From 87bcfd8223781d24877e15e1acc1507f3f96b271 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 20 Mar 2022 19:45:01 +0100 Subject: [PATCH 0001/2369] 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 16301971cb5..8af468ccc9b 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 8ebbfdfa21d63a9bc3889b3caeb3ac38d61c0a60 Mon Sep 17 00:00:00 2001 From: chili-b Date: Sat, 19 Mar 2022 16:00:40 -0400 Subject: [PATCH 0002/2369] 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 00000000000..9941fc6da8c --- /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 fef8bb3ab32..8315f57ff0d 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 bece58e55a05d7db91383bf56cacdc05a2af9430 Mon Sep 17 00:00:00 2001 From: Philipp David Date: Sat, 6 Nov 2021 15:51:38 +0100 Subject: [PATCH 0003/2369] 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 bf618ce330b..00000000000 --- 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 66204733fa8..772f73ca4a7 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 9bcf33ac5fcdd4c35e57bb04479cb559bbfa6d64 Mon Sep 17 00:00:00 2001 From: Piraty Date: Sun, 20 Mar 2022 22:25:04 +0100 Subject: [PATCH 0004/2369] 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 dcdd7cfd40e..9b4de6a28c8 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 00000000000..5636324afbc --- /dev/null +++ b/srcpkgs/tumbler/update @@ -0,0 +1 @@ +ignore="*.*[13579].*" From f5a53e8fc28a8464c20bd39f24dfbfd81c40e1d8 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 22:30:27 +0100 Subject: [PATCH 0005/2369] 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 00000000000..d01aba1e34c --- /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 9089f55d5ea560a972282169b9824d75f96ff5bd Mon Sep 17 00:00:00 2001 From: Sanjay Pavan Date: Thu, 3 Mar 2022 19:11:30 +0530 Subject: [PATCH 0006/2369] 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 00000000000..455884f0b1a --- /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 6ef4a1e207d..a52cc2bb03f 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 19b1db75c4f8df8306a20d99938961e5ec956829 Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated Date: Sat, 5 Mar 2022 12:38:42 +0100 Subject: [PATCH 0007/2369] 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 d0792f1961f..6c2d860909c 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 ebd4923f72a5c265f9434134dc1c909ad53dc177 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sun, 23 Jan 2022 17:57:27 +0200 Subject: [PATCH 0008/2369] 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 565cd4f952d..00000000000 --- 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 cb356dbe018..00000000000 --- 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 180e473235f..bdb18614807 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 a810f0d51c8ede279ccb91b4cbb1910c0ff87157 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 0009/2369] 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 f3229ed6068..e99cf74e035 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 f6797c2e1edc1dd67eb5f90621c17db7b0897931 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 0010/2369] 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 75e93754656..5367dc8680c 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 fc118eccd2bb8291d3ab882dc299a89232d622c0 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 0011/2369] 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 ac88c0efaaa..c09f51778e3 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 066fd9941f9005e7183aa633fadd27b57fa23913 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 5 Mar 2022 13:19:13 -0500 Subject: [PATCH 0012/2369] 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 7a057147d0c..db15e5a366f 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 8b58871d4eb87c845d9d6c2ee112f6a1bb223f55 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 8 Mar 2022 15:35:49 -0500 Subject: [PATCH 0013/2369] 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 733636d4a28..04bca21ab08 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 b2a00cf32b88aa8b63228f0f4fcd342ed9433960 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 14 Mar 2022 03:34:41 -0400 Subject: [PATCH 0014/2369] 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 83332ba10f9..a443ec3fb51 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 9f63cc525631887912b3664ea90cc56ef66270dd Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 14 Mar 2022 03:39:12 -0400 Subject: [PATCH 0015/2369] 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 30b450cd353..208a55032a3 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 703db7b3e0a3fca3fcfc337e06797d24e5395e7b Mon Sep 17 00:00:00 2001 From: hechos Date: Sun, 20 Mar 2022 15:38:45 -0300 Subject: [PATCH 0016/2369] 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 62c33ae48c9..6973e02571b 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 80f36cf464e6f1ab9d22e32ed4d2f3bd86d4d37d Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sat, 19 Mar 2022 18:20:53 +0530 Subject: [PATCH 0017/2369] linux-firmware: update to 20220310 --- srcpkgs/linux-firmware/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index 7c55a94b343..018f08f9509 100644 --- a/srcpkgs/linux-firmware/template +++ b/srcpkgs/linux-firmware/template @@ -1,6 +1,6 @@ # Template file for 'linux-firmware' pkgname=linux-firmware -version=20220209 +version=20220310 revision=1 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}" short_desc="Binary firmware blobs for the Linux kernel" @@ -8,7 +8,7 @@ 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 69c39d35b3326b35dca936edd19f28efdaaee1e7 Mon Sep 17 00:00:00 2001 From: Jose G Perez Taveras Date: Sun, 20 Mar 2022 05:19:39 -0400 Subject: [PATCH 0018/2369] 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 3b89fa15109..4f1c061d576 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 b198d2dc5e5bc647b4202ed01a946741ad0f8524 Mon Sep 17 00:00:00 2001 From: chili-b Date: Sat, 19 Mar 2022 21:10:43 -0400 Subject: [PATCH 0019/2369] 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 31b15fbb4d9..90ede78d19a 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 f587be8d75f31e14afdf92e7128a8053533a2a23 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 0020/2369] 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 4dbf467d42b..fc00ddb3644 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 8e40bf72c6fa75d7e605d39f00a10f6ada84b2e9 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 20 Mar 2022 14:50:28 +0100 Subject: [PATCH 0021/2369] 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 3e50e64f96f..659f5257ae2 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 05fae437866855345e159b0ecd81333bba1e71a3 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 4 Mar 2022 21:05:01 +0100 Subject: [PATCH 0022/2369] 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 d57de65ca80..d7b6f822491 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 c5d1c7fbb845f23fa78abebd501403ad8e279ae3 Mon Sep 17 00:00:00 2001 From: Matthias von Faber Date: Sat, 19 Mar 2022 16:37:20 +0100 Subject: [PATCH 0023/2369] 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 0b007bb865d..98317332f36 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 c50e41d564233e87c1f14c61b0020ff9e4a6660f Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 8 Mar 2022 02:57:59 -0500 Subject: [PATCH 0024/2369] 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 00000000000..a2abfe61e84 --- /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 14ee8daad0c..6da6f9c3d40 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 5cd45dd184a..f81228ad740 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 6ec782cccbb..a9abc60e64e 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 4d1e5bc774184dd7b90260c36ba8463c0eaf0fd6 Mon Sep 17 00:00:00 2001 From: Karel Balej Date: Fri, 11 Mar 2022 21:13:50 +0100 Subject: [PATCH 0025/2369] 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 50f5f543b50..846f2e381b1 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 172b42a33c9665a9030703b1813497233e2d821c Mon Sep 17 00:00:00 2001 From: Karel Balej Date: Fri, 11 Mar 2022 21:33:23 +0100 Subject: [PATCH 0026/2369] 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 83b5783cb02..315841c47ba 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 c58ff20762d..952926c7df9 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 b724a2a4da8f5e08c76c0259aecf5cd7d6c5c803 Mon Sep 17 00:00:00 2001 From: teldra Date: Wed, 16 Mar 2022 11:27:47 +0100 Subject: [PATCH 0027/2369] 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 13a91c28109..a84b6bc296b 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 038b278470d5a8da23d71c9e467d3af2f1825d30 Mon Sep 17 00:00:00 2001 From: zenobit Date: Mon, 14 Mar 2022 23:28:42 +0100 Subject: [PATCH 0028/2369] 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 75d8c4290fe..f9eaa1b1873 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 f878b1c635088e637a2ff89bd39204b06aa26d46 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 20 Mar 2022 21:22:09 -0500 Subject: [PATCH 0029/2369] 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 315841c47ba..2d8a8b8b0df 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 f4dcddc3569..fe171d75b35 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 afaa2ceba3bb71640a4b0124da7c8d9726ea94a0 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 20 Mar 2022 21:22:11 -0500 Subject: [PATCH 0030/2369] 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 fcbbb46b64a..3f4c5925636 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 da207070380d30636eb8784cf3c0f116ba205749 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 0031/2369] 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 8b0493c1f92..ec36f57837a 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 db52feaf170e85a538b309389fdd44587da36a66 Mon Sep 17 00:00:00 2001 From: skmpz Date: Fri, 10 Sep 2021 21:24:56 +0400 Subject: [PATCH 0032/2369] 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 39122128a30..00000000000 --- 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 9b57379bfc8..3732311abb2 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 1afda39d8966c2c7d79aec82e00ef4104713d8ec Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Mon, 21 Mar 2022 09:33:41 +0100 Subject: [PATCH 0033/2369] 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 5516594f44f..e12c57deeb5 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 9c7a509c7cefce4feddbf7240db9d13251ca3996 Mon Sep 17 00:00:00 2001 From: Henry Naguski Date: Sun, 20 Mar 2022 19:51:34 -0600 Subject: [PATCH 0034/2369] 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 4f00d57388e..2b3a783943b 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 f9fd85e4f7c7078156747a686d65c74084c87ccb 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 0035/2369] 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 23ef9da2644..7339c30acbe 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 00000000000..39f94a1d4dd --- /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 a0da399fb2d..8fdd7215cd9 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 0b1fc1a22bf9adb87401c991c1e8220ccb221fcc Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 21 Mar 2022 14:06:08 +0100 Subject: [PATCH 0036/2369] 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 a907482b751..2d5bf7a8095 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 51ff9e7eb992d2a743e91b8a27ecb41bb8d86b83 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 21 Mar 2022 16:12:29 +0100 Subject: [PATCH 0037/2369] 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 2f03d4420f0..f40c2f1646e 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 ba482268b0e6282ac012b629bbb6bba4b32e410e Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Tue, 25 May 2021 12:08:54 +1100 Subject: [PATCH 0038/2369] 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 fe2dc3ccee4..e0071fcf0b1 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 dd90721fd90..00000000000 --- a/srcpkgs/patchelf/update +++ /dev/null @@ -1,2 +0,0 @@ -site='https://nixos.org/releases/patchelf/' -pattern='patchelf-\K[\d.]+(?=/)' From 9fd038b979a9069624dc257dd8ce7535f5df8ae1 Mon Sep 17 00:00:00 2001 From: Piraty Date: Tue, 22 Mar 2022 11:51:31 +0100 Subject: [PATCH 0039/2369] 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 9ef2297baeb..9c691626703 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 c0d140adea04401b6d245655ee71fc56e038da1e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 22 Mar 2022 16:19:05 +0100 Subject: [PATCH 0040/2369] 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 fa05e329472..4f54c6c05e9 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 604c24238fccc490c13e9c17de63c1ce1d53df02 Mon Sep 17 00:00:00 2001 From: Ramdziana F Y Date: Mon, 21 Mar 2022 20:11:35 +0700 Subject: [PATCH 0041/2369] 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 e3421bb8539..d3673882469 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 f46bf9591a2d2b17d1d26584055dc6ca47318708 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 22 Mar 2022 17:56:15 +0100 Subject: [PATCH 0042/2369] 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 2c2d8c329e6..569c4e29177 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 a0442790ec77f0887ed9a7b44540764c2a01fa9d Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 22 Mar 2022 17:58:04 +0100 Subject: [PATCH 0043/2369] 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 04b0bef6df6..8b22de823ad 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 5f628d6fc8d58a620b6772651aad803ec520fe56 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 21 Mar 2022 10:02:40 -0400 Subject: [PATCH 0044/2369] 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 | 68 ++++++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 28 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 082b5c2fc19..00000000000 --- 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 19ac9e7cbf0..64c1ae02179 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= - 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 - cd ${wrksrc}/dbus-${pyver} +do_configure() { + local py_abiver py_inc pyver + for pyver in $py2_ver $py3_ver; do + case "${pyver}" in + "${py2_ver}") + py_inc="$py2_inc" + ;; + *) + py_inc="$py3_inc" + py_abiver="$py3_abiver" + ;; + esac + 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 aaa028cd3129bb88562bd2ba2bd382849fe1982d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 21 Mar 2022 23:58:07 -0400 Subject: [PATCH 0045/2369] 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 00000000000..f4d913bbbd8 --- /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 7b63b401f2a..4f192264d4b 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 695bfbc43aadee81f1573e1b2e870bc2d678c3c5 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 22 Mar 2022 19:54:46 +0100 Subject: [PATCH 0046/2369] 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 252c84c21b1..f5ff0d9066a 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 6551bd81a164d63354917f7ce3dd511ad205f6d3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 22 Mar 2022 20:24:14 +0100 Subject: [PATCH 0047/2369] 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 005880d7bcb..9f15e0a43dd 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 4cd0718d8f7dbd296cd901cbe41fe273ff6ebb22 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 12 Mar 2022 17:37:09 +0100 Subject: [PATCH 0048/2369] 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 c357b9efae6..00000000000 --- 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 c23125bb0cb..30fa0d2cce3 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 From a692f004d43087c0dabe58874b1f9c82d3278933 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Wed, 23 Mar 2022 13:55:28 +1100 Subject: [PATCH 0049/2369] jadx: update to 1.3.4. --- srcpkgs/jadx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template index d5e2f69ab77..71467e34044 100644 --- a/srcpkgs/jadx/template +++ b/srcpkgs/jadx/template @@ -1,6 +1,6 @@ # Template file for 'jadx' pkgname=jadx -version=1.3.3 +version=1.3.4 revision=1 hostmakedepends="openjdk8 gradle" short_desc="Decompiler for Dalvik bytecode" @@ -8,7 +8,7 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://github.com/skylot/jadx" distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz" -checksum=c423176c0b0675db6a9969133af3ec71d2568897155362fe50b0288e76bfe78d +checksum=9f7f05c647a287fe4a572d85f14715559513e864d27f6bf6b19852529da8efdc do_build() { gradle copyArtifacts From 63a789ab4dfa083085a7781a828d1164d6af1a98 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 17 Mar 2022 11:12:24 +0100 Subject: [PATCH 0050/2369] tau: update to 0.12.0. --- srcpkgs/tau/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/tau/template b/srcpkgs/tau/template index d81968c76ac..d1f9e962499 100644 --- a/srcpkgs/tau/template +++ b/srcpkgs/tau/template @@ -1,11 +1,10 @@ # Template file for 'tau' pkgname=tau -version=0.11.3 +version=0.12.0 revision=1 build_style=meson build_helper=rust -configure_args=" -Dxi-core=system" -hostmakedepends="cargo gettext pkg-config rust glib-devel xi-editor" +hostmakedepends="cargo gettext pkg-config glib-devel" makedepends="libhandy-devel rust-std vte3-devel" depends="xi-editor" checkdepends="appstream-glib desktop-file-utils" @@ -13,8 +12,8 @@ short_desc="GTK frontend for the Xi text editor, written in Rust" maintainer="Enno Boland " license="MIT" homepage="https://gitlab.gnome.org/World/Tau" -distfiles="https://gitlab.gnome.org/World/Tau/uploads/b5f24cd692ec0c2a2c2be460fffaf505/tau-${version}.tar.xz" -checksum=36e915de4ca906599b4ad176d4e2d625b454801a09ca0d4b0a1fbaf14915e60e +distfiles="https://gitlab.gnome.org/World/Tau/uploads/14037a7f98f475d2497b74bd74a0430e/tau-${version}.tar.xz" +checksum=a14e4c3511fa51cc051c33ad04a3989b93c6aa2405e8b0f5ac05970fe5d95449 # this sometimes builds and sometimes doesn't, do not # reenable unless you can reliably build it every time From c35b73085ae06392eed07ecc71adc41b49ecd87a Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 23 Mar 2022 23:02:00 -0500 Subject: [PATCH 0051/2369] Amass: update to 3.18.2. --- srcpkgs/Amass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template index 271551b6b15..c11b52a0465 100644 --- a/srcpkgs/Amass/template +++ b/srcpkgs/Amass/template @@ -1,6 +1,6 @@ # Template file for 'Amass' pkgname=Amass -version=3.17.1 +version=3.18.2 revision=1 build_style=go go_import_path="github.com/OWASP/Amass/v3/..." @@ -9,7 +9,7 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://www.owasp.org/index.php/OWASP_Amass_Project" distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz" -checksum=5d11de26ce62dad9ddc4f36032a1192c2c126c4e23a31e1e04cb2d08098d5dfd +checksum=67c21e19d1e6cc9fccb2a1ea3ffab75c9198693fc46ff5d7b63fcbe60a4cd4bb post_install() { rm ${DESTDIR}/usr/bin/examples From 8dc873b10a2dd0e9578892a9680549e626b55bdb Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 23 Mar 2022 23:04:08 -0500 Subject: [PATCH 0052/2369] QMPlay2: update to 22.03.19. --- srcpkgs/QMPlay2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template index 463afde3a83..1c8571de259 100644 --- a/srcpkgs/QMPlay2/template +++ b/srcpkgs/QMPlay2/template @@ -1,6 +1,6 @@ # Template file for 'QMPlay2' pkgname=QMPlay2 -version=21.12.24 +version=22.03.19 revision=1 wrksrc="${pkgname}-src-${version}" build_style=cmake @@ -15,7 +15,7 @@ license="LGPL-3.0-only" homepage="http://zaps166.sourceforge.net/?app=QMPlay2" changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog" distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz" -checksum=92e5fa7f7df43a83f72bf9e87366ebae71148bc683db0556447981f0dd8e5f2d +checksum=d6cde1cec25729d32a8cc1ba925b711b98d18961941f9764a7db8a75b255004e if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From 1073465e5cb59474724e4dceefd2109cb99ced61 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 23 Mar 2022 23:05:38 -0500 Subject: [PATCH 0053/2369] python3-rich: update to 12.0.1. --- srcpkgs/python3-rich/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template index 942d44da3fa..c394edfbead 100644 --- a/srcpkgs/python3-rich/template +++ b/srcpkgs/python3-rich/template @@ -1,6 +1,6 @@ # Template file for 'python3-rich' pkgname=python3-rich -version=11.2.0 +version=12.0.1 revision=1 wrksrc="rich-${version}" build_style=python3-module @@ -13,7 +13,8 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/willmcgugan/rich" distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz" -checksum=1a6266a5738115017bb64a66c59c717e7aa047b3ae49a011ede4abdeffc6536e +checksum=3fba9dd15ebe048e2795a02ac19baee79dc12cc50b074ef70f2958cd651b59a9 +make_check=extended # some checks only work on windows post_install() { vlicense LICENSE From fbc5298913d02b679d6acb54353cab23779404de Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 23 Mar 2022 23:08:55 -0500 Subject: [PATCH 0054/2369] python3-waitress: update to 2.1.1. --- srcpkgs/python3-waitress/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-waitress/template b/srcpkgs/python3-waitress/template index ae3ee23f693..5e40d71a3d4 100644 --- a/srcpkgs/python3-waitress/template +++ b/srcpkgs/python3-waitress/template @@ -1,6 +1,6 @@ # Template file for 'python3-waitress' pkgname=python3-waitress -version=2.1.0 +version=2.1.1 revision=1 wrksrc="waitress-${version}" build_style=python3-module @@ -12,4 +12,4 @@ maintainer="Andrew Benson " license="ZPL-2.1" homepage="https://github.com/Pylons/waitress" distfiles="${PYPI_SITE}/w/waitress/waitress-${version}.tar.gz" -checksum=ec8a8d9b6b15f3bb2c1a82b8f3929a029c333c35fcafb08c185a9e562d8cc9c2 +checksum=e2e60576cf14a1539da79f7b7ee1e79a71e64f366a0b47db54a15e971f57bb16 From 6c8442bd882bce9ecd6f6271fd78a885594e0dea Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 23 Mar 2022 23:09:04 -0500 Subject: [PATCH 0055/2369] ytmdl: update to 2022.03.16. --- srcpkgs/ytmdl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template index dd28541cea4..5dfe4a7636a 100644 --- a/srcpkgs/ytmdl/template +++ b/srcpkgs/ytmdl/template @@ -1,6 +1,6 @@ # Template file for 'ytmdl' pkgname=ytmdl -version=2021.11.07 +version=2022.03.16 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -16,7 +16,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/deepjyoti30/ytmdl" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=1de4cdd9f256acac5518637d533c0737e8f3ab13a4990e171f2ffd16d1bdfd8f +checksum=cb2271e7e2e2db107848699dd7e56a7d9479b6ce20e5ddef8710bd7078543430 # There is no test to run make_check=no From abd006fa9d4f03a2364bdea92bdab69efd97886a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 24 Mar 2022 14:49:45 +0100 Subject: [PATCH 0056/2369] pianobar: fix build Close: #36316 --- srcpkgs/pianobar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template index 652db15ba46..b7d991fef5a 100644 --- a/srcpkgs/pianobar/template +++ b/srcpkgs/pianobar/template @@ -6,7 +6,7 @@ build_style=gnu-makefile make_build_args="V=1" hostmakedepends="pkg-config" makedepends="faad2-devel ffmpeg-devel gnutls-devel json-c-devel libao-devel - libcurl-devel" + libcurl-devel libgcrypt-devel" short_desc="Free/open-source, console-based client for Pandora radio" maintainer="Ulf " license="MIT" From 1b439057c3db652b5fbfe252fec66548e0aa0e55 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 23 Mar 2022 14:33:28 +0100 Subject: [PATCH 0057/2369] netpbm: update to 10.97.06. --- srcpkgs/netpbm/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index db6f8708eb8..d72721bd9eb 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,10 +1,10 @@ # Template file for 'netpbm' pkgname=netpbm # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY -version=10.97.05 +version=10.97.06 revision=1 -_githash=9f95511f291ecc492e283932064857717678bb19 -_githash_guide=4571e910b4cc98268539768c98d9303dc052847b +_githash=f336dfc59346a26a045f7e0df0ecba32d904c55e +_githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79 create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" hostmakedepends="pkg-config perl python flex" @@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm" homepage="http://netpbm.sourceforge.net/" distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="8d42d131931141d79848bf9320b63b8858c51651c0f1ebb2fc2da7e2bcd8c78d - b782b5092a3da5fe804084f7e8eb2452e777dcbe73bc0f9634671eafe6a07392" +checksum="9cd658ec9081b980a98fb44f02aa5289ba9ca17ad7e9a699627bf6f2a85c5612 + 30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde" post_extract() { cd $build_wrksrc From d7266508f9e76117274dd04b603d00de15191c57 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 23 Mar 2022 14:35:23 +0100 Subject: [PATCH 0058/2369] tab: update to 9.1. --- srcpkgs/tab/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template index 987ae0a0e9e..b0e7720b1d2 100644 --- a/srcpkgs/tab/template +++ b/srcpkgs/tab/template @@ -1,15 +1,15 @@ # Template file for 'tab' pkgname=tab -version=9.0 +version=9.1 revision=1 -wrksrc="tkatchev-tab-95a2e7a0d12d" +wrksrc="tkatchev-tab-457574615bf4" checkdepends="python3" short_desc="Shell language for text/number manipulation" maintainer="Leah Neukirchen " license="BSL-1.0" homepage="http://tkatchev.bitbucket.io/tab/" distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2" -checksum=1df7244af5db044fc4a6a38f2aa22e040246580bddd89bccb64d3967699d01d1 +checksum=ccc72e4c8a5f0d7786a8c4a4c8b8dd5599ad867c876605b2cacad7f32c30651a do_build() { ${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm From a67b6c5a70f32f0b556325cb5d26ce3ce6cae328 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 24 Mar 2022 15:52:34 +0100 Subject: [PATCH 0059/2369] parallel: update to 20220322. --- srcpkgs/parallel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template index dd16940a024..030875ae0ff 100644 --- a/srcpkgs/parallel/template +++ b/srcpkgs/parallel/template @@ -1,6 +1,6 @@ # Template file for 'parallel' pkgname=parallel -version=20220122 +version=20220322 revision=1 build_style=gnu-configure depends="perl" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/parallel/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=b8221a21412bca572ad8445b7981dfd625a3c6d48772cda468dfb5b886337e00 +checksum=df93ccf6a9f529ad2126b7042aef0486603e938c77b405939c41702d38a4e6d8 pre_configure() { # no html and pdf doc From f921d2446589cf54025692f74d2d262816526d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Tue, 22 Mar 2022 09:28:37 +0100 Subject: [PATCH 0060/2369] doomretro: update to 4.4.10. --- srcpkgs/doomretro/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template index 5367dc8680c..aa3010c9a7d 100644 --- a/srcpkgs/doomretro/template +++ b/srcpkgs/doomretro/template @@ -1,6 +1,6 @@ # Template file for 'doomretro' pkgname=doomretro -version=4.4.9 +version=4.4.10 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=02f2f3ec9d8d4db5ad1d00fcb5a5161113d3caa6dc108f14af8760535f00ce9e +checksum=4f16113b576c6c76a1961b143437be67e149f1c24262f44dde0b81407c01e466 From 3662dedb0b3a2aae311ecae45b7fdba7245a72b6 Mon Sep 17 00:00:00 2001 From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com> Date: Thu, 17 Mar 2022 21:27:57 -0700 Subject: [PATCH 0061/2369] CLion: update to 2021.3.4. --- srcpkgs/CLion/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template index 7bcdc3545a2..65e76c206e6 100644 --- a/srcpkgs/CLion/template +++ b/srcpkgs/CLion/template @@ -1,6 +1,6 @@ # Template file for 'CLion' pkgname=CLion -version=2021.3.3 +version=2021.3.4 revision=1 archs="x86_64 aarch64" wrksrc="clion-${version}" @@ -10,7 +10,7 @@ maintainer="Anton Afanasyev " license="custom:Commercial" homepage="https://www.jetbrains.com/clion" distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz" -checksum=35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d +checksum=f3b0b9e0dd0cd4aebef5d424e7a22868c732daad47d6c94f73630cef449ccf78 repository=nonfree restricted=yes nopie=yes From f85a7e42fd0bce4f76a608cfd69787f832fc9f26 Mon Sep 17 00:00:00 2001 From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com> Date: Thu, 17 Mar 2022 21:28:52 -0700 Subject: [PATCH 0062/2369] intellij-idea-ultimate-edition: update to 2021.3.3. --- srcpkgs/intellij-idea-ultimate-edition/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template index 3340f9c0f0f..92ad9135f3a 100644 --- a/srcpkgs/intellij-idea-ultimate-edition/template +++ b/srcpkgs/intellij-idea-ultimate-edition/template @@ -1,6 +1,6 @@ # Template file for 'intellij-idea-ultimate-edition' pkgname=intellij-idea-ultimate-edition -version=2021.3.2 +version=2021.3.3 revision=1 archs="i686 x86_64" create_wrksrc="true" @@ -11,7 +11,7 @@ license="custom:Commercial" homepage="https://www.jetbrains.com/idea" _filename="ideaIU-${version}-no-jbr.tar.gz" distfiles="https://download.jetbrains.com/idea/${_filename}" -checksum=face5d154a2c9244b278bfc6dca37218ae3344090526a0679086eff9b0c56670 +checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470 repository=nonfree restricted=yes nopie=yes From 72075cf8c89a171c28f7893dbbdcfb204f20f080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 19 Mar 2022 22:50:25 +0100 Subject: [PATCH 0063/2369] New package: rootlesskit-0.14.6 --- srcpkgs/rootlesskit/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/rootlesskit/template diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template new file mode 100644 index 00000000000..15fbeba58f7 --- /dev/null +++ b/srcpkgs/rootlesskit/template @@ -0,0 +1,14 @@ +# Template file for 'rootlesskit' +pkgname=rootlesskit +version=0.14.6 +revision=1 +build_style=go +go_import_path="github.com/rootless-containers/rootlesskit" +go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl + ${go_import_path}/cmd/rootlesskit-docker-proxy" +short_desc="Linux-native \"fake root\" for implementing rootless containers" +maintainer="Piotr Wójcik " +license="Apache-2.0" +homepage="https://github.com/rootless-containers/rootlesskit" +distfiles="https://github.com/rootless-containers/rootlesskit/archive/v${version}.tar.gz" +checksum=e27e4249f12cca44fc6e15a27f214f30fcb5f15646c813a90b6788bd9f0cfd4b From 74ed8b24e2f7e993a142250910351f412842b118 Mon Sep 17 00:00:00 2001 From: skmpz Date: Fri, 18 Mar 2022 20:41:30 +0400 Subject: [PATCH 0064/2369] calibre: update to 5.39.0. --- srcpkgs/calibre/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index af47d8993ee..9f59df3a035 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,6 +1,6 @@ # Template file for 'calibre' pkgname=calibre -version=5.38.0 +version=5.39.0 revision=1 build_style=python3-module pycompile_dirs="/usr/lib/calibre/" @@ -27,7 +27,7 @@ license="GPL-3.0-only" homepage="https://calibre-ebook.com" changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt" distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz" -checksum=82b46b2c9d0ba2c82d95940e285b1fa168d55998613d216fa6d60da7d68fc550 +checksum=2fbe45ec9d4dea481772cc290e27567efdba60cd9d2fe736713d9b1eb020582e python_version=3 lib32disabled=yes nocross=yes From 983a0e5e558d831204142c5b9eed40e7c7dc59dd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 24 Mar 2022 21:42:57 +0100 Subject: [PATCH 0065/2369] Amass: fix build --- srcpkgs/Amass/template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template index c11b52a0465..ea6584b868d 100644 --- a/srcpkgs/Amass/template +++ b/srcpkgs/Amass/template @@ -10,7 +10,3 @@ license="Apache-2.0" homepage="https://www.owasp.org/index.php/OWASP_Amass_Project" distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz" checksum=67c21e19d1e6cc9fccb2a1ea3ffab75c9198693fc46ff5d7b63fcbe60a4cd4bb - -post_install() { - rm ${DESTDIR}/usr/bin/examples -} From 72647420054d0ebeb9bc8e480e77ea78baf6b207 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 15:02:10 -0700 Subject: [PATCH 0066/2369] libadwaita: update to 1.1.0 --- srcpkgs/libadwaita/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template index 37abdc5a2e5..aef0032bfb7 100644 --- a/srcpkgs/libadwaita/template +++ b/srcpkgs/libadwaita/template @@ -1,6 +1,6 @@ # Template file for 'libadwaita' pkgname=libadwaita -version=1.0.2 +version=1.1.0 revision=1 build_style=meson build_helper="gir" @@ -15,7 +15,7 @@ maintainer="Michal Vasilek " license="LGPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/libadwaita/" distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz" -checksum=79e56011f5532fba6cb02531249d2bcfb8a6c42495c7a7de92f8819661fea091 +checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e build_options="gir gtk_doc" build_options_default="gir gtk_doc" From 5256444bacb1959c2023d1f372ade916e4694352 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 20 Mar 2022 13:48:28 +0100 Subject: [PATCH 0067/2369] New package: budgie-control-center-1.0.1 --- srcpkgs/budgie-control-center-devel | 1 + srcpkgs/budgie-control-center/template | 30 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 120000 srcpkgs/budgie-control-center-devel create mode 100644 srcpkgs/budgie-control-center/template diff --git a/srcpkgs/budgie-control-center-devel b/srcpkgs/budgie-control-center-devel new file mode 120000 index 00000000000..ff5de5ddf18 --- /dev/null +++ b/srcpkgs/budgie-control-center-devel @@ -0,0 +1 @@ +budgie-control-center \ No newline at end of file diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template new file mode 100644 index 00000000000..15d7ee0dca8 --- /dev/null +++ b/srcpkgs/budgie-control-center/template @@ -0,0 +1,30 @@ +# Template file for 'budgie-control-center' +pkgname=budgie-control-center +version=1.0.1 +revision=1 +build_style=meson +hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config + polkit python3 libxml2" +makedepends="ModemManager-devel NetworkManager-devel accountsservice-devel + colord-devel colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel + gnome-online-accounts-devel gnome-settings-daemon-devel ibus-devel + libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel libnma-devel + polkit-devel pulseaudio-devel samba-devel upower-devel libxml2-devel + libX11-devel libXi-devel libepoxy-devel gdk-pixbuf-devel gtk+3-devel + libglib-devel cups-devel libgudev-devel libwacom-devel libsecret-devel + udisks2-devel gsound-devel libsoup-devel gcr-devel cheese-devel" +depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes + gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop" +short_desc="Budgie Control Center" +maintainer="Orphaned " +license="GPL-2.0-or-later" +homepage="https://github.com/BuddiesOfBudgie/budgie-control-center" +distfiles="https://github.com/BuddiesOfBudgie/budgie-control-center/releases/download/v${version}/budgie-control-center-${version}.tar.xz" +checksum=6c049d02600f6650238b4376a7eac77d8fcd786e9c603c4e4ec87cad0022028a + +budgie-control-center-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove usr/share/pkgconfig + } +} From a6dc191230a3dda893448f66e5c7b883cfa661e0 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 20 Mar 2022 14:04:46 +0100 Subject: [PATCH 0068/2369] New package: budgie-desktop-view-1.2 --- srcpkgs/budgie-desktop-view/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/budgie-desktop-view/template diff --git a/srcpkgs/budgie-desktop-view/template b/srcpkgs/budgie-desktop-view/template new file mode 100644 index 00000000000..57ec2a5790a --- /dev/null +++ b/srcpkgs/budgie-desktop-view/template @@ -0,0 +1,13 @@ +# Template file for 'budgie-desktop-view' +pkgname=budgie-desktop-view +version=1.2 +revision=1 +build_style=meson +hostmakedepends="pkg-config intltool vala glib-devel" +makedepends="libglib-devel gtk+3-devel vala-devel" +short_desc="Budgie desktop icons application" +maintainer="Orphaned " +license="Apache-2.0" +homepage="https://github.com/BuddiesOfBudgie/budgie-desktop-view" +distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop-view/releases/download/v${version}/budgie-desktop-view-v${version}.tar.xz" +checksum=8399fae4326e5a21dda889bd89cb16ed8201f2854dc5cbc12394b90420d4cf2e From 6f42ffa46ae8ec495b79f026265613955ca887b0 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 20 Mar 2022 01:27:41 +0100 Subject: [PATCH 0069/2369] budgie-screensaver: update to 5.0. --- srcpkgs/budgie-screensaver/patches/musl.patch | 12 ++++++++++++ srcpkgs/budgie-screensaver/template | 17 ++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/budgie-screensaver/patches/musl.patch diff --git a/srcpkgs/budgie-screensaver/patches/musl.patch b/srcpkgs/budgie-screensaver/patches/musl.patch new file mode 100644 index 00000000000..6f5c265f83a --- /dev/null +++ b/srcpkgs/budgie-screensaver/patches/musl.patch @@ -0,0 +1,12 @@ +diff --git a/src/subprocs.c b/src/subprocs.c +index a378658..ba37650 100644 +--- a/src/subprocs.c ++++ b/src/subprocs.c +@@ -36,6 +36,7 @@ + # define fork vfork + #endif /* VMS */ + ++#define _POSIX_SOURCE + #include /* for the signal names */ + + #include diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template index 971ebcdb4c2..b877543d33a 100644 --- a/srcpkgs/budgie-screensaver/template +++ b/srcpkgs/budgie-screensaver/template @@ -1,14 +1,13 @@ # Template file for 'budgie-screensaver' pkgname=budgie-screensaver -version=4.0 -revision=2 -wrksrc=budgie-screensaver-v${version} -build_style=gnu-configure -hostmakedepends="pkg-config intltool glib" +version=5.0 +revision=1 +build_style=meson +hostmakedepends="pkg-config intltool glib-devel" makedepends="gnome-desktop-devel dbus-glib-devel pam-devel elogind-devel" short_desc="Fork of GNOME Screensaver for Budgie 10" -maintainer="Lorem " +maintainer="Orphaned " license="GPL-2.0-only" -homepage="https://github.com/getsolus/budgie-screensaver" -distfiles="https://github.com/getsolus/budgie-screensaver/releases/download/v${version}/budgie-screensaver-v${version}.tar.xz" -checksum=dde83f355e549b5f6290655f33acd910d2febbb8fd974f922b14814054f80f49 +homepage="https://github.com/BuddiesOfBudgie/budgie-screensaver" +distfiles="https://github.com/BuddiesOfBudgie/budgie-screensaver/releases/download/v${version}/budgie-screensaver-v${version}.tar.xz" +checksum=611969a9f53e5d3148cad7445e95c94bfff6ea61c2f339969ecb5d9b51f6b871 From 9fb8156b7d817fe6f792e7044dbdcbb5889018aa Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 20 Mar 2022 01:27:36 +0100 Subject: [PATCH 0070/2369] budgie-desktop: update to 10.6. --- srcpkgs/budgie-desktop/template | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template index 6d7dc6d139b..a65c395c994 100644 --- a/srcpkgs/budgie-desktop/template +++ b/srcpkgs/budgie-desktop/template @@ -1,9 +1,7 @@ # Template file for 'budgie-desktop' pkgname=budgie-desktop -version=10.5.3 -revision=2 -create_wrksrc=yes -build_wrksrc="$pkgname-$version" +version=10.6 +revision=1 build_style=meson build_helper=gir configure_args="-Dwith-gtk-doc=false" @@ -13,20 +11,14 @@ makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel upower-devel gtk+3-devel polkit-devel gnome-bluetooth-devel gnome-menus-devel gnome-settings-daemon-devel vala libuuid-devel libupower-glib3" -depends="gnome-session gnome-settings-daemon gnome-control-center elogind - gnome-themes-extra budgie-screensaver" +depends="gnome-session gnome-settings-daemon budgie-control-center elogind + gnome-themes-extra budgie-screensaver budgie-desktop-view" short_desc="Modern desktop environment from the Solus Project" -maintainer="Lorem " +maintainer="Orphaned " license="GPL-2.0-only, LGPL-2.1-only" -homepage="https://github.com/solus-project/budgie-desktop" -distfiles="${homepage}/releases/download/v${version}/budgie-desktop-v${version}.tar.xz - ${homepage}/commit/7a2835f2fa247e7201bb9e4a434bade8f4bfe86e.patch>mutter41.patch" -checksum="878f4e6460c29740bf633c3b11ba97bcb788068c1460f82569938af2f1633b25 - 65430e84e33b1529aebae169ad8e0392abf1b5c4bb1b454d46f17dc37469d763" - -post_patch() { - patch -Np1 < ../mutter41.patch -} +homepage="https://github.com/BuddiesOfBudgie/budgie-desktop" +distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz" +checksum=ba297a10b547e6d7bf164406750b5c5dae98a7524978b30b4ad3cba9624def9e budgie-desktop-devel_package() { short_desc+=" - development files" From 76a6a93292d25ca31cffda71f2524081f597305f Mon Sep 17 00:00:00 2001 From: Barbaross Date: Thu, 17 Mar 2022 07:31:50 -0400 Subject: [PATCH 0071/2369] herbstluftwm: update to 0.9.4 --- srcpkgs/herbstluftwm/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template index d4927fc80ea..9b284845113 100644 --- a/srcpkgs/herbstluftwm/template +++ b/srcpkgs/herbstluftwm/template @@ -1,19 +1,19 @@ # Template file for 'herbstluftwm' pkgname=herbstluftwm -version=0.9.3 +version=0.9.4 revision=1 build_style=cmake hostmakedepends="pkg-config asciidoc" makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel - libXrender-devel freetype-devel" + libXrender-devel freetype-devel libXfixes-devel" conf_files="/etc/xdg/${pkgname}/autostart" short_desc="Manual tiling window manager for X" -maintainer="Orphaned " +maintainer="Cullen Ross " license="BSD-2-Clause" homepage="https://herbstluftwm.org" changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS" distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz" -checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105 +checksum=eef8eed076af33af2a75911c0fb1215fdb3427606a034ea8b44fe76872cb03cc post_install() { vlicense LICENSE From 728a8ea599073a40e2d513d832ae98585d29e50d Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Fri, 25 Mar 2022 00:26:43 +0100 Subject: [PATCH 0072/2369] thermald: update to 2.4.9. --- srcpkgs/thermald/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template index 8a3625e5c19..633a5a49812 100644 --- a/srcpkgs/thermald/template +++ b/srcpkgs/thermald/template @@ -1,6 +1,6 @@ # Template file for 'thermald' pkgname=thermald -version=2.4.8 +version=2.4.9 revision=1 _pkgname=thermal_daemon archs="i686* x86_64*" @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later" homepage="https://github.com/intel/${_pkgname}" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=3e5a5033339c021de41ed4f946dd39e13f79f722fb5bd98d798e83658184c39b +checksum=fb793a2bfaae2e544ef62801075419587b0c045041c69eeafbf61959cce07fdb conf_files='/etc/thermald/*' if [ "$CROSS_BUILD" ]; then From 595898092f148928c4b83599d1edc4c051e9b05d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 25 Mar 2022 15:01:20 +0100 Subject: [PATCH 0073/2369] kore: update to 4.2.1. --- srcpkgs/kore/patches/platform.patch | 11 ----------- srcpkgs/kore/template | 8 +++++--- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/kore/patches/platform.patch diff --git a/srcpkgs/kore/patches/platform.patch b/srcpkgs/kore/patches/platform.patch deleted file mode 100644 index cbacde0591b..00000000000 --- a/srcpkgs/kore/patches/platform.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/misc/linux-platform.sh 2020-09-02 14:26:51.393112635 +0200 -+++ b/misc/linux-platform.sh 2020-09-02 14:28:26.281114976 +0200 -@@ -2,7 +2,7 @@ - # - # Linux specific defines and system call maps. - --PLATFORM=$(uname -m) -+PLATFORM=${XBPS_TARGET_MACHINE} - BASE=$(dirname $0) - - case "$PLATFORM" in diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template index 6c6e2d1378c..52b7dbe718a 100644 --- a/srcpkgs/kore/template +++ b/srcpkgs/kore/template @@ -1,7 +1,7 @@ # Template file for 'kore' pkgname=kore -version=4.1.0 -revision=2 +version=4.2.1 +revision=1 # arch specific seccomp stuff archs="x86_64* aarch64* ppc64*" build_style=gnu-makefile @@ -14,9 +14,11 @@ maintainer="Helmut Pozimski " license="ISC" homepage="https://kore.io" distfiles="https://kore.io/releases/kore-${version}.tar.gz" -checksum=b7d73b005fde0ea01c356a54e4bbd8a209a4dff9cf315802a127ce7267efbe61 +checksum=f76b108a4eefa27c89123f5d6a36b493b171e429be7a85d3dd1466ac87e7f15a disable_parallel_build=yes +export TARGET_PLATFORM=${XBPS_TARGET_MACHINE} + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" fi From 5d8acc825f3c13a947f5dd0da9556767757fcde6 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 25 Mar 2022 09:04:13 -0500 Subject: [PATCH 0074/2369] Amass: update to 3.18.3. --- srcpkgs/Amass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template index ea6584b868d..a33e92ce1d2 100644 --- a/srcpkgs/Amass/template +++ b/srcpkgs/Amass/template @@ -1,6 +1,6 @@ # Template file for 'Amass' pkgname=Amass -version=3.18.2 +version=3.18.3 revision=1 build_style=go go_import_path="github.com/OWASP/Amass/v3/..." @@ -9,4 +9,4 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://www.owasp.org/index.php/OWASP_Amass_Project" distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz" -checksum=67c21e19d1e6cc9fccb2a1ea3ffab75c9198693fc46ff5d7b63fcbe60a4cd4bb +checksum=66eee8ffd300e67a540e9962d2526377677df04b1a3b436471e0a930dd422a9f From 0aa97fb52cc0a88a00dab583c547a569cf9bbf0a Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 23 Mar 2022 22:26:51 -0500 Subject: [PATCH 0075/2369] nvidia: update to 510.60.02. --- srcpkgs/nvidia/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index 43a6ba6821f..3707accdab6 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux" pkgname=nvidia -version=510.47.03 +version=510.60.02 revision=1 maintainer="Andrew Benson " license="custom:NVIDIA Proprietary" @@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1" _pkg="NVIDIA-Linux-x86_64-${version}" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" -checksum=f2a421dae836318d3c0d96459ccb3af27e90e50c95b0faa4288af76279e5d690 +checksum=a800dfc0549078fd8c6e8e6780efb8eee87872e6055c7f5f386a4768ce07e003 # subpackages need to be processed in this specific order subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit" depends="nvidia-libs-${version}_${revision} From 8202a45cecfc5837cf9705a3282fb697d32c895d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 25 Mar 2022 15:10:32 +0100 Subject: [PATCH 0076/2369] linux5.4: update to 5.4.187. --- srcpkgs/linux5.4/files/arm64-dotconfig | 3 ++- srcpkgs/linux5.4/template | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig index a6dd16191de..2b70d687ce1 100644 --- a/srcpkgs/linux5.4/files/arm64-dotconfig +++ b/srcpkgs/linux5.4/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.4.180 Kernel Configuration +# Linux/arm64 5.4.187 Kernel Configuration # # @@ -394,6 +394,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDEN_EL2_VECTORS=y CONFIG_ARM64_SSBD=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.4/template b/srcpkgs/linux5.4/template index 77179607979..46c8f5c5c75 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.185 +version=5.4.187 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=d15fe9da679bfb624f35f127a17559f6d037ad37a313cf5fd22ce155401f3787 +checksum=189e3db3f2af8578037f9c8b4710e1002bdd56f318c5f8589b40de889be9a7b8 python_version=3 nodebug=yes # -dbg package is generated below manually From d71e0fc1d7b16fe5926825a8457b78f94b79d17d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 25 Mar 2022 15:15:24 +0100 Subject: [PATCH 0077/2369] linux4.19: update to 4.19.236. --- srcpkgs/linux4.19/files/arm64-dotconfig | 3 ++- srcpkgs/linux4.19/template | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux4.19/files/arm64-dotconfig b/srcpkgs/linux4.19/files/arm64-dotconfig index a2bf3cb34ad..8268b16af7f 100644 --- a/srcpkgs/linux4.19/files/arm64-dotconfig +++ b/srcpkgs/linux4.19/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.230 Kernel Configuration +# Linux/arm64 4.19.236 Kernel Configuration # # @@ -449,6 +449,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDEN_EL2_VECTORS=y CONFIG_ARM64_SSBD=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y # CONFIG_ARMV8_DEPRECATED is not set CONFIG_ARM64_SW_TTBR0_PAN=y diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template index 840a4516d83..f2fb29a3cf0 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.235 +version=4.19.236 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=530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598 +checksum=002ef6adcafe8d90571f8882280a9bef28d1aa7cc9a3f35a50afc4cb2ebe31c0 python_version=3 nodebug=yes # -dbg package is generated below manually From e284ccd8a7f9535c8a3f1c8c5595ae6343a16752 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 25 Mar 2022 10:42:45 -0500 Subject: [PATCH 0078/2369] python3-youtubesearch: update to 1.6.3. --- srcpkgs/python3-youtubesearch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template index 2e1c6fc1322..3d88fc1126a 100644 --- a/srcpkgs/python3-youtubesearch/template +++ b/srcpkgs/python3-youtubesearch/template @@ -1,6 +1,6 @@ # Template file for 'python3-youtubesearch' pkgname=python3-youtubesearch -version=1.6.2 +version=1.6.3 revision=1 wrksrc="youtube-search-python-${version}" build_style=python3-module @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/alexmercerind/youtube-search-python" distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=d3d4081c319e839f8843f8e361c0b461d420fcd4d7aa4fcbdadf744af8208a8e +checksum=bdb34757c5e390c4d20989d04317acbceffa94293693cbeecb493b079440dbd3 make_check=no # no tests defined post_install() { From 27b447072f9cd558b68b4cd21fdecda2714d8a5c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 25 Mar 2022 20:09:54 +0100 Subject: [PATCH 0079/2369] grml-rescueboot: update to 0.5.2. --- srcpkgs/grml-rescueboot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/grml-rescueboot/template b/srcpkgs/grml-rescueboot/template index dd08b8fa040..41eb267a780 100644 --- a/srcpkgs/grml-rescueboot/template +++ b/srcpkgs/grml-rescueboot/template @@ -1,6 +1,6 @@ # Template file for 'grml-rescueboot' pkgname=grml-rescueboot -version=0.5.1 +version=0.5.2 revision=1 archs="i686 x86_64" build_style="gnu-makefile" @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="http://wiki.grml.org/doku.php?id=rescueboot" distfiles="https://github.com/grml/${pkgname}/archive/v${version}.tar.gz" -checksum=03a2196f3b8cac67d16ba7a87e2a1a57d435a75712492a15ab98a2cd34543098 +checksum=14d37a44c7ef9b0d73cf4e3d3e2698e4a3683e719e02203ff69472b282582f9d do_build() { : From 3dc2b9f3e08c66958ca0d5d5485854cb33e11e77 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 25 Mar 2022 15:16:55 -0400 Subject: [PATCH 0080/2369] python3: update to 3.10.4. --- srcpkgs/python3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index df408f9ed74..ed15b88359f 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.3 +version=3.10.4 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=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc +checksum=80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19 alternatives=" python:idle:/usr/bin/idle${version%.*} From daf89d19a316693cf2575929e90e7854549ae0b0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 25 Mar 2022 15:18:20 -0400 Subject: [PATCH 0081/2369] python3-tkinter: update to 3.10.4. --- 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 bfe219597ff..4aa0a732d03 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.3 +version=3.10.4 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=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc +checksum=80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3" From 1e641f80fc18265db6742169f4d75a0e2df01a54 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 25 Mar 2022 15:18:42 -0400 Subject: [PATCH 0082/2369] python3-pytools: update to 2022.1.2. --- srcpkgs/python3-pytools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template index 3280c48dfb0..1cbf56dc08d 100644 --- a/srcpkgs/python3-pytools/template +++ b/srcpkgs/python3-pytools/template @@ -1,6 +1,6 @@ # Template file for 'python3-pytools' pkgname=python3-pytools -version=2022.1.1 +version=2022.1.2 revision=1 wrksrc=${pkgname#*-}-${version} build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="X11" homepage="https://pypi.org/project/pytools" distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz" -checksum=3eebcc11923bf36fc42a9102d6e417a94817efb1aeb24d3149686dd5e3ec54d4 +checksum=5e824101880a246354756365880a65bb416f6a8cab6513b68fcbb48fba090fcb post_install() { vlicense LICENSE From bafb97788707a59d19aee2236f8f2991449d94ca Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 25 Mar 2022 15:18:57 -0400 Subject: [PATCH 0083/2369] python3-pytz: update to 2022.1. --- srcpkgs/python3-pytz/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pytz/template b/srcpkgs/python3-pytz/template index 7bddbf1ddfd..9f9136df52f 100644 --- a/srcpkgs/python3-pytz/template +++ b/srcpkgs/python3-pytz/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytz' pkgname=python3-pytz -version=2021.3 -revision=2 +version=2022.1 +revision=1 wrksrc="pytz-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="MIT" homepage="https://pythonhosted.org/pytz/" distfiles="${PYPI_SITE}/p/pytz/pytz-${version}.tar.gz" -checksum=acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326 +checksum=1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7 post_install() { # use system tz database From dccbf6ff3412e0c939e623d74fc0eb2844bea8a6 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 25 Mar 2022 15:19:10 -0400 Subject: [PATCH 0084/2369] python3-setuptools-rust: update to 1.2.0. --- srcpkgs/python3-setuptools-rust/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template index 9cd1c497793..c2a506773ca 100644 --- a/srcpkgs/python3-setuptools-rust/template +++ b/srcpkgs/python3-setuptools-rust/template @@ -1,19 +1,18 @@ # Template file for 'python3-setuptools-rust' pkgname=python3-setuptools-rust -version=1.1.2 +version=1.2.0 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module hostmakedepends="python3-setuptools_scm" -depends="python3-semanticversion python3-tomli - python3-setuptools python3-typing_extensions" +depends="python3-semanticversion python3-setuptools python3-typing_extensions" short_desc="Setuptools plugin for Rust support" maintainer="Andrew J. Hesford " license="MIT" homepage="https://github.com/PyO3/setuptools-rust" changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md" distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz" -checksum=a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1 +checksum=0a4ada479e8c7e3d8bd7cb56e1a29acc2b2bb98c2325051b0cdcb57d7f056de8 # Tests have unpackaged dependencies make_check=no From ddf9897e6f05d192ffbd03e535551f4207baa67b Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Fri, 25 Mar 2022 09:56:17 -0500 Subject: [PATCH 0085/2369] zfs: update to 2.1.4. --- srcpkgs/zfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template index 477c39614cd..6c7b69345fd 100644 --- a/srcpkgs/zfs/template +++ b/srcpkgs/zfs/template @@ -1,6 +1,6 @@ # Template file for 'zfs' pkgname=zfs -version=2.1.3 +version=2.1.4 revision=1 build_style=gnu-configure configure_args="--with-config=user --with-mounthelperdir=/usr/bin @@ -15,7 +15,7 @@ maintainer="Toyam Cox " license="CDDL-1.0" homepage="https://openzfs.github.io/openzfs-docs/" distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz" -checksum=b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd +checksum=3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6 # dkms must be before initramfs-regenerate to build modules before images triggers="dkms initramfs-regenerate" dkms_modules="zfs ${version}" From a7e21ebd992ab0626f3eb2f5433715cfe5e8f45f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 15:08:23 -0700 Subject: [PATCH 0086/2369] libhandy1: update to 1.6.1 --- srcpkgs/libhandy1/template | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template index 95803645bb7..fbbe35856b2 100644 --- a/srcpkgs/libhandy1/template +++ b/srcpkgs/libhandy1/template @@ -1,6 +1,6 @@ # Template file for 'libhandy1' pkgname=libhandy1 -version=1.5.0 +version=1.6.1 revision=1 wrksrc="libhandy-${version}" build_style=meson @@ -8,7 +8,7 @@ build_helper="gir" configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc gtk_doc) $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled) -Dintrospection=$(vopt_if gir enabled disabled)" -hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gir vala-devel)" +hostmakedepends="glib-devel pkg-config gettext $(vopt_if gtk_doc gi-docgen) $(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" @@ -17,15 +17,11 @@ license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/libhandy/" changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/NEWS" distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz" -checksum=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe +checksum=6eab0384404d56bd1b1fa059d9a081177778f6ae080ffc2120f28656ca7462a4 build_options="gir glade gtk_doc" desc_option_glade="Generate glade modules and catalog files" -build_options_default="gir glade" - -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gtk_doc" -fi +build_options_default="gir glade gtk_doc" do_check() { xvfb-run ninja -C build test @@ -47,7 +43,7 @@ libhandy1-devel_package() { vmove usr/share/vala fi if [ "$build_option_gtk_doc" ]; then - vmove usr/share/gtk-doc + vmove usr/share/doc fi } } From e3e68c4e8c0c25b56a53737dfcff50fef0495b7a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 23 Mar 2022 17:14:32 +0100 Subject: [PATCH 0087/2369] mutter: update to 41.5. --- srcpkgs/mutter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 5efabfea13b..e3f7f7bf1ca 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,6 @@ # Template file for 'mutter' pkgname=mutter -version=41.4 +version=41.5 revision=1 build_helper="gir" build_style=meson @@ -20,7 +20,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=55882695064aa6f0385cd1f7f7fab2c2a2ed2c9aec78f578faa07f5209ca529c +checksum=2233e52528451620be8578ea1dc7ff30d7eb6701eb316e9d17c219df57a08ea7 shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so libmutter-cogl-pango-9.so" make_check=no # needs a full graphical session From 7a108e4b126cc66f9b6290385dab261308102cb9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 23 Mar 2022 17:13:34 +0100 Subject: [PATCH 0088/2369] gnome-shell: update to 41.5. * restore optional build dependencies They were removed with GNOME 41, but are required for recorder and bluetooth indicator Closes #36291 --- srcpkgs/gnome-shell/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 9cca8add22c..ff60caafa4e 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=41.4 +version=41.5 revision=1 build_style=meson build_helper=gir @@ -10,7 +10,8 @@ hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc makedepends="gnome-control-center-devel at-spi2-atk-devel evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel - NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel" + NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel + gnome-bluetooth-devel pipewire-devel gstreamer1-devel" depends="elogind gnome-control-center gsettings-desktop-schemas upower" checkdepends="xvfb-run mesa-dri $depends" short_desc="GNOME core user interface" @@ -19,7 +20,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS" distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz" -checksum=c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4 +checksum=efbe8d1179983d5c2e68b1035f073fefe01b15fbdaf68f48adff96fa355b0bc5 do_check() { mkdir /tmp/gnome-shell-xdg From da33f8c519aa976f5db5a64591f16303c084f0f3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 18:17:29 +0100 Subject: [PATCH 0089/2369] gnome-nibbles: fix build with recent vala --- srcpkgs/gnome-nibbles/patches/vala.patch | 178 +++++++++++++++++++++++ 1 file changed, 178 insertions(+) create mode 100644 srcpkgs/gnome-nibbles/patches/vala.patch diff --git a/srcpkgs/gnome-nibbles/patches/vala.patch b/srcpkgs/gnome-nibbles/patches/vala.patch new file mode 100644 index 00000000000..48c56530319 --- /dev/null +++ b/srcpkgs/gnome-nibbles/patches/vala.patch @@ -0,0 +1,178 @@ +From 62964e9256fcac616109af874dbb2bd8342a9853 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Wed, 17 Mar 2021 11:25:05 +0100 +Subject: [PATCH] Reference of [GtkChild] fields is handled by GtkBuilder, type + must be unowned + +--- + src/controls.vala | 20 ++++++++++---------- + src/nibbles-window.vala | 26 +++++++++++++------------- + src/players.vala | 6 +++--- + src/preferences-dialog.vala | 30 +++++++++++++++--------------- + src/scoreboard.vala | 6 +++--- + 5 files changed, 44 insertions(+), 44 deletions(-) + +diff --git a/src/controls.vala b/src/controls.vala +index 584c9ff..f95d210 100644 +--- a/src/controls.vala ++++ b/src/controls.vala +@@ -22,7 +22,7 @@ using Gtk; + [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls.ui")] + private class Controls : Box + { +- [GtkChild] private Box grids_box; ++ [GtkChild] private unowned Box grids_box; + private Gee.LinkedList grids = new Gee.LinkedList (); + + private Gdk.Pixbuf arrow_pixbuf; +@@ -100,15 +100,15 @@ private class Controls : Box + [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls-grid.ui")] + private class ControlsGrid : Button + { +- [GtkChild] private Label name_label; +- [GtkChild] private Image arrow_up; +- [GtkChild] private Image arrow_down; +- [GtkChild] private Image arrow_left; +- [GtkChild] private Image arrow_right; +- [GtkChild] private Label move_up_label; +- [GtkChild] private Label move_down_label; +- [GtkChild] private Label move_left_label; +- [GtkChild] private Label move_right_label; ++ [GtkChild] private unowned Label name_label; ++ [GtkChild] private unowned Image arrow_up; ++ [GtkChild] private unowned Image arrow_down; ++ [GtkChild] private unowned Image arrow_left; ++ [GtkChild] private unowned Image arrow_right; ++ [GtkChild] private unowned Label move_up_label; ++ [GtkChild] private unowned Label move_down_label; ++ [GtkChild] private unowned Label move_left_label; ++ [GtkChild] private unowned Label move_right_label; + + internal WormProperties worm_props; + internal ulong external_handler; +diff --git a/src/nibbles-window.vala b/src/nibbles-window.vala +index 6961326..6bfb74a 100644 +--- a/src/nibbles-window.vala ++++ b/src/nibbles-window.vala +@@ -40,30 +40,30 @@ private class NibblesWindow : ApplicationWindow + private int window_height; + + /* Main widgets */ +- [GtkChild] private Stack main_stack; +- [GtkChild] private Overlay overlay; ++ [GtkChild] private unowned Stack main_stack; ++ [GtkChild] private unowned Overlay overlay; + + /* HeaderBar */ +- [GtkChild] private HeaderBar headerbar; +- [GtkChild] private MenuButton hamburger_menu; +- [GtkChild] private Button new_game_button; +- [GtkChild] private Button pause_button; ++ [GtkChild] private unowned HeaderBar headerbar; ++ [GtkChild] private unowned MenuButton hamburger_menu; ++ [GtkChild] private unowned Button new_game_button; ++ [GtkChild] private unowned Button pause_button; + + /* Pre-game screen widgets */ +- [GtkChild] private Players players; +- [GtkChild] private Speed speed; +- [GtkChild] private Controls controls; ++ [GtkChild] private unowned Players players; ++ [GtkChild] private unowned Speed speed; ++ [GtkChild] private unowned Controls controls; + + /* Statusbar widgets */ +- [GtkChild] private Stack statusbar_stack; +- [GtkChild] private Label countdown; +- [GtkChild] private Scoreboard scoreboard; ++ [GtkChild] private unowned Stack statusbar_stack; ++ [GtkChild] private unowned Label countdown; ++ [GtkChild] private unowned Scoreboard scoreboard; + private Gdk.Pixbuf scoreboard_life; + + /* Rendering of the game */ + private NibblesView? view; + +- [GtkChild] private Box game_box; ++ [GtkChild] private unowned Box game_box; + private Games.GridFrame frame; + + /* Game being played */ +diff --git a/src/players.vala b/src/players.vala +index 9198412..4bde18e 100644 +--- a/src/players.vala ++++ b/src/players.vala +@@ -21,9 +21,9 @@ using Gtk; + [GtkTemplate (ui = "/org/gnome/Nibbles/ui/players.ui")] + private class Players : Box + { +- [GtkChild] private ToggleButton worms4; +- [GtkChild] private ToggleButton worms5; +- [GtkChild] private ToggleButton worms6; ++ [GtkChild] private unowned ToggleButton worms4; ++ [GtkChild] private unowned ToggleButton worms5; ++ [GtkChild] private unowned ToggleButton worms6; + + private SimpleAction nibbles_number_action; + private SimpleAction players_number_action; +diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala +index 216a1e2..2d3a7bf 100644 +--- a/src/preferences-dialog.vala ++++ b/src/preferences-dialog.vala +@@ -24,21 +24,21 @@ private class PreferencesDialog : Window + private GLib.Settings settings; + private Gee.ArrayList worm_settings; + +- [GtkChild] private Stack stack; +- [GtkChild] private Stack headerbar_stack; +- [GtkChild] private ComboBoxText worm_combobox; +- [GtkChild] private Gtk.ListStore list_store_1; +- [GtkChild] private Gtk.ListStore list_store_2; +- [GtkChild] private Gtk.ListStore list_store_3; +- [GtkChild] private Gtk.ListStore list_store_4; +- [GtkChild] private TreeView tree_view_1; +- [GtkChild] private TreeView tree_view_2; +- [GtkChild] private TreeView tree_view_3; +- [GtkChild] private TreeView tree_view_4; +- [GtkChild] private ComboBoxText combo_box_1; +- [GtkChild] private ComboBoxText combo_box_2; +- [GtkChild] private ComboBoxText combo_box_3; +- [GtkChild] private ComboBoxText combo_box_4; ++ [GtkChild] private unowned Stack stack; ++ [GtkChild] private unowned Stack headerbar_stack; ++ [GtkChild] private unowned ComboBoxText worm_combobox; ++ [GtkChild] private unowned Gtk.ListStore list_store_1; ++ [GtkChild] private unowned Gtk.ListStore list_store_2; ++ [GtkChild] private unowned Gtk.ListStore list_store_3; ++ [GtkChild] private unowned Gtk.ListStore list_store_4; ++ [GtkChild] private unowned TreeView tree_view_1; ++ [GtkChild] private unowned TreeView tree_view_2; ++ [GtkChild] private unowned TreeView tree_view_3; ++ [GtkChild] private unowned TreeView tree_view_4; ++ [GtkChild] private unowned ComboBoxText combo_box_1; ++ [GtkChild] private unowned ComboBoxText combo_box_2; ++ [GtkChild] private unowned ComboBoxText combo_box_3; ++ [GtkChild] private unowned ComboBoxText combo_box_4; + + private Gee.ArrayList list_stores; + private Gee.ArrayList tree_views; +diff --git a/src/scoreboard.vala b/src/scoreboard.vala +index a41aee1..aebc1cc 100644 +--- a/src/scoreboard.vala ++++ b/src/scoreboard.vala +@@ -59,9 +59,9 @@ private class Scoreboard : Box + [GtkTemplate (ui = "/org/gnome/Nibbles/ui/player-score-box.ui")] + private class PlayerScoreBox : Box + { +- [GtkChild] private Label name_label; +- [GtkChild] private Label score_label; +- [GtkChild] private Grid lives_grid; ++ [GtkChild] private unowned Label name_label; ++ [GtkChild] private unowned Label score_label; ++ [GtkChild] private unowned Grid lives_grid; + + private Gee.LinkedList life_images = new Gee.LinkedList (); + +-- +GitLab + From d797c8b79dfca2a837a5cad07635b74780d2e016 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 25 Mar 2022 22:43:33 +0100 Subject: [PATCH 0090/2369] gnome-nibbles: fix build with recent vala (part2) --- srcpkgs/gnome-nibbles/patches/vala2.patch | 66 +++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 srcpkgs/gnome-nibbles/patches/vala2.patch diff --git a/srcpkgs/gnome-nibbles/patches/vala2.patch b/srcpkgs/gnome-nibbles/patches/vala2.patch new file mode 100644 index 00000000000..c7a86316925 --- /dev/null +++ b/srcpkgs/gnome-nibbles/patches/vala2.patch @@ -0,0 +1,66 @@ +From 1b48446068608aff9b5edf1fdbd4b8c0d9f0be94 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Sat, 16 Jan 2021 13:56:10 +0100 +Subject: [PATCH] Don't alter or try to write [GtkChild] fields + +See https://gitlab.gnome.org/GNOME/vala/issues/1121 +--- + src/controls.vala | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/src/controls.vala b/src/controls.vala +index 4f07358..584c9ff 100644 +--- a/src/controls.vala ++++ b/src/controls.vala +@@ -140,25 +140,25 @@ private class ControlsGrid : Button + arrow_left.set_from_pixbuf (arrow.rotate_simple (Gdk.PixbufRotation.COUNTERCLOCKWISE)); + arrow_right.set_from_pixbuf (arrow.rotate_simple (Gdk.PixbufRotation.CLOCKWISE)); + +- up_handler = worm_props.notify ["up"].connect (() => configure_label (worm_props.up, ref move_up_label)); +- down_handler = worm_props.notify ["down"].connect (() => configure_label (worm_props.down, ref move_down_label)); +- left_handler = worm_props.notify ["left"].connect (() => configure_label (worm_props.left, ref move_left_label)); +- right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, ref move_right_label)); +- +- configure_label (worm_props.up, ref move_up_label); +- configure_label (worm_props.down, ref move_down_label); +- configure_label (worm_props.left, ref move_left_label); +- configure_label (worm_props.right, ref move_right_label); ++ up_handler = worm_props.notify ["up"].connect (() => configure_label (worm_props.up, move_up_label)); ++ down_handler = worm_props.notify ["down"].connect (() => configure_label (worm_props.down, move_down_label)); ++ left_handler = worm_props.notify ["left"].connect (() => configure_label (worm_props.left, move_left_label)); ++ right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, move_right_label)); ++ ++ configure_label (worm_props.up, move_up_label); ++ configure_label (worm_props.down, move_down_label); ++ configure_label (worm_props.left, move_left_label); ++ configure_label (worm_props.right, move_right_label); + } + + internal void mark_duplicated_keys (GenericSet duplicate_keys) + { +- set_duplicate_class (worm_props.up in duplicate_keys, ref move_up_label); +- set_duplicate_class (worm_props.down in duplicate_keys, ref move_down_label); +- set_duplicate_class (worm_props.left in duplicate_keys, ref move_left_label); +- set_duplicate_class (worm_props.right in duplicate_keys, ref move_right_label); ++ set_duplicate_class (worm_props.up in duplicate_keys, move_up_label); ++ set_duplicate_class (worm_props.down in duplicate_keys, move_down_label); ++ set_duplicate_class (worm_props.left in duplicate_keys, move_left_label); ++ set_duplicate_class (worm_props.right in duplicate_keys, move_right_label); + } +- private static void set_duplicate_class (bool new_value, ref Label label) ++ private static void set_duplicate_class (bool new_value, Label label) + { + if (new_value) + label.get_style_context ().add_class ("duplicate"); +@@ -175,7 +175,7 @@ private class ControlsGrid : Button + worm_props.disconnect (color_handler); + } + +- private static void configure_label (uint key_value, ref Label label) ++ private static void configure_label (uint key_value, Label label) + { + string? key_name = Gdk.keyval_name (key_value); + if (key_name == "Up") +-- +GitLab + From b3bd7dfa284723ff9269e05886293db568579990 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 12:37:45 +0100 Subject: [PATCH 0091/2369] aisleriot: update to 3.22.21. --- srcpkgs/aisleriot/patches/guile-2.2.patch | 36 +++++++++++++++++++++++ srcpkgs/aisleriot/template | 4 +-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/aisleriot/patches/guile-2.2.patch diff --git a/srcpkgs/aisleriot/patches/guile-2.2.patch b/srcpkgs/aisleriot/patches/guile-2.2.patch new file mode 100644 index 00000000000..eb2ce5610b4 --- /dev/null +++ b/srcpkgs/aisleriot/patches/guile-2.2.patch @@ -0,0 +1,36 @@ +From 5e9b538db5304ccfed6c0d048a94d8c47dd27e31 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha +Date: Thu, 17 Feb 2022 23:51:15 +0100 +Subject: [PATCH] games: Only use -Ono-letrectify with guile 3.0 + +This fixes a build failure on guile 2.2 where this flag is unknown. + +Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/925 +--- + games/meson.build | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/games/meson.build b/games/meson.build +index e552beab..56819b4d 100644 +--- a/games/meson.build ++++ b/games/meson.build +@@ -122,9 +122,13 @@ guile_warnings = [ + '-W1', + ] + +-guile_flags = [ +- '-Ono-letrectify', +-] ++guile_flags = [] ++ ++if guile_version.version_compare('>= 3.0') ++ guile_flags += [ ++ '-Ono-letrectify', ++ ] ++endif + + # FIXME: this should use files('...') (allowed as per docs), + # but that crashes meson, see https://gitlab.gnome.org/chpe/meson/issues/2 +-- +GitLab + diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template index 6655dbb7660..d4d178b13c9 100644 --- a/srcpkgs/aisleriot/template +++ b/srcpkgs/aisleriot/template @@ -1,6 +1,6 @@ # Template file for 'aisleriot' pkgname=aisleriot -version=3.22.20 +version=3.22.21 revision=1 build_style=meson # build requires assertions to be turned on -> n_debug=false @@ -15,5 +15,5 @@ maintainer="Érico Nogueira " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Aisleriot" distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=e5f4d00156060a8ecf410ed5d4e485b0f19177c554009c2b0ea6ee6579af549a +checksum=fd7e7b58e1480dcc9d41b1ae8c9fcb1dd0e6c66eef0a5c1090784dddca9dd655 replaces="aisleriot-data>=0" From 5a2de660590526833c1a03f7ba6b52f9b90e0096 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 25 Mar 2022 11:15:28 -0400 Subject: [PATCH 0092/2369] dendrite: update to 0.7.0. add MAX_OPEN_FILES variable with default set to value recommended by upstream (65535). --- srcpkgs/dendrite/files/dendrite-monolith-server/run | 1 + srcpkgs/dendrite/template | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dendrite/files/dendrite-monolith-server/run b/srcpkgs/dendrite/files/dendrite-monolith-server/run index 2fab17797c4..66400fe89c5 100755 --- a/srcpkgs/dendrite/files/dendrite-monolith-server/run +++ b/srcpkgs/dendrite/files/dendrite-monolith-server/run @@ -1,5 +1,6 @@ #!/bin/sh [ -r ./conf ] && . ./conf +ulimit -n ${MAX_OPEN_FILES:-65535} cd /var/lib/dendrite || exit 1 exec 2>&1 exec chpst -u _dendrite:_dendrite dendrite-monolith-server \ diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template index 7589a7944ce..1bef12b9564 100644 --- a/srcpkgs/dendrite/template +++ b/srcpkgs/dendrite/template @@ -1,6 +1,6 @@ # Template file for 'dendrite' pkgname=dendrite -version=0.6.5 +version=0.7.0 revision=1 build_style=go go_import_path="github.com/matrix-org/dendrite" @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://matrix.org/docs/projects/server/dendrite" changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md" distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz" -checksum=b74170bd3f81e2f22ff4673bc632e37afeef1121fa90acb03ed2eed17a387133 +checksum=26c378bff1738b0e8422c7bd425be4763f22225f422ae1854c78644e4ca8bc42 system_accounts="_dendrite" _dendrite_homedir="/var/lib/dendrite" From d1cf0c79d0f8c3bc8223b58a4de2da9cfdbb8ffa Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Fri, 25 Mar 2022 21:19:05 +0100 Subject: [PATCH 0093/2369] google-chrome: update to 99.0.4844.84 --- 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 e12c57deeb5..e6a568ca685 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.82 +version=99.0.4844.84 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=b9c181ddc15760795a7c30b950d90a8ef78487825fb12b1e171d1f71fe8a107e +checksum=96f260f798f1adb471a3a5b8e68702ef88237884e32f0e43baf15a78aed5b669 do_extract() { mkdir -p ${DESTDIR} From 0ce7bd6b4dbaf9269c117636046c7b15a1cce1ec Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Tue, 22 Mar 2022 12:25:49 +0100 Subject: [PATCH 0094/2369] volta: update to 1.0.6 --- srcpkgs/volta/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template index b8fc160cdda..7874993281e 100644 --- a/srcpkgs/volta/template +++ b/srcpkgs/volta/template @@ -1,6 +1,6 @@ # Template file for 'volta' pkgname=volta -version=1.0.5 +version=1.0.6 revision=1 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil. build_style="cargo" @@ -11,7 +11,7 @@ maintainer="Alex Lohr " license="BSD-2-Clause" homepage="https://volta.sh/" distfiles="https://github.com/volta-cli/volta/archive/v${version}.tar.gz" -checksum=8b3741376e639d0e2d2eec7a7b628ac1d70af7a2c459d9b01c05c4853f5680ae +checksum=0f66edcb2639bee2c1668efd119c2937a77fbbe564c9d63827e8eaf37dbee4b9 post_install() { vlicense LICENSE From 4af58a22bfad1633f8c6390546378acefe6a337b Mon Sep 17 00:00:00 2001 From: shtayerc Date: Mon, 21 Feb 2022 17:57:14 +0100 Subject: [PATCH 0095/2369] aerc: update to 0.9.0 --- .../aerc/patches/makefile-only-install.patch | 18 +++++++++++++++ srcpkgs/aerc/template | 22 ++++++------------- 2 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 srcpkgs/aerc/patches/makefile-only-install.patch diff --git a/srcpkgs/aerc/patches/makefile-only-install.patch b/srcpkgs/aerc/patches/makefile-only-install.patch new file mode 100644 index 00000000000..696832fe736 --- /dev/null +++ b/srcpkgs/aerc/patches/makefile-only-install.patch @@ -0,0 +1,18 @@ +Build style handles building and installing aerc binary. +Makefile should only install remaining files. + +--- ./Makefile ++++ ./Makefile +@@ -82,11 +82,10 @@ + clean: + $(RM) $(DOCS) aerc + +-install: $(DOCS) aerc ++install: $(DOCS) + mkdir -m755 -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man7 \ + $(DESTDIR)$(SHAREDIR) $(DESTDIR)$(SHAREDIR)/filters $(DESTDIR)$(SHAREDIR)/templates $(DESTDIR)$(SHAREDIR)/stylesets \ + $(DESTDIR)$(PREFIX)/share/applications +- install -m755 aerc $(DESTDIR)$(BINDIR)/aerc + install -m644 aerc.1 $(DESTDIR)$(MANDIR)/man1/aerc.1 + install -m644 aerc-search.1 $(DESTDIR)$(MANDIR)/man1/aerc-search.1 + install -m644 aerc-config.5 $(DESTDIR)$(MANDIR)/man5/aerc-config.5 diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template index 2ff3b10c48c..30a43148402 100644 --- a/srcpkgs/aerc/template +++ b/srcpkgs/aerc/template @@ -1,29 +1,21 @@ # Template file for 'aerc' pkgname=aerc -version=0.7.1 +version=0.9.0 revision=1 build_style=go -hostmakedepends="scdoc git" +go_import_path="git.sr.ht/~rjarry/aerc" +go_build_tags=notmuch +go_ldflags="-X main.Version=${version}" +hostmakedepends="scdoc" makedepends="libnotmuch-devel" short_desc="Terminal email client" maintainer="shtayerc " license="MIT" homepage="https://aerc-mail.org" distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz" -checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc - -do_configure() { - : -} - -do_build() { - make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch -} - -do_install() { - make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install -} +checksum=b5901feb37a55edd1f713e76c1012ac3fc0757202ddacd7d388cc7ce60638023 post_install() { + make PREFIX=/usr DESTDIR=${DESTDIR} install vlicense LICENSE } From 82e70e2eda73292b5dd1ccf67b53ff34419b8371 Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Fri, 25 Mar 2022 10:33:02 -0400 Subject: [PATCH 0096/2369] pipewire: update to 0.3.48. --- srcpkgs/pipewire/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 0924ae71ba1..5ed1ee1d3bd 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,6 +1,6 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.3.47 +version=0.3.48 revision=1 _pms_version=0.4.1 build_style=meson @@ -32,7 +32,7 @@ homepage="https://pipewire.org/" changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz" -checksum="8d70170a91ecba73746c1d83f95d54eee8ca71d0c3521926f05ed830d8b5a84e +checksum="0d218be86b3d2b548c06259c47ad8d110ee1c09f071e17c4393eeef5c880fa6f 119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975" make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire" system_accounts="_pipewire" From 680a65eafa923e7a85250a10c531732b9b81354c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 24 Mar 2022 17:16:45 +0100 Subject: [PATCH 0097/2369] retroarch: update to 1.10.2. --- srcpkgs/retroarch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index ed8e9da4394..6b89a54d89a 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -1,6 +1,6 @@ # Template file for 'retroarch' pkgname=retroarch -version=1.10.0 +version=1.10.2 revision=1 wrksrc="RetroArch-$version" build_style=configure @@ -25,7 +25,7 @@ license="GPL-3.0-or-later" homepage="https://www.retroarch.com/" changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md" distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz" -checksum=ff9c31abae19528275e40fbe49ef40be9410b4108513ae7dbf325e210e5b5bec +checksum=e426b8d30c25806e54c61f21d0d742695fa4f6bc6a271def4459db5460d28e8e build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11" build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11" From 8fe5ea08a380c6aa18e5e7cf0314339009ce5030 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 17 Mar 2022 08:55:25 -0400 Subject: [PATCH 0098/2369] python3-phonenumbers: update to 8.12.45. --- srcpkgs/python3-phonenumbers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template index 9cb6d6a351f..c4dd9b71d03 100644 --- a/srcpkgs/python3-phonenumbers/template +++ b/srcpkgs/python3-phonenumbers/template @@ -1,6 +1,6 @@ # Template file for 'python3-phonenumbers' pkgname=python3-phonenumbers -version=8.12.44 +version=8.12.45 revision=1 wrksrc="phonenumbers-${version}" build_style=python3-module @@ -12,4 +12,4 @@ license="Apache-2.0" homepage="https://github.com/daviddrysdale/python-phonenumbers" changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md" distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz" -checksum=26cfd0257d1704fe2f88caff2caabb70d16a877b1e65b6aae51f9fbbe10aa8ce +checksum=94e30f59b2be6c4310a90f3d5da53d49900bdb440484506f3333c694ebb0cdab From cb5327296b727cb48578a12981aa69a5880a19d5 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 17 Mar 2022 08:53:53 -0400 Subject: [PATCH 0099/2369] synapse: update to 1.55.2. --- srcpkgs/synapse/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index f28f1313dcd..1c07111f424 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,6 +1,6 @@ # Template file for 'synapse' pkgname=synapse -version=1.54.0 +version=1.55.2 revision=1 build_style=python3-module make_check_target=tests @@ -21,7 +21,7 @@ license="Apache-2.0" homepage="https://github.com/matrix-org/synapse" changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md" distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz" -checksum=6e9ee5f0657fe01c5d141101b11c2c2da147003f7f8e684ef44d4f462125b7a1 +checksum=8e06cb264d1631d2518f2f726c89d62c5ed7148b73fbb8190a9c120d3166e7c4 system_accounts="synapse" synapse_homedir="/var/lib/synapse" From ef7fe3ed1ab70c3bcf348543dde052fd00101329 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Sun, 6 Feb 2022 18:45:45 -0500 Subject: [PATCH 0100/2369] New package: conduit-0.3.0 --- srcpkgs/conduit/files/conduit/log/run | 1 + srcpkgs/conduit/files/conduit/run | 6 ++++++ srcpkgs/conduit/template | 29 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 120000 srcpkgs/conduit/files/conduit/log/run create mode 100644 srcpkgs/conduit/files/conduit/run create mode 100644 srcpkgs/conduit/template diff --git a/srcpkgs/conduit/files/conduit/log/run b/srcpkgs/conduit/files/conduit/log/run new file mode 120000 index 00000000000..3a5b4a58605 --- /dev/null +++ b/srcpkgs/conduit/files/conduit/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/conduit/files/conduit/run b/srcpkgs/conduit/files/conduit/run new file mode 100644 index 00000000000..a3a42e32362 --- /dev/null +++ b/srcpkgs/conduit/files/conduit/run @@ -0,0 +1,6 @@ +#!/bin/sh +[ -r ./conf ] && . ./conf +ulimit -n ${MAX_OPEN_FILES:-8192} +export CONDUIT_CONFIG=${CONDUIT_CONFIG:-/etc/conduit/conduit.toml} + +exec chpst -u _conduit:_conduit conduit diff --git a/srcpkgs/conduit/template b/srcpkgs/conduit/template new file mode 100644 index 00000000000..c2e423e7989 --- /dev/null +++ b/srcpkgs/conduit/template @@ -0,0 +1,29 @@ +# Template file for 'conduit' +pkgname=conduit +version=0.3.0 +revision=1 +wrksrc="conduit-v${version}" +build_style=cargo +hostmakedepends="clang" +short_desc="Simple, fast and reliable chat server powered by Matrix" +maintainer="Joel Beckmeyer " +license="Apache-2.0" +homepage="https://conduit.rs/" +distfiles="https://gitlab.com/famedly/conduit/-/archive/v${version}/conduit-v${version}.tar.gz" +checksum=9e750ed2b8d0e986b1cdc02278124b39c11fa785f2763914836978a5a79863e3 + +system_accounts="_conduit" +_conduit_homedir="/var/lib/conduit" + +make_dirs="/var/lib/conduit 0700 _conduit _conduit + /etc/conduit 755 _conduit _conduit" + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + XBPS_CROSS_RUSTFLAGS+=" -latomic" +fi + +post_install() { + vsconf conduit-example.toml conduit.toml + vsv conduit +} From ed5c91b450f03b2ccff99dc142f26efffa1a1482 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 12:35:01 +0100 Subject: [PATCH 0101/2369] Venom: remove package * not maintained, doesn't build with recent vala versions --- srcpkgs/Venom/template | 16 ---------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 srcpkgs/Venom/template diff --git a/srcpkgs/Venom/template b/srcpkgs/Venom/template deleted file mode 100644 index deb714982db..00000000000 --- a/srcpkgs/Venom/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'Venom' -pkgname=Venom -version=0.5.5 -revision=1 -build_style=meson -hostmakedepends="vala pkg-config glib-devel" -makedepends="gtk+3-devel libgee08-devel gspell-devel - libcanberra-devel sqlcipher-devel json-glib-devel - libsoup-devel toxcore-devel libsodium-devel - opus-devel libvpx-devel gstreamer1-devel" -short_desc="Modern Tox client for the desktop" -maintainer="Nathan Owens " -license="GPL-3.0-or-later" -homepage="https://github.com/naxuroqa/Venom/" -distfiles="https://github.com/naxuroqa/Venom/archive/${version}.tar.gz" -checksum=0348e26d70b0614b6ee3d50fb6c086ae1f696ed250d8ea80eec28299bee23562 diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 30fa0d2cce3..5003333859c 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -12,6 +12,7 @@ replaces=" ImageMagick6<=6.9.12.12_2 MoinMoin<=1.9.11_1 Platinum9-theme<=0.0.0.20170720_3 + Venom<=0.5.5_1 XorCurses<=0.2.2_1 acme-client<=0.1.16_5 albert<=0.16.1_4 From 8eee5cb2040883a6e5ec8c73713803ba161aab9a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:09:02 +0100 Subject: [PATCH 0102/2369] granite: update to 6.2.0. --- common/shlibs | 2 +- srcpkgs/granite/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 2d8a8b8b0df..dd26ddee444 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1190,7 +1190,7 @@ libconfig.so.11 libconfig-1.7.1_1 libopusfile.so.0 opusfile-0.12_2 libopusurl.so.0 opusfile-0.12_2 libopusenc.so.0 libopusenc-0.2_1 -libgranite.so.5 granite-0.5.0_1 +libgranite.so.6 granite-6.2.0_1 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1 librlog.so.5 librlog-1.4_1 libtinyxml.so.0 tinyxml-2.6.2_1 diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template index 2ae77d6ee66..f3a53c4165b 100644 --- a/srcpkgs/granite/template +++ b/srcpkgs/granite/template @@ -1,10 +1,10 @@ # Template file for 'granite' pkgname=granite -version=5.5.0 +version=6.2.0 revision=1 build_style=meson build_helper="gir" -hostmakedepends="pkg-config vala" +hostmakedepends="pkg-config gettext vala" makedepends="gtk+3-devel libgee08-devel" depends="hicolor-icon-theme" short_desc="GTK3 widget library for elementary OS" @@ -12,7 +12,7 @@ maintainer="Cameron Nemo " license="LGPL-3.0-or-later" homepage="https://github.com/elementary/granite" distfiles="https://github.com/elementary/granite/archive/${version}.tar.gz" -checksum=0c376520c7d462fca05213a14970ee1075fea4a78062a33b47529e2647cd5557 +checksum=067d31445da9808a802fca523630c3e4b84d2d7c78ae547ced017cb7f3b9c6b5 granite-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From c685323e1105be4bceb4ce2851a1713f2b7950eb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:02 +0100 Subject: [PATCH 0103/2369] Minder: revbump for granite 6, build translations --- srcpkgs/Minder/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template index da4f9b751c2..8ee716a6f9f 100644 --- a/srcpkgs/Minder/template +++ b/srcpkgs/Minder/template @@ -1,9 +1,9 @@ # Template file for 'Minder' pkgname=Minder version=1.14.0 -revision=1 +revision=2 build_style=meson -hostmakedepends="pkg-config glib-devel vala" +hostmakedepends="pkg-config gettext glib-devel vala" makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel json-glib-devel" short_desc="Mind-mapping application designed for Pantheon" From d2fbbeb07af6c5e16ddfdfe6c379a851c5b27450 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:02 +0100 Subject: [PATCH 0104/2369] bookworm: revbump for granite 6, build translations --- srcpkgs/bookworm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template index 3e319fb786d..0205a6e6242 100644 --- a/srcpkgs/bookworm/template +++ b/srcpkgs/bookworm/template @@ -1,9 +1,9 @@ # Template file for 'bookworm' pkgname=bookworm version=1.1.2 -revision=4 +revision=5 build_style=meson -hostmakedepends="pkg-config glib-devel vala" +hostmakedepends="pkg-config glib-devel gettext vala" makedepends="gtk+3-devel libgee08-devel granite-devel webkit2gtk-devel sqlite-devel poppler-glib-devel libxml2-devel glib-devel libsoup-devel" From f117a0509f3f84b7c07afba6fd1b5ac15c9f0c36 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:04 +0100 Subject: [PATCH 0105/2369] notes-up: update to 2.0.6. --- srcpkgs/notes-up/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template index 481a214cfbc..55db14d47b3 100644 --- a/srcpkgs/notes-up/template +++ b/srcpkgs/notes-up/template @@ -1,6 +1,6 @@ # Template file for 'notes-up' pkgname=notes-up -version=2.0.5 +version=2.0.6 revision=1 wrksrc=Notes-up-${version} build_style=meson @@ -13,7 +13,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, BSD-3-Clause" homepage="https://github.com/Philip-Scott/Notes-up" distfiles="https://github.com/Philip-Scott/Notes-up/archive/${version}.tar.gz" -checksum=56ddf5ab3468c3bbb806106c41b485b020ade3c7f48d271bda1e78ddce5e1664 +checksum=6e7b6ac4a3a917867a1555db0a6e03e40ccd9955b5d76e980a26fa8e40744f07 post_install() { ln -s com.github.philip_scott.notes-up ${DESTDIR}/usr/bin/notes-up From ebaa03749c28ce8fd6b23f3dddf4144d14d1a9da Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:04 +0100 Subject: [PATCH 0106/2369] nutty: revbump for granite 6, build translations --- srcpkgs/nutty/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template index 37396577835..eb263a89af4 100644 --- a/srcpkgs/nutty/template +++ b/srcpkgs/nutty/template @@ -1,18 +1,18 @@ # Template file for 'nutty' pkgname=nutty version=1.1.1 -revision=1 +revision=2 build_style=meson -hostmakedepends="pkg-config vala glib-devel" +hostmakedepends="pkg-config gettext vala glib-devel" makedepends="gtk+3-devel libgee08-devel libnotify-devel granite-devel sqlite-devel" short_desc="Network Utility" maintainer="linarcx " license="GPL-3.0-or-later" homepage="https://github.com/babluboy/nutty" -distfiles="${homepage}/archive/${version}.tar.gz" +distfiles="https://github.com/babluboy/nutty/archive/${version}.tar.gz" checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba -python_version=2 #unverified +python_version=2 post_install() { vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications From f4ac6e7edc96b20f5ac7f5a4d9555e30f453488b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:04 +0100 Subject: [PATCH 0107/2369] pantheon-agent-polkit: revbump for granite 6 --- srcpkgs/pantheon-agent-polkit/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/pantheon-agent-polkit/template b/srcpkgs/pantheon-agent-polkit/template index c2ae95b313e..4285532c67b 100644 --- a/srcpkgs/pantheon-agent-polkit/template +++ b/srcpkgs/pantheon-agent-polkit/template @@ -1,13 +1,13 @@ # Template file for 'pantheon-agent-polkit' pkgname=pantheon-agent-polkit version=1.0.0 -revision=1 +revision=2 build_style=meson -hostmakedepends="intltool pkg-config vala gobject-introspection" +hostmakedepends="gettext pkg-config vala gobject-introspection" makedepends="gtk+3-devel polkit-devel granite-devel" short_desc="Pantheon Polkit Agent" maintainer="Orphaned " license="LGPL-3.0-or-later" -homepage="https://github.com/elementary/${pkgname}" -distfiles="${homepage}/archive/${version}.tar.gz" +homepage="https://github.com/elementary/pantheon-agent-polkit" +distfiles="https://github.com/elementary/pantheon-agent-polkit/archive/${version}.tar.gz" checksum=8e730f335545a4ca2717e1c9ccad61c329c1f19ea51f76ae4783da9e0416d484 From df2c04b002f578011b09ab54a979890052896350 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:05 +0100 Subject: [PATCH 0108/2369] pantheon-screenshot: update to 6.0.2. --- srcpkgs/pantheon-screenshot/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/pantheon-screenshot/template b/srcpkgs/pantheon-screenshot/template index 3492b0c0d49..fb2ee8e7b09 100644 --- a/srcpkgs/pantheon-screenshot/template +++ b/srcpkgs/pantheon-screenshot/template @@ -1,18 +1,18 @@ # Template file for 'pantheon-screenshot' pkgname=pantheon-screenshot -version=1.7.1 +version=6.0.2 revision=1 wrksrc="screenshot-${version}" build_style=meson -hostmakedepends="desktop-file-utils glib-devel intltool pkgconf vala" -makedepends="granite-devel libcanberra-devel" -depends="desktop-file-utils gdk-pixbuf gtk+3 hicolor-icon-theme" +hostmakedepends="desktop-file-utils glib-devel gettext pkg-config vala" +makedepends="granite-devel libcanberra-devel libhandy1-devel" +depends="desktop-file-utils gdk-pixbuf hicolor-icon-theme" short_desc="Screenshot tool" maintainer="Orphaned " license="LGPL-3.0-only" homepage="https://github.com/elementary/screenshot-tool" distfiles="https://github.com/elementary/screenshot-tool/archive/${version}.tar.gz" -checksum=2789abf01b9b41ae62e39eea4d5765dd606898435e1723939a06301922c431e2 +checksum=af1d67b196a22af529190f593183ff2eebad51a1329be7279cddb7dc0ce406f4 post_install() { ln -s io.elementary.screenshot-tool "$DESTDIR"/usr/bin/"$pkgname" From 7e71d33f89c6e235c068125e286faa5555191c71 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:05 +0100 Subject: [PATCH 0109/2369] planner: update to 3.0.6. --- srcpkgs/planner/template | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template index 7be79ab4c6b..b55a40f9306 100644 --- a/srcpkgs/planner/template +++ b/srcpkgs/planner/template @@ -1,32 +1,19 @@ # Template file for 'planner' pkgname=planner -version=2.7 +version=3.0.6 revision=1 build_style=meson build_helper="gir" hostmakedepends="gettext pkg-config vala glib-devel curl" -makedepends="evolution-data-server-devel libgee08-devel granite-devel - webkit2gtk-devel libsoup-devel libpeas-devel libhandy1-devel" +makedepends="libgee08-devel granite-devel webkit2gtk-devel libsoup-devel + libhandy1-devel json-glib-devel" depends="io.elementary.icons io.elementary.stylesheet curl" short_desc="Task manager with Todoist support designed for GNU/Linux" maintainer="linarcx " license="GPL-3.0-or-later" homepage="https://github.com/alainm23/planner" distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz" -checksum=cd34953867a91b2992aa4eafddc5093a695d1e6096571ade75640dddcc425d69 - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" evolution-data-server-devel" -fi -pre_configure() { - if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - # In musl libc there is no _NL_TIME_FIRST_WEEKDAY in langinfo.h - # thus replace Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0]; - # with 0; (sunday) - vsed -i src/Services/Calendar/CalendarModel.vala \ - -e "s#\(int week_start =\) Posix.*#\1 0;#" - fi -} +checksum=345a9ad2220820f08f583321e874528eee9f7e009236127efacee72d071c7ea5 post_install() { vinstall data/com.github.alainm23.planner.desktop.in 644 \ From a560de0adb129b8bd8048f4d2f79c6e3675fa865 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:05 +0100 Subject: [PATCH 0110/2369] quickDocs: revbump for granite 6 --- srcpkgs/quickDocs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template index 940ad376d9c..c4a22e6bbe7 100644 --- a/srcpkgs/quickDocs/template +++ b/srcpkgs/quickDocs/template @@ -1,7 +1,7 @@ # Template file for 'quickDocs' pkgname=quickDocs version=2.2.6 -revision=1 +revision=2 build_style=meson hostmakedepends="vala pkg-config" makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel" From 946da220356428b036b1ba14b2fe231edd87db59 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:05 +0100 Subject: [PATCH 0111/2369] sequeler: revbump for granite 6 --- srcpkgs/sequeler/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template index a36107372bd..32f127dc5c6 100644 --- a/srcpkgs/sequeler/template +++ b/srcpkgs/sequeler/template @@ -1,7 +1,7 @@ # Template file for 'sequeler' pkgname=sequeler version=0.8.2 -revision=1 +revision=2 build_style=meson hostmakedepends="gettext pkg-config glib-devel vala" makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel From 27d3c964256b82f88117eeab50f8e617767f4a45 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:05 +0100 Subject: [PATCH 0112/2369] switchboard: update to 6.0.0. --- srcpkgs/switchboard/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template index ebb706e5d9e..9397fea8cde 100644 --- a/srcpkgs/switchboard/template +++ b/srcpkgs/switchboard/template @@ -1,16 +1,16 @@ # Template file for 'switchboard' pkgname=switchboard -version=2.3.7 -revision=2 +version=6.0.0 +revision=1 build_style=meson hostmakedepends="pkg-config vala gettext" -makedepends="granite-devel clutter-gtk-devel gtk+3-devel" +makedepends="granite-devel gtk+3-devel libhandy1-devel" short_desc="Extensible System Settings app designed for elementary OS" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://github.com/elementary/switchboard" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=373db840b254897b2a59f6f421508f8f1361adc5d4d35b7963ba024e5c8234c9 +distfiles="https://github.com/elementary/switchboard/archive/${version}.tar.gz" +checksum=40c2fd17535cba239b7c78b62d93a3f5ef7e990b31a7c4ecf04cba0c2b60d792 switchboard-devel_package() { short_desc+=" - development files" From d83eb56f5457b7da834c4cbddaf8b23e23a40c59 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:06 +0100 Subject: [PATCH 0113/2369] switchboard-plug-bluetooth: update to 2.3.6. --- srcpkgs/switchboard-plug-bluetooth/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/switchboard-plug-bluetooth/template b/srcpkgs/switchboard-plug-bluetooth/template index 37336891815..b1b6977a526 100644 --- a/srcpkgs/switchboard-plug-bluetooth/template +++ b/srcpkgs/switchboard-plug-bluetooth/template @@ -1,13 +1,13 @@ # Template file for 'switchboard-plug-bluetooth' pkgname=switchboard-plug-bluetooth -version=2.3.0 +version=2.3.6 revision=1 build_style=meson -hostmakedepends="pkg-config vala" +hostmakedepends="pkg-config vala gettext" makedepends="switchboard-devel granite-devel gtk+3-devel" short_desc="Switchboard Bluetooth Plug" maintainer="Cameron Nemo " license="GPL-3.0-or-later" -homepage="https://github.com/elementary/${pkgname}" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=ffeb4cdb53696b241e203f4e0920bb90c05fd77b99a05bd9483cb4c8367f1000 +homepage="https://github.com/elementary/switchboard-plug-bluetooth" +distfiles="https://github.com/elementary/switchboard-plug-bluetooth/archive/${version}.tar.gz" +checksum=fec5d135dc17c3ab1396cbe78f255e767f1834dfc4db8ec30579ff0ef29836b9 From b44175f866b13f70fcb8163d587a4ef1289f1054 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:06 +0100 Subject: [PATCH 0114/2369] switchboard-plug-network: update to 2.4.2. * build translations * enable cross builds --- srcpkgs/switchboard-plug-network/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template index 31f640cf25d..382aea7559a 100644 --- a/srcpkgs/switchboard-plug-network/template +++ b/srcpkgs/switchboard-plug-network/template @@ -1,15 +1,14 @@ # Template file for 'switchboard-plug-network' pkgname=switchboard-plug-network -version=2.3.3 +version=2.4.2 revision=1 build_style=meson -hostmakedepends="pkg-config vala" +hostmakedepends="pkg-config vala gettext" makedepends="switchboard-devel granite-devel gtk+3-devel libnma-devel NetworkManager-devel" short_desc="Switchboard Network Plug" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/elementary/switchboard-plug-network" -distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz" -checksum=a2f29b3054c187f2be9688bb04b6800cf4c2d3dd74cdd4fa37626f0b2ac5df50 -nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363" +distfiles="https://github.com/elementary/switchboard-plug-network/archive/${version}.tar.gz" +checksum=190b1f9123bc9ee4120a624ad3de91c0e40a141cb19b8eb7ec74d3c39f008971 From 42d9e2874e3ed2e2ef7074dd8a3a5222338f46da Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:06 +0100 Subject: [PATCH 0115/2369] switchboard-plug-printers: update to 2.1.10. --- .../patches/fix-signal_subscribe.patch | 11 --------- .../patches/ftbfs.patch | 23 ------------------- srcpkgs/switchboard-plug-printers/template | 10 ++++---- 3 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch delete mode 100644 srcpkgs/switchboard-plug-printers/patches/ftbfs.patch diff --git a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch deleted file mode 100644 index 48eb8948a64..00000000000 --- a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/CUPSNotifier.vala 2018-11-28 12:34:33.000000000 +0100 -+++ b/src/CUPSNotifier.vala 2021-01-29 19:26:11.191992396 +0100 -@@ -63,7 +63,7 @@ - Bus.get_proxy.begin (BusType.SYSTEM, "org.cups.cupsd.Notifier", "/org/cups/cupsd/Notifier", GLib.DBusProxyFlags.NONE, null, (obj, res) => { - try { - dbus_notifier = Bus.get_proxy.end (res); -- ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, subscription_callback); -+ ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, (GLib.DBusSignalCallback)subscription_callback); - } catch (IOError e) { - critical (e.message); - } diff --git a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch b/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch deleted file mode 100644 index e8e21e2c484..00000000000 --- a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3175c2ebf106145a95355d2571e0a2aa4834e884 Mon Sep 17 00:00:00 2001 -From: Enerccio -Date: Tue, 17 Sep 2019 15:31:37 +0200 -Subject: [PATCH] Update cups.vapi (#118) - -Fixed bug with compilation ---- - vapi/cups.vapi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vapi/cups.vapi b/vapi/cups.vapi -index 7f1b795..5dcdba6 100644 ---- a/vapi/cups.vapi -+++ b/vapi/cups.vapi -@@ -605,7 +605,7 @@ namespace CUPS { - [CCode (cname = "ippAddBooleans")] - private unowned Attribute _add_booleans (Tag group, string name, [CCode (array_length_pos = 0.9)] char[] values); - public unowned Attribute add_booleans (Tag group, string name, bool[] values) { -- char[] char_values; -+ char[] char_values = {}; - foreach (var val in values) { - char_values += val ? 1 : 0; - } diff --git a/srcpkgs/switchboard-plug-printers/template b/srcpkgs/switchboard-plug-printers/template index caecd10c886..05f3c86abd7 100644 --- a/srcpkgs/switchboard-plug-printers/template +++ b/srcpkgs/switchboard-plug-printers/template @@ -1,14 +1,14 @@ # Template file for 'switchboard-plug-printers' pkgname=switchboard-plug-printers -version=2.1.6 +version=2.1.10 revision=1 build_style=meson -hostmakedepends="pkg-config vala intltool" +hostmakedepends="pkg-config vala gettext" makedepends="switchboard-devel granite-devel gtk+3-devel cups-devel" depends="cups-pk-helper" short_desc="Switchboard Printers Plug" maintainer="Orphaned " license="GPL-3.0-or-later" -homepage="https://github.com/elementary/${pkgname}" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=fe2c748e3737c3304ea8613d43d5ba8596f95499a65b8d13f93c4f702901f442 +homepage="https://github.com/elementary/switchboard-plug-printers" +distfiles="https://github.com/elementary/switchboard-plug-printers/archive/${version}.tar.gz" +checksum=448f6ae28fc4dacc2c329532e21aacc4ec7aa4af7d93bd6d7013002253faef3d From 0ed5f263035e54d814f65e3fa89fabad60b97010 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 21:59:08 +0100 Subject: [PATCH 0116/2369] io.elementary.calculator: update to 1.7.2. --- srcpkgs/io.elementary.calculator/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template index 56abf698403..35a363c7ae9 100644 --- a/srcpkgs/io.elementary.calculator/template +++ b/srcpkgs/io.elementary.calculator/template @@ -1,17 +1,17 @@ # Template file for 'io.elementary.calculator' pkgname=io.elementary.calculator -version=1.6.0 -revision=2 +version=1.7.2 +revision=1 wrksrc="calculator-${version}" build_style=meson -hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream" -makedepends="granite-devel gtk+3-devel" +hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream" +makedepends="granite-devel gtk+3-devel libhandy1-devel" short_desc="Calculator app designed for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-only" homepage="https://github.com/elementary/calculator" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=c650d5ff7d2df2d122ade0cbd35be50927f22b0d260f28e374b1112114f24540 +checksum=d296d06b36a0c7dd84e7e91e9801989e83312612d6ee6f0479030c1b340d397b pantheon-calculator_package() { depends="io.elementary.calculator>=${version}_${revision}" From 578d602535eaada891d194ea8e288d0a95d5cba6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:06 +0100 Subject: [PATCH 0117/2369] io.elementary.calendar: update to 6.1.0. --- .../patches/00-musl.patch | 69 ++++++++++--------- .../01-fix-build-without-locale-command.patch | 32 +++++++++ srcpkgs/io.elementary.calendar/template | 18 ++--- 3 files changed, 78 insertions(+), 41 deletions(-) create mode 100644 srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch index f85beca403f..9b50a7e6e25 100644 --- a/srcpkgs/io.elementary.calendar/patches/00-musl.patch +++ b/srcpkgs/io.elementary.calendar/patches/00-musl.patch @@ -1,44 +1,49 @@ -commit c9ba80af072819261a9e24a04a0859b93b5db810 -Author: Cameron Nemo -Date: Thu Oct 18 11:33:15 2018 -0700 - - Check for _NL_TIME_FIRST_WEEKDAY declaration - -diff --git core/Model/CalendarModel.vala core/Model/CalendarModel.vala -index 3e3b8cbd..b33f75f8 100644 ---- a/core/Model/CalendarModel.vala -+++ b/core/Model/CalendarModel.vala -@@ -68,7 +68,11 @@ public class Maya.Model.CalendarModel : Object { - } - - private CalendarModel () { -+#if HAVE_NL_TIME_FIRST_WEEKDAY - int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0]; -+#else -+ int week_start = 0; -+#endif - if (week_start >= 1 && week_start <= 7) { - week_starts_on = (Maya.Settings.Weekday)week_start-1; +--- a/core/Services/Calendar/EventStore.vala ++++ b/core/Services/Calendar/EventStore.vala +@@ -304,6 +304,7 @@ public class Calendar.EventStore : Object { + // number we want, so we convert the pointer address to a uint to get + // the data. Since the pointer address is actually data, using it as a + // pointer will segfault. ++#if HAVE_NL_TIME_WEEK_1STDAY + uint week_day1 = (uint) Posix.NLTime.WEEK_1STDAY.to_string (); + var week_1stday = 0; // Default to 0 if unrecognized data + if (week_day1 == 19971130) { // Sunday +@@ -313,6 +314,9 @@ public class Calendar.EventStore : Object { + } else { + warning ("Unknown value of _NL_TIME_WEEK_1STDAY: %u", week_day1); } -diff --git meson.build meson.build -index a0cd2dd7..02b4e1d1 100644 ++#else ++ var week_1stday = 0; ++#endif + /* The offset between GLib and local POSIX numbering. + * If week_1stday is Monday, data is correct for GLib: Monday=1 through Sunday=7, + * so offset is 0. +@@ -323,7 +327,11 @@ public class Calendar.EventStore : Object { + // Get the start of week + // HACK This line produces a string of 3 bytes. It takes the raw value + // of the first one and uses that as the value of week_start. ++#if HAVE_NL_TIME_FIRST_WEEKDAY + int week_start_posix = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0]; ++#else ++ int week_start_posix = 0; ++#endif + + var week_start = week_start_posix + glib_offset; + if (week_start == 0) { // Sunday special case --- a/meson.build +++ b/meson.build -@@ -31,7 +31,17 @@ folks_dep = dependency('folks') - geocode_glib_dep = dependency('geocode-glib-1.0') - gclue_dep = dependency('libgeoclue-2.0') +@@ -48,7 +48,14 @@ else + add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala') + endif -m_dep = meson.get_compiler('c').find_library('m', required : false) +cc = meson.get_compiler('c') +m_dep = cc.find_library('m', required : false) -+libnotify_dep = dependency('libnotify', required: false) -+ -+if libnotify_dep.found() -+ add_project_arguments('--define=HAVE_LIBNOTIFY', language: 'vala') -+endif -+ +if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY') + add_project_arguments('--define=HAVE_NL_TIME_FIRST_WEEKDAY', language: 'vala') ++endif ++if cc.has_header_symbol('langinfo.h', '_NL_TIME_WEEK_1STDAY') ++ add_project_arguments('--define=HAVE_NL_TIME_WEEK_1STDAY', language: 'vala') +endif gresource_calendar = gnome.compile_resources( diff --git a/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch b/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch new file mode 100644 index 00000000000..6513e4c5422 --- /dev/null +++ b/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch @@ -0,0 +1,32 @@ +--- a/core/Tests/meson.build ++++ b/core/Tests/meson.build +@@ -18,15 +18,20 @@ util_tests = executable( + ) + test('Utils Tests', util_tests, suite: 'core', is_parallel: false) + ++locale_prog = find_program('locale', required: false) + # We need these three locales to run the tests +-locales = run_command('locale', '-a').stdout().split('\n') +-if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8') +- eventstore_tests = executable( +- tests_name + '-eventstore', +- 'eventstore-tests.vala', +- dependencies: tests_deps +- ) +- test('EventStore Tests', eventstore_tests, suite: 'core', is_parallel: false) ++if locale_prog.found() ++ locales = run_command(locale_prog, '-a').stdout().split('\n') ++ if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8') ++ eventstore_tests = executable( ++ tests_name + '-eventstore', ++ 'eventstore-tests.vala', ++ dependencies: tests_deps ++ ) ++ test('EventStore Tests', eventstore_tests, suite: 'core', is_parallel: false) ++ else ++ message('EventStore Tests have been disabled, a locale is missing in the system.') ++ endif + else +-message('EventStore Tests have been disabled, a locale is missing in the system.') ++ message('EventStore Tests have been disabled, the locale command is missing in the system.') + endif diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template index a5ea019353a..bf87c759900 100644 --- a/srcpkgs/io.elementary.calendar/template +++ b/srcpkgs/io.elementary.calendar/template @@ -1,22 +1,21 @@ # Template file for 'io.elementary.calendar' pkgname=io.elementary.calendar -version=5.0 -revision=6 -_git_commit=46346e48b53e9d3d59d9f567b622532338f50f32 -wrksrc="calendar-${_git_commit}" +version=6.1.0 +revision=1 +wrksrc="calendar-${version}" build_style=meson build_helper="gir" -hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream +hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream glib-devel evolution-data-server-devel" makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel - libchamplain-devel clutter-devel evolution-data-server-devel + libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel" short_desc="Desktop calendar app designed for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-only" homepage="https://github.com/elementary/calendar" -distfiles="${homepage}/archive/${_git_commit}.tar.gz" -checksum=3be3851baeed67144e5cbed209b2c1b982fe9830db13372e3051423295dee345 +distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz" +checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d libio.elementary.calendar_package() { short_desc+=" - library" @@ -28,7 +27,8 @@ libio.elementary.calendar_package() { libio.elementary.calendar-devel_package() { short_desc+=" - library development files" depends="libio.elementary.calendar>=${version} evolution-data-server-devel - granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel" + granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel + libhandy1-devel" pkg_install() { vmove "usr/lib/*.so" vmove usr/lib/pkgconfig From 02de071ef077c9ee7aafacc1a27ec0356a582db0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:04 +0100 Subject: [PATCH 0118/2369] io.elementary.code: update to 6.1.0. --- .../io.elementary.code/patches/vala050.patch | 25 ------------------- srcpkgs/io.elementary.code/template | 18 ++++++------- 2 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/io.elementary.code/patches/vala050.patch diff --git a/srcpkgs/io.elementary.code/patches/vala050.patch b/srcpkgs/io.elementary.code/patches/vala050.patch deleted file mode 100644 index ec3abb8fd9f..00000000000 --- a/srcpkgs/io.elementary.code/patches/vala050.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a185de0e7716aa2de2bf21de96e6c9af1dca81aa Mon Sep 17 00:00:00 2001 -From: Daniel Kolesa -Date: Wed, 16 Sep 2020 20:43:07 +0200 -Subject: [PATCH] fix with vala-0.50 - ---- - plugins/outline/Vala/ValaSymbolOutline.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git plugins/outline/Vala/ValaSymbolOutline.vala plugins/outline/Vala/ValaSymbolOutline.vala -index c8db339..31386a6 100644 ---- a/plugins/outline/Vala/ValaSymbolOutline.vala -+++ b/plugins/outline/Vala/ValaSymbolOutline.vala -@@ -61,7 +61,7 @@ public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline - - public void parse_symbols () { - var context = new Vala.CodeContext (); -- context.profile = Vala.Profile.GOBJECT; -+ context.set_target_profile(Vala.Profile.GOBJECT); - context.add_source_filename (doc.file.get_path ()); - context.report = new Report (); - if (cancellable != null) --- -2.28.0 - diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template index 05d84cc39c9..c47d667b8a9 100644 --- a/srcpkgs/io.elementary.code/template +++ b/srcpkgs/io.elementary.code/template @@ -1,19 +1,19 @@ # Template file for 'io.elementary.code' pkgname=io.elementary.code -version=3.4.1 -revision=5 +version=6.1.0 +revision=1 wrksrc="code-${version}" build_style=meson -hostmakedepends="pkg-config vala intltool glib-devel" +hostmakedepends="pkg-config vala gettext polkit glib-devel" makedepends="editorconfig-devel libgee08-devel granite-devel libpeas-devel - gtksourceview-devel vte3-devel gtkspell3-devel zeitgeist-devel libsoup-devel - webkit2gtk-devel gtk+3-devel libgit2-glib-devel" + gtksourceview4-devel vte3-devel gtkspell3-devel libsoup-devel + gtk+3-devel libgit2-glib-devel polkit-devel libhandy1-devel" short_desc="Code editor designed for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/code" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=d84b38193b72cd93995aae604358c83c5b6976d8472ce985027b947cfed990bf +distfiles="https://github.com/elementary/code/archive/${version}.tar.gz" +checksum=d44851eb827dc9a069ab81b6a9cfe255795e3319a6882ca344152781968ce3ce libio.elementary.code_package() { short_desc+=" - library" @@ -25,8 +25,8 @@ libio.elementary.code_package() { libio.elementary.code-devel_package() { short_desc+=" - library development files" depends="libio.elementary.code>=${version} fontconfig-devel granite-devel - gtk+3-devel gtksourceview-devel libgee08-devel libgit2-glib-devel - libglib-devel libpeas-devel pango-devel zeitgeist-devel" + gtk+3-devel gtksourceview4-devel libgee08-devel libgit2-glib-devel + libglib-devel libpeas-devel pango-devel polkit-devel libhandy1-devel" pkg_install() { vmove "usr/lib/*.so" vmove usr/lib/pkgconfig From 74f6875c22232e728ba0e76b37e9d35d68280e42 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:07 +0100 Subject: [PATCH 0119/2369] io.elementary.files: update to 6.1.2. --- common/shlibs | 4 ++-- srcpkgs/io.elementary.files/template | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index dd26ddee444..ffcc843af85 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3524,8 +3524,8 @@ libadwaita-1.so.0 libadwaita-1.0.0alpha2_1 libswitchboard-2.0.so.0 switchboard-2.3.2_1 libcodecore.so.0 libio.elementary.code-3.0_1 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1 -libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1 -libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1 +libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1 +libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1 libwlroots.so.9 wlroots0.14-0.14.1_1 libwlroots.so.10 wlroots-0.15.0_1 libbaseencode.so.1 libbaseencode-1.0.9_1 diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template index cb0643a0244..0e8d5fb177d 100644 --- a/srcpkgs/io.elementary.files/template +++ b/srcpkgs/io.elementary.files/template @@ -1,20 +1,20 @@ # Template file for 'io.elementary.files' pkgname=io.elementary.files -version=4.5.0 +version=6.1.2 revision=1 wrksrc="files-${version}" build_style=meson -configure_args="-Dwith-unity=disabled" -hostmakedepends="vala glib-devel pkg-config intltool" +configure_args="-Dsystemduserunitdir=no" +hostmakedepends="vala glib-devel pkg-config gettext" makedepends="gtk+3-devel libglib-devel libgee08-devel sqlite-devel plank-devel libcanberra-devel granite-devel pango-devel zeitgeist-devel dbus-glib-devel - libnotify-devel libcloudproviders-devel libgit2-glib-devel" + libnotify-devel libcloudproviders-devel libgit2-glib-devel libhandy1-devel" short_desc="File browser designed for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/files" distfiles="https://github.com/elementary/files/archive/${version}.tar.gz" -checksum=987f87df2a74c97cb866b34a20ea395ae1f67d03c9517185494860653fbc065c +checksum=2a328d8df901186bb700c835064c9a526e5694545b668df512282773cfaa7b08 CFLAGS="-fcommon" @@ -28,7 +28,7 @@ libio.elementary.files_package() { libio.elementary.files-devel_package() { short_desc+=" - library development files" depends="libio.elementary.files>=${version} libgee08-devel gtk+3-devel - libcanberra-devel libglib-devel zeitgeist-devel" + libcanberra-devel libglib-devel zeitgeist-devel libhandy1-devel" pkg_install() { vmove "usr/lib/*.so" vmove usr/lib/pkgconfig From 6c7a446bcf955e002b72919860f3c8359d2919a5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:04 +0100 Subject: [PATCH 0120/2369] io.elementary.icons: update to 6.1.0. --- srcpkgs/io.elementary.icons/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template index fb3a6c06cc8..95dbc0ca3dd 100644 --- a/srcpkgs/io.elementary.icons/template +++ b/srcpkgs/io.elementary.icons/template @@ -1,6 +1,6 @@ # Template file for 'io.elementary.icons' pkgname=io.elementary.icons -version=5.3.1 +version=6.1.0 revision=1 wrksrc="icons-${version}" build_style=meson @@ -11,8 +11,8 @@ short_desc="Named, vector icons for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/icons" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=67b349453f8990e399521bb8d96f4caf4c23a27cf22cbc18ddacf0e817c59e12 +distfiles="https://github.com/elementary/icons/archive/${version}.tar.gz" +checksum=bab0f638a60d7a28bf269f4a11346b28495a819e3f516403a7e0bb880c441c2f post_install() { # How did that get there? From 70b020e87ae28123093db00d539112eaadf00845 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:07 +0100 Subject: [PATCH 0121/2369] io.elementary.music: update to 5.1.1. --- .../io.elementary.music/patches/vala-array-size.patch | 11 ----------- srcpkgs/io.elementary.music/template | 11 ++++++----- 2 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/io.elementary.music/patches/vala-array-size.patch diff --git a/srcpkgs/io.elementary.music/patches/vala-array-size.patch b/srcpkgs/io.elementary.music/patches/vala-array-size.patch deleted file mode 100644 index 2cc268cdae6..00000000000 --- a/srcpkgs/io.elementary.music/patches/vala-array-size.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/core/GStrewamer/Equalizer.vala 2020-03-04 23:50:04.000000000 +0100 -+++ b/core/GStreamer/Equalizer.vala 2020-12-14 15:53:22.359597220 +0100 -@@ -31,7 +31,7 @@ - construct { - element = Gst.ElementFactory.make ("equalizer-10bands", "equalizer"); - -- int[10] freqs = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000}; -+ int freqs[10] = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000}; - - float last_freq = 0; - for (int index = 0; index < 10; index++) { diff --git a/srcpkgs/io.elementary.music/template b/srcpkgs/io.elementary.music/template index de6ae0f94d9..3ef8c156863 100644 --- a/srcpkgs/io.elementary.music/template +++ b/srcpkgs/io.elementary.music/template @@ -1,20 +1,21 @@ # Template file for 'io.elementary.music' pkgname=io.elementary.music -version=5.0.5 +version=5.1.1 revision=1 wrksrc="music-${version}" build_style=meson configure_args="-Dbuild-plugins=true -Dplugins=audioplayer,cdrom,ipod" -hostmakedepends="vala desktop-file-utils intltool pkg-config AppStream glib-devel" +hostmakedepends="vala desktop-file-utils gettext pkg-config AppStream glib-devel" makedepends="taglib-devel granite-devel vala-devel gtk+3-devel libgee08-devel clutter-gtk-devel dbus-glib-devel libgda-devel libgpod-devel libxml2-devel - json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel" + json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel + libhandy1-devel" short_desc="Music player and library designed for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/music" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=ed7cba3b07189273890b321b21cda198f18b102e4466eb7207c0b5f27b31dfc9 +checksum=35e97ec496327b4eb388308168711bf9f8e976a857eb97bca21805f83abf9d15 libio.elementary.music_package() { short_desc+=" - library" @@ -26,7 +27,7 @@ libio.elementary.music-devel_package() { short_desc+=" - library development files" depends="libio.elementary.music>=${version} granite-devel gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libglib-devel - libpeas-devel" + libpeas-devel libhandy1-devel" pkg_install() { vmove "usr/lib/*.so" vmove usr/lib/pkgconfig From 85ed1b229017540f58874b233c9f572f6632e519 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:05 +0100 Subject: [PATCH 0122/2369] io.elementary.photos: update to 2.7.4. --- .../patches/fix-meson.patch | 95 ------------------- srcpkgs/io.elementary.photos/template | 11 +-- 2 files changed, 5 insertions(+), 101 deletions(-) delete mode 100644 srcpkgs/io.elementary.photos/patches/fix-meson.patch diff --git a/srcpkgs/io.elementary.photos/patches/fix-meson.patch b/srcpkgs/io.elementary.photos/patches/fix-meson.patch deleted file mode 100644 index 820e3b8ef96..00000000000 --- a/srcpkgs/io.elementary.photos/patches/fix-meson.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 27e529fc96da828982563e2e19a6f0cef883a29e Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Wed, 22 Jul 2020 19:35:53 +0200 -Subject: [PATCH] meson: Properly include config.vapi and config.h (#578) - ---- - meson.build | 21 +++++++++++++++++++-- - src/meson.build | 13 ------------- - 2 files changed, 19 insertions(+), 15 deletions(-) - -diff --git meson.build meson.build -index 5edb5314..9bebaca0 100644 ---- a/meson.build -+++ b/meson.build -@@ -11,14 +11,33 @@ add_project_arguments([ - '-Wno-unused', - '-Wl,--enable-new-dtags', - -+ '-include', 'config.h', - '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()) - ], - language: 'c', - ) -+add_project_arguments([ -+ '--vapidir', join_paths(meson.current_source_dir(), 'vapi'), -+ '--pkg', 'config', -+ ], -+ language: 'vala', -+) - - libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), meson.project_name()) - pluginsdir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins') - -+conf_data = configuration_data() -+conf_data.set_quoted('PROJECT_NAME', meson.project_name()) -+conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name()) -+conf_data.set_quoted('_VERSION', meson.project_version()) -+conf_data.set_quoted('_PREFIX', get_option('prefix')) -+conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir'))) -+conf_data.set_quoted('_LIBEXECDIR', libexecdir) -+config_header = configure_file( -+ output : 'config.h', -+ configuration : conf_data -+) -+ - gnome = import('gnome') - i18n = import('i18n') - -@@ -52,7 +71,6 @@ gstreamer_plugins_base_vapi = meson.get_compiler('vala').find_library('gstreamer - gstreamer_plugins_base_dep = declare_dependency(dependencies: [gstreamer_plugins_base_vapi]) - lconv_dep = meson.get_compiler('vala').find_library('LConv', dirs: join_paths(meson.current_source_dir(), 'vapi')) - linux_dep = meson.get_compiler('vala').find_library('linux') --config_dep = meson.get_compiler('vala').find_library('config', dirs: join_paths(meson.current_source_dir(), 'vapi')) - - vapi_include = include_directories('./vapi') - -@@ -82,7 +100,6 @@ dependencies = [ - webkit2gtk_dep, - lconv_dep, - linux_dep, -- config_dep - ] - - add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'vapi')], language: 'vala') -diff --git src/meson.build src/meson.build -index 45bf4c1b..1215d778 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -4,18 +4,6 @@ library_files = files( - 'plugins/TransitionsInterfaces.vala' - ) - --conf_data = configuration_data() --conf_data.set_quoted('PROJECT_NAME', meson.project_name()) --conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name()) --conf_data.set_quoted('_VERSION', meson.project_version()) --conf_data.set_quoted('_PREFIX', get_option('prefix')) --conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir'))) --conf_data.set_quoted('_LIBEXECDIR', libexecdir) --config_header = configure_file( -- output : 'config.h', -- configuration : conf_data --) -- - photos_files = files( - 'AppDirs.vala', - 'Application.vala', -@@ -233,7 +221,6 @@ photos_exe = executable( - meson.project_name(), - photos_files, - library_files, -- config_header, - icons_gresource, - global_gresource, - dependencies: dependencies, diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template index 81c1734164b..d0f69169be3 100644 --- a/srcpkgs/io.elementary.photos/template +++ b/srcpkgs/io.elementary.photos/template @@ -1,22 +1,21 @@ # Template file for 'io.elementary.photos' pkgname=io.elementary.photos -version=2.7.0 -revision=2 +version=2.7.4 +revision=1 wrksrc="photos-${version}" build_style=meson -configure_args="-Dlibunity=false" -hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream +hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream glib-devel python3-scour" makedepends="libaccounts-glib-devel libexif-devel libgee08-devel geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel - vte3-devel" + vte3-devel libhandy1-devel" depends="desktop-file-utils gsettings-desktop-schemas" short_desc="Photo viewer and organizer designed for elementary OS" maintainer="Cameron Nemo " license="LGPL-2.1-or-later" homepage="https://github.com/elementary/photos" distfiles="https://github.com/elementary/photos/archive/${version}.tar.gz" -checksum=9f6ad409d053e3239b9ec7fc59429afe9ce89e40878697a73c2c3f215556a074 +checksum=3227f498e483b150f0a1407f4cf244d69f1c7453fc9bcba164fe3ab944283315 From edd418bf89b5b09a7ca60b7c85934c3fd4ed5e22 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:05 +0100 Subject: [PATCH 0123/2369] io.elementary.stylesheet: update to 6.1.1. --- srcpkgs/io.elementary.stylesheet/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/io.elementary.stylesheet/template b/srcpkgs/io.elementary.stylesheet/template index 791bca04709..618ac82dda0 100644 --- a/srcpkgs/io.elementary.stylesheet/template +++ b/srcpkgs/io.elementary.stylesheet/template @@ -1,12 +1,13 @@ # Template file for 'io.elementary.stylesheet' pkgname=io.elementary.stylesheet -version=5.4.2 -revision=2 +version=6.1.1 +revision=1 wrksrc="stylesheet-${version}" build_style=meson +hostmakedepends="sassc gettext" short_desc="GTK Stylesheet for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/stylesheet" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec +checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e From e9cbe003e9d8dfffa48b86c26ae310c303826ff1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:08 +0100 Subject: [PATCH 0124/2369] io.elementary.terminal: update to 6.0.1. --- srcpkgs/io.elementary.terminal/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/io.elementary.terminal/template b/srcpkgs/io.elementary.terminal/template index 2aba6a5b563..f3e0972cdfe 100644 --- a/srcpkgs/io.elementary.terminal/template +++ b/srcpkgs/io.elementary.terminal/template @@ -1,19 +1,19 @@ # Template file for 'io.elementary.terminal' pkgname=io.elementary.terminal -version=5.5.2 +version=6.0.1 revision=1 wrksrc="terminal-${version}" build_style=meson configure_args="-Dubuntu-bionic-patched-vte=false" -hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream glib-devel" -makedepends="granite-devel libnotify-devel vte3-devel" +hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream glib-devel" +makedepends="granite-devel libnotify-devel vte3-devel libhandy1-devel" depends="desktop-file-utils gsettings-desktop-schemas" short_desc="Terminal from elementary OS for the 21st century" maintainer="Cameron Nemo " license="LGPL-3.0-only" homepage="https://github.com/elementary/terminal" distfiles="https://github.com/elementary/terminal/archive/${version}.tar.gz" -checksum=589ad0225e3a45700d95c8ead1b646f22a22c7688f647876a5329b3b4bd923cd +checksum=de741ad5deadb927243a7007be0f5d3bb4070f780362d59ded600692064b0eca pantheon-terminal_package() { depends="io.elementary.terminal>=${version}_${revision}" From 4bc73a226f93fc9a137cbea347864debff9c9960 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:06 +0100 Subject: [PATCH 0125/2369] io.elementary.videos: update to 2.8.3. --- srcpkgs/io.elementary.videos/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template index c989ccaf695..eaca37a8372 100644 --- a/srcpkgs/io.elementary.videos/template +++ b/srcpkgs/io.elementary.videos/template @@ -1,15 +1,15 @@ # Template file for 'io.elementary.videos' pkgname=io.elementary.videos -version=2.7.2 +version=2.8.3 revision=1 wrksrc="videos-${version}" build_style=meson -hostmakedepends="intltool pkg-config vala AppStream" +hostmakedepends="gettext pkg-config vala AppStream" makedepends="granite-devel clutter-gst3-devel clutter-gtk-devel - gstreamer1-devel gst-plugins-base1-devel" + gstreamer1-devel gst-plugins-base1-devel libhandy1-devel" short_desc="Video player and library app designed for elementary OS" maintainer="Ulf " license="GPL-3.0-or-later" homepage="https://github.com/elementary/videos" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a +checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6 From 48df55b094ea8e88831610176a96d95cfd41f623 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:49:31 +0100 Subject: [PATCH 0126/2369] giti: remove package * doesn't build with recent vala --- srcpkgs/giti/template | 13 ------------- srcpkgs/removed-packages/template | 3 ++- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/giti/template diff --git a/srcpkgs/giti/template b/srcpkgs/giti/template deleted file mode 100644 index e3c8663fa53..00000000000 --- a/srcpkgs/giti/template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'giti' -pkgname=giti -version=1.0.0 -revision=1 -build_style=meson -hostmakedepends="pkg-config vala gettext" -makedepends="gtk+3-devel libgit2-glib-devel libgee08-devel granite-devel" -short_desc="Permanent observer of your git directories" -maintainer="linarcx " -license="GPL-3.0-or-later" -homepage="https://github.com/LinArcX/giti" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=8054581f9eddf226a3e16e404ef062ebaba0ea1223255d8b0c3eeac301cf6872 diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 5003333859c..df264c9d750 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=66 +revision=67 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -81,6 +81,7 @@ replaces=" gens-gs<=2.16.7_2 geoip-data<=20171002_2 gespeaker<=0.8.6_3 + giti<=1.0.0_1 gksu<=2.0.2_4 glibmm-doc<=2.64.2_2 gnome-doc-utils<=0.20.10_9 From ca7b677ab5cbd4708fa227b9708a018d707b1f5a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 12:22:51 +0100 Subject: [PATCH 0127/2369] colord-gtk: update to 0.3.0. --- common/shlibs | 1 + srcpkgs/colord-gtk/template | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/common/shlibs b/common/shlibs index ffcc843af85..7d323593a12 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1133,6 +1133,7 @@ libibus-1.0.so.5 ibus-1.4.99.20120917_1 libxapian.so.30 libxapian-1.4.0_1 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1 libcolord-gtk.so.1 colord-gtk-0.1.23_1 +libcolord-gtk4.so.1 colord-gtk-0.3.0_1 libgdm.so.1 libgdm-3.6.0_1 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1 libcheese.so.8 libcheese-3.17.90_1 diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template index 634a9322dae..843320e6308 100644 --- a/srcpkgs/colord-gtk/template +++ b/srcpkgs/colord-gtk/template @@ -1,26 +1,27 @@ # Template file for 'colord-gtk' pkgname=colord-gtk -version=0.2.0 -revision=2 +version=0.3.0 +revision=1 build_style=meson build_helper=gir -configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false) - -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)" -hostmakedepends="pkg-config intltool glib-devel libxslt +configure_args="-Dtests=false $(vopt_bool vala vapi) $(vopt_bool docs docs) + $(vopt_bool man man)" +hostmakedepends="pkg-config gettext glib-devel libxslt $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel) $(vopt_if man docbook-xsl-ns)" -makedepends="colord-devel gtk+3-devel" +makedepends="colord-devel gtk+3-devel gtk4-devel" short_desc="GTK support library for colord" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://github.com/hughsie/colord-gtk" +changelog="https://raw.githubusercontent.com/hughsie/colord-gtk/main/NEWS" distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz" -checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717 +checksum=b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0 build_options="vala docs man" -build_options_default="vala" -desc_option_docs="Generate documents" -desc_option_man="Generate manpage" +build_options_default="vala man docs" +desc_option_docs="Generate documentation" +desc_option_man="Generate man pages" colord-gtk-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" @@ -33,5 +34,8 @@ colord-gtk-devel_package() { if [ "$build_option_vala" ]; then vmove usr/share/vala fi + if [ "$build_option_docs" ]; then + vmove usr/share/gtk-doc + fi } } From a7072a462fce30b4dcc30aac29cdc6b0d7287177 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 24 Mar 2022 16:47:44 +0100 Subject: [PATCH 0128/2369] timg: update to 1.4.4. --- srcpkgs/timg/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template index 7774d007cf0..91f1516b259 100644 --- a/srcpkgs/timg/template +++ b/srcpkgs/timg/template @@ -1,6 +1,6 @@ # Template file for 'timg' pkgname=timg -version=1.4.2 +version=1.4.4 revision=1 build_style=cmake configure_args="-DWITH_OPENSLIDE_SUPPORT=off -Wno-dev" @@ -10,5 +10,5 @@ short_desc="24-bit color image & video viewer for terminal" maintainer="33KK " license="GPL-2.0-only" homepage="https://github.com/hzeller/timg" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=7607efaffbed0b65b3c824956de421b155a4f14243e7a752b19454f88bf9d563 +distfiles="https://github.com/hzeller/timg/archive/v${version}.tar.gz" +checksum=66d2e00b50068fd6638bb8be1859c50ca4f24caef751f9dc95b303f37fb07b1e From b17ed48beacbbbfadc0769815e37a08cf90b6ba8 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 26 Mar 2022 08:51:52 +0100 Subject: [PATCH 0129/2369] wine: update to 7.5. --- srcpkgs/wine/patches/musl-limits.patch | 4 ++-- srcpkgs/wine/patches/musl-rpath.patch | 8 ++++---- srcpkgs/wine/patches/musl-uid-t.patch | 4 ++-- srcpkgs/wine/template | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch index b13cbe9ea48..45cb7cbd510 100644 --- a/srcpkgs/wine/patches/musl-limits.patch +++ b/srcpkgs/wine/patches/musl-limits.patch @@ -1,5 +1,5 @@ ---- a/wine-7.4/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 -+++ b/wine-7.4/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 +--- a/wine-7.5/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 ++++ b/wine-7.5/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 @@ -29,7 +29,8 @@ #include #include diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch index 82f45cc1d17..4ed5e2642d9 100644 --- a/srcpkgs/wine/patches/musl-rpath.patch +++ b/srcpkgs/wine/patches/musl-rpath.patch @@ -1,7 +1,7 @@ diff --git a/configure b/configure index 774a95ce003..d408e77cc78 100755 ---- a/wine-7.4/configure -+++ b/wine-7.4/configure +--- a/wine-7.5/configure ++++ b/wine-7.5/configure @@ -11137,6 +11137,38 @@ fi LIBWINE_DEPENDS="wine.map" @@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755 diff --git a/configure.ac b/configure.ac index 8c5066a3de6..01ede86df1e 100644 ---- a/wine-7.4/configure.ac -+++ b/wine-7.4/configure.ac +--- a/wine-7.5/configure.ac ++++ b/wine-7.5/configure.ac @@ -916,6 +916,9 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version") AC_SUBST(LIBWINE_DEPENDS,"wine.map") diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch index 2fe1c18c553..a358997c396 100644 --- a/srcpkgs/wine/patches/musl-uid-t.patch +++ b/srcpkgs/wine/patches/musl-uid-t.patch @@ -1,5 +1,5 @@ ---- a/wine-7.4/server/security.h 2022-01-29 08:23:43.759508270 +0100 -+++ b/wine-7.4/server/security.h 2022-01-29 08:24:07.976443565 +0100 +--- a/wine-7.5/server/security.h 2022-01-29 08:23:43.759508270 +0100 ++++ b/wine-7.5/server/security.h 2022-01-29 08:24:07.976443565 +0100 @@ -22,6 +22,7 @@ #define __WINE_SERVER_SECURITY_H diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 8dfb8df9f6b..e9598ba932a 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=7.4 +version=7.5 revision=1 _pkgver=${version/r/-r} create_wrksrc=yes @@ -13,8 +13,8 @@ license="LGPL-2.1-or-later" homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz" -checksum="728e866d6e49ce92a2a0c514333e9ff08bdbf6c86f5ef4e6180143b8d2b7d416 - c1688af87737f47337a8f7e24d501d99582a691a2a08ba8e71b9911abbfd8554" +checksum="462c3185aedeec851067a5165d648f5499fb93c1b655f46b825f4bc11914e281 + 3b3a10654c90b210ab8dbf9d0aa2d2e3f4179a73e56e7c2101008e77903afead" build_options="mingw staging xshm" build_options_default="mingw xshm" From 7de4df80b354635c4a718c4c9484e5a365a3855f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 00:52:47 +0100 Subject: [PATCH 0130/2369] apostrophe: update to 2.6.1. --- srcpkgs/apostrophe/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template index 127919d611a..d130b8694cd 100644 --- a/srcpkgs/apostrophe/template +++ b/srcpkgs/apostrophe/template @@ -1,7 +1,7 @@ # Template file for 'apostrophe' pkgname=apostrophe -version=2.5 -revision=2 +version=2.6.1 +revision=1 wrksrc="$pkgname-v$version" build_style=meson build_helper=gir @@ -14,4 +14,4 @@ maintainer="Michal Vasilek " license="GPL-3.0-only" homepage="https://gitlab.gnome.org/World/apostrophe" distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz" -checksum=366b239ea7bb720c11fc7344827b6739e4983132c9932aa4705a3b88533d75e4 +checksum=f1c38d97cc5413a21017b95c16f0e869fd0d316ec1a3c54ec5607534562cee5c From bb133c217d1cfffbec0b36bcf5b0a8b1a9536fdd Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Wed, 23 Mar 2022 13:09:45 +1100 Subject: [PATCH 0131/2369] openvpn: update to 2.5.6. --- srcpkgs/openvpn/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template index 04bead136a4..bb874a247ab 100644 --- a/srcpkgs/openvpn/template +++ b/srcpkgs/openvpn/template @@ -1,6 +1,6 @@ # Template file for 'openvpn' pkgname=openvpn -version=2.5.5 +version=2.5.6 revision=1 build_style=gnu-configure configure_args="$(vopt_enable pkcs11) --disable-systemd @@ -12,8 +12,9 @@ short_desc="Easy-to-use, robust, and highly configurable VPN" maintainer="Orphaned " license="GPL-2.0-only" homepage="https://www.openvpn.net" +changelog="https://raw.githubusercontent.com/OpenVPN/openvpn/release/${version%.*}/Changes.rst" distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz" -checksum=119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b +checksum=13c7c3dc399d1b571cabf189c4d34ae34656ee72b6bde2a8059c1e9bc61574ed build_options="mbedtls pkcs11" build_options_default="pkcs11" From d322e0c18821139e6615427f7f66ab7132e40972 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:02 +0100 Subject: [PATCH 0132/2369] meson: update to 0.61.4. --- srcpkgs/meson/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 67fa3514289..2f9ccaaa469 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,6 +1,6 @@ # Template file for 'meson' pkgname=meson -version=0.60.3 +version=0.61.4 revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://mesonbuild.com" changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz" -checksum=87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e +checksum=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 # XXX: sanitizers aren't available on musl if [ "$XBPS_TARGET_LIBC" = glibc ]; then From ca53da124771ea5b040abd3a1b49ddff499461e3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:58 +0100 Subject: [PATCH 0133/2369] Marker: fix for meson 0.61 --- srcpkgs/Marker/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Marker/template b/srcpkgs/Marker/template index be02723dc4e..eed5bddc36c 100644 --- a/srcpkgs/Marker/template +++ b/srcpkgs/Marker/template @@ -4,7 +4,7 @@ version=2020.04.04 revision=1 wrksrc=marker build_style=meson -hostmakedepends="glib-devel pkg-config" +hostmakedepends="glib-devel pkg-config itstool gettext" makedepends="gtksourceview-devel gtkspell3-devel gtk+3-devel libglib-devel webkit2gtk-devel" depends="iso-codes" From cb553aae52560ad9d1f784bc269f52ad91284bf6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:58 +0100 Subject: [PATCH 0134/2369] accountsservice: fix for meson 0.61 --- .../accountsservice/patches/meson-0.61.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch diff --git a/srcpkgs/accountsservice/patches/meson-0.61.patch b/srcpkgs/accountsservice/patches/meson-0.61.patch new file mode 100644 index 00000000000..9245afdd47d --- /dev/null +++ b/srcpkgs/accountsservice/patches/meson-0.61.patch @@ -0,0 +1,29 @@ +From ac9b14f1c1bbca413987d0bbfeaad05804107e9a Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +Date: Sun, 31 Oct 2021 12:29:14 +0000 +Subject: Fix build with meson 0.60 + +Positional parameters to merge_file() were never allowed and always +ignored, so just drop it. +See: https://github.com/mesonbuild/meson/issues/9441 + +Fixes #97 +--- + data/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 70edf89..9e80299 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -33,7 +33,6 @@ configure_file( + policy = act_namespace.to_lower() + '.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: policy, + po_dir: po_dir, +-- +cgit v1.2.1 + From b9d18ff3c4cd9683eea9621095d5175266eb0268 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 0135/2369] bijiben: fix for meson 0.61 --- srcpkgs/bijiben/patches/meson-0.61.patch | 46 ++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 srcpkgs/bijiben/patches/meson-0.61.patch diff --git a/srcpkgs/bijiben/patches/meson-0.61.patch b/srcpkgs/bijiben/patches/meson-0.61.patch new file mode 100644 index 00000000000..7576536953a --- /dev/null +++ b/srcpkgs/bijiben/patches/meson-0.61.patch @@ -0,0 +1,46 @@ +From 01ccae2ccb640b2d33fd09c3dfb7d605830b5b0f Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sat, 22 Jan 2022 23:16:37 +0100 +Subject: [PATCH] meson: fix build with meson 0.61 + +i18n.merge_file doesn't accept positional arguments +--- + data/appdata/meson.build | 1 - + data/meson.build | 2 -- + 2 files changed, 3 deletions(-) + +diff --git a/data/appdata/meson.build b/data/appdata/meson.build +index 48a31e3..d78d052 100644 +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,7 +1,6 @@ + info = 'org.gnome.Notes.appdata.xml' + + i18n.merge_file( +- info, + input: info + '.in', + output: info, + po_dir: po_dir, +diff --git a/data/meson.build b/data/meson.build +index d00d98f..556d564 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -4,7 +4,6 @@ subdir('appdata') + mime = 'org.gnome.Notes.xml' + + i18n.merge_file( +- mime, + input: mime + '.in', + output: mime, + po_dir: po_dir, +@@ -18,7 +17,6 @@ desktop_conf = configuration_data() + desktop_conf.set ('icon', application_id) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: configure_file( + input: files (desktop + '.in'), +-- +2.34.1 + From c6d92cff309d1d15a287d6704bb6af537cae99e1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 0136/2369] cinnamon: fix for meson 0.61 --- srcpkgs/cinnamon/patches/meson-0.61.patch | 53 +++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 srcpkgs/cinnamon/patches/meson-0.61.patch diff --git a/srcpkgs/cinnamon/patches/meson-0.61.patch b/srcpkgs/cinnamon/patches/meson-0.61.patch new file mode 100644 index 00000000000..f0937a355f9 --- /dev/null +++ b/srcpkgs/cinnamon/patches/meson-0.61.patch @@ -0,0 +1,53 @@ +From 37de1aaae1edd1fbcd3c2ef2ac5f4baa4c8e2751 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 11 Jan 2022 18:14:35 -0500 +Subject: [PATCH] Revert "build: disable gir install via list to pacify meson + >= 0.60.2 (#10489)" + +This reverts commit 8fc2df08b40aa3e1958ed2fde853c50676d8cf48. + +This commit was wrong, because it tried to work around a bug in a single +version of meson by using something that isn't, wasn't, and won't be a +valid value. + +The fixed version of meson 0.60.x has been out for a while now, which +once again accepts `false`, and 0.61.0 also accepts `false` but was +known at the time of this workaround to not work in meson-git master +(now meson 0.61.0). + +Using `false` is acceptable and the failure to accept it has been +qualified as a meson regression. Using `[false]` is just... trying to +fuzz meson with random objects until you get something that slips its +way through the argument checker and produces desired effects on the +python implementation level. +--- + src/meson.build | 2 +- + src/st/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 7999c0a67b..34b130d50f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -196,7 +196,7 @@ cinnamon_gir = gnome.generate_gir( + includes: cinnamon_gir_includes, + install: true, + install_dir_typelib: pkglibdir, +- install_dir_gir: [false], ++ install_dir_gir: false, + extra_args: [ + '-DST_COMPILATION', + '--quiet', +diff --git a/src/st/meson.build b/src/st/meson.build +index d299727d06..ec7d7b30a1 100644 +--- a/src/st/meson.build ++++ b/src/st/meson.build +@@ -213,7 +213,7 @@ st_gir = gnome.generate_gir( + includes: st_gir_includes, + install: true, + install_dir_typelib: pkglibdir, +- install_dir_gir: [false], ++ install_dir_gir: false, + extra_args: [ + '-DST_COMPILATION', + '--quiet', From 0b054f94f2e694937d1484abb022ee9e58d24d3a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 0137/2369] d-feet: fix for meson 0.61 --- srcpkgs/d-feet/patches/meson-0.61.patch | 33 +++++++++++++++++++++++++ srcpkgs/d-feet/x | 1 - 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/d-feet/patches/meson-0.61.patch delete mode 100644 srcpkgs/d-feet/x diff --git a/srcpkgs/d-feet/patches/meson-0.61.patch b/srcpkgs/d-feet/patches/meson-0.61.patch new file mode 100644 index 00000000000..f8e7f64a60c --- /dev/null +++ b/srcpkgs/d-feet/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From b5a99f86395fd71dc08907ac3c5f2d757384c49f Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sun, 23 Jan 2022 12:35:26 +0100 +Subject: [PATCH] meson: fix build with meson 0.61 + +i18n.merge_file doesn't accept positional arguments +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 026bd80..3b03b94 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -13,7 +13,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: '@BASENAME@', +@@ -25,7 +24,6 @@ i18n.merge_file( + appdata = df_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: '@BASENAME@', + po_dir: po_dir, +-- +2.34.1 + diff --git a/srcpkgs/d-feet/x b/srcpkgs/d-feet/x deleted file mode 100644 index 166f7a95708..00000000000 --- a/srcpkgs/d-feet/x +++ /dev/null @@ -1 +0,0 @@ -xbps-query: option requires an argument -- 's' From 8692d29c67e3a76c828cb6e8622d3741529cbc21 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 0138/2369] dconf-editor: fix for meson 0.61 --- srcpkgs/dconf-editor/patches/meson-0.61.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/dconf-editor/patches/meson-0.61.patch diff --git a/srcpkgs/dconf-editor/patches/meson-0.61.patch b/srcpkgs/dconf-editor/patches/meson-0.61.patch new file mode 100644 index 00000000000..b6f06606e88 --- /dev/null +++ b/srcpkgs/dconf-editor/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 21 Jan 2022 22:22:58 +0100 +Subject: [PATCH] editor/meson.build: fix meson 0.61 errors + +Signed-off-by: Alexander Kanavin +--- + editor/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/editor/meson.build b/editor/meson.build +index 4c89ab99..0eb3bb1a 100644 +--- a/editor/meson.build ++++ b/editor/meson.build +@@ -1,7 +1,6 @@ + desktop = dconf_editor_namespace + '.desktop' + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -26,7 +25,6 @@ configure_file( + appdata = dconf_editor_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +-- +GitLab + From 4658e30a9bed3d043bb923b6409815f87259372b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 0139/2369] devhelp: fix for meson 0.61 --- srcpkgs/devhelp/patches/meson-0.61.patch | 48 ++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch new file mode 100644 index 00000000000..dfea339688e --- /dev/null +++ b/srcpkgs/devhelp/patches/meson-0.61.patch @@ -0,0 +1,48 @@ +From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001 +From: r-value +Date: Wed, 17 Nov 2021 18:02:20 +0800 +Subject: [PATCH] Remove incorrect arg for i18n.merge_file + +`i18n.merge_file` has been ignoring positional arguments and +explicitly rejects with error "ERROR: Function does not take +positional arguments" since meson 0.60.0 +--- + data/meson.build | 2 -- + plugins/gedit-plugin/meson.build | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index c6aeffb4..0bc531a2 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -19,7 +19,6 @@ appdata_conf = configuration_data() + appdata_conf.set('application_id', APPLICATION_ID) + appdata = APPLICATION_ID + '.appdata.xml' + appdata_file = I18N.merge_file( +- appdata, + input: configure_file( + input: 'org.gnome.Devhelp.appdata.xml.in.in', + output: APPLICATION_ID + '.appdata.xml.in', +@@ -45,7 +44,6 @@ desktop_conf = configuration_data() + desktop_conf.set('application_id', APPLICATION_ID) + desktop = APPLICATION_ID + '.desktop' + desktop_file = I18N.merge_file( +- desktop, + type: 'desktop', + input: configure_file( + input: 'org.gnome.Devhelp.desktop.in.in', +diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build +index 4f779886..877a01ff 100644 +--- a/plugins/gedit-plugin/meson.build ++++ b/plugins/gedit-plugin/meson.build +@@ -7,7 +7,6 @@ install_data( + + plugin_info_file = 'devhelp.plugin' + I18N.merge_file( +- plugin_info_file, + type: 'desktop', + input: plugin_info_file + '.desktop.in', + output: plugin_info_file, +-- +GitLab + From db2e8db70a7d33d76bf66af5628a2ffe25ad0872 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 0140/2369] epiphany: fix for meson 0.61 --- srcpkgs/epiphany/patches/meson-0.61.patch | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/epiphany/patches/meson-0.61.patch diff --git a/srcpkgs/epiphany/patches/meson-0.61.patch b/srcpkgs/epiphany/patches/meson-0.61.patch new file mode 100644 index 00000000000..1584627ca2d --- /dev/null +++ b/srcpkgs/epiphany/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001 +From: rvalue +Date: Wed, 24 Nov 2021 04:52:42 +0000 +Subject: [PATCH] Remove incorrect args for i18n.merge_file + +Part-of: +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 46df3fd80..eac6b8224 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -16,7 +16,6 @@ install_data( + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) + desktop = i18n.merge_file( +- 'desktop', + input: configure_file( + input: files('org.gnome.Epiphany.desktop.in.in'), + output: 'org.gnome.Epiphany.desktop.in', +@@ -32,7 +31,6 @@ desktop = i18n.merge_file( + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: files('org.gnome.Epiphany.appdata.xml.in.in'), + output: 'org.gnome.Epiphany.appdata.xml.in', +-- +GitLab + From ed3648cf4cad442df554d893a487fd329130b5be Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:10:59 +0100 Subject: [PATCH 0141/2369] evince: fix for meson 0.61 --- srcpkgs/evince/patches/meson-0.61.patch | 52 +++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 srcpkgs/evince/patches/meson-0.61.patch diff --git a/srcpkgs/evince/patches/meson-0.61.patch b/srcpkgs/evince/patches/meson-0.61.patch new file mode 100644 index 00000000000..baed9dc1af8 --- /dev/null +++ b/srcpkgs/evince/patches/meson-0.61.patch @@ -0,0 +1,52 @@ +From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001 +From: r-value +Date: Wed, 17 Nov 2021 18:22:45 +0800 +Subject: [PATCH] Remove incorrect args for i18n.merge_file + +`i18n.merge_file` has been ignoring positional arguments for +a time and explicitly rejects with error since meson 0.60.0 +--- + backend/meson.build | 1 - + data/meson.build | 1 - + meson.build | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/backend/meson.build b/backend/meson.build +index e44c1d6d7..ab3df9acf 100644 +--- a/backend/meson.build ++++ b/backend/meson.build +@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends + ) + + i18n.merge_file( +- appstream, + input: appstream_in, + output: appstream, + po_dir: po_dir, +diff --git a/data/meson.build b/data/meson.build +index 8a308b853..afc302098 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -15,7 +15,6 @@ foreach desktop: desktops + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/meson.build b/meson.build +index 34c86661f..f74efb3c4 100644 +--- a/meson.build ++++ b/meson.build +@@ -492,7 +492,6 @@ install_headers( + appdata = ev_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +-- +GitLab + From a2d07997261c64e00a1fb1b3dbf4e756dcdcf7e0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 0142/2369] fprintd: fix for meson 0.61 --- srcpkgs/fprintd/patches/meson-0.61.patch | 146 +++++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 srcpkgs/fprintd/patches/meson-0.61.patch diff --git a/srcpkgs/fprintd/patches/meson-0.61.patch b/srcpkgs/fprintd/patches/meson-0.61.patch new file mode 100644 index 00000000000..836c7e03605 --- /dev/null +++ b/srcpkgs/fprintd/patches/meson-0.61.patch @@ -0,0 +1,146 @@ +From 50943b1bd4f18d103c35233f0446ce7a31d1817e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= +Date: Wed, 27 Oct 2021 15:44:31 +0200 +Subject: [PATCH] build: Do not use positional arguments in i18n.merge_file + +This was never really used and it's breaking meson 60. +While this may just become a warning in 60.1, it's just better to avoid +using it. + +See: https://github.com/mesonbuild/meson/issues/9441 +--- + data/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 92bfa2e..ece5fc6 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -24,7 +24,7 @@ if get_option('systemd') + endif + + polkit_policy = 'net.reactivated.fprint.device.policy' +-polkit_policy_target = i18n.merge_file(polkit_policy, ++polkit_policy_target = i18n.merge_file( + input: '@0@.in'.format(polkit_policy), + output: polkit_policy, + po_dir: meson.source_root() / 'po', +-- +GitLab + +From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 11 Jan 2022 21:06:35 -0500 +Subject: [PATCH] use more idiomatic/correct embedded shell scripting + +Formatting arguments into code is fragile, and meson natively knows how +to pass files as arguments via argv. So pass them as arguments to the +shell. +--- + doc/dbus/meson.build | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build +index 802938e..861da64 100644 +--- a/doc/dbus/meson.build ++++ b/doc/dbus/meson.build +@@ -19,11 +19,10 @@ foreach interface_file: dbus_interfaces_files + capture: true, + command: [ + bash, '-c', +- 'cat @INPUT@;' + +- xsltproc.path() + ' @0@/@1@ '.format( +- meson.source_root(), +- files('spec-to-docbook.xsl')[0]) + +- interface_file.full_path() + '| tail -n +2;', ++ 'cat "$1"; "$2" "$3" "$4" | tail -n +2', ++ '_', # argv0 ignored ++ '@INPUT@', ++ xsltproc, files('spec-to-docbook.xsl')[0], interface_file + ], + ) + endforeach +-- +GitLab + +From 2c34cef5ef2004d8479475db5523c572eb409a6b Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 11 Jan 2022 20:46:29 -0500 +Subject: [PATCH] remove pointless copying of files into build directory + +I'm not entirely sure what this did, but it seems to be obsoleted by +commit 93bad825406d13ed5eb2cf27541dc58194bef8f3. +--- + doc/dbus/meson.build | 6 +++--- + src/meson.build | 20 ++++++------------- + ....xml => net.reactivated.Fprint.Device.xml} | 0 + ...xml => net.reactivated.Fprint.Manager.xml} | 0 + 4 files changed, 9 insertions(+), 17 deletions(-) + rename src/{device.xml => net.reactivated.Fprint.Device.xml} (100%) + rename src/{manager.xml => net.reactivated.Fprint.Manager.xml} (100%) + +diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build +index 861da64..431127d 100644 +--- a/doc/dbus/meson.build ++++ b/doc/dbus/meson.build +@@ -9,13 +9,13 @@ docbook_xml_header = custom_target('docbook_xml_header', + ) + + dbus_interfaces_refs = [] +-foreach interface_file: dbus_interfaces_files +- basename = run_command('basename', interface_file.full_path(), '.xml').stdout().strip() ++foreach interface_file: dbus_interfaces ++ basename = run_command('basename', interface_file, '.xml').stdout().strip() + dbus_interfaces_refs += custom_target(basename + '_ref', + input: docbook_xml_header, + output: basename + '.ref.xml', + build_by_default: true, +- depends: interface_file, ++ depend_files: interface_file, + capture: true, + command: [ + bash, '-c', +diff --git a/src/meson.build b/src/meson.build +index 1df6216..a7ce3fe 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -1,22 +1,14 @@ + bash = find_program('bash') +-dbus_interfaces = ['Manager', 'Device'] +-dbus_interfaces_files = [] ++dbus_interfaces = files( ++ 'net.reactivated.Fprint.Manager.xml', ++ 'net.reactivated.Fprint.Device.xml', ++) + +-foreach interface_name: dbus_interfaces +- interface = interface_name.to_lower() +- interface_file = interface + '.xml' +- dbus_interfaces_files += custom_target('dbus_interface_' + interface, +- input: interface_file, +- output: 'net.reactivated.Fprint.@0@.xml'.format(interface_name), +- command: ['cp', '@INPUT@', '@OUTPUT@'], +- install: true, +- install_dir: dbus_interfaces_dir, +- ) +-endforeach ++install_data(dbus_interfaces, install_dir: dbus_interfaces_dir) + + # NOTE: We should pass "--glib-min-required 2.64" but cannot + fprintd_dbus_sources_base = gnome.gdbus_codegen('fprintd-dbus', +- sources: dbus_interfaces_files, ++ sources: dbus_interfaces, + autocleanup: 'all', + interface_prefix: 'net.reactivated.Fprint.', + namespace: 'FprintDBus', +diff --git a/src/device.xml b/src/net.reactivated.Fprint.Device.xml +similarity index 100% +rename from src/device.xml +rename to src/net.reactivated.Fprint.Device.xml +diff --git a/src/manager.xml b/src/net.reactivated.Fprint.Manager.xml +similarity index 100% +rename from src/manager.xml +rename to src/net.reactivated.Fprint.Manager.xml +-- +GitLab + From 22666b40cc5597e4c7ff4823aea1cb57acd98189 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 0143/2369] fractal: fix for meson 0.61 --- srcpkgs/fractal/patches/meson-0.61.patch | 35 ++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 srcpkgs/fractal/patches/meson-0.61.patch diff --git a/srcpkgs/fractal/patches/meson-0.61.patch b/srcpkgs/fractal/patches/meson-0.61.patch new file mode 100644 index 00000000000..79197803abf --- /dev/null +++ b/srcpkgs/fractal/patches/meson-0.61.patch @@ -0,0 +1,35 @@ +From 6fa1a23596d65d94aa889efe725174e6cd2903f0 Mon Sep 17 00:00:00 2001 +From: Jonas Platte +Date: Sun, 31 Oct 2021 15:23:31 +0100 +Subject: [PATCH] Remove deprecated positional argument to i18n.merge_file + +See https://github.com/mesonbuild/meson/issues/9441 +--- + fractal-gtk/res/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fractal-gtk/res/meson.build b/fractal-gtk/res/meson.build +index 7a7a7d65..a176787c 100644 +--- a/fractal-gtk/res/meson.build ++++ b/fractal-gtk/res/meson.build +@@ -2,7 +2,7 @@ subdir('icons') + + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) +-desktop_file = i18n.merge_file ('desktop-file', ++desktop_file = i18n.merge_file ( + type: 'desktop', + input: configure_file( + input: files('org.gnome.Fractal.desktop.in.in'), +@@ -28,7 +28,7 @@ endif + + metainfo_conf = configuration_data() + metainfo_conf.set('appid', application_id) +-metainfo_file = i18n.merge_file ('metainfo-file', ++metainfo_file = i18n.merge_file ( + input: configure_file( + input: files('org.gnome.Fractal.metainfo.xml.in.in'), + output: 'org.gnome.Fractal.metainfo.xml.in', +-- +GitLab + From edbf36a293d6031c14f46df946d6c516b290b34d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 0144/2369] gcr: fix for meson 0.61 --- srcpkgs/gcr/patches/meson-0.61.patch | 59 ++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 srcpkgs/gcr/patches/meson-0.61.patch diff --git a/srcpkgs/gcr/patches/meson-0.61.patch b/srcpkgs/gcr/patches/meson-0.61.patch new file mode 100644 index 00000000000..21c1c361022 --- /dev/null +++ b/srcpkgs/gcr/patches/meson-0.61.patch @@ -0,0 +1,59 @@ +From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka +Date: Wed, 12 Jan 2022 00:24:20 +0100 +Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir + +This argument has been removed in Meson 0.61.0: + + gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" + +https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: + +> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. + +Fixes #89 +--- + gck/meson.build | 1 - + gcr/meson.build | 1 - + ui/meson.build | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/gck/meson.build b/gck/meson.build +index 756b486..a21a1e9 100644 +--- a/gck/meson.build ++++ b/gck/meson.build +@@ -131,7 +131,6 @@ if get_option('introspection') + sources: gck_gir_sources, + namespace: 'Gck', + nsversion: '@0@'.format(gck_major_version), +- packages: gck_deps, + export_packages: 'gck-@0@'.format(gck_major_version), + includes: [ 'GObject-2.0', 'Gio-2.0' ], + header: 'gck/gck.h', +diff --git a/gcr/meson.build b/gcr/meson.build +index 2233a44..c83641b 100644 +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -190,7 +190,6 @@ if get_option('introspection') + sources: [ gcr_base_public_sources, gcr_base_headers ], + namespace: 'Gcr', + nsversion: '@0@'.format(gcr_major_version), +- packages: gcr_base_deps, + export_packages: 'gcr-base-@0@'.format(gcr_major_version), + includes: [ + 'GObject-2.0', +diff --git a/ui/meson.build b/ui/meson.build +index e656ea2..32ee057 100644 +--- a/ui/meson.build ++++ b/ui/meson.build +@@ -152,7 +152,6 @@ if get_option('introspection') + export_packages: 'gcr-ui-@0@'.format(gcr_major_version), + identifier_prefix: 'Gcr', + symbol_prefix: 'gcr', +- packages: gcr_ui_deps, + includes: [ + 'GObject-2.0', + 'Gio-2.0', +-- +GitLab + From f07a0061643ede8ff299bc07d837463cbdd7b41e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 0145/2369] gitg: fix for meson 0.61 --- srcpkgs/gitg/patches/meson-0.61.patch | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/gitg/patches/meson-0.61.patch diff --git a/srcpkgs/gitg/patches/meson-0.61.patch b/srcpkgs/gitg/patches/meson-0.61.patch new file mode 100644 index 00000000000..330d45fc5ad --- /dev/null +++ b/srcpkgs/gitg/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From c81e1579afe7f221371b6866c25f388f48747728 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sun, 23 Jan 2022 14:54:31 +0100 +Subject: [PATCH] meson: fix build with meson 0.61 + +i18n.merge_file doesn't accept positional arguments +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index a8b90fd1..2413531d 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -6,7 +6,6 @@ desktop_config = configuration_data() + desktop_config.set('icon', application_id) + desktop_config.set('binary', gitg_name) + i18n.merge_file( +- desktop, + type: 'desktop', + input: configure_file( + input: desktop + '.in.in', +@@ -42,7 +41,6 @@ appdata_config = configuration_data() + appdata_config.set('app-id', application_id) + appdata_config.set('gettext', gitg_name) + i18n.merge_file( +- appdata, + type: 'xml', + input: configure_file( + input: appdata + '.in.in', +-- +2.34.1 + From a8b3e99f17f57918bc5a3160229e2b54272d37f3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 17:20:40 +0100 Subject: [PATCH 0146/2369] glade3: fix for meson 0.61 --- srcpkgs/glade3/patches/meson-0.61.patch | 57 +++++++++++++++++++++++++ srcpkgs/glade3/template | 2 +- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/glade3/patches/meson-0.61.patch diff --git a/srcpkgs/glade3/patches/meson-0.61.patch b/srcpkgs/glade3/patches/meson-0.61.patch new file mode 100644 index 00000000000..72f9c0e509b --- /dev/null +++ b/srcpkgs/glade3/patches/meson-0.61.patch @@ -0,0 +1,57 @@ +From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 20 Jan 2022 14:18:09 -0500 +Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional + argument + +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 9f244566..bfbc514c 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,6 @@ desktop_conf = configuration_data() + desktop_conf.set('VERSION', glade_version) + + i18n.merge_file( +- 'desktop', + type: 'desktop', + input: configure_file( + input: 'org.gnome.Glade.desktop.in.in', +@@ -18,7 +17,6 @@ i18n.merge_file( + appdata = glade_name + '.appdata.xml' + + i18n.merge_file( +- 'appdata', + input: 'org.gnome.Glade.appdata.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +-- +GitLab + + +From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 20 Jan 2022 14:19:03 -0500 +Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS + +--- + help/LINGUAS | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/help/LINGUAS b/help/LINGUAS +index fc3cd4c3..d67e42c8 100644 +--- a/help/LINGUAS ++++ b/help/LINGUAS +@@ -1,6 +1,5 @@ + # please keep this list sorted alphabetically + # +-da + bg + ca + cs +-- +GitLab + diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template index 763632c1e71..a0235c1faef 100644 --- a/srcpkgs/glade3/template +++ b/srcpkgs/glade3/template @@ -4,7 +4,7 @@ version=3.38.2 revision=1 wrksrc="glade-${version}" build_style=meson -build_helper="gir" +build_helper="gir qemu" configure_args="-Dgtk_doc=true -Dman=true $(vopt_bool gir introspection)" hostmakedepends="glib-devel intltool itstool pkg-config gjs-devel yelp-tools gettext-devel gtk-doc" From c4f09bc97b9bf35d6f50c6d4af087ea24711c091 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 18:19:02 +0100 Subject: [PATCH 0147/2369] gnome-2048: fix for meson 0.61 --- srcpkgs/gnome-2048/patches/meson-0.61.patch | 36 +++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 srcpkgs/gnome-2048/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-2048/patches/meson-0.61.patch b/srcpkgs/gnome-2048/patches/meson-0.61.patch new file mode 100644 index 00000000000..912759654d7 --- /dev/null +++ b/srcpkgs/gnome-2048/patches/meson-0.61.patch @@ -0,0 +1,36 @@ +From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Sun, 23 Jan 2022 10:49:07 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:19:0: ERROR: Function does not take positional arguments. +data/meson.build:39:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 33f73ca..8974a63 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -17,7 +17,6 @@ install_data( + + # Desktop file + desktop_file = i18n.merge_file( +- 'desktop-file', + input: 'org.gnome.TwentyFortyEight.desktop.in', + output: 'org.gnome.TwentyFortyEight.desktop', + install: true, +@@ -37,7 +36,6 @@ endif + + # AppData file + appdata_file = i18n.merge_file( +- 'appdata-file', + input: 'org.gnome.TwentyFortyEight.appdata.xml.in', + output: 'org.gnome.TwentyFortyEight.appdata.xml', + install: true, +-- +GitLab + From 694fd66a44313e381ee5871f44d4f08a4f4ca5b9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 18:37:12 +0100 Subject: [PATCH 0148/2369] gnome-authenticator: fix for meson 0.61 --- .../patches/meson-0.61.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/gnome-authenticator/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch new file mode 100644 index 00000000000..eade2e1241b --- /dev/null +++ b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch @@ -0,0 +1,18 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -63,7 +63,6 @@ configure_file( + desktop_conf = configuration_data() + desktop_conf.set('APP_ID', application_id) + desktop_file = i18n.merge_file( +- 'desktop', + input: configure_file( + input: meson.project_name() + '.desktop.in.in', + output: '@BASENAME@', +@@ -90,7 +89,6 @@ appdata_conf = configuration_data() + appdata_conf.set('APP_ID', application_id) + appdata_conf.set('GETTEXT_PACKAGE', gettext_package) + appdata_file = i18n.merge_file( +- 'appdata', + input: configure_file( + input: meson.project_name() + '.appdata.xml.in.in', + output: '@BASENAME@', From ed6be8c3d2089fb7c033aec048963a3b92be95a3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 16:44:19 +0100 Subject: [PATCH 0149/2369] gnome-bluetooth: fix for meson 0.61 --- .../gnome-bluetooth/patches/meson-0.61.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch new file mode 100644 index 00000000000..c6962edd4f0 --- /dev/null +++ b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch @@ -0,0 +1,25 @@ +From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Fri, 7 Jan 2022 12:51:22 +0100 +Subject: [PATCH] build: Fix build for newer versions of meson + +sendto/meson.build:24:5: ERROR: Function does not take positional arguments. +--- + sendto/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sendto/meson.build b/sendto/meson.build +index 24a4e394..3e233a03 100644 +--- a/sendto/meson.build ++++ b/sendto/meson.build +@@ -22,7 +22,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +-- +GitLab + From 44a175a79da4ff41d4bb8032dd1835329b4962fb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 17:47:14 +0100 Subject: [PATCH 0150/2369] gnome-books: fix for meson 0.61 --- srcpkgs/gnome-books/patches/meson-0.61.patch | 33 ++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/gnome-books/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-books/patches/meson-0.61.patch b/srcpkgs/gnome-books/patches/meson-0.61.patch new file mode 100644 index 00000000000..0e6ba9befd9 --- /dev/null +++ b/srcpkgs/gnome-books/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From 2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Wed, 9 Mar 2022 17:46:00 +0100 +Subject: [PATCH] meson: remove positional args from i18n.merge_file + +This causes the build to fail with meson 0.61+ +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index bc6edfb4..5061554d 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -54,7 +54,6 @@ sources += gnome.compile_resources( + appdata = 'org.gnome.Books.appdata.xml' + + appdata_file = i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +@@ -74,7 +73,6 @@ if appstream_util.found() + desktop = 'org.gnome.Books.desktop' + + desktop_file = i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +-- +2.35.1 + From af273b00909611655eeb27bbf8ede88ffe96224b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 0151/2369] gnome-boxes: fix for meson 0.61 --- srcpkgs/gnome-boxes/patches/meson-0.61.patch | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 srcpkgs/gnome-boxes/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-boxes/patches/meson-0.61.patch b/srcpkgs/gnome-boxes/patches/meson-0.61.patch new file mode 100644 index 00000000000..3d9c56f5841 --- /dev/null +++ b/srcpkgs/gnome-boxes/patches/meson-0.61.patch @@ -0,0 +1,36 @@ +From fd0acfbe79444687c73dea182c2d1a5fa1c77324 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sat, 15 Jan 2022 00:07:31 +0100 +Subject: [PATCH] build: remove positional i18n.merge_file arguments + +otherwise building with meson 0.61+ fails: + + ERROR: Function does not take positional arguments. +--- + data/meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index d32638a8..2dc1798b 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes', + desktop_conf = configuration_data () + desktop_conf.set ('icon', application_id) + desktop = i18n.merge_file ( +- 'desktop', + input: configure_file ( + input: files ('org.gnome.Boxes.desktop.in'), + output: 'org.gnome.Boxes.desktop.in', +@@ -65,7 +64,7 @@ configure_file ( + + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) +-appdata_file = i18n.merge_file ('appdata-file', ++appdata_file = i18n.merge_file ( + input: configure_file ( + input: files ('org.gnome.Boxes.appdata.xml.in'), + output: 'org.gnome.Boxes.appdata.xml.in', +-- +2.34.1 + From 13702dcd49b88168afe687b5a56055db3fe78bca Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 0152/2369] gnome-calendar: fix for meson 0.61 --- srcpkgs/gnome-calendar/patches/meson-0.61.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 srcpkgs/gnome-calendar/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-calendar/patches/meson-0.61.patch b/srcpkgs/gnome-calendar/patches/meson-0.61.patch new file mode 100644 index 00000000000..e2df31e0760 --- /dev/null +++ b/srcpkgs/gnome-calendar/patches/meson-0.61.patch @@ -0,0 +1,10 @@ +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,7 +1,6 @@ + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: files('org.gnome.Calendar.appdata.xml.in.in'), + output: 'org.gnome.Calendar.appdata.xml.in', From 8fc8f10a0fcbed11ec2a717603ef1954df06a11c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:00 +0100 Subject: [PATCH 0153/2369] gnome-characters: fix for meson 0.61 --- .../gnome-characters/patches/meson-0.61.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/gnome-characters/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-characters/patches/meson-0.61.patch b/srcpkgs/gnome-characters/patches/meson-0.61.patch new file mode 100644 index 00000000000..248f8d5dced --- /dev/null +++ b/srcpkgs/gnome-characters/patches/meson-0.61.patch @@ -0,0 +1,18 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -47,7 +47,6 @@ desktop_conf.set('appid', characters_application_id) + desktop_conf.set('bindir', characters_bindir) + + i18n.merge_file( +- 'desktop-file', + type: 'desktop', + input: configure_file ( + input: characters_name + '.desktop.in', +@@ -61,7 +60,6 @@ i18n.merge_file( + ) + + appdata_file = i18n.merge_file( +- 'appdata-file', + input: characters_name + '.appdata.xml.in', + output: characters_application_id + '.appdata.xml', + po_dir: po_dir, From a279b1e1ef3fdc31164e419a45858da1873f4ab6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 18:34:03 +0100 Subject: [PATCH 0154/2369] gnome-dictionary: fix for meson 0.61 --- .../gnome-dictionary/patches/meson-0.61.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 srcpkgs/gnome-dictionary/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-dictionary/patches/meson-0.61.patch b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch new file mode 100644 index 00000000000..768494e2a8c --- /dev/null +++ b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch @@ -0,0 +1,30 @@ +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,6 +1,6 @@ + appdata_conf = configuration_data() + appdata_conf.set('application_id', application_id) +-i18n.merge_file('appdata', ++i18n.merge_file( + input: configure_file( + input: 'org.gnome.Dictionary.appdata.xml.in.in', + output: 'org.gnome.Dictionary.appdata.xml.in', +--- a/data/meson.build ++++ b/data/meson.build +@@ -3,7 +3,7 @@ subdir('appdata') + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) + desktop_conf.set('application_id', application_id) +-i18n.merge_file('desktop', ++i18n.merge_file( + input: configure_file( + input: 'org.gnome.Dictionary.desktop.in.in', + output: 'org.gnome.Dictionary.desktop.in', +@@ -45,7 +45,7 @@ sources = [ + ] + + foreach s: sources +- i18n.merge_file('sources', ++ i18n.merge_file( + input: '@0@.in'.format(s), + output: s, + install: true, From 55b1a53325866c1e2f662538b5d2e1bf821c89d1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 0155/2369] gnome-disk-utility: fix for meson 0.61 --- .../patches/meson-0.61.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 srcpkgs/gnome-disk-utility/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch new file mode 100644 index 00000000000..09e0c33d079 --- /dev/null +++ b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch @@ -0,0 +1,34 @@ +From 46ed7d26873b9741dff61f9df8e7778a8dc6f5cc Mon Sep 17 00:00:00 2001 +From: rvalue +Date: Fri, 17 Dec 2021 12:29:30 +0000 +Subject: [PATCH] build: fix arguments of i18n.merge_file + +`i18n.merge_file` has been ignoring positional arguments for a time +and explicitly rejects with error since meson 0.60.0 +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index e38a1d8e..38fb5207 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -11,7 +11,6 @@ desktops = [ + + foreach desktop: desktops + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -38,7 +37,6 @@ install_data( + info = 'org.gnome.DiskUtility.appdata.xml' + + i18n.merge_file( +- info, + input: info + '.in', + output: info, + po_dir: po_dir, +-- +GitLab + From 2843885583d81f510d7711a224b3d508976b636d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 25 Mar 2022 23:45:53 +0100 Subject: [PATCH 0156/2369] gnome-documents: fix for meson 0.61 --- .../gnome-documents/patches/meson-0.61.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch new file mode 100644 index 00000000000..131d3450940 --- /dev/null +++ b/srcpkgs/gnome-documents/patches/meson-0.61.patch @@ -0,0 +1,18 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -56,7 +56,6 @@ foreach app: documents_apps + appdata = app + '.appdata.xml' + + appdata_file = i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +@@ -76,7 +75,6 @@ foreach app: documents_apps + desktop = app + '.desktop' + + desktop_file = i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, From e8a61f665e3395289c875bec40637ec5623633b6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 0157/2369] gnome-font-viewer: fix for meson 0.61 --- .../patches/meson-0.61.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 srcpkgs/gnome-font-viewer/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch new file mode 100644 index 00000000000..072ce27fd0d --- /dev/null +++ b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch @@ -0,0 +1,40 @@ +From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001 +From: r-value +Date: Thu, 30 Dec 2021 17:14:47 +0800 +Subject: [PATCH] Fix meson build with meson 0.60.0+ + +`i18n.merge_file` has been ignoring positional arguments for a time +and explicitly rejects with error since meson 0.60.0 +--- + data/meson.build | 2 +- + src/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index bfc9caa..8e42134 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,6 +1,6 @@ + appdatadir = join_paths(datadir, 'metainfo') + appdata_file = 'org.gnome.font-viewer.appdata.xml' +-merged_appdata = i18n.merge_file(appdata_file, ++merged_appdata = i18n.merge_file( + input: appdata_file + '.in', + output: appdata_file, + po_dir: '../po', +diff --git a/src/meson.build b/src/meson.build +index f863d45..826c59b 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop' + desktop_conf = configuration_data() + desktop_conf.set('VERSION', meson.project_version()) + desktop_conf.set('APPLICATION_ID', application_id) +-i18n.merge_file(desktop_file, ++i18n.merge_file( + input: configure_file(input: desktop_file + '.in.in', + output: desktop_file + '.in', + configuration: desktop_conf), +-- +GitLab + From 9c3c534ec8a043fab13ba9f26d94144b2aaa6f1d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 25 Mar 2022 23:45:56 +0100 Subject: [PATCH 0158/2369] gnome-games: fix for meson 0.61 --- srcpkgs/gnome-games/patches/meson-0.61.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch new file mode 100644 index 00000000000..0a3b006b227 --- /dev/null +++ b/srcpkgs/gnome-games/patches/meson-0.61.patch @@ -0,0 +1,20 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -44,7 +44,7 @@ mime_types = [ + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) + desktop_conf.set('mimetypes', ';'.join(mime_types) + ';') +-desktop_file = i18n.merge_file ('desktop-file', ++desktop_file = i18n.merge_file ( + type: 'desktop', + input: configure_file( + input: files('org.gnome.Games.desktop.in.in'), +@@ -70,7 +70,7 @@ endif + + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) +-appdata_file = i18n.merge_file ('appdata-file', ++appdata_file = i18n.merge_file ( + input: configure_file( + input: files('org.gnome.Games.appdata.xml.in.in'), + output: 'org.gnome.Games.appdata.xml.in', From 4352a8fce72842459bd033cbca6c63ffe678b446 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 18:14:37 +0100 Subject: [PATCH 0159/2369] gnome-mahjongg: fix for meson 0.61 --- .../gnome-mahjongg/patches/meson-0.61.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 srcpkgs/gnome-mahjongg/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch new file mode 100644 index 00000000000..2a17ad71375 --- /dev/null +++ b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch @@ -0,0 +1,37 @@ +From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 24 Jan 2022 11:22:48 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:24:0: ERROR: Function does not take positional arguments. +data/meson.build:45:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 8740503..edb8583 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes')) + install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes')) + + desktop_file = i18n.merge_file ( +- 'desktop-file', + input: 'org.gnome.Mahjongg.desktop.in', + output: 'org.gnome.Mahjongg.desktop', + install: true, +@@ -41,7 +40,7 @@ if desktop_file_validate.found() + ) + endif + +-appdata_file = i18n.merge_file ('appdata-file', ++appdata_file = i18n.merge_file ( + input: 'org.gnome.Mahjongg.appdata.xml.in', + output: 'org.gnome.Mahjongg.appdata.xml', + install: true, +-- +GitLab + From 3e4d5c21090b4de3a67822f38143e19f1a375503 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 0160/2369] gnome-music: fix for meson 0.61 --- srcpkgs/gnome-music/patches/meson-0.61.patch | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 srcpkgs/gnome-music/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-music/patches/meson-0.61.patch b/srcpkgs/gnome-music/patches/meson-0.61.patch new file mode 100644 index 00000000000..aca43b5608a --- /dev/null +++ b/srcpkgs/gnome-music/patches/meson-0.61.patch @@ -0,0 +1,30 @@ +From d9f35b542adbf6b0e1114c7c077df04212a98fc7 Mon Sep 17 00:00:00 2001 +From: Jean Felder +Date: Thu, 18 Nov 2021 12:09:26 +0100 +Subject: [PATCH] meson: Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 +where it returns a deprecation message: +"DEPRECATION: i18n.merge_file does not take any positional +arguments. This will become a hard error in the next Meson release." + +See: https://github.com/mesonbuild/meson/issues/9441 +--- + data/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 25ff1e102..145ee5221 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID) + appdata_conf.set('package_url', PACKAGE_URL) + appdata_conf.set('package_url_bug', PACKAGE_URL_BUG) + i18n.merge_file( +- 'appdata', + input: configure_file( + output: PROJECT_RDNN_NAME + '.appdata.xml.in', + input: PROJECT_RDNN_NAME + '.appdata.xml.in.in', +-- +GitLab + From e9d3facb45616e06bc1f14eadcad9eb738466f73 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 18:23:31 +0100 Subject: [PATCH 0161/2369] gnome-photos: fix for meson 0.61 --- srcpkgs/gnome-photos/patches/meson-0.61.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 srcpkgs/gnome-photos/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-photos/patches/meson-0.61.patch b/srcpkgs/gnome-photos/patches/meson-0.61.patch new file mode 100644 index 00000000000..f406b1c494c --- /dev/null +++ b/srcpkgs/gnome-photos/patches/meson-0.61.patch @@ -0,0 +1,32 @@ +From a0ac868a19d55dc52100e54fe4b2d29041bc6752 Mon Sep 17 00:00:00 2001 +From: rvalue +Date: Fri, 21 Jan 2022 12:36:02 +0000 +Subject: [PATCH] meson: remove incorrect args for i18n.merge_file + +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 6e7192e0..94271de2 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -3,7 +3,6 @@ subdir('icons') + appdata = photos_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +@@ -23,7 +22,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +-- +GitLab + From a025f4e0b6b59c79abd9089fb99f49a55d19e270 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 18:25:42 +0100 Subject: [PATCH 0162/2369] gnome-podcasts: fix for meson 0.61 --- .../gnome-podcasts/patches/meson-0.61.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 srcpkgs/gnome-podcasts/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-podcasts/patches/meson-0.61.patch b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch new file mode 100644 index 00000000000..b5ad823b70c --- /dev/null +++ b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch @@ -0,0 +1,38 @@ +From 6614bb62ecbec7c3b18ea7fe44beb50fe7942b27 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Thu, 20 Jan 2022 01:27:48 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments. +podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments. +--- + podcasts-gtk/resources/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/podcasts-gtk/resources/meson.build b/podcasts-gtk/resources/meson.build +index c1f1ee9f..87148087 100644 +--- a/podcasts-gtk/resources/meson.build ++++ b/podcasts-gtk/resources/meson.build +@@ -2,7 +2,7 @@ subdir('icons') + + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) +-desktop_file = i18n.merge_file ('desktop-file', ++desktop_file = i18n.merge_file ( + type: 'desktop', + input: configure_file( + input: files('org.gnome.Podcasts.desktop.in.in'), +@@ -27,7 +27,7 @@ endif + + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) +-appdata_file = i18n.merge_file ('appdata-file', ++appdata_file = i18n.merge_file ( + input: configure_file( + input: files('org.gnome.Podcasts.appdata.xml.in.in'), + output: 'org.gnome.Podcasts.appdata.xml.in', +-- +GitLab + From 3a126d53ffe4df70f74d831b07a7bc0f6b05e5fb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 18:27:03 +0100 Subject: [PATCH 0163/2369] gnome-screenshot: fix for meson 0.61 --- .../gnome-screenshot/patches/meson-0.61.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 srcpkgs/gnome-screenshot/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-screenshot/patches/meson-0.61.patch b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch new file mode 100644 index 00000000000..b21aa0490d4 --- /dev/null +++ b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch @@ -0,0 +1,36 @@ +From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001 +From: Jack Hill +Date: Thu, 18 Nov 2021 00:46:58 -0500 +Subject: [PATCH] meson: remove extraneous positional argument + +* data/meson.build (desktop_file) + (metainfo_file): Remove extraneous positional argument. + +Closes #186 +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd570b3..4e2e2e8 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,7 +1,6 @@ + gnome = import('gnome') + + desktop_file = i18n.merge_file( +- 'desktop', + type: 'desktop', + input: 'org.gnome.Screenshot.desktop.in', + output: 'org.gnome.Screenshot.desktop', +@@ -23,7 +22,6 @@ if desktop_file_validate.found() + endif + + metainfo_file = i18n.merge_file( +- 'appdata', + input: 'org.gnome.Screenshot.metainfo.xml.in', + output: 'org.gnome.Screenshot.metainfo.xml', + po_dir: join_paths(meson.current_source_dir(), '../po'), +-- +GitLab + From 51d11b34aa15d69db2c3c98ed5d461860bdb2a38 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 18:28:32 +0100 Subject: [PATCH 0164/2369] gnome-settings-daemon: fix for meson 0.61 --- .../patches/meson-0.61.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch new file mode 100644 index 00000000000..b7c03ca2da6 --- /dev/null +++ b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch @@ -0,0 +1,38 @@ +From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001 +From: Marvin Schmidt +Date: Wed, 26 Jan 2022 23:08:58 +0100 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. +--- + plugins/power/meson.build | 1 - + plugins/wacom/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/plugins/power/meson.build b/plugins/power/meson.build +index 69e619f2..014bb6da 100644 +--- a/plugins/power/meson.build ++++ b/plugins/power/meson.build +@@ -76,7 +76,6 @@ if host_is_linux + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: policy, + po_dir: po_dir, +diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build +index d8dd0ec7..c00323d4 100644 +--- a/plugins/wacom/meson.build ++++ b/plugins/wacom/meson.build +@@ -7,7 +7,6 @@ policy_in = configure_file( + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: policy, + po_dir: po_dir, +-- +GitLab + From b68f09780e73f18469195d17676b0c126ca525e0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 18:30:02 +0100 Subject: [PATCH 0165/2369] gnome-shell: fix for meson 0.61 --- srcpkgs/gnome-shell/patches/meson-0.61.patch | 82 ++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 srcpkgs/gnome-shell/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-shell/patches/meson-0.61.patch b/srcpkgs/gnome-shell/patches/meson-0.61.patch new file mode 100644 index 00000000000..ad3b7ef3923 --- /dev/null +++ b/srcpkgs/gnome-shell/patches/meson-0.61.patch @@ -0,0 +1,82 @@ +From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Thu, 23 Dec 2021 17:18:16 +0100 +Subject: [PATCH] build: Drop incorrect positional arg + +Unlike other targets that take a name, i18n.merge_file() does not. + +Part-of: +--- + data/meson.build | 2 +- + src/calendar-server/meson.build | 2 +- + subprojects/extensions-app/data/meson.build | 2 +- + subprojects/extensions-app/data/metainfo/meson.build | 2 +- + subprojects/extensions-tool/src/templates/meson.build | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index f924fdf806..76ae45c93a 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir) + desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') + + foreach desktop_file : desktop_files +- i18n.merge_file('desktop', ++ i18n.merge_file( + input: configure_file( + input: desktop_file + '.in.in', + output: desktop_file + '.in', +diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build +index 7363282a59..8b4ef411c8 100644 +--- a/src/calendar-server/meson.build ++++ b/src/calendar-server/meson.build +@@ -27,7 +27,7 @@ configure_file( + install_dir: servicedir + ) + +-i18n.merge_file('evolution-calendar.desktop', ++i18n.merge_file( + input: 'evolution-calendar.desktop.in', + output: 'evolution-calendar.desktop', + po_dir: po_dir, +diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build +index d7e7d4001c..4b601e8bd1 100644 +--- a/subprojects/extensions-app/data/meson.build ++++ b/subprojects/extensions-app/data/meson.build +@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir) + desktopconf.set('app_id', app_id) + desktopconf.set('prgname', prgname) + +-i18n.merge_file('desktop', ++i18n.merge_file( + input: configure_file( + input: base_id + '.desktop.in.in', + output: desktop_file + '.in', +diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build +index c4962c0576..a19bfa80a4 100644 +--- a/subprojects/extensions-app/data/metainfo/meson.build ++++ b/subprojects/extensions-app/data/metainfo/meson.build +@@ -1,5 +1,5 @@ + metainfo = app_id + '.metainfo.xml' +-i18n.merge_file(metainfo, ++i18n.merge_file( + input: base_id + '.metainfo.xml.in', + output: metainfo, + po_dir: po_dir, +diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build +index 670e2bf448..d693bfaddb 100644 +--- a/subprojects/extensions-tool/src/templates/meson.build ++++ b/subprojects/extensions-tool/src/templates/meson.build +@@ -4,7 +4,7 @@ template_metas = [ + ] + template_deps = [] + foreach template : template_metas +- template_deps += i18n.merge_file(template, ++ template_deps += i18n.merge_file( + input: template + '.in', + output: template, + po_dir: po_dir, +-- +GitLab + From 313bb1a30404a1c7e5ade3e6efbbd3581f51f1e1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 18:31:24 +0100 Subject: [PATCH 0166/2369] gnome-sound-recorder: fix for meson 0.61 --- .../patches/meson-0.61.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch new file mode 100644 index 00000000000..40392e6a9fe --- /dev/null +++ b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch @@ -0,0 +1,41 @@ +From 1335b1b1aff61167f8648f7cb3c569764031960d Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 24 Jan 2022 11:37:06 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/appdata/meson.build:5:0: ERROR: Function does not take positional arguments. +data/meson.build:16:0: ERROR: Function does not take positional arguments. +--- + data/appdata/meson.build | 1 - + data/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/data/appdata/meson.build b/data/appdata/meson.build +index 1f5744e..d2c2c3a 100644 +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id) + metainfo_conf.set('gettext-package', gettext_package) + + metainfo_file = i18n.merge_file( +- 'metainfo-file', + input: configure_file( + input: 'org.gnome.SoundRecorder.metainfo.xml.in.in', + output: '@BASENAME@', +diff --git a/data/meson.build b/data/meson.build +index 44117ad..0ff8fa5 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -14,7 +14,6 @@ install_data( + desktop_conf = configuration_data() + desktop_conf.set('app-id', application_id) + desktop_file = i18n.merge_file( +- 'desktop', + input: configure_file( + input: 'org.gnome.SoundRecorder.desktop.in.in', + output: '@BASENAME@', +-- +GitLab + From 4b7d11291c1593b185e299e914328a624f50bb5e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 19:05:16 +0100 Subject: [PATCH 0167/2369] gnome-sudoku: fix for meson 0.61 --- srcpkgs/gnome-sudoku/patches/meson-0.61.patch | 38 +++++++++++++++++++ srcpkgs/gnome-sudoku/template | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gnome-sudoku/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-sudoku/patches/meson-0.61.patch b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch new file mode 100644 index 00000000000..93549d0158d --- /dev/null +++ b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch @@ -0,0 +1,38 @@ +From 7c9935a02b48f332f67bad3e4ee020b75591084a Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 24 Jan 2022 11:44:06 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:5:0: ERROR: Function does not take positional arguments. +data/meson.build:24:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index f18f247..9c95e02 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml') + + resources = gnome.compile_resources('gnome-sudoku', resource_files) + +-desktop_file = i18n.merge_file('desktop', ++desktop_file = i18n.merge_file( + input: '@0@.desktop.in'.format(application_id), + output: '@0@.desktop'.format(application_id), + install: true, +@@ -21,7 +21,7 @@ if desktop_file_validate.found() + ) + endif + +-appdata_file = i18n.merge_file('appdata', ++appdata_file = i18n.merge_file( + input: '@0@.appdata.xml.in'.format(application_id), + output: '@0@.appdata.xml'.format(application_id), + install: true, +-- +GitLab + diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template index ed1759478ab..6e0af45248f 100644 --- a/srcpkgs/gnome-sudoku/template +++ b/srcpkgs/gnome-sudoku/template @@ -5,7 +5,7 @@ revision=1 build_helper="gir" build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config vala" -makedepends="gtk4-devel libgee08-devel json-glib-devel qqwing-devel" +makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel" short_desc="GNOME Sudoku Japanese logic game" maintainer="Orphaned " license="GPL-3.0-or-later" From 8dfc7a60c72529368c94e55bc3b6512734102bbc Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 21:56:48 +0100 Subject: [PATCH 0168/2369] gnome-taquin: fix for meson 0.61 --- srcpkgs/gnome-taquin/patches/meson-0.61.patch | 134 ++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 srcpkgs/gnome-taquin/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-taquin/patches/meson-0.61.patch b/srcpkgs/gnome-taquin/patches/meson-0.61.patch new file mode 100644 index 00000000000..e14267675ec --- /dev/null +++ b/srcpkgs/gnome-taquin/patches/meson-0.61.patch @@ -0,0 +1,134 @@ +From 99dea5e7863e112f33f16e59898c56a4f1a547b3 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Sat, 16 Jan 2021 14:00:15 +0100 +Subject: [PATCH] Don't alter or try to write [GtkChild] fields + +See https://gitlab.gnome.org/GNOME/vala/issues/1121 +--- + src/overlayed-list.vala | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/src/overlayed-list.vala b/src/overlayed-list.vala +index 3fbb1c3..eb2404a 100644 +--- a/src/overlayed-list.vala ++++ b/src/overlayed-list.vala +@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + internal void set_window_size (AdaptativeWidget.WindowSize new_size) + { + if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size)) +- set_horizontal (ref main_context, ref edit_mode_box); ++ set_horizontal (ref main_context, edit_mode_box); + else +- set_vertical (ref main_context, ref edit_mode_box); ++ set_vertical (ref main_context, edit_mode_box); + } +- private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box) ++ private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box) + { + main_context.remove_class ("vertical"); + edit_mode_box.halign = Align.END; +@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + edit_mode_box.width_request = 160; + main_context.add_class ("horizontal"); + } +- private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box) ++ private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box) + { + main_context.remove_class ("horizontal"); + edit_mode_box.halign = Align.CENTER; +@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + internal bool next_match () + { +- return _next_match (ref main_list_box); ++ return _next_match (main_list_box); + } +- private static inline bool _next_match (ref ListBox main_list_box) ++ private static inline bool _next_match (ListBox main_list_box) + { + ListBoxRow? row = main_list_box.get_selected_row (); // TODO multiple rows and focus-only lists + if (row == null) +@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + if (row == null) + { +- _scroll_bottom (ref main_list_box); ++ _scroll_bottom (main_list_box); + return false; + } + main_list_box.select_row ((!) row); +@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + internal bool previous_match () + { +- return _previous_match (ref main_list_box); ++ return _previous_match (main_list_box); + } +- private static inline bool _previous_match (ref ListBox main_list_box) ++ private static inline bool _previous_match (ListBox main_list_box) + { + uint n_items = main_list_box.get_children ().length (); // FIXME OverlayedList.n_items is unreliable + if (n_items == 0) +@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + protected int [] get_selected_rows_indices () + { +- return _get_selected_rows_indices (ref main_list_box); ++ return _get_selected_rows_indices (main_list_box); + } +- private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box) ++ private static inline int [] _get_selected_rows_indices (ListBox main_list_box) + { + int [] indices = new int [0]; + main_list_box.selected_foreach ((_list_box, selected_row) => { +@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + protected void scroll_top () + { +- _scroll_top (ref main_list_box); ++ _scroll_top (main_list_box); + } +- private static inline void _scroll_top (ref ListBox main_list_box) ++ private static inline void _scroll_top (ListBox main_list_box) + { + Adjustment adjustment = main_list_box.get_adjustment (); + adjustment.set_value (adjustment.get_lower ()); +@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + protected void scroll_bottom () + { +- _scroll_bottom (ref main_list_box); ++ _scroll_bottom (main_list_box); + } +- private static inline void _scroll_bottom (ref ListBox main_list_box) ++ private static inline void _scroll_bottom (ListBox main_list_box) + { + Adjustment adjustment = main_list_box.get_adjustment (); + adjustment.set_value (adjustment.get_upper ()); +@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + internal bool handle_copy_text (out string copy_text) + { +- return _handle_copy_text (out copy_text, ref main_list_box); ++ return _handle_copy_text (out copy_text, main_list_box); + } +- private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box) ++ private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box) + { + List selected_rows = main_list_box.get_selected_rows (); + OverlayedListRow row; +@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + internal SelectionState get_selection_state () + { +- return _get_selection_state (ref main_list_box, ref main_list_store); ++ return _get_selection_state (main_list_box, ref main_list_store); + } +- private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store) ++ private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store) + { + List selected_rows = main_list_box.get_selected_rows (); + uint n_selected_rows = selected_rows.length (); +-- +GitLab + From cd190e6f1e9e87f0ea784d267ab86027c1841f14 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 0169/2369] gnome-terminal: fix for meson 0.61 --- .../gnome-terminal/patches/meson-0.61.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 srcpkgs/gnome-terminal/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-terminal/patches/meson-0.61.patch b/srcpkgs/gnome-terminal/patches/meson-0.61.patch new file mode 100644 index 00000000000..8b6edbb923a --- /dev/null +++ b/srcpkgs/gnome-terminal/patches/meson-0.61.patch @@ -0,0 +1,47 @@ +From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Fri, 14 Jan 2022 11:33:32 +0100 +Subject: [PATCH] build: Fix for newer meson + +--- + data/meson.build | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 79d97e5b..e0bcbb91 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -18,7 +18,6 @@ + metainfodir = gt_datadir / 'metainfo' + + i18n.merge_file( +- gt_dns_name + '.metainfo.xml', + input: gt_dns_name + '.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -27,7 +26,6 @@ i18n.merge_file( + ) + + i18n.merge_file( +- gt_dns_name + '.Nautilus.metainfo.xml', + input: gt_dns_name + '.Nautilus.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -40,7 +38,6 @@ i18n.merge_file( + desktopdatadir = gt_datadir / 'applications' + + i18n.merge_file( +- gt_dns_name + '.desktop', + input: gt_dns_name + '.desktop.in', + output: '@BASENAME@', + type: 'desktop', +@@ -57,4 +54,4 @@ meson.add_install_script( + + # Subdirs + +-subdir('icons') +\ No newline at end of file ++subdir('icons') +-- +GitLab + From 01e999ecb14955e94a1f56542d5f9a47d6a69497 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 19:30:05 +0100 Subject: [PATCH 0170/2369] gnome-tetravex: fix for meson 0.61 --- .../gnome-tetravex/patches/meson-0.61.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 srcpkgs/gnome-tetravex/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-tetravex/patches/meson-0.61.patch b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch new file mode 100644 index 00000000000..12e0eab64ef --- /dev/null +++ b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch @@ -0,0 +1,38 @@ +From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 24 Jan 2022 11:48:22 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:37:0: ERROR: Function does not take positional arguments. +data/meson.build:59:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index bb77248..b881e8a 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -34,7 +34,7 @@ endif + + # Desktop file + if get_option('build_gui') +- desktop_file = i18n.merge_file ('desktop-file', ++ desktop_file = i18n.merge_file ( + input: project_id + '.desktop.in', + output: project_id + '.desktop', + install: true, +@@ -56,7 +56,7 @@ endif + + # AppData file + if get_option('build_gui') +- appdata_file = i18n.merge_file ('appdata-file', ++ appdata_file = i18n.merge_file ( + input: project_id + '.appdata.xml.in', + output: project_id + '.appdata.xml', + install: true, +-- +GitLab + From ad0529237289663ec0dc4c511a41218c0c1cef66 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 19:27:12 +0100 Subject: [PATCH 0171/2369] gnome-tweaks: fix for meson 0.61 --- srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch new file mode 100644 index 00000000000..80efde38735 --- /dev/null +++ b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch @@ -0,0 +1,32 @@ +From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001 +From: Mae Dartmann +Date: Wed, 16 Feb 2022 06:08:41 +0000 +Subject: [PATCH] meson: fix invalid positional argument + +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd6d5da..74f7e82 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,5 +1,5 @@ + appdata_file = 'org.gnome.tweaks.appdata.xml' +-i18n.merge_file(appdata_file, ++i18n.merge_file( + input: appdata_file + '.in', + output: appdata_file, + po_dir: '../po', +@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file, + ) + + desktop_file = 'org.gnome.tweaks.desktop' +-i18n.merge_file(desktop_file, ++i18n.merge_file( + input: desktop_file + '.in', + output: desktop_file, + po_dir: '../po', +-- +GitLab + From 608494985a0016f56a0bda87a05d4ce47295ed19 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 0172/2369] gnome-weather: fix for meson 0.61 --- srcpkgs/gnome-weather/patches/meson-0.61.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 srcpkgs/gnome-weather/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-weather/patches/meson-0.61.patch b/srcpkgs/gnome-weather/patches/meson-0.61.patch new file mode 100644 index 00000000000..a305b8c54dc --- /dev/null +++ b/srcpkgs/gnome-weather/patches/meson-0.61.patch @@ -0,0 +1,10 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -59,7 +59,6 @@ endif + appdata_conf = configuration_data() + appdata_conf.set('app_id', weather_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: '@0@.appdata.xml.in.in'.format(default_id), + output: '@0@.appdata.xml.in'.format(default_id), From 19e8cc8b389251242dc5ab5e47f4517189e8fa0d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 19:31:37 +0100 Subject: [PATCH 0173/2369] gnote: fix for meson 0.61 --- srcpkgs/gnote/patches/meson-0.61.patch | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 srcpkgs/gnote/patches/meson-0.61.patch diff --git a/srcpkgs/gnote/patches/meson-0.61.patch b/srcpkgs/gnote/patches/meson-0.61.patch new file mode 100644 index 00000000000..e5575c0fa3f --- /dev/null +++ b/srcpkgs/gnote/patches/meson-0.61.patch @@ -0,0 +1,36 @@ +From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 24 Jan 2022 11:53:17 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:4:0: ERROR: Function does not take positional arguments. +data/meson.build:41:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index a6138165..8d16368a 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,6 @@ install_man('gnote.1') + + desktop_file = 'org.gnome.Gnote.desktop' + gnote_desktop_file = i18n.merge_file( +- desktop_file, + type: 'desktop', + input: desktop_file + '.in', + output: desktop_file, +@@ -39,7 +38,6 @@ configure_file( + + gnote_appdata = 'org.gnome.Gnote.appdata.xml' + appdata_file = i18n.merge_file( +- gnote_appdata, + input: gnote_appdata + '.in', + output: gnote_appdata, + po_dir: '../po', +-- +GitLab + From 6edad91dd9657bbfe43be16781f9c3bd00c2e5e2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 0174/2369] gobject-introspection: fix for meson 0.61 --- .../patches/meson-0.61.patch | 294 ++++++++++++++++++ 1 file changed, 294 insertions(+) create mode 100644 srcpkgs/gobject-introspection/patches/meson-0.61.patch diff --git a/srcpkgs/gobject-introspection/patches/meson-0.61.patch b/srcpkgs/gobject-introspection/patches/meson-0.61.patch new file mode 100644 index 00000000000..44bf409b116 --- /dev/null +++ b/srcpkgs/gobject-introspection/patches/meson-0.61.patch @@ -0,0 +1,294 @@ +From 827494d6415b696a98fa195cbd883b50cc893bfc Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 11 Jan 2022 15:47:50 +0000 +Subject: [PATCH] doctool: Add templates_dir CLI argument + +We can find the templates directory using the module file once +installed, but when running uninstalled we need to have a way to specify +where the templates can be found in the sources directory. +--- + giscanner/docmain.py | 4 +++- + giscanner/docwriter.py | 14 ++++++++------ + 2 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/giscanner/docmain.py b/giscanner/docmain.py +index dab063ef..88430f05 100644 +--- a/giscanner/docmain.py ++++ b/giscanner/docmain.py +@@ -51,6 +51,8 @@ def doc_main(args): + parser.add_argument("-s", "--write-sections-file", + action="store_const", dest="format", const="sections", + help="Backwards-compatible equivalent to -f sections") ++ parser.add_argument("--templates-dir", ++ action="store") + + args = parser.parse_args(args[1:]) + if not args.output: +@@ -74,7 +76,7 @@ def doc_main(args): + with open(args.output, 'w', encoding='utf-8') as fp: + write_sections_file(fp, sections_file) + else: +- writer = DocWriter(transformer, args.language, args.format) ++ writer = DocWriter(transformer, args.language, args.format, args.templates_dir) + writer.write(args.output) + + return 0 +diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py +index d0cd610f..b72ab2ac 100644 +--- a/giscanner/docwriter.py ++++ b/giscanner/docwriter.py +@@ -1288,7 +1288,7 @@ LANGUAGES = { + + + class DocWriter(object): +- def __init__(self, transformer, language, output_format): ++ def __init__(self, transformer, language, output_format, templates_dir=None): + self._transformer = transformer + + try: +@@ -1300,18 +1300,20 @@ class DocWriter(object): + self._formatter = formatter_class(self._transformer) + self._language = self._formatter.language + self._output_format = output_format ++ self._templates_dir = templates_dir + + self._lookup = self._get_template_lookup() + + def _get_template_lookup(self): +- if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: ++ if self._templates_dir is not None: ++ srcdir = self._templates_dir ++ elif 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: + top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR'] +- srcdir = os.path.join(top_srcdir, 'giscanner') ++ srcdir = os.path.join(top_srcdir, 'giscanner', 'doctemplates') + else: +- srcdir = os.path.dirname(__file__) ++ srcdir = os.path.join(os.path.dirname(__file__), 'doctemplates') + +- template_dir = os.path.join(srcdir, 'doctemplates', +- self._formatter.output_format) ++ template_dir = os.path.join(srcdir, self._formatter.output_format) + + return TemplateLookup(directories=[template_dir], + module_directory=tempfile.mkdtemp(), +-- +GitLab + +From effb1e09dee263cdac4ec593e8caf316e6f01fe2 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 11 Jan 2022 15:51:10 +0000 +Subject: [PATCH] build: Avoid the doctemplates hack +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The hack that copies the doctemplates directory into the build +directory has stopped working with newer versions of Meson; while it's +possible to copy files, custom_target() cannot depend on a directory. +Additionally, the dependency has always been broken. + +Instead, we enumerate the template files—after all, it's not like they +change a lot—and then we list them as dependencies for the test targets. + +Fixes: #414 +--- + giscanner/doctemplates/devdocs/meson.build | 19 +++++++ + giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++ + giscanner/meson.build | 14 ++--- + tests/scanner/meson.build | 24 +++++---- + 4 files changed, 98 insertions(+), 22 deletions(-) + create mode 100644 giscanner/doctemplates/devdocs/meson.build + create mode 100644 giscanner/doctemplates/mallard/meson.build + +diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build +new file mode 100644 +index 00000000..2037182a +--- /dev/null ++++ b/giscanner/doctemplates/devdocs/meson.build +@@ -0,0 +1,19 @@ ++doc_templates += files([ ++ 'Gjs/_doc.tmpl', ++ 'Gjs/_index.tmpl', ++ 'Gjs/_method.tmpl', ++ 'Gjs/_methods.tmpl', ++ 'Gjs/_properties.tmpl', ++ 'Gjs/_signals.tmpl', ++ 'Gjs/_staticmethods.tmpl', ++ 'Gjs/_vfuncs.tmpl', ++ 'Gjs/base.tmpl', ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++]) +diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build +new file mode 100644 +index 00000000..5fe4e2af +--- /dev/null ++++ b/giscanner/doctemplates/mallard/meson.build +@@ -0,0 +1,63 @@ ++base_templates = files([ ++ 'base.tmpl', ++ 'class.tmpl', ++ 'namespace.tmpl', ++]) ++ ++c_templates = files([ ++ 'C/callback.tmpl', ++ 'C/class.tmpl', ++ 'C/constructor.tmpl', ++ 'C/default.tmpl', ++ 'C/enum.tmpl', ++ 'C/field.tmpl', ++ 'C/function.tmpl', ++ 'C/interface.tmpl', ++ 'C/method.tmpl', ++ 'C/namespace.tmpl', ++ 'C/property.tmpl', ++ 'C/record.tmpl', ++ 'C/signal.tmpl', ++ 'C/vfunc.tmpl', ++]) ++ ++gjs_templates = files([ ++ 'Gjs/callback.tmpl', ++ 'Gjs/class.tmpl', ++ 'Gjs/constructor.tmpl', ++ 'Gjs/default.tmpl', ++ 'Gjs/enum.tmpl', ++ 'Gjs/field.tmpl', ++ 'Gjs/function.tmpl', ++ 'Gjs/interface.tmpl', ++ 'Gjs/method.tmpl', ++ 'Gjs/namespace.tmpl', ++ 'Gjs/property.tmpl', ++ 'Gjs/record.tmpl', ++ 'Gjs/signal.tmpl', ++ 'Gjs/vfunc.tmpl', ++]) ++ ++py_templates = files([ ++ 'Python/callback.tmpl', ++ 'Python/class.tmpl', ++ 'Python/constructor.tmpl', ++ 'Python/default.tmpl', ++ 'Python/enum.tmpl', ++ 'Python/field.tmpl', ++ 'Python/function.tmpl', ++ 'Python/interface.tmpl', ++ 'Python/method.tmpl', ++ 'Python/namespace.tmpl', ++ 'Python/property.tmpl', ++ 'Python/record.tmpl', ++ 'Python/signal.tmpl', ++ 'Python/vfunc.tmpl', ++]) ++ ++doc_templates += [ ++ base_templates, ++ c_templates, ++ gjs_templates, ++ py_templates, ++] +diff --git a/giscanner/meson.build b/giscanner/meson.build +index 41edcd44..3d7dc678 100644 +--- a/giscanner/meson.build ++++ b/giscanner/meson.build +@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c', + + install_subdir('doctemplates', install_dir: giscannerdir) + +-# XXX: this doesn't track the input, but there is nothing to copy many files +-# in meson. +-doc_templates = custom_target('copy-templates', +- input : 'doctemplates', +- output : 'doctemplates', +- command : [ +- python, '-c', +- 'import sys, shutil;' + +- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' + +- 'shutil.copytree(sys.argv[1], sys.argv[2])', +- '@INPUT@', '@OUTPUT@']) ++doc_templates = [] ++subdir('doctemplates/devdocs') ++subdir('doctemplates/mallard') + + flex = find_program('flex', 'win_flex') + bison = find_program('bison', 'win_bison') +diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build +index 5176b957..b81b3fd5 100644 +--- a/tests/scanner/meson.build ++++ b/tests/scanner/meson.build +@@ -525,19 +525,26 @@ foreach gir : test_girs + endforeach + + if has_girdoctool and glib_dep.type_name() == 'pkgconfig' ++ doctool_env = environment() ++ doctool_env.set('srcdir', meson.current_source_dir()) ++ doctool_env.set('builddir', meson.current_build_dir()) ++ + foreach language : ['C', 'Python', 'Gjs'] + regress_docs = custom_target( + 'generate-docs-' + language, + input: regress_gir, +- depends: [doc_templates], ++ depend_files: doc_templates, + build_by_default: not cairo_deps_found, ++ env: doctool_env, + output: 'Regress-1.0-' + language, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), + '--add-include-path=' + meson.current_build_dir(), + '--language', language, +- '@INPUT@', '-o', '@OUTPUT@'], ++ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'), ++ '@INPUT@', '-o', '@OUTPUT@', ++ ], + ) + + if cairo_deps_found +@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-' + language], + depends: [regress_docs], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endforeach +@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + regress_sections = custom_target( + 'generate-docs-sections', + input: regress_gir, +- depends: [doc_templates], ++ depend_files: [doc_templates], + build_by_default: not cairo_deps_found, + output: 'Regress-1.0-sections.txt', ++ env: doctool_env, + command: [ + python, girdoctool, + '--add-include-path=' + join_paths(build_root, 'gir'), +@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' + python, + args: [gi_tester, 'Regress-1.0-sections.txt'], + depends: [regress_sections], +- env: [ +- 'srcdir=' + meson.current_source_dir(), +- 'builddir=' + meson.current_build_dir(), +- ], ++ env: doctool_env, + ) + endif + endif +-- +GitLab + From 94f6f5c9425bf241a779cec9720bd9b01bd5766a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 25 Jan 2022 10:11:01 +0100 Subject: [PATCH 0175/2369] gthumb: fix for meson 0.61 --- .../patches/linguas-remove-duplicate.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 srcpkgs/gthumb/patches/linguas-remove-duplicate.patch diff --git a/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch new file mode 100644 index 00000000000..00e9dde8466 --- /dev/null +++ b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch @@ -0,0 +1,24 @@ +From daef485dffd67319c114cf1bda453bf6157e11ff Mon Sep 17 00:00:00 2001 +From: Paolo Bacchilega +Date: Tue, 11 Jan 2022 12:30:44 +0100 +Subject: [PATCH] LINGUAS: removed duplicated entry + +--- + help/LINGUAS | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/help/LINGUAS b/help/LINGUAS +index b615195e..aabf71ac 100644 +--- a/help/LINGUAS ++++ b/help/LINGUAS +@@ -9,7 +9,6 @@ eu + fr + hu + id +-id + nl + oc + sl +-- +GitLab + From 2b5612e499c0659fb6dc55dfae8fe083e2cc2504 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 21:45:46 +0100 Subject: [PATCH 0176/2369] gtranslator: fix for meson 0.61 --- srcpkgs/gtranslator/patches/meson-0.61.patch | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch new file mode 100644 index 00000000000..54063041fe1 --- /dev/null +++ b/srcpkgs/gtranslator/patches/meson-0.61.patch @@ -0,0 +1,36 @@ +From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 24 Jan 2022 11:57:43 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:15:0: ERROR: Function does not take positional arguments. +data/meson.build:37:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 2ca0be0b..2ebbfb12 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -13,7 +13,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: '@0@.desktop'.format(gtr_app_id), +@@ -35,7 +34,6 @@ appdata_in = configure_file( + ) + + i18n.merge_file( +- appdata, + input: appdata_in, + output: appdata, + po_dir: po_dir, +-- +GitLab + From ac7dcb8f1b8a87c9f0f78c33682630dd07ff5c39 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 21:57:19 +0100 Subject: [PATCH 0177/2369] gvfs: fix for meson 0.61 --- srcpkgs/gvfs/patches/meson-0.61.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 srcpkgs/gvfs/patches/meson-0.61.patch diff --git a/srcpkgs/gvfs/patches/meson-0.61.patch b/srcpkgs/gvfs/patches/meson-0.61.patch new file mode 100644 index 00000000000..38f04b2e894 --- /dev/null +++ b/srcpkgs/gvfs/patches/meson-0.61.patch @@ -0,0 +1,10 @@ +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -366,7 +366,6 @@ if enable_admin + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: '@BASENAME@', + po_dir: po_dir, From dbd6d7a716da134cf0cd8599db17ab0e1e0d6f45 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 22 Mar 2022 22:42:58 +0100 Subject: [PATCH 0178/2369] harfbuzz: fix for meson 0.61 --- srcpkgs/harfbuzz/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template index 894a1b7bf9f..d5c501aa541 100644 --- a/srcpkgs/harfbuzz/template +++ b/srcpkgs/harfbuzz/template @@ -3,7 +3,7 @@ pkgname=harfbuzz version=3.3.1 revision=1 build_style=meson -build_helper=gir +build_helper="gir qemu" configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled -Dgraphite=enabled -Dintrospection=enabled" hostmakedepends="glib-devel pkg-config gtk-doc" From 46bbb5787fee06b37a1f1c5bfeab3d6cc69d8222 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 21:57:05 +0100 Subject: [PATCH 0179/2369] hitori: fix for meson 0.61 --- srcpkgs/hitori/patches/meson-0.61.patch | 41 +++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 srcpkgs/hitori/patches/meson-0.61.patch diff --git a/srcpkgs/hitori/patches/meson-0.61.patch b/srcpkgs/hitori/patches/meson-0.61.patch new file mode 100644 index 00000000000..37adaa0116e --- /dev/null +++ b/srcpkgs/hitori/patches/meson-0.61.patch @@ -0,0 +1,41 @@ +From d25728e122f1d7b985029a5ba96810c3e57c27f7 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Tue, 2 Nov 2021 12:04:29 +0000 +Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Meson never took positional arguments in this function, but didn’t warn +about it until Meson 0.60. Drop the unnecessary arguments to fix the +warning. + +Signed-off-by: Philip Withnall +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 97b8e68..c66a233 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,6 +1,6 @@ + subdir('icons') + +-desktop_file = i18n.merge_file('desktop-file', ++desktop_file = i18n.merge_file( + type: 'desktop', + input: '@0@.desktop.in'.format(application_id), + output: '@0@.desktop'.format(application_id), +@@ -20,7 +20,7 @@ if desktop_file_validate.found() + ) + endif + +-appdata_file = i18n.merge_file('appdata-file', ++appdata_file = i18n.merge_file( + input: '@0@.appdata.xml.in'.format(application_id), + output: '@0@.appdata.xml'.format(application_id), + po_dir: join_paths(meson.source_root(), 'po'), +-- +GitLab + From 17f769b8076aaa1c0fe9e69396384063640115a5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 12 Mar 2022 21:07:42 +0100 Subject: [PATCH 0180/2369] io.elementary.code: fix for meson 0.61 --- .../patches/meson-0.61.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/io.elementary.code/patches/meson-0.61.patch diff --git a/srcpkgs/io.elementary.code/patches/meson-0.61.patch b/srcpkgs/io.elementary.code/patches/meson-0.61.patch new file mode 100644 index 00000000000..87a88aabff4 --- /dev/null +++ b/srcpkgs/io.elementary.code/patches/meson-0.61.patch @@ -0,0 +1,22 @@ +From a2607cce3a6b1bb62d02456456d3cbc3c6530bb0 Mon Sep 17 00:00:00 2001 +From: Xeonacid +Date: Sat, 8 Jan 2022 02:00:25 +0800 +Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file + (#1165) + +--- + data/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index c2ff0c2881..1f3940d481 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -64,7 +64,6 @@ if get_option ('have_pkexec') + ) + + i18n.merge_file( +- 'policy', + input: policy_in, + output: meson.project_name() + '.policy', + po_dir: join_paths(meson.source_root (), 'po', 'extra'), From 6fc7109729dda7f4955f635f9f129104e79c9350 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 16 Mar 2022 22:54:07 +0100 Subject: [PATCH 0181/2369] io.elementary.music: fix for meson 0.61 --- .../patches/meson-0.61.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/io.elementary.music/patches/meson-0.61.patch diff --git a/srcpkgs/io.elementary.music/patches/meson-0.61.patch b/srcpkgs/io.elementary.music/patches/meson-0.61.patch new file mode 100644 index 00000000000..17393cc5aa0 --- /dev/null +++ b/srcpkgs/io.elementary.music/patches/meson-0.61.patch @@ -0,0 +1,18 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -27,7 +27,6 @@ install_data( + + i18n = import('i18n') + desktop_file = i18n.merge_file( +- 'desktop', + input: meson.project_name() + '.desktop.in', + output: meson.project_name() + '.desktop', + install: true, +@@ -37,7 +36,6 @@ desktop_file = i18n.merge_file( + ) + + appdata_file = i18n.merge_file( +- 'appdata', + input: meson.project_name() + '.appdata.xml.in', + output: meson.project_name() + '.appdata.xml', + install: true, From 1c5efbbf1ad1ba952e0e573293874dd1bd8fe1a4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 15 Mar 2022 20:24:34 +0100 Subject: [PATCH 0182/2369] io.elementary.terminal: fix for meson 0.61 --- .../patches/meson-0.61.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 srcpkgs/io.elementary.terminal/patches/meson-0.61.patch diff --git a/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch new file mode 100644 index 00000000000..7fd1fb45533 --- /dev/null +++ b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch @@ -0,0 +1,38 @@ +From 15e3ace08cb25e53941249fa1ee680a1e2f871b4 Mon Sep 17 00:00:00 2001 +From: Xeonacid +Date: Sat, 8 Jan 2022 02:00:28 +0800 +Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file + (#649) + +--- + data/meson.build | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 435b84172..a64fc120e 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -4,7 +4,6 @@ install_data( + ) + + i18n.merge_file ( +- 'desktop', + input: meson.project_name() + '.desktop.in', + output: meson.project_name() + '.desktop', + install: true, +@@ -14,7 +13,6 @@ i18n.merge_file ( + ) + + i18n.merge_file ( +- 'desktop', + input: 'open-pantheon-terminal-here.desktop.in', + output: 'open-pantheon-terminal-here.desktop', + install: true, +@@ -24,7 +22,6 @@ i18n.merge_file ( + ) + + i18n.merge_file ( +- 'appdata', + input: meson.project_name() + '.appdata.xml.in', + output: meson.project_name() + '.appdata.xml', + install: true, From 64f2cf15361716e20cd3ff9c6c6f4f683fff296a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 12 Mar 2022 17:07:09 +0100 Subject: [PATCH 0183/2369] libaccounts-glib: fix for meson 0.61 --- srcpkgs/libaccounts-glib/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template index ad3a6e0621a..9b86ed45ed9 100644 --- a/srcpkgs/libaccounts-glib/template +++ b/srcpkgs/libaccounts-glib/template @@ -17,9 +17,9 @@ checksum=eebb1c6debfcf929efb388a0f28d8cc8ec9b32f273e4abe4224a33e5d299cd73 if [ "$CROSS_BUILD" ]; then # Remove docs. During install of package, it will try # to run target binary with host, which causes exec error - pre_build() { - vsed -e '/docs/d' -i meson.build - } + post_patch() { + vsed -e '/docs/d' -i meson.build + } fi libaccounts-glib-devel_package() { From 6b51922f577c162f62fc09988139fc048f515423 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 12 Mar 2022 18:44:04 +0100 Subject: [PATCH 0184/2369] network-manager-applet: fix for meson 0.61 --- .../patches/meson-0.61.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/network-manager-applet/patches/meson-0.61.patch diff --git a/srcpkgs/network-manager-applet/patches/meson-0.61.patch b/srcpkgs/network-manager-applet/patches/meson-0.61.patch new file mode 100644 index 00000000000..1060e15b364 --- /dev/null +++ b/srcpkgs/network-manager-applet/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 21 Jan 2022 22:34:09 +0100 +Subject: [PATCH] meson.build: address meson 0.61 failures + +https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107 +--- + meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 33adb632..6178c0eb 100644 +--- a/meson.build ++++ b/meson.build +@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false) + + foreach desktop: desktop_files + i18n.merge_file( +- desktop + '-desktop', + input: desktop + '.desktop.in', + output: desktop + '.desktop', + install: true, +@@ -275,7 +274,6 @@ endforeach + appdata = 'nm-connection-editor.appdata.xml' + + i18n.merge_file( +- 'desktop', + input: appdata + '.in', + output: appdata, + install: true, +-- +GitLab + From 48f36f5f62b8eb92b6b754da9611361174578f27 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 25 Mar 2022 23:46:01 +0100 Subject: [PATCH 0185/2369] newsflash: fix for meson 0.61 --- srcpkgs/newsflash/patches/meson-0.61.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/newsflash/patches/meson-0.61.patch diff --git a/srcpkgs/newsflash/patches/meson-0.61.patch b/srcpkgs/newsflash/patches/meson-0.61.patch new file mode 100644 index 00000000000..bfc8a67d0aa --- /dev/null +++ b/srcpkgs/newsflash/patches/meson-0.61.patch @@ -0,0 +1,20 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,7 @@ subdir('icons') + + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) +-desktop_file = i18n.merge_file ('desktop-file', ++desktop_file = i18n.merge_file ( + type: 'desktop', + input: configure_file( + input: files('com.gitlab.newsflash.desktop.in.in'), +@@ -27,7 +27,7 @@ endif + + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) +-appdata_file = i18n.merge_file ('appdata-file', ++appdata_file = i18n.merge_file ( + input: configure_file( + input: files('com.gitlab.newsflash.appdata.xml.in.in'), + output: '@BASENAME@', From 3b97f166f37923ce0b5f1f8b8c265751cd8dd0b3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 25 Mar 2022 11:35:35 +0100 Subject: [PATCH 0186/2369] orc: fix for meson 0.61 --- srcpkgs/orc/template | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template index 36311464556..10f306289dd 100644 --- a/srcpkgs/orc/template +++ b/srcpkgs/orc/template @@ -3,8 +3,9 @@ pkgname=orc version=0.4.32 revision=1 build_style=meson -configure_args="-Dexamples=disabled -Dtests=disabled" -hostmakedepends="pkg-config gtk-doc" +build_helper="gir" +configure_args="-Dexamples=disabled -Dtests=disabled -Dgtk_doc=$(vopt_if gtk_doc enabled disabled)" +hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)" short_desc="Oild Runtime Compiler" maintainer="Orphaned " license="BSD-2-Clause" @@ -12,6 +13,12 @@ homepage="https://cgit.freedesktop.org/gstreamer/orc" distfiles="http://gstreamer.freedesktop.org/src/orc/orc-${version}.tar.xz" checksum=a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0 +build_options="gtk_doc" + +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" +fi + post_install() { vlicense COPYING } @@ -25,6 +32,8 @@ orc-devel_package() { vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove usr/share/aclocal - vmove usr/share/gtk-doc + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/gtk-doc + fi } } From 5b8b52ba5389198fef876dae68a056b1134d6245 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 16 Mar 2022 23:06:25 +0100 Subject: [PATCH 0187/2369] p11-kit: fix for meson 0.61 --- srcpkgs/p11-kit/patches/meson-0.61.patch | 42 ++++++++++++++++++++++++ srcpkgs/p11-kit/template | 14 ++++++-- 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/p11-kit/patches/meson-0.61.patch diff --git a/srcpkgs/p11-kit/patches/meson-0.61.patch b/srcpkgs/p11-kit/patches/meson-0.61.patch new file mode 100644 index 00000000000..43e75620c40 --- /dev/null +++ b/srcpkgs/p11-kit/patches/meson-0.61.patch @@ -0,0 +1,42 @@ +From 9f01a8a45ba913a9b65894cef9369b6010005096 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 11 Jan 2022 23:25:05 -0500 +Subject: [PATCH] gtkdoc: remove dependencies on custom target files + +Sadly, the `dependencies` kwarg does not actually do what it seems to be +trying to be used for, here. It is for listing dependency or library +objects whose compiler flags should be added to gtkdoc-scangobj. + +It will not actually add ninja target dependencies. The similar kwarg in +other meson functions (e.g. genmarshal and compile_schemas) that *do* +allow adding target dependencies, is `depend_files`. + +Older versions of meson simply did nothing in an if/elif/elif block +where these custom_targets never matched anything, and were thus +silently ignored. + +Meson 0.61 type-validates the arguments and rejects CustomTarget as +invalid: + +``` +doc/manual/meson.build:72:8: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget | PkgConfigDependency] but should have been array[Dependency | SharedLibrary | StaticLibrary] +``` + +Fixes #406 +--- + doc/manual/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/manual/meson.build b/doc/manual/meson.build +index cf8758db..560df8db 100644 +--- a/doc/manual/meson.build ++++ b/doc/manual/meson.build +@@ -73,7 +73,7 @@ if get_option('gtk_doc') + main_xml: 'p11-kit-docs.xml', + namespace: 'p11_kit', + src_dir: 'p11-kit', +- dependencies: libffi_deps + dlopen_deps + xml_deps, ++ dependencies: libffi_deps + dlopen_deps, + scan_args: [ + '--ignore-headers=' + ' '.join(ignore_headers), + '--rebuild-types', diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template index cc0b11eb720..63cdebc7563 100644 --- a/srcpkgs/p11-kit/template +++ b/srcpkgs/p11-kit/template @@ -3,8 +3,9 @@ pkgname=p11-kit version=0.23.22 revision=3 build_style=meson +build_helper="qemu" configure_args="-Dlibffi=enabled -Dsystemd=disabled -Dbash_completion=disabled - -Dgtk_doc=true -Dman=true -Dnls=true -Dtrust_module=enabled + -Dman=true $(vopt_bool gtk_doc gtk_doc) -Dnls=true -Dtrust_module=enabled -Dtrust_paths=/etc/ssl/certs/ca-certificates.crt" hostmakedepends="pkg-config gettext gtk-doc libxslt libtasn1-tools" makedepends="libtasn1-devel libffi-devel" @@ -22,6 +23,13 @@ else configure_args+=" -Dtest=false" fi +build_options="gtk_doc" +build_options_default="" + +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" +fi + post_install() { mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example \ ${DESTDIR}/etc/pkcs11/pkcs11.conf @@ -38,6 +46,8 @@ p11-kit-devel_package() { vmove usr/include vmove "usr/lib/*.so" vmove usr/lib/pkgconfig - vmove usr/share/gtk-doc + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/gtk-doc + fi } } From fc65dd976ef6ede1e4748f1033c243b1611a3cd7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 16 Mar 2022 23:30:51 +0100 Subject: [PATCH 0188/2369] pantheon-screenshot: fix for meson 0.61 --- .../patches/meson-0.61.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 srcpkgs/pantheon-screenshot/patches/meson-0.61.patch diff --git a/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch new file mode 100644 index 00000000000..8a64e9f14a5 --- /dev/null +++ b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch @@ -0,0 +1,29 @@ +From 80a5d942e813dd098e1ef0f6629b81d2ccef05ae Mon Sep 17 00:00:00 2001 +From: Bobby Rong +Date: Thu, 13 Jan 2022 13:51:48 +0800 +Subject: [PATCH] Fix data/meson.build (#241) + +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index cb2adc80..76dad525 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -20,7 +20,6 @@ install_data( + ) + + i18n.merge_file ( +- 'desktop', + input: 'screenshot.desktop.in', + output: meson.project_name() + '.desktop', + install: true, +@@ -30,7 +29,6 @@ i18n.merge_file ( + ) + + i18n.merge_file ( +- 'appdata', + input: 'screenshot.appdata.xml.in', + output: meson.project_name() + '.appdata.xml', + install: true, From aca0964009712dd0085d709963af7c3e7b62445e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 16 Mar 2022 23:33:07 +0100 Subject: [PATCH 0189/2369] polari: fix for meson 0.61 --- srcpkgs/polari/patches/meson-0.61.patch | 43 +++++++++++++++++++++++++ srcpkgs/polari/template | 1 + 2 files changed, 44 insertions(+) create mode 100644 srcpkgs/polari/patches/meson-0.61.patch diff --git a/srcpkgs/polari/patches/meson-0.61.patch b/srcpkgs/polari/patches/meson-0.61.patch new file mode 100644 index 00000000000..a9ed3bc5803 --- /dev/null +++ b/srcpkgs/polari/patches/meson-0.61.patch @@ -0,0 +1,43 @@ +From 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 24 Jan 2022 12:32:00 +0000 +Subject: [PATCH] meson: Drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/appdata/meson.build:2:0: ERROR: Function does not take positional arguments. +data/meson.build:5:0: ERROR: Function does not take positional arguments. + +Part-of: +--- + data/appdata/meson.build | 2 +- + data/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/appdata/meson.build b/data/appdata/meson.build +index 88b4a0be..781ba22f 100644 +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,5 +1,5 @@ + appdata_name = app_id + '.appdata.xml' +-appdata = i18n.merge_file(appdata_name, ++appdata = i18n.merge_file( + input: appdata_name + '.in', + output: appdata_name, + po_dir: '../../po', +diff --git a/data/meson.build b/data/meson.build +index cedfd57b..655ae700 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,7 @@ subdir('appdata') + subdir('icons') + + desktop_filename = app_id + '.desktop' +-desktop_file = i18n.merge_file(desktop_filename, ++desktop_file = i18n.merge_file( + input: desktop_filename + '.in', + output: desktop_filename, + po_dir: '../po', +-- +GitLab + diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template index fda5f194537..eb7c9d2dd3d 100644 --- a/srcpkgs/polari/template +++ b/srcpkgs/polari/template @@ -12,6 +12,7 @@ short_desc="GNOME IRC client" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Polari" +changelog="https://gitlab.gnome.org/GNOME/polari/-/raw/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=a3b05f81660370c67c942b6f44b298c7b78816feb38c926ec2212bde22ea40eb From 82fd432bad31cbb38a86967a977d8aa51ca77e29 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 16 Mar 2022 23:35:12 +0100 Subject: [PATCH 0190/2369] shotwell: fix for meson 0.61 --- srcpkgs/shotwell/patches/meson-0.61.patch | 27 +++++++++++++++++++++++ srcpkgs/shotwell/template | 1 + 2 files changed, 28 insertions(+) create mode 100644 srcpkgs/shotwell/patches/meson-0.61.patch diff --git a/srcpkgs/shotwell/patches/meson-0.61.patch b/srcpkgs/shotwell/patches/meson-0.61.patch new file mode 100644 index 00000000000..f33fa2af163 --- /dev/null +++ b/srcpkgs/shotwell/patches/meson-0.61.patch @@ -0,0 +1,27 @@ +From cc328b43ebb9a54a256ec73a86fb18381b2038e6 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 11 Jan 2022 21:57:26 -0500 +Subject: [PATCH] fix duplicate languages causing meson 0.61 to error out + +It tried to create multiple targets with the same name and generating +the same file. On older versions of meson, this was a run_target and +just ran twice, but was still wrong. +--- + help/LINGUAS | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/help/LINGUAS b/help/LINGUAS +index 68f089c4..5352eecd 100644 +--- a/help/LINGUAS ++++ b/help/LINGUAS +@@ -6,7 +6,6 @@ es + fr + hu + id +-id + lv + pt_BR + sv +-- +GitLab + diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index b0c1878e31b..386644d4939 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -14,6 +14,7 @@ short_desc="Open source photo manager for GNOME" maintainer="Enno Boland " license="LGPL-2.1-or-later, CC-BY-SA-3.0" homepage="https://wiki.gnome.org/Apps/Shotwell" +changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS" distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz" checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2 lib32disabled=yes From 799f3f286a1ccf80b6fb3d7b1910618dad7b3a14 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 16 Mar 2022 23:36:48 +0100 Subject: [PATCH 0191/2369] simple-scan: fix for meson 0.61 --- srcpkgs/simple-scan/patches/meson-0.61.patch | 37 ++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 srcpkgs/simple-scan/patches/meson-0.61.patch diff --git a/srcpkgs/simple-scan/patches/meson-0.61.patch b/srcpkgs/simple-scan/patches/meson-0.61.patch new file mode 100644 index 00000000000..e193747322c --- /dev/null +++ b/srcpkgs/simple-scan/patches/meson-0.61.patch @@ -0,0 +1,37 @@ +From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001 +From: r-value +Date: Tue, 16 Nov 2021 02:43:11 +0800 +Subject: [PATCH] Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 where +it fails with "ERROR: Function does not take positional arguments". +--- + data/meson.build | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 2b5a0ee3..cf6e4ae1 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml', + install_dir: join_paths (datadir, 'glib-2.0', 'schemas')) + meson.add_install_script ('meson_compile_gschema.py') + +-i18n.merge_file ('desktop-file', +- input: 'simple-scan.desktop.in', ++i18n.merge_file (input: 'simple-scan.desktop.in', + output: 'simple-scan.desktop', + install: true, + install_dir: join_paths (datadir, 'applications'), + po_dir: '../po', + type: 'desktop') + +-i18n.merge_file ('appdata-file', +- input: 'simple-scan.appdata.xml.in', ++i18n.merge_file (input: 'simple-scan.appdata.xml.in', + output: 'simple-scan.appdata.xml', + install: true, + install_dir: join_paths (datadir, 'metainfo'), +-- +GitLab + From 7317e0295e07a154a85394212f550fcb17047b6f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 16 Mar 2022 23:39:25 +0100 Subject: [PATCH 0192/2369] sound-juicer: fix for meson 0.61 --- srcpkgs/sound-juicer/patches/meson-0.61.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 srcpkgs/sound-juicer/patches/meson-0.61.patch diff --git a/srcpkgs/sound-juicer/patches/meson-0.61.patch b/srcpkgs/sound-juicer/patches/meson-0.61.patch new file mode 100644 index 00000000000..662b7d631f6 --- /dev/null +++ b/srcpkgs/sound-juicer/patches/meson-0.61.patch @@ -0,0 +1,35 @@ +From 9f97ca1faca396099f52264a9729aa355f8d122e Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Tue, 25 Jan 2022 12:15:31 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:2:0: ERROR: Function does not take positional arguments. +data/meson.build:31:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index ccff2d80..4dac8166 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,6 +1,5 @@ + # Desktop file + i18n.merge_file( +- 'desktop', + input: configure_file( + input: 'org.gnome.SoundJuicer.desktop.in.in', + output: 'org.gnome.SoundJuicer.desktop.in', +@@ -29,7 +28,6 @@ configure_file( + + # Metainfo + metainfo_file = i18n.merge_file( +- 'metainfo', + input: files(join_paths('metainfo', 'org.gnome.SoundJuicer.metainfo.xml.in')), + output: 'org.gnome.SoundJuicer.metainfo.xml', + po_dir: po_dir, +-- +GitLab + From 6fb661d73e153f2a6f6c191734623128f20c7ce8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 16 Mar 2022 23:40:28 +0100 Subject: [PATCH 0193/2369] switchboard: fix for meson 0.61 --- srcpkgs/switchboard/patches/meson-0.61.patch | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 srcpkgs/switchboard/patches/meson-0.61.patch diff --git a/srcpkgs/switchboard/patches/meson-0.61.patch b/srcpkgs/switchboard/patches/meson-0.61.patch new file mode 100644 index 00000000000..cf29004ec33 --- /dev/null +++ b/srcpkgs/switchboard/patches/meson-0.61.patch @@ -0,0 +1,30 @@ +From ecf2a6c42122946cc84150f6927ef69c1f67c909 Mon Sep 17 00:00:00 2001 +From: Xeonacid +Date: Sat, 8 Jan 2022 01:58:44 +0800 +Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file + (#226) + +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index c456813..109554d 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,5 +1,5 @@ + po_extra_dir = join_paths(meson.source_root(), 'po', 'extra') +-i18n.merge_file('desktop', ++i18n.merge_file( + input: 'io.elementary.switchboard.desktop.in', + output: 'io.elementary.switchboard.desktop', + install: true, +@@ -8,7 +8,7 @@ i18n.merge_file('desktop', + type: 'desktop' + ) + +-i18n.merge_file('appdata', ++i18n.merge_file( + input: 'io.elementary.switchboard.appdata.xml.in', + output: 'io.elementary.switchboard.appdata.xml', + install: true, From 3aa45ee73794a332572834614b50ecc60d754a22 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 17 Mar 2022 00:05:03 +0100 Subject: [PATCH 0194/2369] tau: fix for meson 0.61 --- srcpkgs/tau/patches/meson-0.61.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/tau/patches/meson-0.61.patch diff --git a/srcpkgs/tau/patches/meson-0.61.patch b/srcpkgs/tau/patches/meson-0.61.patch new file mode 100644 index 00000000000..d7ec3e3365b --- /dev/null +++ b/srcpkgs/tau/patches/meson-0.61.patch @@ -0,0 +1,17 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,4 +1,4 @@ +-desktop_file = i18n.merge_file ('desktop-file', ++desktop_file = i18n.merge_file ( + type: 'desktop', + input: configure_file( + input: files('org.gnome.Tau.desktop.in.in'), +@@ -22,7 +22,7 @@ if desktop_file_validate.found() + ) + endif + +-appdata_file = i18n.merge_file ('appdata-file', ++appdata_file = i18n.merge_file ( + input: configure_file( + input: files('org.gnome.Tau.appdata.xml.in.in'), + output: 'org.gnome.Tau.appdata.xml.in', From 373449a57b0d12c4e39651d630d70d746a8ce5bf Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 14:28:48 +0100 Subject: [PATCH 0195/2369] tilix: fix for meson 0.61 --- srcpkgs/tilix/patches/meson-0.61.patch | 33 ++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/tilix/patches/meson-0.61.patch diff --git a/srcpkgs/tilix/patches/meson-0.61.patch b/srcpkgs/tilix/patches/meson-0.61.patch new file mode 100644 index 00000000000..c35c8d08ad0 --- /dev/null +++ b/srcpkgs/tilix/patches/meson-0.61.patch @@ -0,0 +1,33 @@ +From 7cb2c59a31891f6463d1b181f1ec461c9352d782 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Tue, 22 Feb 2022 12:06:23 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() (#2081) + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:13:0: ERROR: Function does not take positional arguments. +data/meson.build:46:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 81e9b410..c8b23e1b 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -11,7 +11,6 @@ install_data( + + # Install the desktop file + desktop_file = i18n.merge_file( +- '@0@.desktop'.format(project_id), + output: '@BASENAME@', + input: 'pkg/desktop/@0@.desktop.in'.format(project_id), + po_dir: meson.source_root() / 'po', +@@ -44,7 +43,6 @@ metainfo_with_releases = custom_target('metainfo-news-merge', + + # Install the MetaInfo file + metainfo_file = i18n.merge_file( +- tilix_metainfo_name, + output: tilix_metainfo_name, + input: metainfo_with_releases, + po_dir: meson.source_root() / 'po', From c59fa41e6edafd1359455dc7f3658b84f985648b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 17 Mar 2022 00:09:00 +0100 Subject: [PATCH 0196/2369] totem: fix for meson 0.61 --- srcpkgs/totem/patches/meson-0.61.patch | 39 ++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 srcpkgs/totem/patches/meson-0.61.patch diff --git a/srcpkgs/totem/patches/meson-0.61.patch b/srcpkgs/totem/patches/meson-0.61.patch new file mode 100644 index 00000000000..8f05c5c7a01 --- /dev/null +++ b/srcpkgs/totem/patches/meson-0.61.patch @@ -0,0 +1,39 @@ +From 61e3a957cb7339c6614e764fcf1120d967d687e9 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 6 Jan 2022 17:21:28 +0100 +Subject: [PATCH] build: Remove unused i18n.merge_file() "name" + +data/meson.build:78:0: ERROR: Function does not take positional arguments. +data/appdata/meson.build:3:0: ERROR: Function does not take positional arguments. +--- + data/appdata/meson.build | 1 - + data/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/data/appdata/meson.build b/data/appdata/meson.build +index c4d17e927..c2e646327 100644 +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,7 +1,6 @@ + appdata = 'org.gnome.Totem.appdata.xml' + + appdata_file = i18n.merge_file ( +- 'appdata', + input: appdata + '.in', + output: appdata, + install: true, +diff --git a/data/meson.build b/data/meson.build +index b31ce755c..8eebe3db1 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -76,7 +76,6 @@ desktop_in = configure_file( + ) + + desktop_file = i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +-- +GitLab + From 007315d74538ed43012a61380052055ef6dfbd21 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 17 Mar 2022 00:14:03 +0100 Subject: [PATCH 0197/2369] virt-viewer: fix for meson 0.61 --- srcpkgs/virt-viewer/patches/meson-0.61.patch | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 srcpkgs/virt-viewer/patches/meson-0.61.patch diff --git a/srcpkgs/virt-viewer/patches/meson-0.61.patch b/srcpkgs/virt-viewer/patches/meson-0.61.patch new file mode 100644 index 00000000000..0b900e1f212 --- /dev/null +++ b/srcpkgs/virt-viewer/patches/meson-0.61.patch @@ -0,0 +1,26 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,6 @@ if host_machine.system() != 'windows' + desktop = 'remote-viewer.desktop' + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -14,7 +13,6 @@ if host_machine.system() != 'windows' + mimetypes = 'virt-viewer-mime.xml' + + i18n.merge_file ( +- mimetypes, + type: 'xml', + input: mimetypes + '.in', + output: mimetypes, +@@ -27,7 +25,6 @@ if host_machine.system() != 'windows' + metainfo = 'remote-viewer.appdata.xml' + + i18n.merge_file ( +- metainfo, + type: 'xml', + input: metainfo + '.in', + output: metainfo, From e6928816e5771c8db92b36da52bd8cf884915a8a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 26 Mar 2022 13:45:18 +0100 Subject: [PATCH 0198/2369] janet: update to 1.21.0. --- srcpkgs/janet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template index d7a6b871124..30c4dc43db4 100644 --- a/srcpkgs/janet/template +++ b/srcpkgs/janet/template @@ -1,6 +1,6 @@ # Template file for 'janet' pkgname=janet -version=1.20.0 +version=1.21.0 revision=1 build_style=meson configure_args="-Db_lto=false" # breaks jpm @@ -10,7 +10,7 @@ license="MIT" homepage="https://janet-lang.org/" changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md" distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz" -checksum=cc2e617e2bdffaeca0fc330c890c73a83e2211b4ff65555d58973c47376bf5b1 +checksum=8e53efcdeda9b7519248bef5f0e744ad947e013b14960c66ba75967c5fb0a7fd post_install() { vlicense LICENSE From 2f200e2e7d295a2bf25b4c216b0b168e0229341f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 26 Mar 2022 13:50:01 +0100 Subject: [PATCH 0199/2369] stress-ng: update to 0.13.12. --- srcpkgs/stress-ng/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template index 5f94f17799c..d13629b279b 100644 --- a/srcpkgs/stress-ng/template +++ b/srcpkgs/stress-ng/template @@ -1,6 +1,6 @@ # Template file for 'stress-ng' pkgname=stress-ng -version=0.13.11 +version=0.13.12 revision=1 build_style=gnu-makefile make_use_env=1 @@ -9,4 +9,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/ColinIanKing/stress-ng/" distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz" -checksum=b7327cd0d01e331541648a545ec5a69c33202659afc26a8602042399e1fd4fdd +checksum=16540d9cfa80d6a274fc0238d7251675ee38df6d5be805d14a67ce9efcb59ce9 From e0ad92885f8dc92920b6ce83040da8eb67825793 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 26 Mar 2022 13:50:45 +0100 Subject: [PATCH 0200/2369] iana-etc: update to 20220325. --- srcpkgs/iana-etc/files/services | 7 +++++-- srcpkgs/iana-etc/template | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services index 511b3346bea..94b9380da4f 100644 --- a/srcpkgs/iana-etc/files/services +++ b/srcpkgs/iana-etc/files/services @@ -7628,6 +7628,7 @@ dsmipv6 4191/udp azeti 4192/tcp azeti-bd 4192/udp pvxplusio 4193/tcp +spdm 4194/tcp aws-wsp 4195/tcp aws-wsp 4195/udp aws-wsp 4195/sctp @@ -7664,6 +7665,8 @@ perrla 4313/tcp choiceview-agt 4314/tcp choiceview-clt 4316/tcp opentelemetry 4317/tcp +fox-skytale 4319/tcp +fox-skytale 4319/udp fdt-rcatp 4320/tcp fdt-rcatp 4320/udp rwhois 4321/tcp @@ -8249,8 +8252,6 @@ strexec-s 5027/udp qvr 5028/tcp infobright 5029/tcp infobright 5029/udp -surfpass 5030/tcp -surfpass 5030/udp dmp 5031/udp signacert-agent 5032/tcp jtnetd-server 5033/tcp @@ -9973,6 +9974,7 @@ espeech 8416/udp espeech-rtp 8417/tcp espeech-rtp 8417/udp aritts 8423/tcp +pgbackrest 8432/tcp cybro-a-bus 8442/tcp cybro-a-bus 8442/udp pcsync-https 8443/tcp @@ -11329,6 +11331,7 @@ ng-control 38412/sctp xn-control 38422/sctp e1-interface 38462/sctp f1-control 38472/sctp +psqlmws 38638/tcp sruth 38800/tcp secrmmsafecopya 38865/tcp vroa 39063/tcp diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template index aca09e0e1e4..e4d7a60c37c 100644 --- a/srcpkgs/iana-etc/template +++ b/srcpkgs/iana-etc/template @@ -1,7 +1,7 @@ # Template file for 'iana-etc' pkgname=iana-etc reverts="202001016_1" -version=20211229 +version=20220325 revision=1 bootstrap=yes short_desc="Unix /etc/services and /etc/protocols files" From 53e788a8c4f6c1bb4d607b73a6422a3a6f02b246 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 26 Mar 2022 13:54:12 +0100 Subject: [PATCH 0201/2369] coq: update to 8.15.1. --- srcpkgs/coq/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template index b7ddbfe70a3..fcfbc92cb2f 100644 --- a/srcpkgs/coq/template +++ b/srcpkgs/coq/template @@ -1,14 +1,14 @@ # Template file for 'coq' pkgname=coq -version=8.15.0 -revision=2 +version=8.15.1 +revision=1 hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith" short_desc="Proof assistant written in OCaml" maintainer="Leah Neukirchen " license="LGPL-2.1-only" homepage="https://coq.inria.fr" distfiles="https://github.com/coq/coq/archive/V${version}.tar.gz" -checksum=73466e61f229b23b4daffdd964be72bd7a110963b9d84bd4a86bb05c5dc19ef3 +checksum=513e953b7183d478acb75fd6e80e4dc32ac1a918cf4343ac31a859cfb4e9aad2 nopie=yes nocross=yes From 6c9afe97a488056b25a41cda4fbb34bdd5c44da1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 26 Mar 2022 14:04:06 +0100 Subject: [PATCH 0202/2369] erlang: update to 24.3.2. --- srcpkgs/erlang/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index fc8bd893714..d59eeb464e7 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,6 +1,6 @@ # Template file for 'erlang' pkgname=erlang -version=24.2.2 +version=24.3.2 revision=1 create_wrksrc=yes build_wrksrc="otp-OTP-${version}" @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="http://www.erlang.org/" changelog="https://github.com/erlang/otp/releases" distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz" -checksum=b6adfc0bf14d94348146ae26cc38d09dca545f8e14ebab7ddcf9482a6e8d1162 +checksum=cdc9cf788d28a492eb6b24881fbd06a0a5c785dc374ad415b3be1db96326583c subpackages="erlang-doc" if [ -z "$CROSS_BUILD" ]; then From 7e6ecbff360a157cfb2ad23a547f40c7a3dbb28e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 26 Mar 2022 15:38:16 +0100 Subject: [PATCH 0203/2369] python3-pipenv: update to 2022.3.24. --- srcpkgs/python3-pipenv/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template index cae723465c0..4d0f0ec7e28 100644 --- a/srcpkgs/python3-pipenv/template +++ b/srcpkgs/python3-pipenv/template @@ -1,6 +1,6 @@ # Template file for 'python3-pipenv' pkgname=python3-pipenv -version=2022.1.8 +version=2022.3.24 revision=1 wrksrc="pipenv-${version}" build_style=python3-module @@ -10,8 +10,9 @@ short_desc="Python Development Workflow for Humans" maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/pypa/pipenv" +changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst" distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz" -checksum=f84d7119239b22ab2ac2b8fbc7d619d83cf41135206d72a17c4f151cda529fd0 +checksum=800198d430e724f899e6db319cc640d5fd6da2acdbc301ceb1a1f967e990428b conflicts="python-pipenv>=0" post_extract() { @@ -20,7 +21,4 @@ post_extract() { post_install() { vlicense LICENSE - # remove files only valid for Python 2 - rm -rf ${DESTDIR}/${py3_sitelib}/pipenv/patched/yaml2 - rm -f ${DESTDIR}/${py3_sitelib}/pipenv/vendor/importlib_resources/_py2.py } From 9e0b0f4e74f5ac03cef9ce196037eabb0f9e3c31 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Mar 2022 15:23:00 +0100 Subject: [PATCH 0204/2369] .github: improve the PR template * avoid confusion with [skip CI] and [ci skip] --- .github/pull_request_template.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index cc4b5721590..ef2a5d7637a 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -8,7 +8,8 @@ - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> - From 2e7c14e9e582855eefd683b70fbff55734b6a1aa Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 25 Mar 2022 21:58:04 +0100 Subject: [PATCH 0205/2369] glib: update to 2.72.0. --- .../glib/patches/disable-broken-tests.patch | 56 ++++++------ srcpkgs/glib/patches/fix-formatd.patch | 86 ------------------- srcpkgs/glib/template | 6 +- 3 files changed, 30 insertions(+), 118 deletions(-) delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch index c6bb8d96fad..2a526300750 100644 --- a/srcpkgs/glib/patches/disable-broken-tests.patch +++ b/srcpkgs/glib/patches/disable-broken-tests.patch @@ -1,14 +1,14 @@ --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -50,7 +50,6 @@ gio_tests = { - 'cancellable' : {}, - 'contexts' : {}, - 'contenttype' : {}, +@@ -56,7 +56,6 @@ gio_tests = { + # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251 + 'should_fail' : host_system == 'darwin', + }, - 'converter-stream' : {}, 'credentials' : {}, - 'data-input-stream' : {}, - 'data-output-stream' : {}, -@@ -74,7 +73,6 @@ gio_tests = { + 'cxx' : { + 'source' : ['cxx.cpp'], +@@ -91,7 +90,6 @@ gio_tests = { 'network-monitor' : {}, 'network-monitor-race' : {}, 'permission' : {}, @@ -16,15 +16,15 @@ 'power-profile-monitor' : {}, 'proxy-test' : {}, 'readwrite' : {}, -@@ -151,7 +149,6 @@ endif +@@ -174,7 +172,6 @@ endif # Test programs buildable on UNIX only if host_machine.system() != 'windows' gio_tests += { - 'file' : {}, 'gdbus-peer' : { 'dependencies' : [libgdbus_example_objectmanager_dep], - 'install_rpath' : installed_tests_execdir -@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() + 'install_rpath' : installed_tests_execdir, +@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources_binary2, ] endif @@ -32,6 +32,8 @@ - gio_tests += { - 'resources' : { - 'extra_sources' : resources_extra_sources, +- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 +- 'should_fail' : host_system == 'darwin', - }, - } endif @@ -39,29 +41,33 @@ foreach test_name, extra_args : gio_tests --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -11,21 +11,14 @@ glib_tests = { +@@ -11,25 +11,17 @@ glib_tests = { 'cache' : {}, 'charset' : {}, 'checksum' : {}, - 'collate' : {}, + 'completion' : {}, 'cond' : {}, - 'convert' : {}, 'cxx' : { 'source' : ['cxx.cpp'], }, 'dataset' : {}, -- 'date' : {}, - 'dir' : {}, - 'environment' : {}, -- 'error' : {}, - 'fileutils' : {}, -- 'gdatetime' : { -- 'suite' : ['slow'], +- 'date' : { +- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 +- 'should_fail' : host_system == 'darwin', - }, - 'guuid' : {}, - 'gvariant' : { + 'dir' : {}, + 'environment' : { + # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 + 'should_fail' : host_system == 'darwin', + }, +- 'error' : {}, +- 'fileutils' : {}, + 'gdatetime' : { 'suite' : ['slow'], -@@ -57,7 +50,6 @@ glib_tests = { + }, +@@ -65,7 +57,6 @@ glib_tests = { 'mutex' : {}, 'node' : {}, 'once' : {}, @@ -69,11 +75,3 @@ 'option-argv0' : {}, 'overflow' : {}, 'overflow-fallback' : { -@@ -102,7 +94,6 @@ glib_tests = { - 'thread' : {}, - 'thread-pool' : {}, - 'timeout' : {}, -- 'timer' : {}, - 'tree' : {}, - 'utf8-performance' : {}, - 'utf8-pointer' : {}, diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch deleted file mode 100644 index 2249ff5a450..00000000000 --- a/srcpkgs/glib/patches/fix-formatd.patch +++ /dev/null @@ -1,86 +0,0 @@ -From: =?UTF-8?q?=C3=89rico=20Nogueira?= -[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE. - -Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are -available. This way, we can still use the _g_snprintf() path for some -functions, and also use the *_l functions when they are available. - -newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l -functions being used are nonstandard glibc extensions. Gating all the -locale functionality behind them meant we were using fallbacks on non -glibc platforms unnecessarily. - -Further changes to this code could add fallback for the non _l suffixed -number parsing functions, but that might be unnecessary complexity. - -Fixes #2553 ---- - glib/gstrfuncs.c | 17 +++++++---------- - 1 file changed, 7 insertions(+), 10 deletions(-) - -diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c -index ea710c7a1..e486251ab 100644 ---- a/glib/gstrfuncs.c -+++ b/glib/gstrfuncs.c -@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = { - - const guint16 * const g_ascii_table = ascii_table_data; - --#if defined (HAVE_NEWLOCALE) && \ -- defined (HAVE_USELOCALE) && \ -- defined (HAVE_STRTOD_L) && \ -- defined (HAVE_STRTOULL_L) && \ -- defined (HAVE_STRTOLL_L) -+#if defined(HAVE_NEWLOCALE) && \ -+ defined(HAVE_USELOCALE) - #define USE_XLOCALE 1 - #endif - -@@ -731,7 +728,7 @@ gdouble - g_ascii_strtod (const gchar *nptr, - gchar **endptr) - { --#ifdef USE_XLOCALE -+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L) - - g_return_val_if_fail (nptr != NULL, 0); - -@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar *buffer, - #define TOUPPER(c) (ISLOWER (c) ? (c) - 'a' + 'A' : (c)) - #define TOLOWER(c) (ISUPPER (c) ? (c) - 'A' + 'a' : (c)) - --#ifndef USE_XLOCALE -+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) - - static guint64 - g_parse_long_long (const gchar *nptr, -@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar *nptr, - } - return 0; - } --#endif /* !USE_XLOCALE */ -+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */ - - /** - * g_ascii_strtoull: -@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr, - gchar **endptr, - guint base) - { --#ifdef USE_XLOCALE -+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L) - return strtoull_l (nptr, endptr, base, get_C_locale ()); - #else - gboolean negative; -@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr, - gchar **endptr, - guint base) - { --#ifdef USE_XLOCALE -+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L) - return strtoll_l (nptr, endptr, base, get_C_locale ()); - #else - gboolean negative; --- -2.34.1 - diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 0cd7eee4f69..d301dadb899 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,6 +1,6 @@ # Template file for 'glib' pkgname=glib -version=2.70.2 +version=2.72.0 revision=1 build_style=meson # static version is necessary for qemu-user-static; @@ -15,9 +15,9 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GLib" #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS" -changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS" +changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz" -checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f +checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d build_options="gtk_doc" desc_option_gtk_doc="Build GTK API docs" From 22b477311a12344d089576acf424054eaa0e084e Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Thu, 3 Mar 2022 10:48:23 +0700 Subject: [PATCH 0206/2369] New package: upterm-0.7.6 --- srcpkgs/upterm/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/upterm/template diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template new file mode 100644 index 00000000000..362f919c40e --- /dev/null +++ b/srcpkgs/upterm/template @@ -0,0 +1,21 @@ +# Template file for 'upterm' +pkgname=upterm +version=0.7.6 +revision=1 +build_style=go +go_import_path="github.com/owenthereal/upterm" +go_package="${go_import_path}/cmd/upterm" +short_desc="Secure Terminal Sharing" +maintainer="Hervy Qurrotul Ainur Rozi " +license="Apache-2.0" +homepage="https://github.com/owenthereal/upterm/" +distfiles="https://github.com/owenthereal/upterm/archive/refs/tags/v$version.tar.gz" +checksum=26ceb5eee035d4e1a08240aced75a20f2e54b1e192eef0bf5eb51d0195997f8c + +post_install() { + vcompletion etc/completion/upterm.zsh_completion zsh + vcompletion etc/completion/upterm.bash_completion.sh bash + for man in etc/man/man1/*.1; do + vman "${man}" + done +} From f781d6f3d89f9af67ff1c35f9614e19b1ea61127 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Mar 2022 19:00:12 +0100 Subject: [PATCH 0207/2369] brasero: update to 3.12.3. --- srcpkgs/brasero/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template index 9083a2ccb68..da86c9a6669 100644 --- a/srcpkgs/brasero/template +++ b/srcpkgs/brasero/template @@ -1,7 +1,7 @@ # Template file for 'brasero' pkgname=brasero -version=3.12.2 -revision=6 +version=3.12.3 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-schemas-compile --disable-caches" @@ -13,9 +13,10 @@ depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file- short_desc="Application to burn CD/DVD for the Gnome Desktop" maintainer="Orphaned " license="GPL-2.0-or-later" -homepage="http://www.gnome.org/projects/brasero" +homepage="https://wiki.gnome.org/Apps/Brasero" +changelog="https://gitlab.gnome.org/GNOME/brasero/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041 +checksum=87749eae33a141207d1b00be233b6d8045982ed3249ed4b98dae1f3a975fea15 # Package build options build_options="gir" From 8d25f3eee381cddc680ba2d2e1933be09d0d0bc1 Mon Sep 17 00:00:00 2001 From: zenobit Date: Sat, 26 Mar 2022 00:58:53 +0100 Subject: [PATCH 0208/2369] gitea: update to 1.16.5 --- srcpkgs/gitea/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index f9eaa1b1873..c8b9b361ce2 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -1,6 +1,6 @@ # Template file for 'gitea' pkgname=gitea -version=1.16.4 +version=1.16.5 revision=1 create_wrksrc=yes build_style=go @@ -30,9 +30,9 @@ short_desc="Git with a cup of Tea" maintainer="fosslinux " 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=ef396b797d39a64867dfcd4532043c363dce3fe054afaa37bb97f8a2ea3f2a18 +changelog="https://raw.githubusercontent.com/go-gitea/gitea/main/CHANGELOG.md" +distfiles="https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz" +checksum=d9aab2e8357ca1a22eaffb328356e4e355a8f851a4de6fb4e7eb54ca80f0187b system_accounts="_gitea" _gitea_homedir="/var/lib/gitea" From fcc70b9cffe790997efb72d9b79a9d60237b02e8 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 22 Mar 2022 11:44:40 -0400 Subject: [PATCH 0209/2369] helvum: clean up patch/template upstream released pipewire-rs v0.5.0 that fixes the underlying issue, but the Cargo.toml version requirement didn't allow it to be updated. --- srcpkgs/helvum/patches/i686-pipewire.patch | 33 +++++++--------------- srcpkgs/helvum/template | 23 ++------------- 2 files changed, 13 insertions(+), 43 deletions(-) diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch index 17f0f17f887..bd08b0e217b 100644 --- a/srcpkgs/helvum/patches/i686-pipewire.patch +++ b/srcpkgs/helvum/patches/i686-pipewire.patch @@ -1,24 +1,11 @@ -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(), - } - } +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -14,7 +14,7 @@ + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + + [dependencies] +-pipewire = "0.4" ++pipewire = "0.5" + gtk = { version = "0.4.1", package = "gtk4" } + glib = { version = "0.15.1", features = ["log"] } --- - diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template index 49ad2dd6013..5a694dc43c2 100644 --- a/srcpkgs/helvum/template +++ b/srcpkgs/helvum/template @@ -1,12 +1,8 @@ # 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 +revision=2 build_style=cargo -build_helper=rust hostmakedepends="pkg-config clang libclang" makedepends="gtk4-devel pipewire-devel glib-devel" depends="pipewire" @@ -14,21 +10,8 @@ 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 -} +distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz" +checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02" post_install() { # Normally, meson would do this, but it's simpler to use the cargo build style and do this manually From 9477cf247ba28ece26156f0f6ba580b405b5b268 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 26 Mar 2022 14:28:28 -0400 Subject: [PATCH 0210/2369] pijul: remove unnecessary build_helper --- srcpkgs/pijul/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template index 581d77789c9..53fb1c83ebe 100644 --- a/srcpkgs/pijul/template +++ b/srcpkgs/pijul/template @@ -3,7 +3,6 @@ pkgname=pijul version=0.12.2 revision=5 build_style=cargo -build_helper=rust _sequoia_ver=0.9.0 hostmakedepends="pkg-config clang" makedepends="libsodium-devel openssl-devel nettle-devel" From 000c8e5feeeeed0a64a35951ed42cea4b838b84e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 26 Mar 2022 14:29:26 -0400 Subject: [PATCH 0211/2369] rdedup: remove unnecessary build_helper --- srcpkgs/rdedup/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template index 6bd71cacfc4..0e67d278ca0 100644 --- a/srcpkgs/rdedup/template +++ b/srcpkgs/rdedup/template @@ -3,7 +3,6 @@ pkgname=rdedup 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" From bf274327dbc0f3b84f59cd82612fcffdd29bbcae Mon Sep 17 00:00:00 2001 From: ipkalm Date: Sat, 19 Mar 2022 18:33:15 +0700 Subject: [PATCH 0212/2369] New package: v2ray-4.44.0 --- srcpkgs/v2ray/files/v2ray/run | 3 ++ ...equest-API-changed-since-go1.17-1370.patch | 47 +++++++++++++++++ srcpkgs/v2ray/template | 52 +++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 srcpkgs/v2ray/files/v2ray/run create mode 100644 srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch create mode 100644 srcpkgs/v2ray/template diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run new file mode 100644 index 00000000000..3b1ac46ab24 --- /dev/null +++ b/srcpkgs/v2ray/files/v2ray/run @@ -0,0 +1,3 @@ +#!/bin/sh + +exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1 diff --git a/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch b/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch new file mode 100644 index 00000000000..2a35b075f0a --- /dev/null +++ b/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch @@ -0,0 +1,47 @@ +From 77b88171d6bd837b76a5ad6e6b23689391530ed6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E6=9C=B1=E8=81=96=E9=BB=8E=20=28Zhu=20Sheng=20Li=29?= + +Date: Sat, 6 Nov 2021 22:09:26 +0800 +Subject: [PATCH] fix: readRequest API changed since go1.17 (#1370) + +fixed: #1265 +--- + transport/internet/headers/http/http.go | 4 ++-- + transport/internet/headers/http/linkedreadRequest.go | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/transport/internet/headers/http/http.go b/transport/internet/headers/http/http.go +index c73f7a63..54611889 100644 +--- a/transport/internet/headers/http/http.go ++++ b/transport/internet/headers/http/http.go +@@ -90,7 +90,7 @@ func (h *HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) { + buffer.Clear() + copy(buffer.Extend(lenEnding), leftover) + +- if _, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes())), false); err != io.ErrUnexpectedEOF { ++ if _, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes()))); err != io.ErrUnexpectedEOF { + return nil, err + } + } +@@ -110,7 +110,7 @@ func (h *HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) { + } + + // Parse the request +- if req, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes())), false); err != nil { ++ if req, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes()))); err != nil { + return nil, err + } else { // nolint: golint + h.req = req +diff --git a/transport/internet/headers/http/linkedreadRequest.go b/transport/internet/headers/http/linkedreadRequest.go +index 35154b87..45773312 100644 +--- a/transport/internet/headers/http/linkedreadRequest.go ++++ b/transport/internet/headers/http/linkedreadRequest.go +@@ -9,4 +9,4 @@ import ( + ) + + //go:linkname readRequest net/http.readRequest +-func readRequest(b *bufio.Reader, deleteHostHeader bool) (req *http.Request, err error) ++func readRequest(b *bufio.Reader) (req *http.Request, err error) +-- +2.33.1 + diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template new file mode 100644 index 00000000000..cf6cd28a534 --- /dev/null +++ b/srcpkgs/v2ray/template @@ -0,0 +1,52 @@ +# Template file for 'v2ray' +pkgname=v2ray +version=4.44.0 +revision=1 +wrksrc=${pkgname}-core-${version} +build_style=go +go_import_path="github.com/v2fly/v2ray-core/v4" +go_ldflags="-X github.com/v2fly/v2ray-core/v4.codename=$pkgname -X github.com/v2fly/v2ray-core/v4.version=$version -X github.com/v2fly/v2ray-core/v4.build=$SOURCE_DATE_EPOCH -s -w -buildid=" +short_desc="Platform for building proxies to bypass network restrictions" +maintainer="ipkalm " +license="MIT" +homepage="https://github.com/v2fly/v2ray-core" +distfiles="https://github.com/v2fly/v2ray-core/archive/v${version}/${pkgname}-${version}.tar.gz" +checksum=d9973bafd3020f60a51fa3495b24ab417b08b3c8f9539a3748d00da6c68d0103 +conf_files="/etc/v2ray/config.json" + +system_accounts="_v2ray" + +export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath" +export CGO_ENABLED=0 + +do_build() { + go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main + go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ctl" -tags "confonly" ./infra/control/main +} + +do_check() { + local pkgs=$(go list ./... | grep -v \ + -e 'app/dns$' \ + -e 'app/stats$' \ + -e 'app/router$' \ + -e 'app/router/command$' \ + -e 'common/task$' \ + -e 'common/signal$' \ + -e 'testing/scenarios$' \ + -e 'proxy/vmess$' \ + -e 'transport/pipe$' \ + -e 'transport/internet/websocket$' \ + -e 'transport/internet/quic$' \ + -e 'v4/infra/conf/rule$' \ + -e 'v4/infra/conf/geodata/memconservative$' \ + -e 'v4/transport/internet/kcp$' \ + ) + go test $pkgs +} + +post_install() { + vlicense LICENSE + vmkdir etc/v2ray + vcopy release/config/*.json etc/v2ray/ + vsv v2ray +} From 1db87225ea7e1101dd42910da81c1e65ed349a69 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 26 Mar 2022 20:54:02 +0100 Subject: [PATCH 0213/2369] nq: update to 0.5. --- srcpkgs/nq/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nq/template b/srcpkgs/nq/template index 67e1d96222a..7dcc1c03af9 100644 --- a/srcpkgs/nq/template +++ b/srcpkgs/nq/template @@ -1,6 +1,6 @@ # Template file for 'nq' pkgname=nq -version=0.4 +version=0.5 revision=1 build_style=gnu-makefile short_desc="Unix command line queue utility" @@ -8,4 +8,4 @@ maintainer="Leah Neukirchen " license="Public Domain" homepage="https://github.com/leahneukirchen/nq" distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz" -checksum=287d6700063b64cfa9db51df95e2a046736eb38c0d3b6e0af0a8e7da6df8880b +checksum=3f01aaf0b8eee4f5080ed1cd71887cb6485d366257d4cf5470878da2b734b030 From 9b42133514c5ab530fd8879be4dd963534669dc6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 26 Mar 2022 20:58:32 +0100 Subject: [PATCH 0214/2369] ii: update to 1.9. Adopted. --- srcpkgs/ii/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/ii/template b/srcpkgs/ii/template index 13a7ef62682..5ef7a1d6b9e 100644 --- a/srcpkgs/ii/template +++ b/srcpkgs/ii/template @@ -1,20 +1,21 @@ # Template file for 'ii' pkgname=ii -version=1.8 -revision=4 +version=1.9 +revision=1 build_style=gnu-makefile make_build_args="INCLUDES=-I. LIBS=" short_desc="Minimalist FIFO IRC client" -maintainer="Orphaned " +maintainer="Leah Neukirchen " license="MIT" -homepage="http://tools.suckless.org/${pkgname}" -distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz" -checksum=b9d9e1eae25e63071960e921af8b217ab1abe64210bd290994aca178a8dc68d2 +homepage="https://tools.suckless.org/ii" +distfiles="https://dl.suckless.org/tools/${pkgname}-${version}.tar.gz" +checksum=850cb323b583d261b51bda9993ee733334352a8e6ca1e2f02b57c154bf568c17 pre_build() { sed -i 's| -O0||g' config.mk sed -i 's|^CFLAGS *=|override CFLAGS +=|g' config.mk sed -i 's|^LDFLAGS *=|override LDFLAGS +=|g' config.mk + sed -i 's|^LIBS *=|override LIBS +=|g' config.mk } post_install() { From 1cc584f83ee57db7b56d748ee20b6250ab9b23e8 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 26 Mar 2022 22:02:47 +0100 Subject: [PATCH 0215/2369] chromium: update to 99.0.4844.84. --- srcpkgs/chromium/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 2708747046d..f6154e22375 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=99.0.4844.51 +version=99.0.4844.84 revision=1 archs="i686* x86_64* aarch64* armv7l* ppc64le*" short_desc="Google's attempt at creating a safer, faster, and more stable browser" @@ -9,7 +9,7 @@ maintainer="Duncaen " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=97c52e57eca0dc8b752d274047f38c88aaa86036c0587b26b056efbd3fb2bae3 +checksum=20ec184ed34bdc7e660ccf6c007b2db37007de423b3a5a51698a96aa29527515 lib32disabled=yes From aabeb438ef9730f42b5f043d5e3cf2ea2700b28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Tue, 5 Oct 2021 23:05:33 +0200 Subject: [PATCH 0216/2369] New package: bees-0.7 --- .../0001-don-t-run-tests-unless-asked.patch | 44 +++++++++++++++ .../patches/0002-move-sbin-into-bin.patch | 37 +++++++++++++ ...0003-start-work-on-cross-compilation.patch | 54 +++++++++++++++++++ srcpkgs/bees/patches/series | 2 + srcpkgs/bees/template | 28 ++++++++++ 5 files changed, 165 insertions(+) create mode 100644 srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch create mode 100644 srcpkgs/bees/patches/0002-move-sbin-into-bin.patch create mode 100644 srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch create mode 100644 srcpkgs/bees/patches/series create mode 100644 srcpkgs/bees/template diff --git a/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch new file mode 100644 index 00000000000..4b1431b4587 --- /dev/null +++ b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch @@ -0,0 +1,44 @@ +From e139a679d7cc3f04ad001054a6b1815b7afc92e3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= + +Date: Thu, 7 Oct 2021 18:04:15 +0200 +Subject: [PATCH 1/3] don't run tests unless asked + +--- + Makefile | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index 9c840c4..d4c241e 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,16 +14,12 @@ BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN) + + DEFAULT_MAKE_TARGET ?= reallyall + +-ifeq ($(DEFAULT_MAKE_TARGET),reallyall) +- RUN_INSTALL_TESTS = test +-endif +- + include Defines.mk + + default: $(DEFAULT_MAKE_TARGET) + + all: lib src scripts +-reallyall: all doc test ++reallyall: all doc + + clean: ## Cleanup + git clean -dfx -e localconf +@@ -55,7 +51,7 @@ install_tools: src + install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk + + install_bees: ## Install bees + libs +-install_bees: src $(RUN_INSTALL_TESTS) ++install_bees: src + install -Dm755 bin/bees $(DESTDIR)$(LIBEXEC_PREFIX)/bees + + install_scripts: ## Install scipts +-- +2.35.1 + diff --git a/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch new file mode 100644 index 00000000000..3d3b7fe2229 --- /dev/null +++ b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch @@ -0,0 +1,37 @@ +From fc133aa8647fe34a41c70bd5915c7f7f655d3160 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= + +Date: Thu, 7 Oct 2021 18:05:15 +0200 +Subject: [PATCH 2/3] move sbin/* into bin/* + +Void does not distinguis between bin and sbin, but this patch will +likely not be upstreamable. +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index d4c241e..2694e78 100644 +--- a/Makefile ++++ b/Makefile +@@ -48,7 +48,7 @@ scripts: scripts/beesd scripts/beesd@.service + install_tools: ## Install support tools + libs + install_tools: src + install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap +- install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk ++ install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/bin/fiewalk + + install_bees: ## Install bees + libs + install_bees: src +@@ -56,7 +56,7 @@ install_bees: src + + install_scripts: ## Install scipts + install_scripts: scripts +- install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd ++ install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/bin/beesd + install -Dm644 scripts/beesd.conf.sample $(DESTDIR)/$(ETC_PREFIX)/bees/beesd.conf.sample + ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),) + install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service +-- +2.35.1 + diff --git a/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch new file mode 100644 index 00000000000..30f75846075 --- /dev/null +++ b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch @@ -0,0 +1,54 @@ +From be64a6e50987dba582d8704d62cb1f9a3577645d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= + +Date: Thu, 7 Oct 2021 18:06:54 +0200 +Subject: [PATCH 3/3] start work on cross compilation + +The tests have to be run on the host, so these shouldn't be cross +compiled. This patch is not done yet, but it's included here anyway, so +that whoever wants to continue on it doesn't have to start from scratch. +--- + makeflags | 3 +++ + test/Makefile | 6 +++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/makeflags b/makeflags +index c5b6951..29e0430 100644 +--- a/makeflags ++++ b/makeflags +@@ -11,3 +11,6 @@ CCFLAGS += -I../include -D_FILE_OFFSET_BITS=64 + + BEES_CFLAGS = $(CCFLAGS) -std=c99 $(CFLAGS) + BEES_CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast $(CXXFLAGS) ++ ++BEES_CFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c99 $(CFLAGS_FOR_BUILD) ++BEES_CXXFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c++11 -Wold-style-cast $(CXXFLAGS_FOR_BUILD) +diff --git a/test/Makefile b/test/Makefile +index ae66a7c..3c70244 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -24,7 +24,7 @@ BEES_LDFLAGS = -L../lib $(LDFLAGS) + mkdir -p $@ + + .depends/%.dep: %.cc tests.h Makefile | .depends +- $(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $< ++ $(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) -M -MF $@ -MT $(<:.cc=.o) $< + + depends.mk: $(PROGRAMS:%=.depends/%.dep) + cat $^ > $@.new +@@ -33,10 +33,10 @@ depends.mk: $(PROGRAMS:%=.depends/%.dep) + include depends.mk + + $(PROGRAMS:%=%.o): %.o: %.cc ../makeflags Makefile +- $(CXX) $(BEES_CXXFLAGS) -o $@ -c $< ++ $(CXX_FOR_BUILD) $(BEES_CXXFLAG_FOR_BUILDS) -o $@ -c $< + + $(PROGRAMS): %: %.o ../makeflags Makefile ../lib/libcrucible.a +- $(CXX) $(BEES_CXXFLAGS) $(BEES_LDFLAGS) -o $@ $< $(LIBS) ++ $(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) $(BEES_LDFLAGS) -o $@ $< $(LIBS) + + %.txt: % Makefile FORCE + ./$< >$@ 2>&1 || (RC=$$?; cat $@; exit $$RC) +-- +2.35.1 + diff --git a/srcpkgs/bees/patches/series b/srcpkgs/bees/patches/series new file mode 100644 index 00000000000..d9a2837128f --- /dev/null +++ b/srcpkgs/bees/patches/series @@ -0,0 +1,2 @@ +0001-don-t-run-tests-unless-asked.patch +0002-move-sbin-into-bin.patch diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template new file mode 100644 index 00000000000..c9184f593e8 --- /dev/null +++ b/srcpkgs/bees/template @@ -0,0 +1,28 @@ +# Template file for 'bees' +pkgname=bees +version=0.7 +revision=1 +archs="~*-musl" +build_style=gnu-makefile +make_check_target="test" +hostmakedepends="pkg-config" +depends="btrfs-progs" +short_desc="Best-Effort Extent-Same, a btrfs deduplication agent" +maintainer="Jan Christian Grünhage " +license="GPL-3.0-or-later" +homepage="https://github.com/Zygo/bees" +distfiles="https://github.com/Zygo/bees/archive/refs/tags/v${version}.tar.gz" +checksum=2e67422b9f0d9ef665523b474fb27055efffceb263f8ccfdfda2a3aac9c6bdb1 + +if [ "$CROSS_BUILD" ]; then +# Tests don't work properly with cross compilation, because it doesn't +# differentiate between host and target compilers correctly. +# +# There is a patch included which starts working on this, but I couldn't get it +# to work properly, so it's not being applied right now. + make_check="no" +fi + +pre_build() { + export BEES_VERSION="${version}" +} From 2085660c7ea000f69f157f8a9570f8e6717227af Mon Sep 17 00:00:00 2001 From: KushBlazingJudah <59340248+KushBlazingJudah@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:34:01 -0300 Subject: [PATCH 0217/2369] wob: update to 0.13. --- srcpkgs/wob/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template index 3570896a1dc..6b68df4a5ef 100644 --- a/srcpkgs/wob/template +++ b/srcpkgs/wob/template @@ -1,6 +1,6 @@ # Template file for 'wob' pkgname=wob -version=0.12 +version=0.13 revision=1 build_style=meson configure_args="-Dseccomp=enabled" @@ -11,7 +11,7 @@ maintainer="travankor " license="ISC" homepage="https://github.com/francma/wob" distfiles="https://github.com/francma/wob/archive/${version}.tar.gz" -checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01 +checksum=555965ba2b4e5fa67c8342e42f7ccd5eea7c9aeb762684e2ea52ccff40cc7f56 post_install() { vlicense LICENSE From 74412cdb843a8bfcef549e87d7a666ac0996c00e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Tue, 22 Mar 2022 22:53:24 +0100 Subject: [PATCH 0218/2369] newsboat: update to 2.27. --- srcpkgs/newsboat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template index 39c8eac9a7e..09f30180a19 100644 --- a/srcpkgs/newsboat/template +++ b/srcpkgs/newsboat/template @@ -1,6 +1,6 @@ # Template file for 'newsboat' pkgname=newsboat -version=2.26 +version=2.27 revision=1 build_style=configure build_helper="rust" @@ -17,7 +17,7 @@ license="MIT" homepage="https://newsboat.org/" changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md" distfiles="https://newsboat.org/releases/${version}/newsboat-${version}.tar.xz" -checksum=34a4834e00f06c0151c700d6af065f5b8776872227d9d4484d247ae7a4413c18 +checksum=fd5a40096689d4fc0f18441319197769fa377709821b1a3f1b2ba1f006625285 # tests fail when run by superuser # they always fail on musl, see https://github.com/newsboat/newsboat/issues/1216 From f40e905cc653d958361fed50b372d5486edbca61 Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Sat, 26 Mar 2022 11:09:59 +0700 Subject: [PATCH 0219/2369] SweetHome3D: update to 6.6 --- srcpkgs/SweetHome3D/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/SweetHome3D/template b/srcpkgs/SweetHome3D/template index 344aa9e903e..169fe188e51 100644 --- a/srcpkgs/SweetHome3D/template +++ b/srcpkgs/SweetHome3D/template @@ -1,6 +1,6 @@ # Template file for 'SweetHome3D' pkgname=SweetHome3D -version=6.5.2 +version=6.6 revision=1 archs="i686 x86_64" wrksrc="SweetHome3D-${version}-src" @@ -12,7 +12,7 @@ maintainer="1is7ac3 " license="GPL-2.0-or-later" homepage="www.sweethome3d.com" distfiles="${SOURCEFORGE_SITE}/sweethome3d/SweetHome3D-${version}-src.zip" -checksum=e3323f078e49c72e575e2e771f1586a7c18475b42ea32982abb27756b7a81dc8 +checksum=0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b do_build() { ant application textures furniture examples help java3dLibraries From f484b3019fd256d6ddefe796ca6eeec55efed3c2 Mon Sep 17 00:00:00 2001 From: notthewave Date: Fri, 25 Mar 2022 21:49:59 +0100 Subject: [PATCH 0220/2369] kirc: update to 0.3.1. --- srcpkgs/kirc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kirc/template b/srcpkgs/kirc/template index fd25076500d..e49f4b1f253 100644 --- a/srcpkgs/kirc/template +++ b/srcpkgs/kirc/template @@ -1,6 +1,6 @@ # Template file for 'kirc' pkgname=kirc -version=0.3.0 +version=0.3.1 revision=1 build_style=gnu-makefile short_desc="Tiny IRC client written in POSIX C99" @@ -8,7 +8,7 @@ maintainer="notthewave " license="MIT" homepage="http://kirc.io" distfiles="https://github.com/mcpcpc/${pkgname}/archive/refs/tags/${version}.tar.gz" -checksum=1b35c77f46466106b0fde52c0933866ccf5fd7c97569465297dcae018c4b4a16 +checksum=19bb058a9845eb5b2febe6e8d658dcd06c194b58669f37837dbdf37627c7d7dd post_install() { vlicense LICENSE From 0bf7c35db10efebebd593c9784e1a21c1092e53c Mon Sep 17 00:00:00 2001 From: Anjandev Momi Date: Mon, 25 May 2020 03:17:12 -0700 Subject: [PATCH 0221/2369] New package: netris-0.1.8 --- srcpkgs/netris/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/netris/template diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template new file mode 100644 index 00000000000..0eb9abeb5b5 --- /dev/null +++ b/srcpkgs/netris/template @@ -0,0 +1,13 @@ +# Template file for 'netris' +pkgname=netris +version=0.1.8 +revision=1 +wrksrc=$pkgname-v$version +build_style=go +go_import_path=gitlab.com/tslocum/netris/cmd/netris +short_desc="Multiplayer Tetris clone" +maintainer="Anjandev Momi " +license="GPL-3.0-or-later" +homepage="https://gitlab.com/tslocum/netris" +distfiles="https://gitlab.com/tslocum/netris/-/archive/v${version}/netris-v${version}.tar.gz" +checksum=3638d7bfce544fde9ab1dd15376586e12513187f7c3b51baf223846cce60a33e From 8d5fbcaaf0f5231d6e7a17ec1c4a9e1dace0eb50 Mon Sep 17 00:00:00 2001 From: Mate GABRI Date: Fri, 25 Mar 2022 11:47:50 +1000 Subject: [PATCH 0222/2369] kops: update to 1.23.0 --- srcpkgs/kops/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template index d044b28cad1..4ba82a05a2a 100644 --- a/srcpkgs/kops/template +++ b/srcpkgs/kops/template @@ -1,6 +1,6 @@ # Template file for 'kops' pkgname=kops -version=1.22.2 +version=1.23.0 revision=1 archs="x86_64*" build_wrksrc=src/k8s.io/kops From 0dc0cc9246c6d61124f8e1cefaabfb75d319845c Mon Sep 17 00:00:00 2001 From: anelki Date: Wed, 23 Mar 2022 17:56:44 -0500 Subject: [PATCH 0223/2369] Signal-Desktop: update to 5.36.0. --- 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 038af9b6e17..55591ea4c82 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.35.0 +version=5.36.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=12d4766356d50f4eaff907a738860be91bf4c012fd2db62d00757078923dca67 +checksum=de158a8f4b19e3f8b849abf07fbb3d1b2207a3a08fde31aac328635e66a8a956 nostrip_files="signal-desktop" post_extract() { From 1eb6fd3be8dd8988bb9bbb54e79b9ffefebe7430 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 21 Mar 2022 10:56:40 +0100 Subject: [PATCH 0224/2369] dbeaver: update to 22.0.1. --- srcpkgs/dbeaver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index d20837b230c..276af880242 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -1,6 +1,6 @@ # Template file for 'dbeaver' pkgname=dbeaver -version=22.0.0 +version=22.0.1 revision=1 # the build downloads binaries linked to glibc archs="x86_64 aarch64" @@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum " license="Apache-2.0" homepage="https://dbeaver.io" distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz" -checksum=c4e995ce3c46723f071faefe8dc68df54f001c634e757a9bf89c594fe3a55613 +checksum=2258f77b6e68fc0784dd7d92fc1297695b57e6ca22e3d454f21f328bf61e2bf0 nopie=true if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then From cd48b6f592e6d2ff2df83a287dfb5ce4aefaf5f3 Mon Sep 17 00:00:00 2001 From: Kyle Nusbaum Date: Sat, 19 Mar 2022 01:51:59 -0500 Subject: [PATCH 0225/2369] apache-kafka: update to 3.1.0. --- srcpkgs/apache-kafka/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache-kafka/template b/srcpkgs/apache-kafka/template index 0e75af73152..453b0992356 100644 --- a/srcpkgs/apache-kafka/template +++ b/srcpkgs/apache-kafka/template @@ -1,6 +1,6 @@ # Template file for 'apache-kafka' pkgname=apache-kafka -version=3.0.0 +version=3.1.0 revision=1 wrksrc="kafka-${version}-src" hostmakedepends="curl which tar openjdk8" @@ -10,7 +10,7 @@ maintainer="Kyle Nusbaum " license="Apache-2.0" homepage="https://kafka.apache.org" distfiles="https://dlcdn.apache.org/kafka/${version}/kafka-${version}-src.tgz" -checksum=66a9efddcc2ce88984941020db012178efd51eb47c359c7fd1bab791416e39cd +checksum=75265c6b103b73fa9c8a9897963bee6587f968309ec827ad795e48dea1a61aaf case "$XBPS_TARGET_MACHINE" in ppc64*) ;; From 30e858c81a40273226cdb84554ba3ce030f4d384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?= Date: Fri, 18 Mar 2022 11:59:16 +0100 Subject: [PATCH 0226/2369] zoom: update to 5.9.6.2225. --- srcpkgs/zoom/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template index 3ec023975ed..aa16c7503ed 100644 --- a/srcpkgs/zoom/template +++ b/srcpkgs/zoom/template @@ -1,6 +1,6 @@ # Template file for 'zoom' pkgname=zoom -version=5.9.3.1911 +version=5.9.6.2225 revision=1 archs="x86_64" wrksrc=zoom @@ -13,7 +13,7 @@ maintainer="Daniel Santana " license="custom:Proprietary" homepage="https://zoom.us/" distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm" -checksum=6cbb3d72b6d84c2527e75b577959af5ea1992111fdaf37c56fd1fcc8725fcc87 +checksum=1e43ae0e43168586f5dd05ace1e646afe1455825b62b760e2dab0a3564da35e3 repository=nonfree noshlibprovides=yes noverifyrdeps=yes From 3ef8360c9f1324bb149740010de436534e26a598 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Sun, 27 Mar 2022 11:08:07 -0400 Subject: [PATCH 0227/2369] libnma: update to 1.8.36. --- common/shlibs | 1 + srcpkgs/libnma/template | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7d323593a12..bba46e1678d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2957,6 +2957,7 @@ liblz.so.1 lzlib-1.8_1 libelogind.so.0 libelogind-238.1_2 libseat.so.1 libseat-0.3.0_1 libnma.so.0 libnma-1.8.30_1 +libnma-gtk4.so.0 libnma-1.8.36_1 libgspell-1.so.2 gspell-1.8.0_1 libotf.so.1 libotf-0.9.16_1 libimagequant.so.0 libimagequant-2.8.2_1 diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template index c0a9791e573..148ae51d6de 100644 --- a/srcpkgs/libnma/template +++ b/srcpkgs/libnma/template @@ -1,12 +1,12 @@ # Template file for 'libnma' pkgname=libnma -version=1.8.34 +version=1.8.36 revision=1 build_style=meson build_helper="gir" -configure_args="-Dlibnma_gtk4=false" +configure_args="-Dlibnma_gtk4=true" hostmakedepends="gettext glib-devel gtk-doc pkg-config vala" -makedepends="gcr-devel gtk+3-devel iso-codes +makedepends="gcr-devel gtk+3-devel gtk4-devel iso-codes mobile-broadband-provider-info NetworkManager-devel" depends="NetworkManager iso-codes" short_desc="NetworkManager panel applet for GNOME - runtime library" @@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/libnma" changelog="https://gitlab.gnome.org/GNOME/libnma/-/raw/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f5e2e738e0fca7f2a549079290b2d8017511d485a83220c36df380a3b4753304 +checksum=d99415f4cdff642230019ec5cdd2b1fbf1ec550a8ae865219f75482a642b7b7a replaces="libnm-gtk>=0" if [ "$CROSS_BUILD" ]; then From e2d3cebfb9bbc021d6b16f4b4adc5d3a4cff5700 Mon Sep 17 00:00:00 2001 From: Jose G Perez Taveras Date: Sun, 27 Mar 2022 05:42:05 -0400 Subject: [PATCH 0228/2369] font-iosevka: update to 15.1.0. --- 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 4f1c061d576..e293af01166 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.3 +version=15.1.0 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 - 7c6a4d8e003cab1a46f86fdf43f8c49e4b9d6ce932961572476266ad9f351608 - 629dd3cf957f7ef255e7dccc3286c5a3b54c0a6a7cde8b93b3a7fdc9dffc4cbd" + 4bb10d12681546fa129f9105706d6f55c346b75418a19793fb300f0bd4e5991d + e05995a4b66592d5868b7e667bba8a5f1822499fc53c6cd7a8abf3e40f8b8895" font_dirs="/usr/share/fonts/TTF" From 581d9efa2ef71daddfb4ad7bb9bdfa7160e6804c Mon Sep 17 00:00:00 2001 From: Ramdziana F Y Date: Sun, 27 Mar 2022 18:24:31 +0700 Subject: [PATCH 0229/2369] vivaldi: update to 5.1.2567.73 --- srcpkgs/vivaldi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template index d3673882469..9108f67a4d2 100644 --- a/srcpkgs/vivaldi/template +++ b/srcpkgs/vivaldi/template @@ -1,6 +1,6 @@ # Template file for 'vivaldi' pkgname=vivaldi -version=5.1.2567.66 +version=5.1.2567.73 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=e2631cfabdd2d916fd8ab05004afd86efeec4e47d50a86b8be4cd3b59f6430ed +checksum=efc4a4d39724840cbcc78317ef1a0e5e300cb8b9d655defee8e746626f845f12 repository=nonfree restricted=yes nostrip=yes From 3d397662bb66a21490f9bcf829651b9c8f01c46d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Tue, 8 Mar 2022 12:45:16 +0100 Subject: [PATCH 0230/2369] freerdp: update to 2.6.1. --- srcpkgs/freerdp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template index c4796b8c73c..da6703547a8 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -1,6 +1,6 @@ # Template file for 'freerdp' pkgname=freerdp -version=2.6.0 +version=2.6.1 revision=1 wrksrc="FreeRDP-${version}" build_style=cmake @@ -20,7 +20,7 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://www.freerdp.com/" distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz" -checksum=b9eb850f27bed4362b9a1017d37f6e271f43428948f995e7815e039306cb6ddd +checksum=2ff86a839c1cf678a24d9bf435c83745aafbd5f0d19b637b733e306acede96e3 CFLAGS="-Wno-dev" case "$XBPS_TARGET_MACHINE" in From 17ecd449289622ae269d832215f2daffea12521e Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 27 Mar 2022 17:42:39 +0200 Subject: [PATCH 0231/2369] dxa: update to 0.1.5. --- srcpkgs/dxa/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dxa/template b/srcpkgs/dxa/template index 4d4e05f1c45..9eeb0175f96 100644 --- a/srcpkgs/dxa/template +++ b/srcpkgs/dxa/template @@ -1,14 +1,16 @@ # Template file for 'dxa' pkgname=dxa -version=0.1.4 +version=0.1.5 revision=1 build_style=gnu-makefile +make_check_target="test" +checkdepends="xa" short_desc="6502/R65C02 disassembler" maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://www.floodgap.com/retrotech/xa/#dxa" distfiles="https://www.floodgap.com/retrotech/xa/dists/dxa-${version}.tar.gz" -checksum=0b4ae0c0ae75223f446429bd19e8959d6224124b1ed1deb4a24f06f619b66b95 +checksum=8e40ed77816581f9ad95acac2ed69a2fb2ac7850e433d19cd684193a45826799 do_install() { vbin dxa From 113b85c3fbffb0a4930bf2b6dfc8b77d8a7384f1 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 27 Mar 2022 17:43:28 +0200 Subject: [PATCH 0232/2369] xa: update to 2.3.13. --- srcpkgs/xa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xa/template b/srcpkgs/xa/template index 913275ab347..b6df10d7664 100644 --- a/srcpkgs/xa/template +++ b/srcpkgs/xa/template @@ -1,6 +1,6 @@ # Template file for 'xa' pkgname=xa -version=2.3.12 +version=2.3.13 revision=1 build_style=gnu-makefile make_check_target="test" @@ -10,7 +10,7 @@ maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://www.floodgap.com/retrotech/xa/" distfiles="https://www.floodgap.com/retrotech/xa/dists/xa-${version}.tar.gz" -checksum=f8fd1536012d676fc6cbfcdd6a91793e564c89b6ef747f8db8f467c178fb0704 +checksum=a9477af150b6c8a91cd3d41e1cf8c9df552d383326495576830271ca4467bd86 post_extract() { vsed -i 's/${LD}/${CC}/' src/Makefile From d953e121007e0a99fe536fd19f3381993f9d0545 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 27 Mar 2022 20:25:40 +0200 Subject: [PATCH 0233/2369] monit: update to 5.32.0. --- srcpkgs/monit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template index 3616fa0ee29..b10596c639d 100644 --- a/srcpkgs/monit/template +++ b/srcpkgs/monit/template @@ -1,6 +1,6 @@ # Template file for 'monit' pkgname=monit -version=5.31.0 +version=5.32.0 revision=1 build_style=gnu-configure configure_args=" @@ -16,7 +16,7 @@ license="AGPL-3.0-only" homepage="https://mmonit.com/monit/" changelog="https://mmonit.com/monit/changes/" distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz" -checksum=eae71f28941fb663eec74c1a59b69546c659529796550bd9c0c544e9b52ac055 +checksum=1077052d4c4e848ac47d14f9b37754d46419aecbe8c9a07e1f869c914faf3216 pre_configure() { ./bootstrap From 88ae4718529d0abd158c0f1b6ec9741a4cd7d1d6 Mon Sep 17 00:00:00 2001 From: Mate GABRI Date: Mon, 7 Mar 2022 21:29:14 +1000 Subject: [PATCH 0234/2369] kubernetes-helm: update to 3.8.1 --- srcpkgs/kubernetes-helm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kubernetes-helm/template b/srcpkgs/kubernetes-helm/template index 18c05630ce4..8e7eab5eea5 100644 --- a/srcpkgs/kubernetes-helm/template +++ b/srcpkgs/kubernetes-helm/template @@ -1,6 +1,6 @@ # Template file for 'kubernetes-helm' pkgname=kubernetes-helm -version=3.7.2 +version=3.8.1 revision=1 wrksrc="helm-${version}" hostmakedepends="go make git mercurial tar" @@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum " license="Apache-2.0" homepage="https://helm.sh/" distfiles="https://github.com/helm/helm/archive/v${version}.tar.gz" -checksum=d04175807c2948261517b58120a0810ec20b92c0058acb040e973d0b9de7b08d +checksum=fed90e57113a6b6e50db03ee711358b04733bc2a50797e1b103a300b1f8a4b16 conflicts="helm" nopie=true From 04dd99f659f01659704870e3ea986878459b4f18 Mon Sep 17 00:00:00 2001 From: Omar Zeghouani Date: Mon, 28 Feb 2022 09:42:47 +0000 Subject: [PATCH 0235/2369] libuv: update to 1.43.0. --- srcpkgs/libuv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template index 76a36863f4b..2575d92da2a 100644 --- a/srcpkgs/libuv/template +++ b/srcpkgs/libuv/template @@ -1,6 +1,6 @@ # Template file for 'libuv' pkgname=libuv -version=1.41.0 +version=1.43.0 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -10,7 +10,7 @@ license="MIT, CC-BY-SA-4.0" homepage="https://libuv.org/" changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog" distfiles="https://github.com/libuv/libuv/archive/v${version}.tar.gz" -checksum=6cfeb5f4bab271462b4a2cc77d4ecec847fdbdc26b72019c27ae21509e6f94fa +checksum=9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d # the tests fail when run as root and as such break in the CI containers make_check="extended" From a62f4724bb2f99f9ca8e1a66e8eee76bd3ffd1ce Mon Sep 17 00:00:00 2001 From: 0x5c Date: Tue, 22 Feb 2022 12:51:36 -0500 Subject: [PATCH 0236/2369] micro: adopt. --- srcpkgs/micro/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template index ceaaed3ad43..4848d9338e9 100644 --- a/srcpkgs/micro/template +++ b/srcpkgs/micro/template @@ -9,7 +9,7 @@ go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}" # Adding CompileDate is bad for reproducibility and adding CommitHash # is redundant as we use a tag to build the package. short_desc="Modern and intuitive terminal-based text editor" -maintainer="Diogo Leal " +maintainer="0x5c " license="MIT" homepage="https://micro-editor.github.io" distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz" From f5f0648a829a9e6874f898ed711cf7526898a560 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 27 Mar 2022 22:27:59 +0200 Subject: [PATCH 0237/2369] janet: update to 1.21.1. --- common/shlibs | 2 +- srcpkgs/janet/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index bba46e1678d..d3c9ab101c3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3899,7 +3899,7 @@ libcaribou.so.0 libcaribou-0.4.21_3 libtinyclipboard.so.1 tinyclipboard-16.01_1 libcbor.so.0.9 libcbor-0.9.0_1 libfido2.so.1 libfido2-1.6.0_2 -libjanet.so.1.20 janet-1.20.0_1 +libjanet.so.1.21 janet-1.21.1_1 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1 libcbang0.so cbang-1.6.0_3 libblosc.so.1 c-blosc-1.17.1_1 diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template index 30c4dc43db4..4301ab90c75 100644 --- a/srcpkgs/janet/template +++ b/srcpkgs/janet/template @@ -1,6 +1,6 @@ # Template file for 'janet' pkgname=janet -version=1.21.0 +version=1.21.1 revision=1 build_style=meson configure_args="-Db_lto=false" # breaks jpm @@ -10,7 +10,7 @@ license="MIT" homepage="https://janet-lang.org/" changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md" distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz" -checksum=8e53efcdeda9b7519248bef5f0e744ad947e013b14960c66ba75967c5fb0a7fd +checksum=8c6eeabbc0c00ac901b66763676fa4bfdac96e5b6a3def85025b45126227c4e0 post_install() { vlicense LICENSE From 55ca50a3c94a8b6709bcde3217438251b4a4892d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Thu, 24 Feb 2022 22:26:49 +0100 Subject: [PATCH 0238/2369] bfs: update to 2.5. --- srcpkgs/bfs/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template index c4d8b40be69..799cd1d86bb 100644 --- a/srcpkgs/bfs/template +++ b/srcpkgs/bfs/template @@ -1,9 +1,9 @@ # Template file for 'bfs' pkgname=bfs -version=2.3.1 +version=2.5 revision=1 build_style=gnu-makefile -makedepends="acl-devel libcap-devel" +makedepends="acl-devel libcap-devel oniguruma-devel" checkdepends="acl-progs libcap-progs" short_desc="Breadth-first version of the UNIX find command" maintainer="Daniel Eyßer " @@ -11,7 +11,7 @@ license="0BSD" homepage="https://github.com/tavianator/bfs" changelog="https://raw.githubusercontent.com/tavianator/bfs/main/RELEASES.md" distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz" -checksum=c3ed60001804ca79a3794935ab6b9927bd14df42dc34e475b34d62929fcc5a98 +checksum=410be5de74bfc5dece213731d3a8462310789118d299fb14f02bd9b0fdd66875 post_install() { vlicense LICENSE From c0510fa00456f12aca6bc7511bc4ed6d059f8a98 Mon Sep 17 00:00:00 2001 From: ologantr Date: Sun, 27 Mar 2022 16:44:25 +0200 Subject: [PATCH 0239/2369] sqlite: update to 3.38.2. --- srcpkgs/sqlite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index 0ef5405dfa6..e0be1354632 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,6 +1,6 @@ # Template file for 'sqlite' pkgname=sqlite -version=3.38.1 +version=3.38.2 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=8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4 +checksum=e7974aa1430bad690a5e9f79a6ee5c8492ada8269dc675875ad0fb747d7cada4 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \ From 8d22c765b6b96224830c0bbb5f1e72e95c1dc31f Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Sat, 26 Mar 2022 17:12:48 -0400 Subject: [PATCH 0240/2369] just: update to 1.1.1. --- srcpkgs/just/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/just/template b/srcpkgs/just/template index 436ea6d5d45..7dc9fe4fbeb 100644 --- a/srcpkgs/just/template +++ b/srcpkgs/just/template @@ -1,6 +1,6 @@ # Template file for 'just' pkgname=just -version=1.1.0 +version=1.1.1 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=b0eaf3c7da507be9ad8e0ce050a10459eeead72b94d50bc3261e3dcda516b03a +checksum=b985def8260965773422fc6c665fa37aeb7304280560dbf8f641479ba00e2da0 make_check=ci-skip # test fails when run as root # Fix failing test From 77f7786afd555c282caf215e4eb53f28d5456c9e Mon Sep 17 00:00:00 2001 From: notthewave Date: Fri, 25 Mar 2022 22:02:02 +0100 Subject: [PATCH 0241/2369] sfeed: update to 1.3. --- srcpkgs/sfeed/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template index 47ca1fd1411..46b4d83e558 100644 --- a/srcpkgs/sfeed/template +++ b/srcpkgs/sfeed/template @@ -1,6 +1,6 @@ # Template file for 'sfeed' pkgname=sfeed -version=1.2 +version=1.3 revision=1 build_style=gnu-makefile make_install_args="MANPREFIX=/usr/share/man" @@ -11,7 +11,7 @@ maintainer="notthewave " license="ISC" homepage="https://git.codemadness.org/sfeed" distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz" -checksum=7d3cdaf8dcc6582f6655330f82f8a57ca37c4b9c84ff995b09b7b7fb9fe58b58 +checksum=49d32e98a47a80a2a6cbd5d816938057d4ca3910e0a6a814b2c2a6520fbda9ba post_install() { vlicense LICENSE From 5394d2250e38274e31c111dd694f296ce7b69034 Mon Sep 17 00:00:00 2001 From: Andy Weidenbaum Date: Thu, 24 Mar 2022 19:38:45 +1100 Subject: [PATCH 0242/2369] MoarVM: update to 2022.03. --- srcpkgs/MoarVM/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template index f437404bd76..9386751ab79 100644 --- a/srcpkgs/MoarVM/template +++ b/srcpkgs/MoarVM/template @@ -1,6 +1,6 @@ # Template file for 'MoarVM' pkgname=MoarVM -version=2022.02 +version=2022.03 revision=1 build_style=configure configure_script="perl Configure.pl" @@ -15,6 +15,6 @@ license="Artistic-2.0" homepage="https://moarvm.org" changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog" distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz" -checksum=4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96 +checksum=fb71cd13912464482b99b33f0c06e9fd7c51a151c6e632a9220cf93c5855fdaf nocross=yes shlib_provides="libmoar.so" From ad3b8f153ee4b0730d11260c7616e756d2565218 Mon Sep 17 00:00:00 2001 From: Andy Weidenbaum Date: Thu, 24 Mar 2022 19:40:33 +1100 Subject: [PATCH 0243/2369] nqp: update to 2022.03. --- srcpkgs/nqp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template index e80e23f80ee..52ec0153fe0 100644 --- a/srcpkgs/nqp/template +++ b/srcpkgs/nqp/template @@ -1,6 +1,6 @@ # Template file for 'nqp' pkgname=nqp -version=2022.02 +version=2022.03 revision=1 build_style=configure make_check_target=test @@ -15,5 +15,5 @@ maintainer="Andy Weidenbaum " license="Artistic-2.0" homepage="https://github.com/Raku/nqp" distfiles="https://rakudo.org/dl/nqp/${pkgname}-${version}.tar.gz" -checksum=25d3c99745cd84f4049a9bd9cf26bb5dc817925abaafe71c9bdb68841cdb18b1 +checksum=a95e778970c4d09c091d2aa299c05036208ce4b4b0d3a7af373198c12258b306 nocross=yes From 1ce70f1f371477188f60a79d643e12319231e117 Mon Sep 17 00:00:00 2001 From: Andy Weidenbaum Date: Thu, 24 Mar 2022 19:42:26 +1100 Subject: [PATCH 0244/2369] rakudo: update to 2022.03. --- srcpkgs/rakudo/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template index 979c33def79..6a0345b5790 100644 --- a/srcpkgs/rakudo/template +++ b/srcpkgs/rakudo/template @@ -1,6 +1,6 @@ # Template file for 'rakudo' pkgname=rakudo -version=2022.02 +version=2022.03 revision=1 build_style=configure make_check_target=test @@ -32,10 +32,10 @@ license="Artistic-2.0" homepage="https://rakudo.org" changelog="https://github.com/rakudo/rakudo/raw/master/docs/ChangeLog" distfiles="https://rakudo.org/dl/rakudo/${pkgname}-${version}.tar.gz" -checksum=6a6e9dbcc6d9a1610a34c6ec67e2d3f694d7b33e9e0a0f224543089fa7f71332 +checksum=03e215b001a879747618d6fc18eb7f89c0b812f5e543a43ed66c13439ea8a227 nocross=yes provides="raku-${version}_${revision}" post_install() { - vbin tools/install-dist.p6 raku-install-dist + vbin tools/install-dist.raku raku-install-dist } From 89e1c0aad74558ef6c144ddcd9bef6cdfb29d4b6 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 24 Mar 2022 00:13:18 +0100 Subject: [PATCH 0245/2369] nwipe: update to 0.33. --- srcpkgs/nwipe/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nwipe/template b/srcpkgs/nwipe/template index acc1307e5f1..5a82401a9d4 100644 --- a/srcpkgs/nwipe/template +++ b/srcpkgs/nwipe/template @@ -1,17 +1,18 @@ # Template file for 'nwipe' pkgname=nwipe -version=0.32 +version=0.33 revision=1 build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="libuuid-devel libparted-devel ncurses-devel" +depends="smartmontools" short_desc="Utility to securely erase disks" maintainer="Orphaned " license="GPL-2.0-only" homepage="https://github.com/martijnvanbrummelen/nwipe" changelog="https://raw.githubusercontent.com/martijnvanbrummelen/nwipe/master/CHANGELOG.md" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=40b7a3833d60a28834ccc190174c97a28141fdd43d93652ae93bb4928f567a5c +checksum=e771a6d36a6800a5cf0ad460591bfd7fe4c04a908afe3da5fd169c921195e489 CFLAGS="-D_FILE_OFFSET_BITS=64" From d670e016fae668466dfe9c23bc7d892f9fba7214 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 24 Mar 2022 00:18:32 +0100 Subject: [PATCH 0246/2369] partclone: update to 0.3.19. --- srcpkgs/partclone/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template index f7187bbff91..941c9e4bd52 100644 --- a/srcpkgs/partclone/template +++ b/srcpkgs/partclone/template @@ -1,6 +1,6 @@ # Template file for 'partclone' pkgname=partclone -version=0.3.18 +version=0.3.19 revision=1 build_style=gnu-configure configure_args="--disable-rpath --enable-ncursesw --enable-f2fs @@ -13,8 +13,8 @@ short_desc="File system clone and restore utilities" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://partclone.org/" -distfiles="https://github.com/Thomas-Tsai/${pkgname}/archive/${version}.tar.gz" -checksum=50070e29c2e00e991a3784f13339347acb46d2a293f43531d1f4f4f0dcb42311 +distfiles="https://github.com/Thomas-Tsai/partclone/archive/refs/tags/${version}.tar.gz" +checksum=e15e399297b8efd74a4fd19f3caca28e5c1772b051acf7fc311f3c86296bcda4 CFLAGS="-DBTRFS_DISABLE_BACKTRACE" pre_configure() { From 64372003447a9a5d109ee2c8f3376315294482e9 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Tue, 22 Mar 2022 03:15:35 -0400 Subject: [PATCH 0247/2369] New package: ircdog-0.3.0 --- srcpkgs/ircdog/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/ircdog/template diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template new file mode 100644 index 00000000000..e26b035a138 --- /dev/null +++ b/srcpkgs/ircdog/template @@ -0,0 +1,16 @@ +# Template file for 'ircdog' +pkgname=ircdog +version=0.3.0 +revision=1 +build_style=go +go_import_path="github.com/ergochat/ircdog" +short_desc="Simple wrapper over the raw IRC protocol" +maintainer="0x5c " +license="ISC" +homepage="https://github.com/ergochat/ircdog" +distfiles="https://github.com/ergochat/ircdog/archive/refs/tags/v${version}.tar.gz" +checksum=ea58a3fb081e438eae834ed7a812cc7640e7d3440c3615b814b880fef0eab5f6 + +post_install() { + vlicense LICENSE +} From 937276b12e9adc3db75ddf40f120739492203f9e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 02:34:28 +0100 Subject: [PATCH 0248/2369] stagit: update to 1.0. --- srcpkgs/stagit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template index 7078a4f6c94..f5828d25ed5 100644 --- a/srcpkgs/stagit/template +++ b/srcpkgs/stagit/template @@ -1,6 +1,6 @@ # Template file for 'stagit' pkgname=stagit -version=0.9.6 +version=1.0 revision=1 build_style=gnu-makefile make_install_args="MANPREFIX=/usr/share/man" @@ -10,7 +10,7 @@ maintainer="Steve Prybylski " license="MIT" homepage="https://codemadness.org/git/stagit/log.html" distfiles="https://codemadness.org/releases/stagit/${pkgname}-${version}.tar.gz" -checksum=d072f386f3a546ed0341e20f9c2dfd7756a761fab1c40316a96690cb2b3066d0 +checksum=10a0e31bb57d6da0dea84728cabed95b8f7d83fde13bb76e0ce18ef71ab68d8f LDFLAGS="-lgit2" post_install() { From f53a04a9b875d37609d9e04a100934538c8e1c1f Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 16 Mar 2022 22:06:02 +0100 Subject: [PATCH 0249/2369] imlib2: update to 1.8.1, adopt. --- srcpkgs/imlib2/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template index dd9ac63e7cc..b560ef27489 100644 --- a/srcpkgs/imlib2/template +++ b/srcpkgs/imlib2/template @@ -1,6 +1,6 @@ # Template file for 'imlib2' pkgname=imlib2 -version=1.8.0 +version=1.8.1 revision=1 build_style=gnu-configure configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding" @@ -9,11 +9,11 @@ makedepends="freetype-devel libjpeg-turbo-devel libpng-devel libwebp-devel tiff-devel libid3tag-devel giflib-devel libXext-devel libSM-devel libheif-devel librsvg-devel" short_desc="Image manipulation library" -maintainer="Orphaned " +maintainer="tibequadorian " license="Imlib2" homepage="https://sourceforge.net/projects/enlightenment/" -distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz" -checksum=6f881c9a1eee040484d2f13070fefbf1d88270a75042e2d5de63fa22ea6e1c88 +distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.xz" +checksum=522e1e70e65bc0eddfe207617d15c9a395662a7c090661daaa2c294fb7d9fdaa post_install() { vlicense COPYING From 2d9dcd176566d17be164e8aba5a64171b3cd79b3 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Wed, 19 May 2021 16:09:01 +0200 Subject: [PATCH 0250/2369] New package: perl-Math-Int64-0.54 --- srcpkgs/perl-Math-Int64/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/perl-Math-Int64/template diff --git a/srcpkgs/perl-Math-Int64/template b/srcpkgs/perl-Math-Int64/template new file mode 100644 index 00000000000..f5554054e6f --- /dev/null +++ b/srcpkgs/perl-Math-Int64/template @@ -0,0 +1,15 @@ +# Template file for 'perl-Math-Int64' +pkgname=perl-Math-Int64 +version=0.54 +revision=1 +wrksrc="${pkgname#perl-}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +depends="perl" +short_desc="Add support for 64 bit integers, signed and unsigned, to Perl" +maintainer="newbluemoon " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Math-Int64" +distfiles="${CPAN_SITE}/Math/Math-Int64-${version}.tar.gz" +checksum=dcfc51e698437ea6b9cefe0276215c56cdb6a7f85e3e24a2b6b4189f1960d351 From 2ec06f8fb1fb7324d82bec8a0ef919c9a5de16cc Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Wed, 19 May 2021 16:09:28 +0200 Subject: [PATCH 0251/2369] New package: perl-Math-Int128-0.22 --- srcpkgs/perl-Math-Int128/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/perl-Math-Int128/template diff --git a/srcpkgs/perl-Math-Int128/template b/srcpkgs/perl-Math-Int128/template new file mode 100644 index 00000000000..eb4fb2e68fd --- /dev/null +++ b/srcpkgs/perl-Math-Int128/template @@ -0,0 +1,20 @@ +# Template file for 'perl-Math-Int128' +pkgname=perl-Math-Int128 +version=0.22 +revision=1 +wrksrc="${pkgname#perl-}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl" +depends="perl perl-Math-Int64" +checkdepends="perl-Math-Int64" +short_desc="Add support for 128 bit integers, signed and unsigned, to Perl" +maintainer="newbluemoon " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/Math-Int64" +distfiles="${CPAN_SITE}/Math/Math-Int128-${version}.tar.gz" +checksum=a630ca401753866955f1173848ab5b4ac4ad5ca6ad9087f11cdf91dde85119bc + +if [ "$XBPS_TARGET_WORDSIZE" == "32" ]; then + broken="not supported on 32-bit architectures" +fi From 643a0b285ca16fb9d8ba587f8e96a5f289fec111 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Wed, 19 May 2021 16:10:55 +0200 Subject: [PATCH 0252/2369] perl-Crypt-CBC: update to 3.04 --- srcpkgs/perl-Crypt-CBC/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Crypt-CBC/template b/srcpkgs/perl-Crypt-CBC/template index 5ddc77f0674..f15cfc6013c 100644 --- a/srcpkgs/perl-Crypt-CBC/template +++ b/srcpkgs/perl-Crypt-CBC/template @@ -1,6 +1,6 @@ # Template file for 'perl-Crypt-CBC' pkgname=perl-Crypt-CBC -version=3.01 +version=3.04 revision=1 wrksrc="${pkgname#perl-}-${version}" build_style=perl-module @@ -12,6 +12,6 @@ maintainer="newbluemoon " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Crypt-CBC" distfiles="${CPAN_SITE}/Crypt/Crypt-CBC-${version}.tar.gz" -checksum=de259c1c94fc1fd2731dfd276e8b05e31edfd2150848afdff09ac6ae9a03e624 +checksum=4026c57d0dbf6496c0d561a26f161b763d3b8edf351139c073492e21b5fbce07 # check requires a lot of new cascading dependencies make_check=no From 88581225f8bfe778e048780bd2c395818a7b43d2 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Fri, 11 Feb 2022 19:40:45 +0100 Subject: [PATCH 0253/2369] lilypond: update to 2.23.6 --- srcpkgs/lilypond/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template index 66d452bd777..0cc74759a10 100644 --- a/srcpkgs/lilypond/template +++ b/srcpkgs/lilypond/template @@ -1,6 +1,6 @@ # Template file for 'lilypond' pkgname=lilypond -version=2.23.5 +version=2.23.6 revision=1 build_wrksrc="build" build_style="gnu-configure" @@ -17,7 +17,7 @@ maintainer="newbluemoon " license="GPL-3.0-or-later, GFDL-1.3-or-later" homepage="https://lilypond.org/" distfiles="https://lilypond.org/downloads/sources/v2.23/lilypond-${version}.tar.gz" -checksum=53fd289eac318356003bf19b2d9e8ec43cb32e2ea926363145c1b26482bd1678 +checksum=a179bd974a0e64390efef5bb0cc1e7287f1218237548433adba51c4f25bba2ce python_version=3 if [ -n "${CROSS_BUILD}" ]; then From 659b2501a0581707beb5d81dcb067450ddd6aec4 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Fri, 11 Feb 2022 19:41:08 +0100 Subject: [PATCH 0254/2369] lilypond-doc: update to 2.23.6 --- srcpkgs/lilypond-doc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template index 89aa80f23fe..f0ee3b262e9 100644 --- a/srcpkgs/lilypond-doc/template +++ b/srcpkgs/lilypond-doc/template @@ -1,6 +1,6 @@ # Template file for 'lilypond-doc' pkgname=lilypond-doc -version=2.23.5 +version=2.23.6 revision=1 create_wrksrc=yes short_desc="Documentation for the lilypond music engraving program" @@ -8,7 +8,7 @@ maintainer="newbluemoon " license="GPL-3.0-or-later, GFDL-1.3-or-later" homepage="https://lilypond.org/" distfiles="https://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2" -checksum=e2b528b3ce70058b634fd76b097f975760c0ad86148d9ec63b66c73a941b0afd +checksum=1fada73c22dbcfa6224744a8ad87e10cced784f98fd9243768c96ee5bc0ee45d do_install() { vmkdir usr From 6958142574afe343ead9a8d9dc9eedd1ff40f525 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Mon, 7 Mar 2022 13:37:41 +0100 Subject: [PATCH 0255/2369] slop: update to 7.6. --- common/shlibs | 2 +- srcpkgs/slop/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index d3c9ab101c3..1b072c738a2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2985,7 +2985,7 @@ libmutter-cogl-9.so.0 mutter-41.0_1 libmutter-cogl-pango-9.so.0 mutter-41.0_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 -libslopy.so.7.5 slop-7.5_1 +libslopy.so.7.6 slop-7.6_1 libbcunit.so.1 bcunit-3.0_1 libzbar.so.0 libzbar-0.10_1 libzbargtk.so.0 libzbar-0.10_1 diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template index bae6088a418..9659f2818c1 100644 --- a/srcpkgs/slop/template +++ b/srcpkgs/slop/template @@ -1,7 +1,7 @@ # Template file for 'slop' pkgname=slop -version=7.5 -revision=5 +version=7.6 +revision=1 build_style=cmake hostmakedepends="pkg-config" makedepends="glew-devel glm icu-devel libXrender-devel" @@ -10,7 +10,7 @@ maintainer="Felipe Nogueira " license="GPL-3.0-or-later" homepage="https://github.com/naelstrof/slop" distfiles="https://github.com/naelstrof/slop/archive/v${version}.tar.gz" -checksum=94d8b6270217cd7f56ce7d4a9a75069025262830a2f91c3239b7fc07da5ea8da +checksum=ec45f9a69d7a24df621f5c634d202451ddca987d550cf588c5c427b99106fb6b slop-devel_package() { short_desc+=" - developments files" From df9a8d06060cb4ef8ebbf6fab520b9920846dcdc Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Mon, 7 Mar 2022 13:38:14 +0100 Subject: [PATCH 0256/2369] maim: rebuild against slop-7.6 --- srcpkgs/maim/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template index c9cfee87533..a3bbf381c46 100644 --- a/srcpkgs/maim/template +++ b/srcpkgs/maim/template @@ -1,7 +1,7 @@ # Template file for 'maim' pkgname=maim version=5.7.4 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config" makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel From 6726d3c1f9595e6dbaf632be9b0d192839bdfcf2 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sun, 6 Mar 2022 19:08:14 +0100 Subject: [PATCH 0257/2369] dumb_runtime_dir: update to 1.0.4. --- srcpkgs/dumb_runtime_dir/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dumb_runtime_dir/template b/srcpkgs/dumb_runtime_dir/template index 756fc018a26..f2b18817be6 100644 --- a/srcpkgs/dumb_runtime_dir/template +++ b/srcpkgs/dumb_runtime_dir/template @@ -1,6 +1,6 @@ # Template file for 'dumb_runtime_dir' pkgname=dumb_runtime_dir -version=1.0.3 +version=1.0.4 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Isaac Freund " license="0BSD" homepage="https://github.com/ifreund/dumb_runtime_dir" distfiles="${homepage}/releases/download/v${version}/dumb_runtime_dir-${version}.tar.gz" -checksum=92fe5c4b6a69eb9e1845b067aa7f71303a6faabea3be8110776b6072c1652718 +checksum=451e680ee2ad4bd268a2cc21571fd843eefde5ffd7a6847221f9a1449924acc0 post_install() { vlicense LICENSE From 399e4d95af485e934d794df9bce714e500b7d755 Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated Date: Sat, 5 Mar 2022 12:14:35 +0100 Subject: [PATCH 0258/2369] skopeo: update to 1.6.1. --- srcpkgs/skopeo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template index cd069e30431..b568744c4b2 100644 --- a/srcpkgs/skopeo/template +++ b/srcpkgs/skopeo/template @@ -1,6 +1,6 @@ # Template file for 'skopeo' pkgname=skopeo -version=1.5.2 +version=1.6.1 revision=1 build_style=go go_import_path="github.com/containers/${pkgname}" @@ -14,7 +14,7 @@ maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/containers/skopeo" distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz" -checksum=e15c189a8134dec62259e6fea2786e9fb55b34e55d26a8924de0d438fd3677c4 +checksum=304016ec4eb802bf1e1b350854db50bdc99a93dcbcc71f9d531dbb916dc146f3 make_dirs="/var/lib/atomic/sigstore 0755 root root" post_build() { From 3b7136b948ad6bd08066ad90bcf30458c745547e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 2 Mar 2022 19:44:21 +0100 Subject: [PATCH 0259/2369] allegro5: update to 5.2.7.0. --- srcpkgs/allegro5/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/allegro5/template b/srcpkgs/allegro5/template index f55a7eb6c14..e63d90e3e3f 100644 --- a/srcpkgs/allegro5/template +++ b/srcpkgs/allegro5/template @@ -1,6 +1,6 @@ # Template file for 'allegro5' pkgname=allegro5 -version=5.2.6.0 +version=5.2.7.0 revision=1 wrksrc="allegro-${version}" build_style=cmake @@ -9,14 +9,14 @@ hostmakedepends="pkg-config" makedepends="zlib-devel alsa-lib-devel jack-devel libXpm-devel libXxf86vm-devel libXxf86dga-devel libXcursor-devel libvorbis-devel libpng-devel glu-devel libjpeg-turbo-devel libtheora-devel freetype-devel libflac-devel physfs-devel - libopenal-devel gtk+-devel opus-devel opusfile-devel" + libopenal-devel gtk+3-devel opus-devel opusfile-devel" depends="virtual?libGL" short_desc="Portable library mainly aimed at video game and multimedia programming" maintainer="Diogo Leal " license="Allegro License (MIT alike)" homepage="https://liballeg.org/" distfiles="https://github.com/liballeg/allegro5/releases/download/${version}/allegro-${version}.tar.gz" -checksum=5de8189ec051e1865f359654f86ec68e2a12a94edd00ad06d1106caa5ff27763 +checksum=c1e3b319d99cb453b39d393572ba2b9f3de42a96de424aee7d4a1abceaaa970c post_install() { vlicense LICENSE.txt From b4c6ac31f489cd491255ca7ccd9e557a3f078779 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, 18 Jan 2021 21:02:52 +0700 Subject: [PATCH 0260/2369] GitHub Action: build on push to branches designated for CI --- .github/workflows/build.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8ecd4d0e658..503f1e1f4b6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,6 +1,10 @@ -name: Check PR +name: Check build -on: pull_request +on: + pull_request: + push: + branches: + - 'ci-**' jobs: # Lint changed templates. From c64dcb92faefb00517d1fc9e030c21649c59ce20 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 14 Mar 2022 16:27:20 -0400 Subject: [PATCH 0261/2369] New package: aravis-0.8.21 --- common/shlibs | 1 + srcpkgs/aravis/template | 47 +++++++++++++++++++++++++++++++++++++++ srcpkgs/gstreamer1-aravis | 1 + srcpkgs/libaravis | 1 + srcpkgs/libaravis-devel | 1 + 5 files changed, 51 insertions(+) create mode 100644 srcpkgs/aravis/template create mode 120000 srcpkgs/gstreamer1-aravis create mode 120000 srcpkgs/libaravis create mode 120000 srcpkgs/libaravis-devel diff --git a/common/shlibs b/common/shlibs index 1b072c738a2..ccc55a1b377 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4144,3 +4144,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1 librz_lang.so.0.3.4 rizin-0.3.4_1 librz_search.so.0.3.4 rizin-0.3.4_1 librz_bin.so.0.3.4 rizin-0.3.4_1 +libaravis-0.8.so.0 libaravis-0.8.21_1 diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template new file mode 100644 index 00000000000..2c67a954144 --- /dev/null +++ b/srcpkgs/aravis/template @@ -0,0 +1,47 @@ +# Template file for 'aravis' +pkgname=aravis +version=0.8.21 +revision=1 +build_style=meson +hostmakedepends="pkg-config gobject-introspection gi-docgen gettext" +makedepends="gtk+3-devel glib-devel libusb-devel zlib-devel libxml2-devel + gstreamer1-devel gst-plugins-base1-devel" +checkdepends="python3-gobject" +short_desc="Vision utilities for genicam based cameras" +maintainer="Andrew J. Hesford " +license="LGPL-2.1-or-later" +homepage="https://github.com/AravisProject/aravis" +distfiles="${homepage}/archive/${version}.tar.gz" +checksum=a53ce93cb082ac1c4215aed48aa9e05d5342d58811938065e9f503b07838dfb3 +# Network test causes timeout in CI +make_check=ci-skip + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" glib-devel prelink-cross qemu-user-static" +fi + +libaravis_package() { + short_desc="Vision library for genicam-based cameras" + pkg_install() { + vmove "usr/lib/*.so.*" + vmove usr/lib/girepository-1.0 + } +} + +libaravis-devel_package() { + depends="libaravis>=${version}_${revision}" + short_desc="Vision library for genicam-based cameras - development files" + pkg_install() { + vmove "usr/lib/*.so" + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gir-1.0 + } +} + +gstreamer1-aravis_package() { + short_desc+=" - gstreamer plugin" + pkg_install() { + vmove usr/lib/gstreamer-1.0 + } +} diff --git a/srcpkgs/gstreamer1-aravis b/srcpkgs/gstreamer1-aravis new file mode 120000 index 00000000000..4309a30c365 --- /dev/null +++ b/srcpkgs/gstreamer1-aravis @@ -0,0 +1 @@ +aravis \ No newline at end of file diff --git a/srcpkgs/libaravis b/srcpkgs/libaravis new file mode 120000 index 00000000000..4309a30c365 --- /dev/null +++ b/srcpkgs/libaravis @@ -0,0 +1 @@ +aravis \ No newline at end of file diff --git a/srcpkgs/libaravis-devel b/srcpkgs/libaravis-devel new file mode 120000 index 00000000000..4309a30c365 --- /dev/null +++ b/srcpkgs/libaravis-devel @@ -0,0 +1 @@ +aravis \ No newline at end of file From fbf45c290b8f11c318cfd934ccded5fdc202cccc Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sat, 26 Mar 2022 21:18:06 +0530 Subject: [PATCH 0262/2369] New package: spotify-adblock-1.0.1 --- srcpkgs/spotify-adblock/template | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/spotify-adblock/template diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template new file mode 100644 index 00000000000..8d64a84df72 --- /dev/null +++ b/srcpkgs/spotify-adblock/template @@ -0,0 +1,25 @@ +# Template file for 'spotify-adblock' +pkgname=spotify-adblock +version=1.0.1 +revision=1 +build_style=cargo +conf_files="/etc/spotify-adblock/config.toml" +short_desc="Adblocker for Spotify" +maintainer="Subhaditya Nath " +license="GPL-3.0-or-later" +homepage="https://github.com/abba23/spotify-adblock" +distfiles="https://github.com/abba23/spotify-adblock/archive/refs/tags/v${version}.tar.gz" +checksum=01edec4cc87fd0bbf77508fe6bcfdfba244771a992eca9d834df0f9399f1c360 + +pre_install() { + { sed -n '/Debian/q' + sed -n '/^```$/q' + sed -n '/^```$/q;s-/usr/local/lib/-/usr/lib/-;p' + } spotify-adblock.desktop +} + +do_install() { + vinstall config.toml 644 etc/spotify-adblock + vinstall spotify-adblock.desktop 644 usr/share/applications + vinstall "target/${RUST_TARGET}/release/libspotifyadblock.so" 644 usr/lib spotify-adblock.so +} From 21bf3872fc609bcebfb8a337268d61e5c9529083 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 14 Mar 2022 21:18:11 -0500 Subject: [PATCH 0263/2369] kaffeine: plugins are not detected shlibs --- srcpkgs/kaffeine/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/kaffeine/template b/srcpkgs/kaffeine/template index 6b9f2ac96c9..e0356c9ad55 100644 --- a/srcpkgs/kaffeine/template +++ b/srcpkgs/kaffeine/template @@ -1,7 +1,7 @@ # Template file for 'kaffeine' pkgname=kaffeine version=2.0.18 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config kcoreaddons" @@ -9,6 +9,8 @@ makedepends="kidletime-devel kio-devel ksolid-devel vlc-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds $(vopt_if dvb 'v4l-utils-devel eudev-libudev-devel')" +depends="qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql + qt5-plugin-sqlite qt5-plugin-tds" short_desc="KDE media player" maintainer="Orphaned " license="GPL-2.0-or-later" From 76ece037d79aad1c55485812be9927d36195ccab Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 1 Oct 2021 18:23:28 -0500 Subject: [PATCH 0264/2369] enchant2: update to 2.3.2. --- srcpkgs/enchant2/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template index 8a48e4d61b8..2d7a2e67e12 100644 --- a/srcpkgs/enchant2/template +++ b/srcpkgs/enchant2/template @@ -1,7 +1,7 @@ # Template file for 'enchant2' pkgname=enchant2 -version=2.2.15 -revision=5 +version=2.3.2 +revision=1 wrksrc="enchant-${version}" build_style=gnu-configure # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering; @@ -22,7 +22,8 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://abiword.github.io/enchant/" distfiles="https://github.com/AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz" -checksum=3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03 +checksum=ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e +make_check=no # tests broken enchant2-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 10874b0b38ee6195e0202157f897735995dded4d Mon Sep 17 00:00:00 2001 From: Adam Pschorr Date: Mon, 21 Mar 2022 12:19:12 -0600 Subject: [PATCH 0265/2369] New package: qt6ct-0.5 --- srcpkgs/qt6ct/files/qt6ct.sh | 6 ++++++ srcpkgs/qt6ct/template | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 srcpkgs/qt6ct/files/qt6ct.sh create mode 100644 srcpkgs/qt6ct/template diff --git a/srcpkgs/qt6ct/files/qt6ct.sh b/srcpkgs/qt6ct/files/qt6ct.sh new file mode 100644 index 00000000000..e4e7708d8a2 --- /dev/null +++ b/srcpkgs/qt6ct/files/qt6ct.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env sh + +export QT_QPA_PLATFORMTHEME=qt5ct +if [ "$XDG_SESSION_TYPE" = "wayland" ]; then + export QT_QPA_PLATFORM=wayland +fi diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template new file mode 100644 index 00000000000..1e443df1dc2 --- /dev/null +++ b/srcpkgs/qt6ct/template @@ -0,0 +1,20 @@ +# Template file for 'qt6ct' +pkgname=qt6ct +version=0.5 +revision=1 +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr" +hostmakedepends="qt6-tools-devel" +makedepends="qt6-base-devel" +depends="qt6-base qt6-svg" +short_desc="Qt6 Configuration Tool" +maintainer="Adam Pschorr " +license="BSD-2-Clause" +homepage="https://github.com/trialuser02/qt6ct" +distfiles="https://github.com/trialuser02/qt6ct/archive/refs/tags/${version}.tar.gz" +checksum=0fea8e5295e4ebebfae36f4862aaa67859238312d7a055b252cc53b281d69e0d + +post_install() { + vlicense COPYING + vinstall ${FILESDIR}/qt6ct.sh 644 etc/profile.d +} From 6591403ab9bc9fc2b6e1e5490977d0e91f8e5f69 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 27 Mar 2022 22:52:23 -0500 Subject: [PATCH 0266/2369] berry: 0.1.11 --- srcpkgs/berry/patches/fix-cross.patch | 48 +++++---------------------- srcpkgs/berry/template | 9 ++--- 2 files changed, 14 insertions(+), 43 deletions(-) diff --git a/srcpkgs/berry/patches/fix-cross.patch b/srcpkgs/berry/patches/fix-cross.patch index 3756ccfa40c..eace39b7a1f 100644 --- a/srcpkgs/berry/patches/fix-cross.patch +++ b/srcpkgs/berry/patches/fix-cross.patch @@ -1,41 +1,11 @@ ---- a/config.mk -+++ b/config.mk -@@ -9,11 +9,11 @@ - # Customize below to fit your system +--- a/configure ++++ b/configure +@@ -26,7 +26,7 @@ + progs="CC=gcc CC=clang CC=cc INSTALL=install" - # paths --PREFIX = /usr/local -+PREFIX = /usr - MANPREFIX = ${PREFIX}/share/man + # Required dependencies +-pkgs="x11 xinerama fontconfig xft" ++pkgs="x11 xinerama fontconfig xft freetype2" --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = $(XBPS_CROSS_BASE)/usr/include -+X11LIB = $(XBPS_CROSS_BASE)/usr/lib - - # Xinerama, comment if you don't want it - XINERAMALIBS = -lXinerama -@@ -21,7 +21,7 @@ - - # freetype - FREETYPELIBS = -lfontconfig -lXft --FREETYPEINC = /usr/include/freetype2 -+FREETYPEINC = $(XBPS_CROSS_BASE)/usr/include/freetype2 - # OpenBSD (uncomment) - #FREETYPEINC = ${X11INC}/freetype2 - -@@ -36,7 +36,7 @@ - # flags - CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${DEBUG_CPPFLAGS} - #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} --CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES) -+CFLAGS += -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES) - LDFLAGS = ${LIBS} - - # Solaris -@@ -44,4 +44,4 @@ - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+#CC = cc + # Default pkg flags to substitute when pkg-config is not found + pkg_libs="-lX11 -lXinerama -lfontconfig -lfreetype -lXft" diff --git a/srcpkgs/berry/template b/srcpkgs/berry/template index 05256589af2..7e2f79c0964 100644 --- a/srcpkgs/berry/template +++ b/srcpkgs/berry/template @@ -1,16 +1,17 @@ # Template file for 'berry' pkgname=berry -version=0.1.7 +version=0.1.11 revision=1 -build_style=gnu-makefile -make_use_env=yes +build_style=configure +configure_args="--prefix=/usr" +hostmakedepends="pkg-config which" makedepends="libX11-devel libXinerama-devel libXft-devel freetype-devel" short_desc="Healthy, bite-sized window manager" maintainer="Andrew Benson " license="MIT" homepage="https://github.com/JLErvin/berry" distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz" -checksum=1d6de883a0cd96ceb167c5ad2e855b0b15fa84872d41a22e05d0fdf0cf4be6b8 +checksum=9beab0c1458fba7cf304dd45b710829640342bc42cfe61f0ae8c2b5391163142 post_install() { vlicense LICENSE From e131a3ea17a48b8fd0361d2cb074304837f7afa7 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 27 Mar 2022 23:03:37 -0500 Subject: [PATCH 0267/2369] downloader-cli: update to 0.3.3. --- srcpkgs/downloader-cli/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/downloader-cli/template b/srcpkgs/downloader-cli/template index e390e31ed7b..a7be8744ea3 100644 --- a/srcpkgs/downloader-cli/template +++ b/srcpkgs/downloader-cli/template @@ -1,7 +1,7 @@ # Template file for 'downloader-cli' pkgname=downloader-cli -version=0.3.2 -revision=2 +version=0.3.3 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-urllib3 python3-downloader-cli" @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/deepjyoti30/downloader-cli" distfiles="https://github.com/deepjyoti30/downloader-cli/archive/${version}.tar.gz" -checksum=ad00b5ab905e57b8c275465c2b8bbeb187068ceff6614e68cf0b86de635acfe5 +checksum=212f87443574f4be7df750223ae15912e3a8f28470cd90aecc40701d109576f4 post_install() { vlicense LICENSE From 7c15c35aca01d33667b971438cecc56bda045f6b Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 27 Mar 2022 23:05:43 -0500 Subject: [PATCH 0268/2369] ffuf: update to 1.4.0. --- srcpkgs/ffuf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template index 5430e121a53..6ceffafb0e5 100644 --- a/srcpkgs/ffuf/template +++ b/srcpkgs/ffuf/template @@ -1,6 +1,6 @@ # Template file for 'ffuf' pkgname=ffuf -version=1.3.1 +version=1.4.0 revision=1 build_style=go go_import_path="github.com/ffuf/ffuf" @@ -9,7 +9,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/ffuf/ffuf" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=136df36154f17668fb726120f0c93059f696786a34e3c2047d61efc3a065c4ec +checksum=cc741088f15b5cfdeb596f1630a015cce0b4b112dc6daf857cd9878e7a1734c1 post_install() { vlicense LICENSE From 0957027b6f4bd7ab00eaf447f8cd8d72e704c933 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 28 Mar 2022 14:21:14 +0200 Subject: [PATCH 0269/2369] s-nail: update to 14.9.24. --- srcpkgs/s-nail/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template index 2ba9e33f361..7a171cea0d2 100644 --- a/srcpkgs/s-nail/template +++ b/srcpkgs/s-nail/template @@ -1,6 +1,6 @@ # Template file for 's-nail' pkgname=s-nail -version=14.9.23 +version=14.9.24 revision=1 build_helper="qemu" hostmakedepends="perl" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="BSD-4-Clause, BSD-3-Clause, BSD-2-Clause, ISC" homepage="https://git.sdaoden.eu/cgit/s-nail.git" distfiles="https://www.sdaoden.eu/downloads/s-nail-${version}.tar.xz" -checksum=2c717b22f4cd8719b82b6618640da6031382d2bf8eb51283bca2c6266957bca8 +checksum=2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c provides="mail-${version}_${revision}" From 8ccfd202300917018401d24b2b691de54f2953d9 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 28 Mar 2022 14:22:18 +0200 Subject: [PATCH 0270/2369] weechat: update to 3.5. --- srcpkgs/weechat/template | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template index c5898cbf309..ebd25fa2154 100644 --- a/srcpkgs/weechat/template +++ b/srcpkgs/weechat/template @@ -1,6 +1,6 @@ # Template file for 'weechat' pkgname=weechat -version=3.4.1 +version=3.5 revision=1 build_style=cmake configure_args="-DENABLE_MAN=ON -DENABLE_PERL=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=7e088109ad5dfbcb08a9a6b1dd70ea8236093fed8a13ee9d9c98881d7b1aeae7 +checksum=ea904e4cec8edd0bd24f3ea17f6d6dff97ca00ee0571ee972e79e54c8c08170c lib32disabled=yes subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl" @@ -32,10 +32,6 @@ if [ "$CROSS_BUILD" ]; then -DPERL_LFLAGS=-L$_perlpath" fi -post_extract() { - vsed -i '/pkg_search_module/s/ruby-3.0/ruby-3.1 &/' cmake/FindRuby.cmake -} - weechat-aspell_package() { lib32disabled=yes depends="${sourcepkg}>=${version}_${revision}" From b66096b16078f9bd60ac8f7d2b9fa20088f33986 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 28 Mar 2022 14:22:29 +0200 Subject: [PATCH 0271/2369] python3-pyinfra: update to 1.7.2. --- srcpkgs/python3-pyinfra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template index 7e633ebc3fe..c4935c5e16b 100644 --- a/srcpkgs/python3-pyinfra/template +++ b/srcpkgs/python3-pyinfra/template @@ -1,6 +1,6 @@ # Template file for 'python3-pyinfra' pkgname=python3-pyinfra -version=1.6.3 +version=1.7.2 revision=1 wrksrc="pyinfra-${version}" build_style=python3-module @@ -14,7 +14,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://pyinfra.com/" distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz" -checksum=0db96b12a5dde2ca464a83b7dbbff74207775ad16de9162313a823320ec12488 +checksum=c7a2464ab50c5de865f0984e1978a9af37fbeca2260c4bf642db37fd0aed910d post_extract() { vsed -i -e '/configparser/d' setup.py # is in Python 3.8 From 9e5a9e15dbd97a23b3526b84389440e96746a5a4 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 28 Mar 2022 08:23:49 -0500 Subject: [PATCH 0272/2369] nfdump: update to 1.6.24. --- srcpkgs/nfdump/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nfdump/template b/srcpkgs/nfdump/template index 1bdf3de252f..348db854dbf 100644 --- a/srcpkgs/nfdump/template +++ b/srcpkgs/nfdump/template @@ -1,6 +1,6 @@ # Template file for 'nfdump' pkgname=nfdump -version=1.6.23 +version=1.6.24 revision=1 build_style=gnu-configure hostmakedepends="automake flex libtool pkg-config" @@ -10,7 +10,7 @@ maintainer="Andrew Benson " license="BSD-3-Clause" homepage="https://github.com/phaag/nfdump" distfiles="https://github.com/phaag/nfdump/archive/v${version}.tar.gz" -checksum=8c5a7959e66bb90fcbd8ad508933a14ebde4ccf7f4ae638d8f18c9473c63af33 +checksum=11ea7ecba405d57076c321f6f77491f1c64538062630131c98ac62dc4870545e configure_args+="--enable-sflow --enable-readpcap --enable-nfcapd" pre_configure() { From a30d2daac267788b4a015e632450b8f69fb57ae8 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 28 Mar 2022 08:26:12 -0500 Subject: [PATCH 0273/2369] python3-simber: update to 0.2.4. --- srcpkgs/python3-simber/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-simber/template b/srcpkgs/python3-simber/template index 27bd0df0d1f..20d06df337b 100644 --- a/srcpkgs/python3-simber/template +++ b/srcpkgs/python3-simber/template @@ -1,7 +1,7 @@ # Template file for 'python3-simber' pkgname=python3-simber -version=0.2.3 -revision=2 +version=0.2.4 +revision=1 wrksrc="simber-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://simber.deepjyoti30.dev/" distfiles="https://github.com/deepjyoti30/simber/archive/${version}.tar.gz" -checksum=bf588394e26dcd45f4dba5f0c7b3cff8de3d66e22a5cd862979828295ea7f32a +checksum=75c9e2fc915d470a4d9d36e5e5d003479d06af5d3a7e21b7ec30745f1845f8b9 post_install() { vlicense LICENSE From 69a4cd966d378e42597b65d1ddfdc09a331ed107 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 28 Mar 2022 08:42:18 -0500 Subject: [PATCH 0274/2369] stellarium: update to 0.22.0. --- srcpkgs/stellarium/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template index 0cfc788cdef..c2a87b2847a 100644 --- a/srcpkgs/stellarium/template +++ b/srcpkgs/stellarium/template @@ -1,16 +1,16 @@ # Template file for 'stellarium' pkgname=stellarium -version=0.21.3 +version=0.22.0 revision=1 build_style=cmake hostmakedepends="perl qt5-qmake qt5-host-tools" makedepends="qt5-location-devel qt5-multimedia-devel qt5-script-devel - qt5-serialport-devel qt5-tools-devel" + qt5-serialport-devel qt5-tools-devel qt5-charts-devel" depends="desktop-file-utils" short_desc="Open Source Planetarium" maintainer="Andrew Benson " license="GPL-2.0-or-later" homepage="https://stellarium.org/" distfiles="https://github.com/Stellarium/stellarium/releases/download/v${version}/stellarium-${version}.tar.gz" -checksum=8ac6c054d12f136fe0d5c0deaaa8d7b69dd2a462be1711a187364574aef97e7f +checksum=0b4dc23cf9054b5e76cd9bc5ad68e172eb221999e90af37e93667d04fe78c885 replaces="stellarium-data>=0" From 27bfe553ee6ff12fdfba0c87c7402634eaefdcbb Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 28 Mar 2022 16:01:20 +0200 Subject: [PATCH 0275/2369] linux5.10: update to 5.10.109. Enable CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_BOOTLOADER=y --- srcpkgs/linux5.10/files/arm64-dotconfig | 2 +- srcpkgs/linux5.10/files/i386-dotconfig | 4 ++-- srcpkgs/linux5.10/files/ppc-dotconfig | 2 +- srcpkgs/linux5.10/files/ppc64-dotconfig | 4 ++-- srcpkgs/linux5.10/files/ppc64le-dotconfig | 4 ++-- srcpkgs/linux5.10/files/x86_64-dotconfig | 4 ++-- srcpkgs/linux5.10/template | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig index f5587464698..acfc37c0351 100644 --- a/srcpkgs/linux5.10/files/arm64-dotconfig +++ b/srcpkgs/linux5.10/files/arm64-dotconfig @@ -4519,7 +4519,7 @@ CONFIG_XILLYBUS_OF=m # end of Character devices CONFIG_RANDOM_TRUST_CPU=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig index 3226507db58..e3ea24162dc 100644 --- a/srcpkgs/linux5.10/files/i386-dotconfig +++ b/srcpkgs/linux5.10/files/i386-dotconfig @@ -4034,8 +4034,8 @@ CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m # end of Character devices -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig index df90c0513f4..078ffac9ee0 100644 --- a/srcpkgs/linux5.10/files/ppc-dotconfig +++ b/srcpkgs/linux5.10/files/ppc-dotconfig @@ -3549,7 +3549,7 @@ CONFIG_DEVPORT=y # CONFIG_XILLYBUS is not set # end of Character devices -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig index 0545b9d79c7..5d973825057 100644 --- a/srcpkgs/linux5.10/files/ppc64-dotconfig +++ b/srcpkgs/linux5.10/files/ppc64-dotconfig @@ -4148,8 +4148,8 @@ CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m # end of Character devices -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig index 5ae9914dc5b..a5158c12dd3 100644 --- a/srcpkgs/linux5.10/files/ppc64le-dotconfig +++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig @@ -3969,8 +3969,8 @@ CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m # end of Character devices -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig index 6f07a461b3a..fa04bb81b4d 100644 --- a/srcpkgs/linux5.10/files/x86_64-dotconfig +++ b/srcpkgs/linux5.10/files/x86_64-dotconfig @@ -4104,8 +4104,8 @@ CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m # end of Character devices -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template index a3ccac15e15..0912977245d 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.107 +version=5.10.109 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=c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea +checksum=18fb22ecb249669ea775474aee614dcb0697cab299068074fd9f0bafa32113dc python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR. From cb15632148780e03a61c8e0d9aaee69ed1f6a839 Mon Sep 17 00:00:00 2001 From: lemmi Date: Fri, 11 Mar 2022 22:37:26 +0100 Subject: [PATCH 0276/2369] podman: add runit service --- srcpkgs/podman/files/podman-docker/finish | 3 +++ srcpkgs/podman/files/podman-docker/run | 4 ++++ srcpkgs/podman/files/podman/log/run | 1 + srcpkgs/podman/files/podman/run | 4 ++++ srcpkgs/podman/template | 4 +++- 5 files changed, 15 insertions(+), 1 deletion(-) create mode 100755 srcpkgs/podman/files/podman-docker/finish create mode 100755 srcpkgs/podman/files/podman-docker/run create mode 120000 srcpkgs/podman/files/podman/log/run create mode 100755 srcpkgs/podman/files/podman/run diff --git a/srcpkgs/podman/files/podman-docker/finish b/srcpkgs/podman/files/podman-docker/finish new file mode 100755 index 00000000000..884b37f53b6 --- /dev/null +++ b/srcpkgs/podman/files/podman-docker/finish @@ -0,0 +1,3 @@ +#!/bin/sh + +[ "$(realpath /run/docker.sock)" = "/run/podman/podman.sock" ] && rm /run/docker.sock diff --git a/srcpkgs/podman/files/podman-docker/run b/srcpkgs/podman/files/podman-docker/run new file mode 100755 index 00000000000..3125a4f89ed --- /dev/null +++ b/srcpkgs/podman/files/podman-docker/run @@ -0,0 +1,4 @@ +#!/bin/sh + +ln -sf /run/podman/podman.sock /run/docker.sock +exec chpst -b podman-docker pause diff --git a/srcpkgs/podman/files/podman/log/run b/srcpkgs/podman/files/podman/log/run new file mode 120000 index 00000000000..3a5b4a58605 --- /dev/null +++ b/srcpkgs/podman/files/podman/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/podman/files/podman/run b/srcpkgs/podman/files/podman/run new file mode 100755 index 00000000000..8eb8f41752e --- /dev/null +++ b/srcpkgs/podman/files/podman/run @@ -0,0 +1,4 @@ +#!/bin/sh + +[ -r ./conf ] && . ./conf +exec podman --log-level info system service ${OPTS:---time=0} 2>&1 diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template index c719e4ca605..95e0531abad 100644 --- a/srcpkgs/podman/template +++ b/srcpkgs/podman/template @@ -1,7 +1,7 @@ # Template file for 'podman' pkgname=podman version=4.0.2 -revision=2 +revision=3 build_style=go go_import_path="github.com/containers/podman/v4" go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport" @@ -34,4 +34,6 @@ post_install() { vendor/github.com/containers/common/pkg/config/containers.conf \ >containers.cgfs.conf vinstall containers.cgfs.conf 644 usr/share/containers containers.conf + vsv podman + vsv podman-docker } From 41c900d86b75e6c26d10ac88774e14509a7025c8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 28 Mar 2022 16:33:53 +0200 Subject: [PATCH 0277/2369] linux5.15: update to 5.15.32. Enable CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_BOOTLOADER=y --- srcpkgs/linux5.15/files/arm64-dotconfig | 2 +- srcpkgs/linux5.15/files/i386-dotconfig | 4 ++-- srcpkgs/linux5.15/files/ppc-dotconfig | 2 +- srcpkgs/linux5.15/files/ppc64-dotconfig | 4 ++-- srcpkgs/linux5.15/files/ppc64le-dotconfig | 4 ++-- srcpkgs/linux5.15/files/x86_64-dotconfig | 4 ++-- srcpkgs/linux5.15/template | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig index f2091f4a897..d086ed21615 100644 --- a/srcpkgs/linux5.15/files/arm64-dotconfig +++ b/srcpkgs/linux5.15/files/arm64-dotconfig @@ -4677,7 +4677,7 @@ CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m CONFIG_XILLYUSB=m CONFIG_RANDOM_TRUST_CPU=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices # diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig index 33ac63d097c..db7fdf4d3bb 100644 --- a/srcpkgs/linux5.15/files/i386-dotconfig +++ b/srcpkgs/linux5.15/files/i386-dotconfig @@ -4136,8 +4136,8 @@ CONFIG_XILLYBUS_CLASS=m CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices # diff --git a/srcpkgs/linux5.15/files/ppc-dotconfig b/srcpkgs/linux5.15/files/ppc-dotconfig index 3c19e95fb93..6ca79da6044 100644 --- a/srcpkgs/linux5.15/files/ppc-dotconfig +++ b/srcpkgs/linux5.15/files/ppc-dotconfig @@ -3629,7 +3629,7 @@ CONFIG_DEVPORT=y CONFIG_XILLYBUS_CLASS=m # CONFIG_XILLYBUS is not set CONFIG_XILLYUSB=m -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices # diff --git a/srcpkgs/linux5.15/files/ppc64-dotconfig b/srcpkgs/linux5.15/files/ppc64-dotconfig index 0261e73e9d8..355ff2fa768 100644 --- a/srcpkgs/linux5.15/files/ppc64-dotconfig +++ b/srcpkgs/linux5.15/files/ppc64-dotconfig @@ -4261,8 +4261,8 @@ CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m CONFIG_XILLYUSB=m -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices # diff --git a/srcpkgs/linux5.15/files/ppc64le-dotconfig b/srcpkgs/linux5.15/files/ppc64le-dotconfig index 59108825538..5148c4e5cf5 100644 --- a/srcpkgs/linux5.15/files/ppc64le-dotconfig +++ b/srcpkgs/linux5.15/files/ppc64le-dotconfig @@ -4078,8 +4078,8 @@ CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m CONFIG_XILLYUSB=m -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices # diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig index b7655fcc219..225e5c5022e 100644 --- a/srcpkgs/linux5.15/files/x86_64-dotconfig +++ b/srcpkgs/linux5.15/files/x86_64-dotconfig @@ -4208,8 +4208,8 @@ CONFIG_XILLYBUS_CLASS=m CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices # diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template index 9b43d8ebf3e..236c406a512 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.30 +version=5.15.32 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 - 18059d8e3f01ab38b22ddf4c2e0a0a9db50926f6535649f51ee7a86a8542aff1" + eacc8609dfcecb637f813ef4d2e13f48bdeb6143be929358f3b3cb4254f9c563" skip_extraction="patch-${version}.xz" python_version=3 From 473a357949bef8194fea718f33605a2bc49d2e18 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 28 Mar 2022 16:36:50 +0200 Subject: [PATCH 0278/2369] linux5.16: update to 5.16.18. Enable CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_BOOTLOADER=y --- srcpkgs/linux5.16/files/arm64-dotconfig | 2 +- srcpkgs/linux5.16/files/i386-dotconfig | 4 ++-- srcpkgs/linux5.16/files/ppc-dotconfig | 2 +- srcpkgs/linux5.16/files/ppc64-dotconfig | 4 ++-- srcpkgs/linux5.16/files/ppc64le-dotconfig | 4 ++-- srcpkgs/linux5.16/files/x86_64-dotconfig | 4 ++-- srcpkgs/linux5.16/template | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/srcpkgs/linux5.16/files/arm64-dotconfig b/srcpkgs/linux5.16/files/arm64-dotconfig index 23f03c1e563..e4b9d7a609a 100644 --- a/srcpkgs/linux5.16/files/arm64-dotconfig +++ b/srcpkgs/linux5.16/files/arm64-dotconfig @@ -4720,7 +4720,7 @@ CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m CONFIG_XILLYUSB=m CONFIG_RANDOM_TRUST_CPU=y -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices # diff --git a/srcpkgs/linux5.16/files/i386-dotconfig b/srcpkgs/linux5.16/files/i386-dotconfig index 9356aea0181..a7c014b0984 100644 --- a/srcpkgs/linux5.16/files/i386-dotconfig +++ b/srcpkgs/linux5.16/files/i386-dotconfig @@ -4167,8 +4167,8 @@ CONFIG_XILLYBUS_CLASS=m CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices # diff --git a/srcpkgs/linux5.16/files/ppc-dotconfig b/srcpkgs/linux5.16/files/ppc-dotconfig index 50f83d57897..19463b4a972 100644 --- a/srcpkgs/linux5.16/files/ppc-dotconfig +++ b/srcpkgs/linux5.16/files/ppc-dotconfig @@ -3652,7 +3652,7 @@ CONFIG_DEVPORT=y CONFIG_XILLYBUS_CLASS=m # CONFIG_XILLYBUS is not set CONFIG_XILLYUSB=m -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices # diff --git a/srcpkgs/linux5.16/files/ppc64-dotconfig b/srcpkgs/linux5.16/files/ppc64-dotconfig index f030f728a84..b204dc8f8a7 100644 --- a/srcpkgs/linux5.16/files/ppc64-dotconfig +++ b/srcpkgs/linux5.16/files/ppc64-dotconfig @@ -4287,8 +4287,8 @@ CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m CONFIG_XILLYUSB=m -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices # diff --git a/srcpkgs/linux5.16/files/ppc64le-dotconfig b/srcpkgs/linux5.16/files/ppc64le-dotconfig index 65d4298a56f..564de8e6096 100644 --- a/srcpkgs/linux5.16/files/ppc64le-dotconfig +++ b/srcpkgs/linux5.16/files/ppc64le-dotconfig @@ -4104,8 +4104,8 @@ CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m CONFIG_XILLYUSB=m -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices # diff --git a/srcpkgs/linux5.16/files/x86_64-dotconfig b/srcpkgs/linux5.16/files/x86_64-dotconfig index 8cc965f2272..dbffc48dfc4 100644 --- a/srcpkgs/linux5.16/files/x86_64-dotconfig +++ b/srcpkgs/linux5.16/files/x86_64-dotconfig @@ -4240,8 +4240,8 @@ CONFIG_XILLYBUS_CLASS=m CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices # diff --git a/srcpkgs/linux5.16/template b/srcpkgs/linux5.16/template index 5775997c8c5..3f8c094faf2 100644 --- a/srcpkgs/linux5.16/template +++ b/srcpkgs/linux5.16/template @@ -1,6 +1,6 @@ -# Template file for 'linux5.16' +# Template file for 'linux4.16' pkgname=linux5.16 -version=5.16.16 +version=5.16.18 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 - 9e7af5007d3596c1efee8556aaa1b1a2e40ddded107448b583624a1f305376db" + 3bb88aa87c3f7788ad84ca5cbf3946ed9fbb3fddb9fca2458944fba5ebd2ab16" skip_extraction="patch-${version}.xz" python_version=3 From 1aae77565dd084d19f452ca791595e8d9837800f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 28 Mar 2022 18:18:51 +0200 Subject: [PATCH 0279/2369] xtools: update to 0.64. --- srcpkgs/xtools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template index a9e48dc39cb..5392fb9a060 100644 --- a/srcpkgs/xtools/template +++ b/srcpkgs/xtools/template @@ -1,6 +1,6 @@ # Template file for 'xtools' pkgname=xtools -version=0.63 +version=0.64 revision=1 build_style=gnu-makefile depends="bash curl findutils git make spdx-licenses-list xbps" @@ -9,4 +9,4 @@ maintainer="Leah Neukirchen " license="Public Domain" homepage="http://git.vuxu.org/xtools" distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz" -checksum=6bc49a536488f3e911317a31f916df9f6778d34685db6aa2d7bd75be07f12995 +checksum=a49140066744d4aaaf856fb40d92df26d6d3f80b2aa03da1746c513e7eab40be From 141895a2f407e1bda632e3e297a864160a92420f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 28 Mar 2022 18:42:31 +0200 Subject: [PATCH 0280/2369] musl-obstack: update to 1.2.3. --- srcpkgs/musl-obstack/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/musl-obstack/template b/srcpkgs/musl-obstack/template index 7da24d22397..a808f53c121 100644 --- a/srcpkgs/musl-obstack/template +++ b/srcpkgs/musl-obstack/template @@ -1,6 +1,6 @@ # Template file for 'musl-obstack' pkgname=musl-obstack -version=1.2.2 +version=1.2.3 revision=1 archs="*-musl" build_style=gnu-configure @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/void-linux/musl-obstack" distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=6eac88961c58a53f31cccd719b97d1b33c65436c51664e760a9582e2659c1314 +checksum=9ffb3479b15df0170eba4480e51723c3961dbe0b461ec289744622db03a69395 CFLAGS="-fPIC" pre_configure() { From c536cc030c46c87924e0fe034986a28d60a68bb7 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:16:53 +0100 Subject: [PATCH 0281/2369] attica: update to 5.92.0. --- srcpkgs/attica/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template index 126c96c5cc7..1222f0cc9a6 100644 --- a/srcpkgs/attica/template +++ b/srcpkgs/attica/template @@ -1,6 +1,6 @@ # Template file for 'attica' pkgname=attica -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/attica" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c05ee119f66d6dc60ecff5b7c6e883d4bc478aca547811b4edbc45eaf0f17b6b +checksum=bf647c7736acbbb99ff1557339f71b5efd5a7591b2af83b482d37d35516bc933 do_check() { cd build From 9006c9890a6eedea60ac3f54c798ca9f911831cc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:16:54 +0100 Subject: [PATCH 0282/2369] baloo5: update to 5.92.0. --- srcpkgs/baloo5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template index 6f14edf7a72..9f6d3c93f69 100644 --- a/srcpkgs/baloo5/template +++ b/srcpkgs/baloo5/template @@ -1,6 +1,6 @@ # Template file for 'baloo5' pkgname=baloo5 -version=5.91.0 +version=5.92.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/Baloo" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=7574d63379c41d8cb0e6579a0d73ab4257967ecbfaa7affa01472dcca35a12b3 +checksum=283570583da0f85b2001ca600b9657e3a3fb9c2dcdd3ea8728553e212e50a475 do_check() { cd build From 4e3994ba9dfd0692025b9bcc38d450d8f6610327 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:16:56 +0100 Subject: [PATCH 0283/2369] bluez-qt5: update to 5.92.0. --- srcpkgs/bluez-qt5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template index 397fd96f10f..2893e694f79 100644 --- a/srcpkgs/bluez-qt5/template +++ b/srcpkgs/bluez-qt5/template @@ -1,6 +1,6 @@ # Template file for 'bluez-qt5' pkgname=bluez-qt5 -version=5.91.0 +version=5.92.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/bluez-qt" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=595a9ebf11845b2a3f7da4b9db596f485760bbe1930fac368150f17b6b96675c +checksum=f58d2483ed2db9cb77621bce3b3c6babd8d1153954030c0dc52ce399c6d28ab6 do_check() { cd build From 6fb6936b5e07e1a8dfb1284af6808ee590c2816a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:16:58 +0100 Subject: [PATCH 0284/2369] breeze-icons: update to 5.92.0. --- srcpkgs/breeze-icons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template index 6f8860791ca..017805c6058 100644 --- a/srcpkgs/breeze-icons/template +++ b/srcpkgs/breeze-icons/template @@ -1,6 +1,6 @@ # Template file for 'breeze-icons' pkgname=breeze-icons -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-3.0-or-later" homepage="https://community.kde.org/Frameworks" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c17db793b931a640f9db4466e1fee917127809f80ac8fc65b2273044ec23422a +checksum=49e09663989fd3498d61cb7518c741c87a702689b6d6074097d628264a064366 nostrip=yes if [ -z "$CROSS_BUILD" ]; then From 23f33fe7bcb30b842526b26cad8e41fdb2093d13 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:16:59 +0100 Subject: [PATCH 0285/2369] extra-cmake-modules: update to 5.92.0. --- srcpkgs/extra-cmake-modules/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template index b9699106132..9c034a06303 100644 --- a/srcpkgs/extra-cmake-modules/template +++ b/srcpkgs/extra-cmake-modules/template @@ -1,6 +1,6 @@ # Template file for 'extra-cmake-modules' pkgname=extra-cmake-modules -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args="-DBUILD_HTML_DOCS=ON" @@ -12,7 +12,7 @@ maintainer="John " license="BSD-3-Clause" homepage="https://invent.kde.org/frameworks/extra-cmake-modules" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9717885e30aadf184fa71511930409cabbf08eb6627ea8b051de8804fbcec54c +checksum=f89a238bc5f28738db25e29296b75b4f795e3e9bfe3a8f1f9390648749d303ef python_version=3 do_check() { From cc85f9ef91bbfddeb6b341c2ac546b2c815fcbcc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:01 +0100 Subject: [PATCH 0286/2369] frameworkintegration: update to 5.92.0. --- srcpkgs/frameworkintegration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template index 861978967fd..9840b077f5c 100644 --- a/srcpkgs/frameworkintegration/template +++ b/srcpkgs/frameworkintegration/template @@ -1,6 +1,6 @@ # Template file for 'frameworkintegration' pkgname=frameworkintegration -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules pkg-config @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/frameworkintegration" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7fbc8c3b949849d22161f78df453d759389319a91b4925ff235799e410c5e684 +checksum=bd8ef6f6656c9756a56fbfa1dc91273426ef3ea5fae3e7a4c7dbeddfbbe3ec5d frameworkintegration-devel_package() { short_desc+=" - development" From 6c05a73ad287f0bde42b09988c3e69c1a4cf3567 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:03 +0100 Subject: [PATCH 0287/2369] kactivities5-stats: update to 5.92.0. --- srcpkgs/kactivities5-stats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template index 32d213d3787..8957274d1f8 100644 --- a/srcpkgs/kactivities5-stats/template +++ b/srcpkgs/kactivities5-stats/template @@ -1,6 +1,6 @@ # Template file for 'kactivities5-stats' pkgname=kactivities5-stats -version=5.91.0 +version=5.92.0 revision=1 wrksrc="${pkgname/5/}-${version}" build_style=cmake @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://api.kde.org/frameworks/kactivities/html/index.html" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz" -checksum=98fdea4517529df0b1b733425a040a80df680d44bb7d27db10070828a9c3c420 +checksum=2206132e0edbb8271f77bb6c45e794b8d3baa3d9b4f94aba005556f9fa3ff751 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" From e19c0a784fb193148a13257e962783f3f90877c9 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:04 +0100 Subject: [PATCH 0288/2369] kactivities5: update to 5.92.0. --- srcpkgs/kactivities5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template index 98ae1f92c4c..75438b590ee 100644 --- a/srcpkgs/kactivities5/template +++ b/srcpkgs/kactivities5/template @@ -1,6 +1,6 @@ # Template file for 'kactivities5' pkgname=kactivities5 -version=5.91.0 +version=5.92.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kactivities" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=c0c811b91ff79cb23b99ec85b390ae331107a010f522ed45600ae6274f87c40f +checksum=fc06b6fc111f5ed8450c1c1c96f36188328b2292001ca3bf3293d0f68678dbcd if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools" From 5149c9a16d8e61c7399bf683371e1e0930afc8a0 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:05 +0100 Subject: [PATCH 0289/2369] kapidox: update to 5.92.0. --- srcpkgs/kapidox/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template index 0bdfa70566a..164a36aa99a 100644 --- a/srcpkgs/kapidox/template +++ b/srcpkgs/kapidox/template @@ -1,9 +1,9 @@ # Template file for 'kapidox' pkgname=kapidox -version=5.91.0 +version=5.92.0 revision=1 -build_style=cmake -hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools" +build_style=python3-module +hostmakedepends="python3 python3-setuptools" makedepends="python3-Jinja2 python3-yaml" depends="python3-Jinja2 python3-yaml doxygen" short_desc="API documentation generation tool for KDE framework" @@ -11,7 +11,7 @@ maintainer="John " license="BSD-2-Clause, CC0-1.0" homepage="https://invent.kde.org/frameworks/kapidox" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=434daaf49056471af72a97043c054d0104f1341f92a4464f66a2256233a2b7f7 +checksum=4f5201de5878bc3fb24f9e2ebd387c0a12d7a27c407636bc878bab5a3999a56d post_install() { vlicense LICENSES/BSD-2-Clause.txt From 61ed63b5eab99c878f46dbb2778897c8f21a65b3 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:07 +0100 Subject: [PATCH 0290/2369] karchive: update to 5.92.0. --- srcpkgs/karchive/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template index 73aa932596b..109cc7a0ec2 100644 --- a/srcpkgs/karchive/template +++ b/srcpkgs/karchive/template @@ -1,6 +1,6 @@ # Template file for 'karchive' pkgname=karchive -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/karchive" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a3602cbed2aaf4d446ff7af78b626042aa6fbce1df60eb2b8332b5f6ff214cce +checksum=5076a28c3a10ab755454c752fa563a4be7ad890f391c43aaa2ee4ee4b6a99fae karchive-devel_package() { short_desc+=" - development" From 4efa0956fff37a5337782b1380488ccddf06ebe5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:09 +0100 Subject: [PATCH 0291/2369] kauth: update to 5.92.0. --- srcpkgs/kauth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template index e8ec3364691..05ea13c55c3 100644 --- a/srcpkgs/kauth/template +++ b/srcpkgs/kauth/template @@ -1,6 +1,6 @@ # Template file for 'kauth' pkgname=kauth -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kauth" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f865cb134cf4013496940d48f397eae6cf6bc5013dadf911340c23bd7ddb3a00 +checksum=44824bf68ee510d8aa0189a9d4b44568b0fe20d17ba45e3b739db1927bfa4728 do_check() { cd build From c2ea7e56a41e030fe9093659dcf7debc7076e03a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:10 +0100 Subject: [PATCH 0292/2369] kbookmarks: update to 5.92.0. --- srcpkgs/kbookmarks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template index b8e10942ed9..c845e8909a6 100644 --- a/srcpkgs/kbookmarks/template +++ b/srcpkgs/kbookmarks/template @@ -1,6 +1,6 @@ # Template file for 'kbookmarks' pkgname=kbookmarks -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only" homepage="https://invent.kde.org/frameworks/kbookmarks" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a42233135dc255a0ff0147f22f9446c2b5932e6b11198aa099fdadbbf5b30e47 +checksum=99504e761621b56e07a561e1caea196fe4623c9334b889f081e3da8e4a19d543 kbookmarks-devel_package() { short_desc+=" - development" From 241f141ee3275d1c4717fdb3088039980fd8dbc5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:12 +0100 Subject: [PATCH 0293/2369] kcalendarcore: update to 5.92.0. --- srcpkgs/kcalendarcore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template index 1011f4c9167..3359712d3db 100644 --- a/srcpkgs/kcalendarcore/template +++ b/srcpkgs/kcalendarcore/template @@ -1,7 +1,7 @@ # Template file for 'kcalendarcore' pkgname=kcalendarcore reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1" -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=37f6975c0ebc8d1983f7c8bef96104dbad705a6a0fc59be53548fd317f05763e +checksum=6ff2e68dfb8b92e0f181f3f19d20991bfd589b4a047b313af908c41391560b3a replaces="kcalcore>=0" do_check() { From 9a9c43032796512b039b7af1921acbb8ba092d0a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:13 +0100 Subject: [PATCH 0294/2369] kcmutils: update to 5.92.0. --- srcpkgs/kcmutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template index 5e53a48e1b9..bf26425f364 100644 --- a/srcpkgs/kcmutils/template +++ b/srcpkgs/kcmutils/template @@ -1,6 +1,6 @@ # Template file for 'kcmutils' pkgname=kcmutils -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.0-only" homepage="https://invent.kde.org/frameworks/kcmutils" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1a195d83a092c493f10f372e245107277c275a418563cbc443a884ef4e4e3901 +checksum=dd49e658fc85c215442a7fa9d2435819f0bef13c997a6c2a51557b82e1bc8d3a kcmutils-devel_package() { short_desc+=" - development" From 6a9c9c5f94e256650fd6d72354727f713478fcbe Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:15 +0100 Subject: [PATCH 0295/2369] kcodecs: update to 5.92.0. --- srcpkgs/kcodecs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template index d2c0c19513e..3ccc8f79b63 100644 --- a/srcpkgs/kcodecs/template +++ b/srcpkgs/kcodecs/template @@ -1,6 +1,6 @@ # Template file for 'kcodecs' pkgname=kcodecs -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kcodecs" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3ec08377a1b2cbc30401ae9e43e1394c61635ab7537a37dc297cdc4deeda7c62 +checksum=d6e5b7a453948d5fa0482715eaf4a0c9abe5b902a0aca15540a04b1a1b60d275 kcodecs-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 8ecb81f1a12afe29937b7e98623dd9c63f5ec2bc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:16 +0100 Subject: [PATCH 0296/2369] kcompletion: update to 5.92.0. --- srcpkgs/kcompletion/template | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template index 5273d19526c..8514a8625df 100644 --- a/srcpkgs/kcompletion/template +++ b/srcpkgs/kcompletion/template @@ -1,20 +1,18 @@ # Template file for 'kcompletion' pkgname=kcompletion -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake -hostmakedepends="kcoreaddons extra-cmake-modules" +configure_args="-DBUILD_DESIGNERPLUGIN=ON" +hostmakedepends="kcoreaddons extra-cmake-modules + qt5-host-tools qt5-qmake qt5-tools-devel" makedepends="kconfig-devel kwidgetsaddons-devel" short_desc="KDE Powerful completion framework" maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kcompletion" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2422485b10de631583b7e92e0778e5cf0c0ceec677bcd289cb7bc04c5441dfd0 - -if [ "CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel" -fi +checksum=08f1525c6cee8babe399c941bb85d04be9dade0341d1d85c6beccd2e93dc7ceb kcompletion-devel_package() { short_desc+=" - development" From d73f46977e716a29282b050dd4ccd2bfd4f3270a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:17 +0100 Subject: [PATCH 0297/2369] kconfig: update to 5.92.0. --- srcpkgs/kconfig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template index ea135ef3058..44dc8ae429d 100644 --- a/srcpkgs/kconfig/template +++ b/srcpkgs/kconfig/template @@ -1,6 +1,6 @@ # Template file for 'kconfig' pkgname=kconfig -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kconfig" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a63c3feadc7b6b94d8e06ead5430289742f62da59dfa4f0ceaaf237523b6ad2b +checksum=7801b641b88368a0c021272073c692337b42ee28f0025d106942c8ce873b0523 do_check() { cd build From 705033588af8b0b6391191093aead52fcb910dbe Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:19 +0100 Subject: [PATCH 0298/2369] kconfigwidgets: update to 5.92.0. --- srcpkgs/kconfigwidgets/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template index d599b5212dc..f14d66ae93e 100644 --- a/srcpkgs/kconfigwidgets/template +++ b/srcpkgs/kconfigwidgets/template @@ -1,8 +1,9 @@ # Template file for 'kconfigwidgets' pkgname=kconfigwidgets -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake +configure_args="-DBUILD_DESIGNERPLUGIN=ON" hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools kconfig gettext kcoreaddons kdoctools" makedepends="qt5-devel kauth-devel kcodecs-devel kconfig-devel kguiaddons-devel @@ -12,7 +13,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kconfigwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=028493a1515a6c965ea0eecabc362340af1d2e8463760465539c980d03d8bb06 +checksum=4259eed35d9ac307ecc30e64833bad7a89ef58fc7125054eb39716d27a4a274a kconfigwidgets-devel_package() { short_desc+=" - development" From 77fd0f64cda6408c4ea48b87b6facd606b7e9a55 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:20 +0100 Subject: [PATCH 0299/2369] kcontacts: update to 5.92.0. --- srcpkgs/kcontacts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template index caba0dd7ac7..544ae3c7f4c 100644 --- a/srcpkgs/kcontacts/template +++ b/srcpkgs/kcontacts/template @@ -1,7 +1,7 @@ # Template file for 'kcontacts' pkgname=kcontacts reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1" -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcontacts" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1b067820de0370a0da43b069f4c9cafb411bb201fcbb112b9743fb9d134b03b1 +checksum=1276006e50f507216a8241ca4b26b02c67c42e5bee26a6b391db6ae4f72533ce kcontacts-devel_package() { short_desc+=" - development" From 404aabd080e9c4ff4a117324c6129cd325bdceac Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:22 +0100 Subject: [PATCH 0300/2369] kcoreaddons: update to 5.92.0. --- srcpkgs/kcoreaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template index 78ba6540324..4838e315b9d 100644 --- a/srcpkgs/kcoreaddons/template +++ b/srcpkgs/kcoreaddons/template @@ -1,6 +1,6 @@ # Template file for 'kcoreaddons' pkgname=kcoreaddons -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcoreaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=dfe3da03260e0153f9f6ced1fc7464eaaf0ed1fb692fc6c2b2d968b629ad719b +checksum=df5f718f324aa2b58191438c8aa5f7498a7997eff990d16ffbc9f19efd1a6667 post_install() { vsed -e 's;${_IMPORT_PREFIX};/usr;g' \ From e902b8d8ddc3c698b3437cc1ddae0450eed9f428 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:23 +0100 Subject: [PATCH 0301/2369] kcrash: update to 5.92.0. --- srcpkgs/kcrash/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template index c29cb5cf7b8..b9fadfc544d 100644 --- a/srcpkgs/kcrash/template +++ b/srcpkgs/kcrash/template @@ -1,6 +1,6 @@ # Template file for 'kcrash' pkgname=kcrash -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kcrash" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=544996a31f616a274961c12023fc0650deeeb9ef50125dffbed10c556eb5b33d +checksum=9bc5605b5026f55d9c2c1ca32c79842c3ad0f5c042e480fe1e7027b2692526c7 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons" From b7cdf4c1c0feead88cd029580269833739efc5af Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:24 +0100 Subject: [PATCH 0302/2369] kdav: update to 5.92.0. --- srcpkgs/kdav/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template index 5e01417e90c..caa894c1356 100644 --- a/srcpkgs/kdav/template +++ b/srcpkgs/kdav/template @@ -1,7 +1,7 @@ # Template file for 'kdav' pkgname=kdav reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1" -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kdav" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5b8cdae0d401dc24bf0cd98cdf35de30501111968923953fa687552ae61adc08 +checksum=f3b16c473b104f83f6124f96f2b06a6c72a447eb19ba31a90e3f4725e732b1c4 kdav-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From 5c6bdffb8928c472692a435afaf2c2cfdb392cbc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:26 +0100 Subject: [PATCH 0303/2369] kdbusaddons: update to 5.92.0. --- srcpkgs/kdbusaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template index f5048739ac1..74165252917 100644 --- a/srcpkgs/kdbusaddons/template +++ b/srcpkgs/kdbusaddons/template @@ -1,6 +1,6 @@ # Template file for 'kdbusaddons' pkgname=kdbusaddons -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdbusaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3a726a9ba053c2e484b5d1d2e53b361bcfb039414df488d6bc7e29a281bc10a3 +checksum=7c03f33cc49ffa80e509f654f410cb142e917bceb2f35f08836dc46ed268ae54 do_check() { cd build From e1681e9efd023781120ec7a01996ec27f5db943e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:27 +0100 Subject: [PATCH 0304/2369] kdeclarative: update to 5.92.0. --- srcpkgs/kdeclarative/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template index 6e7faaf667a..2c6a351f34f 100644 --- a/srcpkgs/kdeclarative/template +++ b/srcpkgs/kdeclarative/template @@ -1,6 +1,6 @@ # Template file for 'kdeclarative' pkgname=kdeclarative -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules pkg-config @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdeclarative" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ffb8fb0edb1036aa310f1a80344e5a7209cfc9dc1bff086ed458fa0e58716da0 +checksum=fe964d77fea37c04eee3863d2b4227b76e33f16583906c284b532a461982d5b3 do_check() { cd build From f483809175682c2dad040a068a79657b842369d7 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:28 +0100 Subject: [PATCH 0305/2369] kded: update to 5.92.0. --- srcpkgs/kded/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template index ab0aba43e07..15d1ebbf684 100644 --- a/srcpkgs/kded/template +++ b/srcpkgs/kded/template @@ -1,6 +1,6 @@ # Template file for 'kded' pkgname=kded -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kded" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e59e6d0fbdad184b2e0d59dccedd1e5be53ea21959d0e828e1bbab4f7bd420fe +checksum=8335531b856cb361ab2e5b390b333eb3405bac4e2bc7c0305994704bd0540e6c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools" From e44950b1a092f7cecc640f51b4416b04106b60bf Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:30 +0100 Subject: [PATCH 0306/2369] kdelibs4support: update to 5.92.0. --- srcpkgs/kdelibs4support/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template index cf84ec928b3..5e8bc71495b 100644 --- a/srcpkgs/kdelibs4support/template +++ b/srcpkgs/kdelibs4support/template @@ -1,9 +1,9 @@ # Template file for 'kdelibs4support' pkgname=kdelibs4support -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake -configure_args=" +configure_args="-DBUILD_DESIGNERPLUGIN=ON -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" hostmakedepends="kcoreaddons extra-cmake-modules perl-URI pkg-config gettext qt5-host-tools qt5-qmake python kdoctools kgendesignerplugin kded" @@ -17,7 +17,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdelibs4support" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=4f6448fc6d03801b8f0e440aecd12e299631ae375c5390b343719eb85374e38c +checksum=292e5e84ad8d7de90f0666b51f085a25b7a9faf521c58379d470d2994004ede0 if [ "$CROSS_BUILD" ]; then # gettaddrinfo runtime test is always fine (can't be achieved in crossbuild) From b4a17c6b60c3be7713972070312dfdf30eb135fa Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:31 +0100 Subject: [PATCH 0307/2369] kdesignerplugin: update to 5.92.0. --- srcpkgs/kdesignerplugin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template index 4ebda348f4e..8b811b77758 100644 --- a/srcpkgs/kdesignerplugin/template +++ b/srcpkgs/kdesignerplugin/template @@ -1,6 +1,6 @@ # Template file for 'kdesignerplugin' pkgname=kdesignerplugin -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-only" homepage="https://invent.kde.org/frameworks/kdesignerplugin" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=d89cfb46171bb467de99bb22a56328cc881621a6ad1d091a4481ccc17cde9b1e +checksum=066859b345da224f5edb601a5f448540330c9a286980b0c34169646c26a22a4e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools" From 0aa36bacd5be25ddc453bb4937188b912c051bfc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:33 +0100 Subject: [PATCH 0308/2369] kdesu: update to 5.92.0. --- srcpkgs/kdesu/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template index fdd9dd503c8..0ba31e7e1a3 100644 --- a/srcpkgs/kdesu/template +++ b/srcpkgs/kdesu/template @@ -1,6 +1,6 @@ # Template file for 'kdesu' pkgname=kdesu -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only" homepage="https://invent.kde.org/frameworks/kdesu" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=55da7ee8c24e49dfd8ae49e1d006e67f541d35d111df412c5eaa8180784a40f2 +checksum=4687dc87a9ada0675801e0c575467bb5f7f7fe21b67ae2ffd1fed80736f95efa kdesu-devel_package() { short_desc+=" - development" From 29858b80f9d6189d8dd48b338aca5789ab526b82 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:34 +0100 Subject: [PATCH 0309/2369] kdewebkit: update to 5.92.0. --- srcpkgs/kdewebkit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template index 8d09be21233..df9fd862a13 100644 --- a/srcpkgs/kdewebkit/template +++ b/srcpkgs/kdewebkit/template @@ -1,6 +1,6 @@ # Template file for 'kdewebkit' pkgname=kdewebkit -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kdewebkit" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=18f361573109e95f39ca1fda04f973d9f64eb4f6ecba3dcea877e5df020796d6 +checksum=4d0a773cad86a642cb90d9844757569f2e2e9d1e96ccf78f73bee885c908d1b6 kdewebkit-devel_package() { short_desc+=" - development" From 8303238b2afdefaa84a7766b962bd9860e04f602 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:35 +0100 Subject: [PATCH 0310/2369] kdnssd: update to 5.92.0. --- srcpkgs/kdnssd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template index f1c7e00db25..a48bf7f3e25 100644 --- a/srcpkgs/kdnssd/template +++ b/srcpkgs/kdnssd/template @@ -1,6 +1,6 @@ # Template file for 'kdnssd' pkgname=kdnssd -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kdnssd" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6f58dcaf51b7188cde16f3b0a9ccf5e7550fe09ca2d9defc3e0ffd4d0fe4bfea +checksum=5f36af49faab84d8ae7ec46f1ba3300c9cdd3d8820dd1e7e48c5c37bcdd844d4 kdnssd-devel_package() { short_desc+=" - development" From f4b3f531ee802d4f239036b089478fc8e91f1798 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:37 +0100 Subject: [PATCH 0311/2369] kdoctools: update to 5.92.0. --- srcpkgs/kdoctools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template index 3bb244a5efc..5e38783fc1b 100644 --- a/srcpkgs/kdoctools/template +++ b/srcpkgs/kdoctools/template @@ -1,6 +1,6 @@ # Template file for 'kdoctools' pkgname=kdoctools -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake build_helper=qemu @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdoctools" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7620010ddfaec988715be343af4e35f8bac75b5e14d1fa9d3bdbbe620925990a +checksum=86a3aeb8b91dec0e1cd81b646654ebd750a8aedfac9b4d53b9b0019a91720870 if [ "$CROSS_BUILD" ]; then configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper" From 0e544cc8bcc66e6ae3e89508ff23db2037d5eb39 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:38 +0100 Subject: [PATCH 0312/2369] kemoticons: update to 5.92.0. --- srcpkgs/kemoticons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template index 49efd8397fd..2a4fa32fee0 100644 --- a/srcpkgs/kemoticons/template +++ b/srcpkgs/kemoticons/template @@ -1,6 +1,6 @@ # Template file for 'kemoticons' pkgname=kemoticons -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later, CC-BY-4.0" homepage="https://invent.kde.org/frameworks/kemoticons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=10287a304fbe0bd6992afe29313c156883591639c9e80ec26e76e683709cf6cb +checksum=fdcfe30941c18a9cb29b58459fbb2ae54a55fd5a0e8688f0c59a7cc7ebf09f07 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" From 5e84f13172807ab2edae7c2cabd38846572e6bab Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:40 +0100 Subject: [PATCH 0313/2369] kfilemetadata5: update to 5.92.0. --- srcpkgs/kfilemetadata5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template index 46d89885302..ab36e2d8649 100644 --- a/srcpkgs/kfilemetadata5/template +++ b/srcpkgs/kfilemetadata5/template @@ -1,6 +1,6 @@ # Template file for 'kfilemetadata5' pkgname=kfilemetadata5 -version=5.91.0 +version=5.92.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kfilemetadata" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=380335d7f08653d0d85bdcde5b93e72d94c6101cd3719bc4c0b26ef6730403fc +checksum=d624d3551094cf73d802b6e95bcd78577ce9eb1e9cbb9a8f340dcad066ea15ce kfilemetadata5-devel_package() { short_desc+=" - development" From a41298f15af0d6119c8ddb43ffe39a12c2f45021 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:41 +0100 Subject: [PATCH 0314/2369] kglobalaccel: update to 5.92.0. --- srcpkgs/kglobalaccel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template index a5c99e6e1fc..2405d1b174d 100644 --- a/srcpkgs/kglobalaccel/template +++ b/srcpkgs/kglobalaccel/template @@ -1,6 +1,6 @@ # Template file for 'kglobalaccel' pkgname=kglobalaccel -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kglobalaccel" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c0610c5dfe078827594e0f32793f0fae87dcee21b75fee491850a7e0cc639a27 +checksum=be7b1e279b63678ec4042f896b159d11c115d05e9831cde6cd67ef4b8e581452 kglobalaccel-devel_package() { short_desc+=" - development" From 7abfb4e491b87e6d62f60627060c7024f0e98e7b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:42 +0100 Subject: [PATCH 0315/2369] kguiaddons: update to 5.92.0. --- srcpkgs/kguiaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template index fb6041e3b4c..ea01d37e9ab 100644 --- a/srcpkgs/kguiaddons/template +++ b/srcpkgs/kguiaddons/template @@ -1,6 +1,6 @@ # Template file for 'kguiaddons' pkgname=kguiaddons -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kguiaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7e56c2d826973632ee90b091c50aac53feb88409f5d2ad76d1214452efa6c83e +checksum=0f6775a565f22900b0de53daa5fe73f7d7e592663e0bb442a8e26ffab27fdf5f kguiaddons-devel_package() { short_desc+=" - development" From 8db63533ae933679294c0e2b214390d138c74e16 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:44 +0100 Subject: [PATCH 0316/2369] kholidays: update to 5.92.0. --- srcpkgs/kholidays/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template index 42b08406e94..163b2dad1ca 100644 --- a/srcpkgs/kholidays/template +++ b/srcpkgs/kholidays/template @@ -1,7 +1,7 @@ # Template file for 'kholidays' pkgname=kholidays reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1" -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kholidays" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b55535746cd3b56270fd19bf377f7256bea00b4f8690449e0580225f6275bb98 +checksum=0ed382c49fb10af87bfa3845a3919ed097c9f808f3a5dbb631ef4e68c86b4b10 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" From ac53d136ba1d4ff7c3d2d6f0847a26458c956161 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:45 +0100 Subject: [PATCH 0317/2369] khtml: update to 5.92.0. --- srcpkgs/khtml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template index d3e481756f6..7415d7e78a2 100644 --- a/srcpkgs/khtml/template +++ b/srcpkgs/khtml/template @@ -1,6 +1,6 @@ # Template file for 'khtml' pkgname=khtml -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/khtml" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=a40056d988fd77bc4bd3749465ed5452701b7e4948e10dc67fb592925c98b3d1 +checksum=91a1d79ea382a25614810cd59f800f0a34c6e86c69ef6d0a08d2655f2a93171a khtml-devel_package() { short_desc+=" - development" From f841da5f811af2399d368ea07f35f436318e574e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:47 +0100 Subject: [PATCH 0318/2369] ki18n: update to 5.92.0. --- srcpkgs/ki18n/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template index 8d57346febf..8b0d17610f5 100644 --- a/srcpkgs/ki18n/template +++ b/srcpkgs/ki18n/template @@ -1,6 +1,6 @@ # Template file for 'ki18n' pkgname=ki18n -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/ki18n" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9e1a8be4e1c0b7bbae262dfb0fffb75c6ec9efe2bd2fbc3fcae3ebbf9f68ed85 +checksum=058032e8e9556f1dadcf0c2bd633da6cfc9673e966dd113388e2b8aee2395777 ki18n-devel_package() { short_desc+=" - development" From dcf5a69ff6f4012f74fef646fc04a19f70e68007 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:48 +0100 Subject: [PATCH 0319/2369] kiconthemes: update to 5.92.0. --- srcpkgs/kiconthemes/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template index a1901117962..65250bdb3ac 100644 --- a/srcpkgs/kiconthemes/template +++ b/srcpkgs/kiconthemes/template @@ -1,8 +1,9 @@ # Template file for 'kiconthemes' pkgname=kiconthemes -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake +configure_args="-DBUILD_DESIGNERPLUGIN=ON" hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools gettext python3" makedepends="kitemviews-devel qt5-svg-devel karchive-devel kconfigwidgets-devel" @@ -11,7 +12,7 @@ maintainer="John " license="LGPL-2.0-only, GPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kiconthemes" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=820d592beab1547265fcc2a61f6262535b85d444a05fd67b4eb2f11d9f2510ce +checksum=2128710ff8bf0a7bbb699fe3a45b231c6b4607ba3e3a3a5d03c25c809233cb23 kiconthemes-devel_package() { short_desc+=" - development" From 30c8715a84cafb3aa3df8f1a79d04ab892834056 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:50 +0100 Subject: [PATCH 0320/2369] kidletime: update to 5.92.0. --- srcpkgs/kidletime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template index 4c57030015f..e9ed68131b1 100644 --- a/srcpkgs/kidletime/template +++ b/srcpkgs/kidletime/template @@ -1,6 +1,6 @@ # Template file for 'kidletime' pkgname=kidletime -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kidletime" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1b23a2503defae1fca23bb1574439dcc24a2856c3603587c903f8e8b188f158b +checksum=e12f14229f7ee587becb5a693374045c460d38c55d61e21eefd78b8db39280d7 kidletime-devel_package() { short_desc+=" - development" From 94a29fc70d946877ab993368a2c773898145105e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:52 +0100 Subject: [PATCH 0321/2369] kimageformats: update to 5.92.0. --- srcpkgs/kimageformats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template index c4ead9a3a6e..ebd6e81db29 100644 --- a/srcpkgs/kimageformats/template +++ b/srcpkgs/kimageformats/template @@ -1,6 +1,6 @@ # Template file for 'kimageformats' pkgname=kimageformats -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args="-DKIMAGEFORMATS_HEIF=ON" @@ -12,4 +12,4 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kimageformats" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=aba371cbb11afba36c394beac443f1e8d3ab9d84801f44bcc252f13e868dc835 +checksum=ce049989125a49dc9bf8d2a2f2f5a2fec79e25a6343087b024fefd0131eca369 From 08bd6604f16aa762333c2b915ebd996f4bde87d4 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:53 +0100 Subject: [PATCH 0322/2369] kinit: update to 5.92.0. --- srcpkgs/kinit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template index d84e3c0262c..a0b0aaee911 100644 --- a/srcpkgs/kinit/template +++ b/srcpkgs/kinit/template @@ -1,6 +1,6 @@ # Template file for 'kinit' pkgname=kinit -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only" homepage="https://invent.kde.org/frameworks/kinit" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=71c3d83e2303f01bfd936351260ee3a7e0e78de568c90dd9236f7d5e8998c2f8 +checksum=cb517912bf17d4b4f015cb1ab935eebadc52ece050f21b33fcb4e799b0c5f3ce kinit-devel_package() { short_desc+=" - development" From d7a1c3a852547e32e45338150f3e91e6f5e8e33b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:55 +0100 Subject: [PATCH 0323/2369] kio: update to 5.92.0. --- srcpkgs/kio/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template index 8062a9a9958..ba96fa5e727 100644 --- a/srcpkgs/kio/template +++ b/srcpkgs/kio/template @@ -1,9 +1,9 @@ # Template file for 'kio' pkgname=kio -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake -configure_args=" +configure_args="-DBUILD_DESIGNERPLUGIN=ON -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" hostmakedepends="kcoreaddons extra-cmake-modules kauth gettext qt5-host-tools qt5-qmake python kdoctools libxml2 kcoreaddons" @@ -16,7 +16,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kio" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f2ddea299f3dc98835df445dd1d622d90233115ad0200e75da5e954523466293 +checksum=d4433f9890f71afe3d7d268e978e0ade96f506a38e41f7d57ffe832d96d44cb3 do_check() { : # Pain to get working in limited enviroment, excpects e.g. real disks From 4bca18faef6266e59d43761b1a9a8f4bed1c63b2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:17:58 +0100 Subject: [PATCH 0324/2369] kirigami2: update to 5.92.0. --- srcpkgs/kirigami2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template index 2022a2ec150..1b85d94048f 100644 --- a/srcpkgs/kirigami2/template +++ b/srcpkgs/kirigami2/template @@ -1,6 +1,6 @@ # Template file for 'kirigami2' pkgname=kirigami2 -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="https://techbase.kde.org/Kirigami" distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz" -checksum=8cd3675c5ba2c656648a7e54b6ad4d89f1dbc0d0ff36e59acd2252681497d445 +checksum=0adaff98ea70c577c9e6d7a688e5c52529a59f56a7d0c8ffce295f342e203d5c kirigami2-devel_package() { short_desc+=" - development" From 6350268ccb5e80f9173d697ae4fa1ad2fcfa8afa Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:00 +0100 Subject: [PATCH 0325/2369] kitemmodels: update to 5.92.0. --- srcpkgs/kitemmodels/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template index 4018125a9f3..beaa9faddb9 100644 --- a/srcpkgs/kitemmodels/template +++ b/srcpkgs/kitemmodels/template @@ -1,6 +1,6 @@ # Template file for 'kitemmodels' pkgname=kitemmodels -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kitemmodels" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=081c7fcf4ed9ec4034720bf87c9592b67603b6168e645c8f0129cb2d787e33a1 +checksum=e65c7f58d602b4b8160b34a3a841d1c7aac77695b73e53aa715765cf42a8e89b kitemmodels-devel_package() { short_desc+=" - development" From c438f04a4ea6db714ccf412ddec97b09efe5aaad Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:03 +0100 Subject: [PATCH 0326/2369] kitemviews: update to 5.92.0. --- srcpkgs/kitemviews/template | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template index a0b0e70424b..ab3405ab835 100644 --- a/srcpkgs/kitemviews/template +++ b/srcpkgs/kitemviews/template @@ -1,20 +1,18 @@ # Template file for 'kitemviews' pkgname=kitemviews -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake -hostmakedepends="kcoreaddons extra-cmake-modules" +configure_args="-DBUILD_DESIGNERPLUGIN=ON" +hostmakedepends="kcoreaddons extra-cmake-modules + qt5-qmake qt5-host-tools qt5-tools-devel" makedepends="qt5-devel qt5-tools-devel" short_desc="Set of item views extending the Qt model-view framework" maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kitemviews" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=68883dbd26401dbde559ca60fe1163e881d679d9cb83697cd5f9d9b0eb279599 - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel" -fi +checksum=058b4d4228387558b03aceb0ed286cbbe89ea07bb6fed968beba0b51678886d6 kitemviews-devel_package() { short_desc+=" - development" From 76109d1e7e411de194e57597db2e7bd6fb2d2e02 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:05 +0100 Subject: [PATCH 0327/2369] kjobwidgets: update to 5.92.0. --- srcpkgs/kjobwidgets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template index 052dbf15734..cbe04600c92 100644 --- a/srcpkgs/kjobwidgets/template +++ b/srcpkgs/kjobwidgets/template @@ -1,6 +1,6 @@ # Template file for 'kjobwidgets' pkgname=kjobwidgets -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kjobwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5b909845e5707689e010d636cd36fb9b3b11fdddd37561b27d71a2234df3f392 +checksum=df24b96f77ddbd2f63a6c2a3c54c4e712ef11a63b93c0b02d949d85af2fb8526 kjobwidgets-devel_package() { short_desc+=" - development" From 8a264466e4ccd810d7106ddc48bda57191b0412c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:07 +0100 Subject: [PATCH 0328/2369] kjs: update to 5.92.0. --- srcpkgs/kjs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template index d919fb3c55d..6990b50f3fe 100644 --- a/srcpkgs/kjs/template +++ b/srcpkgs/kjs/template @@ -1,6 +1,6 @@ # Template file for 'kjs' pkgname=kjs -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kjs" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=322309164f54bcc7b0a8c338f8088160cf61ad6e5bdb95a77c1f72e4aaa57c49 +checksum=04072d527501c92f1e0144e9dcc114e108bfb5a2b50bed8a9b037474aaa6f118 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs" From dda97a282024f31665b983cb64b023287415fd30 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:09 +0100 Subject: [PATCH 0329/2369] kjsembed: update to 5.92.0. --- srcpkgs/kjsembed/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template index 5d411c05ac5..f606b2123fb 100644 --- a/srcpkgs/kjsembed/template +++ b/srcpkgs/kjsembed/template @@ -1,6 +1,6 @@ # Template file for 'kjsembed' pkgname=kjsembed -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="gettext kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kjsembed" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=c0d07cba5fc4173279335f8bf696eb6e013696a19eadd3851f4f428942399e88 +checksum=d7c26538a0b7ac804565840d61df2681ea4b729abb6ecfbfcae3c20536ca6035 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools" From fafa796bcf999bbd2e56a4e4444c357f40cde427 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:11 +0100 Subject: [PATCH 0330/2369] kmediaplayer: update to 5.92.0. --- srcpkgs/kmediaplayer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template index cdd6be6a66e..5c9a97d7230 100644 --- a/srcpkgs/kmediaplayer/template +++ b/srcpkgs/kmediaplayer/template @@ -1,6 +1,6 @@ # Template file for 'kmediaplayer' pkgname=kmediaplayer -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules @@ -11,7 +11,7 @@ maintainer="John " license="X11" homepage="https://invent.kde.org/frameworks/kmediaplayer" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=018aea7a06b09b9ebf7dcd6c1cf50caed144b91d0e449bfc31354c24f357c966 +checksum=fe38eb2ed593e2e68909129a042d52121b12b9350524a7a1463c24c9c58a97a6 kmediaplayer-devel_package() { short_desc+=" - development" From a50d18d33c41b7c47c6c600a5e5b55d0ca8df84e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:14 +0100 Subject: [PATCH 0331/2369] knewstuff: update to 5.92.0. --- srcpkgs/knewstuff/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template index ab225ccd0e8..ba2a38d746c 100644 --- a/srcpkgs/knewstuff/template +++ b/srcpkgs/knewstuff/template @@ -1,6 +1,6 @@ # Template file for 'knewstuff' pkgname=knewstuff -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/knewstuff" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5dd9fb32fe7e99b64f8dc4b8801bbdba5dc5ba2eda9bec2fb1fc563a53ec6a2a +checksum=4b14aee55d7701c72d05030fad508a5cb89fee34656d4d84c2d977a3c2a66c3f knewstuff-devel_package() { short_desc+=" - development" From 78f490f0ad3f6685bca033336ac8875176436116 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:16 +0100 Subject: [PATCH 0332/2369] knotifications: update to 5.92.0. --- srcpkgs/knotifications/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template index 0d5472d3836..27a83bf27de 100644 --- a/srcpkgs/knotifications/template +++ b/srcpkgs/knotifications/template @@ -1,6 +1,6 @@ # Template file for 'knotifications' pkgname=knotifications -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/knotifications" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f5f78ae7ca381524f990ead138ea68796a185418e608646dff216a846bcc0788 +checksum=8c4e095e3d96140f19e9f2e2dbc74df174e29416455671fc6680828038ea94b7 knotifications-devel_package() { short_desc+=" - development" From fdec5eb125a3792d129ff36e34b8413b27414096 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:18 +0100 Subject: [PATCH 0333/2369] knotifyconfig: update to 5.92.0. --- srcpkgs/knotifyconfig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template index 291c1b38c0d..f33e7ca6330 100644 --- a/srcpkgs/knotifyconfig/template +++ b/srcpkgs/knotifyconfig/template @@ -1,6 +1,6 @@ # Template file for 'knotifyconfig' pkgname=knotifyconfig -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/knotifyconfig" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=cedb0993e813f063a14b91b3db13d986a4501a5b8d52dc74992a57d4e0ada51e +checksum=f7f452e3197886a2afdfaa5a2954d412eb0ae2bc47ce742902765c053239313a knotifyconfig-devel_package() { short_desc+=" - development" From 45cbbbb82b25be2a5a465e8ca13fbf19e083a5fd Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:20 +0100 Subject: [PATCH 0334/2369] kpackage: update to 5.92.0. --- srcpkgs/kpackage/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template index 290c11ae3c2..7488611aa6d 100644 --- a/srcpkgs/kpackage/template +++ b/srcpkgs/kpackage/template @@ -1,6 +1,6 @@ # Template file for 'kpackage' pkgname=kpackage -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kpackage" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=51309ab8fbb5774f04ef989b15674df63348cef97f349a293f202817b9a3888b +checksum=361f75fb4e3dff46e6dab42d858488af58fd40f3af1f7a39881ea9240cd866ab post_install() { vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \ From 7f66460b692635015335b0e42790b5577ba156a2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:22 +0100 Subject: [PATCH 0335/2369] kparts: update to 5.92.0. --- srcpkgs/kparts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template index 9e64fcbea09..681aec45914 100644 --- a/srcpkgs/kparts/template +++ b/srcpkgs/kparts/template @@ -1,6 +1,6 @@ # Template file for 'kparts' pkgname=kparts -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kparts" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f2ff8a873ae20899233d7ff8936204814d1ccbe1786fa872b5922912c232d182 +checksum=094e18b2e9119f1c197c625235e639204ab5aa1910b13ae4317c8145b4fe3318 do_check() { : # test can not find packages assets?! From 681595db7379163ece25d2994972e3529b199faf Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:25 +0100 Subject: [PATCH 0336/2369] kpeople: update to 5.92.0. --- srcpkgs/kpeople/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template index 5dd2667bd74..717d2756b92 100644 --- a/srcpkgs/kpeople/template +++ b/srcpkgs/kpeople/template @@ -1,6 +1,6 @@ # Template file for 'kpeople' pkgname=kpeople -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kpeople" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=77bf43f6714e2b82029b7a45d9a72779e28540375dd6d0e63f0fddf418c28226 +checksum=b313729131bfbdb0ffd24ded926a2c6604dd06a18bd612c2ead6aa886f29c571 do_check() { cd build From 1898ca1235f31e31d5b37817733862d89d2af1d2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:27 +0100 Subject: [PATCH 0337/2369] kplotting: update to 5.92.0. --- srcpkgs/kplotting/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template index 1117f4d380f..6b6fa4db6f8 100644 --- a/srcpkgs/kplotting/template +++ b/srcpkgs/kplotting/template @@ -1,8 +1,9 @@ # Template file for 'kplotting' pkgname=kplotting -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake +configure_args="-DBUILD_DESIGNERPLUGIN=ON" hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel" makedepends="qt5-devel qt5-tools-devel" short_desc="QWidget-derived class for easy data-plotting" @@ -10,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kplotting" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=46eb996698946d7b0dc60d69674b26a06278a7f8f8eb588504d1b1c423adf565 +checksum=c95d63e2e4c4abbf625ec1cfe749314c1a90dc5be4a90a1ea1617bc969071ed1 kplotting-devel_package() { short_desc+=" - development" From 05ecdf1b3b157bd31dda85dec9eef1b7a5fa4dd3 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:29 +0100 Subject: [PATCH 0338/2369] kpty: update to 5.92.0. --- srcpkgs/kpty/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template index a9e42a08709..28f4d371f53 100644 --- a/srcpkgs/kpty/template +++ b/srcpkgs/kpty/template @@ -1,6 +1,6 @@ # Template file for 'kpty' pkgname=kpty -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kpty" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0da072117ddcded5de1d9befd2c1cf0b471711607902d03cb57bcf384d9ac1fb +checksum=cb1dac5f8f7ba059ef967a2cf3d1580a29a8d7b373ef67e82e0ac4f0285ee052 kpty-devel_package() { short_desc+=" - development" From 889d227bfea44ee5029ea1ee9d1f58caae2fad4d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:31 +0100 Subject: [PATCH 0339/2369] kquickcharts: update to 5.92.0. --- srcpkgs/kquickcharts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template index 8d60b9b72a2..d2d5278ba25 100644 --- a/srcpkgs/kquickcharts/template +++ b/srcpkgs/kquickcharts/template @@ -1,6 +1,6 @@ # Template file for 'kquickcharts' pkgname=kquickcharts -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-only OR LGPL-3.0-only" homepage="https://community.kde.org/Frameworks" distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz" -checksum=930178d092b6e04394d739bf6ce11f1d89c5d7d167ad38ebeb689d226af511be +checksum=1a430e2909b137466cf41c334a60ebc01e4cde82e71acbb167cd64d1f13e8678 do_check() { cd build From 51208e22e44d470c2f8f28f68f898cef998ba048 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:33 +0100 Subject: [PATCH 0340/2369] kross: update to 5.92.0. --- srcpkgs/kross/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template index 55fc9c20716..14c6ba42f54 100644 --- a/srcpkgs/kross/template +++ b/srcpkgs/kross/template @@ -1,6 +1,6 @@ # Template file for 'kross' pkgname=kross -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args=" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kross" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=54e17773868cc6ecd91a5927ee475cce49ce225f5ee429ff725aee2a8110c819 +checksum=129e2840eb1f33c95d50cde79a82f784cf735c3f1ae636f15dcf695c0b0c1ebf if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From 22afb960bf3abe4447fe0ed152a28b37a94d8b3c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:35 +0100 Subject: [PATCH 0341/2369] krunner: update to 5.92.0. --- srcpkgs/krunner/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template index 48e0ed1e077..4fab48018a1 100644 --- a/srcpkgs/krunner/template +++ b/srcpkgs/krunner/template @@ -1,6 +1,6 @@ # Template file for 'krunner' pkgname=krunner -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/krunner" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0677f9409d1d60e53608632cdbc04aa7454ed4355609bee6bbceff994be12a9e +checksum=3fc80c5d66359e4593115b58fcd055ca9cab8f23376123094e13c5d4bdc48fed do_check() { cd build From 21febf082189c04ff16e9158b4ebe1a0b94e1f01 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:38 +0100 Subject: [PATCH 0342/2369] kservice: update to 5.92.0. --- srcpkgs/kservice/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template index f5fe4993201..adda7f1fe8b 100644 --- a/srcpkgs/kservice/template +++ b/srcpkgs/kservice/template @@ -1,6 +1,6 @@ # Template file for 'kservice' pkgname=kservice -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kservice" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=779d11c436887c5300c6f3bf477ba334673444b3e9d3212a0cf12a1f653b9254 +checksum=52e2d9654bbade7db91c647192b78bc3ac1feedc0c279e9c371142aa5ec82ef8 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools" From 14f4b881c2684cc15d54246d99b0c64b9381dec8 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:40 +0100 Subject: [PATCH 0343/2369] ksolid: update to 5.92.0. --- srcpkgs/ksolid/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template index 840ffdae067..d954a2e1318 100644 --- a/srcpkgs/ksolid/template +++ b/srcpkgs/ksolid/template @@ -1,6 +1,6 @@ # Template file for 'ksolid' pkgname=ksolid -version=5.91.0 +version=5.92.0 revision=1 wrksrc="${pkgname#k}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/solid" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz" -checksum=4f561eaa048a6c0e35c3bb14b8bc1f637708afff689f464576bba2e7ab0293a8 +checksum=8926c859af4b6b14e0967fc3b76ca0e76de27d0ab544087eefdffe40518b5a9c libksolid_package() { short_desc+=" - runtime library" From a45316bcf250090704d6002afbad63478286cc49 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:42 +0100 Subject: [PATCH 0344/2369] ktexteditor: update to 5.92.0. --- srcpkgs/ktexteditor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template index 3b5fdaee241..3dcd6b5a743 100644 --- a/srcpkgs/ktexteditor/template +++ b/srcpkgs/ktexteditor/template @@ -1,6 +1,6 @@ # Template file for 'ktexteditor' pkgname=ktexteditor -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args=" @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/ktexteditor" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f532a1e0621d8a257387758fa616c43729dc2811c22894c656ddefe2c3367fae +checksum=bcd01c3ca07d02106de1c68156e568ded7686ca9557b30a04f7b4e24cf43fb8c do_check() { cd build From 981c767e18faf881d846894f317898612e243d37 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:45 +0100 Subject: [PATCH 0345/2369] ktextwidgets: update to 5.92.0. --- srcpkgs/ktextwidgets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template index 0e36a76dab5..2768b6f1ddc 100644 --- a/srcpkgs/ktextwidgets/template +++ b/srcpkgs/ktextwidgets/template @@ -1,6 +1,6 @@ # Template file for 'ktextwidgets' pkgname=ktextwidgets -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/ktextwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c41a6ae85345c33188c251e011a43672641fe489243c3436a1e1f15aa6cabf76 +checksum=fe867bf498a5170a9fba91dff652b68fa5cae2af8864dbe89a6e54638ff90b0c ktextwidgets-devel_package() { short_desc+=" - development" From 93f2254bb34ef18c55388844beca83129dafd130 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:47 +0100 Subject: [PATCH 0346/2369] kunitconversion: update to 5.92.0. --- srcpkgs/kunitconversion/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template index 45b3b894cbc..73f122a4fc6 100644 --- a/srcpkgs/kunitconversion/template +++ b/srcpkgs/kunitconversion/template @@ -1,6 +1,6 @@ # Template file for 'kunitconversion' pkgname=kunitconversion -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kunitconversion" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=57456b649efe2488f403e7b3cae73a734b3b459d32100b6b143f1c8d80035b58 +checksum=47e2b4c4b329562044954a67edda4d5ade953bd2a9760f6214c5f8f17239f09e kunitconversion-devel_package() { short_desc+=" - development" From 9bcb113d5328615dc22e54f0ba277f9230b8e588 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:49 +0100 Subject: [PATCH 0347/2369] kwallet: update to 5.92.0. --- srcpkgs/kwallet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template index 3133eb1e48f..6d2b98d6a7a 100644 --- a/srcpkgs/kwallet/template +++ b/srcpkgs/kwallet/template @@ -1,6 +1,6 @@ # Template file for 'kwallet' pkgname=kwallet -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwallet" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3736051cfc42598368704b36c36f41482f778c45ba22a4e591389725945938fc +checksum=71aca76cb0edbf569827709b073bff2edb5c129a85638df4bc666d70786740e5 kwallet-devel_package() { short_desc+=" - development" From d4702df237daeab7a150f105ef5bd348d8ac356e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:51 +0100 Subject: [PATCH 0348/2369] kwayland: update to 5.92.0. --- srcpkgs/kwayland/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template index b23c3b67f2c..41c3aee7518 100644 --- a/srcpkgs/kwayland/template +++ b/srcpkgs/kwayland/template @@ -1,6 +1,6 @@ # Template file for 'kwayland' pkgname=kwayland -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwayland" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3efdfa6539fb0c053092ef5f178d0ea776a93a35754eefb1be348dcbd46403a8 +checksum=95e097cefbe4e260129d77ab9fe3013818b85b9aee6e4744acfa1ada96fed195 kwayland-devel_package() { short_desc+=" - development" From b6adbdc84f258c33c6128c63c6e882f678425dd9 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:53 +0100 Subject: [PATCH 0349/2369] kwidgetsaddons: update to 5.92.0. --- srcpkgs/kwidgetsaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template index 7fe825d363e..324be77968b 100644 --- a/srcpkgs/kwidgetsaddons/template +++ b/srcpkgs/kwidgetsaddons/template @@ -1,6 +1,6 @@ # Template file for 'kwidgetsaddons' pkgname=kwidgetsaddons -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwidgetsaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e3b4dc3db4d608b2a725e9087ca3add1105e4027e7e47d10f96c2eff344af20e +checksum=d0e3558d6a7ed550f31d319e6b52d6ed61d693a1aa50e6dd4f430a1324111f2c do_check() { cd build From f0f0aa532784b19647dee95ce18627855e72e608 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:55 +0100 Subject: [PATCH 0350/2369] kwindowsystem: update to 5.92.0. --- srcpkgs/kwindowsystem/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template index 71e5dcbd752..dd6ffc7afaa 100644 --- a/srcpkgs/kwindowsystem/template +++ b/srcpkgs/kwindowsystem/template @@ -1,6 +1,6 @@ # Template file for 'kwindowsystem' pkgname=kwindowsystem -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake # Check stage requires a running X Server @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwindowsystem" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=257990566f0ef96ca23e84eaad7a66a28dd67493b6cd5c6fdb3a2fe5b613c0fb +checksum=dcdbbd2b4f2372fc225141361a7d9ae4a8f28ed77a266dc22c20be473fdc7d80 kwindowsystem-devel_package() { short_desc+=" - development" From 9e417af26d7fccc42c8e6688e2871665725cbb75 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:56 +0100 Subject: [PATCH 0351/2369] kxmlgui: update to 5.92.0. --- srcpkgs/kxmlgui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template index 79b5b2b3e0f..4f30b9703ae 100644 --- a/srcpkgs/kxmlgui/template +++ b/srcpkgs/kxmlgui/template @@ -1,6 +1,6 @@ # Template file for 'kxmlgui' pkgname=kxmlgui -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kxmlgui" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2f68b187570e22c7037fdbcff83ebaad8b5c77fe1bec166c059da6d475149ce3 +checksum=e08b4c0d3cc39f788d918bd2ba331966a8af5208233c38a27f029f93a597b743 do_check() { cd build From 21a78a75d7844f041400c1cbcc230037862ba08f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:58 +0100 Subject: [PATCH 0352/2369] kxmlrpcclient: update to 5.92.0. --- srcpkgs/kxmlrpcclient/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template index e658982b3b6..619fe8a1d3e 100644 --- a/srcpkgs/kxmlrpcclient/template +++ b/srcpkgs/kxmlrpcclient/template @@ -1,6 +1,6 @@ # Template file for 'kxmlrpcclient' pkgname=kxmlrpcclient -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later, BSD-2-Clause" homepage="https://invent.kde.org/frameworks/kxmlrpcclient" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=f0c2a92910283997c21c4f49b2bb074c1edede63706da89f965711cc8babdeae +checksum=0e32dca201f8b3d241e985c8dd8854774569d08167a9f3f060a141551e19beab post_install() { vlicense LICENSES/BSD-2-Clause.txt From 76365943badeb4f64a1059f386596dad4718ef16 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:18:59 +0100 Subject: [PATCH 0353/2369] modemmanager-qt5: update to 5.92.0. --- srcpkgs/modemmanager-qt5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template index c9a8158b6bf..920b6b1f570 100644 --- a/srcpkgs/modemmanager-qt5/template +++ b/srcpkgs/modemmanager-qt5/template @@ -1,6 +1,6 @@ # Template file for 'modemmanager-qt5' pkgname=modemmanager-qt5 -version=5.91.0 +version=5.92.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/modemmanager-qt" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=a2673f18c7866d39c9cedca2f86540c56baf966a2491a86ca06a5a0427358496 +checksum=7ed0b4f48a781fa9166e0446ac14fc21036195cb3d800ce21a546cac02fe5898 do_check() { cd build From 14ed5e3d20e5324c856ef3876eb7b39c6b8e6e7b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:19:00 +0100 Subject: [PATCH 0354/2369] networkmanager-qt5: update to 5.92.0. --- srcpkgs/networkmanager-qt5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template index 1b0b32a2346..bc475ea1215 100644 --- a/srcpkgs/networkmanager-qt5/template +++ b/srcpkgs/networkmanager-qt5/template @@ -1,6 +1,6 @@ # Template file for 'networkmanager-qt5' pkgname=networkmanager-qt5 -version=5.91.0 +version=5.92.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/networkmanager-qt" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=2e20ffd995ce64a90b1133b594bab2b2292be54e538f62633e78e8296cc44738 +checksum=51ddc8ec0ea60c87c49d5a6709eed86fe1e066d57d059a7f9e774c97b81bfa64 do_check() { cd build From 9e233f5f79c715dfa1454a1b4932aeb3f9a6ba19 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:19:35 +0100 Subject: [PATCH 0355/2369] oxygen-icons5: update to 5.92.0. --- srcpkgs/oxygen-icons5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template index 30893cc109a..94d05f08582 100644 --- a/srcpkgs/oxygen-icons5/template +++ b/srcpkgs/oxygen-icons5/template @@ -1,6 +1,6 @@ # Template file for 'oxygen-icons5' pkgname=oxygen-icons5 -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later, LGPL-3.0-or-later" homepage="https://invent.kde.org/frameworks/oxygen-icons5" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=51713501fe067cd34d3c296bc2b891d62ed2e3c4f26ead36323f8adc3d157248 +checksum=ca88b03fdd961f9f8bfa449e1fe74e3ce66e11937be9a8f6d1569a46f6429ef1 conflicts="oxygen-icons>=0" oxygen-icons_package() { From 9eaaab787dc85f6ac94165d060928c737d2ad864 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:19:37 +0100 Subject: [PATCH 0356/2369] plasma-framework: update to 5.92.0. --- srcpkgs/plasma-framework/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template index fd74fc2a405..2ab058fb303 100644 --- a/srcpkgs/plasma-framework/template +++ b/srcpkgs/plasma-framework/template @@ -1,6 +1,6 @@ # Template file for 'plasma-framework' pkgname=plasma-framework -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/plasma-framework" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f4471872b4f279e2979f661f2792f0afa8af5f15896bd9e6a08e1ec7ed85b079 +checksum=c6c2bc624564c74fd80bce170a1c763803d5207ef86108b5724fcba73c3506f7 do_check() { cd build From bb4ab1c66a9c3021f62bbd42d1b2ed3679925586 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:19:38 +0100 Subject: [PATCH 0357/2369] prison: update to 5.92.0. --- srcpkgs/prison/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template index fa4b89d45a3..5f1e84c53f7 100644 --- a/srcpkgs/prison/template +++ b/srcpkgs/prison/template @@ -1,6 +1,6 @@ # Template file for 'prison' pkgname=prison -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen @@ -12,7 +12,7 @@ maintainer="John " license="MIT" homepage="https://community.kde.org/Frameworks" distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz" -checksum=8f61c6c351e018df29a837a2d276d088b61fc844af406ea2d4f221f8e5b83f4c +checksum=7e6fee9fd56be6c4589c106a3c16a28a4aa5832a24dcefe88302a9ad113ee41e post_install() { vlicense LICENSES/BSD-3-Clause.txt From a66cefd3caca7e703b0783c8c7d172bd7469fe62 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:19:40 +0100 Subject: [PATCH 0358/2369] purpose: update to 5.92.0. --- srcpkgs/purpose/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template index c4dbc383d75..dc71877ba34 100644 --- a/srcpkgs/purpose/template +++ b/srcpkgs/purpose/template @@ -1,6 +1,6 @@ # Template file for 'purpose' pkgname=purpose -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/purpose" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=952c012d347f0ca6f1dc1aaad7e0ab538699bcaf9099fe8b25ddafd4cebfdcfc +checksum=94613e180550f9d15443ced1f2d93b566350d9a981205b4f98923714dc4f400a do_check() { cd build From 323eeb344eeff05f8e8a86d2e84e2460c8386e71 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:19:41 +0100 Subject: [PATCH 0359/2369] qqc2-desktop-style: update to 5.92.0. --- srcpkgs/qqc2-desktop-style/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template index 3ac4ebda2d1..5af0197811c 100644 --- a/srcpkgs/qqc2-desktop-style/template +++ b/srcpkgs/qqc2-desktop-style/template @@ -1,6 +1,6 @@ # Template file for 'qqc2-desktop-style' pkgname=qqc2-desktop-style -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/qqc2-desktop-style" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=11d52dfd9f576ee4933b32c6dd2458c5e25836935d9dcc27f3c845e8dccea965 +checksum=97530813b9a80505b5484175a55be49cc020244fbe3b1bdaeef15845c3c9bdac qqc2-desktop-style-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 89d279fbc571b48e378081431c6d5c48ed2cb7b5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:19:43 +0100 Subject: [PATCH 0360/2369] sonnet: update to 5.92.0. --- srcpkgs/sonnet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template index 8270d62a11e..b7d08f3d959 100644 --- a/srcpkgs/sonnet/template +++ b/srcpkgs/sonnet/template @@ -1,6 +1,6 @@ # Template file for 'sonnet' pkgname=sonnet -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/sonnet" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bda19e339d19ffcfa6bfa74eb6f0cdaf75e2537450d2deed03f45f4a6b91fd18 +checksum=31fc1dda3db582337529922d38b6eac72b1551c4a0d86fb9307363e061d05722 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" sonnet" From 598e5a05cfa4b188c6fda3eb0f90792f3ec0ddfd Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:19:44 +0100 Subject: [PATCH 0361/2369] syndication: update to 5.92.0. --- srcpkgs/syndication/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template index 1fda9ff348e..3a35ebf2c17 100644 --- a/srcpkgs/syndication/template +++ b/srcpkgs/syndication/template @@ -1,7 +1,7 @@ # Template file for 'syndication' pkgname=syndication reverts="18.08.0_1 18.08.0_2 18.08.1_1" -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz" -checksum=fe05fc898c8e5adf23b977138e8b595448805fc2d48c62579881f500ab5953b8 +checksum=1c9ab9772103c001e56afbe0356ede04f953b07be8d2c2e2f2fff3e7b5bd5d46 syndication-devel_package() { short_desc+=" - development" From 92f58024617b53828c002b942c93969bb8edae05 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:19:46 +0100 Subject: [PATCH 0362/2369] syntax-highlighting: update to 5.92.0. --- srcpkgs/syntax-highlighting/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template index d390c1ae40a..5ad6ec87783 100644 --- a/srcpkgs/syntax-highlighting/template +++ b/srcpkgs/syntax-highlighting/template @@ -1,6 +1,6 @@ # Template file for 'syntax-highlighting' pkgname=syntax-highlighting -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/syntax-highlighting" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=370a45b274db90e8d2d34d61d3f665a3f1f9f552d4503ce5805a47f445c4f93a +checksum=99347eaf9b2249f875cacd8319c77f2f8e110d0e7834f51f296ed911dcc7e50e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" syntax-highlighting" From 46c697c99d9fdc43673bb3ced70a8fcbf0b085e7 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 03:19:47 +0100 Subject: [PATCH 0363/2369] threadweaver: update to 5.92.0. --- srcpkgs/threadweaver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template index da71b23a484..9d65ff2b49d 100644 --- a/srcpkgs/threadweaver/template +++ b/srcpkgs/threadweaver/template @@ -1,6 +1,6 @@ # Template file for 'threadweaver' pkgname=threadweaver -version=5.91.0 +version=5.92.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/threadweaver" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=22485000cf28d4b28a46e7856532339df5e3e49180ee4a0493f3f3491f9e00a4 +checksum=48b0cf3d969437eaeb0839cbb16a35209336fc6e78c1540920f91bbab8b01101 threadweaver-devel_package() { short_desc+=" - development" From 7fe7501c83c81578d9daa101d5360b89ac76da9e Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 23:18:45 +0100 Subject: [PATCH 0364/2369] bluedevil: update to 5.24.3. --- srcpkgs/bluedevil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template index d504a731df3..a3eb6e45043 100644 --- a/srcpkgs/bluedevil/template +++ b/srcpkgs/bluedevil/template @@ -1,6 +1,6 @@ # Template file for 'bluedevil' pkgname=bluedevil -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/bluedevil" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=24d7501e65149093e17c8545199d1bcae27fe828ded65d6a20446c8fffe1fa2a +checksum=9dd1566eae8bb793330f2f54ab34cd75ed79e7f3924bf78149077b122cc49ec2 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel" From 997994aaabb119107c5a62f7ffd31e1678fbbcef Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:54:42 +0100 Subject: [PATCH 0365/2369] breeze-gtk: update to 5.24.3. --- srcpkgs/breeze-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template index 067afa6ce66..8e1a152f177 100644 --- a/srcpkgs/breeze-gtk/template +++ b/srcpkgs/breeze-gtk/template @@ -1,6 +1,6 @@ # Template file for 'breeze-gtk' pkgname=breeze-gtk -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules sassc python3 python3-cairo" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/breeze-gtk" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=2c1f02be02bac5d9098e90901b047ba587f57dc3827dd89b5a868ca80a2f2dc8 +checksum=2911bb2f99ad42ec820cc2adcbf1f8a6f18ba437f72ce216562e12584fd042a4 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel" From 928259a2aa8dd4c2f26f1d6418f05e72d84e4874 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:54:50 +0100 Subject: [PATCH 0366/2369] breeze: update to 5.24.3. --- srcpkgs/breeze/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template index 9efe5daf780..0317ba5620d 100644 --- a/srcpkgs/breeze/template +++ b/srcpkgs/breeze/template @@ -1,6 +1,6 @@ # Template file for 'breeze' pkgname=breeze -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/breeze" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=5fee72b7bc88fe8d97b575f46de62037ac2f898c7a5ff024e62f1082d60984b9 +checksum=4b8f92e55c72ed59b7bdfe4be6044fcb0a0816fb6f1ea2bdd9884b58b9a92940 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From a4adf06f0903eea6f77dbef9c416941c65d85a1a Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:54:52 +0100 Subject: [PATCH 0367/2369] kactivitymanagerd: update to 5.24.3. --- srcpkgs/kactivitymanagerd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template index ddfa1727d02..879d45275ce 100644 --- a/srcpkgs/kactivitymanagerd/template +++ b/srcpkgs/kactivitymanagerd/template @@ -1,6 +1,6 @@ # Template file for 'kactivitymanagerd' pkgname=kactivitymanagerd -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake build_helper="qemu" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kactivitymanagerd" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=a14714645797114b45c4bd0d87fe2559f4c4b5d4625e100045b25c66fd25a958 +checksum=9cae3e136ee6743474fd96a573b235b6ca8653d4f61f412d9d3ec866861cae63 From ef4452435379dc68a04155bdf145db92088a51d2 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:54:53 +0100 Subject: [PATCH 0368/2369] kde-cli-tools: update to 5.24.3. --- srcpkgs/kde-cli-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template index 15d12bab1ed..847a7213209 100644 --- a/srcpkgs/kde-cli-tools/template +++ b/srcpkgs/kde-cli-tools/template @@ -1,6 +1,6 @@ # Template file for 'kde-cli-tools' pkgname=kde-cli-tools -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kde-cli-tools" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=9549c0474695df4855b66ee2196caa14a0bc3e0179920ae564d149bc5ecf6984 +checksum=fe64da7ce3ad7e7b2d743e06aec0f6666e1909d3ad08867a0173c5c262f7e803 post_install() { ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin From 0071d9f73feef4aeddf4bb0336468eb1fc47b4a9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:54:55 +0100 Subject: [PATCH 0369/2369] kde-gtk-config5: update to 5.24.3. --- srcpkgs/kde-gtk-config5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template index 17151ae771c..a68d66dbb12 100644 --- a/srcpkgs/kde-gtk-config5/template +++ b/srcpkgs/kde-gtk-config5/template @@ -1,6 +1,6 @@ # Template file for 'kde-gtk-config5' pkgname=kde-gtk-config5 -version=5.24.2 +version=5.24.3 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -15,7 +15,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kde-gtk-config" distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz" -checksum=eab1d06c3e3f5c02b3a6608f6b2bc8d20d82f7e2f3ea4c666d4d2f69f476776d +checksum=fb4bcd30c93e15962153e81ca218f03465f02d1d2d011f267bb96946869ba05c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kcoreaddons" From bef2c8ef983f14771c152e2ca85668f5f96d5f87 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:54:56 +0100 Subject: [PATCH 0370/2369] kdecoration: update to 5.24.3. --- srcpkgs/kdecoration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template index 5e422f52cb3..a358d713d04 100644 --- a/srcpkgs/kdecoration/template +++ b/srcpkgs/kdecoration/template @@ -1,6 +1,6 @@ # Template file for 'kdecoration' pkgname=kdecoration -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kdecoration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=ac5f02324a5d64e81408c30f3c9d077da460b77278eed7f195344d3f5acc8d87 +checksum=bbfc3d83f76dc8d2568bbe2f5395af5887eaba79094fcb901930585f8b53f636 kdecoration-devel_package() { short_desc+=" - development" From 1d10451186325469d1e077786abb52d83a7de7b9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:54:58 +0100 Subject: [PATCH 0371/2369] kdeplasma-addons5: update to 5.24.3. --- srcpkgs/kdeplasma-addons5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template index c083d1b0b01..065f0fede44 100644 --- a/srcpkgs/kdeplasma-addons5/template +++ b/srcpkgs/kdeplasma-addons5/template @@ -1,6 +1,6 @@ # Template file for 'kdeplasma-addons5' pkgname=kdeplasma-addons5 -version=5.24.2 +version=5.24.3 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kdeplasma-addons" distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz" -checksum=13e62f9091f26eeff7d4bf4a51569c2af561dd051d1c1d94b98071a7465d6cf3 +checksum=86fe08a744e31ce22124bca4337633f6a2523fbc87d915d3ffd42e65da66f23c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 41fab29b79ce8d5e4f4de1b91eb7b25c1dbb0321 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:00 +0100 Subject: [PATCH 0372/2369] kgamma5: update to 5.24.3. --- srcpkgs/kgamma5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template index a6345f6366e..30fa3d8e657 100644 --- a/srcpkgs/kgamma5/template +++ b/srcpkgs/kgamma5/template @@ -1,6 +1,6 @@ # Template file for 'kgamma5' pkgname=kgamma5 -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kgamma5" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=a31bc51521cdfc55bbb29aee2f713378ba34fcee08326dbb10a2d6486a7a4957 +checksum=66da3bdfaaddb70c6bbf5739eaa970c8a7f67fd8295872ee201a1445c2df9867 From 8fca1f124f0341bb4ef7e41d7555ec0332265de9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:02 +0100 Subject: [PATCH 0373/2369] khotkeys: update to 5.24.3. --- srcpkgs/khotkeys/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template index 1fef1d71c1a..1a59a447a85 100644 --- a/srcpkgs/khotkeys/template +++ b/srcpkgs/khotkeys/template @@ -1,6 +1,6 @@ # Template file for 'khotkeys' pkgname=khotkeys -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/plasma/khotkeys" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=05ef66dd409b7de9ce6711b2b8931e68cc9eb7978adcb7ed17576a788e5870b2 +checksum=17f45fa898147b7bd9e1bd4850aef10d03c25dbfe088ef46803a817f7348afcb if [ "$CROSS_BUILD" ]; then configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" From cdcb7cf4fae236d4711c0bf1b6dd88565f327899 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:03 +0100 Subject: [PATCH 0374/2369] kinfocenter: update to 5.24.3. --- srcpkgs/kinfocenter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template index 338b9ec75c0..eac578309f8 100644 --- a/srcpkgs/kinfocenter/template +++ b/srcpkgs/kinfocenter/template @@ -1,6 +1,6 @@ # Template file for 'kinfocenter' pkgname=kinfocenter -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only" homepage="https://invent.kde.org/plasma/kinfocenter" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=af5dd1af07e308c42f55d5c2ec472ab5b4ab67bef03d29545f9bc5e6d03ebeda +checksum=d2f5acb7a52434e6b539dc52d23cf09754e313411b32d169f36403ba0801e223 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel" From 145e501d39f721e695e6071dd91b2186ff2d637c Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:05 +0100 Subject: [PATCH 0375/2369] kmenuedit: update to 5.24.3. --- srcpkgs/kmenuedit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template index 0b852ac0c1e..02793528e9e 100644 --- a/srcpkgs/kmenuedit/template +++ b/srcpkgs/kmenuedit/template @@ -1,6 +1,6 @@ # Template file for 'kmenuedit' pkgname=kmenuedit -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kmenuedit" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=5e0eb1979bcfe4b66ff010197d8bcb0bcc3f9eab4c5d95c454c7b145d228a672 +checksum=8bc5d0dfef18e4e1f561cd86f2d023b8d5f951ffd7bcc497633e4ad263cb3bfa From f314adfac164fdb71890799278961c5817237e69 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:07 +0100 Subject: [PATCH 0376/2369] kscreen: update to 5.24.3. --- srcpkgs/kscreen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template index fcfff4f8cf8..00eb087ad0a 100644 --- a/srcpkgs/kscreen/template +++ b/srcpkgs/kscreen/template @@ -1,6 +1,6 @@ # Template file for 'kscreen' pkgname=kscreen -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kscreen" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=f8549747eaaca0a7172e57d404207a684ef659ee107c2b2815526d5d5180f489 +checksum=0e814b3db2c952857bc399e9d3bc349b80ad7367ac755c22dae31004c7684bf2 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From bedc3bd6bf42ec17f86acafe54950987351e9fc7 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:09 +0100 Subject: [PATCH 0377/2369] kscreenlocker: update to 5.24.3. --- srcpkgs/kscreenlocker/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template index 26e5ea06f44..29b2b0c4f67 100644 --- a/srcpkgs/kscreenlocker/template +++ b/srcpkgs/kscreenlocker/template @@ -1,6 +1,6 @@ # Template file for 'kscreenlocker' pkgname=kscreenlocker -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kscreenlocker" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=fcd9d5be26409819903b445d2ebe888ea2e7cba289304b80462e9d701e06d3e5 +checksum=03157ca122085fd6d8eeabb369c363ef706a773ad509eb5c08722a0e4bf903b6 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wayland-devel" From 47c5e89a382c518a4d58e7eb41fbc8801ab07082 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:10 +0100 Subject: [PATCH 0378/2369] ksshaskpass: update to 5.24.3. --- srcpkgs/ksshaskpass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template index 4c8ee2c30d3..18b7a81583c 100644 --- a/srcpkgs/ksshaskpass/template +++ b/srcpkgs/ksshaskpass/template @@ -1,6 +1,6 @@ # Template file for 'ksshaskpass' pkgname=ksshaskpass -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,5 +12,5 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/ksshaskpass" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=3073957d9e0a18119466db2be4d9d066f3c8f594fa0459031040852c94c3950b +checksum=3bbe16721dabd7fbae659be3f21b4a386d8ca0a6d288c94ccd3954ecbd4d7847 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass" From 172a593100674c821d3a7ee53144d0e86485e0f1 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:12 +0100 Subject: [PATCH 0379/2369] ksystemstats: update to 5.24.3. --- srcpkgs/ksystemstats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template index f53ab6a923c..65541c9fde5 100644 --- a/srcpkgs/ksystemstats/template +++ b/srcpkgs/ksystemstats/template @@ -1,6 +1,6 @@ # Template file for 'ksystemstats' pkgname=ksystemstats -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake gettext @@ -12,4 +12,4 @@ maintainer="John " license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only" homepage="https://invent.kde.org/plasma/ksystemstats" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=ff6befbea33add48a7a6fec574576cccbfc6eea6e28018fef06b16cbea2d2057 +checksum=4c303bd73bafb254ca8bb5dee0de3b7a2ec4123e719827d26268625047bb330e From 32fc8e334014af828c085cb2bceaba27d829080b Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:13 +0100 Subject: [PATCH 0380/2369] kwallet-pam: update to 5.24.3. --- srcpkgs/kwallet-pam/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template index 39d3bbcbe4d..c32def9d2ba 100644 --- a/srcpkgs/kwallet-pam/template +++ b/srcpkgs/kwallet-pam/template @@ -1,6 +1,6 @@ # Template file for 'kwallet-pam' pkgname=kwallet-pam -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules" @@ -11,4 +11,4 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kwallet-pam" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=afa0dea0d9faaa25f1bb75901cb5d0f031ab55bd6287d75fcd26521f9e92586a +checksum=33dd50c4d9258d1e3326980192e2523490754cd1724ff704c7e36984e5cdad7f From cbba6787b53da29c14d58aac5dbf717b0b642c05 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:15 +0100 Subject: [PATCH 0381/2369] kwayland-integration: update to 5.24.3. --- srcpkgs/kwayland-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template index 22e58dc16ea..95e908c2228 100644 --- a/srcpkgs/kwayland-integration/template +++ b/srcpkgs/kwayland-integration/template @@ -1,6 +1,6 @@ # Template file for 'kwayland-integration' pkgname=kwayland-integration -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kwayland-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=fb8cab0a35b6fee268243481707613f6cea9715cda96d124a0a508e3b2a1ba93 +checksum=9f6f167fd16aebf550ae9bda176237ea80efae4a08826050ccbd2d7a73de05cf From 1ec80d542843fb2ccacbb999028dea513118ccbd Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:16 +0100 Subject: [PATCH 0382/2369] kwayland-server: update to 5.24.3. --- srcpkgs/kwayland-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template index 162db239488..7bf6ed477fa 100644 --- a/srcpkgs/kwayland-server/template +++ b/srcpkgs/kwayland-server/template @@ -1,6 +1,6 @@ # Template file for 'kwayland-server' pkgname=kwayland-server -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake build_helper="qemu" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/kwayland-server" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=147b0312fe456ca5018da641fb5758d94d55eca136d075729d322829634ee247 +checksum=560b20a15b459c5a1e8d0b38e9d53c3a75660bc798fa544e7a9d5c36260e063b kwayland-server-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From cdeb454fbd557dfba594ac72b8a0d1d6ce75ff26 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:19 +0100 Subject: [PATCH 0383/2369] kwin: update to 5.24.3. --- srcpkgs/kwin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template index 3630868e413..435bcc4eb3a 100644 --- a/srcpkgs/kwin/template +++ b/srcpkgs/kwin/template @@ -1,6 +1,6 @@ # Template file for 'kwin' pkgname=kwin -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake build_helper=qemu @@ -21,7 +21,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kwin" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=2aabb59ef884cb2fb3f53b9577d651a1c39977a482bca93d6634ed3593054411 +checksum=d84db7e32a13177a0bd030e6c65907cc37c28efad51ee17c518e402235cbf46b build_options="pipewire" build_options_default="pipewire" From 7b74b8ee8ace29a638d16a0c7484da2219fbe407 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:20 +0100 Subject: [PATCH 0384/2369] kwrited: update to 5.24.3. --- srcpkgs/kwrited/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template index 0b3ccbfeb3b..5a556a8be1d 100644 --- a/srcpkgs/kwrited/template +++ b/srcpkgs/kwrited/template @@ -1,6 +1,6 @@ # Template file for 'kwrited' pkgname=kwrited -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,4 +11,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kwrited" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=9d88edeacece79f2a8a1cc989b36896c2ad911b31d1c8ba78b4c3406a9b97205 +checksum=2d768547e131aed99d165b0aee7b080e512a2a5ffab292bff8f71033631cede9 From cca2f6d99bc88163df7131766a4915d117da4f13 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:22 +0100 Subject: [PATCH 0385/2369] layer-shell-qt: update to 5.24.3. --- srcpkgs/layer-shell-qt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template index a9786a4e56e..3642d981934 100644 --- a/srcpkgs/layer-shell-qt/template +++ b/srcpkgs/layer-shell-qt/template @@ -1,6 +1,6 @@ # Template file for 'layer-shell-qt' pkgname=layer-shell-qt -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/layer-shell-qt" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=eefee96cf04cb1dbaede72b50354ddc7129915f1b88c340ff206724c29620f2c +checksum=5de105ece2d7e6ca2d65305186462b0f9240930276adf7d5eedf77ffeaa67d40 layer-shell-qt-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 405a1b42159efb8c5f70422c413b3b192b0de83b Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:23 +0100 Subject: [PATCH 0386/2369] libkscreen: update to 5.24.3. --- srcpkgs/libkscreen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template index 5b3ab7883fa..5b76a89d08d 100644 --- a/srcpkgs/libkscreen/template +++ b/srcpkgs/libkscreen/template @@ -1,6 +1,6 @@ # Template file for 'libkscreen' pkgname=libkscreen -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/libkscreen" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=a64c2263a0de898a4a0e73f85949b4d3868aef87aa221d597e8c16f412103b04 +checksum=a6874f0f4066e16ea191341d4d7d73deaf304e117ab64306d311c862393de7a0 libkscreen-devel_package() { short_desc+=" - development" From 93d89322e980cf7affccb01c01d42e579eb2314c Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:25 +0100 Subject: [PATCH 0387/2369] libksysguard: update to 5.24.3. --- srcpkgs/libksysguard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template index 4fe82b36bbf..2fac80ddba4 100644 --- a/srcpkgs/libksysguard/template +++ b/srcpkgs/libksysguard/template @@ -1,6 +1,6 @@ # Template file for 'libksysguard' pkgname=libksysguard -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/libksysguard" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=13983f626906db864eda20bfa2e994ccbe4ddc534af7a052675b3475b7e9472f +checksum=148651cf33c7400d7a0df507d0bb75a6924e1ae80f5a46eefeaeb44c848ff1a2 build_options="webengine" From f82662786adf791501e7c026596f87db944725a1 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:27 +0100 Subject: [PATCH 0388/2369] milou: update to 5.24.3. --- srcpkgs/milou/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template index abe6af2c8b0..05ef7d33c83 100644 --- a/srcpkgs/milou/template +++ b/srcpkgs/milou/template @@ -1,6 +1,6 @@ # Template file for 'milou' pkgname=milou -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LPGL-2.1-or-later" homepage="https://invent.kde.org/plasma/milou" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=9a8c4b0561ce85f37ccd4500b715c73b9ed77aec79aa46eb2b0e04d9b94381e4 +checksum=31d70b760653e0fe4b9c1b59d7601bb52d307a3d3be3b8f67550a4ea9d22bd1b if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 4c994446c7f317b9f7d2349fcb46f4cde8045198 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:29 +0100 Subject: [PATCH 0389/2369] oxygen: update to 5.24.3. --- srcpkgs/oxygen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template index 521ae7f336b..afd58f630f8 100644 --- a/srcpkgs/oxygen/template +++ b/srcpkgs/oxygen/template @@ -1,6 +1,6 @@ # Template file for 'oxygen' pkgname=oxygen -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/oxygen" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=73d821a412a86df1511e6979d985de496d226ecc4201fe64e43b9400e1860cda +checksum=018dbd3c276707bbcc8515424ae45a0133cd9a2e31ffd7a0bbc25522586e400a From 9b169ef007439c4ce07e0a5770a5d591b9b2acce Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:31 +0100 Subject: [PATCH 0390/2369] plasma-browser-integration: update to 5.24.3. --- srcpkgs/plasma-browser-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template index 41d3d104a68..e7e64687c57 100644 --- a/srcpkgs/plasma-browser-integration/template +++ b/srcpkgs/plasma-browser-integration/template @@ -1,6 +1,6 @@ # Template file for 'plasma-browser-integration' pkgname=plasma-browser-integration -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF @@ -14,4 +14,4 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/plasma-browser-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=e8a48296d1a713d8b8f002d559a4cd12cd7f4892c591ed985c5ce49f7bffe738 +checksum=40b07a0065bf24a78997fb210b0550642872ba8c41ba1df6c2cb6785d85851d7 From e5e2025111e54cbc6ae26d83ecb07f234f4c230c Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:33 +0100 Subject: [PATCH 0391/2369] plasma-desktop: update to 5.24.3. --- srcpkgs/plasma-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template index fbef3a8d399..58edbeb7f5d 100644 --- a/srcpkgs/plasma-desktop/template +++ b/srcpkgs/plasma-desktop/template @@ -1,6 +1,6 @@ # Template file for 'plasma-desktop' pkgname=plasma-desktop -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF @@ -18,6 +18,6 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2" homepage="https://invent.kde.org/plasma/plasma-desktop" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=524193c24c95f67137410786f94c70d3c96827bae133a48bb53226f32c33fa10 +checksum=583e7ecfd2e2b766d645284cf13605851d96e2ad7cf2e657b4665aa3f3fd91d3 replaces="user-manager>=0" python_version=3 From 212524edc17e7c7b299e6b72d9b8a7f6d4b21e35 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:35 +0100 Subject: [PATCH 0392/2369] plasma-disks: update to 5.24.3. --- srcpkgs/plasma-disks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template index bd58a31096c..9498075cb52 100644 --- a/srcpkgs/plasma-disks/template +++ b/srcpkgs/plasma-disks/template @@ -1,6 +1,6 @@ # Template file for 'plasma-disks' pkgname=plasma-disks -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/plasma-disks" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=e2135701903316f46df042f8b0eade162a1f1412644d9f4d9fa0512856b81522 +checksum=9e71a018eb875dd70d7b30f23937098ae8d6d9eab2306b541f916ddf6b64745a From e8e171dd3bcd2f635ddfe85c758bc740cb2a8202 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:36 +0100 Subject: [PATCH 0393/2369] plasma-firewall: update to 5.24.3. --- srcpkgs/plasma-firewall/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template index 051b5af7faa..474ae2d9cf1 100644 --- a/srcpkgs/plasma-firewall/template +++ b/srcpkgs/plasma-firewall/template @@ -1,6 +1,6 @@ # Template file for 'plasma-firewall' pkgname=plasma-firewall -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcmutils @@ -11,4 +11,4 @@ maintainer="John " license="GPL-2.0-only OR GPL-3.0-only" homepage="https://invent.kde.org/network/plasma-firewall" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=7ac775e652570c704d6d3e1b0809e10e3718c630f89fe4c2b11dd3f91f5c85d3 +checksum=bff36b7a922a6d0e5e20df539c6995d775f62a1d63c970b55bb430abd580ef64 From 7698f2161f139b1e3636b3303a215a0ad2754439 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:38 +0100 Subject: [PATCH 0394/2369] plasma-integration: update to 5.24.3. --- srcpkgs/plasma-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template index 493d73cfbbd..59c8998026b 100644 --- a/srcpkgs/plasma-integration/template +++ b/srcpkgs/plasma-integration/template @@ -1,6 +1,6 @@ # Template file for 'plasma-integration' pkgname=plasma-integration -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,4 +14,4 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/plasma/plasma-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=b6408b32e13b9713cd34f499c7aae216218a04b6c9655f37689d95f8b323f947 +checksum=7aef8f3b6234b402b978d12e72d9c5eb2b82cbe587afa32f288e2e160b103c0c From 4ffe922d9facf3eca2f0b2a29eb5cd56fcf46fec Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:40 +0100 Subject: [PATCH 0395/2369] plasma-nm: update to 5.24.3. --- srcpkgs/plasma-nm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template index 1404adc97bb..cc71c9f5492 100644 --- a/srcpkgs/plasma-nm/template +++ b/srcpkgs/plasma-nm/template @@ -1,6 +1,6 @@ # Template file for 'plasma-nm' pkgname=plasma-nm -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-nm" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=114ead32c90d521ae0504baee971da71a2c0f1a37d25bbf1868012ed030048cb +checksum=2cf64e94ed921546bc0be44f50e3490033a353bf3f0ad7a5a513ef5585fc3bfd if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 1af80a720a388586a48b93cdf9af20d00b76e5b2 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:41 +0100 Subject: [PATCH 0396/2369] plasma-pa: update to 5.24.3. --- srcpkgs/plasma-pa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template index 5285d753439..dd3e8e33c8a 100644 --- a/srcpkgs/plasma-pa/template +++ b/srcpkgs/plasma-pa/template @@ -1,6 +1,6 @@ # Template file for 'plasma-pa' pkgname=plasma-pa -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-pa" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=015dff4f7561a0fdca28a0d49e98df3bb112300c9e29588f685e58ae037603e6 +checksum=e18fbe9cf9f2948c2d3567ba0bb71126ffef8d7c4df8084a8fa0fd48c0ca0759 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel" From 3a627d5c0864da1e90f2d0f5596e0b31d12c1104 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:43 +0100 Subject: [PATCH 0397/2369] plasma-sdk: update to 5.24.3. --- srcpkgs/plasma-sdk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template index 3bf3208853f..4d713043e9d 100644 --- a/srcpkgs/plasma-sdk/template +++ b/srcpkgs/plasma-sdk/template @@ -1,6 +1,6 @@ # Template file for 'plasma-sdk' pkgname=plasma-sdk -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-sdk" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=83486883400fb837df6541f462df390b28df5d9a174a04e55e971ffe483c777b +checksum=f9bad013598b8d4e8b0be4ceaa5ad5f1a3326911f7b41e754d57d7a5f1f5d63c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From bda947c6bca6d36498417eb90259d0a52c4cba28 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:45 +0100 Subject: [PATCH 0398/2369] plasma-systemmonitor: update to 5.24.3. --- srcpkgs/plasma-systemmonitor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template index e81d4b72595..4cdb8fc83b4 100644 --- a/srcpkgs/plasma-systemmonitor/template +++ b/srcpkgs/plasma-systemmonitor/template @@ -1,6 +1,6 @@ # Template file for 'plasma-systemmonitor' pkgname=plasma-systemmonitor -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake @@ -12,4 +12,4 @@ maintainer="John " license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only" homepage="https://invent.kde.org/plasma/plasma-systemmonitor" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=16902047b659cbe7e3452e527699aa8891546323a54efc60d0fdcfac8fe0ccd4 +checksum=904c0cbf56469b4b021559cc898aef57917cbe36526317c5bc7d34f255c0439d From 0c9f797ac8907803b4f0ec1f4fb4f21fc5162ed8 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:47 +0100 Subject: [PATCH 0399/2369] plasma-thunderbolt: update to 5.24.3. --- srcpkgs/plasma-thunderbolt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template index a8a79a05ae4..7fbd11daa1a 100644 --- a/srcpkgs/plasma-thunderbolt/template +++ b/srcpkgs/plasma-thunderbolt/template @@ -1,6 +1,6 @@ # Template file for 'plasma-thunderbolt' pkgname=plasma-thunderbolt -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kcmutils @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/plasma-thunderbolt" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=7111626252470f7c1de5b3c261b29db3ac9bdac5e1453b6853cda8aaaa5681be +checksum=52bec310386158c7f85cd6a8a7db5bedabdb8494f4c6818d8466aa33a6dba5df do_check() { : # Requires running dbus and bolt services From 48976d55e9da802ca54918326f01e3090b5b0ee9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:55:49 +0100 Subject: [PATCH 0400/2369] plasma-vault: update to 5.24.3. --- srcpkgs/plasma-vault/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template index 3c971780ddc..980ab7d44e7 100644 --- a/srcpkgs/plasma-vault/template +++ b/srcpkgs/plasma-vault/template @@ -1,6 +1,6 @@ # Template file for 'plasma-vault' pkgname=plasma-vault -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake @@ -14,4 +14,4 @@ maintainer="Giuseppe Fierro " license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/KDE/plasma-vault" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=be8e517dff5e3fcfaeade1d9a992c5d44c52b3efbdeb345a79dad94141722e52 +checksum=8d4998fd105073ce8ae6012426c0bd024529e0ae67c3c3ea9178918fcf87be38 From b57e1a9604cadc614ca289c0c7642b2ff88e96f1 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:56:05 +0100 Subject: [PATCH 0401/2369] plasma-workspace-wallpapers: update to 5.24.3. --- srcpkgs/plasma-workspace-wallpapers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template index 9522d47d221..4d21268470d 100644 --- a/srcpkgs/plasma-workspace-wallpapers/template +++ b/srcpkgs/plasma-workspace-wallpapers/template @@ -1,6 +1,6 @@ # Template file for 'plasma-workspace-wallpapers' pkgname=plasma-workspace-wallpapers -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -10,4 +10,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=3664b2cd1005f2632475e2024fcec623090407d4398e0bc70dcfe45dfbb8bf67 +checksum=da252edb70b3373c38fb30318a44f52f047d4f31cbbd26c01c30bf2398c43848 From 1c61c493e0c262f9d93c6426a730e2e1a2f7766a Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:56:09 +0100 Subject: [PATCH 0402/2369] plasma-workspace: update to 5.24.3. --- srcpkgs/plasma-workspace/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index e6609778d1a..a8ae6f591b0 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -1,6 +1,6 @@ # Template file for 'plasma-workspace' pkgname=plasma-workspace -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF @@ -23,7 +23,7 @@ maintainer="John " license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-workspace" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=e7fd2ad7c067710401f7322789ce796c3ad5e02a3813bdfb84ebd5dbd8787d11 +checksum=104c5c0ebb000f48c749a6bafdde4cbb1b06d188e1a23ef95a2d035cce442ab4 build_options="pipewire" build_options_default="pipewire" From 30757836f9ca29daf82d9b81b23a2a2d5de16166 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:56:11 +0100 Subject: [PATCH 0403/2369] polkit-kde-agent: update to 5.24.3. --- srcpkgs/polkit-kde-agent/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template index 2dc1f55fbcf..53ebff5a685 100644 --- a/srcpkgs/polkit-kde-agent/template +++ b/srcpkgs/polkit-kde-agent/template @@ -1,6 +1,6 @@ # Template file for 'polkit-kde-agent' pkgname=polkit-kde-agent -version=5.24.2 +version=5.24.3 revision=1 wrksrc="${pkgname}-1-${version}" build_style=cmake @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://commits.kde.org/polkit-kde-agent" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz" -checksum=43685eccd228edf74c7fee80f6cafb217159b540b487cda067c18e3ec6b7ba7d +checksum=788d392c811ee7c8098d294ccc9fff7f7a695977689a66cb4a1cb52d6f4779d5 From 7be7a4eff013fb47eb315a6651ee95439d22d0d1 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:56:13 +0100 Subject: [PATCH 0404/2369] powerdevil: update to 5.24.3. --- srcpkgs/powerdevil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template index 5bd44767528..3eb123d13d5 100644 --- a/srcpkgs/powerdevil/template +++ b/srcpkgs/powerdevil/template @@ -1,6 +1,6 @@ # Template file for 'powerdevil' pkgname=powerdevil -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/powerdevil" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=8c742e057f19e3852ed6403e7a3f86fa70a478ae0c6c30a492491a5b02b7cd8d +checksum=495275be84a96572d2e2a7ee343e1ab98c79e7c8eef402a7f26d86863e25f010 From 2ea0d1cd95aa43a133baac029aaadb9e8d522652 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:56:14 +0100 Subject: [PATCH 0405/2369] sddm-kcm: update to 5.24.3. --- srcpkgs/sddm-kcm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template index b44457380eb..95d916cf3e1 100644 --- a/srcpkgs/sddm-kcm/template +++ b/srcpkgs/sddm-kcm/template @@ -1,6 +1,6 @@ # Template file for 'sddm-kcm' pkgname=sddm-kcm -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,4 +14,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/sddm-kcm" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=af95a174536c7deb01d4274c1e0efa71a06a8728dbafa144dc37a37b803c3e22 +checksum=d0d01ceda262734e87f0cfc28138a1b5478651722a703a55ac744c4e676ec696 From 2863d386e2a67be271699fadfcdaa087e3455666 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:56:16 +0100 Subject: [PATCH 0406/2369] systemsettings: update to 5.24.3. --- srcpkgs/systemsettings/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template index 1574038368c..57c764dcde4 100644 --- a/srcpkgs/systemsettings/template +++ b/srcpkgs/systemsettings/template @@ -1,6 +1,6 @@ # Template file for 'systemsettings' pkgname=systemsettings -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,4 +14,4 @@ maintainer="John " license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://invent.kde.org/plasma/systemsettings" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=b31e3bbd0ed6c69718341e7290f8a8888e972ca3c1eae10f2a5da912b17d2e5c +checksum=6200618137f9a1411007a78f9b50eaf78048ce9819428d997a44816d6093d585 From 5f97843d728871492e49f3ef0e70e5e811f643ab Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 16:56:18 +0100 Subject: [PATCH 0407/2369] xdg-desktop-portal-kde: update to 5.24.3. --- srcpkgs/xdg-desktop-portal-kde/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template index 10169eb0f39..23aaba046f6 100644 --- a/srcpkgs/xdg-desktop-portal-kde/template +++ b/srcpkgs/xdg-desktop-portal-kde/template @@ -1,6 +1,6 @@ # Template file for 'xdg-desktop-portal-kde' pkgname=xdg-desktop-portal-kde -version=5.24.2 +version=5.24.3 revision=1 build_style=cmake configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3 +checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b From 7169ba74ef5bccddb98ee3bb74a161be9c3bd5fd Mon Sep 17 00:00:00 2001 From: John Date: Mon, 28 Mar 2022 22:36:54 +0200 Subject: [PATCH 0408/2369] kcompletion: add cross patch --- srcpkgs/kcompletion/patches/cross.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/kcompletion/patches/cross.patch diff --git a/srcpkgs/kcompletion/patches/cross.patch b/srcpkgs/kcompletion/patches/cross.patch new file mode 100644 index 00000000000..fdfcab160c0 --- /dev/null +++ b/srcpkgs/kcompletion/patches/cross.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2022-03-05 13:56:56.000000000 +0100 ++++ - 2022-03-28 22:30:11.749301510 +0200 +@@ -45,7 +45,7 @@ + option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) + add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") + +-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF) ++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON) + add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer") + + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) From 716ce8561a0fc775c2354d0feb86522b879ae01e Mon Sep 17 00:00:00 2001 From: John Date: Mon, 28 Mar 2022 22:37:21 +0200 Subject: [PATCH 0409/2369] kconfigwidgets: add cross patch --- srcpkgs/kconfigwidgets/patches/cross.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/kconfigwidgets/patches/cross.patch diff --git a/srcpkgs/kconfigwidgets/patches/cross.patch b/srcpkgs/kconfigwidgets/patches/cross.patch new file mode 100644 index 00000000000..cf9d7d54a87 --- /dev/null +++ b/srcpkgs/kconfigwidgets/patches/cross.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2022-03-05 13:57:20.000000000 +0100 ++++ - 2022-03-28 22:35:00.337296905 +0200 +@@ -41,7 +41,7 @@ + option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) + add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") + +-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF) ++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON) + add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer") + + if (NOT ANDROID AND NOT WIN32) From 3bb9c08ee3817f5131b9aef38f6950895e582fea Mon Sep 17 00:00:00 2001 From: John Date: Mon, 28 Mar 2022 22:37:38 +0200 Subject: [PATCH 0410/2369] kiconthemes: add cross patch --- srcpkgs/kiconthemes/patches/cross.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/kiconthemes/patches/cross.patch diff --git a/srcpkgs/kiconthemes/patches/cross.patch b/srcpkgs/kiconthemes/patches/cross.patch new file mode 100644 index 00000000000..48eb81784cd --- /dev/null +++ b/srcpkgs/kiconthemes/patches/cross.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2022-03-05 14:01:35.000000000 +0100 ++++ - 2022-03-28 22:31:40.368478068 +0200 +@@ -30,7 +30,7 @@ + option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) + add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") + +-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF) ++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON) + add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer") + + ecm_setup_version(PROJECT From 8d0e6bf17a30d93fe8e5df9b70b89a12752ca33e Mon Sep 17 00:00:00 2001 From: John Date: Mon, 28 Mar 2022 22:38:04 +0200 Subject: [PATCH 0411/2369] kitemviews: add cross patch --- srcpkgs/kitemviews/patches/cross.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/kitemviews/patches/cross.patch diff --git a/srcpkgs/kitemviews/patches/cross.patch b/srcpkgs/kitemviews/patches/cross.patch new file mode 100644 index 00000000000..4abaf14f351 --- /dev/null +++ b/srcpkgs/kitemviews/patches/cross.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2022-03-05 12:17:35.000000000 +0100 ++++ - 2022-03-28 22:29:14.364077451 +0200 +@@ -30,7 +30,7 @@ + option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) + add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") + +-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF) ++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON) + add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer") + + ecm_setup_version(PROJECT VARIABLE_PREFIX KPLOTTING From 4c2814d28ac78810868bd70c701c90a86eb93b7c Mon Sep 17 00:00:00 2001 From: John Date: Mon, 28 Mar 2022 22:38:17 +0200 Subject: [PATCH 0412/2369] kplotting: add cross patch --- srcpkgs/kplotting/patches/cross.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/kplotting/patches/cross.patch diff --git a/srcpkgs/kplotting/patches/cross.patch b/srcpkgs/kplotting/patches/cross.patch new file mode 100644 index 00000000000..61e1c12c761 --- /dev/null +++ b/srcpkgs/kplotting/patches/cross.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2022-03-05 12:17:35.000000000 +0100 ++++ - 2022-03-28 22:33:55.042066950 +0200 +@@ -30,7 +30,7 @@ + option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) + add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") + +-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF) ++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON) + add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer") + + ecm_setup_version(PROJECT VARIABLE_PREFIX KPLOTTING From a743b68955d080ecb0741dca9c8234351fafcd99 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 28 Mar 2022 15:52:15 -0500 Subject: [PATCH 0413/2369] New package: jc-1.18.6 Clsoes #35804. --- srcpkgs/jc/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/jc/template diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template new file mode 100644 index 00000000000..8f510a980bc --- /dev/null +++ b/srcpkgs/jc/template @@ -0,0 +1,14 @@ +# Template file for 'jc' +pkgname=jc +version=1.18.6 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-Pygments" +checkdepends="python3-pytest $depends" +short_desc="Convert to JSON" +maintainer="Andrew Benson " +license="MIT" +homepage="https://github.com/kellyjonbrazil/jc" +distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" +checksum=5347188ed55762a0325d5d8f6a1ff3ec221b4ad548dee085fadc5fe10366af93 From d34c14115c19e5a2ecae0f279aeed2f3c625c958 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 27 Mar 2022 21:19:56 +0200 Subject: [PATCH 0414/2369] zlib: backport upstream fix for CVE-2018-25032. --- srcpkgs/zlib/patches/CVE-2018-25032.patch | 343 ++++++++++++++++++++++ srcpkgs/zlib/template | 2 +- 2 files changed, 344 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/zlib/patches/CVE-2018-25032.patch diff --git a/srcpkgs/zlib/patches/CVE-2018-25032.patch b/srcpkgs/zlib/patches/CVE-2018-25032.patch new file mode 100644 index 00000000000..9f37ba5c583 --- /dev/null +++ b/srcpkgs/zlib/patches/CVE-2018-25032.patch @@ -0,0 +1,343 @@ +From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Tue, 17 Apr 2018 22:09:22 -0700 +Subject: [PATCH] Fix a bug that can crash deflate on some input when using + Z_FIXED. + +This bug was reported by Danilo Ramos of Eideticom, Inc. It has +lain in wait 13 years before being found! The bug was introduced +in zlib 1.2.2.2, with the addition of the Z_FIXED option. That +option forces the use of fixed Huffman codes. For rare inputs with +a large number of distant matches, the pending buffer into which +the compressed data is written can overwrite the distance symbol +table which it overlays. That results in corrupted output due to +invalid distances, and can result in out-of-bound accesses, +crashing the application. + +The fix here combines the distance buffer and literal/length +buffers into a single symbol buffer. Now three bytes of pending +buffer space are opened up for each literal or length/distance +pair consumed, instead of the previous two bytes. This assures +that the pending buffer cannot overwrite the symbol table, since +the maximum fixed code compressed length/distance is 31 bits, and +since there are four bytes of pending space for every three bytes +of symbol space. +--- + deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++--------------- + deflate.h | 25 +++++++++---------- + trees.c | 50 +++++++++++-------------------------- + 3 files changed, 79 insertions(+), 70 deletions(-) + +diff --git a/deflate.c b/deflate.c +index 425babc00..19cba873a 100644 +--- a/deflate.c ++++ b/deflate.c +@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + int wrap = 1; + static const char my_version[] = ZLIB_VERSION; + +- ushf *overlay; +- /* We overlay pending_buf and d_buf+l_buf. This works since the average +- * output size for (length,distance) codes is <= 24 bits. +- */ +- + if (version == Z_NULL || version[0] != my_version[0] || + stream_size != sizeof(z_stream)) { + return Z_VERSION_ERROR; +@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + +- overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); +- s->pending_buf = (uchf *) overlay; +- s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); ++ /* We overlay pending_buf and sym_buf. This works since the average size ++ * for length/distance pairs over any compressed block is assured to be 31 ++ * bits or less. ++ * ++ * Analysis: The longest fixed codes are a length code of 8 bits plus 5 ++ * extra bits, for lengths 131 to 257. The longest fixed distance codes are ++ * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest ++ * possible fixed-codes length/distance pair is then 31 bits total. ++ * ++ * sym_buf starts one-fourth of the way into pending_buf. So there are ++ * three bytes in sym_buf for every four bytes in pending_buf. Each symbol ++ * in sym_buf is three bytes -- two for the distance and one for the ++ * literal/length. As each symbol is consumed, the pointer to the next ++ * sym_buf value to read moves forward three bytes. From that symbol, up to ++ * 31 bits are written to pending_buf. The closest the written pending_buf ++ * bits gets to the next sym_buf symbol to read is just before the last ++ * code is written. At that time, 31*(n-2) bits have been written, just ++ * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at ++ * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1 ++ * symbols are written.) The closest the writing gets to what is unread is ++ * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and ++ * can range from 128 to 32768. ++ * ++ * Therefore, at a minimum, there are 142 bits of space between what is ++ * written and what is read in the overlain buffers, so the symbols cannot ++ * be overwritten by the compressed data. That space is actually 139 bits, ++ * due to the three-bit fixed-code block header. ++ * ++ * That covers the case where either Z_FIXED is specified, forcing fixed ++ * codes, or when the use of fixed codes is chosen, because that choice ++ * results in a smaller compressed block than dynamic codes. That latter ++ * condition then assures that the above analysis also covers all dynamic ++ * blocks. A dynamic-code block will only be chosen to be emitted if it has ++ * fewer bits than a fixed-code block would for the same set of symbols. ++ * Therefore its average symbol length is assured to be less than 31. So ++ * the compressed data for a dynamic block also cannot overwrite the ++ * symbols from which it is being constructed. ++ */ ++ ++ s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4); ++ s->pending_buf_size = (ulg)s->lit_bufsize * 4; + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { +@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + deflateEnd (strm); + return Z_MEM_ERROR; + } +- s->d_buf = overlay + s->lit_bufsize/sizeof(ush); +- s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; ++ s->sym_buf = s->pending_buf + s->lit_bufsize; ++ s->sym_end = (s->lit_bufsize - 1) * 3; ++ /* We avoid equality with lit_bufsize*3 because of wraparound at 64K ++ * on 16 bit machines and because stored blocks are restricted to ++ * 64K-1 bytes. ++ */ + + s->level = level; + s->strategy = strategy; +@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value) + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; +- if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) ++ if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + return Z_BUF_ERROR; + do { + put = Buf_size - s->bi_valid; +@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source) + #else + deflate_state *ds; + deflate_state *ss; +- ushf *overlay; + + + if (deflateStateCheck(source) || dest == Z_NULL) { +@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source) + ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); + ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); + ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); +- overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); +- ds->pending_buf = (uchf *) overlay; ++ ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4); + + if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || + ds->pending_buf == Z_NULL) { +@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source) + zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); + + ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); +- ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); +- ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; ++ ds->sym_buf = ds->pending_buf + ds->lit_bufsize; + + ds->l_desc.dyn_tree = ds->dyn_ltree; + ds->d_desc.dyn_tree = ds->dyn_dtree; +@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +diff --git a/deflate.h b/deflate.h +index 23ecdd312..d4cf1a98b 100644 +--- a/deflate.h ++++ b/deflate.h +@@ -217,7 +217,7 @@ typedef struct internal_state { + /* Depth of each subtree used as tie breaker for trees of equal frequency + */ + +- uchf *l_buf; /* buffer for literals or lengths */ ++ uchf *sym_buf; /* buffer for distances and literals/lengths */ + + uInt lit_bufsize; + /* Size of match buffer for literals/lengths. There are 4 reasons for +@@ -239,13 +239,8 @@ typedef struct internal_state { + * - I can't count above 4 + */ + +- uInt last_lit; /* running index in l_buf */ +- +- ushf *d_buf; +- /* Buffer for distances. To simplify the code, d_buf and l_buf have +- * the same number of elements. To use different lengths, an extra flag +- * array would be necessary. +- */ ++ uInt sym_next; /* running index in sym_buf */ ++ uInt sym_end; /* symbol table full when sym_next reaches this */ + + ulg opt_len; /* bit length of current block with optimal trees */ + ulg static_len; /* bit length of current block with static trees */ +@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, + + # define _tr_tally_lit(s, c, flush) \ + { uch cc = (c); \ +- s->d_buf[s->last_lit] = 0; \ +- s->l_buf[s->last_lit++] = cc; \ ++ s->sym_buf[s->sym_next++] = 0; \ ++ s->sym_buf[s->sym_next++] = 0; \ ++ s->sym_buf[s->sym_next++] = cc; \ + s->dyn_ltree[cc].Freq++; \ +- flush = (s->last_lit == s->lit_bufsize-1); \ ++ flush = (s->sym_next == s->sym_end); \ + } + # define _tr_tally_dist(s, distance, length, flush) \ + { uch len = (uch)(length); \ + ush dist = (ush)(distance); \ +- s->d_buf[s->last_lit] = dist; \ +- s->l_buf[s->last_lit++] = len; \ ++ s->sym_buf[s->sym_next++] = dist; \ ++ s->sym_buf[s->sym_next++] = dist >> 8; \ ++ s->sym_buf[s->sym_next++] = len; \ + dist--; \ + s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ + s->dyn_dtree[d_code(dist)].Freq++; \ +- flush = (s->last_lit == s->lit_bufsize-1); \ ++ flush = (s->sym_next == s->sym_end); \ + } + #else + # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) +diff --git a/trees.c b/trees.c +index 4f4a65011..decaeb7c3 100644 +--- a/trees.c ++++ b/trees.c +@@ -416,7 +416,7 @@ local void init_block(s) + + s->dyn_ltree[END_BLOCK].Freq = 1; + s->opt_len = s->static_len = 0L; +- s->last_lit = s->matches = 0; ++ s->sym_next = s->matches = 0; + } + + #define SMALLEST 1 +@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) + + Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", + opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, +- s->last_lit)); ++ s->sym_next / 3)); + + if (static_lenb <= opt_lenb) opt_lenb = static_lenb; + +@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) + unsigned dist; /* distance of matched string */ + unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ + { +- s->d_buf[s->last_lit] = (ush)dist; +- s->l_buf[s->last_lit++] = (uch)lc; ++ s->sym_buf[s->sym_next++] = dist; ++ s->sym_buf[s->sym_next++] = dist >> 8; ++ s->sym_buf[s->sym_next++] = lc; + if (dist == 0) { + /* lc is the unmatched char */ + s->dyn_ltree[lc].Freq++; +@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) + s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; + s->dyn_dtree[d_code(dist)].Freq++; + } +- +-#ifdef TRUNCATE_BLOCK +- /* Try to guess if it is profitable to stop the current block here */ +- if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { +- /* Compute an upper bound for the compressed length */ +- ulg out_length = (ulg)s->last_lit*8L; +- ulg in_length = (ulg)((long)s->strstart - s->block_start); +- int dcode; +- for (dcode = 0; dcode < D_CODES; dcode++) { +- out_length += (ulg)s->dyn_dtree[dcode].Freq * +- (5L+extra_dbits[dcode]); +- } +- out_length >>= 3; +- Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", +- s->last_lit, in_length, out_length, +- 100L - out_length*100L/in_length)); +- if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; +- } +-#endif +- return (s->last_lit == s->lit_bufsize-1); +- /* We avoid equality with lit_bufsize because of wraparound at 64K +- * on 16 bit machines and because stored blocks are restricted to +- * 64K-1 bytes. +- */ ++ return (s->sym_next == s->sym_end); + } + + /* =========================================================================== +@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree) + { + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ +- unsigned lx = 0; /* running index in l_buf */ ++ unsigned sx = 0; /* running index in sym_buf */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ + +- if (s->last_lit != 0) do { +- dist = s->d_buf[lx]; +- lc = s->l_buf[lx++]; ++ if (s->sym_next != 0) do { ++ dist = s->sym_buf[sx++] & 0xff; ++ dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8; ++ lc = s->sym_buf[sx++]; + if (dist == 0) { + send_code(s, lc, ltree); /* send a literal byte */ + Tracecv(isgraph(lc), (stderr," '%c' ", lc)); +@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree) + } + } /* literal or match pair ? */ + +- /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ +- Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, +- "pendingBuf overflow"); ++ /* Check that the overlay between pending_buf and sym_buf is ok: */ ++ Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow"); + +- } while (lx < s->last_lit); ++ } while (sx < s->sym_next); + + send_code(s, END_BLOCK, ltree); + } diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template index e8c44f9bdb8..0a3cd6a4a30 100644 --- a/srcpkgs/zlib/template +++ b/srcpkgs/zlib/template @@ -1,7 +1,7 @@ # Template file for 'zlib' pkgname=zlib version=1.2.11 -revision=4 +revision=5 bootstrap=yes build_style=configure configure_args="--prefix=/usr --shared" From 920382d2671ac28651706f77c7d71414cb84d9f1 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 28 Mar 2022 16:40:22 -0500 Subject: [PATCH 0415/2369] proxychains-ng: update to 4.16. --- srcpkgs/proxychains-ng/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/proxychains-ng/template b/srcpkgs/proxychains-ng/template index 3cbb9a335e9..2473f4d45e3 100644 --- a/srcpkgs/proxychains-ng/template +++ b/srcpkgs/proxychains-ng/template @@ -1,6 +1,6 @@ # Template file for 'proxychains-ng' pkgname=proxychains-ng -version=4.15 +version=4.16 revision=1 build_style=gnu-configure make_install_target="install install-config" @@ -10,4 +10,4 @@ maintainer="David " license="GPL-2.0-only" homepage="https://github.com/rofl0r/proxychains-ng" distfiles="http://ftp.barfooze.de/pub/sabotage/tarballs/${pkgname}-${version}.tar.xz" -checksum=3207ab7f1f053c3fdcdf5ac158bcdef0683e3b7d8427b602ce9c0abe6a369081 +checksum=37a9983d995857cc398cfeefb96739827b3d86a71e03a5193b99f1b097046812 From 7fd34e1d452048e095a4abf2d0c1f0e96a11b50e Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 28 Mar 2022 16:17:49 +0200 Subject: [PATCH 0416/2369] restic: update to 0.13.0. --- srcpkgs/restic/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template index 90f1e689db1..18e2a8b1f40 100644 --- a/srcpkgs/restic/template +++ b/srcpkgs/restic/template @@ -1,6 +1,6 @@ # Template file for 'restic' pkgname=restic -version=0.12.1 +version=0.13.0 revision=1 build_style=go go_import_path=github.com/restic/restic @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://restic.net/" changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md" distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz" -checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb +checksum=b3c09137b462548f44d764f98909534bef6e85fe029d4daf60545642cdefd3dd post_install() { vlicense LICENSE From db3eff34b9da7f2bfeb88092d15acfd39f5850eb Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 29 Mar 2022 05:50:52 +0200 Subject: [PATCH 0417/2369] bees: fix build --- srcpkgs/bees/patches/fix-build.patch | 12 ++++++++++++ srcpkgs/bees/patches/series | 1 + 2 files changed, 13 insertions(+) create mode 100644 srcpkgs/bees/patches/fix-build.patch diff --git a/srcpkgs/bees/patches/fix-build.patch b/srcpkgs/bees/patches/fix-build.patch new file mode 100644 index 00000000000..3799e27e32a --- /dev/null +++ b/srcpkgs/bees/patches/fix-build.patch @@ -0,0 +1,12 @@ +--- a/src/fiemap.cc ++++ b/src/fiemap.cc +@@ -28,7 +28,8 @@ main(int argc, char **argv) + if (argc > 2) { fm.fm_start = stoull(argv[2], nullptr, 0); } + if (argc > 3) { fm.fm_length = stoull(argv[3], nullptr, 0); } + if (argc > 4) { fm.fm_flags = stoull(argv[4], nullptr, 0); } +- fm.fm_length = min(fm.fm_length, FIEMAP_MAX_OFFSET - fm.fm_start); ++ using FU = decltype(fm.fm_length); ++ fm.fm_length = min(FU(fm.fm_length), FU(FIEMAP_MAX_OFFSET - fm.fm_start)); + uint64_t stop_at = fm.fm_start + fm.fm_length; + uint64_t last_byte = fm.fm_start; + do { diff --git a/srcpkgs/bees/patches/series b/srcpkgs/bees/patches/series index d9a2837128f..068ccfc2db8 100644 --- a/srcpkgs/bees/patches/series +++ b/srcpkgs/bees/patches/series @@ -1,2 +1,3 @@ 0001-don-t-run-tests-unless-asked.patch 0002-move-sbin-into-bin.patch +fix-build.patch From 05c199948de6de8470fc49ad03ed4dea71f9ce27 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 29 Mar 2022 05:52:59 +0200 Subject: [PATCH 0418/2369] bees: also disable on platforms without 64-bit atomics --- srcpkgs/bees/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template index c9184f593e8..6f8783ea65f 100644 --- a/srcpkgs/bees/template +++ b/srcpkgs/bees/template @@ -23,6 +23,10 @@ if [ "$CROSS_BUILD" ]; then make_check="no" fi +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + broken="undefined reference to __atomic_fetch_add_8" +fi + pre_build() { export BEES_VERSION="${version}" } From b0af67247122eb1e234a2311e3fa882c6341c28d Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Mar 2022 08:06:54 +0200 Subject: [PATCH 0419/2369] kpty: fix cross --- srcpkgs/kpty/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template index 28f4d371f53..47612b152d6 100644 --- a/srcpkgs/kpty/template +++ b/srcpkgs/kpty/template @@ -3,6 +3,7 @@ pkgname=kpty version=5.92.0 revision=1 build_style=cmake +configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter" hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel" makedepends="kcoreaddons-devel ki18n-devel libutempter-devel" short_desc="KDE Interfacing with pseudo terminal devices" From 530a954ad82608026ccd7fd990188ba39218e630 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 29 Mar 2022 14:25:13 +0200 Subject: [PATCH 0420/2369] conduit: restrict archs (ring dependency) --- srcpkgs/conduit/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/conduit/template b/srcpkgs/conduit/template index c2e423e7989..cf972b13e25 100644 --- a/srcpkgs/conduit/template +++ b/srcpkgs/conduit/template @@ -2,6 +2,8 @@ pkgname=conduit version=0.3.0 revision=1 +# needs ring/rustls +archs="x86_64* i686* aarch64* armv[67]*" wrksrc="conduit-v${version}" build_style=cargo hostmakedepends="clang" From 4f632892d47839e30114b6bbbd98325f92ec9b50 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 29 Mar 2022 14:27:56 +0200 Subject: [PATCH 0421/2369] retroarch: fix checksum --- srcpkgs/retroarch/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index 6b89a54d89a..bafac5d513a 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -25,7 +25,7 @@ license="GPL-3.0-or-later" homepage="https://www.retroarch.com/" changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md" distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz" -checksum=e426b8d30c25806e54c61f21d0d742695fa4f6bc6a271def4459db5460d28e8e +checksum=c7d371208292aa58b295d639e550efbe412671e09a3d609540796709b17b9b8b build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11" build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11" From cb7389ca83971cb1c1a6c20c46759445ee274a7e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 28 Mar 2022 23:46:33 +0200 Subject: [PATCH 0422/2369] crash: use system readline, zlib. --- srcpkgs/crash/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template index 82d9a3968c1..7f158c9ed63 100644 --- a/srcpkgs/crash/template +++ b/srcpkgs/crash/template @@ -1,11 +1,11 @@ # Template file for 'crash' pkgname=crash version=8.0.0 -revision=1 +revision=2 archs="i686 x86_64" # broken on musl build_style=gnu-makefile hostmakedepends="flex tar wget texinfo" -makedepends="lzo-devel ncurses-devel zlib-devel" +makedepends="lzo-devel ncurses-devel zlib-devel readline-devel" depends="binutils" short_desc="Kernel crash dump debugger and live inspector" maintainer="Leah Neukirchen " @@ -25,7 +25,7 @@ post_extract() { } do_build() { - make ${makejobs} lzo + make ${makejobs} lzo GDB_CONF_FLAGS="--with-system-readline --with-system-zlib" make ${makejobs} extensions } From f5a9d3f31c43d5d11c382f8819090bdf13559cf6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 29 Mar 2022 14:08:01 +0200 Subject: [PATCH 0423/2369] expat: update to 2.4.8. --- srcpkgs/expat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template index ccab77dad17..126ea7b3f47 100644 --- a/srcpkgs/expat/template +++ b/srcpkgs/expat/template @@ -1,6 +1,6 @@ # Template file for 'expat' pkgname=expat -version=2.4.7 +version=2.4.8 revision=1 build_style=gnu-configure short_desc="XML parser library written in C" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://libexpat.github.io/" distfiles="https://github.com/libexpat/libexpat/releases/download/R_${version//./_}/expat-${version}.tar.xz" -checksum=9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d +checksum=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25 post_install() { vlicense COPYING From 57d5ca7c0127b82917d1ae7d88b5c4baf6a748ad Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Thu, 20 Jan 2022 19:52:59 +0200 Subject: [PATCH 0424/2369] New package: acme-client-1.3.0 portable acme-client existed previously with a different upstream, which was unmaintained - switch to one that is maintained. --- srcpkgs/acme-client/files/acme-client.conf | 31 ++++++++++++++++++++++ srcpkgs/acme-client/template | 23 ++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 srcpkgs/acme-client/files/acme-client.conf create mode 100644 srcpkgs/acme-client/template diff --git a/srcpkgs/acme-client/files/acme-client.conf b/srcpkgs/acme-client/files/acme-client.conf new file mode 100644 index 00000000000..31dd96f0088 --- /dev/null +++ b/srcpkgs/acme-client/files/acme-client.conf @@ -0,0 +1,31 @@ +# +# $OpenBSD: acme-client.conf,v 1.4 2020/09/17 09:13:06 florian Exp $ +# +authority letsencrypt { + api url "https://acme-v02.api.letsencrypt.org/directory" + account key "/etc/acme/letsencrypt-privkey.pem" +} + +authority letsencrypt-staging { + api url "https://acme-staging-v02.api.letsencrypt.org/directory" + account key "/etc/acme/letsencrypt-staging-privkey.pem" +} + +authority buypass { + api url "https://api.buypass.com/acme/directory" + account key "/etc/acme/buypass-privkey.pem" + contact "mailto:me@example.com" +} + +authority buypass-test { + api url "https://api.test4.buypass.no/acme/directory" + account key "/etc/acme/buypass-test-privkey.pem" + contact "mailto:me@example.com" +} + +domain example.com { + alternative names { secure.example.com } + domain key "/etc/ssl/private/example.com.key" + domain full chain certificate "/etc/ssl/example.com.fullchain.pem" + sign with letsencrypt +} diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template new file mode 100644 index 00000000000..da8fd65f1f4 --- /dev/null +++ b/srcpkgs/acme-client/template @@ -0,0 +1,23 @@ +# Template file for 'acme-client' +pkgname=acme-client +version=1.3.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config sed" +makedepends="openssl-devel" +checkdepends="nginx curl" +short_desc="Portable version of OpenBSD's acme-client" +maintainer="Lauri Tirkkonen " +license="GPL-2.0-only" +homepage="https://git.sr.ht/~graywolf/acme-client-portable/" +distfiles="https://data.wolfsden.cz/sources/acme-client-${version}.tar.gz" +checksum=ac8796652393fa73f32dfda60ed3a437fc260867df1b81fa3c241bd95c5bc719 +make_check=no # requires https://github.com/letsencrypt/pebble which isn't packaged + +pre_install() { + sed -i 's,/etc/examples/,/usr/share/examples/acme-client/,g' usr.sbin/acme-client/acme-client.conf.5 +} + +post_install() { + vsconf ${FILESDIR}/acme-client.conf +} From 235105026c3f8f8439985216dffea78a27259576 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Wed, 23 Mar 2022 23:59:55 -0400 Subject: [PATCH 0425/2369] cura-fdm-materials: update to 4.13.0. --- srcpkgs/cura-fdm-materials/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template index 2383b2c697a..fb701a7510f 100644 --- a/srcpkgs/cura-fdm-materials/template +++ b/srcpkgs/cura-fdm-materials/template @@ -1,7 +1,7 @@ # Template file for 'cura-fdm-materials' pkgname=cura-fdm-materials reverts="2019.08.21_1" -version=4.12.0 +version=4.13.0 revision=1 wrksrc="fdm_materials-${version}" build_style=cmake @@ -10,7 +10,7 @@ maintainer="Karl Nilsson " license="CC0-1.0" homepage="https://github.com/Ultimaker/fdm_materials" distfiles="https://github.com/Ultimaker/fdm_materials/archive/${version}.tar.gz" -checksum=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41 +checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8 post_install() { vlicense LICENSE From 560817e0e79634ef1356425b374f457bbbd6ea84 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Thu, 24 Mar 2022 00:00:21 -0400 Subject: [PATCH 0426/2369] libArcus: update to 4.13.1. --- srcpkgs/libArcus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template index d560ee19b81..21176dfdbcb 100644 --- a/srcpkgs/libArcus/template +++ b/srcpkgs/libArcus/template @@ -1,7 +1,7 @@ # Template file for 'libArcus' pkgname=libArcus -version=4.12.1 -revision=2 +version=4.13.1 +revision=1 build_style=cmake configure_args="-DBUILD_EXAMPLES=OFF" hostmakedepends="protobuf python3-sip-devel" @@ -12,7 +12,7 @@ maintainer="Karl Nilsson " license="LGPL-3.0-or-later" homepage="https://github.com/Ultimaker/libArcus" distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz" -checksum=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6 +checksum=51e865cb648750ad9ea315fa7632ee7016890273f911270f60d28c8a4bc50240 libArcus-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 628373621cfcbf2a94733964151833c121f151e9 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Tue, 29 Mar 2022 11:23:27 -0400 Subject: [PATCH 0427/2369] Uranium: update to 4.13.1. --- srcpkgs/Uranium/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template index 672b0227662..eb4bcf6670e 100644 --- a/srcpkgs/Uranium/template +++ b/srcpkgs/Uranium/template @@ -1,6 +1,6 @@ # Template file for 'Uranium' pkgname=Uranium -version=4.12.1 +version=4.13.1 revision=1 build_style=cmake pycompile_dirs="usr/lib/uranium/plugins" @@ -15,7 +15,7 @@ maintainer="Karl Nilsson " license="LGPL-3.0-or-later" homepage="https://github.com/Ultimaker/Uranium" distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz" -checksum=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0 +checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41 post_install() { vmkdir usr/share/uranium/cmake From 163c48c7fb2bb4ee5d4c37297fc17317ee0fb601 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Tue, 29 Mar 2022 11:23:57 -0400 Subject: [PATCH 0428/2369] cura-engine: update to 4.13.1. --- srcpkgs/cura-engine/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template index 8c2822f73c0..5cded6271de 100644 --- a/srcpkgs/cura-engine/template +++ b/srcpkgs/cura-engine/template @@ -1,7 +1,7 @@ # Template file for 'cura-engine' pkgname=cura-engine -version=4.12.1 -revision=2 +version=4.13.1 +revision=1 wrksrc="CuraEngine-${version}" build_style=cmake configure_args="-DCURA_ENGINE_VERSION=${version}" @@ -12,7 +12,7 @@ maintainer="Karl Nilsson " license="AGPL-3.0-or-later" homepage="https://github.com/Ultimaker/CuraEngine" distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz" -checksum=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b +checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657 post_install() { vlicense LICENSE From 2313c5681e680b2304f0412c9f260b0a42c75306 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Tue, 11 Jan 2022 12:57:01 -0500 Subject: [PATCH 0429/2369] libSavitar: update to 4.13.1. --- srcpkgs/libSavitar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template index 3870dcc222b..eaffe92be8c 100644 --- a/srcpkgs/libSavitar/template +++ b/srcpkgs/libSavitar/template @@ -1,6 +1,6 @@ # Template file for 'libSavitar' pkgname=libSavitar -version=4.12.1 +version=4.13.1 revision=1 build_style=cmake hostmakedepends="python3" @@ -10,7 +10,7 @@ maintainer="Karl Nilsson " license="LGPL-3.0-or-later" homepage="https://github.com/Ultimaker/libSavitar" distfiles="https://github.com/Ultimaker/libSavitar/archive/${version}.tar.gz" -checksum=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940 +checksum=0bd50f54d557bed70f2c8420405c690b819b287156e81e10b6f51651cebce2e9 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3-sip-devel" From 04c17f113f16f674954ec1caa24c8aea22ea07ba Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Thu, 24 Mar 2022 00:18:57 -0400 Subject: [PATCH 0430/2369] New package: libCharon-4.13.0 --- srcpkgs/libCharon/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/libCharon/template diff --git a/srcpkgs/libCharon/template b/srcpkgs/libCharon/template new file mode 100644 index 00000000000..b33e995d9db --- /dev/null +++ b/srcpkgs/libCharon/template @@ -0,0 +1,14 @@ +# Template file for 'libCharon' +pkgname=libCharon +version=4.13.0 +revision=1 +build_style=cmake +configure_args="INSTALL_SERVICE=OFF" +hostmakedepends="python3" +checkdepends="python3-pytest python3-mypy" +short_desc="File metadata and streaming library" +maintainer="Karl Nilsson " +license="GPL-3.0-or-later" +homepage="https://github.com/Ultimaker/libCharon" +distfiles="https://github.com/Ultimaker/libCharon/archive/${version}.tar.gz" +checksum=efccb04a84b9a80fe4e154aa4b44c56b59061aeba25937be804277a5f21259ec From d52bd1f3cf1864b9d35e69dd0e9ee42795af5cd1 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Tue, 11 Jan 2022 12:57:04 -0500 Subject: [PATCH 0431/2369] cura: update to 4.13.1. --- srcpkgs/cura/patches/fix_multiply_models.patch | 13 ------------- .../cura/patches/fix_support_blocker_crash.patch | 15 --------------- srcpkgs/cura/template | 6 +++--- 3 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch deleted file mode 100644 index 32174f8bc31..00000000000 --- a/srcpkgs/cura/patches/fix_multiply_models.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py -index c29a0648d..dad67ba16 100644 ---- a/cura/Arranging/Nest2DArrange.py -+++ b/cura/Arranging/Nest2DArrange.py -@@ -91,7 +91,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV - - if hull_polygon is not None and hull_polygon.getPoints() is not None and len(hull_polygon.getPoints()) > 2: # numpy array has to be explicitly checked against None - for point in hull_polygon.getPoints(): -- converted_points.append(Point(point[0] * factor, point[1] * factor)) -+ converted_points.append(Point(int(point[0] * factor), int(point[1] * factor))) - item = Item(converted_points) - item.markAsFixedInBin(0) - node_items.append(item) diff --git a/srcpkgs/cura/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch deleted file mode 100644 index 0ac249e2e5c..00000000000 --- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cura/PickingPass.py b/cura/PickingPass.py -index 54e886fe6..4d6ef671d 100644 ---- a/cura/PickingPass.py -+++ b/cura/PickingPass.py -@@ -72,8 +72,8 @@ class PickingPass(RenderPass): - - window_size = self._renderer.getWindowSize() - -- px = (0.5 + x / 2.0) * window_size[0] -- py = (0.5 + y / 2.0) * window_size[1] -+ px = int((0.5 + x / 2.0) * window_size[0]) -+ py = int((0.5 + y / 2.0) * window_size[1]) - - if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1): - return -1 diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template index aa06dcd98b8..8e0cc09ab8d 100644 --- a/srcpkgs/cura/template +++ b/srcpkgs/cura/template @@ -1,6 +1,6 @@ # Template file for 'cura' pkgname=cura -version=4.12.1 +version=4.13.1 revision=1 wrksrc="Cura-${version}" build_style=cmake @@ -11,11 +11,11 @@ hostmakedepends="python3" makedepends="Uranium libArcus-devel python3-devel" depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects - python3-pynest2d python3-keyring" + python3-pynest2d python3-keyring python3-sentry libCharon" checkdepends="python3-pytest python3-mypy $depends" short_desc="3D printer / slicing GUI" maintainer="Karl Nilsson " license="LGPL-3.0-or-later" homepage="https://github.com/Ultimaker/Cura" distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz" -checksum=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72 +checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c From dd89a62b8c8334657da078bd4675e786e0354df7 Mon Sep 17 00:00:00 2001 From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com> Date: Thu, 17 Mar 2022 21:43:41 -0700 Subject: [PATCH 0432/2369] jetbrains-jdk-bin: update to 11.0.14.1b2043.17. --- srcpkgs/jetbrains-jdk-bin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template index b2f4fe780d1..1f428e05bd3 100644 --- a/srcpkgs/jetbrains-jdk-bin/template +++ b/srcpkgs/jetbrains-jdk-bin/template @@ -1,6 +1,6 @@ # Template file for 'jetbrains-jdk-bin' pkgname=jetbrains-jdk-bin -version=11.0.13b1890.3 +version=11.0.14.1b2043.17 revision=1 archs="x86_64" wrksrc="jbr" @@ -11,7 +11,7 @@ homepage="https://github.com/JetBrains/JetBrainsRuntime" _jdk_ver=${version%b*} _jdk_build=${version#*b} distfiles="https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz" -checksum=6dc1208c486ed023ddd9f79f66f099304cd6785895d4e782aaefe0603f47e621 +checksum=2c5b7398acb2b718cbdd8327e4c77e52b131fdf3424fee03d0c51afb3b315c10 # This JDK appears to link to libs that do not exist, but functions well even in their absence. # Best guess is that they are optional. ¯\_(ツ)_/¯ noverifyrdeps=yes From 57b32d671fa1ceaf73e1eed7109b0c6973235d3c Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 13 Mar 2022 13:53:20 +0300 Subject: [PATCH 0433/2369] fish-shell: update to 3.4.1. --- srcpkgs/fish-shell/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template index 657e5604c3d..0fc86db7e7b 100644 --- a/srcpkgs/fish-shell/template +++ b/srcpkgs/fish-shell/template @@ -1,6 +1,6 @@ # Template file for 'fish-shell' pkgname=fish-shell -version=3.3.1 +version=3.4.1 revision=1 wrksrc="fish-${version}" build_style=cmake @@ -14,7 +14,7 @@ license="GPL-2.0-only" homepage="https://fishshell.com/" changelog="https://github.com/fish-shell/fish-shell/raw/master/CHANGELOG.rst" distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz" -checksum=b5b4ee1a5269762cbbe993a4bd6507e675e4100ce9bbe84214a5eeb2b19fae89 +checksum=b6f23b3843b04db6b0a90fea1f6f0d0e40cc027b4a732098200863f2864a94ea register_shell="/bin/fish /usr/bin/fish" # tests don't work as root make_check=ci-skip From 30d48246b0029324679d730efe74aea503f89c80 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 29 Mar 2022 20:05:35 +0200 Subject: [PATCH 0434/2369] linux5.4: update to 5.4.188. --- 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 46c8f5c5c75..ac636bc1d2f 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.187 +version=5.4.188 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=189e3db3f2af8578037f9c8b4710e1002bdd56f318c5f8589b40de889be9a7b8 +checksum=9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc python_version=3 nodebug=yes # -dbg package is generated below manually From 0b0ad90ddc61eab3a8fb54d8fc3984c3531ac20c Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 29 Mar 2022 20:08:57 +0200 Subject: [PATCH 0435/2369] linux4.19: update to 4.19.237. --- 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 f2fb29a3cf0..cb61654da41 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.236 +version=4.19.237 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=002ef6adcafe8d90571f8882280a9bef28d1aa7cc9a3f35a50afc4cb2ebe31c0 +checksum=bafff35102cc486ec2bf94c6d908be8e24017b2e4a1873f52f24c855eb220cd8 python_version=3 nodebug=yes # -dbg package is generated below manually From f841eea1cfc53d84dd21ca08daa056a7b2f6dcc7 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Mon, 28 Mar 2022 20:48:50 -0500 Subject: [PATCH 0436/2369] .github/workflows: Add a workflow for dealing with stale issues/prs --- .github/workflows/stale.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 00000000000..c759ef9459e --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,20 @@ +--- +name: Stale Cleanup + +on: + schedule: + - cron: '30 1 * * *' + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v4 + with: + stale-issue-message: 'Issues become stale 90 days after last activity and are closed 7 days after that. If this issue is still relevant bump it or assign it.' + stale-pr-message: 'Pull Requests become stale 90 days after last activity and are closed 7 days after that. If this pull request is still relevant bump it or assign it.' + days-before-stale: 90 + days-before-close: 7 + debug-only: true + exempt-all-assignees: true + operations-per-run: 1000 From a2c813b11353aad72452d8666c2fb88ee6928161 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Tue, 29 Mar 2022 21:49:29 -0500 Subject: [PATCH 0437/2369] .github/workflows: make stale comments workflow dispatchable --- .github/workflows/stale.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index c759ef9459e..abdc83c9d38 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -2,6 +2,7 @@ name: Stale Cleanup on: + workflow_dispatch: schedule: - cron: '30 1 * * *' From 25ef07c6a726a7329e82b821c0955bb977188ae2 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Tue, 29 Mar 2022 23:43:32 -0500 Subject: [PATCH 0438/2369] runit-void: update to 20220329. --- srcpkgs/runit-void/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template index a0aef0484c0..42eeab9a292 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=3 +version=20220329 +revision=1 wrksrc="void-runit-${version}" build_style=gnu-makefile short_desc="Void Linux runit scripts" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="CC0-1.0" homepage="https://github.com/void-linux/void-runit" distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz" -checksum=9ac95a14b5e1aedfcf0b093b8992b08316448ac1afb7fd26501ac43c4ebf3847 +checksum=43037b1cbf177a3ee6d690cc652eedf819ca37f44636311b55aa716e159a4718 depends="virtual?awk procps-ng runit" conf_files=" From 26390947e13fe93a1a6c9426f8b888eb6764a085 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Tue, 8 Mar 2022 13:36:14 +0100 Subject: [PATCH 0439/2369] New package: yass-0.1.0 --- srcpkgs/yass/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/yass/template diff --git a/srcpkgs/yass/template b/srcpkgs/yass/template new file mode 100644 index 00000000000..7b4577941ec --- /dev/null +++ b/srcpkgs/yass/template @@ -0,0 +1,20 @@ +# Template file for 'yass' +pkgname=yass +version=0.1.0 +revision=1 +build_wrksrc=source +build_style=gnu-makefile +hostmakedepends="pkg-config" +makedepends="clthreads-devel clxclient-devel freetype-devel jack-devel + libX11-devel libXft-devel" +short_desc="Yet Another Scrolling Scope" +maintainer="tibequadorian " +license="GPL-2.0-or-later" +homepage="https://kokkinizita.linuxaudio.org/linuxaudio/" +distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2" +checksum=d247798b708303bc7622c3b6b96fb8190f3b3a07424a3b53c95d21ab8fc6d34a + +pre_build() { + # change pkgconf to pkg-config + vsed -i 's/pkgconf/pkg-config/' Makefile +} From 7185e93d16f33e0489a17c7c894c979aac723774 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 29 Mar 2022 14:27:58 +0200 Subject: [PATCH 0440/2369] zlib: update to 1.2.12. --- srcpkgs/zlib/patches/CVE-2018-25032.patch | 343 ---------------------- srcpkgs/zlib/patches/cc.patch | 24 ++ srcpkgs/zlib/template | 6 +- 3 files changed, 27 insertions(+), 346 deletions(-) delete mode 100644 srcpkgs/zlib/patches/CVE-2018-25032.patch create mode 100644 srcpkgs/zlib/patches/cc.patch diff --git a/srcpkgs/zlib/patches/CVE-2018-25032.patch b/srcpkgs/zlib/patches/CVE-2018-25032.patch deleted file mode 100644 index 9f37ba5c583..00000000000 --- a/srcpkgs/zlib/patches/CVE-2018-25032.patch +++ /dev/null @@ -1,343 +0,0 @@ -From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001 -From: Mark Adler -Date: Tue, 17 Apr 2018 22:09:22 -0700 -Subject: [PATCH] Fix a bug that can crash deflate on some input when using - Z_FIXED. - -This bug was reported by Danilo Ramos of Eideticom, Inc. It has -lain in wait 13 years before being found! The bug was introduced -in zlib 1.2.2.2, with the addition of the Z_FIXED option. That -option forces the use of fixed Huffman codes. For rare inputs with -a large number of distant matches, the pending buffer into which -the compressed data is written can overwrite the distance symbol -table which it overlays. That results in corrupted output due to -invalid distances, and can result in out-of-bound accesses, -crashing the application. - -The fix here combines the distance buffer and literal/length -buffers into a single symbol buffer. Now three bytes of pending -buffer space are opened up for each literal or length/distance -pair consumed, instead of the previous two bytes. This assures -that the pending buffer cannot overwrite the symbol table, since -the maximum fixed code compressed length/distance is 31 bits, and -since there are four bytes of pending space for every three bytes -of symbol space. ---- - deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++--------------- - deflate.h | 25 +++++++++---------- - trees.c | 50 +++++++++++-------------------------- - 3 files changed, 79 insertions(+), 70 deletions(-) - -diff --git a/deflate.c b/deflate.c -index 425babc00..19cba873a 100644 ---- a/deflate.c -+++ b/deflate.c -@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - int wrap = 1; - static const char my_version[] = ZLIB_VERSION; - -- ushf *overlay; -- /* We overlay pending_buf and d_buf+l_buf. This works since the average -- * output size for (length,distance) codes is <= 24 bits. -- */ -- - if (version == Z_NULL || version[0] != my_version[0] || - stream_size != sizeof(z_stream)) { - return Z_VERSION_ERROR; -@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - - s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ - -- overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); -- s->pending_buf = (uchf *) overlay; -- s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); -+ /* We overlay pending_buf and sym_buf. This works since the average size -+ * for length/distance pairs over any compressed block is assured to be 31 -+ * bits or less. -+ * -+ * Analysis: The longest fixed codes are a length code of 8 bits plus 5 -+ * extra bits, for lengths 131 to 257. The longest fixed distance codes are -+ * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest -+ * possible fixed-codes length/distance pair is then 31 bits total. -+ * -+ * sym_buf starts one-fourth of the way into pending_buf. So there are -+ * three bytes in sym_buf for every four bytes in pending_buf. Each symbol -+ * in sym_buf is three bytes -- two for the distance and one for the -+ * literal/length. As each symbol is consumed, the pointer to the next -+ * sym_buf value to read moves forward three bytes. From that symbol, up to -+ * 31 bits are written to pending_buf. The closest the written pending_buf -+ * bits gets to the next sym_buf symbol to read is just before the last -+ * code is written. At that time, 31*(n-2) bits have been written, just -+ * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at -+ * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1 -+ * symbols are written.) The closest the writing gets to what is unread is -+ * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and -+ * can range from 128 to 32768. -+ * -+ * Therefore, at a minimum, there are 142 bits of space between what is -+ * written and what is read in the overlain buffers, so the symbols cannot -+ * be overwritten by the compressed data. That space is actually 139 bits, -+ * due to the three-bit fixed-code block header. -+ * -+ * That covers the case where either Z_FIXED is specified, forcing fixed -+ * codes, or when the use of fixed codes is chosen, because that choice -+ * results in a smaller compressed block than dynamic codes. That latter -+ * condition then assures that the above analysis also covers all dynamic -+ * blocks. A dynamic-code block will only be chosen to be emitted if it has -+ * fewer bits than a fixed-code block would for the same set of symbols. -+ * Therefore its average symbol length is assured to be less than 31. So -+ * the compressed data for a dynamic block also cannot overwrite the -+ * symbols from which it is being constructed. -+ */ -+ -+ s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4); -+ s->pending_buf_size = (ulg)s->lit_bufsize * 4; - - if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || - s->pending_buf == Z_NULL) { -@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - deflateEnd (strm); - return Z_MEM_ERROR; - } -- s->d_buf = overlay + s->lit_bufsize/sizeof(ush); -- s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; -+ s->sym_buf = s->pending_buf + s->lit_bufsize; -+ s->sym_end = (s->lit_bufsize - 1) * 3; -+ /* We avoid equality with lit_bufsize*3 because of wraparound at 64K -+ * on 16 bit machines and because stored blocks are restricted to -+ * 64K-1 bytes. -+ */ - - s->level = level; - s->strategy = strategy; -@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value) - - if (deflateStateCheck(strm)) return Z_STREAM_ERROR; - s = strm->state; -- if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) -+ if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) - return Z_BUF_ERROR; - do { - put = Buf_size - s->bi_valid; -@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source) - #else - deflate_state *ds; - deflate_state *ss; -- ushf *overlay; - - - if (deflateStateCheck(source) || dest == Z_NULL) { -@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source) - ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); - ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); - ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); -- overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); -- ds->pending_buf = (uchf *) overlay; -+ ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4); - - if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || - ds->pending_buf == Z_NULL) { -@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source) - zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); - - ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); -- ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); -- ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; -+ ds->sym_buf = ds->pending_buf + ds->lit_bufsize; - - ds->l_desc.dyn_tree = ds->dyn_ltree; - ds->d_desc.dyn_tree = ds->dyn_dtree; -@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush) - FLUSH_BLOCK(s, 1); - return finish_done; - } -- if (s->last_lit) -+ if (s->sym_next) - FLUSH_BLOCK(s, 0); - return block_done; - } -@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush) - FLUSH_BLOCK(s, 1); - return finish_done; - } -- if (s->last_lit) -+ if (s->sym_next) - FLUSH_BLOCK(s, 0); - return block_done; - } -@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush) - FLUSH_BLOCK(s, 1); - return finish_done; - } -- if (s->last_lit) -+ if (s->sym_next) - FLUSH_BLOCK(s, 0); - return block_done; - } -@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush) - FLUSH_BLOCK(s, 1); - return finish_done; - } -- if (s->last_lit) -+ if (s->sym_next) - FLUSH_BLOCK(s, 0); - return block_done; - } -diff --git a/deflate.h b/deflate.h -index 23ecdd312..d4cf1a98b 100644 ---- a/deflate.h -+++ b/deflate.h -@@ -217,7 +217,7 @@ typedef struct internal_state { - /* Depth of each subtree used as tie breaker for trees of equal frequency - */ - -- uchf *l_buf; /* buffer for literals or lengths */ -+ uchf *sym_buf; /* buffer for distances and literals/lengths */ - - uInt lit_bufsize; - /* Size of match buffer for literals/lengths. There are 4 reasons for -@@ -239,13 +239,8 @@ typedef struct internal_state { - * - I can't count above 4 - */ - -- uInt last_lit; /* running index in l_buf */ -- -- ushf *d_buf; -- /* Buffer for distances. To simplify the code, d_buf and l_buf have -- * the same number of elements. To use different lengths, an extra flag -- * array would be necessary. -- */ -+ uInt sym_next; /* running index in sym_buf */ -+ uInt sym_end; /* symbol table full when sym_next reaches this */ - - ulg opt_len; /* bit length of current block with optimal trees */ - ulg static_len; /* bit length of current block with static trees */ -@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, - - # define _tr_tally_lit(s, c, flush) \ - { uch cc = (c); \ -- s->d_buf[s->last_lit] = 0; \ -- s->l_buf[s->last_lit++] = cc; \ -+ s->sym_buf[s->sym_next++] = 0; \ -+ s->sym_buf[s->sym_next++] = 0; \ -+ s->sym_buf[s->sym_next++] = cc; \ - s->dyn_ltree[cc].Freq++; \ -- flush = (s->last_lit == s->lit_bufsize-1); \ -+ flush = (s->sym_next == s->sym_end); \ - } - # define _tr_tally_dist(s, distance, length, flush) \ - { uch len = (uch)(length); \ - ush dist = (ush)(distance); \ -- s->d_buf[s->last_lit] = dist; \ -- s->l_buf[s->last_lit++] = len; \ -+ s->sym_buf[s->sym_next++] = dist; \ -+ s->sym_buf[s->sym_next++] = dist >> 8; \ -+ s->sym_buf[s->sym_next++] = len; \ - dist--; \ - s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ - s->dyn_dtree[d_code(dist)].Freq++; \ -- flush = (s->last_lit == s->lit_bufsize-1); \ -+ flush = (s->sym_next == s->sym_end); \ - } - #else - # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) -diff --git a/trees.c b/trees.c -index 4f4a65011..decaeb7c3 100644 ---- a/trees.c -+++ b/trees.c -@@ -416,7 +416,7 @@ local void init_block(s) - - s->dyn_ltree[END_BLOCK].Freq = 1; - s->opt_len = s->static_len = 0L; -- s->last_lit = s->matches = 0; -+ s->sym_next = s->matches = 0; - } - - #define SMALLEST 1 -@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) - - Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", - opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, -- s->last_lit)); -+ s->sym_next / 3)); - - if (static_lenb <= opt_lenb) opt_lenb = static_lenb; - -@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) - unsigned dist; /* distance of matched string */ - unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ - { -- s->d_buf[s->last_lit] = (ush)dist; -- s->l_buf[s->last_lit++] = (uch)lc; -+ s->sym_buf[s->sym_next++] = dist; -+ s->sym_buf[s->sym_next++] = dist >> 8; -+ s->sym_buf[s->sym_next++] = lc; - if (dist == 0) { - /* lc is the unmatched char */ - s->dyn_ltree[lc].Freq++; -@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) - s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; - s->dyn_dtree[d_code(dist)].Freq++; - } -- --#ifdef TRUNCATE_BLOCK -- /* Try to guess if it is profitable to stop the current block here */ -- if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { -- /* Compute an upper bound for the compressed length */ -- ulg out_length = (ulg)s->last_lit*8L; -- ulg in_length = (ulg)((long)s->strstart - s->block_start); -- int dcode; -- for (dcode = 0; dcode < D_CODES; dcode++) { -- out_length += (ulg)s->dyn_dtree[dcode].Freq * -- (5L+extra_dbits[dcode]); -- } -- out_length >>= 3; -- Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", -- s->last_lit, in_length, out_length, -- 100L - out_length*100L/in_length)); -- if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; -- } --#endif -- return (s->last_lit == s->lit_bufsize-1); -- /* We avoid equality with lit_bufsize because of wraparound at 64K -- * on 16 bit machines and because stored blocks are restricted to -- * 64K-1 bytes. -- */ -+ return (s->sym_next == s->sym_end); - } - - /* =========================================================================== -@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree) - { - unsigned dist; /* distance of matched string */ - int lc; /* match length or unmatched char (if dist == 0) */ -- unsigned lx = 0; /* running index in l_buf */ -+ unsigned sx = 0; /* running index in sym_buf */ - unsigned code; /* the code to send */ - int extra; /* number of extra bits to send */ - -- if (s->last_lit != 0) do { -- dist = s->d_buf[lx]; -- lc = s->l_buf[lx++]; -+ if (s->sym_next != 0) do { -+ dist = s->sym_buf[sx++] & 0xff; -+ dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8; -+ lc = s->sym_buf[sx++]; - if (dist == 0) { - send_code(s, lc, ltree); /* send a literal byte */ - Tracecv(isgraph(lc), (stderr," '%c' ", lc)); -@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree) - } - } /* literal or match pair ? */ - -- /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ -- Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, -- "pendingBuf overflow"); -+ /* Check that the overlay between pending_buf and sym_buf is ok: */ -+ Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow"); - -- } while (lx < s->last_lit); -+ } while (sx < s->sym_next); - - send_code(s, END_BLOCK, ltree); - } diff --git a/srcpkgs/zlib/patches/cc.patch b/srcpkgs/zlib/patches/cc.patch new file mode 100644 index 00000000000..0136071eabe --- /dev/null +++ b/srcpkgs/zlib/patches/cc.patch @@ -0,0 +1,24 @@ +From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Mon, 28 Mar 2022 18:34:10 -0700 +Subject: [PATCH] Fix configure issue that discarded provided CC definition. + +--- + configure | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure b/configure +index 52ff4a04e..3fa3e8618 100755 +--- a/configure ++++ b/configure +@@ -174,7 +174,10 @@ if test -z "$CC"; then + else + cc=${CROSS_PREFIX}cc + fi ++else ++ cc=${CC} + fi ++ + cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template index 0a3cd6a4a30..6dbe3003220 100644 --- a/srcpkgs/zlib/template +++ b/srcpkgs/zlib/template @@ -1,7 +1,7 @@ # Template file for 'zlib' pkgname=zlib -version=1.2.11 -revision=5 +version=1.2.12 +revision=1 bootstrap=yes build_style=configure configure_args="--prefix=/usr --shared" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="Zlib" homepage="http://www.zlib.net" distfiles="$homepage/$pkgname-$version.tar.gz" -checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 +checksum=91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9 zlib-devel_package() { depends="zlib>=${version}_${revision}" From 2f91c0010b9b044967ea118d00bc9c1f056e4d0c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 30 Mar 2022 14:18:27 +0200 Subject: [PATCH 0441/2369] sbcl: update to 2.2.3. --- srcpkgs/sbcl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index 7bcf793ec93..edd3cb36bf3 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,6 +1,6 @@ # Template file for 'sbcl' pkgname=sbcl -version=2.2.2 +version=2.2.3 revision=1 archs="i686 x86_64* armv7l aarch64 ppc64le*" hostmakedepends="iana-etc texinfo" @@ -12,7 +12,7 @@ license="custom:BSD+public_domain" homepage="http://www.sbcl.org/" changelog="http://www.sbcl.org/news.html" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2" -checksum=8790dbbe97711dce14bb823125ce5b185b0073cf2f3cbf37bdd1ad380e7950f6 +checksum=de7f49e1f7750fd2cd89111ef70641cc5471355f621b737392ac68aa95f37f9f nocross=yes nopie=yes @@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d case "$XBPS_TARGET_MACHINE" in x86_64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2" - checksum+=" 77b7cfd4be60b6efa9b4166100f5e451d764e3751c1f1365ee83b3a9f220d5c8" + checksum+=" 8745f9358b686819209e188a93fb8cf5b4227a3f623af20504a68d129a314256" ;; i686) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2" From c34b6b390d9c95756de8777a74a9967eaaa9cafd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 30 Mar 2022 14:30:49 +0200 Subject: [PATCH 0442/2369] python3-pipenv: update to 2022.3.28. --- srcpkgs/python3-pipenv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template index 4d0f0ec7e28..707476ccc36 100644 --- a/srcpkgs/python3-pipenv/template +++ b/srcpkgs/python3-pipenv/template @@ -1,6 +1,6 @@ # Template file for 'python3-pipenv' pkgname=python3-pipenv -version=2022.3.24 +version=2022.3.28 revision=1 wrksrc="pipenv-${version}" build_style=python3-module @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/pypa/pipenv" changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst" distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz" -checksum=800198d430e724f899e6db319cc640d5fd6da2acdbc301ceb1a1f967e990428b +checksum=4e7aae62dad7679ce81b54cc3451be19fb2c469e269335b36b14132fe5ceecb3 conflicts="python-pipenv>=0" post_extract() { From b07b9db9815b1b3decab36526d8f509e3b23ea93 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 30 Mar 2022 11:07:26 -0400 Subject: [PATCH 0443/2369] unison: update to 2.52.0. --- srcpkgs/unison/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template index 67c424a3b8a..783573c120e 100644 --- a/srcpkgs/unison/template +++ b/srcpkgs/unison/template @@ -1,14 +1,14 @@ # Template file for 'unison' pkgname=unison -version=2.51.4 -revision=2 +version=2.52.0 +revision=1 hostmakedepends="ocaml" short_desc="File-synchronization tool" maintainer="allan " license="GPL-3.0-or-later" homepage="https://www.cis.upenn.edu/~bcpierce/unison/" distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz" -checksum=d1ecc7581aaf2ed0f3403d4960f468acd7b9f1d92838a17c96e6d1df79b802d5 +checksum=a11389971212915328fe69101c92737b17664595c4318ebcb8da367e5ba63540 nocross="OCaml does not cross compile" do_build() { From 307d601300b1723858caefb7308d09752447290f Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sun, 27 Mar 2022 14:55:32 +0200 Subject: [PATCH 0444/2369] praat: update to 6.2.10 --- srcpkgs/praat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template index ac2777a445c..142f0d2661a 100644 --- a/srcpkgs/praat/template +++ b/srcpkgs/praat/template @@ -1,6 +1,6 @@ # Template file for 'praat' pkgname=praat -version=6.2.09 +version=6.2.10 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=3c38b8af267b152a3fda1af78fe8cc26a1717f70a886387e657c55746f666af1 +checksum=f6358b2c6a967afe89882720d503c74221b364c563e1e4316a2d73c9f0c22bcd # 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 From 5dffb97cf3369193f123aabb050f66b98be4544b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 30 Mar 2022 18:18:45 +0200 Subject: [PATCH 0445/2369] sbcl: use clisp on i686. --- srcpkgs/sbcl/template | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index edd3cb36bf3..b78c2520298 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -22,10 +22,6 @@ x86_64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2" checksum+=" 8745f9358b686819209e188a93fb8cf5b4227a3f623af20504a68d129a314256" ;; -i686) - distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2" - checksum+=" 6bed7e31bb28e841da7bfc48c75adb8bef19e5e07d1d6f0fc7487f022c32f92c" - ;; arm*) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2" checksum+=" a5fbf1d596a909a7719bc4a958f00e8537bf399fa051f83736baee950b21e56a" @@ -34,7 +30,7 @@ aarch64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.3.9-arm64-linux-binary.tar.bz2" checksum+=" 14c8fc0f3a03416b5d23763156e2bb28b690fb665af1e6f6112201fd0ddcd512" ;; -ppc*|*-musl) +i686*|ppc*|*-musl) # ecl bootstrap is broken since 2.2.0: # https://build.voidlinux.org/builders/x86_64-musl_builder/builds/39694/steps/shell_3/logs/stdio makedepends+=" clisp" From d94ca8a89ddac26dc49303c8d4f20ed47791744b Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Wed, 30 Mar 2022 13:01:35 -0500 Subject: [PATCH 0446/2369] consul-template: update to 0.28.0. --- srcpkgs/consul-template/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template index 00cd77f3416..4faeaf1c9ae 100644 --- a/srcpkgs/consul-template/template +++ b/srcpkgs/consul-template/template @@ -1,6 +1,6 @@ # Template file for 'consul-template' pkgname=consul-template -version=0.25.1 +version=0.28.0 revision=1 build_style=go go_import_path="github.com/hashicorp/consul-template" @@ -10,4 +10,4 @@ maintainer="Noel Cower " license="MPL-2.0" homepage="https://github.com/hashicorp/consul-template" distfiles="$homepage/archive/v$version.tar.gz" -checksum=f8d214733961ef3333493ce912180c5c0311c87e4b1a116308f31283b6c77419 +checksum=61ce1b818ae9f555440a5a3a7a81590051c4871acfccd73001b4b087c66357e9 From 6a3cb597bafcfd4685f9960fefd47e75162307d8 Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Tue, 29 Mar 2022 04:23:34 -0300 Subject: [PATCH 0447/2369] oil: update to 0.9.9 --- srcpkgs/oil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template index cf1cbccfefe..7def1be3658 100644 --- a/srcpkgs/oil/template +++ b/srcpkgs/oil/template @@ -1,6 +1,6 @@ # Template file for 'oil' pkgname=oil -version=0.9.8 +version=0.9.9 revision=1 build_style=configure configure_args="--prefix=/usr $(vopt_with readline)" @@ -11,7 +11,7 @@ maintainer="MarcoAPC " license="Apache-2.0" homepage="https://www.oilshell.org" distfiles="${homepage}/download/${pkgname}-${version}.tar.xz" -checksum=3acaf17c9e5d17d027a60d6be878fe683d7de25f7d5fd621e2f219f91f9a1fc1 +checksum=6f6b4c4b9cf8a1e8e1dc2ff7bf39c85a11b871ddda9e9e51b9f7e1a0e46b2824 register_shell="/usr/bin/osh" nocross="Build systems gets confused with host and cross toolchains/headers" nostrip=yes From 2f39e40ede53c5b1a8cb2a0f4226585f01cb2cb9 Mon Sep 17 00:00:00 2001 From: Martin Dimov Date: Mon, 28 Mar 2022 00:42:05 +0300 Subject: [PATCH 0448/2369] font-material-design-icons-ttf: merge with ttf-material-icons, rev bump --- srcpkgs/font-material-design-icons-ttf/template | 8 +++++++- srcpkgs/ttf-material-icons | 1 + srcpkgs/ttf-material-icons/template | 16 ---------------- 3 files changed, 8 insertions(+), 17 deletions(-) create mode 120000 srcpkgs/ttf-material-icons delete mode 100644 srcpkgs/ttf-material-icons/template diff --git a/srcpkgs/font-material-design-icons-ttf/template b/srcpkgs/font-material-design-icons-ttf/template index fe3da363cc1..d05b3c8a0a4 100644 --- a/srcpkgs/font-material-design-icons-ttf/template +++ b/srcpkgs/font-material-design-icons-ttf/template @@ -1,7 +1,7 @@ # Template file for 'font-material-design-icons-ttf' pkgname=font-material-design-icons-ttf version=4.0.0 -revision=1 +revision=2 wrksrc="material-design-icons-${version}" depends="font-util xbps-triggers" short_desc="Material Design icons by Google" @@ -16,3 +16,9 @@ font_dirs="/usr/share/fonts/TTF" do_install() { vinstall font/MaterialIcons-Regular.ttf 644 usr/share/fonts/TTF } + +ttf-material-icons_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/ttf-material-icons b/srcpkgs/ttf-material-icons new file mode 120000 index 00000000000..4d1e4bb1d94 --- /dev/null +++ b/srcpkgs/ttf-material-icons @@ -0,0 +1 @@ +font-material-design-icons-ttf \ No newline at end of file diff --git a/srcpkgs/ttf-material-icons/template b/srcpkgs/ttf-material-icons/template deleted file mode 100644 index b429c563c47..00000000000 --- a/srcpkgs/ttf-material-icons/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'ttf-material-icons' -pkgname=ttf-material-icons -version=4.0.0 -revision=1 -wrksrc=material-design-icons-${version} -short_desc="Material Design icons by Google" -maintainer="Michael Carlberg " -license=CC -homepage=http://google.github.io/material-design-icons/ -distfiles=https://github.com/google/material-design-icons/archive/${version}.tar.gz -checksum=b1b068d625d5e15d6ec0059209cec67bc4c46e39c4611b859d6f6680dbf23934 - -do_install() { - vinstall font/MaterialIcons-Regular.ttf 644 usr/share/fonts/TTF - vlicense LICENSE -} From 5d4374c9e76697f214d2f823e37aad4786935070 Mon Sep 17 00:00:00 2001 From: Bas Ploeger <5904333+basploeger@users.noreply.github.com> Date: Thu, 24 Mar 2022 23:09:10 +0100 Subject: [PATCH 0449/2369] html-xml-utils: update to 8.3. --- srcpkgs/html-xml-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/html-xml-utils/template b/srcpkgs/html-xml-utils/template index ff073e7a740..81fda5d90a2 100644 --- a/srcpkgs/html-xml-utils/template +++ b/srcpkgs/html-xml-utils/template @@ -1,6 +1,6 @@ # Template file for 'html-xml-utils' pkgname=html-xml-utils -version=8.0 +version=8.3 revision=1 build_style=gnu-configure makedepends="libidn-devel" @@ -9,4 +9,4 @@ maintainer="Orphaned " license="W3C" homepage="https://www.w3.org/Tools/HTML-XML-utils/README" distfiles="https://www.w3.org/Tools/HTML-XML-utils/${pkgname}-${version}.tar.gz" -checksum=749059906c331c2c7fbaceee02466245a237b91bd408dff8f396d0734a060ae2 +checksum=a50c4d16dad660ad6792ef53bc77efa9d5729797623771a3fce52d8e23d3d08c From 8cc3c27fa041dec49203bfbd0bce589f7c0a59c5 Mon Sep 17 00:00:00 2001 From: Vasteel <48246459+Vast-eel@users.noreply.github.com> Date: Wed, 30 Mar 2022 12:56:17 +0200 Subject: [PATCH 0450/2369] font-sarasa-gothic: update to 0.36.2. --- srcpkgs/font-sarasa-gothic/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template index 534a4bf861f..167c56b75ce 100644 --- a/srcpkgs/font-sarasa-gothic/template +++ b/srcpkgs/font-sarasa-gothic/template @@ -1,6 +1,6 @@ # Template file for 'font-sarasa-gothic' pkgname=font-sarasa-gothic -version=0.34.3 +version=0.36.2 revision=1 create_wrksrc=yes depends="font-util" @@ -9,7 +9,7 @@ maintainer="B. Wilson " license="OFL-1.1" homepage="https://github.com/be5invis/Sarasa-Gothic" distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z" -checksum=6938707af097f5bf899f570c886063860973193db9524468da0c27af4a36ce94 +checksum=cdc65aed713b5a991919755c712e0961e4388a7c3c636eed8e06b93bedf9a6f8 font_dirs="/usr/share/fonts/TTF" From 810bfcc20d96906b3989f902e147d908ea9eb5ae Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 30 Mar 2022 16:39:24 -0500 Subject: [PATCH 0451/2369] fortune-mod: don't install offensive fortunes Closes #36417. --- srcpkgs/fortune-mod/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fortune-mod/template b/srcpkgs/fortune-mod/template index 59f0aa80500..e08c7d162d7 100644 --- a/srcpkgs/fortune-mod/template +++ b/srcpkgs/fortune-mod/template @@ -1,7 +1,7 @@ # Template file for 'fortune-mod' pkgname=fortune-mod version=1.99.1 -revision=6 +revision=7 hostmakedepends="recode" makedepends="recode-devel" short_desc="Implementation of the BSDGames 'fortune' program" @@ -11,6 +11,9 @@ homepage="http://www.redellipse.net/code/fortune" distfiles="${DEBIAN_SITE}/main/f/fortune-mod/${pkgname}_${version}.orig.tar.gz" checksum=fc51aee1f73c936c885f4e0f8b6b48f4f68103e3896eaddc6a45d2b71e14eace +desc_option_offensive="Enable offensive fortunes" +build_options="offensive" + if [ "$CROSS_BUILD" ]; then hostmakedepends+=" fortune-mod" _strfile="STRFILE=/usr/bin/strfile" @@ -30,7 +33,7 @@ do_build() { } do_install() { make prefix=${DESTDIR} FORTDIR=${DESTDIR}/usr/bin \ - COOKIEDIR=$DESTDIR/usr/share/fortunes \ + COOKIEDIR=$DESTDIR/usr/share/fortunes OFFENSIVE=$(vopt_if offensive 1 0) \ install vlicense LICENSE } From ffcb1e6fb8349a0d15466f45487407708e0373f5 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 30 Mar 2022 21:09:04 -0400 Subject: [PATCH 0452/2369] python3-Jinja2: update to 3.1.1. --- srcpkgs/python3-Jinja2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template index caea80866dc..d43e75d50b6 100644 --- a/srcpkgs/python3-Jinja2/template +++ b/srcpkgs/python3-Jinja2/template @@ -1,6 +1,6 @@ # Template file for 'python3-Jinja2' pkgname=python3-Jinja2 -version=3.0.3 +version=3.1.1 revision=1 wrksrc="Jinja2-${version}" build_style=python3-module @@ -13,7 +13,7 @@ license="BSD-3-Clause" homepage="http://jinja.pocoo.org/" changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst" distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz" -checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 +checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9 post_install() { vlicense LICENSE.rst From b10c2fa73559e6e4a9cc17282dfe6c48b6cb4288 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 30 Mar 2022 21:09:19 -0400 Subject: [PATCH 0453/2369] python3-cppy: update to 1.2.1. --- srcpkgs/python3-cppy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-cppy/template b/srcpkgs/python3-cppy/template index 3afd8399c77..d94c660c25c 100644 --- a/srcpkgs/python3-cppy/template +++ b/srcpkgs/python3-cppy/template @@ -1,6 +1,6 @@ # Template file for 'python3-cppy' pkgname=python3-cppy -version=1.2.0 +version=1.2.1 revision=1 wrksrc="cppy-${version}" build_style=python3-module @@ -13,7 +13,7 @@ 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=95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc +checksum=83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b post_install() { vlicense LICENSE From 4090db9ea7af16813ddcf055ec619fe5655cbe95 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 30 Mar 2022 21:11:12 -0400 Subject: [PATCH 0454/2369] python3-ipython: update to 8.2.0. --- srcpkgs/python3-ipython/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template index 07bdc201821..dfaae66b583 100644 --- a/srcpkgs/python3-ipython/template +++ b/srcpkgs/python3-ipython/template @@ -1,6 +1,6 @@ # Template file for 'python3-ipython' pkgname=python3-ipython -version=8.1.1 +version=8.2.0 revision=1 wrksrc="ipython-${version}" build_style=python3-module @@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://ipython.org/" distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz" -checksum=8138762243c9b3a3ffcf70b37151a2a35c23d3a29f9743878c33624f4207be3d +checksum=70e5eb132cac594a34b5f799bd252589009905f05104728aea6a403ec2519dc1 conflicts="python-ipython<=5.8.0_2" do_check() { From c180c2ff8628f57574752b63cf98bc983928c11f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 30 Mar 2022 21:19:08 -0400 Subject: [PATCH 0455/2369] python3-hypothesis: update to 6.40.0. --- srcpkgs/python3-hypothesis/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template index 15b9d0f9b0c..df2addcb45d 100644 --- a/srcpkgs/python3-hypothesis/template +++ b/srcpkgs/python3-hypothesis/template @@ -1,6 +1,6 @@ # Template file for 'python3-hypothesis' pkgname=python3-hypothesis -version=6.39.0 +version=6.40.0 revision=1 wrksrc="hypothesis-hypothesis-python-${version}" build_wrksrc=hypothesis-python @@ -15,7 +15,7 @@ license="MPL-2.0" homepage="https://hypothesis.works/" changelog="https://hypothesis.readthedocs.io/en/latest/changes.html" distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz" -checksum=09f2077d400640a936392edbf068f5dfe182b48f70ab3c8592d8274b4ee13e36 +checksum=e68589666b903461e7437ea49043a7bd09a6e2cfd1cc32970b4ee19ffe2ed434 do_check() { # Manually run the tests that tox considers part of the "full" suite, From b79b3d30270b315301507ff715bb137bdf499d98 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 30 Mar 2022 21:19:42 -0400 Subject: [PATCH 0456/2369] python3-quart: update to 0.17.0. --- srcpkgs/python3-quart/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template index 5e3114877ce..1033468c7c8 100644 --- a/srcpkgs/python3-quart/template +++ b/srcpkgs/python3-quart/template @@ -1,6 +1,6 @@ # Template file for 'python3-quart' pkgname=python3-quart -version=0.16.3 +version=0.17.0 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-pep517 @@ -15,7 +15,7 @@ license="MIT" homepage="https://gitlab.com/pgjones/quart" changelog="https://gitlab.com/pgjones/quart/-/blob/master/CHANGELOG.rst" distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz" -checksum=84eabcb0da8b84eebcec31c27c59396425c6727ea6f7e524e8f1afc1aa161bb8 +checksum=1f879256b09daa4f7e9a141e90746f11103ce1f3a386f9480709e1d982768a9a do_check() { # Tests require dist-info on the package, which is only in the wheel. From 8bec5079187d3cca03202551f0cfdb3b0a7ea7f5 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 30 Mar 2022 21:19:55 -0400 Subject: [PATCH 0457/2369] python3-tifffile: update to 2022.3.25. --- 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 00d4c6c3f39..65b0d119ade 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.3.16 +version=2022.3.25 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=2e51c805be3a77f472c0cca3f0c13e60eb110fbfc305a20e278dad3d4e4fe4bf +checksum=620c68f3eeb2b1923e1b3a8bf8a8b7f79498bcd9cd34051ad567c44f0a404353 # Tests require unpackaged fsspec make_check=no From 70a2e81b464e99a98b81100460889349004ab65e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 30 Mar 2022 21:22:51 -0400 Subject: [PATCH 0458/2369] vkQuake: update to 1.13.0. --- srcpkgs/vkQuake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template index 6ae764cb629..8c0174565c7 100644 --- a/srcpkgs/vkQuake/template +++ b/srcpkgs/vkQuake/template @@ -1,6 +1,6 @@ # Template file for 'vkQuake' pkgname=vkQuake -version=1.12.2 +version=1.13.0 revision=1 build_wrksrc="Quake" build_style=gnu-makefile @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-or-later" homepage="https://github.com/Novum/vkQuake" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=6ce6d44dbc13d8d9b689efa32b19b2765257f3b859becf34cb2e894751ea046e +checksum=baeab4fbea17bb41064b56a7e6e745f2856634c88d57ad86de97990399c24b3b do_install() { vbin vkquake From 9f50345e006a3620a6142ffce4023229f8d42d7c Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Tue, 29 Mar 2022 23:59:51 +0530 Subject: [PATCH 0459/2369] wireplumber: add runit service ahesford: add log sub-service, redirect stderr in run script Co-authored-by: Andrew J. Hesford Closes: #36416 [via git-merge-pr] --- srcpkgs/wireplumber/files/wireplumber/control/t | 2 ++ srcpkgs/wireplumber/files/wireplumber/log/run | 3 +++ srcpkgs/wireplumber/files/wireplumber/run | 10 ++++++++++ srcpkgs/wireplumber/template | 3 ++- 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100755 srcpkgs/wireplumber/files/wireplumber/control/t create mode 100644 srcpkgs/wireplumber/files/wireplumber/log/run create mode 100644 srcpkgs/wireplumber/files/wireplumber/run diff --git a/srcpkgs/wireplumber/files/wireplumber/control/t b/srcpkgs/wireplumber/files/wireplumber/control/t new file mode 100755 index 00000000000..a095b7bc777 --- /dev/null +++ b/srcpkgs/wireplumber/files/wireplumber/control/t @@ -0,0 +1,2 @@ +#!/bin/sh +[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid) diff --git a/srcpkgs/wireplumber/files/wireplumber/log/run b/srcpkgs/wireplumber/files/wireplumber/log/run new file mode 100644 index 00000000000..4dd58318870 --- /dev/null +++ b/srcpkgs/wireplumber/files/wireplumber/log/run @@ -0,0 +1,3 @@ +#!/bin/sh + +exec logger -t wireplumber -p daemon.info diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run new file mode 100644 index 00000000000..ae0cf99e200 --- /dev/null +++ b/srcpkgs/wireplumber/files/wireplumber/run @@ -0,0 +1,10 @@ +#!/bin/sh +# this service is experimental and most setups should start pipewire and wireplumber as a user, +# for further information, please refer to the handbook + +sv check dbus >/dev/null 2>&1 || exit 1 + +exec 2>&1 + +export HOME=/var/run/pipewire +exec chpst -u _pipewire:_pipewire:audio:video -P dbus-run-session wireplumber diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template index e94c35b3eea..dadbf62647f 100644 --- a/srcpkgs/wireplumber/template +++ b/srcpkgs/wireplumber/template @@ -1,7 +1,7 @@ # Template file for 'wireplumber' pkgname=wireplumber version=0.4.8 -revision=1 +revision=2 build_style=meson build_helper=gir configure_args="-Dintrospection=enabled -Dsystem-lua=true" @@ -18,6 +18,7 @@ checksum=a7a84c21230c339a905704a9495dda10a4dec41a96bc115a9b33d24310a3f605 post_install() { vlicense LICENSE + vsv wireplumber } wireplumber-devel_package() { From d6fe012f93a626a6ea4c12b17d54212dc57cba20 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Mon, 28 Mar 2022 19:49:52 +0530 Subject: [PATCH 0460/2369] mongoose: update to 7.6 Closes: #36395 [via git-merge-pr] --- srcpkgs/mongoose/patches/add-makefile.patch | 50 ----------------- srcpkgs/mongoose/patches/fix-makefile.patch | 59 +++++++++++++++++++++ srcpkgs/mongoose/patches/fix-tests.patch | 17 ++++++ srcpkgs/mongoose/template | 40 +++++++++++--- 4 files changed, 108 insertions(+), 58 deletions(-) delete mode 100644 srcpkgs/mongoose/patches/add-makefile.patch create mode 100644 srcpkgs/mongoose/patches/fix-makefile.patch create mode 100644 srcpkgs/mongoose/patches/fix-tests.patch diff --git a/srcpkgs/mongoose/patches/add-makefile.patch b/srcpkgs/mongoose/patches/add-makefile.patch deleted file mode 100644 index fd0b2109547..00000000000 --- a/srcpkgs/mongoose/patches/add-makefile.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- /dev/null -+++ b/Makefile -@@ -0,0 +1,47 @@ -+PROG = mongoose -+LIB = lib$(PROG).so.0 -+ -+ifndef PREFIX -+ PREFIX=/usr/local -+endif -+ -+ifndef DOCDIR -+ DOCDIR=$(PREFIX)/share/$(PROG)/doc -+endif -+ -+CPPFLAGS+=-DMONGOOSE_ENABLE_THREADS -DMG_ENABLE_SSL -+CFLAGS+=-fPIC -c -Wall -+LDFLAGS+=-shared -lssl -pthread -lcrypto -+ -+SRCS=mongoose.c -+OBJS=mongoose.o -+INCLUDE=. -+ -+all: $(LIB) -+ -+$(LIB): $(OBJS) -+ $(CC) $(OBJS) $(LDFLAGS) -o $(LIB) -+ -+$(OBJS): $(SRCS) -+ $(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDE) $(SRCS) -o $(OBJS) -+ -+install: -+ install -d $(DESTDIR)$(PREFIX)/include -+ install -m644 mongoose.h $(DESTDIR)$(PREFIX)/include -+ install -d $(DESTDIR)$(PREFIX)/lib -+ ln -sf $(LIB) $(LIB).0; cp -a $(LIB).0 $(DESTDIR)$(PREFIX)/lib -+ ln -sf $(LIB) libmongoose.so; cp -a libmongoose.so $(DESTDIR)$(PREFIX)/lib -+ install -m755 $(LIB) $(DESTDIR)$(PREFIX)/lib -+ install -dm755 $(DESTDIR)$(DOCDIR) -+ cp -a examples $(DESTDIR)$(DOCDIR) -+ cp -a docs/* $(DESTDIR)$(DOCDIR)/ -+ -+ -+test: -+ $(MAKE) -C test/ -+clean: -+ rm -f $(OBJS) $(LIB) -+ $(MAKE) -C test/ clean -+ -+.PHONY: clean test all -+ diff --git a/srcpkgs/mongoose/patches/fix-makefile.patch b/srcpkgs/mongoose/patches/fix-makefile.patch new file mode 100644 index 00000000000..d829ea8adc8 --- /dev/null +++ b/srcpkgs/mongoose/patches/fix-makefile.patch @@ -0,0 +1,59 @@ +--- a/Makefile ++++ b/Makefile +@@ -5,5 +5,5 @@ SRCS = mongoose.c test/unit_test.c test/packed_fs.c + OPTS ?= -O3 -g3 + INCS ?= -Isrc -I. +-CFLAGS ?= $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) $(EXTRA) ++CFLAGS := $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) $(CFLAGS) + SSL ?= MBEDTLS + CWD ?= $(realpath $(CURDIR)) +@@ -10,6 +10,9 @@ CWD ?= $(realpath $(CURDIR)) + DOCKER ?= docker run --rm -e Tmp=. -e WINEDEBUG=-all -v $(CWD):$(CWD) -w $(CWD) + VCFLAGS = /nologo /W3 /O2 /I. $(DEFS) $(TFLAGS) + IPV6 ?= 1 ++ifneq "$(NO_SANITIZE)" "1" ++SANITIZE = -fsanitize=address,undefined ++endif + ASAN_OPTIONS ?= + EXAMPLES := $(wildcard examples/*) + PREFIX ?= /usr/local +@@ -19,12 +22,12 @@ VERSION ?= $(shell cut -d'"' -f2 src/version.h) + ifeq "$(SSL)" "MBEDTLS" + MBEDTLS ?= /usr + CFLAGS += -DMG_ENABLE_MBEDTLS=1 -I$(MBEDTLS)/include -I/usr/include +-LDFLAGS ?= -L$(MBEDTLS)/lib -lmbedtls -lmbedcrypto -lmbedx509 ++LDFLAGS += -L$(MBEDTLS)/lib -lmbedtls -lmbedcrypto -lmbedx509 + endif + ifeq "$(SSL)" "OPENSSL" + OPENSSL ?= /usr + CFLAGS += -DMG_ENABLE_OPENSSL=1 -I$(OPENSSL)/include +-LDFLAGS ?= -L$(OPENSSL)/lib -lssl -lcrypto ++LDFLAGS += -L$(OPENSSL)/lib -lssl -lcrypto + endif + + all: mg_prefix unamalgamated unpacked test test++ arm examples vc98 vc2017 mingw mingw++ linux linux++ fuzz +@@ -59,7 +62,7 @@ fuzz: fuzzer + $(RUN) ./fuzzer + + # make CC=/usr/local/opt/llvm\@8/bin/clang ASAN_OPTIONS=detect_leaks=1 +-test: CFLAGS += -DMG_ENABLE_IPV6=$(IPV6) -fsanitize=address,undefined ++test: CFLAGS += -DMG_ENABLE_IPV6=$(IPV6) $(SANITIZE) + test: mongoose.h Makefile $(SRCS) + $(CC) $(SRCS) $(CFLAGS) -coverage $(LDFLAGS) -g -o unit_test + ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./unit_test +@@ -108,10 +111,12 @@ linux++: CC = g++ + linux++: WARN += -Wno-missing-field-initializers + linux++: linux + +-linux-libs: CFLAGS += -fPIC +-linux-libs: mongoose.o +- $(CC) mongoose.o $(LDFLAGS) -shared -o libmongoose.so.$(VERSION) ++.PHONY: linux-libs ++linux-libs: libmongoose.a libmongoose.so.$(VERSION) ++libmongoose.a: mongoose.o + $(AR) rcs libmongoose.a mongoose.o ++libmongoose.so.$(VERSION): mongoose.o ++ $(CC) mongoose.o $(LDFLAGS) -shared -o libmongoose.so.$(VERSION) + + install: linux-libs + install -Dm644 libmongoose.a libmongoose.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib diff --git a/srcpkgs/mongoose/patches/fix-tests.patch b/srcpkgs/mongoose/patches/fix-tests.patch new file mode 100644 index 00000000000..8b25527492d --- /dev/null +++ b/srcpkgs/mongoose/patches/fix-tests.patch @@ -0,0 +1,17 @@ +Skip tests that want to connect to the internet + +--- a/test/unit_test.c ++++ b/test/unit_test.c +@@ -1680,11 +1562,9 @@ int main(void) { + test_ws(); + test_ws_fragmentation(); + test_http_server(); +- test_http_client(); + test_http_no_content_length(); + test_http_pipeline(); + test_http_range(); +- test_mqtt(); + printf("SUCCESS. Total tests: %d\n", s_num_tests); + return EXIT_SUCCESS; + } + diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template index eddadc64733..a81658710d7 100644 --- a/srcpkgs/mongoose/template +++ b/srcpkgs/mongoose/template @@ -1,22 +1,44 @@ # Template file for 'mongoose' pkgname=mongoose -version=6.18 -revision=4 +version=7.6 +revision=1 build_style=gnu-makefile -make_use_env=compliant +make_use_env=yes +make_check_target=test +make_build_target=linux-libs makedepends="openssl-devel" -short_desc="Easy to use Web server" -maintainer="Orphaned " +checkdepends="openssl-devel" +short_desc="Embedded HTTP/WebSocket/MQTT library for C/C++" +maintainer="Subhaditya Nath " license="GPL-2.0-only" -homepage="https://cesanta.com/" +homepage="https://mongoose.ws/" distfiles="https://github.com/cesanta/mongoose/archive/${version}.tar.gz" -checksum=f5c10346abc9c72f7cac7885d853ca064fb09aad57580433941a8fd7a3543769 +checksum=1ef09d971b6de1a6317c109980d6fb5a9c19b39efef2506d6b76869644b3dafa + +# -Wno-error=unused-function: patched tests leave some functions unused +# -Wno-error=sign-conversion: GCC falsely flags musl FD_{SET,ISSET,CLR} +CFLAGS="-fPIC -Wno-error=sign-conversion -Wno-error=unused-function" + +export SSL=OPENSSL + +# libsanitizer-devel is currenly not available on musl +if [ "$XBPS_TARGET_LIBC" = musl ]; then + make_check_args+=" NO_SANITIZE=1" +else + checkdepends+=" libsanitizer-devel" +fi + +# GitHub CI runner doesn't support IPv6, causing tests to fail +if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then + make_check_args+=" IPV6=0" +fi mongoose-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include + vmove "usr/lib/*.a" vmove "usr/lib/*.so" } } @@ -24,6 +46,8 @@ mongoose-devel_package() { mongoose-doc_package() { short_desc+=" - documentation" pkg_install() { - vmove usr/share + vmkdir "usr/share/${sourcepkg}/doc" + vcopy examples "usr/share/${sourcepkg}/doc" + vcopy "docs/*" "usr/share/${sourcepkg}/doc" } } From 25a18b7b13ba94f15bed9721b227cc81e201025c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 31 Mar 2022 02:59:29 +0200 Subject: [PATCH 0461/2369] qbittorrent: update to 4.4.2. --- srcpkgs/qbittorrent/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index b7c236909ae..b80695e8095 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,6 +1,6 @@ # Template file for 'qbittorrent' pkgname=qbittorrent -version=4.4.1 +version=4.4.2 revision=1 create_wrksrc=yes build_style=gnu-configure @@ -16,7 +16,7 @@ license="GPL-2.0-or-later" homepage="https://www.qbittorrent.org/" changelog="https://www.qbittorrent.org/news.php" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=1386f000ce1d791469c3ea03e3951ca25f67f534e66896592bd12357dda9a8ec +checksum=efa580924e96605bae916b9a8ae1f3fce82a5130647ae41d74d689761262463d do_extract() { local n=${pkgname}-${version} From 2cb60502ff36cbea47a023ca1673fd0ab27b82bf Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Wed, 23 Mar 2022 13:45:35 +1100 Subject: [PATCH 0462/2369] iwd: update to 1.26. --- srcpkgs/iwd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template index c03b430976e..66f55599c5e 100644 --- a/srcpkgs/iwd/template +++ b/srcpkgs/iwd/template @@ -1,6 +1,6 @@ # Template file for 'iwd' pkgname=iwd -version=1.24 +version=1.26 revision=1 build_style=gnu-configure configure_args="--disable-systemd-service --enable-pie @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://iwd.wiki.kernel.org/" changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog" distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz" -checksum=61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224 +checksum=0ff4541c2b7f14ec010c3cbd1f02350f1b58cb0c103412db22550e90d8040d6b make_dirs="/var/lib/iwd 0600 root root /var/lib/ead 0600 root root /etc/iwd 755 root root" From 9e5b86d801619365c52ffce003ed6711efc5f801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Thu, 31 Mar 2022 09:43:16 -0300 Subject: [PATCH 0463/2369] doxygen: update to 1.9.3. --- ...-Fix-memory-corruption-in-TextStream.patch | 40 ------------------- srcpkgs/doxygen/template | 4 +- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch diff --git a/srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch b/srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch deleted file mode 100644 index 80c7ff16d17..00000000000 --- a/srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch +++ /dev/null @@ -1,40 +0,0 @@ -upstream PR: https://github.com/doxygen/doxygen/pull/8739 - -What was happening is that the TextStream object is reused for multiple -different files. Therefore, when one calls setStream(nullptr) or -setFile(nullptr), m_f or m_s will, respectively, still contain a pointer -to the previous member, which is used when one calls setFile() or -setStream() again, since these methods will call flush(). - -For example, a program doing - - s.setFile(f1); - s.setStream(nullptr); - fclose(f1); - s.setFile(f2); - -will call fwrite(f1, ...). This pattern can be observed in many parts of -Doxygen, so fixing it in TextStream itself by always zeroing the other -pointer is the simplest fix. - -diff --git a/src/textstream.h b/src/textstream.h -index 161ce7fe..38027ec0 100644 ---- a/src/textstream.h -+++ b/src/textstream.h -@@ -67,11 +67,13 @@ class TextStream final - { - flush(); - m_s = s; -+ m_f = nullptr; - } - - void setFile(FILE *f) - { - flush(); -+ m_s = nullptr; - m_f = f; - } - --- -2.33.0 - diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template index 8f5b986ceaf..946ceeebcc1 100644 --- a/srcpkgs/doxygen/template +++ b/srcpkgs/doxygen/template @@ -1,6 +1,6 @@ # Template file for 'doxygen' pkgname=doxygen -version=1.9.2 +version=1.9.3 revision=1 build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None" @@ -12,7 +12,7 @@ license="GPL-2.0-only" homepage="http://www.doxygen.org/" changelog="https://www.doxygen.nl/manual/changelog.html" distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz" -checksum=060f254bcef48673cc7ccf542736b7455b67c110b30fdaa33512a5b09bbecee5 +checksum=f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0 build_options="wizard" desc_option_wizard="build Qt5 GUI configuration tool, doxywizard" From fdecc767d65f83a01048a44d6c441a1062e44f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Thu, 31 Mar 2022 09:43:28 -0300 Subject: [PATCH 0464/2369] libvarlink: update to 23. --- srcpkgs/libvarlink/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libvarlink/template b/srcpkgs/libvarlink/template index 0633adbb17b..43eb3ab8981 100644 --- a/srcpkgs/libvarlink/template +++ b/srcpkgs/libvarlink/template @@ -1,6 +1,6 @@ # Template file for 'libvarlink' pkgname=libvarlink -version=22 +version=23 revision=1 build_style=meson short_desc="C implementation of the Varlink protocol and command line tool" @@ -8,7 +8,7 @@ maintainer="Érico Nogueira " license="Apache-2.0" homepage="https://varlink.org/" distfiles="https://github.com/varlink/libvarlink/archive/refs/tags/${version}.tar.gz" -checksum=932c0d7c3d2d8acdf5878d8fd8006887c5855189688d19eb09125682740b99bb +checksum=a5575e070e446e7c4486d424393950e6cb7a3b376ee20d517b0c13a876659a8d libvarlink-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From cf1170b5769582900fec732c1d87ced425016bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Thu, 31 Mar 2022 09:43:31 -0300 Subject: [PATCH 0465/2369] kstars: update to 3.5.8. --- srcpkgs/kstars/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template index 11ab05b13b0..0b14040aff2 100644 --- a/srcpkgs/kstars/template +++ b/srcpkgs/kstars/template @@ -1,6 +1,6 @@ # Template file for 'kstars' pkgname=kstars -version=3.5.5 +version=3.5.8 revision=1 build_style=cmake hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons @@ -18,4 +18,4 @@ maintainer="Érico Nogueira " license="GPL-2.0-or-later" homepage="https://edu.kde.org/kstars/" distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=703df56050672af10fc8142296ceaa27134a6a00e8222f3f6677f18ff1ac6b43 +checksum=660d902837b7abf3810d6e24f72fd84f0444a29bd7d43e1896b19fece1c88c3f From 15f15a2fa227defda1da091018b49cb94422e708 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 31 Mar 2022 14:21:35 +0200 Subject: [PATCH 0466/2369] libX11: update to 1.7.4. --- srcpkgs/libX11/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template index 83d21c86ad1..53bd34be6e0 100644 --- a/srcpkgs/libX11/template +++ b/srcpkgs/libX11/template @@ -1,7 +1,7 @@ # Template file for 'libX11' pkgname=libX11 -version=1.7.3.1 -revision=2 +version=1.7.4 +revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto --enable-static --enable-malloc0returnsnull" @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="http://xorg.freedesktop.org/" distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz" -checksum=2ffd417266fb875028fdc0ef349694f63dbcd76d0b0cfacfb52e6151f4b60989 +checksum=0e7d48bfa0b0ee5705d14fe140cf4310744ed131f0a6241b7cf03db06000fe51 do_configure() { ./configure ${configure_args} From 3d6eb5861c6cda9f87c80fa94c89f7e75ae0f732 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 31 Mar 2022 10:12:26 -0400 Subject: [PATCH 0467/2369] Revert "python3-Jinja2: update to 3.1.1." python3-jupyter_nbconvert-6.0.7 is incompatible with Jinja >= 3.1.0, so hold back until that package can be updated. This reverts commit ffcb1e6fb8349a0d15466f45487407708e0373f5. --- srcpkgs/python3-Jinja2/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template index d43e75d50b6..6a4c28214cc 100644 --- a/srcpkgs/python3-Jinja2/template +++ b/srcpkgs/python3-Jinja2/template @@ -1,7 +1,8 @@ # Template file for 'python3-Jinja2' pkgname=python3-Jinja2 -version=3.1.1 -revision=1 +reverts="3.1.1_1" +version=3.0.3 +revision=2 wrksrc="Jinja2-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,7 +14,7 @@ license="BSD-3-Clause" homepage="http://jinja.pocoo.org/" changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst" distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz" -checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9 +checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 post_install() { vlicense LICENSE.rst From fc1dc35a0894b02fca77cdbb1fb7b419e043337b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 19 Mar 2022 21:55:20 -0300 Subject: [PATCH 0468/2369] python3-sympy: update to 1.10.1. Also fix integer_nthroot(2, 10**10) in 32 bit, reported upstream. --- .../patches/fix_integer_nthroot.patch | 26 +++++++++++++++++++ srcpkgs/python3-sympy/template | 4 +-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch diff --git a/srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch b/srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch new file mode 100644 index 00000000000..0f4860a6c9e --- /dev/null +++ b/srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch @@ -0,0 +1,26 @@ +Fix integer_nthroot(2, 10**10) in 32 bit. + +See: https://github.com/sympy/sympy/issues/18374#issuecomment-1081196879 + +diff --git a/sympy/core/power.py b/sympy/core/power.py +index 59ab7c53a4..ae3ee25c93 100644 +--- a/sympy/core/power.py ++++ b/sympy/core/power.py +@@ -21,6 +21,8 @@ + + from mpmath.libmp import sqrtrem as mpmath_sqrtrem + ++from ctypes import c_ulong ++ULONG_MAX = c_ulong(-1).value + + + def isqrt(n): +@@ -74,7 +76,7 @@ def integer_nthroot(y, n): + raise ValueError("y must be nonnegative") + if n < 1: + raise ValueError("n must be positive") +- if HAS_GMPY and n < 2**63: ++ if HAS_GMPY and n <= ULONG_MAX: + # Currently it works only for n < 2**63, else it produces TypeError + # sympy issue: https://github.com/sympy/sympy/issues/18374 + # gmpy2 issue: https://github.com/aleaxit/gmpy/issues/257 diff --git a/srcpkgs/python3-sympy/template b/srcpkgs/python3-sympy/template index 807f0db5f1a..3bb4df3bffd 100644 --- a/srcpkgs/python3-sympy/template +++ b/srcpkgs/python3-sympy/template @@ -1,6 +1,6 @@ # Template file for 'python3-sympy' pkgname=python3-sympy -version=1.9 +version=1.10.1 revision=1 wrksrc="sympy-${version}" build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://sympy.org/" distfiles="${PYPI_SITE}/s/sympy/sympy-${version}.tar.gz" -checksum=c7a880e229df96759f955d4f3970d4cabce79f60f5b18830c08b90ce77cd5fdc +checksum=5939eeffdf9e152172601463626c022a2c27e75cf6278de8d401d50c9d58787b post_install() { vman doc/man/isympy.1 From e6e52b067618e5b0f31392f2f66335ea2e657ab7 Mon Sep 17 00:00:00 2001 From: Petr Cizmar Date: Thu, 31 Mar 2022 16:40:10 +0200 Subject: [PATCH 0469/2369] New package: ctzcls-cups-1.5 --- srcpkgs/ctzcls-cups/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/ctzcls-cups/template diff --git a/srcpkgs/ctzcls-cups/template b/srcpkgs/ctzcls-cups/template new file mode 100644 index 00000000000..38572c0fcbf --- /dev/null +++ b/srcpkgs/ctzcls-cups/template @@ -0,0 +1,21 @@ +# Template file for 'ctzcls-cups' +pkgname=ctzcls-cups +version=1.5 +revision=1 +create_wrksrc=yes +makedepends="cups-devel" +short_desc="Citizen Sticker Printers driver for CUPS" +maintainer="Petr Cizmar " +license="GPL-2.0-or-later" +homepage="https://www.citizen-systems.co.jp/en/printer/download/driver-cups-source/" +distfiles="https://www.citizen-systems.co.jp/en/printer/download/driver-cups-source/cups-ctzcls.tar.bz2" +checksum=d3fe19aa253044c383df3a3869c9dac88b0ced374fe42eb24aabfe6a1ff72ff4 + +do_build() { + $CC $CFLAGS -fPIC -o rastertocls rastertocls.c -lcupsimage -lcups $LDFLAGS +} + +do_install() { + vinstall ctzcls.ppd 644 /usr/share/cups/model/ + vinstall rastertocls 755 /usr/lib/cups/filter/ +} From faf4e6e199b167ceadddbebf474e5347fafd49fb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 31 Mar 2022 20:44:27 +0200 Subject: [PATCH 0470/2369] meson: patch gtk-update-icon-cache detection --- ...me-fallback-to-gtk-update-icon-cache.patch | 26 +++++++++++++++++++ srcpkgs/meson/template | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch diff --git a/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch new file mode 100644 index 00000000000..56a3f7cf341 --- /dev/null +++ b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch @@ -0,0 +1,26 @@ +From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot +Date: Wed, 23 Mar 2022 22:15:11 +0100 +Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache + +Commit a0cade8f introduced a typo and wrongly check for +gtk4-update-icon-cache twice. +If gtk4-update-icon-cache (gtk4) is not found, look for +gtk-update-icon-cache (gtk3) instead. +--- + mesonbuild/modules/gnome.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index 673a781a41d..501be9ae4da 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: ' + prog = state.find_program('gtk4-update-icon-cache', required=False) + found = isinstance(prog, build.Executable) or prog.found() + if not found: +- prog = state.find_program('gtk4-update-icon-cache') ++ prog = state.find_program('gtk-update-icon-cache') + icondir = os.path.join(datadir_abs, 'icons', 'hicolor') + script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir]) + script.skip_if_destdir = True diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 2f9ccaaa469..adfa2d52f7a 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,7 +1,7 @@ # Template file for 'meson' pkgname=meson version=0.61.4 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" depends="ninja python3-setuptools" From 41d213902c509cf4a26455414ee7fc65114a3c82 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 31 Mar 2022 06:11:14 +0200 Subject: [PATCH 0471/2369] New package: helix-22.03 --- srcpkgs/helix/files/hx | 2 + ...g-the-format-ident-Rust-feature-1881.patch | 104 ++++++++++++++++++ srcpkgs/helix/template | 32 ++++++ 3 files changed, 138 insertions(+) create mode 100644 srcpkgs/helix/files/hx create mode 100644 srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch create mode 100644 srcpkgs/helix/template diff --git a/srcpkgs/helix/files/hx b/srcpkgs/helix/files/hx new file mode 100644 index 00000000000..a43e49fadc5 --- /dev/null +++ b/srcpkgs/helix/files/hx @@ -0,0 +1,2 @@ +#!/bin/sh +HELIX_RUNTIME=/usr/lib/helix/runtime exec /usr/lib/helix/hx "$@" diff --git a/srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch b/srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch new file mode 100644 index 00000000000..73eafa91cc1 --- /dev/null +++ b/srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch @@ -0,0 +1,104 @@ +From f2dd3d446914ec0953cd7e056d430fc3b959e75d Mon Sep 17 00:00:00 2001 +From: Marcin Puc +Date: Wed, 30 Mar 2022 02:08:30 +0200 +Subject: [PATCH] Avoid using the format ident Rust feature (#1881) + +--- + helix-loader/src/grammar.rs | 14 +++++++++----- + helix-term/src/commands/typed.rs | 4 ++-- + helix-term/src/health.rs | 9 +++++---- + 3 files changed, 16 insertions(+), 11 deletions(-) + +diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs +index 299a06bf..f0c5ea28 100644 +--- a/helix-loader/src/grammar.rs ++++ b/helix-loader/src/grammar.rs +@@ -63,12 +63,12 @@ pub fn get_language(name: &str) -> Result { + library_path.set_extension(DYLIB_EXTENSION); + + let library = unsafe { Library::new(&library_path) } +- .with_context(|| format!("Error opening dynamic library {library_path:?}"))?; ++ .with_context(|| format!("Error opening dynamic library {:?}", library_path))?; + let language_fn_name = format!("tree_sitter_{}", name.replace('-', "_")); + let language = unsafe { + let language_fn: Symbol Language> = library + .get(language_fn_name.as_bytes()) +- .with_context(|| format!("Failed to load symbol {language_fn_name}"))?; ++ .with_context(|| format!("Failed to load symbol {}", language_fn_name))?; + language_fn() + }; + std::mem::forget(library); +@@ -133,7 +133,7 @@ where + // TODO: print all failures instead of the first one found. + rx.iter() + .find(|result| result.is_err()) +- .map(|err| err.with_context(|| format!("Failed to {action} some grammar(s)"))) ++ .map(|err| err.with_context(|| format!("Failed to {} some grammar(s)", action))) + .unwrap_or(Ok(())) + } + +@@ -238,12 +238,16 @@ fn build_grammar(grammar: GrammarConfiguration) -> Result<()> { + }; + + let grammar_dir_entries = grammar_dir.read_dir().with_context(|| { +- format!("Failed to read directory {grammar_dir:?}. Did you use 'hx --grammar fetch'?") ++ format!( ++ "Failed to read directory {:?}. Did you use 'hx --grammar fetch'?", ++ grammar_dir ++ ) + })?; + + if grammar_dir_entries.count() == 0 { + return Err(anyhow!( +- "Directory {grammar_dir:?} is empty. Did you use 'hx --grammar fetch'?" ++ "Directory {:?} is empty. Did you use 'hx --grammar fetch'?", ++ grammar_dir + )); + }; + +diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs +index 8b7f481b..c921f85b 100644 +--- a/helix-term/src/commands/typed.rs ++++ b/helix-term/src/commands/typed.rs +@@ -891,8 +891,8 @@ fn setting( + } + let (key, arg) = (&args[0].to_lowercase(), &args[1]); + +- let key_error = || anyhow::anyhow!("Unknown key `{key}`"); +- let field_error = |_| anyhow::anyhow!("Could not parse field `{arg}`"); ++ let key_error = || anyhow::anyhow!("Unknown key `{}`", key); ++ let field_error = |_| anyhow::anyhow!("Could not parse field `{}`", arg); + + let mut config = serde_json::to_value(&cx.editor.config().clone()).unwrap(); + let pointer = format!("/{}", key.replace('.', "/")); +diff --git a/helix-term/src/health.rs b/helix-term/src/health.rs +index f13d35f0..2a02e118 100644 +--- a/helix-term/src/health.rs ++++ b/helix-term/src/health.rs +@@ -89,10 +89,11 @@ pub fn languages_all() { + + let column = |item: &str, color: Color| { + let data = format!( +- "{:column_width$}", ++ "{:width$}", + item.get(..column_width - 2) +- .map(|s| format!("{s}…")) +- .unwrap_or_else(|| item.to_string()) ++ .map(|s| format!("{}…", s)) ++ .unwrap_or_else(|| item.to_string()), ++ width = column_width, + ) + .stylize() + .with(color); +@@ -158,7 +159,7 @@ pub fn language(lang_str: String) { + { + Some(l) => l, + None => { +- let msg = format!("Language '{lang_str}' not found"); ++ let msg = format!("Language '{}' not found", lang_str); + println!("{}", msg.red()); + let suggestions: Vec<&str> = syn_loader_conf + .language +-- +2.35.1 + diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template new file mode 100644 index 00000000000..961a894092b --- /dev/null +++ b/srcpkgs/helix/template @@ -0,0 +1,32 @@ +# Template file for 'helix' +pkgname=helix +version=22.03 +revision=1 +build_style=cargo +make_install_args="--path helix-term" +hostmakedepends="git" +short_desc="Post-modern modal text editor" +maintainer="Marcin Puc " +license="MPL-2.0" +homepage="https://helix-editor.com/" +changelog="https://github.com/helix-editor/helix/blob/master/CHANGELOG.md" +distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz" +checksum=a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4 +conflicts="hex>=0" + +# skip problematic doctests on i686 +case "$XBPS_TARGET_MACHINE" in + i686*) make_check_args="-- --skip src/";; + *) ;; +esac + +post_install() { + rm runtime/grammars/.gitkeep + rm runtime/themes/README.md + rm -rf runtime/grammars/sources + + vmkdir usr/lib/helix + mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/lib/helix/ + vcopy runtime usr/lib/helix + vbin ${FILESDIR}/hx +} From d58a0d4f114b41ab84390a021291e14bf5ba64c4 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 20:45:21 -0700 Subject: [PATCH 0472/2369] gtksourceview5: update to 5.4.0 --- srcpkgs/gtksourceview5/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template index c4c7d94f51e..81be2e5248d 100644 --- a/srcpkgs/gtksourceview5/template +++ b/srcpkgs/gtksourceview5/template @@ -1,6 +1,6 @@ # Template file for 'gtksourceview5' pkgname=gtksourceview5 -version=5.2.0 +version=5.4.0 revision=1 wrksrc="gtksourceview-${version}" build_style=meson @@ -8,7 +8,7 @@ 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)" + $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)" makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala) pcre2-devel" checkdepends="xvfb-run cantarell-fonts" @@ -16,9 +16,10 @@ 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" +#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-4/NEWS" distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz" -checksum=c9b34fa02654f56ce22fa08827d89db4ba81631b2e6d7d31ea65d13c729430e9 +checksum=003bc217e670a8ec8aa3aece994b70e70b7d6b8074938adda21718555d84e637 # Package build options build_options="gir gtk_doc" @@ -42,7 +43,7 @@ gtksourceview5-devel_package() { vmove usr/lib/pkgconfig vmove "usr/lib/*.so" if [ "$build_option_gtk_doc" ]; then - vmove usr/share/gtk-doc + vmove usr/share/doc fi if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 From ea9b514e6d92ef29c560466d7a506f528aee2a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Thu, 31 Mar 2022 21:58:28 +0200 Subject: [PATCH 0473/2369] python3-libarchive-c: update to 4.0. --- srcpkgs/python3-libarchive-c/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template index 1a4d1de77f2..e84524799bd 100644 --- a/srcpkgs/python3-libarchive-c/template +++ b/srcpkgs/python3-libarchive-c/template @@ -1,6 +1,6 @@ # Template file for 'python3-libarchive-c' pkgname=python3-libarchive-c -version=3.2 +version=4.0 revision=1 wrksrc="python-libarchive-c-${version}" build_style=python3-module @@ -12,4 +12,4 @@ maintainer="Piotr Wójcik " license="CC0-1.0" homepage="https://pypi.org/project/libarchive-c/" distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz" -checksum=e09bd195f72646472f7514145f8f65fd371444d9c98123cd6ec7555048d57045 +checksum=5266797302af2707b6b61bce3b4ce417fe8a583fbeaaab5712dc6dcbf0de3c2b From b7bde118fede451fba04f3d37ca705bd6f1bc3a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Thu, 31 Mar 2022 21:58:29 +0200 Subject: [PATCH 0474/2369] diffoscope: update to 209. --- srcpkgs/diffoscope/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template index 17a9cfd447b..9ce203fb8ff 100644 --- a/srcpkgs/diffoscope/template +++ b/srcpkgs/diffoscope/template @@ -1,6 +1,6 @@ # Template file for 'diffoscope' pkgname=diffoscope -version=203 +version=209 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -14,4 +14,4 @@ license="GPL-3.0-or-later" homepage="https://diffoscope.org/" changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog" distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz" -checksum=d048dbbef81c6a77985f76b9a358e014461ac5c7b36920449fdc999e314654e7 +checksum=e845a0b6cd56c116fee670ae8497512489504dc911201bd77b7d65b8550618f6 From ebb82f4e58d4c93c52da54c0040f19b079d8ccf8 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 18 Mar 2022 07:51:01 -0400 Subject: [PATCH 0475/2369] swaykbdd: update to 1.1. --- srcpkgs/swaykbdd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/swaykbdd/template b/srcpkgs/swaykbdd/template index 195b04475bc..1434199c5f2 100644 --- a/srcpkgs/swaykbdd/template +++ b/srcpkgs/swaykbdd/template @@ -1,6 +1,6 @@ # Template file for 'swaykbdd' pkgname=swaykbdd -version=1.0 +version=1.1 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Joel Beckmeyer " license="MIT" homepage="https://github.com/artemsen/swaykbdd" distfiles="https://github.com/artemsen/swaykbdd/archive/v${version}.tar.gz" -checksum=9de46256cafb2b002d4632e1a2f4ca2383e69b69de4d19d3d2d6f4825ef9fca2 +checksum=b1b0fa9ca43e177345a7761d0f9b705ff7d338fea48c1877a44767cf527b131c post_install() { vlicense LICENSE From 2e954f6f0b1c69764bc8ad331cb4744797eef505 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 31 Mar 2022 21:09:07 +0200 Subject: [PATCH 0476/2369] gfbgraph: update to 0.2.5. --- srcpkgs/gfbgraph/template | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template index 85a7d27af6e..63c6376122a 100644 --- a/srcpkgs/gfbgraph/template +++ b/srcpkgs/gfbgraph/template @@ -1,51 +1,42 @@ # Template file for 'gfbgraph' pkgname=gfbgraph -version=0.2.4 +version=0.2.5 revision=1 build_style=gnu-configure build_helper="gir" -configure_args="--disable-static" -hostmakedepends="pkg-config intltool automake libtool gtk-doc which" +configure_args="--disable-static $(vopt_enable gtk_doc gtk-doc)" +hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)" makedepends="rest-devel json-glib-devel gnome-online-accounts-devel" short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GFBGraph" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379 +checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3 +make_check=no # needs facebook credentials -build_options="gir" +build_options="gir gtk_doc" build_options_default="gir" -if [ "$CROSS_BUILD" ]; then - configure_args+=" --disable-gtk-doc" -else - configure_args+=" --enable-gtk-doc" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" fi -do_check() { - : -} - -pre_configure() { - NOCONFIGURE=1 sh autogen.sh -} - post_install() { rm -rf ${DESTDIR}/usr/doc } gfbgraph-devel_package() { - depends="${makedepends} ${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} ${makedepends}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - if [ -z "$CROSS_BUILD" ]; then + if [ "$build_option_gtk_doc" ]; then vmove usr/share/gtk-doc fi vmove "usr/lib/*.so" - if [ -z "$CROSS_BUILD" ]; then + if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi } From eb8b768f58ddc21adf609cefcb212b5819afb299 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 31 Mar 2022 16:22:00 -0500 Subject: [PATCH 0477/2369] Amass: update to 3.19.0. --- srcpkgs/Amass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template index a33e92ce1d2..993c17d52c1 100644 --- a/srcpkgs/Amass/template +++ b/srcpkgs/Amass/template @@ -1,6 +1,6 @@ # Template file for 'Amass' pkgname=Amass -version=3.18.3 +version=3.19.0 revision=1 build_style=go go_import_path="github.com/OWASP/Amass/v3/..." @@ -9,4 +9,4 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://www.owasp.org/index.php/OWASP_Amass_Project" distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz" -checksum=66eee8ffd300e67a540e9962d2526377677df04b1a3b436471e0a930dd422a9f +checksum=539c2207f844c81cc9a6286e436f26a1fc0690bf424ea1885844dd33002b7ef6 From b56906ed41536cd4bc5b753af95256f82c436814 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 1 Apr 2022 00:09:11 +0200 Subject: [PATCH 0478/2369] libvirt-glib: remove unnecessary build deps --- srcpkgs/libvirt-glib/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template index 032188df7f7..7ec4d989823 100644 --- a/srcpkgs/libvirt-glib/template +++ b/srcpkgs/libvirt-glib/template @@ -6,9 +6,9 @@ build_helper="gir" build_style=meson configure_args="-Dintrospection=$(vopt_if gir enabled disabled) -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)" -hostmakedepends="automake pkg-config intltool glib-devel gettext-devel - python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)" -makedepends="libglib-devel libvirt-devel libxml2-devel python-devel" +hostmakedepends="pkg-config gettext glib-devel + $(vopt_if vala vala) $(vopt_if doc gtk-doc)" +makedepends="libglib-devel libvirt-devel libxml2-devel" short_desc="Glib integration with libvirt" maintainer="Enno Boland " license="LGPL-2.1-or-later" From 991988446e17a03ffebf84949dd3cfbc2f6f6ffd Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 31 Mar 2022 17:18:12 -0500 Subject: [PATCH 0479/2369] jc: add missing depends --- srcpkgs/jc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template index 8f510a980bc..20a7438da19 100644 --- a/srcpkgs/jc/template +++ b/srcpkgs/jc/template @@ -1,10 +1,10 @@ # Template file for 'jc' pkgname=jc version=1.18.6 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-Pygments" +depends="python3-Pygments python3-ruamel.yaml python3-xmltodict" checkdepends="python3-pytest $depends" short_desc="Convert to JSON" maintainer="Andrew Benson " From 6d3d2c9c7fa8b3ec0d7ceb92c355ab5dd33af5f5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 31 Mar 2022 23:35:26 +0200 Subject: [PATCH 0480/2369] gnome-ssh-askpass: use gtk+3 --- srcpkgs/gnome-ssh-askpass/template | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template index fbd9174fae2..558193ab2a1 100644 --- a/srcpkgs/gnome-ssh-askpass/template +++ b/srcpkgs/gnome-ssh-askpass/template @@ -1,10 +1,13 @@ # Template file for 'gnome-ssh-askpass' pkgname=gnome-ssh-askpass version=8.9p1 -revision=1 +revision=2 wrksrc="openssh-${version}" +build_wrksrc="contrib" +build_style=gnu-makefile +make_build_target="gnome-ssh-askpass3" hostmakedepends="pkg-config" -makedepends="gtk+-devel" +makedepends="gtk+3-devel" short_desc="GTK SSH passphrase grabber (from OpenSSH)" maintainer="Leah Neukirchen " license="BSD-3-Clause, BSD-2-Clause" @@ -16,12 +19,7 @@ alternatives=" ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass " -do_build() { - cd contrib - ${CC} ${CFLAGS} $(pkg-config --cflags gtk+-2.0) ${pkgname}2.c -o ${pkgname} $(pkg-config --libs gtk+-2.0) ${LDFLAGS} -lX11 -} - do_install() { - vbin contrib/${pkgname} - vlicense LICENCE + vbin gnome-ssh-askpass3 gnome-ssh-askpass + vlicense ../LICENCE } From 281fbe8c7d8b669509760e36c0428977c40cf925 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Wed, 16 Mar 2022 14:30:12 +0100 Subject: [PATCH 0481/2369] zellij: update to 0.27.0 --- srcpkgs/zellij/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template index e2ada810e57..72a9ab9e6e7 100644 --- a/srcpkgs/zellij/template +++ b/srcpkgs/zellij/template @@ -1,6 +1,6 @@ # Template file for 'zellij' pkgname=zellij -version=0.26.0 +version=0.27.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 @@ -9,12 +9,12 @@ build_style=cargo build_helper=qemu checkdepends="openssl-devel pkg-config" short_desc="Terminal workspace with batteries included" -maintainer="Marcin Puc " +maintainer="Marcin Puc " 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=f0b0cfe7b72ce842de80d5c32cc2abe624b3286fab16f313a4e43e226e95e87b +checksum=6159482c25d3cb55b04d23230812f4450e88ff0975161594297a7deef8979a38 post_build() { ZELLIJ="target/${RUST_TARGET}/release/zellij" From c3e4a94b4902a2a8c25b47110b4261bdf55b4ae1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 31 Mar 2022 22:43:18 +0200 Subject: [PATCH 0482/2369] gtk4: update to 4.6.2. --- srcpkgs/gtk4/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index a689633bf4d..ed86ad7bab4 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,6 +1,6 @@ # Template file for 'gtk4' pkgname=gtk4 -version=4.6.1 +version=4.6.2 revision=1 wrksrc="gtk-${version}" build_style=meson @@ -13,7 +13,7 @@ configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true -Dcolord=$(vopt_if colord enabled disabled) -Dcloudproviders=$(vopt_if cloudproviders enabled disabled) -Dvulkan=$(vopt_if vulkan enabled disabled)" -hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl +hostmakedepends="gettext-devel glib-devel gi-docgen perl pkg-config sassc gettext libxslt docbook-xsl python3-docutils $(vopt_if wayland 'wayland-devel wayland-protocols')" makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel @@ -29,7 +29,7 @@ license="LGPL-2.1-or-later" homepage="https://www.gtk.org/" changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-6/NEWS" distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz" -checksum=d85508d21cbbcd63d568a7862af5ecd63b978d7d5799cbe404c91d2389d0ec5f +checksum=ff263af609a50eb76056653592d929459aef4819a444c436f6d52c6f63c1faec # Package build options build_options="broadway cloudproviders colord cups gir vulkan wayland x11" From 998cd46ac70d75b6c216e38f6f7edbaeb32a2bba Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Sat, 26 Mar 2022 20:51:35 -0400 Subject: [PATCH 0483/2369] network-manager-applet: update to 1.26.0. --- .../patches/meson-0.61.patch | 33 ------------------- srcpkgs/network-manager-applet/template | 4 +-- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/network-manager-applet/patches/meson-0.61.patch diff --git a/srcpkgs/network-manager-applet/patches/meson-0.61.patch b/srcpkgs/network-manager-applet/patches/meson-0.61.patch deleted file mode 100644 index 1060e15b364..00000000000 --- a/srcpkgs/network-manager-applet/patches/meson-0.61.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 21 Jan 2022 22:34:09 +0100 -Subject: [PATCH] meson.build: address meson 0.61 failures - -https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107 ---- - meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 33adb632..6178c0eb 100644 ---- a/meson.build -+++ b/meson.build -@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false) - - foreach desktop: desktop_files - i18n.merge_file( -- desktop + '-desktop', - input: desktop + '.desktop.in', - output: desktop + '.desktop', - install: true, -@@ -275,7 +274,6 @@ endforeach - appdata = 'nm-connection-editor.appdata.xml' - - i18n.merge_file( -- 'desktop', - input: appdata + '.in', - output: appdata, - install: true, --- -GitLab - diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template index 958d5b22896..8a8915bef3e 100644 --- a/srcpkgs/network-manager-applet/template +++ b/srcpkgs/network-manager-applet/template @@ -1,6 +1,6 @@ # Template file for 'network-manager-applet' pkgname=network-manager-applet -version=1.24.0 +version=1.26.0 revision=1 build_style=meson configure_args="-Dselinux=false" @@ -16,5 +16,5 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/NetworkManager" changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b9f4bca5d0352718e07b7385fb195a9bbc8fd686b7959b74137854d52aab9c58 +checksum=69611b29064adbd57395fe3e51a9ebde1ea794615f776900453a2bbe3d8cddfd lib32disabled=yes From 6cd4af3cf929c8c1a90e4aaf3f4886976485c73c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 1 Apr 2022 01:31:30 +0200 Subject: [PATCH 0484/2369] glib-networking: update to 2.72.0. --- srcpkgs/glib-networking/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template index 5adca78241c..fc1cbf84035 100644 --- a/srcpkgs/glib-networking/template +++ b/srcpkgs/glib-networking/template @@ -1,6 +1,6 @@ # Template file for 'glib-networking' pkgname=glib-networking -version=2.70.1 +version=2.72.0 revision=1 build_style=meson configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled @@ -13,11 +13,8 @@ short_desc="Network-related giomodules for glib" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/glib-networking/" +#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS" +changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-72/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc +checksum=100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b lib32disabled=yes -make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c - -post_install() { - rm -rf ${DESTDIR}/usr/lib/systemd -} From b9c98a60d5fdfa830872f8e1efb632166ddda0a7 Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 1 Apr 2022 03:14:51 +0200 Subject: [PATCH 0485/2369] helix: broken on ppc32 --- srcpkgs/helix/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template index 961a894092b..17a819728ef 100644 --- a/srcpkgs/helix/template +++ b/srcpkgs/helix/template @@ -20,6 +20,11 @@ case "$XBPS_TARGET_MACHINE" in *) ;; esac +case "$XBPS_TARGET_MACHINE" in + ppc64*) ;; + ppc*) broken="no AtomicU64 in sync::atomic";; +esac + post_install() { rm runtime/grammars/.gitkeep rm runtime/themes/README.md From 0951261aa76e4e8de095e3e452e93cc092854d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 30 Mar 2022 09:41:50 -0300 Subject: [PATCH 0486/2369] giac: update to 1.7.0.53. --- srcpkgs/giac/patches/micropy.patch | 18 ++++++++++++++++++ srcpkgs/giac/template | 5 +++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/giac/patches/micropy.patch diff --git a/srcpkgs/giac/patches/micropy.patch b/srcpkgs/giac/patches/micropy.patch new file mode 100644 index 00000000000..0e417a5a8ec --- /dev/null +++ b/srcpkgs/giac/patches/micropy.patch @@ -0,0 +1,18 @@ +--- a/src/icas.cc 2021-03-02 04:52:40.000000000 -0300 ++++ b/src/icas.cc 2022-03-30 10:00:39.154056068 -0300 +@@ -1810,6 +1810,7 @@ + cerr << "// Setting tex log" << '\n'; + show_tex=true; + } ++#ifdef HAVE_LIBMICROPYTHON + if (getenv("GIAC_MICROPY")){ + cerr << "Micropython mode\n"; + python_compat(4 | python_compat(contextptr),contextptr); +@@ -1821,6 +1822,7 @@ + return 0; + } + } ++#endif + #ifdef HAVE_LIBREADLINE + if (ARGC==1){ + int taillemax=1000; diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template index 2c192c2b858..fbdadc31dde 100644 --- a/srcpkgs/giac/template +++ b/srcpkgs/giac/template @@ -1,6 +1,6 @@ # Template file for 'giac' pkgname=giac -version=1.7.0.45 +version=1.7.0.53 revision=1 wrksrc="giac-${version%.*}" build_style=gnu-configure @@ -12,8 +12,9 @@ short_desc="Free computer algebra system" maintainer="Gonzalo Tornaría " license="GPL-3.0-or-later" homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" +changelog="https://www-fourier.ujf-grenoble.fr/~parisse/install_en#new" distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz" -checksum=028b9e323d81a261a243c0768d5e12f3d76371eff05fd24cf2eb177b445f1da6 +checksum=74e5f98f63147c0197e4ce309601ae745312761be61c1a99c8a6bab4862e4a9f # need more than 4*65536 stack, see try_parse() in gen.cc line 11812 LDFLAGS="-Wl,-z,stack-size=2097152" From eeecac31598633c1f3142acc8a15752caacd203d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 30 Mar 2022 09:41:28 -0300 Subject: [PATCH 0487/2369] gp2c: update to 0.0.12pl1. --- srcpkgs/gp2c/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gp2c/template b/srcpkgs/gp2c/template index da996ed0972..f82cf95c2d9 100644 --- a/srcpkgs/gp2c/template +++ b/srcpkgs/gp2c/template @@ -1,6 +1,6 @@ # Template file for 'gp2c' pkgname=gp2c -version=0.0.12 +version=0.0.12pl1 revision=1 build_style=gnu-configure hostmakedepends="perl" @@ -10,5 +10,6 @@ short_desc="PARI/GP Computer Algebra System - gp2c compiler" maintainer="Gonzalo Tornaría " license="GPL-2.0-or-later" homepage="http://pari.math.u-bordeaux.fr/" +changelog="http://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=gp2c.git;a=blob_plain;f=ChangeLog;hb=HEAD" distfiles="${homepage}pub/pari/GP2C/${pkgname}-${version}.tar.gz" -checksum=ee9ff63979670408d8c293902ce7ff6a825145f0e7e7c6323764733ef1b9310d +checksum=79a8c46f7ad3331e4d8ae6af6b496c4742fd73a73b996b3ca7ead61452ca6e8d From 83e1e0e6e5bf1742f6778d190ed318aff41bdd71 Mon Sep 17 00:00:00 2001 From: anelki Date: Thu, 31 Mar 2022 17:12:18 -0500 Subject: [PATCH 0488/2369] Signal-Desktop: update to 5.37.0. --- 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 55591ea4c82..a0b15428b92 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.36.0 +version=5.37.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=de158a8f4b19e3f8b849abf07fbb3d1b2207a3a08fde31aac328635e66a8a956 +checksum=bd674ea6ba0582862f26a8fed1557d21f68161ef05891e67ca4cb653bf0f8d1a nostrip_files="signal-desktop" post_extract() { From bdd3622662bfbdeeffc5d8d1e9ad8105fb056476 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 31 Mar 2022 16:39:31 -0700 Subject: [PATCH 0489/2369] vte3: update to 0.68.0 --- srcpkgs/vte3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index f88f797740b..d75cd4edef2 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,6 +1,6 @@ # Template file for 'vte3' pkgname=vte3 -version=0.66.2 +version=0.68.0 revision=1 wrksrc="vte-${version}" build_style=meson @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Terminal/VTE" distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz" -checksum=e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976 +checksum=13e7d4789ca216a33780030d246c9b13ddbfd04094c6316eea7ff92284dd1749 # Suppress warnings as errors for NULL format strings (musl libc) CXXFLAGS="-Wno-error=format=" From de7e688ac808d388251865af42e163c59cc6993c Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 1 Apr 2022 13:40:10 -0500 Subject: [PATCH 0490/2369] podman: update to 4.0.3. --- srcpkgs/podman/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template index 95e0531abad..a12ca2c3244 100644 --- a/srcpkgs/podman/template +++ b/srcpkgs/podman/template @@ -1,7 +1,7 @@ # Template file for 'podman' pkgname=podman -version=4.0.2 -revision=3 +version=4.0.3 +revision=1 build_style=go go_import_path="github.com/containers/podman/v4" go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport" @@ -15,7 +15,7 @@ license="Apache-2.0" homepage="https://podman.io/" changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md" distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz" -checksum=cac4328b0a5e618f4f6567944e255d15fad3e1f7901df55603f1efdd7aaeda95 +checksum=e3b53fc9142d4f2dc085f17a377d92ffb8bfe7756c4f47b8128b38bcc3540cbc if [ "$CROSS_BUILD" ]; then go_build_tags+=" containers_image_openpgp" From 9ef46bf26ac5acc1af5809f11c97b19c5e2233ed Mon Sep 17 00:00:00 2001 From: 0x5c Date: Tue, 29 Mar 2022 05:26:18 -0400 Subject: [PATCH 0491/2369] onboard: fix SyntaxWarnings and disable tests - A missing % operator was breaking a c-style format string, causing a SyntaxWarning to be trown twice at package install time (during byte-compilation). - The tests were failing since they try to run 'killall' before executing onboard in xautomation(7), both not being possible in xbps-src. --- srcpkgs/onboard/patches/fix-brokenformat.patch | 15 +++++++++++++++ srcpkgs/onboard/template | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/onboard/patches/fix-brokenformat.patch diff --git a/srcpkgs/onboard/patches/fix-brokenformat.patch b/srcpkgs/onboard/patches/fix-brokenformat.patch new file mode 100644 index 00000000000..e5d200208a9 --- /dev/null +++ b/srcpkgs/onboard/patches/fix-brokenformat.patch @@ -0,0 +1,15 @@ +Fix for https://bugs.launchpad.net/onboard/+bug/1948723 + + +-- +--- a/Onboard/LayoutLoaderSVG.py ++++ b/Onboard/LayoutLoaderSVG.py +@@ -445,7 +445,7 @@ + except KeyError as ex: + (strerror) = ex + raise Exceptions.LayoutFileError("Unrecognized modifier %s in" \ +- "definition of %s" (strerror, full_id)) ++ "definition of %s" % (strerror, full_id)) + + value = attributes.get("action") + if value: diff --git a/srcpkgs/onboard/template b/srcpkgs/onboard/template index c147bf58a65..b138fae6189 100644 --- a/srcpkgs/onboard/template +++ b/srcpkgs/onboard/template @@ -1,7 +1,7 @@ # Template file for 'onboard' pkgname=onboard version=1.4.1 -revision=9 +revision=10 build_style=python3-module hostmakedepends="intltool pkg-config python3-distutils-extra" makedepends="dconf-devel eudev-libudev-devel gtk+3-devel hunspell-devel @@ -14,3 +14,5 @@ license="GPL-3.0-or-later" homepage="https://launchpad.net/onboard" distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.gz" checksum=01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865 +# Tries to run onboard in tests, using xautomation(7) +make_check=no From 26add4f9b7d44435a1e98d8469d85861e8a73f05 Mon Sep 17 00:00:00 2001 From: Jose G Perez Taveras Date: Sun, 6 Mar 2022 15:12:54 -0500 Subject: [PATCH 0492/2369] go: update to 1.18. Closes: #36013 [via git-merge-pr] --- srcpkgs/go/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/go/template b/srcpkgs/go/template index 990a575b7ae..58f0b0fc248 100644 --- a/srcpkgs/go/template +++ b/srcpkgs/go/template @@ -1,6 +1,6 @@ # Template file for 'go' pkgname=go -version=1.17.6 +version=1.18 revision=1 create_wrksrc=yes build_wrksrc=go @@ -11,7 +11,7 @@ license="BSD-3-Clause" homepage="https://go.dev/" changelog="https://go.dev/doc/devel/release.html" distfiles="https://go.dev/dl/go${version}.src.tar.gz" -checksum=4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 +checksum=38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6 nostrip=yes noverifyrdeps=yes From e7e3c7b60cb1e12c7d2d5fee97f71fb6c8d8cae4 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Wed, 30 Mar 2022 09:47:27 +0200 Subject: [PATCH 0493/2369] google-chrome: update to 100.0.4896.60 Closes: #36413 [via git-merge-pr] --- 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 e6a568ca685..a630fcdae46 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.84 +version=100.0.4896.60 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=96f260f798f1adb471a3a5b8e68702ef88237884e32f0e43baf15a78aed5b669 +checksum=05ba6d17d2704ffff1e1d554b40aaddabca9256b7e63ff73e99c469393de8a1f do_extract() { mkdir -p ${DESTDIR} From e8c9349f01ac5af7a3e493955607138765bf71d7 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 1 Apr 2022 23:17:28 -0500 Subject: [PATCH 0494/2369] chronograf: update to 1.9.4. --- srcpkgs/chronograf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template index 50a08abafeb..db97744b814 100644 --- a/srcpkgs/chronograf/template +++ b/srcpkgs/chronograf/template @@ -1,6 +1,6 @@ # Template file for 'chronograf' pkgname=chronograf -version=1.9.1 +version=1.9.4 revision=1 build_style=go go_import_path="github.com/influxdata/${pkgname}" @@ -12,7 +12,7 @@ maintainer="Michael Aldridge " license="AGPL-3.0-or-later" homepage="https://www.influxdata.com/time-series-platform/chronograf/" distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz" -checksum=df5600b2bd0b5ed0d3a3c548e5d72038b62fdda1501ad616eb1c1d82b054793a +checksum=ff294f25a9de57140024b9953992c1a4d79ec88167ad28435645d888a0096c27 system_accounts="_chronograf" _chronograf_homedir="/var/lib/${pkgname}" From 37d8679860e9cde6357d8c4ab8284872ac522a9a Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 1 Apr 2022 23:23:58 -0500 Subject: [PATCH 0495/2369] libnss-cache: update to 0.20. --- srcpkgs/libnss-cache/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libnss-cache/template b/srcpkgs/libnss-cache/template index 49b1cc76780..da8d918e3a7 100644 --- a/srcpkgs/libnss-cache/template +++ b/srcpkgs/libnss-cache/template @@ -1,6 +1,6 @@ # Template file for 'libnss-cache' pkgname=libnss-cache -version=0.17 +version=0.20 revision=1 wrksrc=$pkgname-version-$version build_style=gnu-makefile @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="LGPL-3.0" homepage="https://github.com/google/libnss-cache" distfiles="https://github.com/google/libnss-cache/archive/version/$version.tar.gz" -checksum=3777cbc46dc8d08144b99321d1f039718cd347d3be8ed66a8cb3722d3e6692f5 +checksum=71324b6035674028a0f39c98aedfbaed94adbcddd72dc1c4ab81308b135dd586 case "$XBPS_TARGET_MACHINE" in *musl) From 02a5d1bec855dc5f15953f1bae9903184aae7675 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 1 Apr 2022 23:35:20 -0500 Subject: [PATCH 0496/2369] libpam-policycache: update to 0.11. --- srcpkgs/libpam-policycache/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libpam-policycache/template b/srcpkgs/libpam-policycache/template index d40385708fe..6777b0856dd 100644 --- a/srcpkgs/libpam-policycache/template +++ b/srcpkgs/libpam-policycache/template @@ -1,7 +1,7 @@ # Template file for 'libpam-policycache' pkgname=libpam-policycache -version=0.10 -revision=2 +version=0.11 +revision=1 build_style=gnu-configure hostmakedepends="autoconf automake libtool pkg-config" makedepends="glib-devel libscrypt-devel pam-devel" @@ -10,7 +10,7 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://github.com/google/libpam-policycache" distfiles="https://github.com/google/libpam-policycache/archive/v$version.tar.gz" -checksum=7a8210d4a64980af11ff770578e724f2eae2aca56b4cc5977902290468f5aaf0 +checksum=d1a074493d3a4076094a79093ec02c8fdd886069b9624d8b6765f7a1e840fae6 CFLAGS="-Wno-error=deprecated-declarations" make_dirs="/etc/libpam-policycache.d 0755 root root From 65f92d244913068888cd743e81618ee0324a19e3 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 1 Apr 2022 23:45:34 -0500 Subject: [PATCH 0497/2369] yarn-bin: update to 1.22.18. --- srcpkgs/yarn-bin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yarn-bin/template b/srcpkgs/yarn-bin/template index 111cdd49457..01ce68263ad 100644 --- a/srcpkgs/yarn-bin/template +++ b/srcpkgs/yarn-bin/template @@ -1,6 +1,6 @@ # Template file for 'yarn-bin' pkgname=yarn-bin -version=1.22.10 +version=1.22.18 revision=1 depends="virtual?nodejs-runtime" short_desc="Fast, reliable, and secure dependency management - precompiled binaries" @@ -8,7 +8,7 @@ maintainer="Michael Aldridge " license="BSD-2-Clause" homepage="https://yarnpkg.com/" distfiles="https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz" -checksum=7e433d4a77e2c79e6a7ae4866782608a8e8bcad3ec6783580577c59538381a6e +checksum=816e5c073b3d35936a398d1fe769ebbcd517298e3510b649e8fc67cd3a62e113 conflicts="yarn>=0" do_extract() { From 921ffe92ae1d4f959c4923dbd86fa453e29e5cba Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 1 Apr 2022 23:51:16 -0500 Subject: [PATCH 0498/2369] yarn: update to 1.22.18. --- srcpkgs/yarn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yarn/template b/srcpkgs/yarn/template index aa9f68e53c4..834d72024cc 100644 --- a/srcpkgs/yarn/template +++ b/srcpkgs/yarn/template @@ -1,6 +1,6 @@ # Template file for 'yarn' pkgname=yarn -version=1.22.10 +version=1.22.18 revision=1 hostmakedepends="yarn-bin nodejs tar" depends="virtual?nodejs-runtime" @@ -9,7 +9,7 @@ maintainer="Michael Aldridge " license="BSD-2-Clause" homepage="https://yarnpkg.com/" distfiles="https://github.com/yarnpkg/${pkgname}/archive/v${version}.tar.gz" -checksum=66153f5fdd3078ce320c775990e4b4f03d5b596186f0e1fbceb34225abe3cd3e +checksum=accb0911b05329220a6fe7fd14d091add3b62535811ea97503e8579ae5812c2e conflicts="yarn-bin>=0" From 58c693ad0df6e0d092ce72c3041617f97c6a5214 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 1 Apr 2022 23:58:48 -0500 Subject: [PATCH 0499/2369] .github/workflows: clean up cycle check --- .github/workflows/{cron.yml => cycles.yml} | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) rename .github/workflows/{cron.yml => cycles.yml} (84%) diff --git a/.github/workflows/cron.yml b/.github/workflows/cycles.yml similarity index 84% rename from .github/workflows/cron.yml rename to .github/workflows/cycles.yml index 1b53808a758..e75297ac937 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cycles.yml @@ -1,18 +1,10 @@ -name: 'Scheduled tasks' +name: 'Cycle Check' on: schedule: - cron: '0 18 * * *' jobs: - lock: - runs-on: ubuntu-latest - steps: - - uses: dessant/lock-threads@v2 - with: - github-token: ${{ github.token }} - pr-lock-inactive-days: '90' - process-only: 'prs' cycles: runs-on: ubuntu-latest container: From a385dec53aef82ced88f5c49dfce6085d67c6cc6 Mon Sep 17 00:00:00 2001 From: teldra Date: Mon, 21 Feb 2022 11:44:15 +0100 Subject: [PATCH 0500/2369] kodi-addon-pvr-zattoo: update to 19.7.11. --- srcpkgs/kodi-addon-pvr-zattoo/template | 7 +++---- srcpkgs/kodi-addon-pvr-zattoo/update | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template index 79ebdc6c30a..e532a1bfdbe 100644 --- a/srcpkgs/kodi-addon-pvr-zattoo/template +++ b/srcpkgs/kodi-addon-pvr-zattoo/template @@ -1,7 +1,7 @@ # Template file for 'kodi-addon-pvr-zattoo' pkgname=kodi-addon-pvr-zattoo -version=19.7.8.1 -revision=3 +version=19.7.11 +revision=1 _kodi_release=Matrix wrksrc="pvr.zattoo-${version}-${_kodi_release}" build_style=cmake @@ -14,8 +14,7 @@ maintainer="teldra " license="GPL-2.0-only" homepage="https://github.com/rbuehlma/pvr.zattoo" distfiles="https://github.com/rbuehlma/pvr.zattoo/archive/${version}-${_kodi_release}.tar.gz" -checksum=25dc4ea72b5315a65286ba606e6e26d281fb8eb830d5e0164b66b8d7ae90319a -make_check=no # No target to "make test" +checksum=07d96b1b0c3b464c0bf02279fa8cab9ccdf675344129f3a970b14bafce225fb4 if [ -n "${CROSS_BUILD}" ]; then configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake" diff --git a/srcpkgs/kodi-addon-pvr-zattoo/update b/srcpkgs/kodi-addon-pvr-zattoo/update index 86efd6c4989..b7c348dae80 100644 --- a/srcpkgs/kodi-addon-pvr-zattoo/update +++ b/srcpkgs/kodi-addon-pvr-zattoo/update @@ -1,2 +1,2 @@ -ignore="19.* 512" +ignore="20* 512" pattern='\K[\d\.]+(?=-[A-Z][a-z])' From 5571a7b75c417a2a201f01edf0ff1ad7f4c30538 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 31 Mar 2022 20:14:50 +0200 Subject: [PATCH 0501/2369] emacs-gtk2: remove package --- srcpkgs/emacs-gtk2 | 1 - srcpkgs/emacs/template | 20 +------------------- srcpkgs/removed-packages/template | 1 + 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 120000 srcpkgs/emacs-gtk2 diff --git a/srcpkgs/emacs-gtk2 b/srcpkgs/emacs-gtk2 deleted file mode 120000 index a7642dd168d..00000000000 --- a/srcpkgs/emacs-gtk2 +++ /dev/null @@ -1 +0,0 @@ -emacs \ No newline at end of file diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template index 1cd4d18bd6a..9c4405ffc88 100644 --- a/srcpkgs/emacs/template +++ b/srcpkgs/emacs/template @@ -9,7 +9,7 @@ configure_args="--with-file-notification=inotify --with-modules $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt) $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)" hostmakedepends="pkg-config tar" -makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel +makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel dbus-devel acl-devel $(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel) $(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if xpm libXpm-devel) @@ -41,7 +41,6 @@ pre_configure() { mkdir -p nox mv * nox || true cp -a nox x11 - cp -a nox gtk2 cp -a nox gtk3 } @@ -54,9 +53,6 @@ do_configure() { $(vopt_with dbus) --without-gconf --without-gsettings \ ${configure_args} - cd $wrksrc/gtk2 - ./configure --with-x-toolkit=gtk2 ${configure_args} - cd $wrksrc/gtk3 ./configure --with-x-toolkit=gtk3 --with-xwidgets ${configure_args} } @@ -64,7 +60,6 @@ do_configure() { do_build() { make ${makejobs} -C nox make ${makejobs} -C x11 - make ${makejobs} -C gtk2 make ${makejobs} -C gtk3 } @@ -101,19 +96,6 @@ emacs-x11_package() { } } -emacs-gtk2_package() { - depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme" - provides="emacs-${version}_${revision}" - replaces="emacs>=0" - short_desc+=" - GTK+2 version" - pkg_install() { - make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/gtk2 install - rm -f ${PKGDESTDIR}/usr/bin/ctags - rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info} - rm -rf ${PKGDESTDIR}/usr/lib - } -} - emacs-gtk3_package() { depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme" provides="emacs-${version}_${revision}" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index df264c9d750..d5a5e66b8b1 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -68,6 +68,7 @@ replaces=" eclipse-ecj<=4.9_3 electron7<=7.3.3_1 electron9<=9.4.1_1 + emacs-gtk2<=27.2_1 enventor<=1.0.0_2 epstopdf<=2.27_3 flickcurl-devel<=1.26_4 From 5dbb92ca6bf29071439b344fbddf2b647907344f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 12:11:22 +0200 Subject: [PATCH 0502/2369] glib: bump shlibs --- common/shlibs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index ccc55a1b377..9f5333c203d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -84,11 +84,11 @@ libmagic.so.1 libmagic-5.12_1 libbluetooth.so.3 libbluetooth-4.58_1 libwmf-0.2.so.7 libwmf-0.2.8.4_1 libwmflite-0.2.so.7 libwmf-0.2.8.4_1 -libgthread-2.0.so.0 glib-2.70.0_1 -libglib-2.0.so.0 glib-2.70.0_1 -libgmodule-2.0.so.0 glib-2.70.0_1 -libgio-2.0.so.0 glib-2.70.0_1 -libgobject-2.0.so.0 glib-2.70.0_1 +libgthread-2.0.so.0 glib-2.72.0_1 +libglib-2.0.so.0 glib-2.72.0_1 +libgmodule-2.0.so.0 glib-2.72.0_1 +libgio-2.0.so.0 glib-2.72.0_1 +libgobject-2.0.so.0 glib-2.72.0_1 libatk-1.0.so.0 atk-1.26.0_1 libpangocairo-1.0.so.0 pango-1.24.0_1 libpangoft2-1.0.so.0 pango-1.24.0_1 From d42addf055b21ccc8ff40f500e3c79be14fb6927 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 12:12:16 +0200 Subject: [PATCH 0503/2369] vte3: bump shlibs --- common/shlibs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/shlibs b/common/shlibs index 9f5333c203d..7079375524f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -821,7 +821,7 @@ libvpx.so.6 libvpx6-1.8.0_1 libXevie.so.1 libXevie-1.0.2_1 libatspi.so.0 at-spi2-core-1.91.91_1 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1 -libvte-2.91.so.0 vte3-0.52.2_1 +libvte-2.91.so.0 vte3-0.68.0_1 libpipeline.so.1 libpipeline-1.2.0_1 libosp.so.5 opensp-1.5.2_1 libogrove.so.0 openjade-1.3.2_1 From ee05d995bf840966ebc30620211c71057be314b2 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Thu, 31 Mar 2022 20:36:55 -0400 Subject: [PATCH 0504/2369] hex: change binary name to avoid conflict --- srcpkgs/helix/template | 3 +-- srcpkgs/hex/template | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template index 17a819728ef..b454cc8fa87 100644 --- a/srcpkgs/helix/template +++ b/srcpkgs/helix/template @@ -1,7 +1,7 @@ # Template file for 'helix' pkgname=helix version=22.03 -revision=1 +revision=2 build_style=cargo make_install_args="--path helix-term" hostmakedepends="git" @@ -12,7 +12,6 @@ homepage="https://helix-editor.com/" changelog="https://github.com/helix-editor/helix/blob/master/CHANGELOG.md" distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz" checksum=a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4 -conflicts="hex>=0" # skip problematic doctests on i686 case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/hex/template b/srcpkgs/hex/template index 6295e03ddff..07bf3c269d2 100644 --- a/srcpkgs/hex/template +++ b/srcpkgs/hex/template @@ -1,7 +1,7 @@ # Template file for 'hex' pkgname=hex version=0.4.2 -revision=1 +revision=2 build_style=cargo short_desc="Futuristic take on hexdump" maintainer="SolitudeSF " @@ -11,5 +11,7 @@ distfiles="${homepage}/archive/v${version}.tar.gz" checksum=a7cc1ece337fc19e77fbbbca145001bc5d447bde4118eb6de2c99407eb1a3b74 post_install() { + # avoid conflict with helix + mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/bin/hex vlicense LICENSE } From cfc4ced65b17679c82f0fe120c73fa95a442bf94 Mon Sep 17 00:00:00 2001 From: teldra Date: Mon, 21 Feb 2022 10:17:21 +0100 Subject: [PATCH 0505/2369] radicale: update to 3.1.5. - remove conf file entry, because it changes filerights after updates --- srcpkgs/radicale/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template index 8d81e3b6130..65eb085022c 100644 --- a/srcpkgs/radicale/template +++ b/srcpkgs/radicale/template @@ -1,6 +1,6 @@ # Template file for 'radicale' pkgname=radicale -version=3.1.4 +version=3.1.5 revision=1 wrksrc="Radicale-${version}" build_style=python3-module @@ -14,11 +14,10 @@ license="GPL-3.0-or-later" homepage="https://radicale.org" changelog="https://github.com/Kozea/Radicale/blob/master/CHANGELOG.md" distfiles="https://github.com/Kozea/Radicale/archive/refs/tags/v${version}.tar.gz" -checksum=7658db3bb78ddb5934b573a875d1ef3ca6cfe932a4a15dc0c781126bea7f41c1 +checksum=1d631d0c0efd049c05fb32876d8e4f5662df4fa91f8aa6f52a994608d9a3e12d conf_files=" /etc/radicale/config /etc/radicale/rights - /etc/radicale/users /etc/sv/radicale/log/run" make_dirs=" /etc/radicale 755 root root @@ -33,7 +32,6 @@ replaces="radicale2<3.0.6" post_install() { vinstall config 644 etc/radicale/ vinstall rights 640 etc/radicale/ - vinstall /dev/null 640 etc/radicale users vinstall config 644 usr/share/examples/radicale vinstall radicale.wsgi 644 usr/share/radicale vsv radicale From 781bd35b0e399280f8e3d314905083235a64f6ae Mon Sep 17 00:00:00 2001 From: Wesley Chan Date: Tue, 19 Oct 2021 16:03:13 +0800 Subject: [PATCH 0506/2369] New package: acme.sh-3.0.2 --- srcpkgs/acme.sh/template | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 srcpkgs/acme.sh/template diff --git a/srcpkgs/acme.sh/template b/srcpkgs/acme.sh/template new file mode 100644 index 00000000000..92092c41e3b --- /dev/null +++ b/srcpkgs/acme.sh/template @@ -0,0 +1,24 @@ +# Template file for 'acme.sh' +pkgname=acme.sh +version=3.0.2 +revision=1 +short_desc="Pure Unix shell script implementing ACME client protocol" +maintainer="Wesley Chan " +license="GPL-3.0-or-later" +homepage="https://github.com/acmesh-official/acme.sh" +distfiles="https://github.com/acmesh-official/acme.sh/archive/refs/tags/${version}.tar.gz" +checksum=d6cda672697fe02cfa2a61bf74ec1b472aa797b03baead6deec625158965cee0 + +do_install() { + vmkdir usr/share/acme.sh/deploy + vmkdir usr/share/acme.sh/dnsapi + vmkdir usr/share/acme.sh/notify + vmkdir usr/bin + + vinstall acme.sh 755 usr/share/acme.sh/ + vcopy deploy/*.sh usr/share/acme.sh/deploy/ + vcopy dnsapi/*.sh usr/share/acme.sh/dnsapi/ + vcopy notify/*.sh usr/share/acme.sh/notify/ + + ln -sf /usr/share/acme.sh/acme.sh ${DESTDIR}/usr/bin/acme.sh +} From 26966e051dae4e47bb56d81e05a2d09f818dd642 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 29 Mar 2022 23:12:55 +0200 Subject: [PATCH 0507/2369] gawk: fix tests --- srcpkgs/gawk/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template index 0a79c2ca2c5..b922097b01f 100644 --- a/srcpkgs/gawk/template +++ b/srcpkgs/gawk/template @@ -21,6 +21,11 @@ alternatives=" pre_check() { vsed -i 's/done | more/done/g' test/Makefile + # This fixes tests on glibc, relevant tests on musl are disabled + # because the locale command doesn't exist. + vsed -i 's/en_US.ISO-8859-1//' test/localenl.sh + vsed -i '/^LC_ALL=en_US.ISO-8859-1 passed$/d' test/localenl.ok + case "$XBPS_TARGET_MACHINE" in *-musl) vsed -i '/testext/d' test/Makefile From 254658006aacadfe72accebf8aa171be032dc97c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 18:16:03 +0200 Subject: [PATCH 0508/2369] snixembed: fix checksum --- srcpkgs/snixembed/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/snixembed/template b/srcpkgs/snixembed/template index bc8c37948a8..aa6dedb561e 100644 --- a/srcpkgs/snixembed/template +++ b/srcpkgs/snixembed/template @@ -11,7 +11,7 @@ maintainer="projectmoon " license="ISC" homepage="https://git.sr.ht/~steef/snixembed" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=7f49fcd891ffa58be8b7e387a73cfd5b98a354aad3af1c76d9960a07cd92340e +checksum=1e735384a3edd80dcdc8a6d2cac39c1f7fd48543ab9488820e72851e62b0880b post_install() { vlicense LICENSE From c0f8a18f080b8fccc45e67bbffdad5ae488967f9 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 2 Apr 2022 18:15:57 +0300 Subject: [PATCH 0509/2369] mousepad: update to 0.5.9. --- srcpkgs/mousepad/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template index 1a85167aeb8..a471702954e 100644 --- a/srcpkgs/mousepad/template +++ b/srcpkgs/mousepad/template @@ -1,6 +1,6 @@ # Template file for 'mousepad' pkgname=mousepad -version=0.5.8 +version=0.5.9 revision=1 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale" @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://xfce.org/" changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS" distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=921ebbcfdfd5e2e56f31a5177a2d26f46c758cc972595017bca9e0a6a3c3a721 +checksum=f108a8c167ec5727266ab67666f10dbd60e972d56ea03944302fdabb2167f473 From b29e333bea43382c3be9da1672bf0a5d44c41313 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Wed, 30 Mar 2022 02:05:43 -0400 Subject: [PATCH 0510/2369] Manual.md: document the check functions The pre_/do_/post_check functions were not listed in the list of building phase functions, and were not mentioned elsewhere (do_check was mentioned once). This documents their existence. --- Manual.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Manual.md b/Manual.md index af5f698deba..8ec755499bb 100644 --- a/Manual.md +++ b/Manual.md @@ -1101,7 +1101,13 @@ still be passed in if it's a GNU configure script. - `post_build()` Actions to execute after `do_build()`. -- `pre_install()` Actions to execute after `post_build()`. +- `pre_check()` Actions to execute after `post_build()`. + +- `do_check()` Actions to execute to run checks for the package. + +- `post_check()` Actions to execute after `do_check()`. + +- `pre_install()` Actions to execute after `post_check()`. - `do_install()` Actions to execute to install the package files into the `fake destdir`. From 6ef0f50206f20006a5c5c0338060e576e1e5cb5f Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 2 Apr 2022 18:12:35 +0300 Subject: [PATCH 0511/2369] eclipse: update to 4.23. --- srcpkgs/eclipse/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template index cb4c8cfff42..d365b6ff06e 100644 --- a/srcpkgs/eclipse/template +++ b/srcpkgs/eclipse/template @@ -1,9 +1,9 @@ # Template file for 'eclipse' pkgname=eclipse -version=4.22 +version=4.23 revision=1 #code name of version -_release=2021-12 +_release=2022-03 archs="x86_64" wrksrc="eclipse" depends="openjdk11 gtk+3 webkit2gtk libXtst @@ -19,7 +19,7 @@ _patch=R _edition=java _mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse" distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz" -checksum=6d70a896ad70ef79f527447e5b0d1b373ca00179653ab2361aa9550d0a87068d +checksum=2905e74afac8ecbaaf2563d4c14a1a28100a7a03cb4b73b540df3607ee5bfa6f python_version=2 do_install() { From ed76f7badeffbd687d9cb159497501cab89a9d5d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 19:12:13 +0200 Subject: [PATCH 0512/2369] gupnp-dlna: add missing build dependency --- srcpkgs/gupnp-dlna/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gupnp-dlna/template b/srcpkgs/gupnp-dlna/template index 6286c09fb11..d88090126ee 100644 --- a/srcpkgs/gupnp-dlna/template +++ b/srcpkgs/gupnp-dlna/template @@ -6,7 +6,7 @@ build_style=gnu-configure build_helper="gir" configure_args="--disable-static $(vopt_enable gir introspection)" hostmakedepends="automake libtool pkg-config $(vopt_if vala vala)" -makedepends="gst-plugins-base1-devel $(vopt_if vala vala)" +makedepends="gst-plugins-base1-devel libxml2-devel $(vopt_if vala vala)" short_desc="GUPnP DLNA" maintainer="Orphaned " license="LGPL-2.1-or-later" From d780e3f755455b6019c6be04ace23053d1c7118d Mon Sep 17 00:00:00 2001 From: RunningDroid Date: Sun, 13 Feb 2022 23:08:59 -0500 Subject: [PATCH 0513/2369] New Package: python3-jq-1.2.2 --- srcpkgs/python3-jq/patches/jq-py-setup.patch | 143 +++++++++++++++++++ srcpkgs/python3-jq/template | 23 +++ 2 files changed, 166 insertions(+) create mode 100644 srcpkgs/python3-jq/patches/jq-py-setup.patch create mode 100644 srcpkgs/python3-jq/template diff --git a/srcpkgs/python3-jq/patches/jq-py-setup.patch b/srcpkgs/python3-jq/patches/jq-py-setup.patch new file mode 100644 index 00000000000..1eb4f28e7aa --- /dev/null +++ b/srcpkgs/python3-jq/patches/jq-py-setup.patch @@ -0,0 +1,143 @@ +From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001 +From: "Robert T. McGibbon" +Date: Fri, 7 May 2021 19:14:20 -0400 +Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility + +--- + setup.py | 98 +------------------------------------------------------- + 1 file changed, 1 insertion(+), 97 deletions(-) + +diff --git a/setup.py b/setup.py +index 663792c..3ebcabe 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,113 +1,19 @@ + #!/usr/bin/env python + + import os +-import subprocess +-import tarfile +-import shutil +-import sysconfig + +-import requests + from setuptools import setup +-from setuptools.command.build_ext import build_ext + from setuptools.extension import Extension + + +-def urlretrieve(source_url, destination_path): +- response = requests.get(source_url, stream=True) +- if response.status_code != 200: +- raise Exception("status code was: {}".format(response.status_code)) +- +- with open(destination_path, "wb") as fileobj: +- for chunk in response.iter_content(chunk_size=128): +- fileobj.write(chunk) +- +-def path_in_dir(relative_path): +- return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path)) +- +-def dependency_path(relative_path): +- return os.path.join(path_in_dir("_deps"), relative_path) +- + def read(fname): + return open(os.path.join(os.path.dirname(__file__), fname)).read() + + +-jq_lib_tarball_path = dependency_path("jq-lib-1.6.tar.gz") +-jq_lib_dir = dependency_path("jq-1.6") +- +-oniguruma_version = "6.9.4" +-oniguruma_lib_tarball_path = dependency_path("onig-{}.tar.gz".format(oniguruma_version)) +-oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version)) +-oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version)) +- +-class jq_build_ext(build_ext): +- def run(self): +- if not os.path.exists(dependency_path(".")): +- os.makedirs(dependency_path(".")) +- self._build_oniguruma() +- self._build_libjq() +- build_ext.run(self) +- +- def _build_oniguruma(self): +- self._build_lib( +- source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version), +- tarball_path=oniguruma_lib_tarball_path, +- lib_dir=oniguruma_lib_build_dir, +- commands=[ +- ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir], +- ["make"], +- ["make", "install"], +- ]) +- +- +- def _build_libjq(self): +- self._build_lib( +- source_url="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz", +- tarball_path=jq_lib_tarball_path, +- lib_dir=jq_lib_dir, +- commands=[ +- ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir], +- ["make"], +- ]) +- +- def _build_lib(self, source_url, tarball_path, lib_dir, commands): +- self._download_tarball( +- source_url=source_url, +- tarball_path=tarball_path, +- lib_dir=lib_dir, +- ) +- +- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET") +- if macosx_deployment_target: +- os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target) +- +- def run_command(args): +- print("Executing: %s" % ' '.join(args)) +- subprocess.check_call(args, cwd=lib_dir) +- +- for command in commands: +- run_command(command) +- +- def _download_tarball(self, source_url, tarball_path, lib_dir): +- if os.path.exists(tarball_path): +- os.unlink(tarball_path) +- print("Downloading {}".format(source_url)) +- urlretrieve(source_url, tarball_path) +- print("Downloaded {}".format(source_url)) +- +- if os.path.exists(lib_dir): +- shutil.rmtree(lib_dir) +- tarfile.open(tarball_path, "r:gz").extractall(dependency_path(".")) +- +- + jq_extension = Extension( + "jq", + sources=["jq.c"], +- include_dirs=[os.path.join(jq_lib_dir, "src")], +- extra_link_args=["-lm"], +- extra_objects=[ +- os.path.join(jq_lib_dir, ".libs/libjq.a"), +- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"), +- ], ++ libraries=["jq"] + ) + + setup( +@@ -120,7 +26,6 @@ setup( + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', + license='BSD 2-Clause', + ext_modules = [jq_extension], +- cmdclass={"build_ext": jq_build_ext}, + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', +@@ -137,4 +42,3 @@ setup( + 'Programming Language :: Python :: 3.9', + ], + ) +- +-- +2.29.3 diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template new file mode 100644 index 00000000000..52702247c21 --- /dev/null +++ b/srcpkgs/python3-jq/template @@ -0,0 +1,23 @@ +# Template file for 'python3-jq' +pkgname=python3-jq +version=1.2.2 +revision=1 +wrksrc="${pkgname#*-}.py-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools python3-Cython" +makedepends="python3-devel jq-devel" +depends="python3" +short_desc="Python bindings for jq" +maintainer="RunningDroid " +license="BSD-2-Clause" +homepage="https://pypi.org/project/jq/" +distfiles="https://github.com/mwilliamson/jq.py/archive/${version}.tar.gz" +checksum=0b926078855b6daee6e8ae5366ebf11c06911195abae643a7cdd37fce087fa0e + +pre_build() { + cython jq.pyx +} + +post_install() { + vlicense LICENSE +} From 6c9ce16f5680eb4f6d3c635bb3cdc08e7433eb9a Mon Sep 17 00:00:00 2001 From: RunningDroid Date: Sun, 27 Mar 2022 00:46:22 -0400 Subject: [PATCH 0514/2369] python3-minidb: update to 2.0.6. And remove pycompile_module so xlint passes --- srcpkgs/python3-minidb/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-minidb/template b/srcpkgs/python3-minidb/template index 7c63ae3ef62..f901265dbc3 100644 --- a/srcpkgs/python3-minidb/template +++ b/srcpkgs/python3-minidb/template @@ -1,10 +1,9 @@ # Template file for 'python3-minidb' pkgname=python3-minidb -version=2.0.2 -revision=5 +version=2.0.6 +revision=1 wrksrc="minidb-${version}" build_style=python3-module -pycompile_module="minidb.py" hostmakedepends="python3-setuptools" depends="python3" short_desc="Simple SQLite3 store for Python objects" @@ -12,7 +11,7 @@ maintainer="Steve Prybylski " license="ISC" homepage="https://thp.io/2010/minidb/" distfiles="https://github.com/thp/minidb/archive/${version}.tar.gz" -checksum=40a1992281dbfb63a90616db328c1babc3aabadd8844fdd676369e8df09d3b9f +checksum=7e4ef07d858d6e6118dfd000031e7698fb29b44bd8fe38e713d241fcaec6ee1e post_install() { sed -n '/# Copyright/,/OF THIS SOFTWARE./p' minidb.py > COPYING From 797ada95a54a8ca1431ab18c84b82aac361270b9 Mon Sep 17 00:00:00 2001 From: RunningDroid Date: Sun, 13 Feb 2022 23:09:28 -0500 Subject: [PATCH 0515/2369] urlwatch: update to 2.25. --- srcpkgs/urlwatch/patches/test_handler.patch | 14 ++++++++++++++ srcpkgs/urlwatch/template | 10 +++++----- 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/urlwatch/patches/test_handler.patch diff --git a/srcpkgs/urlwatch/patches/test_handler.patch b/srcpkgs/urlwatch/patches/test_handler.patch new file mode 100644 index 00000000000..73f301e49f9 --- /dev/null +++ b/srcpkgs/urlwatch/patches/test_handler.patch @@ -0,0 +1,14 @@ +Work around https://github.com/thp/urlwatch/issues/677 + +diff --git a/lib/urlwatch/tests/test_handler.py b/lib/urlwatch/tests/test_handler.py +index 736536a..fac9449 100644 +--- a/lib/urlwatch/tests/test_handler.py ++++ b/lib/urlwatch/tests/test_handler.py +@@ -89,6 +89,7 @@ def test_pep8_conformance(): + + class ConfigForTest(CommandConfig): + def __init__(self, config, urls, cache, hooks, verbose): ++ sys.argv = sys.argv[:1] + (prefix, bindir) = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0]))) + super().__init__('urlwatch', os.path.dirname(__file__), bindir, prefix, config, urls, hooks, cache, verbose) + diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template index a10260a19af..0d15244c6ac 100644 --- a/srcpkgs/urlwatch/template +++ b/srcpkgs/urlwatch/template @@ -1,7 +1,7 @@ # Template file for 'urlwatch' pkgname=urlwatch -version=2.23 -revision=2 +version=2.25 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-appdirs python3-keyring python3-minidb python3-requests @@ -9,18 +9,18 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests # Check the Docs for optional packages: # https://urlwatch.readthedocs.io/en/latest/dependencies.html#optional-packages checkdepends="python3-pytest python3-pycodestyle python3-docutils - python3-Pygments ${depends}" + python3-Pygments python3-jq ${depends}" short_desc="Tool for monitoring webpages for updates" maintainer="RunningDroid " license="BSD-3-Clause" homepage="https://thp.io/2008/urlwatch/" distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz" -checksum=73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842 +checksum=6802297d3318286e7f3d36b9a4567a2fb09b0ae779d4b76811dd29a7281c1f8a do_check() { # skip the tests that require python modules that aren't packaged # (pdftotext & pytesseract) - pytest -k "not (pdf or ocr or json)" -v + pytest -k 'not (pdf or ocr)' -v } post_install() { From 2701ebc55d69bae61ff8433dab0356299153a084 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 2 Apr 2022 19:44:02 +0200 Subject: [PATCH 0516/2369] knot: update to 3.1.7. --- srcpkgs/knot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template index bf1f6107ab5..a8f43d8d92a 100644 --- a/srcpkgs/knot/template +++ b/srcpkgs/knot/template @@ -1,6 +1,6 @@ # Template file for 'knot' pkgname=knot -version=3.1.6 +version=3.1.7 revision=1 build_style=gnu-configure configure_args=" @@ -18,7 +18,7 @@ maintainer="Duncaen " license="GPL-3.0-or-later" homepage="https://www.knot-dns.cz/" distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz" -checksum=e9ba1305d750dc08fb08687aec7ac55737ca073deaa0b867c884e0c0f2fdb753 +checksum=ffb6887e238ce4c7df0cc76bb55a5093465275201ac12156a3390782dc49857b system_accounts="_knot" _knot_homedir="/var/lib/knot" From 2e964e462ca2a8239eac08138a156abbd52514f2 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 2 Apr 2022 19:44:27 +0200 Subject: [PATCH 0517/2369] poke: update to 2.3. --- srcpkgs/poke/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/poke/template b/srcpkgs/poke/template index b562e96c8a4..126a3fd67bb 100644 --- a/srcpkgs/poke/template +++ b/srcpkgs/poke/template @@ -1,6 +1,6 @@ # Template file for 'poke' pkgname=poke -version=2.1 +version=2.3 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="https://www.jemarch.net/poke.html" changelog="https://www.jemarch.net/poke-${version}-relnotes.html" distfiles="${GNU_SITE}/poke/poke-${version}.tar.gz" -checksum=cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670 +checksum=3690cf1116da7cb3a9ec6b4f7003e253e268b510212a288fd38aafed0ebcc766 poke-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From d9de3ff9c445eb78b8a0dee65b00ffdf8ca45f94 Mon Sep 17 00:00:00 2001 From: lemmi Date: Sat, 2 Apr 2022 21:38:24 +0200 Subject: [PATCH 0518/2369] obs: update to 27.2.4. --- srcpkgs/obs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index f8599214a12..df6ee22e52e 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,6 +1,6 @@ # Template file for 'obs' pkgname=obs -version=27.2.0 +version=27.2.4 revision=1 archs="i686* x86_64* ppc64le* aarch64*" wrksrc="obs-studio-${version}" @@ -19,7 +19,7 @@ license="GPL-2.0-or-later" homepage="https://obsproject.com" changelog="https://github.com/obsproject/obs-studio/releases" distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz" -checksum=c52d99cba6c536cb805e3e0f54663c33cfc43a1b7521bec97d241019499f9789 +checksum=f7297a7421cbfe2bb4bc6bf83659bb873bc8f1186667c35c34bdbaac3f0fd5fd obs-devel_package() { short_desc+=" - development files" From f827922d4ef2613d55a74f440b9b838a6c540492 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Wed, 23 Mar 2022 18:09:45 -0400 Subject: [PATCH 0519/2369] python3-shapely: update to 1.8.1. --- srcpkgs/python3-shapely/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template index 8a1cf715847..7ca8f0ddd04 100644 --- a/srcpkgs/python3-shapely/template +++ b/srcpkgs/python3-shapely/template @@ -1,10 +1,11 @@ # Template file for 'python3-shapely' pkgname=python3-shapely -version=1.8.0 -revision=2 -wrksrc="Shapely-${version}" +version=1.8.1 +revision=1 +wrksrc="shapely-${version}" build_style=python3-module build_helper=numpy +make_check_target=tests hostmakedepends="python3-setuptools python3-Cython geos" makedepends="python3-devel python3-numpy geos-devel" depends="python3" @@ -12,9 +13,9 @@ checkdepends="python3-pytest" short_desc="Library for manipulation and analysis of geometric objects for Python3" maintainer="Karl Nilsson " license="BSD-3-Clause" -homepage="https://github.com/Toblerity/Shapely" -distfiles="https://github.com/Toblerity/Shapely/archive/${version}.tar.gz" -checksum=492d4207b20541e3d0f31c238e07d2f55fe5e00afcfd12390bf55737901fce91 +homepage="https://github.com/shapely/shapely" +distfiles="https://github.com/shapely/shapely/archive/${version}.tar.gz" +checksum=daf4d5ceae7d1e4053d96af760377b843787cae0b42e6d9d19eb832204c7c8a4 pre_configure() { if [ "$CROSS_BUILD" ]; then @@ -29,7 +30,3 @@ pre_configure() { post_install() { vlicense LICENSE.txt LICENSE } - -do_check() { - python3 -m pytest tests/ -} From 6211084fe2c21e47799baf9bdcfeb0aa8935a313 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Tue, 29 Mar 2022 13:16:51 -0400 Subject: [PATCH 0520/2369] python3-pycollada: update to 0.7.2. --- srcpkgs/python3-pycollada/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pycollada/template b/srcpkgs/python3-pycollada/template index 7aae1200635..89e7c15a05b 100644 --- a/srcpkgs/python3-pycollada/template +++ b/srcpkgs/python3-pycollada/template @@ -1,7 +1,7 @@ # Template file for 'python3-pycollada' pkgname=python3-pycollada -version=0.7.1 -revision=3 +version=0.7.2 +revision=1 wrksrc="pycollada-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ maintainer="Karl Nilsson " license="BSD-3-Clause" homepage="https://pycollada.readthedocs.io/en/latest/" distfiles="https://github.com/pycollada/pycollada/archive/v${version}.tar.gz" -checksum=b0b8e1fd17e3e5a7c1befcb5ec4fa0ead1318c5ca340bb930f62f9809fbce8a1 +checksum=e3c29857a65b3dd9c0375c1074195195fc3dada95d6b5c78d246b005f2e85c93 post_install() { vlicense COPYING From 12cb61ce2d31666c1cbdf81d2f7ebf841fa7dc9c Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Tue, 14 Dec 2021 14:45:51 -0500 Subject: [PATCH 0521/2369] python3-trimesh: update to 3.10.7. --- srcpkgs/python3-trimesh/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template index e716da77167..e51b6eb62f9 100644 --- a/srcpkgs/python3-trimesh/template +++ b/srcpkgs/python3-trimesh/template @@ -1,6 +1,6 @@ # Template file for 'python3-trimesh' pkgname=python3-trimesh -version=3.9.34 +version=3.10.7 revision=1 wrksrc="trimesh-${version}" build_style=python3-module @@ -10,14 +10,13 @@ depends="python3-numpy python3-scipy python3-networkx python3-lxml python3-pyglet python3-shapely python3-rtree python3-Pillow python3-svg.path python3-jsonschema python3-psutil python3-chardet python3-sympy python3-msgpack python3-pycollada python3-requests" -# unit tests fail on x86 https://github.com/mikedh/trimesh/issues/690 checkdepends="$depends python3-pytest" short_desc="Python3 library for loading and using triangular meshes" maintainer="Karl Nilsson " license="MIT" homepage="https://trimsh.org/" distfiles="https://github.com/mikedh/trimesh/archive/${version}.tar.gz" -checksum=713a959be0f93c049d0735f573b814cfa704c5bbfaf0c607facb61ede5a8ab2e +checksum=e98fd2dff632729fc6fb963653b91d9f4a5a6a9a1f79493dd885e3e4d1f9c4da post_install() { vlicense LICENSE.md @@ -29,3 +28,8 @@ do_check() { vsed -i 's/coveralls//' setup.py python3 -m pytest } + +# disable tests for i686 +if [ "$XBPS_WORDSIZE" -eq "32" ]; then + make_check=no # https://github.com/mikedh/trimesh/issues/690; +fi From da393b328ec03c49fbfe3cd15d5a65f44beb2c9c Mon Sep 17 00:00:00 2001 From: iaroki Date: Sun, 3 Apr 2022 00:12:43 +0300 Subject: [PATCH 0522/2369] gopls: update to 0.8.2. --- srcpkgs/gopls/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template index 434fc7fd0de..963253e7b4e 100644 --- a/srcpkgs/gopls/template +++ b/srcpkgs/gopls/template @@ -1,6 +1,6 @@ # Template file for 'gopls' pkgname=gopls -version=0.7.4 +version=0.8.2 revision=1 wrksrc=tools-gopls-v${version} build_wrksrc=gopls @@ -11,7 +11,7 @@ maintainer="Renato Aguiar " license="MIT" homepage="https://github.com/golang/tools" distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz" -checksum=7ce445846ffb0a33faed244206b142f9d307f326a35d09d18c6267538203bcf7 +checksum=761aa768e82a958e6f803db39215c995fe0f263df825ed1cbb9f6b2989f0cd00 post_install() { vlicense ../LICENSE From f3ba7ab949feb3a10d1f9b8f7900bb45f056a157 Mon Sep 17 00:00:00 2001 From: skmpz Date: Fri, 1 Apr 2022 19:40:47 +0400 Subject: [PATCH 0523/2369] calibre: update to 5.40.0. --- srcpkgs/calibre/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index 9f59df3a035..036b195ac99 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,6 +1,6 @@ # Template file for 'calibre' pkgname=calibre -version=5.39.0 +version=5.40.0 revision=1 build_style=python3-module pycompile_dirs="/usr/lib/calibre/" @@ -27,7 +27,7 @@ license="GPL-3.0-only" homepage="https://calibre-ebook.com" changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt" distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz" -checksum=2fbe45ec9d4dea481772cc290e27567efdba60cd9d2fe736713d9b1eb020582e +checksum=e0ec0e2352926f165f4b9cbe67666ea2bd181f7cb702e98487391168a099d794 python_version=3 lib32disabled=yes nocross=yes From 4cc79007d5101ea3b66d8e26a6e4541283e16d6d Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Sat, 2 Apr 2022 11:09:17 -0400 Subject: [PATCH 0524/2369] python3-svg.path: update to 5.1. --- srcpkgs/python3-svg.path/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-svg.path/template b/srcpkgs/python3-svg.path/template index 6abf6ff8ca8..0d92697a0a9 100644 --- a/srcpkgs/python3-svg.path/template +++ b/srcpkgs/python3-svg.path/template @@ -1,17 +1,20 @@ # Template file for 'python3-svg.path' pkgname=python3-svg.path -version=4.1 -revision=3 +version=5.1 +revision=1 wrksrc="svg.path-${version}" build_style=python3-module +# disable failing test +make_check_args="-k not(ImageTest)" hostmakedepends="python3-setuptools" depends="python3" +checkdepends="python3-pytest-cov python3-Pillow" short_desc="Python3 SVG path parser" maintainer="Karl Nilsson " license="MIT" homepage="https://github.com/regebro/svg.path" distfiles="https://github.com/regebro/svg.path/archive/${version}.tar.gz" -checksum=8fe78a5ff8f379c78dac4a3ba623068a8a2af434dace24103a053e06525d400d +checksum=2ea5351a5886f8c55ae8fddb2f7182dca3d5760c03abade9cb256b91e4bb9bb4 post_install() { vlicense LICENSE.txt From dd7225919fb032e73712b76a318b7672587ea062 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sat, 2 Apr 2022 16:07:02 +0300 Subject: [PATCH 0525/2369] qutebrowser: update to 2.5.0. --- srcpkgs/qutebrowser/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template index 5dc61ab30aa..4368870992a 100644 --- a/srcpkgs/qutebrowser/template +++ b/srcpkgs/qutebrowser/template @@ -1,6 +1,6 @@ # Template file for 'qutebrowser' pkgname=qutebrowser -version=2.4.0 +version=2.5.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools asciidoc" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="https://qutebrowser.org/" changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc" distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz" -checksum=f2cd9abb14ebabf9630573b2fb8447be192877787dc4e3964e1b55f72a8592ec +checksum=e18442a230570f25918a2e89ad4d073ace46c4f59b5fdda2e80ab3c4764451fd nostrip=yes # testing requires unpackaged plugins: # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures From 665aa8001cce74906310afa30bdd020814cec731 Mon Sep 17 00:00:00 2001 From: Bas Ploeger <5904333+basploeger@users.noreply.github.com> Date: Fri, 1 Apr 2022 20:59:18 +0200 Subject: [PATCH 0526/2369] html-xml-utils: update to 8.4. --- srcpkgs/html-xml-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/html-xml-utils/template b/srcpkgs/html-xml-utils/template index 81fda5d90a2..8086cc66849 100644 --- a/srcpkgs/html-xml-utils/template +++ b/srcpkgs/html-xml-utils/template @@ -1,6 +1,6 @@ # Template file for 'html-xml-utils' pkgname=html-xml-utils -version=8.3 +version=8.4 revision=1 build_style=gnu-configure makedepends="libidn-devel" @@ -9,4 +9,4 @@ maintainer="Orphaned " license="W3C" homepage="https://www.w3.org/Tools/HTML-XML-utils/README" distfiles="https://www.w3.org/Tools/HTML-XML-utils/${pkgname}-${version}.tar.gz" -checksum=a50c4d16dad660ad6792ef53bc77efa9d5729797623771a3fce52d8e23d3d08c +checksum=41bb9b14e1f4cd6102e3f8dfb79e7146a24c09693869873165c421769a57d137 From 4fcb295a68b2d78339a427fb650446304dc5bd15 Mon Sep 17 00:00:00 2001 From: skmpz Date: Fri, 1 Apr 2022 20:08:19 +0400 Subject: [PATCH 0527/2369] libgcrypt: update to 1.10.1. --- srcpkgs/libgcrypt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template index b3285e6f8ed..52cae347860 100644 --- a/srcpkgs/libgcrypt/template +++ b/srcpkgs/libgcrypt/template @@ -1,6 +1,6 @@ # Template file for 'libgcrypt' pkgname=libgcrypt -version=1.10.0 +version=1.10.1 revision=1 build_style=gnu-configure configure_args="--enable-static --without-capabilities" @@ -10,7 +10,7 @@ maintainer="skmpz " license="LGPL-2.1-or-later" homepage="https://www.gnupg.org" distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2" -checksum=6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81 +checksum=ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de if [ "$CROSS_BUILD" ]; then configure_args+=" ac_cv_sys_symbol_underscore=no" From 64065b8722057a152e2fd3d8b60c94f6ebed13ff Mon Sep 17 00:00:00 2001 From: Ricardo Steijn Date: Sat, 2 Apr 2022 19:06:32 +0200 Subject: [PATCH 0528/2369] lutris: update to 0.5.10 --- srcpkgs/lutris/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template index 431fcf6c59a..a59268c0c16 100644 --- a/srcpkgs/lutris/template +++ b/srcpkgs/lutris/template @@ -1,6 +1,6 @@ # Template file for 'lutris' pkgname=lutris -version=0.5.9.1 +version=0.5.10 revision=1 build_style=meson hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel" @@ -13,4 +13,4 @@ license="GPL-3.0-or-later" homepage="https://lutris.net" changelog="https://raw.githubusercontent.com/lutris/lutris/master/debian/changelog" distfiles="https://github.com/lutris/lutris/archive/v${version}.tar.gz" -checksum=c140ec6ac62b4f9eeaa7065229dfa1c4fb08194bc0fb118c831d894c43914f88 +checksum=f174fdbff15bb26c4bdf531d4e75b9e3954f858297f811cb478f46a9d183f2d0 From 71848ffbfe08b696e57212f8d10cc241f8a2b513 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Fri, 1 Apr 2022 16:00:59 +0200 Subject: [PATCH 0529/2369] qpwgraph: update to 0.2.4. --- srcpkgs/qpwgraph/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qpwgraph/template b/srcpkgs/qpwgraph/template index cb19601bbb8..5e83972a706 100644 --- a/srcpkgs/qpwgraph/template +++ b/srcpkgs/qpwgraph/template @@ -1,6 +1,6 @@ # Template file for 'qpwgraph' pkgname=qpwgraph -version=0.2.2 +version=0.2.4 revision=1 wrksrc="qpwgraph-v${version}" build_style=cmake @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://gitlab.freedesktop.org/rncbc/qpwgraph" changelog="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/ChangeLog" distfiles="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/archive/v${version}/qpwgraph-v${version}.tar.gz" -checksum=622592c7fab8be3281eefee8979706ea8a063c98eb0f48a0c4c87655c3de7abf +checksum=5e2ad77e794367e3e1e6df5214e8770135941092ffac49bbbaaf7619decb54b5 From 0ff873217dd5e0f62d993d6a95dbac5b0f3ec501 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 31 Mar 2022 02:49:32 +0200 Subject: [PATCH 0530/2369] shared-mime-info: update to 2.2. --- .../shared-mime-info/patches/meson-0.60.patch | 100 ------------------ srcpkgs/shared-mime-info/template | 8 +- 2 files changed, 4 insertions(+), 104 deletions(-) delete mode 100644 srcpkgs/shared-mime-info/patches/meson-0.60.patch diff --git a/srcpkgs/shared-mime-info/patches/meson-0.60.patch b/srcpkgs/shared-mime-info/patches/meson-0.60.patch deleted file mode 100644 index 2faa5992584..00000000000 --- a/srcpkgs/shared-mime-info/patches/meson-0.60.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Mon, 8 Nov 2021 18:22:47 -0500 -Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating - translated XML - -gettext upstream has supported this for a very long time (since 0.19.7 -via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015), -and itstool is (mostly) a legacy of the time before gettext had proper -support for these sorts of use cases. - -This is similar to the state of intltool, which is described at -https://wiki.gnome.org/MigratingFromIntltoolToGettext - -During the port from autotools to meson, the legacy use of itstool was -faithfully translated to meson in the only way possible: by jumping -through hoops to run ninja inside ninja in order to generate the .mo -files for itstool, because meson's i18n module used a flawed design and -there was no "real" target to create those files, only a .PHONY -run_target which other rules cannot depend on. - -Although meson 0.60.0 added support for real targets for the built .mo -files, this changed the rules for output filenames, breaking the script. - -But msgfmt does not care, and anyways comes with builtin meson functions -for convenient use with XML files. So let's take this opportunity to -drop legacy dependencies and use the modern, builtin tooling, which -fixes this bug as a side effect. - -Fixes #170 ---- - .gitlab-ci.yml | 2 -- - README.md | 2 +- - data/freedesktop_generate.sh | 12 ------------ - data/meson.build | 16 +++++----------- - meson.build | 1 - - 5 files changed, 6 insertions(+), 27 deletions(-) - delete mode 100755 data/freedesktop_generate.sh - -diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh -deleted file mode 100755 -index 62ccffa..0000000 ---- a/data/freedesktop_generate.sh -+++ /dev/null -@@ -1,12 +0,0 @@ --#!/bin/sh -e -- --src_root="$1" --build_root="$2" -- --ninja -C "${build_root}" shared-mime-info-gmo -- --itstool \ -- --its "${src_root}/data/its/shared-mime-info.its" \ -- --join "${src_root}/data/freedesktop.org.xml.in" \ -- -o "${build_root}/data/freedesktop.org.xml" \ -- "${build_root}/po/"*".gmo" -diff --git a/data/meson.build b/data/meson.build -index 24361c9..09ed7a9 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,18 +1,12 @@ - - install_man('update-mime-database.1') - --freedesktop_org_xml = custom_target('freedesktop.org.xml', -- input : files( -- 'freedesktop.org.xml.in', -- 'its/shared-mime-info.its', -- 'its/shared-mime-info.loc', -- ), -+freedesktop_org_xml = i18n.merge_file( -+ input: 'freedesktop.org.xml.in', - output: 'freedesktop.org.xml', -- command: [ -- find_program('freedesktop_generate.sh'), -- meson.source_root(), -- meson.build_root() -- ], -+ data_dirs: '.', -+ po_dir: '../po', -+ type: 'xml', - install: true, - install_dir: get_option('datadir') / 'mime' / 'packages', - ) -diff --git a/meson.build b/meson.build -index 0d08c8a..60f17ae 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,7 +20,6 @@ config.set_quoted('VERSION', meson.project_version()) - ############################################################################### - # Find tools - --itstool = find_program('itstool') - xmllint = find_program('xmllint') - xmlto = find_program('xmlto', required: false) - --- -GitLab - diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template index f5afb2dd54c..0fd71959fff 100644 --- a/srcpkgs/shared-mime-info/template +++ b/srcpkgs/shared-mime-info/template @@ -1,7 +1,7 @@ # Template file for 'shared-mime-info' pkgname=shared-mime-info -version=2.1 -revision=2 +version=2.2 +revision=1 build_style=meson configure_args="-Dupdate-mimedb=false" hostmakedepends="pkg-config gettext xmlto" @@ -11,5 +11,5 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://freedesktop.org/Software/shared-mime-info" changelog="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/raw/master/NEWS" -distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-${version}.tar.xz" -checksum=b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563 +distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${version}/shared-mime-info-${version}.tar.gz" +checksum=bcf5d552318136cf7b3ae259975f414fbcdc9ebce000c87cf1f0901ff14e619f From cafd949df7cb4363d4e3fe063b42bd9a7c67e14f Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Mon, 28 Mar 2022 19:28:16 +0200 Subject: [PATCH 0531/2369] chatterino2: update to 2.3.4. --- .../patches/0001-fix-desktop-icon-name.patch | 13 +++ .../patches/0001-use-system-deps.patch | 58 ------------- srcpkgs/chatterino2/patches/cmake.patch | 36 ++++++++ srcpkgs/chatterino2/template | 84 ++++++++++--------- 4 files changed, 92 insertions(+), 99 deletions(-) create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch create mode 100644 srcpkgs/chatterino2/patches/cmake.patch diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch new file mode 100644 index 00000000000..9f41d03190b --- /dev/null +++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch @@ -0,0 +1,13 @@ +diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop +index 6ee45354..ece81f5c 100644 +--- a/chatterino2/resources/com.chatterino.chatterino.desktop ++++ b/chatterino2/resources/com.chatterino.chatterino.desktop +@@ -4,7 +4,7 @@ Version=1.0 + Name=Chatterino + Comment=Chat client for Twitch + Exec=chatterino +-Icon=chatterino ++Icon=com.chatterino.chatterino + Terminal=false + Categories=Network;InstantMessaging; + StartupWMClass=chatterino diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch deleted file mode 100644 index 383c5ea23f4..00000000000 --- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git chatterino.pro chatterino.pro -index d8b14bbe..f7657f06 100644 ---- a/chatterino.pro -+++ b/chatterino.pro -@@ -12,10 +12,17 @@ - # - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only) - - QT += widgets core gui network multimedia svg concurrent --CONFIG += communi --COMMUNI += core model util - - INCLUDEPATH += src/ -+# libcommuni -+INCLUDEPATH += /usr/include/qt5/Communi/IrcCore -+INCLUDEPATH += /usr/include/qt5/Communi/IrcModel -+INCLUDEPATH += /usr/include/qt5/Communi/IrcUtil -+DEFINES += IRC_SHARED -+LIBS += -lIrcCore -lIrcModel -lIrcUtil -+# qtkeychain -+INCLUDEPATH += /usr/include/qt5keychain -+LIBS += -lqt5keychain - TARGET = chatterino - TEMPLATE = app - PRECOMPILED_HEADER = src/PrecompiledHeader.hpp -@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) { - include(lib/warnings.pri) - include(lib/fmt.pri) - include(lib/humanize.pri) --include(lib/libcommuni.pri) - include(lib/websocketpp.pri) - include(lib/wintoast.pri) - include(lib/signals.pri) -@@ -86,7 +92,6 @@ include(lib/settings.pri) - include(lib/serialize.pri) - include(lib/winsdk.pri) - include(lib/rapidjson.pri) --include(lib/qtkeychain.pri) - - exists( $$OUT_PWD/conanbuildinfo.pri ) { - message("Using conan packages") -diff --git src/common/Credentials.cpp src/common/Credentials.cpp -index 87abecb9..5de78130 100644 ---- a/src/common/Credentials.cpp -+++ b/src/common/Credentials.cpp -@@ -1,12 +1,12 @@ - #include "Credentials.hpp" - - #include "debug/AssertInGuiThread.hpp" --#include "keychain.h" - #include "singletons/Paths.hpp" - #include "singletons/Settings.hpp" - #include "util/CombinePath.hpp" - #include "util/Overloaded.hpp" - -+#include - #include - #include - diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch new file mode 100644 index 00000000000..a59d0a4eb9f --- /dev/null +++ b/srcpkgs/chatterino2/patches/cmake.patch @@ -0,0 +1,36 @@ +diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake +index 82905436..b0b89a4e 100644 +--- a/chatterino2/cmake/FindLRUCache.cmake ++++ b/chatterino2/cmake/FindLRUCache.cmake +@@ -1,6 +1,6 @@ + include(FindPackageHandleStandardArgs) + +-find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache) ++find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache NO_CMAKE_FIND_ROOT_PATH) + + find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR) + +diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake +index 4671874c..119284c2 100644 +--- a/chatterino2/cmake/FindPajladaSerialize.cmake ++++ b/chatterino2/cmake/FindPajladaSerialize.cmake +@@ -1,6 +1,6 @@ + include(FindPackageHandleStandardArgs) + +-find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include) ++find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include NO_CMAKE_FIND_ROOT_PATH) + + find_package_handle_standard_args(PajladaSerialize DEFAULT_MSG PajladaSerialize_INCLUDE_DIR) + +diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake +index f4c964ec..75efba20 100644 +--- a/chatterino2/cmake/FindPajladaSignals.cmake ++++ b/chatterino2/cmake/FindPajladaSignals.cmake +@@ -1,6 +1,6 @@ + include(FindPackageHandleStandardArgs) + +-find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include) ++find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include NO_CMAKE_FIND_ROOT_PATH) + + find_package_handle_standard_args(PajladaSignals DEFAULT_MSG PajladaSignals_INCLUDE_DIR) + diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template index f69730b3a9f..e1f99ac9e9f 100644 --- a/srcpkgs/chatterino2/template +++ b/srcpkgs/chatterino2/template @@ -1,55 +1,57 @@ # Template file for 'chatterino2' pkgname=chatterino2 -version=2.2.2 -revision=2 -_signals_commit=6665ccad90461c01b7fe704a98a835953d644156 -_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450 -_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be -_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144 -build_style=qmake -configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore - INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel - INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil" -hostmakedepends="qt5-qmake qt5-host-tools pkg-config" -makedepends="qt5-svg-devel qt5-multimedia-devel - boost-devel rapidjson libcommuni-devel websocketpp - qtkeychain-qt5-devel" -short_desc="Qt-based twitch chat client" -maintainer="Franc[e]sco " -license="MIT" +version=2.3.4 +revision=1 +_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868" +_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469" +_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c" +_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc" +_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9" +_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b" +create_wrksrc=yes +build_wrksrc="chatterino2" +build_style=cmake +hostmakedepends="qt5-qmake qt5-host-tools" +makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel + boost-devel openssl-devel rapidjson websocketpp" +depends="qt5-imageformats qt5-svg" +short_desc="Chat client for twitch.tv" +maintainer="Orphaned " +license=MIT homepage="https://chatterino.com" changelog="https://chatterino.com/changelog" -distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz - https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz +distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz + https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz + https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz - https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz - https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz" -checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70 -e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66 -f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe -5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0 -eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454" + https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz + https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz + https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz" +checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c + ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4 + d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63 + 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5 + 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46 + 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7 + f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" - configure_args+=" LIBS+=-latomic" + LIBS="-latomic" fi post_extract() { - rmdir lib/signals - rmdir lib/settings - rmdir lib/humanize - rmdir lib/serialize - mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/ - mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/ - mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/ - mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/ -} - -pre_configure() { - # it wraps libcommuni in a namespace but void's binaries don't - find \( -name '*.cpp' -o -name '*.hpp' \) \ - -exec sed -i "{}" -e 's/Communi::/::/g' \; + mv "chatterino2-${version}" "${build_wrksrc}" + rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \ + ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \ + ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \ + ${build_wrksrc}/lib/qtkeychain ${build_wrksrc}/cmake/sanitizers-cmake + mv "libcommuni-${_libcommuni_commit}" "${build_wrksrc}/lib/libcommuni" + mv "serialize-${_serialize_commit}" "${build_wrksrc}/lib/serialize" + mv "settings-${_settings_commit}" "${build_wrksrc}/lib/settings" + mv "signals-${_signals_commit}" "${build_wrksrc}/lib/signals" + mv "qtkeychain-${_qtkeychain_commit}" "${build_wrksrc}/lib/qtkeychain" + mv "sanitizers-cmake-${_sanitizers_cmake_commit}" "${build_wrksrc}/cmake/sanitizers-cmake" } post_install() { From 3cf615fdae9bf8114d88d555a956d9abb19609bc Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Fri, 1 Apr 2022 21:45:08 +0200 Subject: [PATCH 0532/2369] sonic-visualiser: update to 4.5 --- srcpkgs/sonic-visualiser/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template index fbc1ea3067c..a61f4cf5721 100644 --- a/srcpkgs/sonic-visualiser/template +++ b/srcpkgs/sonic-visualiser/template @@ -1,7 +1,7 @@ # Template file for 'sonic-visualiser' pkgname=sonic-visualiser -version=4.4 -revision=2 +version=4.5 +revision=1 build_style=meson hostmakedepends="pkg-config capnproto-devel qt5-host-tools" makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel @@ -14,7 +14,7 @@ license="GPL-2.0-or-later" homepage="https://www.sonicvisualiser.org/" changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG" distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz" -checksum=762d95cfceff5f2ba31bb632596f6c822ca5b4ee21f3e3615add20bfc24ae16e +checksum=c57b8277b51e7b0accdc6c3b5a575d3961b43ed9e5e0661e053a6ac388ab82a3 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From 47d25a40a43c08a0442cb79da79970255e7624e2 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 Apr 2022 02:32:24 +0200 Subject: [PATCH 0533/2369] go: fix build on ppc64le-musl --- .../fix-ppc64le-startup-detection.patch | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 srcpkgs/go/patches/fix-ppc64le-startup-detection.patch diff --git a/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch b/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch new file mode 100644 index 00000000000..6cc2ab33724 --- /dev/null +++ b/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch @@ -0,0 +1,81 @@ +From 946167906ed8646c433c257b074a10e01f0a7dab Mon Sep 17 00:00:00 2001 +From: "Paul E. Murphy" +Date: Tue, 22 Mar 2022 11:52:02 -0500 +Subject: [PATCH] runtime: make static/dynamic startup detection work with musl + on ppc64le + +The glibc loader explicitly sets the first doubleword on the stack (R1) +to $0 to indicate it was dynamically loaded. + +An ELFv2 ABI compliant loader will set R3/R4 to argc/argv when starting +the process, and R13 to TLS. musl is not compliant. Instead it passes +argc/argv like the kernel, but R3/R4 are in an undefined state and R13 +is valid. + +With the knowledge above, the startup code can be modified to +dynamically handle all three cases when linked internally. + +Fixes #51787 + +Change-Id: I5de33862c161900d9161817388bbc13a65fdc69c +Reviewed-on: https://go-review.googlesource.com/c/go/+/394654 +Reviewed-by: Cherry Mui +Run-TryBot: Paul Murphy +TryBot-Result: Gopher Robot +Trust: Paul Murphy +Trust: Lynn Boger +--- + src/runtime/rt0_linux_ppc64le.s | 32 +++++++++++++++++++++----------- + 1 file changed, 21 insertions(+), 11 deletions(-) + +diff --git a/src/runtime/rt0_linux_ppc64le.s b/src/runtime/rt0_linux_ppc64le.s +index 4f7c6e6c99f6..66f7e7b22a41 100644 +--- a/go/src/runtime/rt0_linux_ppc64le.s ++++ b/go/src/runtime/rt0_linux_ppc64le.s +@@ -147,25 +147,35 @@ TEXT _main<>(SB),NOSPLIT,$-8 + // In a statically linked binary, the stack contains argc, + // argv as argc string pointers followed by a NULL, envv as a + // sequence of string pointers followed by a NULL, and auxv. +- // There is no TLS base pointer. ++ // The TLS pointer should be initialized to 0. + // +- // In a dynamically linked binary, r3 contains argc, r4 +- // contains argv, r5 contains envp, r6 contains auxv, and r13 ++ // In an ELFv2 compliant dynamically linked binary, R3 contains argc, ++ // R4 contains argv, R5 contains envp, R6 contains auxv, and R13 + // contains the TLS pointer. + // +- // Figure out which case this is by looking at r4: if it's 0, +- // we're statically linked; otherwise we're dynamically +- // linked. +- CMP R0, R4 +- BNE dlink +- +- // Statically linked ++ // When loading via glibc, the first doubleword on the stack points ++ // to NULL a value. (that is *(uintptr)(R1) == 0). This is used to ++ // differentiate static vs dynamicly linked binaries. ++ // ++ // If loading with the musl loader, it doesn't follow the ELFv2 ABI. It ++ // passes argc/argv similar to the linux kernel, R13 (TLS) is ++ // initialized, and R3/R4 are undefined. ++ MOVD (R1), R12 ++ CMP R0, R12 ++ BEQ tls_and_argcv_in_reg ++ ++ // Arguments are passed via the stack (musl loader or a static binary) + MOVD 0(R1), R3 // argc + ADD $8, R1, R4 // argv ++ ++ // Did the TLS pointer get set? If so, don't change it (e.g musl). ++ CMP R0, R13 ++ BNE tls_and_argcv_in_reg ++ + MOVD $runtime·m0+m_tls(SB), R13 // TLS + ADD $0x7000, R13 + +-dlink: ++tls_and_argcv_in_reg: + BR main(SB) + + TEXT main(SB),NOSPLIT,$-8 From 5ca6abbdc57d3397b2cfe0b2abcd51d1e4b26f9e Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 31 Mar 2022 02:45:46 +0200 Subject: [PATCH 0534/2369] chromium: update to 100.0.4896.60. Closes https://github.com/void-linux/void-packages/pull/36433 --- ...romium-100-SCTHashdanceMetadata-move.patch | 35 +++++++++ .../disable-aarch64-memory-tagging.patch | 16 ----- ...x-aarch64-musl-memory-tagging-macros.patch | 29 ++++++++ .../fix-build-break-with-system-libdrm.patch | 62 ---------------- .../patches/fix-stack-utils-with-musl.patch | 12 ++-- ...ne_MM_Var-in-CFX_Font-AdjustMMParams.patch | 71 ------------------- .../patches/xxx-ppc64le-support.patch | 12 ++-- srcpkgs/chromium/template | 4 +- 8 files changed, 78 insertions(+), 163 deletions(-) create mode 100644 srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch delete mode 100644 srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch create mode 100644 srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch delete mode 100644 srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch delete mode 100644 srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch diff --git a/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch b/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch new file mode 100644 index 00000000000..903942906c7 --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch @@ -0,0 +1,35 @@ +From 364dc0067d1c20c7a2d21277a7ec0c4419d9bc11 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Wed, 23 Feb 2022 12:18:57 +0100 +Subject: [PATCH] GCC: explicitely move return value of SCTHashdanceMetadata::ToValue + +GCC rejects to do Return Value Optimization in +SCTHashdanceMetadata::ToValue, because the copy constructor is +deleted, and in that scenario RVO is rejected in GCC: + ../../services/network/sct_auditing/sct_auditing_reporter.cc: In member function ‘base::Value network::SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const’: + ../../services/network/sct_auditing/sct_auditing_reporter.cc:191:10: error: use of deleted function ‘base::Value::Value(const base::Value&)’ + 191 | return value; + | ^~~~~ + In file included from ../../services/network/sct_auditing/sct_auditing_reporter.h:14, + from ../../services/network/sct_auditing/sct_auditing_reporter.cc:5: + ../../base/values.h:254:3: note: declared here + 254 | Value(const Value&) = delete; + | ^~~~~ + +Bug: 819294 +Change-Id: I111e51dd10eee7b909d4ac3c0911aac18a589166 +--- + +diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc +index a057e8e..365527b 100644 +--- a/services/network/sct_auditing/sct_auditing_reporter.cc ++++ b/services/network/sct_auditing/sct_auditing_reporter.cc +@@ -188,7 +188,7 @@ + kLogIdKey, base::Base64Encode(base::as_bytes(base::make_span(log_id)))); + value.SetKey(kLogMMDKey, base::TimeDeltaToValue(log_mmd)); + value.SetKey(kCertificateExpiry, base::TimeToValue(certificate_expiry)); +- return value; ++ return std::move(value); + } + + // static diff --git a/srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch b/srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch deleted file mode 100644 index 0596c6364a6..00000000000 --- a/srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch +++ /dev/null @@ -1,16 +0,0 @@ -This is broken in the current release and would require a lot of patches to be -backported. Remove this patch for the next release. - ---- a/base/memory/tagging.h -+++ b/base/memory/tagging.h -@@ -14,10 +14,6 @@ - #include "base/compiler_specific.h" - #include "build/build_config.h" - --#if defined(ARCH_CPU_ARM64) && defined(__clang__) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)) --#define HAS_MEMORY_TAGGING 1 --#endif - - constexpr int kMemTagGranuleSize = 16u; - #if defined(HAS_MEMORY_TAGGING) diff --git a/srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch b/srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch new file mode 100644 index 00000000000..afcdae17985 --- /dev/null +++ b/srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch @@ -0,0 +1,29 @@ +--- a/base/allocator/partition_allocator/tagging.cc ++++ b/base/allocator/partition_allocator/tagging.cc +@@ -28,13 +28,25 @@ + #endif + #endif + +-#ifndef HAS_PR_MTE_MACROS ++#ifndef PR_MTE_TCF_SHIFT + #define PR_MTE_TCF_SHIFT 1 ++#endif ++#ifndef PR_MTE_TCF_NONE + #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT) ++#endif ++#ifndef PR_MTE_TCF_SYNC + #define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT) ++#endif ++#ifndef PR_MTE_TCF_ASYNC + #define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT) ++#endif ++#ifndef PR_MTE_TCF_MASK + #define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT) ++#endif ++#ifndef PR_MTE_TAG_SHIFT + #define PR_MTE_TAG_SHIFT 3 ++#endif ++#ifndef PR_MTE_TAG_MASK + #define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT) + #endif + #endif diff --git a/srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch b/srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch deleted file mode 100644 index fe8eee6d1e9..00000000000 --- a/srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 5b287e0be8d8d8475ec6ef81b16eaa61e19db078 Mon Sep 17 00:00:00 2001 -From: "Steinar H. Gunderson" -Date: Tue, 25 Jan 2022 19:14:53 +0000 -Subject: [PATCH] Fix build break with system libdrm. - -This patch is submitted on behalf of Andres Salomon - (on Cc). Also adding him to src/AUTHORS -per policy, as he has signed the CLA. - -Original patch: -https://salsa.debian.org/dilinger/chromium/-/commit/2333c2fb985ac1ef3d7331776a7833d965c63302 - -Change-Id: I18bd60e2e80f2b9181e74ee7972c3f457ab33b10 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3401704 -Reviewed-by: Andres Calderon Jaramillo -Commit-Queue: Steinar H Gunderson -Auto-Submit: Steinar H Gunderson -Cr-Commit-Position: refs/heads/main@{#963119} ---- - AUTHORS | 1 + - media/gpu/chromeos/BUILD.gn | 1 + - media/gpu/chromeos/video_decoder_pipeline.cc | 2 +- - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/AUTHORS b/AUTHORS -index 0eba3de5065..50edd3f6b38 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -93,6 +93,7 @@ Andreas Papacharalampous - Andrei Borza - Andrei Parvu - Andrei Parvu -+Andres Salomon - Andreu Botella - Andrew Boyarshin - Andrew Brampton -diff --git a/media/gpu/chromeos/BUILD.gn b/media/gpu/chromeos/BUILD.gn -index 7cb4c3ea39a..6fe21c15ecc 100644 ---- a/media/gpu/chromeos/BUILD.gn -+++ b/media/gpu/chromeos/BUILD.gn -@@ -25,6 +25,7 @@ source_set("chromeos") { - - deps = [ - "//base", -+ "//build/config/linux/libdrm", - "//media", - "//media/gpu:buildflags", - "//media/gpu:command_buffer_helper", -diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc -index d2f154ea0d8..416b9434a8d 100644 ---- a/media/gpu/chromeos/video_decoder_pipeline.cc -+++ b/media/gpu/chromeos/video_decoder_pipeline.cc -@@ -28,8 +28,8 @@ - #include "third_party/abseil-cpp/absl/types/optional.h" - - #if BUILDFLAG(USE_VAAPI) -+#include - #include "media/gpu/vaapi/vaapi_video_decoder.h" --#include "third_party/libdrm/src/include/drm/drm_fourcc.h" - #elif BUILDFLAG(USE_V4L2_CODEC) - #include "media/gpu/v4l2/v4l2_video_decoder.h" - #else diff --git a/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch b/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch index bb48d95312b..7936aa6e0db 100644 --- a/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch +++ b/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch @@ -4,17 +4,17 @@ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size // correctly for the main thread. --#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ -+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ - defined(OS_FUCHSIA) +-#elif defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \ ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \ + BUILDFLAG(IS_FUCHSIA) // pthread_getattr_np() can fail if the thread is not invoked by // pthread_create() (e.g., the main thread of blink_unittests). @@ -97,7 +97,7 @@ } void* GetStackStart() { --#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ - defined(OS_FUCHSIA) +-#if defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \ ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \ + BUILDFLAG(IS_FUCHSIA) pthread_attr_t attr; int error; diff --git a/srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch b/srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch deleted file mode 100644 index 2cdbd02a826..00000000000 --- a/srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch +++ /dev/null @@ -1,71 +0,0 @@ -From ffeb67faf715475f6e463d65c368f556780adf19 Mon Sep 17 00:00:00 2001 -From: Lei Zhang -Date: Mon, 31 Jan 2022 22:42:35 +0000 -Subject: [PATCH] Use FT_Done_MM_Var() in CFX_Font::AdjustMMParams() when - possible. - -When FreeType has FT_Done_MM_Var(), use that to free memory in -CFX_Font::AdjustMMParams() to avoid mismatched alloc/free functions. - -Bug: pdfium:1400 -Change-Id: I044540893103921fc64cdd53fcd628cfebf2c9db -Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/90130 -Reviewed-by: Nigi -Commit-Queue: Lei Zhang ---- - core/fxge/cfx_font.cpp | 28 ++++++++++++++++++++++++++-- - 1 file changed, 26 insertions(+), 2 deletions(-) - -diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp -index c08fe9608..8b3a72700 100644 ---- a/third_party/pdfium/core/fxge/cfx_font.cpp -+++ b/third_party/pdfium/core/fxge/cfx_font.cpp -@@ -44,6 +44,30 @@ struct OUTLINE_PARAMS { - float m_CoordUnit; - }; - -+// TODO(crbug.com/pdfium/1400): When FT_Done_MM_Var() is more likely to be -+// available to all users in the future, remove FreeMMVar() and use -+// FT_Done_MM_Var() directly. -+// -+// Use weak symbols to check if FT_Done_MM_Var() is available at runtime. -+#if !BUILDFLAG(IS_WIN) -+extern "C" __attribute__((weak)) decltype(FT_Done_MM_Var) FT_Done_MM_Var; -+#endif -+ -+void FreeMMVar(FXFT_FaceRec* rec, FXFT_MM_VarPtr variation_desc) { -+#if BUILDFLAG(IS_WIN) -+ // Assume `use_system_freetype` GN var is never set on Windows. -+ constexpr bool has_ft_done_mm_var_func = true; -+#else -+ static const bool has_ft_done_mm_var_func = !!FT_Done_MM_Var; -+#endif -+ if (has_ft_done_mm_var_func) { -+ FT_Done_MM_Var(CFX_GEModule::Get()->GetFontMgr()->GetFTLibrary(), -+ variation_desc); -+ } else { -+ FXFT_Free(rec, variation_desc); -+ } -+} -+ - FX_RECT FXRectFromFTPos(FT_Pos left, FT_Pos top, FT_Pos right, FT_Pos bottom) { - return FX_RECT(pdfium::base::checked_cast(left), - pdfium::base::checked_cast(top), -@@ -645,7 +669,7 @@ void CFX_Font::AdjustMMParams(int glyph_index, - FT_Pos max_width = FXFT_Get_Glyph_HoriAdvance(m_Face->GetRec()) * 1000 / - FXFT_Get_Face_UnitsPerEM(m_Face->GetRec()); - if (max_width == min_width) { -- FXFT_Free(m_Face->GetRec(), pMasters); -+ FreeMMVar(m_Face->GetRec(), pMasters); - return; - } - FT_Pos param = min_param + (max_param - min_param) * -@@ -653,7 +677,7 @@ void CFX_Font::AdjustMMParams(int glyph_index, - (max_width - min_width); - coords[1] = param; - } -- FXFT_Free(m_Face->GetRec(), pMasters); -+ FreeMMVar(m_Face->GetRec(), pMasters); - FT_Set_MM_Design_Coordinates(m_Face->GetRec(), 2, coords); - } - diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch index b95e58c834b..0be29c1a4ee 100644 --- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch +++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch @@ -3403,10 +3403,10 @@ index 9ab5e00b8..ad3feffee 100755 template_sources = _Glob("libdav1d/src/*_tmpl.c") _WriteArray(fd, "template_sources", template_sources) -diff --git a/third_party/dav1d/libdav1d/src/ppc/types.h b/third_party/dav1d/libdav1d/src/ppc/types.h +diff --git a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h index 0b4bd72f0..a0caa5e71 100644 ---- a/third_party/dav1d/libdav1d/src/ppc/types.h -+++ b/third_party/dav1d/libdav1d/src/ppc/types.h +--- a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h ++++ b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h @@ -51,4 +51,19 @@ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0))) #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v)) @@ -3520,17 +3520,17 @@ diff --git a/third_party/skia/src/sksl/SkSLString.cpp b/third_party/skia/src/sks index ec3e56964..4cf8999a2 100644 --- a/third_party/skia/src/sksl/SkSLString.cpp +++ b/third_party/skia/src/sksl/SkSLString.cpp -@@ -234,7 +234,12 @@ String to_string(double value) { +@@ -37,7 +37,12 @@ String to_string(double value) { if (needsDotZero) { buffer << ".0"; } -- return String(buffer.str().c_str()); +- return buffer.str(); + + std::string ret(buffer.str()); + if (signbit(value) && ret[0] == '.') { + ret[0] = '-'; + } -+ return String(ret.c_str()); ++ return ret; } bool stod(const StringFragment& s, SKSL_FLOAT* value) { diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index f6154e22375..96b34227a32 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=99.0.4844.84 +version=100.0.4896.60 revision=1 archs="i686* x86_64* aarch64* armv7l* ppc64le*" short_desc="Google's attempt at creating a safer, faster, and more stable browser" @@ -9,7 +9,7 @@ maintainer="Duncaen " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=20ec184ed34bdc7e660ccf6c007b2db37007de423b3a5a51698a96aa29527515 +checksum=0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc lib32disabled=yes From dfc62bec5ad9b0c2996021bcfbc7d7891bd0f97a Mon Sep 17 00:00:00 2001 From: Abigail G Date: Wed, 18 Aug 2021 23:10:00 -0400 Subject: [PATCH 0535/2369] New package: LimeSuite-20.10.0 --- common/shlibs | 1 + srcpkgs/LimeSuite-devel | 1 + srcpkgs/LimeSuite-doc | 1 + srcpkgs/LimeSuite/template | 87 ++++++++++++++++++++++++++++++++++++++ srcpkgs/SoapyLMS7 | 1 + 5 files changed, 91 insertions(+) create mode 120000 srcpkgs/LimeSuite-devel create mode 120000 srcpkgs/LimeSuite-doc create mode 100644 srcpkgs/LimeSuite/template create mode 120000 srcpkgs/SoapyLMS7 diff --git a/common/shlibs b/common/shlibs index 7079375524f..b0c6fe696e5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4145,3 +4145,4 @@ librz_lang.so.0.3.4 rizin-0.3.4_1 librz_search.so.0.3.4 rizin-0.3.4_1 librz_bin.so.0.3.4 rizin-0.3.4_1 libaravis-0.8.so.0 libaravis-0.8.21_1 +libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1 diff --git a/srcpkgs/LimeSuite-devel b/srcpkgs/LimeSuite-devel new file mode 120000 index 00000000000..4431f3d5064 --- /dev/null +++ b/srcpkgs/LimeSuite-devel @@ -0,0 +1 @@ +LimeSuite \ No newline at end of file diff --git a/srcpkgs/LimeSuite-doc b/srcpkgs/LimeSuite-doc new file mode 120000 index 00000000000..4431f3d5064 --- /dev/null +++ b/srcpkgs/LimeSuite-doc @@ -0,0 +1 @@ +LimeSuite \ No newline at end of file diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template new file mode 100644 index 00000000000..44f119784ff --- /dev/null +++ b/srcpkgs/LimeSuite/template @@ -0,0 +1,87 @@ +# Template file for 'LimeSuite' +pkgname=LimeSuite +version=20.10.0 +revision=1 +build_style=cmake +build_helper=cmake-wxWidgets-gtk3 +configure_args=" + -DENABLE_SIMD_FLAGS=none + -DENABLE_UTILITIES=True + -DENABLE_LIME_UTIL=True + -DCMAKE_SKIP_RPATH=True + -DENABLE_DESKTOP=False + -DENABLE_SOAPY_LMS7=True + -DENABLE_PCIE_XILLYBUS=True + -DENABLE_QUICKTEST=True + -DENABLE_MCU_TESTBENCH=True + -DENABLE_FTDI=True + -DENABLE_FX3=True + -DENABLE_STREAM_UNITE=True + -DENABLE_EXAMPLES=True + -DENABLE_HEADERS=True + -DENABLE_GUI=True + -DENABLE_API_DOXYGEN=True + $(vopt_bool octave ENABLE_OCTAVE) + -DLIME_SUITE_EXTVER=${version}_${revision}" +hostmakedepends="doxygen" +makedepends="gnuplot wxWidgets-gtk3-devel libusb-devel SoapySDR-devel libfreeglut-devel + fltk-devel glew-devel sqlite-devel libgomp-devel $(vopt_if octave octave)" +depends="wget" +short_desc="Driver and GUI for LimeSDR/LMS7002M-based SDR platforms" +maintainer="classabbyamp " +license="Apache-2.0" +homepage="https://myriadrf.org/projects/lime-suite/" +distfiles="https://github.com/myriadrf/LimeSuite/archive/refs/tags/v${version}.tar.gz" +checksum=f6d79dc67cb52a5aea839d1dc00e65f85367cb2c275d77f149833d32cf79b467 +shlib_provides="libLimeSuite.so.20.10-1" + +build_options="octave" +desc_option_octave="Enable the LimeSuite Octave plugin" + +# Octave is not built on arm, so don't enable the build option by default on those archs +case "$XBPS_TARGET_MACHINE" in + arm*|aarch64*) build_options_default="" ;; + *) build_options_default="octave" ;; +esac + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" +fi + +post_install() { + vinstall udev-rules/64-limesuite.rules 644 usr/lib/udev/rules.d + + for res in 16 22 32 48 64 128; do + _icon_dir="usr/share/icons/hicolor/${res}x${res}/apps" + vmkdir $_icon_dir + vinstall Desktop/lime-suite-$res.png 644 $_icon_dir lime-suite.png + done + vinstall Desktop/lime-suite.desktop 755 usr/share/applications +} + +LimeSuite-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} + +LimeSuite-doc_package() { + short_desc+=" - documentation" + pkg_install() { + vdoc docs/lms7_api_quick_start_guide.pdf + vdoc docs/StreamProtocol.pdf + vcopy docs/LMS_API_Documentation usr/share/doc/$pkgname + } +} + +SoapyLMS7_package() { + short_desc="SoapySDR module for LimeSDR/LMS7002M" + pkg_install() { + vmove usr/lib/SoapySDR/modules0.7/libLMS7Support.so + } +} diff --git a/srcpkgs/SoapyLMS7 b/srcpkgs/SoapyLMS7 new file mode 120000 index 00000000000..4431f3d5064 --- /dev/null +++ b/srcpkgs/SoapyLMS7 @@ -0,0 +1 @@ +LimeSuite \ No newline at end of file From a87714812694b34fb096f8d56589a95f4e1f82f0 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Tue, 4 Jan 2022 19:19:19 -0600 Subject: [PATCH 0536/2369] wireshark: update to 3.6.3. --- common/shlibs | 6 ++-- .../patches/HAVE_C99_VSNPRINTF.patch | 35 +++++++++++++++++++ srcpkgs/wireshark/patches/cross.patch | 2 +- srcpkgs/wireshark/template | 29 ++++++++++++--- 4 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch diff --git a/common/shlibs b/common/shlibs index b0c6fe696e5..1007c400288 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1573,9 +1573,9 @@ libdovecot-compression.so.0 dovecot-2.3.13_3 libdovecot-sql.so.0 dovecot-2.3.13_3 libdovecot-storage.so.0 dovecot-2.3.13_3 libdovecot-lda.so.0 dovecot-2.3.13_3 -libwiretap.so.11 libwireshark-3.4.0_1 -libwireshark.so.14 libwireshark-3.4.0_1 -libwsutil.so.12 libwireshark-3.4.0_1 +libwiretap.so.12 libwireshark-3.6.3_1 +libwireshark.so.15 libwireshark-3.6.3_1 +libwsutil.so.13 libwireshark-3.6.3_1 libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1 libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1 libKF5Prison.so.5 prison-5.43.0_1 diff --git a/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch b/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch new file mode 100644 index 00000000000..b500598fd36 --- /dev/null +++ b/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch @@ -0,0 +1,35 @@ +--- a/ConfigureChecks.cmake 2021-12-29 13:12:48.000000000 -0600 ++++ b/ConfigureChecks.cmake 2022-01-06 06:45:07.907628761 -0600 +@@ -104,32 +104,6 @@ + check_symbol_exists(tzname "time.h" HAVE_TZNAME) + + # +-# Check if the libc vsnprintf() conforms to C99. If this fails we may +-# need to fall-back on GLib I/O. +-# +-check_c_source_runs(" +- #include +- int main(void) +- { +- /* Check that snprintf() and vsnprintf() don't return +- * -1 if the buffer is too small. C99 says this value +- * is the length that would be written not including +- * the nul byte. */ +- char buf[3]; +- return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1; +- }" +- HAVE_C99_VSNPRINTF +-) +-if (NOT HAVE_C99_VSNPRINTF) +- message(FATAL_ERROR +-"Building Wireshark requires a C99 compliant vsnprintf() and this \ +-target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \ +-using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \ +-developers at wireshark-dev@wireshark.org." +- ) +-endif() +- +-# + # *If* we found libnl, check if we can use nl80211 stuff with it. + # + if (NL_FOUND) diff --git a/srcpkgs/wireshark/patches/cross.patch b/srcpkgs/wireshark/patches/cross.patch index 46dcc949c72..d454505b827 100644 --- a/srcpkgs/wireshark/patches/cross.patch +++ b/srcpkgs/wireshark/patches/cross.patch @@ -33,7 +33,7 @@ Upstream: no # These files are generated as side-effect ${_out}.h ${_out}.out -- COMMAND lemon +- COMMAND $ + COMMAND ${EXECUTABLE_OUTPUT_PATH}/lemon -T${_lemonpardir}/lempar.c -d. diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index fae420888bf..4d0d23c7ed5 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,11 +1,10 @@ # Template file for 'wireshark' pkgname=wireshark -version=3.4.5 +version=3.6.3 revision=1 build_style=cmake -configure_args="-DCMAKE_BUILD_TYPE=None" hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel -qt5-tools qt5-host-tools qt5-qmake" +qt5-tools qt5-host-tools qt5-qmake ruby-asciidoctor" makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel libmaxminddb-devel libgcrypt-devel libcap-devel sbc-devel c-ares-devel libxml2-devel libssh-devel libnl3-devel spandsp-devel tiff-devel libcap-progs liblz4-devel @@ -17,7 +16,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.wireshark.org" distfiles="https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz" -checksum=de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333 +checksum=b60364a4c0068a10811ab3fd075ca6c1eb0e75d44600271b88a20ed93a2ef631 system_groups="wireshark" CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2" @@ -33,6 +32,26 @@ pre_check() { ninja -C build test-programs } +if [ "${XBPS_ALLOW_CHROOT_BREAKOUT}" = "yes" ]; then +do_check() { + # Many tests fail when run as root (i.e. in CI) + test/test.py --disable-capture -p build/run \ + suite_decryption \ + suite_dissectors.group_asterix \ + suite_extcaps \ + suite_fileformats \ + suite_follow \ + suite_follow_dccp \ + suite_follow_multistream \ + suite_io \ + suite_mergecap \ + suite_netperfmeter \ + suite_release \ + suite_text2pcap \ + suite_unittests +} +fi + post_install() { rm -f -- "${DESTDIR}/usr/bin/lemon" rm -f -- "${DESTDIR}/usr/lib/wireshark/cmake/UseLemon.cmake" @@ -77,6 +96,6 @@ wireshark-qt_package() { pkg_install() { vmove usr/bin/wireshark vmove usr/share/man/man1/wireshark.1 - vmove usr/share/applications/wireshark.desktop + vmove usr/share/applications/org.wireshark.Wireshark.desktop } } From 74c83217dfd546a986e36afa66e1780508f8ceb4 Mon Sep 17 00:00:00 2001 From: Michal Tvrznik Date: Fri, 1 Apr 2022 07:58:16 +0200 Subject: [PATCH 0537/2369] emptty: update to 0.7.1. --- srcpkgs/emptty/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template index 6fccd5d53e1..2bbbbf4a11e 100644 --- a/srcpkgs/emptty/template +++ b/srcpkgs/emptty/template @@ -1,6 +1,6 @@ # Template file for 'emptty' pkgname=emptty -version=0.6.2 +version=0.7.1 revision=1 build_style=go go_import_path=github.com/tvrzna/emptty @@ -10,7 +10,7 @@ maintainer="xXR01I1Xx " license="MIT" homepage="https://github.com/tvrzna/emptty" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=a750c5cbaeda6b4d0367d18cedf27d884e6fb9a0c7b20819dc878cf7d5a5013b +checksum=1d86dc0623773d43f9ced8c699ee82c812065ba18ecf277061210392fb2ec56a conf_files="/etc/emptty/conf /etc/pam.d/emptty" post_install() { From 74d09da0f39b9bba2b899bce2de9b947b26e6eff Mon Sep 17 00:00:00 2001 From: Omar Zeghouani Date: Thu, 31 Mar 2022 23:21:56 +0100 Subject: [PATCH 0538/2369] StyLua: update to 0.13.0. --- srcpkgs/StyLua/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template index ab22a3c9297..b6dc22c3875 100644 --- a/srcpkgs/StyLua/template +++ b/srcpkgs/StyLua/template @@ -1,6 +1,6 @@ # Template file for 'StyLua' pkgname=StyLua -version=0.12.4 +version=0.13.0 revision=1 build_style=cargo configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if luau '--features luau')" @@ -10,7 +10,7 @@ license="MPL-2.0" homepage="https://github.com/JohnnyMorganz/StyLua" changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/master/CHANGELOG.md" distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz" -checksum=ce6b4a6767b17f8d609e8c9d666c5f6f5c2863edd0638e70392bfe55f99b4fd0 +checksum=ad74d1f47b0337810459dab9b49694bd5bd6c8c7381a35dcab7866752652988b build_options="lua52 luau" build_options_default="lua52 luau" From 83f8118dd06178f5d4bdac9da12b88a35579d66f Mon Sep 17 00:00:00 2001 From: Savoy Date: Mon, 7 Feb 2022 12:29:38 -0600 Subject: [PATCH 0539/2369] New package: mandown-0.1.2 --- srcpkgs/mandown/template | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/mandown/template diff --git a/srcpkgs/mandown/template b/srcpkgs/mandown/template new file mode 100644 index 00000000000..5ae9b32020d --- /dev/null +++ b/srcpkgs/mandown/template @@ -0,0 +1,11 @@ +# Template file for 'mandown' +pkgname=mandown +version=0.1.2 +revision=1 +build_style=cargo +short_desc="Create man pages from markdown markup" +maintainer="Savoy " +license="Apache-2.0" +homepage="https://gitlab.com/kornelski/mandown" +distfiles="https://gitlab.com/kornelski/mandown/-/archive/$version/mandown-$version.tar.gz" +checksum=ea26e2bf0ab1ebf4bea858072aa582b11d667a07e05b61bc50cfe5c2b382894a From 2ea206b4d7155d7fccb3f631ce0953866002707d Mon Sep 17 00:00:00 2001 From: 0x5c Date: Sat, 2 Apr 2022 23:06:14 -0400 Subject: [PATCH 0540/2369] vpsm: update upstream, clean suid bit - The suid permission bit was incorrectly being set. It is now gone. See #32156 - The upstream README indicates a move to a new GH account. --- srcpkgs/vpsm/patches/setuid-fix.patch | 19 +++++++++++++++++++ srcpkgs/vpsm/template | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/vpsm/patches/setuid-fix.patch diff --git a/srcpkgs/vpsm/patches/setuid-fix.patch b/srcpkgs/vpsm/patches/setuid-fix.patch new file mode 100644 index 00000000000..3a2ec1a1c40 --- /dev/null +++ b/srcpkgs/vpsm/patches/setuid-fix.patch @@ -0,0 +1,19 @@ +Do not apply the setuid permission bit on the vpsm script + +See https://github.com/void-linux/void-packages/issues/32156 +see https://github.com/sineto/vpsm/pull/2 + + +-- + +--- a/Makefile ++++ b/Makefile +@@ -16,7 +16,7 @@ + + .PHONY: install + install: +- install -Dm4755 vpsm $(DESTDIR)$(PREFIX)/bin/vpsm ++ install -Dm755 vpsm $(DESTDIR)$(PREFIX)/bin/vpsm + install -Dm644 man/vpsm.1 $(DESTDIR)/$(PREFIX)/share/man/man1/vpsm.1 + + .PHONY: uninstall diff --git a/srcpkgs/vpsm/template b/srcpkgs/vpsm/template index 62805298d06..ead8e89e6ba 100644 --- a/srcpkgs/vpsm/template +++ b/srcpkgs/vpsm/template @@ -1,13 +1,13 @@ # Template file for 'vpsm' pkgname=vpsm version=0.1.2 -revision=1 +revision=2 build_style=gnu-makefile depends="bash xtools ripgrep hub" short_desc="Void-Packages Sources Management wrapper for XBPS-SRC" maintainer="Sinésio Neto " license="MIT" -homepage="https://github.com/sinetoami/vpsm" +homepage="https://github.com/sineto/vpsm" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=7317439096f56371397eb1250a81ff83e53740c14163993cf6668e9f0c4bdc2f From 149dfe1b33af47e10d22cd8fe9ece0f85a30f00e Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:51:10 -0700 Subject: [PATCH 0541/2369] vala: update to 0.56.0 --- common/shlibs | 2 +- srcpkgs/vala/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 1007c400288..20fd11e0423 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3127,7 +3127,7 @@ libmirage.so.11 libmirage-3.1.0_1 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 libsysprof-4.so sysprof-3.37.90_1 libsysprof-ui-4.so sysprof-3.37.90_1 -libvala-0.54.so.0 libvala-0.54.0_1 +libvala-0.56.so.0 libvala-0.56.0_1 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1 libvalaccodegen.so libvala-0.44.0_1 libphodav-2.0.so.0 phodav-2.2_1 diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index 9b5335cdde1..51b0dd9c836 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -1,7 +1,7 @@ # Template file for 'vala' pkgname=vala # Should be kept in sync with 'valadoc' (shared distfiles) -version=0.54.7 +version=0.56.0 revision=1 build_style=gnu-configure configure_args="--disable-valadoc" @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Vala" changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7 +checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040 shlib_provides="libvalaccodegen.so" make_check=extended From 5108afa7cf1c1a8a946adc57cf62cfd9f2746358 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:51:35 -0700 Subject: [PATCH 0542/2369] valadoc: update to 0.56.0 --- common/shlibs | 2 +- srcpkgs/valadoc/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 20fd11e0423..307cb13347f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3128,7 +3128,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 libsysprof-4.so sysprof-3.37.90_1 libsysprof-ui-4.so sysprof-3.37.90_1 libvala-0.56.so.0 libvala-0.56.0_1 -libvaladoc-0.54.so.0 libvaladoc-0.54.0_1 +libvaladoc-0.56.so.0 libvaladoc-0.56.0_1 libvalaccodegen.so libvala-0.44.0_1 libphodav-2.0.so.0 phodav-2.2_1 libgfshare.so.2 libgfshare-2.0.0_1 diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template index debe8f29768..416fee531d3 100644 --- a/srcpkgs/valadoc/template +++ b/srcpkgs/valadoc/template @@ -1,7 +1,7 @@ # Template file for 'valadoc' pkgname=valadoc # Should be kept in sync with 'vala' (shared distfiles) -version=0.54.7 +version=0.56.0 revision=1 wrksrc="vala-${version}" build_style=gnu-configure @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Vala" changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7 +checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040 pre_configure() { autoreconf -if From 5fc975687f8ae24666f04b8c6ef3ce3a29ee858a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 23:01:30 +0200 Subject: [PATCH 0543/2369] io.elementary.code: revbump for vala 0.56.0 --- srcpkgs/io.elementary.code/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template index c47d667b8a9..80be5d38c50 100644 --- a/srcpkgs/io.elementary.code/template +++ b/srcpkgs/io.elementary.code/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.code' pkgname=io.elementary.code version=6.1.0 -revision=1 +revision=2 wrksrc="code-${version}" build_style=meson hostmakedepends="pkg-config vala gettext polkit glib-devel" From b7eec583a5de4d2aace2f53b74af633558a5b663 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 23:01:30 +0200 Subject: [PATCH 0544/2369] valabind: revbump for vala 0.56.0 --- srcpkgs/valabind/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template index c7b8bf305d2..a9a7765a9bd 100644 --- a/srcpkgs/valabind/template +++ b/srcpkgs/valabind/template @@ -1,7 +1,7 @@ # Template file for 'valabind' pkgname=valabind version=1.8.0 -revision=2 +revision=3 build_style=meson hostmakedepends="pkg-config vala-devel git" makedepends="vala-devel glib-devel" From 3d47ff961e9624b30eb91f600d75bc32ef9d7561 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 23:01:31 +0200 Subject: [PATCH 0545/2369] vala-language-server: revbump for vala 0.56.0 --- srcpkgs/vala-language-server/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template index 1693c8fc0b7..037fa94852d 100644 --- a/srcpkgs/vala-language-server/template +++ b/srcpkgs/vala-language-server/template @@ -1,7 +1,7 @@ # Template file for 'vala-language-server' pkgname=vala-language-server version=0.48.4 -revision=1 +revision=2 build_style=meson hostmakedepends="gettext pkg-config vala" makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel" From a184dc7aa724c976ed582248a8e7641b8b0d5417 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 18:19:54 +0200 Subject: [PATCH 0546/2369] five-or-more: update to 3.32.3. --- srcpkgs/five-or-more/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/five-or-more/template b/srcpkgs/five-or-more/template index bb137c32d42..8f871a5ddb8 100644 --- a/srcpkgs/five-or-more/template +++ b/srcpkgs/five-or-more/template @@ -1,6 +1,6 @@ # Template file for 'five-or-more' pkgname=five-or-more -version=3.32.2 +version=3.32.3 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config vala" @@ -9,5 +9,6 @@ short_desc="GNOME align five or more objects game" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Five%20or%20more" +changelog="https://gitlab.gnome.org/GNOME/five-or-more/-/raw/gnome-3-32/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=311a2693dd04226d32b6d7a02e4c739341bf5bd3492e3285c3910db73e47eea6 +checksum=2d10d72eefdeb324b447d632af0c32496e25fc15a3c01db7d2f00c9b51d09ef4 From 1a697e1c050437690aae159889d2a9894dc91b6a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 18:41:45 +0200 Subject: [PATCH 0547/2369] folks: update to 0.15.5. --- srcpkgs/folks/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template index 90fdec6fff4..fbc56862bde 100644 --- a/srcpkgs/folks/template +++ b/srcpkgs/folks/template @@ -1,11 +1,11 @@ # Template file for 'folks' pkgname=folks -version=0.15.4 +version=0.15.5 revision=1 build_style=meson -build_helper="gir qemu" +build_helper="gir" configure_args="-Db_lto=false" -hostmakedepends="pkg-config intltool glib-devel python3 python3-dbusmock +hostmakedepends="pkg-config gettext glib-devel python3-dbusmock evolution-data-server-devel $(vopt_if gir vala)" makedepends="readline-devel telepathy-glib-devel zeitgeist-devel libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)" @@ -14,8 +14,9 @@ short_desc="GObject Library to aggregate people into metacontacts" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Folks" +changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e71099afc9e88fad4e757ae134bc3fd63e12b901ad62b0ed5536afb79124af5f +checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086 build_options="gir" build_options_default="gir" From 84edfa89c93d81636b8be50885bf50d96f37f812 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 18:50:33 +0200 Subject: [PATCH 0548/2369] go-for-it: fix for vala 0.56 --- srcpkgs/go-for-it/patches/vala-0.56.patch | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 srcpkgs/go-for-it/patches/vala-0.56.patch diff --git a/srcpkgs/go-for-it/patches/vala-0.56.patch b/srcpkgs/go-for-it/patches/vala-0.56.patch new file mode 100644 index 00000000000..76929f6cfa5 --- /dev/null +++ b/srcpkgs/go-for-it/patches/vala-0.56.patch @@ -0,0 +1,30 @@ +From 4be5ff4ff5ef7db9ab320945cd78a2b2e853695c Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sat, 2 Apr 2022 18:53:20 +0200 +Subject: [PATCH] Fix build with vala 0.56 + +~/Go-For-It-1.9.6/src/Services/TaskTimer.vala:35.42-35.50: error: value is less accessible than constant `GOFI.TaskTimer.UPDATE_INTERVAL' + 35 | public const int64 UPDATE_INTERVAL = 60 * US_C; + | ^~~~~~~~~ + +Closes #172 +--- + src/Services/TaskTimer.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Services/TaskTimer.vala b/src/Services/TaskTimer.vala +index 8f14f25..2231dc9 100644 +--- a/src/Services/TaskTimer.vala ++++ b/src/Services/TaskTimer.vala +@@ -32,7 +32,7 @@ public class GOFI.TaskTimer { + + private const int64 US_C = 1000000; // μs<->s conversion + +- public const int64 UPDATE_INTERVAL = 60 * US_C; ++ private const int64 UPDATE_INTERVAL = 60 * US_C; + + /** + * A proxy attribute, that does not store any data itself, but provides +-- +2.35.1 + From 57c67a9788d644ce63d34b86e8c91a1d69c36efc Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 19:01:07 +0200 Subject: [PATCH 0549/2369] gradio: remove package --- srcpkgs/gradio/template | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 srcpkgs/gradio/template diff --git a/srcpkgs/gradio/template b/srcpkgs/gradio/template deleted file mode 100644 index a1c4db39151..00000000000 --- a/srcpkgs/gradio/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'gradio' -pkgname=gradio -version=7.2 -revision=1 -wrksrc="Gradio-${version}" -build_style=meson -hostmakedepends="automake intltool itstool yelp-tools glib-devel - pkg-config gettext gettext-devel vala" -makedepends="gtk+3-devel gettext-devel vala-devel - gst-plugins-base1-devel json-glib-devel libsoup-devel - appstream-glib-devel" -depends="desktop-file-utils gst-plugins-bad1 gst-plugins-good1 - gst-plugins-ugly1" -short_desc="GTK3 app for finding and listening to internet radio stations" -maintainer="Logen Kain " -license="GPL-3.0-or-later" -homepage="https://github.com/haecker-felix/gradio" -distfiles="https://github.com/haecker-felix/${pkgname}/archive/v${version}.tar.gz" -checksum=5a85d7d4afb1424e46c935114b268e4a65de2629d60f48eccd75d67ff4b113d2 From 8ffcd4b133de3871dfa701bea897b350a38c25cd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 19:19:08 +0200 Subject: [PATCH 0550/2369] io.elementary.photos: fix for vala 0.56 --- .../patches/vala-0.56.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 srcpkgs/io.elementary.photos/patches/vala-0.56.patch diff --git a/srcpkgs/io.elementary.photos/patches/vala-0.56.patch b/srcpkgs/io.elementary.photos/patches/vala-0.56.patch new file mode 100644 index 00000000000..08d7d6feaaa --- /dev/null +++ b/srcpkgs/io.elementary.photos/patches/vala-0.56.patch @@ -0,0 +1,51 @@ +From 6594f1323726fb0d38519a7bdafe16f9170353cb Mon Sep 17 00:00:00 2001 +From: Bobby Rong +Date: Mon, 14 Mar 2022 19:50:16 +0800 +Subject: [PATCH] Fix build with vala 0.56 (#711) + +--- + src/main.vala | 2 +- + vapi/config.vapi | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/main.vala b/src/main.vala +index 875d35ec7..57c88cf9c 100644 +--- a/src/main.vala ++++ b/src/main.vala +@@ -273,7 +273,7 @@ namespace CommandlineOptions { + bool show_version = false; + bool debug_enabled = false; + +- public const OptionEntry[] APP_OPTIONS = { ++ const OptionEntry[] APP_OPTIONS = { + { "datadir", 'd', 0, OptionArg.FILENAME, out data_dir, N_("Path to Photos' private data"), N_("DIRECTORY")}, + { "no-runtime-monitoring", 0, 0, OptionArg.NONE, out no_runtime_monitoring, N_("Do not monitor library directory at runtime for changes"), null}, + { "no-startup-progress", 0, 0, OptionArg.NONE, out no_startup_progress, N_("Don't display startup progress meter"), null}, +diff --git a/vapi/config.vapi b/vapi/config.vapi +index 15c8d8b12..36f0acb78 100644 +--- a/vapi/config.vapi ++++ b/vapi/config.vapi +@@ -5,16 +5,16 @@ + */ + + [CCode (cheader_filename="config.h")] +-extern const string _PREFIX; ++public const string _PREFIX; + [CCode (cheader_filename="config.h")] +-extern const string _VERSION; ++public const string _VERSION; + [CCode (cheader_filename="config.h")] +-extern const string GETTEXT_PACKAGE; ++public const string GETTEXT_PACKAGE; + [CCode (cheader_filename="config.h")] +-extern const string LOCALEDIR; ++public const string LOCALEDIR; + [CCode (cheader_filename="config.h")] +-extern const string _LIB; ++public const string _LIB; + [CCode (cheader_filename="config.h")] +-extern const string _LIBEXECDIR; ++public const string _LIBEXECDIR; + [CCode (cheader_filename="config.h")] +-extern const string PROJECT_NAME; ++public const string PROJECT_NAME; From 0cf94abdf9cb29586dfaf726807e4e15645357ec Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 19:24:17 +0200 Subject: [PATCH 0551/2369] libgnome-games-support: update to 1.8.2. --- srcpkgs/libgnome-games-support/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libgnome-games-support/template b/srcpkgs/libgnome-games-support/template index 60a1aba2027..92db8d92bc3 100644 --- a/srcpkgs/libgnome-games-support/template +++ b/srcpkgs/libgnome-games-support/template @@ -1,16 +1,17 @@ # Template file for 'libgnome-games-support' pkgname=libgnome-games-support -version=1.8.0 +version=1.8.2 revision=1 build_style=meson -hostmakedepends="intltool pkg-config gobject-introspection vala" +hostmakedepends="gettext pkg-config gobject-introspection vala" makedepends="gtk+3-devel libgee08-devel" short_desc="GNOME games shared code" maintainer="Orphaned " license="GPL-3.0-or-later" -homepage="https://git.gnome.org/browse/libgnome-games-support/" +homepage="https://gitlab.gnome.org/GNOME/libgnome-games-support/" +changelog="https://gitlab.gnome.org/GNOME/libgnome-games-support/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=abdde538a14fd6078fe6b7e6e93f38a33491d9bec711a116d8b47530184cb3dd +checksum=28434604a7b038731ac0231731388ff104f565bb2330cc24e78cda04cfd3ef7d libgnome-games-support-devel_package() { short_desc+=" - development files" From b8279d38481840b7b70e3ee2f76d55ebac91a4dd Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:43:48 -0700 Subject: [PATCH 0552/2369] shotwell: fix build with vala 0.56.0 --- .../patches/shotwell-0.54.1-vapi_fixes.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch diff --git a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch new file mode 100644 index 00000000000..f39f988f964 --- /dev/null +++ b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch @@ -0,0 +1,67 @@ +From 59ae0ce648982669f24a33db501f3f229508cb6e Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Tue, 30 Nov 2021 15:09:17 +0100 +Subject: [PATCH] Fix accessibility issues with initializer of constants + +--- + src/International.vala | 2 -- + src/Resources.vala | 7 ------- + vapi/version.vapi | 17 ++++++++++++++--- + 3 files changed, 14 insertions(+), 12 deletions(-) + +diff --git a/src/International.vala b/src/International.vala +index 555a91f8..73f07639 100644 +--- a/src/International.vala ++++ b/src/International.vala +@@ -4,8 +4,6 @@ + * See the COPYING file in this distribution. + */ + +-extern const string _LANG_SUPPORT_DIR; +- + public const string TRANSLATABLE = "translatable"; + + namespace InternationalSupport { +diff --git a/src/Resources.vala b/src/Resources.vala +index 6d2b8851..86f0eb65 100644 +--- a/src/Resources.vala ++++ b/src/Resources.vala +@@ -4,13 +4,6 @@ + * See the COPYING file in this distribution. + */ + +-// defined by ./configure or Makefile and included by gcc -D +-extern const string _PREFIX; +-extern const string _VERSION; +-extern const string GETTEXT_PACKAGE; +-extern const string _LIB; +-extern const string _LIBEXECDIR; +- + namespace Resources { + public const string APP_TITLE = "Shotwell"; + public const string APP_LIBRARY_ROLE = _("Photo Manager"); +diff --git a/vapi/version.vapi b/vapi/version.vapi +index 06974c84..e191f2f7 100644 +--- a/vapi/version.vapi ++++ b/vapi/version.vapi +@@ -1,3 +1,14 @@ +-[CCode (cheader_filename="version.h")] +-extern const string? _GIT_VERSION; +- ++[CCode (cheader_filename = "version.h")] ++public const string? _GIT_VERSION; ++[CCode (cheader_filename = "config.h")] ++public const string _PREFIX; ++[CCode (cheader_filename = "config.h")] ++public const string _VERSION; ++[CCode (cheader_filename = "config.h")] ++public const string GETTEXT_PACKAGE; ++[CCode (cheader_filename = "config.h")] ++public const string _LIB; ++[CCode (cheader_filename = "config.h")] ++public const string _LIBEXECDIR; ++[CCode (cheader_filename = "config.h")] ++public const string _LANG_SUPPORT_DIR; +-- +GitLab + From 81a2db4b678e09ed914c3f0959d41d8a7ea0fd80 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 19:28:08 +0200 Subject: [PATCH 0553/2369] planner: fix for vala 0.56 --- srcpkgs/planner/patches/vala-0.56.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/planner/patches/vala-0.56.patch diff --git a/srcpkgs/planner/patches/vala-0.56.patch b/srcpkgs/planner/patches/vala-0.56.patch new file mode 100644 index 00000000000..bff39d43cc1 --- /dev/null +++ b/srcpkgs/planner/patches/vala-0.56.patch @@ -0,0 +1,25 @@ +From 87be3e27ccc8f9a1ef7fbeec9600459eb4569200 Mon Sep 17 00:00:00 2001 +From: Bobby Rong +Date: Mon, 14 Mar 2022 23:36:21 +0800 +Subject: [PATCH] Fix build with vala 0.56 + +Otherwise build fails with + +../src/Application.vala:45.50-55.5: error: value is less accessible than constant `Planner.PLANNER_OPTIONS' +--- + src/Application.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Application.vala b/src/Application.vala +index 8c1c9ddb..ebd8f726 100644 +--- a/src/Application.vala ++++ b/src/Application.vala +@@ -42,7 +42,7 @@ public class Planner : Gtk.Application { + private static bool clear_database = false; + private static string lang = ""; + +- public const OptionEntry[] PLANNER_OPTIONS = { ++ private const OptionEntry[] PLANNER_OPTIONS = { + { "version", 'v', 0, OptionArg.NONE, ref version, + "Display version number", null }, + { "reset", 'r', 0, OptionArg.NONE, ref clear_database, From b6bfd7b472db655cbed47cbc82b51c6c8dcfde3c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 19:35:16 +0200 Subject: [PATCH 0554/2369] tootle: fix for vala 0.56 --- srcpkgs/tootle/patches/vala-0.56.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/tootle/patches/vala-0.56.patch diff --git a/srcpkgs/tootle/patches/vala-0.56.patch b/srcpkgs/tootle/patches/vala-0.56.patch new file mode 100644 index 00000000000..38adf0ff093 --- /dev/null +++ b/srcpkgs/tootle/patches/vala-0.56.patch @@ -0,0 +1,23 @@ +From 11d94c05d4c4a2350801294f155230e899048ab5 Mon Sep 17 00:00:00 2001 +From: Bobby Rong +Date: Sat, 19 Mar 2022 16:59:31 +0800 +Subject: [PATCH] Application: make app_entries private + +Fixes compilation with latest valac. +--- + src/Application.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Application.vala b/src/Application.vala +index 57d0fd7..b48cb53 100644 +--- a/src/Application.vala ++++ b/src/Application.vala +@@ -43,7 +43,7 @@ namespace Tootle { + { null } + }; + +- public const GLib.ActionEntry[] app_entries = { ++ private const GLib.ActionEntry[] app_entries = { + { "about", about_activated }, + { "compose", compose_activated }, + { "back", back_activated }, From 177cff02d4aed6a1238faab17e062a9752237c63 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 19:44:54 +0200 Subject: [PATCH 0555/2369] simple-scan: fix for vala 0.56 --- srcpkgs/simple-scan/patches/vala-0.56.patch | 25 +++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/simple-scan/patches/vala-0.56.patch diff --git a/srcpkgs/simple-scan/patches/vala-0.56.patch b/srcpkgs/simple-scan/patches/vala-0.56.patch new file mode 100644 index 00000000000..0820cee20e4 --- /dev/null +++ b/srcpkgs/simple-scan/patches/vala-0.56.patch @@ -0,0 +1,25 @@ +From c50802b213c325cfa957d66955f6de96908710d9 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Sat, 6 Nov 2021 19:46:07 +0100 +Subject: [PATCH] Fix accessibility conflict of constant and its value + +--- + src/simple-scan.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/simple-scan.vala b/src/simple-scan.vala +index c15a5418..71f32de9 100644 +--- a/src/simple-scan.vala ++++ b/src/simple-scan.vala +@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Application + static bool show_version; + static bool debug_enabled; + static string? fix_pdf_filename = null; +- public const OptionEntry[] options = ++ const OptionEntry[] options = + { + { "version", 'v', 0, OptionArg.NONE, ref show_version, + /* Help string for command line --version flag */ +-- +GitLab + From 14c86558d64ff72ea11042b6cc68aef83b6937e3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 22:59:04 +0200 Subject: [PATCH 0556/2369] geary: fix for vala 0.56 --- srcpkgs/geary/patches/vala-0.56a.patch | 25 ++++++++++++++++ srcpkgs/geary/patches/vala-0.56b.patch | 40 ++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 srcpkgs/geary/patches/vala-0.56a.patch create mode 100644 srcpkgs/geary/patches/vala-0.56b.patch diff --git a/srcpkgs/geary/patches/vala-0.56a.patch b/srcpkgs/geary/patches/vala-0.56a.patch new file mode 100644 index 00000000000..df2c3902db1 --- /dev/null +++ b/srcpkgs/geary/patches/vala-0.56a.patch @@ -0,0 +1,25 @@ +From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Sun, 30 Jan 2022 19:54:11 +0100 +Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument + +--- + src/client/util/util-cache.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala +index f054e32e5..ecc275e84 100644 +--- a/src/client/util/util-cache.vala ++++ b/src/client/util/util-cache.vala +@@ -12,7 +12,7 @@ public class Util.Cache.Lru : Geary.BaseObject { + private class CacheEntry { + + +- public static int lru_compare(CacheEntry a, CacheEntry b) { ++ public static int lru_compare(CacheEntry a, CacheEntry b) { + if (a.key == b.key) { + return 0; + } +-- +GitLab + diff --git a/srcpkgs/geary/patches/vala-0.56b.patch b/srcpkgs/geary/patches/vala-0.56b.patch new file mode 100644 index 00000000000..2d071a13375 --- /dev/null +++ b/srcpkgs/geary/patches/vala-0.56b.patch @@ -0,0 +1,40 @@ +From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Tue, 30 Nov 2021 15:31:31 +0100 +Subject: [PATCH] Fix accessibility issues with initializer of constants + +--- + src/client/application/application-client.vala | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala +index 6ce19ce2a..e6ba85331 100644 +--- a/src/client/application/application-client.vala ++++ b/src/client/application/application-client.vala +@@ -8,16 +8,16 @@ + + // Defined by CMake build script. + extern const string GETTEXT_PACKAGE; +-extern const string _APP_ID; +-extern const string _BUILD_ROOT_DIR; +-extern const string _GSETTINGS_DIR; +-extern const string _INSTALL_PREFIX; +-extern const string _NAME_SUFFIX; ++public extern const string _APP_ID; ++public extern const string _BUILD_ROOT_DIR; ++public extern const string _GSETTINGS_DIR; ++public extern const string _INSTALL_PREFIX; ++public extern const string _NAME_SUFFIX; + extern const string _PLUGINS_DIR; + extern const string _PROFILE; + extern const string _REVNO; +-extern const string _SOURCE_ROOT_DIR; +-extern const string _VERSION; ++public extern const string _SOURCE_ROOT_DIR; ++public extern const string _VERSION; + extern const string _WEB_EXTENSIONS_DIR; + + +-- +GitLab + From 209d1fad146038df7d35b59458938dbc654bb5b3 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 3 Apr 2022 15:19:05 +0200 Subject: [PATCH 0557/2369] zellij: build manpage --- srcpkgs/zellij/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template index 72a9ab9e6e7..911ba18464e 100644 --- a/srcpkgs/zellij/template +++ b/srcpkgs/zellij/template @@ -1,12 +1,13 @@ # Template file for 'zellij' pkgname=zellij version=0.27.0 -revision=1 +revision=2 # 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 archs="x86_64* aarch64* i686*" build_style=cargo build_helper=qemu +hostmakedepends="mandown" checkdepends="openssl-devel pkg-config" short_desc="Terminal workspace with batteries included" maintainer="Marcin Puc " @@ -21,6 +22,8 @@ post_build() { vtargetrun ${ZELLIJ} setup --generate-completion bash > zellij.bash vtargetrun ${ZELLIJ} setup --generate-completion zsh > zellij.zsh vtargetrun ${ZELLIJ} setup --generate-completion fish > zellij.fish + + mandown docs/MANPAGE.md > zellij.1 } post_install() { @@ -30,4 +33,5 @@ post_install() { vlicense LICENSE.md vdoc README.md + vman zellij.1 } From 9fb2bc3a328185a4a29a62aff4ededcbe8d8ae05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Sun, 3 Apr 2022 12:56:10 +0200 Subject: [PATCH 0558/2369] lf: update to r27. --- srcpkgs/lf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template index 896673e297d..00a4cbec79f 100644 --- a/srcpkgs/lf/template +++ b/srcpkgs/lf/template @@ -1,6 +1,6 @@ # Template file for 'lf' pkgname=lf -version=r26 +version=r27 revision=1 build_style=go go_import_path="github.com/gokcehan/${pkgname}" @@ -10,7 +10,7 @@ maintainer="Daniel Lewan " license="MIT" homepage="https://github.com/gokcehan/lf" distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz" -checksum=dccd1ad67d2639e47fe0cbc93d74f202d6d6f0c3759fb0237affb7b1a2b1379e +checksum=cdd132e33387423ef9f9448e21d3f1e5c9a5319b34fdfb53cb5f49351ebac005 post_install() { vlicense LICENSE From 0e0a4655e78d50d33ddd6b4771a2c58f67640372 Mon Sep 17 00:00:00 2001 From: iaroki Date: Sun, 3 Apr 2022 11:34:52 +0300 Subject: [PATCH 0559/2369] skopeo: update to 1.6.2. --- srcpkgs/skopeo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template index b568744c4b2..d8015fbcd92 100644 --- a/srcpkgs/skopeo/template +++ b/srcpkgs/skopeo/template @@ -1,6 +1,6 @@ # Template file for 'skopeo' pkgname=skopeo -version=1.6.1 +version=1.6.2 revision=1 build_style=go go_import_path="github.com/containers/${pkgname}" @@ -14,7 +14,7 @@ maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/containers/skopeo" distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz" -checksum=304016ec4eb802bf1e1b350854db50bdc99a93dcbcc71f9d531dbb916dc146f3 +checksum=48a1b3d18bde9d7af94756d546b0472e90416f05926281f7e533badfb5fcbd7b make_dirs="/var/lib/atomic/sigstore 0755 root root" post_build() { From 4242fb76e47678e45f0141611cd8ed92c3d802c1 Mon Sep 17 00:00:00 2001 From: iaroki Date: Sun, 3 Apr 2022 11:39:57 +0300 Subject: [PATCH 0560/2369] crun: update to 1.4.4. --- srcpkgs/crun/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template index 5b36ee6226b..f08f3920334 100644 --- a/srcpkgs/crun/template +++ b/srcpkgs/crun/template @@ -1,6 +1,6 @@ # Template file for 'crun' pkgname=crun -version=1.4 +version=1.4.4 revision=1 build_style=gnu-configure configure_args="--disable-systemd" @@ -11,7 +11,7 @@ maintainer="Imran Khan " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/containers/crun" distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz" -checksum=fbdf93c31e215c61a9cb97490527ec69c9993e369955e56b0d82cfedc32090ef +checksum=49eeb7ed921428f06094ab02233bb2f95ddfc4bf59a40bcabe8a2823085a0c12 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" argp-standalone" From bbe37e4df08667e815cc6fa962c644dbd6820d7c Mon Sep 17 00:00:00 2001 From: iaroki Date: Sun, 3 Apr 2022 11:44:01 +0300 Subject: [PATCH 0561/2369] buildah: update to 1.24.3. --- srcpkgs/buildah/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template index f3854fe931e..b56a4ea1dff 100644 --- a/srcpkgs/buildah/template +++ b/srcpkgs/buildah/template @@ -1,6 +1,6 @@ # Template file for 'buildah' pkgname=buildah -version=1.23.1 +version=1.24.3 revision=1 build_style=go go_import_path=github.com/containers/buildah @@ -16,7 +16,7 @@ license="Apache-2.0" homepage="https://github.com/containers/buildah" changelog="https://github.com/containers/buildah/blob/master/CHANGELOG.md" distfiles="https://github.com/containers/buildah/archive/refs/tags/v${version}.tar.gz" -checksum=a19eac2762afb0f83b9d5eec3c00e6ecd95d8d8083da599e894c712d9fb6af26 +checksum=664e2aec0e07df9668c6d41de540e84dc2447950cf952851ca9717a10cc46124 post_build() { make -C docs GOMD2MAN=go-md2man From fac51000eee33e1d20ec470c465dac61cac28adc Mon Sep 17 00:00:00 2001 From: iaroki Date: Sun, 3 Apr 2022 11:57:58 +0300 Subject: [PATCH 0562/2369] packer: update to 1.8.0. --- srcpkgs/packer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template index 09f3bc8a6a6..5e39d679ec4 100644 --- a/srcpkgs/packer/template +++ b/srcpkgs/packer/template @@ -1,6 +1,6 @@ # Template file for 'packer' pkgname=packer -version=1.7.10 +version=1.8.0 revision=1 build_style=go go_import_path="github.com/hashicorp/packer" @@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni " license="MPL-2.0" homepage="http://www.packer.io" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=80ed60c492f6765265223f715f26529c8eeb5ce4cee9c4bd7372fd83a9e10493 +checksum=3df688cb488e746df529474f08a430adf0c7c839c4ed3de2022a094eadc515fd replaces="packer-bin>=0" case "$XBPS_TARGET_MACHINE" in From 8f6516045e2cdce307fe36b734f965d35c2d30af Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Sat, 26 Mar 2022 17:21:04 -0400 Subject: [PATCH 0563/2369] pango: update to 1.50.6. --- srcpkgs/pango/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template index ff2978731c8..4d410dbc72b 100644 --- a/srcpkgs/pango/template +++ b/srcpkgs/pango/template @@ -1,6 +1,6 @@ # Template file for 'pango' pkgname=pango -version=1.50.3 +version=1.50.6 revision=1 build_style=meson build_helper=gir @@ -14,7 +14,8 @@ license="LGPL-2.1-or-later" homepage="https://www.pango.org/" changelog="https://gitlab.gnome.org/GNOME/pango/-/raw/main/NEWS" distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c +checksum=a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a +make_check=no # doesn't pass its own tests # Package build options build_options="gir" From 02c7f5f19a32c8207ec9dd83a2732790aa08bd74 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 3 Apr 2022 17:46:51 +0200 Subject: [PATCH 0564/2369] libbsd: update to 0.11.6. --- srcpkgs/libbsd/patches/tests-musl.patch | 18 ------------------ srcpkgs/libbsd/template | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 srcpkgs/libbsd/patches/tests-musl.patch diff --git a/srcpkgs/libbsd/patches/tests-musl.patch b/srcpkgs/libbsd/patches/tests-musl.patch deleted file mode 100644 index ada3a923c87..00000000000 --- a/srcpkgs/libbsd/patches/tests-musl.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/test/fpurge.c -+++ b/test/fpurge.c -@@ -29,15 +29,11 @@ - int - main() - { -- static FILE fp_bad; - FILE *fp; - - if (fpurge(NULL) == 0) - return 1; - -- if (fpurge(&fp_bad) == 0) -- return 1; -- - fp = fopen("/dev/zero", "r"); - if (fpurge(fp) < 0) - return 1; diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template index 769256c0b9a..6363215e445 100644 --- a/srcpkgs/libbsd/template +++ b/srcpkgs/libbsd/template @@ -1,6 +1,6 @@ # Template file for 'libbsd' pkgname=libbsd -version=0.11.5 +version=0.11.6 revision=1 build_style=gnu-configure makedepends="libmd-devel" @@ -9,7 +9,7 @@ maintainer="Duncaen " license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause" homepage="https://libbsd.freedesktop.org/" distfiles="https://libbsd.freedesktop.org/releases/libbsd-${version}.tar.xz" -checksum=1a9c952525635c1bb6770cb22e969b938d8e6a9d7912362b98ee8370599b0efd +checksum=19b38f3172eaf693e6e1c68714636190c7e48851e45224d720b3b5bc0499b5df post_install() { vlicense COPYING From 9b129c4952583bccfc9286b50d24941829833cbc Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 3 Apr 2022 17:48:37 +0200 Subject: [PATCH 0565/2369] openfortivpn: update to 1.17.2. --- srcpkgs/openfortivpn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template index 46e3fb7900f..64cbf60f291 100644 --- a/srcpkgs/openfortivpn/template +++ b/srcpkgs/openfortivpn/template @@ -1,6 +1,6 @@ # Template file for 'openfortivpn' pkgname=openfortivpn -version=1.17.1 +version=1.17.2 revision=1 build_style=gnu-configure configure_args=" @@ -18,7 +18,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/adrienverge/openfortivpn" changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md" distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz" -checksum=c674c59cf3201a55d56cb503053982752fb641b13a85ea406b8a7e7df301e30f +checksum=0f3f3c767cb8bf81418a0fc7c6ab7636c574840c3b6a95c50901c3e1a09c079a conf_files="/etc/openfortivpn/config" From e14ab9048fa24eb4f99be8d7cfe5a70ce67b78ad Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 3 Apr 2022 17:51:43 +0200 Subject: [PATCH 0566/2369] squashfs-tools-ng: update to 1.1.4. --- srcpkgs/squashfs-tools-ng/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/squashfs-tools-ng/template b/srcpkgs/squashfs-tools-ng/template index 3a6e4849703..e05075284fc 100644 --- a/srcpkgs/squashfs-tools-ng/template +++ b/srcpkgs/squashfs-tools-ng/template @@ -1,6 +1,6 @@ # Template file for 'squashfs-tools-ng' pkgname=squashfs-tools-ng -version=1.1.3 +version=1.1.4 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later" homepage="https://infraroot.at/projects/squashfs-tools-ng/index.html" changelog="https://git.infraroot.at/squashfs-tools-ng.git/plain/CHANGELOG.md" distfiles="https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz" -checksum=abce0fcf9a8ae1c3352e4e5e87e1b077f54411da517332ea83b5e7ce948dd70d +checksum=6f3f7864f17b250453df31fe3925ce7d1430cf6b1d514112641d734fe3c8f61a squashfs-tools-ng-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 47b841a89a507cb7f02c680d2d8e87a8815db5ac Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 3 Apr 2022 17:53:42 +0200 Subject: [PATCH 0567/2369] youtube-viewer: update to 3.9.9. --- srcpkgs/youtube-viewer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template index bdf304f9de8..af6941e4531 100644 --- a/srcpkgs/youtube-viewer/template +++ b/srcpkgs/youtube-viewer/template @@ -1,6 +1,6 @@ # Template file for 'youtube-viewer' pkgname=youtube-viewer -version=3.9.7 +version=3.9.9 revision=1 build_style=perl-ModuleBuild configure_args="--gtk" @@ -14,7 +14,7 @@ license="Artistic-2.0" homepage="https://github.com/trizen/youtube-viewer" changelog="https://github.com/trizen/youtube-viewer/releases" distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz" -checksum=0b7ccf18e7aa71b2b82214e3a5614e3036bc98d94951b9bd7aba8da952486257 +checksum=29a326b6496bc6e96840d3c854d79a3ffb9e6006a033f11478c1633c1ac48a8b gtk-youtube-viewer_package() { depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir" From dbb688fca04c6a80ad5a82bc597e51b777db73eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sat, 2 Apr 2022 22:57:04 +0200 Subject: [PATCH 0568/2369] peshming: update to 0.5.0. --- srcpkgs/peshming/template | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template index 299d243509f..0b07235208a 100644 --- a/srcpkgs/peshming/template +++ b/srcpkgs/peshming/template @@ -1,6 +1,6 @@ # Template file for 'peshming' pkgname=peshming -version=0.4.0 +version=0.5.0 revision=1 wrksrc="peshming" build_style=cargo @@ -10,15 +10,26 @@ maintainer="Jan Christian Grünhage " license="AGPL-3.0-only" homepage="https://git.jcg.re/jcgruenhage/peshming" distfiles="https://git.jcg.re/jcgruenhage/peshming/archive/v${version}.tar.gz" -checksum=fd2d3eae35746f513006a34757d00e50d15042df54187f886c553e748985319d +checksum=9b737124e38d4dc6ac91f0e8bc07aab4d5acbbb019c544feb1aa92d6ab0ea8c5 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; ppc*) broken="missing AtomicU64";; esac +pre_build() { + export PESHMING_MAN_DIR=man + export PESHMING_COMPLETIONS_DIR=completions +} + post_install() { vlicense LICENSE vdoc README.md vsconf config.toml.sample + + vcompletion "completions/_peshming" zsh + vcompletion "completions/peshming.fish" fish + vcompletion "completions/peshming.bash" bash + + vman "man/peshming.1" } From 57ddc05e994e103b207e983053d8edabdce3a7ca Mon Sep 17 00:00:00 2001 From: Gene Date: Wed, 8 Sep 2021 13:13:53 -0700 Subject: [PATCH 0569/2369] New package: dsda-doom-0.24.3 --- srcpkgs/dsda-doom/patches/affinity-hack.patch | 165 ++++++++++++++++++ srcpkgs/dsda-doom/template | 20 +++ 2 files changed, 185 insertions(+) create mode 100644 srcpkgs/dsda-doom/patches/affinity-hack.patch create mode 100644 srcpkgs/dsda-doom/template diff --git a/srcpkgs/dsda-doom/patches/affinity-hack.patch b/srcpkgs/dsda-doom/patches/affinity-hack.patch new file mode 100644 index 00000000000..2155ab116b8 --- /dev/null +++ b/srcpkgs/dsda-doom/patches/affinity-hack.patch @@ -0,0 +1,165 @@ +diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt +index d317ddec..c86f76b0 100644 +--- a/prboom2/CMakeLists.txt ++++ b/prboom2/CMakeLists.txt +@@ -53,6 +53,15 @@ endif() + check_symbol_exists(getopt "unistd.h" HAVE_GETOPT) + check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP) + check_symbol_exists(CreateFileMapping "windows.h" HAVE_CREATE_FILE_MAPPING) ++if(NOT WIN32) ++ set(CMAKE_REQUIRED_DEFINITIONS_PREV ${CMAKE_REQUIRED_DEFINITIONS}) ++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE) ++ check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY) ++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_PREV}) ++ if(HAVE_SCHED_SETAFFINITY) ++ add_definitions(-D_GNU_SOURCE) ++ endif() ++endif() + check_symbol_exists(strsignal "string.h" HAVE_STRSIGNAL) + check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP) + +diff --git a/prboom2/cmake/config.h.cin b/prboom2/cmake/config.h.cin +index f92f3d88..2ad70033 100644 +--- a/prboom2/cmake/config.h.cin ++++ b/prboom2/cmake/config.h.cin +@@ -11,6 +11,7 @@ + #cmakedefine HAVE_GETOPT + #cmakedefine HAVE_MMAP + #cmakedefine HAVE_CREATE_FILE_MAPPING ++#cmakedefine HAVE_SCHED_SETAFFINITY + #cmakedefine HAVE_STRSIGNAL + #cmakedefine HAVE_MKSTEMP + +diff --git a/prboom2/src/SDL/i_main.c b/prboom2/src/SDL/i_main.c +index 7537c53f..670f3dbd 100644 +--- a/prboom2/src/SDL/i_main.c ++++ b/prboom2/src/SDL/i_main.c +@@ -45,6 +45,9 @@ + #ifdef _WIN32 + #define WIN32_LEAN_AND_MEAN + #include ++typedef BOOL (WINAPI *SetAffinityFunc)(HANDLE hProcess, DWORD mask); ++#else ++#include + #endif + + #include +@@ -373,6 +376,83 @@ static void I_Quit (void) + uid_t stored_euid = -1; + #endif + ++// ++// Ability to use only the allowed CPUs ++// ++ ++static void I_SetAffinityMask(void) ++{ ++ // This was only set for the sdl music backend, ++ // but now the backend changes based on the music type. ++ // Not sure what the consequences are for this... ++ process_affinity_mask = 1; ++ ++ // Set the process affinity mask so that all threads ++ // run on the same processor. This is a workaround for a bug in ++ // SDL_mixer that causes occasional crashes. ++ if (process_affinity_mask) ++ { ++ const char *errbuf = NULL; ++#ifdef _WIN32 ++ HMODULE kernel32_dll; ++ SetAffinityFunc SetAffinity = NULL; ++ int ok = false; ++ ++ // Find the kernel interface DLL. ++ kernel32_dll = LoadLibrary("kernel32.dll"); ++ ++ if (kernel32_dll) ++ { ++ // Find the SetProcessAffinityMask function. ++ SetAffinity = (SetAffinityFunc)GetProcAddress(kernel32_dll, "SetProcessAffinityMask"); ++ ++ // If the function was not found, we are on an old (Win9x) system ++ // that doesn't have this function. That's no problem, because ++ // those systems don't support SMP anyway. ++ ++ if (SetAffinity) ++ { ++ ok = SetAffinity(GetCurrentProcess(), process_affinity_mask); ++ } ++ } ++ ++ if (!ok) ++ { ++ errbuf = WINError(); ++ } ++#elif defined(HAVE_SCHED_SETAFFINITY) ++ // POSIX version: ++ int i; ++ { ++ cpu_set_t set; ++ ++ CPU_ZERO(&set); ++ ++ for(i = 0; i < 16; i++) ++ { ++ CPU_SET((process_affinity_mask>>i)&1, &set); ++ } ++ ++ if (sched_setaffinity(getpid(), sizeof(set), &set) == -1) ++ { ++ errbuf = strerror(errno); ++ } ++ } ++#else ++ return; ++#endif ++ ++ if (errbuf == NULL) ++ { ++ lprintf(LO_INFO, "I_SetAffinityMask: manual affinity mask is %d\n", process_affinity_mask); ++ } ++ else ++ { ++ lprintf(LO_ERROR, "I_SetAffinityMask: failed to set process affinity mask (%s)\n", errbuf); ++ } ++ } ++} ++ + // + // Sets the priority class for the prboom-plus process + // +@@ -482,6 +562,9 @@ int main(int argc, char **argv) + signal(SIGABRT, I_SignalHandler); + #endif + ++ // Ability to use only the allowed CPUs ++ I_SetAffinityMask(); ++ + // Priority class for the prboom-plus process + I_SetProcessPriority(); + +diff --git a/prboom2/src/SDL/i_video.c b/prboom2/src/SDL/i_video.c +index 5a564a5a..9b68aee7 100644 +--- a/prboom2/src/SDL/i_video.c ++++ b/prboom2/src/SDL/i_video.c +@@ -895,6 +895,7 @@ static void I_ClosestResolution (int *width, int *height) + } + } + ++int process_affinity_mask; + int process_priority; + + // e6y +diff --git a/prboom2/src/i_video.h b/prboom2/src/i_video.h +index 46f0fb71..c39a197e 100644 +--- a/prboom2/src/i_video.h ++++ b/prboom2/src/i_video.h +@@ -109,6 +109,8 @@ void I_UpdateRenderSize(void); // Handle potential + extern int renderW; // resolution scaling + extern int renderH; // - DTIED + ++// Set the process affinity mask so that all threads ++extern int process_affinity_mask; + // Priority class for the prboom-plus process + extern int process_priority; + // Use vanilla keybaord mapping diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template new file mode 100644 index 00000000000..51dcbbf26d3 --- /dev/null +++ b/srcpkgs/dsda-doom/template @@ -0,0 +1,20 @@ +# Template file for 'dsda-doom' +pkgname=dsda-doom +version=0.24.3 +revision=1 +build_wrksrc=prboom2 +build_style=cmake +makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel + SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel" +short_desc="Fork of prboom+ with extra tooling for demo recording and playback" +maintainer="Gene " +license="GPL-2.0-or-later" +homepage="https://github.com/kraflab/dsda-doom" +distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" +checksum=d4cfc82eea029068329d6b6a2dcbe0b316b31a60af12e6dc5ad3e1d2c359d913 +nocross=yes + +post_install() { + vinstall ICONS/dsda-doom.desktop 644 usr/share/applications + vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps +} From 58c1d08d4d22053137e70a78e9743d5acd8fbbb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?= Date: Sun, 3 Apr 2022 04:24:39 +0200 Subject: [PATCH 0570/2369] wireplumber: update to 0.4.9 --- srcpkgs/wireplumber/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template index dadbf62647f..acbffa27fd8 100644 --- a/srcpkgs/wireplumber/template +++ b/srcpkgs/wireplumber/template @@ -1,7 +1,7 @@ # Template file for 'wireplumber' pkgname=wireplumber -version=0.4.8 -revision=2 +version=0.4.9 +revision=1 build_style=meson build_helper=gir configure_args="-Dintrospection=enabled -Dsystem-lua=true" @@ -14,7 +14,7 @@ license="MIT" homepage="https://pipewire.pages.freedesktop.org/wireplumber" changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst" distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz" -checksum=a7a84c21230c339a905704a9495dda10a4dec41a96bc115a9b33d24310a3f605 +checksum=0b25774a2821286a1fa31afb7db8db0573f493b35c40a7031b6e5a30cec0bbe3 post_install() { vlicense LICENSE From 65adea1086833fdf5f37585d719f0a09b76e7480 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 3 Apr 2022 20:30:06 +0200 Subject: [PATCH 0571/2369] dhcpcd: fix privsep on ppc64le --- srcpkgs/dhcpcd/patches/privsep-ppc64le.patch | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch diff --git a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch new file mode 100644 index 00000000000..38a4264a59c --- /dev/null +++ b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch @@ -0,0 +1,23 @@ +commit 156383a2ff84c01b347579ec8651a0a21384adf4 +Author: Daniel Kolesa +Date: Sun Apr 3 20:18:51 2022 +0200 + + use correct SECCOMP_AUDIT_ARCH + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 9534fb0..b866bce 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -213,7 +213,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + #elif defined(__or1k__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC + #elif defined(__powerpc64__) +-# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 ++# ifdef __LITTLE_ENDIAN__ ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE ++# else ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64 ++# endif + #elif defined(__powerpc__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC + #elif defined(__riscv) From 2a09b7589ed31f72d9f96d1524ace401851d2967 Mon Sep 17 00:00:00 2001 From: governorgoat Date: Sat, 2 Apr 2022 22:04:52 -0400 Subject: [PATCH 0572/2369] cronie: update to 1.6.0 --- srcpkgs/cronie/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template index 6c1c7adb523..526f59b4d83 100644 --- a/srcpkgs/cronie/template +++ b/srcpkgs/cronie/template @@ -1,6 +1,6 @@ # Template file for 'cronie' pkgname=cronie -version=1.5.7 +version=1.6.0 revision=1 build_style=gnu-configure configure_args="--with-inotify --without-selinux --with-pam @@ -13,7 +13,7 @@ license="BSD-2-Clause" homepage="https://github.com/cronie-crond/cronie" changelog="https://raw.githubusercontent.com/cronie-crond/cronie/master/NEWS" distfiles="${homepage}/releases/download/cronie-${version}/cronie-${version}.tar.gz" -checksum=538bcfaf2e986e5ae1edf6d1472a77ea8271d6a9005aee2497a9ed6e13320eb3 +checksum=3f7cc263d21838b53a9943eb2a26b862059e2ae36c3f11789ac33cd6818e3628 make_dirs=" /etc/cron.d 0755 root root /etc/cron.hourly 0755 root root From 7d38c79fb0aee4b36b6f0a0165caf6da98fe461b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 3 Apr 2022 18:31:30 +0200 Subject: [PATCH 0573/2369] janet: update to 1.21.2. --- srcpkgs/janet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template index 4301ab90c75..8c3612e4dd7 100644 --- a/srcpkgs/janet/template +++ b/srcpkgs/janet/template @@ -1,6 +1,6 @@ # Template file for 'janet' pkgname=janet -version=1.21.1 +version=1.21.2 revision=1 build_style=meson configure_args="-Db_lto=false" # breaks jpm @@ -10,7 +10,7 @@ license="MIT" homepage="https://janet-lang.org/" changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md" distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz" -checksum=8c6eeabbc0c00ac901b66763676fa4bfdac96e5b6a3def85025b45126227c4e0 +checksum=52db8d18f93351256d0731810e8bea95516db8142f51eeb31664f7884bf63088 post_install() { vlicense LICENSE From 174451cd6a7e8a450c9ad31d53ecc4deb431408b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 3 Apr 2022 18:35:28 +0200 Subject: [PATCH 0574/2369] ugrep: update to 3.7.7. --- srcpkgs/ugrep/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template index 8af468ccc9b..795927e8ab5 100644 --- a/srcpkgs/ugrep/template +++ b/srcpkgs/ugrep/template @@ -1,6 +1,6 @@ # Template file for 'ugrep' pkgname=ugrep -version=3.7.6 +version=3.7.7 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=8288af9eb9f5a5638134911e9e81c8b37d02f29223d473dd96a2046c228cd5d4 +checksum=5490d6491267bb1aaaeac27a0ba41d502f4b1c1b8998b8cc377c91374603932d post_install() { vlicense LICENSE.txt LICENSE From 52316c0354a55376c14662c9d5e83052b55e5a0c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 3 Apr 2022 18:35:30 +0200 Subject: [PATCH 0575/2369] netpbm: update to 10.98.0.0. --- .../netpbm/files/netpbm-security-code.patch | 94 ------- .../files/netpbm-security-scripts.patch | 266 ------------------ srcpkgs/netpbm/template | 6 +- 3 files changed, 3 insertions(+), 363 deletions(-) delete mode 100644 srcpkgs/netpbm/files/netpbm-security-scripts.patch diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch index 408b566ef41..6f7c4976114 100644 --- a/srcpkgs/netpbm/files/netpbm-security-code.patch +++ b/srcpkgs/netpbm/files/netpbm-security-code.patch @@ -804,65 +804,6 @@ diff -up netpbm-10.58.01/other/pnmcolormap.c.security-code netpbm-10.58.01/other } { unsigned int const intQuotient = colormap.size / pamP->width; -diff -up netpbm-10.58.01/urt/README.security-code netpbm-10.58.01/urt/README ---- netpbm-10.58.01/urt/README.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ netpbm-10.58.01/urt/README 2012-04-09 15:40:03.231619438 +0200 -@@ -18,3 +18,8 @@ in its initializer in the original. But - defines stdout as a variable, so that wouldn't compile. So I changed - it to NULL and added a line to rle_hdr_init to set that field to - 'stdout' dynamically. 2000.06.02 BJH. -+ -+Redid the code to check for maths overflows and other crawly horrors. -+Removed pipe through and compress support (unsafe) -+ -+Alan Cox -diff -up netpbm-10.58.01/urt/rle_addhist.c.security-code netpbm-10.58.01/urt/rle_addhist.c ---- netpbm-10.58.01/urt/rle_addhist.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ netpbm-10.58.01/urt/rle_addhist.c 2012-04-09 15:40:03.231619438 +0200 -@@ -14,6 +14,8 @@ - * If you modify this software, you should include a notice giving the - * name of the person performing the modification, the date of modification, - * and the reason for such modification. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox - */ - /* - * rle_addhist.c - Add to the HISTORY comment in header -@@ -71,13 +73,19 @@ rle_addhist(char * argv[], - return; - - length = 0; -- for (i = 0; argv[i]; ++i) -+ for (i = 0; argv[i]; ++i) { -+ overflow_add(length, strlen(argv[i])); -+ overflow_add(length+1, strlen(argv[i])); - length += strlen(argv[i]) +1; /* length of each arg plus space. */ -+ } - - time(&temp); - timedate = ctime(&temp); - length += strlen(timedate); /* length of date and time in ASCII. */ - -+ overflow_add(strlen(padding), 4); -+ overflow_add(strlen(histoire), strlen(padding) + 4); -+ overflow_add(length, strlen(histoire) + strlen(padding) + 4); - length += strlen(padding) + 3 + strlen(histoire) + 1; - /* length of padding, "on " and length of history name plus "="*/ - if (in_hdr) /* if we are interested in the old comments... */ -@@ -85,9 +93,12 @@ rle_addhist(char * argv[], - else - old = NULL; - -- if (old && *old) -+ if (old && *old) { -+ overflow_add(length, strlen(old)); - length += strlen(old); /* add length if there. */ -+ } - -+ overflow_add(length, 1); - ++length; /*Cater for the null. */ - - MALLOCARRAY(newc, length); diff -up netpbm-10.58.01/urt/rle.h.security-code netpbm-10.58.01/urt/rle.h --- netpbm-10.58.01/urt/rle.h.security-code 2012-04-09 15:31:45.000000000 +0200 +++ netpbm-10.58.01/urt/rle.h 2012-04-09 15:40:03.233619414 +0200 @@ -922,41 +863,6 @@ diff -up netpbm-9.58.01/urt/rle_putcom.c.security-code netpbm-10.58.01/urt/rle_p /* Not found */ /* Can't realloc because somebody else might be pointing to this * comments block. Of course, if this were true, then the -diff -up netpbm-10.58.01/urt/Runput.c.security-code netpbm-10.58.01/urt/Runput.c ---- netpbm-10.58.01/urt/Runput.c.security-code 2012-04-09 15:31:45.000000000 +0200 -+++ netpbm-10.58.01/urt/Runput.c 2012-04-09 15:40:03.235619390 +0200 -@@ -17,6 +17,8 @@ - * - * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire - * to have all "void" functions so declared. -+ * -+ * 2002-12-19: Fix maths wrapping bugs. Alan Cox - */ - /* - * Runput.c - General purpose Run Length Encoding. -@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr) - if ( the_hdr->background != 0 ) - { - register int i; -- register rle_pixel *background = -- (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); -+ register rle_pixel *background; - register int *bg_color; -+ -+ overflow_add(the_hdr->ncolors,1); -+ background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); - /* - * If even number of bg color bytes, put out one more to get to - * 16 bit boundary. -@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr) - /* Big-endian machines are harder */ - register int i, nmap = (1 << the_hdr->cmaplen) * - the_hdr->ncmap; -- register char *h_cmap = (char *)malloc( nmap * 2 ); -+ register char *h_cmap = (char *)malloc2( nmap, 2 ); - if ( h_cmap == NULL ) - { - fprintf( stderr, --- netpbm-10.58.01/lib/libpbm1.c.orig 2014-06-16 21:12:28.499230631 -0400 +++ netpbm-10.58.01/lib/libpbm1.c 2014-06-16 21:12:55.932519324 -0400 @@ -78,6 +78,7 @@ diff --git a/srcpkgs/netpbm/files/netpbm-security-scripts.patch b/srcpkgs/netpbm/files/netpbm-security-scripts.patch deleted file mode 100644 index b26f1d4eac1..00000000000 --- a/srcpkgs/netpbm/files/netpbm-security-scripts.patch +++ /dev/null @@ -1,266 +0,0 @@ -diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/ppmfade ---- netpbm-10.47.05/editor/ppmfade.security-scripts 2009-12-10 08:34:32.000000000 +0100 -+++ netpbm-10.47.05/editor/ppmfade 2010-03-16 21:28:09.000000000 +0100 -@@ -14,6 +14,7 @@ - # - #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - use strict; -+use File::Temp "tempdir"; - - my $SPREAD = 1; - my $SHIFT = 2; -@@ -111,20 +112,26 @@ if ($first_file ne "undefined") { - - print("Frames are " . $width . "W x " . $height . "H\n"); - -+# -+# We create a tmp-directory right here -+# -+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1); -+ -+ - if ($first_file eq "undefined") { - print "Fading from black to "; -- system("ppmmake \\#000 $width $height >junk1$$.ppm"); -+ system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm"); - } else { - print "Fading from $first_file to "; -- system("cp", $first_file, "junk1$$.ppm"); -+ system("cp", $first_file, "$tmpdir/junk1$$.ppm"); - } - - if ($last_file eq "undefined") { - print "black.\n"; -- system("ppmmake \\#000 $width $height >junk2$$.ppm"); -+ system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm"); - } else { - print "$last_file\n"; -- system("cp", $last_file, "junk2$$.ppm"); -+ system("cp", $last_file, "$tmpdir/junk2$$.ppm"); - } - - # -@@ -132,14 +139,14 @@ if ($last_file eq "undefined") { - # - - # Here's what our temporary files are: --# junk1$$.ppm: The original (fade-from) image --# junk2$$.ppm: The target (fade-from) image --# junk3$$.ppm: The frame of the fade for the current iteration of the --# the for loop. --# junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate --# image to another, this is the first frame of that --# sequence. --# junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence -+# $tmpdir/junk1$$.ppm: The original (fade-from) image -+# $tmpdir/junk2$$.ppm: The target (fade-from) image -+# $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the -+# the for loop. -+# $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate -+# image to another, this is the first frame of that -+# sequence. -+# $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence - - my $i; # Frame number - for ($i = 1; $i <= $nframes; $i++) { -@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) { - if ($mode eq $SPREAD) { - if ($i <= 10) { - my $n = $spline20[$i] * 100; -- system("ppmspread $n junk1$$.ppm >junk3$$.ppm"); -+ system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n; - $n = $spline20[$i] * 100; -- system("ppmspread $n junk1$$.ppm >junk1a$$.ppm"); -+ system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm"); - $n = (1-$spline20[$i-10]) * 100; -- system("ppmspread $n junk2$$.ppm >junk2a$$.ppm"); -+ system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm"); - $n = $spline10[$i-10]; -- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = (1-$spline20[$i-10])*100; -- system("ppmspread $n junk2$$.ppm >junk3$$.ppm"); -+ system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - } elsif ($mode eq $SHIFT) { - if ($i <= 10) { - my $n = $spline20[$i] * 100; -- system("ppmshift $n junk1$$.ppm >junk3$$.ppm"); -+ system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n; - $n = $spline20[$i] * 100; -- system("ppmshift $n junk1$$.ppm >junk1a$$.ppm"); -+ system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm"); - $n = (1-$spline20[$i-10])*100; -- system("ppmshift $n junk2$$.ppm >junk2a$$.ppm"); -+ system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm"); - $n = $spline10[$i-10]; -- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = (1-$spline20[$i-10]) * 100; -- system("ppmshift $n junk2$$.ppm >junk3$$.ppm"); -+ system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - } elsif ($mode eq $RELIEF) { - if ($i == 1) { -- system("ppmrelief junk1$$.ppm >junk1r$$.ppm"); -+ system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm"); - } - if ($i <= 10) { - my $n = $spline10[$i]; -- system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = $spline10[$i-20]; -- system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("ppmrelief junk2$$.ppm >junk2r$$.ppm"); -+ system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm"); - } - } elsif ($mode eq $OIL) { - if ($i == 1) { -- system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk1o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk1o$$.ppm"); - } - if ($i <= 10) { - my $n = $spline10[$i]; -- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = $spline10[$i-20]; -- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk2o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk2o$$.ppm"); - } - } elsif ($mode eq $EDGE) { - if ($i == 1) { -- system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk1o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk1o$$.ppm"); - } - if ($i <= 10) { - my $n = $spline10[$i]; -- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = $spline10[$i-20]; -- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk2o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk2o$$.ppm"); - } - } elsif ($mode eq $BENTLEY) { - if ($i == 1) { -- system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk1o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk1o$$.ppm"); - } - if ($i <= 10) { - my $n = $spline10[$i]; -- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = $spline10[$i-20]; -- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm"); -- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " . -- ">junk2o$$.ppm"); -+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm"); -+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " . -+ ">$tmpdir/junk2o$$.ppm"); - } - } elsif ($mode eq $BLOCK) { - if ($i <= 10) { - my $n = 1 - 1.9*$spline20[$i]; -- system("pamscale $n junk1$$.ppm | " . -- "pamscale -width $width -height $height >junk3$$.ppm"); -+ system("pamscale $n $tmpdir/junk1$$.ppm | " . -+ "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm"); - } elsif ($i <= 20) { - my $n = $spline10[$i-10]; -- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm"); -+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - my $n = 1 - 1.9*$spline20[31-$i]; -- system("pamscale $n junk2$$.ppm | " . -- "pamscale -width $width -height $height >junk3$$.ppm"); -+ system("pamscale $n $tmpdir/junk2$$.ppm | " . -+ "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm"); - } - if ($i == 10) { -- system("cp", "junk3$$.ppm", "junk1a$$.ppm"); -- system("pamscale $n junk2$$.ppm | " . -- "pamscale -width $width -height $height >junk2a$$.ppm"); -+ system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm"); -+ system("pamscale $n $tmpdir/junk2$$.ppm | " . -+ "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm"); - } - } elsif ($mode eq $MIX) { - my $fade_factor = sqrt(1/($nframes-$i+1)); -- system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm"); -+ system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm"); - } else { - print("Internal error: impossible mode value '$mode'\n"); - } - - my $outfile = sprintf("%s.%04d.ppm", $base_name, $i); -- system("cp", "junk3$$.ppm", $outfile); -+ system("cp", "$tmpdir/junk3$$.ppm", $outfile); - } - - # - # Clean up shop. - # --system("rm junk*$$.ppm"); -+system("rm $tmpdir/junk*$$.ppm"); - - exit(0); diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index d72721bd9eb..61728c4c7d2 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,9 +1,9 @@ # Template file for 'netpbm' pkgname=netpbm # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY -version=10.97.06 +version=10.98.0.0 revision=1 -_githash=f336dfc59346a26a045f7e0df0ecba32d904c55e +_githash=772c4792d998deb70f1719c1a2ad82f2defde5f0 _githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79 create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" @@ -16,7 +16,7 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm" homepage="http://netpbm.sourceforge.net/" distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="9cd658ec9081b980a98fb44f02aa5289ba9ca17ad7e9a699627bf6f2a85c5612 +checksum="f53f8e57e1dec64edddec971f13a1cdcbc17d07110e4699b3090de7a79e3f75a 30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde" post_extract() { From 932346544fc54763ac1efa7055204e3e6d461347 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 3 Apr 2022 18:36:46 +0200 Subject: [PATCH 0576/2369] collectl: update to 4.3.3. --- srcpkgs/collectl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/collectl/template b/srcpkgs/collectl/template index 9ade016be22..ebc778450bc 100644 --- a/srcpkgs/collectl/template +++ b/srcpkgs/collectl/template @@ -1,6 +1,6 @@ # Template file for 'collectl' pkgname=collectl -version=4.3.2 +version=4.3.3 revision=1 wrksrc="${pkgname}" conf_files="/etc/collectl.conf" @@ -11,7 +11,7 @@ license="Artistic-1.0-Perl, GPL-2.0-only" homepage="http://collectl.sourceforge.net/" changelog="http://collectl.sourceforge.net/Releases.html" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.src.tar.gz" -checksum=9fab4769441c07201748e52c7f8c7b21526ab45a05142dd2b2b1fa5c16c38750 +checksum=3e87f9aa6cf1b585ce7cec6ee0e2cde652397fdf871b03b9609c56678f8b4dba do_install() { export DESTDIR From 24df8002177e945cae9e0c65889582362e52a3a1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 3 Apr 2022 18:37:24 +0200 Subject: [PATCH 0577/2369] skaffold: update to 1.37.1. --- srcpkgs/skaffold/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template index 4f54c6c05e9..faa9823d1cc 100644 --- a/srcpkgs/skaffold/template +++ b/srcpkgs/skaffold/template @@ -1,6 +1,6 @@ # Template file for 'skaffold' pkgname=skaffold -version=1.37.0 +version=1.37.1 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=a97a6f6cbf571f342183e5cf65c30932ade282b182fc92f108cb2a160a46779b +checksum=8dfea015256761525d8c0e54713642bcd7ead3e3c96ff58e301d0b77b9ef3bd5 From 33ae1eed44e1353668878a6ad0dea5480dfb82cc Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 3 Apr 2022 19:11:39 +0200 Subject: [PATCH 0578/2369] twm: update to 1.0.12. --- srcpkgs/twm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/twm/template b/srcpkgs/twm/template index 32a2efeeb00..94cbd1e4f51 100644 --- a/srcpkgs/twm/template +++ b/srcpkgs/twm/template @@ -1,6 +1,6 @@ # Template file for 'twm' pkgname=twm -version=1.0.11 +version=1.0.12 revision=1 build_style=gnu-configure hostmakedepends="pkg-config xorg-util-macros bison" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="http://www.x.org/archive/X11R6.8.1/doc/twm.1.html" distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" -checksum=f4e8a842dec410e79741f25ed4dfac09df080835d0bba2e3983b5914569b68c7 +checksum=aaf201d4de04c1bb11eed93de4bee0147217b7bdf61b7b761a56b2fdc276afe4 post_install() { vlicense COPYING From c668c0b010deb31a97eeb11070ccbcd1e8d77fc8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 3 Apr 2022 19:53:32 -0400 Subject: [PATCH 0579/2369] python3-progress: update to 1.6. --- srcpkgs/python3-progress/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-progress/template b/srcpkgs/python3-progress/template index 4a4ec6e0a5a..8883c784127 100644 --- a/srcpkgs/python3-progress/template +++ b/srcpkgs/python3-progress/template @@ -1,7 +1,7 @@ # Template file for 'python3-progress' pkgname=python3-progress -version=1.5 -revision=5 +version=1.6 +revision=1 wrksrc="progress-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,9 @@ maintainer="Orphaned " license="ISC" homepage="https://github.com/verigak/progress" distfiles="${PYPI_SITE}/p/progress/progress-${version}.tar.gz" -checksum=69ecedd1d1bbe71bf6313d88d1e6c4d2957b7f1d4f71312c211257f7dae64372 +checksum=c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccfba34cd +# Tests are only useful on interactive terminals +make_check=no post_install() { vlicense LICENSE From ca2252e1a72e239364bc463ac9ed9064905ddfdb 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, 3 Apr 2022 14:51:11 +0700 Subject: [PATCH 0580/2369] nss: update to 3.77. --- srcpkgs/nss/patches/cpputil-databuffer.patch | 20 -------------------- srcpkgs/nss/template | 6 +++--- 2 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/nss/patches/cpputil-databuffer.patch diff --git a/srcpkgs/nss/patches/cpputil-databuffer.patch b/srcpkgs/nss/patches/cpputil-databuffer.patch deleted file mode 100644 index 44dd3f46788..00000000000 --- a/srcpkgs/nss/patches/cpputil-databuffer.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 f85cfe79a86..5cc04daf52c 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -3,9 +3,9 @@ _nsprver=4.32 pkgname=nss -version=3.76 +version=3.77 revision=1 -hostmakedepends="perl" +hostmakedepends="perl which" makedepends="nspr-devel sqlite-devel zlib-devel" depends="nspr>=${_nsprver}" short_desc="Mozilla Network Security Services" @@ -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=1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630 +checksum=825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd export NS_USE_GCC=1 export LIBRUNPATH= From 677aa566f1bc194d1c668f466a0639cf05ad1550 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, 3 Apr 2022 18:16:39 +0700 Subject: [PATCH 0581/2369] ca-certificates: update to 20211016+3.77. --- srcpkgs/ca-certificates/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template index 450772d160e..eaa70fc7a22 100644 --- a/srcpkgs/ca-certificates/template +++ b/srcpkgs/ca-certificates/template @@ -1,6 +1,6 @@ # Template file for 'ca-certificates' pkgname=ca-certificates -version=20211016+3.74 +version=20211016+3.77 revision=1 _nss_version=${version#*+} bootstrap=yes @@ -16,7 +16,7 @@ homepage="https://wiki.mozilla.org/NSS:Root_certs" distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz ${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz" checksum="2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88 - 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056" + 825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd" post_extract() { cp ${FILESDIR}/* $build_wrksrc/mozilla From c7549dcd6999d21f94a9fc5e43e7561b3e029c52 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 4 Apr 2022 15:45:11 +0200 Subject: [PATCH 0582/2369] texlive2021-bin: use historic texlive repository. As texlive2022 has been released the default repository no longer contains the 2021 version. Make the installer use the frozen historic one. --- srcpkgs/texlive2021-bin/INSTALL | 4 ++-- srcpkgs/texlive2021-bin/template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/texlive2021-bin/INSTALL b/srcpkgs/texlive2021-bin/INSTALL index 9a5b1df97de..bc296786a54 100644 --- a/srcpkgs/texlive2021-bin/INSTALL +++ b/srcpkgs/texlive2021-bin/INSTALL @@ -5,10 +5,10 @@ post) cd opt/texlive2021-installer case "${ARCH}" in x86_64-musl) - ./install-tl -profile void.profile -force-platform x86_64-linuxmusl + ./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile -force-platform x86_64-linuxmusl ;; *) - ./install-tl -profile void.profile + ./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile ;; esac esac diff --git a/srcpkgs/texlive2021-bin/template b/srcpkgs/texlive2021-bin/template index 5c9e334c788..c7bbe1f9fdb 100644 --- a/srcpkgs/texlive2021-bin/template +++ b/srcpkgs/texlive2021-bin/template @@ -1,7 +1,7 @@ # Template file for 'texlive2021-bin' pkgname=texlive2021-bin version=2021 -revision=1 +revision=2 archs="x86_64* i686 aarch64 arm*" create_wrksrc=yes depends="cairo pixman graphite gd poppler libsigsegv From 5d03fd4db71fd9a709a7308ec8f69c5a8754d38a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 4 Apr 2022 15:45:46 +0200 Subject: [PATCH 0583/2369] New package: texlive2022-bin-2022 --- srcpkgs/texlive2022-bin/INSTALL | 15 ++++++++ srcpkgs/texlive2022-bin/INSTALL.msg | 25 ++++++++++++ srcpkgs/texlive2022-bin/REMOVE | 8 ++++ srcpkgs/texlive2022-bin/files/void.profile | 8 ++++ srcpkgs/texlive2022-bin/template | 45 ++++++++++++++++++++++ 5 files changed, 101 insertions(+) create mode 100644 srcpkgs/texlive2022-bin/INSTALL create mode 100644 srcpkgs/texlive2022-bin/INSTALL.msg create mode 100644 srcpkgs/texlive2022-bin/REMOVE create mode 100644 srcpkgs/texlive2022-bin/files/void.profile create mode 100644 srcpkgs/texlive2022-bin/template diff --git a/srcpkgs/texlive2022-bin/INSTALL b/srcpkgs/texlive2022-bin/INSTALL new file mode 100644 index 00000000000..890ae6709c6 --- /dev/null +++ b/srcpkgs/texlive2022-bin/INSTALL @@ -0,0 +1,15 @@ +case "${ACTION}" in +post) + case "${UPDATE}" in + no) + cd opt/texlive2022-installer + case "${ARCH}" in + x86_64-musl) + ./install-tl -profile void.profile -force-platform x86_64-linuxmusl + ;; + *) + ./install-tl -profile void.profile + ;; + esac + esac +esac diff --git a/srcpkgs/texlive2022-bin/INSTALL.msg b/srcpkgs/texlive2022-bin/INSTALL.msg new file mode 100644 index 00000000000..05a58d965c7 --- /dev/null +++ b/srcpkgs/texlive2022-bin/INSTALL.msg @@ -0,0 +1,25 @@ +- TeXLive is free software see the files: + + /usr/share/licenses/texlive2022-bin/LICENSE.TL + /usr/share/licenses/texlive2022-bin/LICENSE.CTAN + +===================================================================== + + To update you TeXLive installation use only the program + + /opt/texlive/2022/bin//tlmgr + + where is: + - x86_64-linux ==> x86_64 architecture + - i386-linux ==> i386 architecture + + see: + + http://www.tug.org/texlive/doc/tlmgr.html#EXAMPLES + + for the details and the documentation in + + WARNING: To avoid messing up your TeXLive installation, DON'T use + the installation scripts in /opt/texlive-installer. + + For a full installation, run "tlmgr install scheme-full". diff --git a/srcpkgs/texlive2022-bin/REMOVE b/srcpkgs/texlive2022-bin/REMOVE new file mode 100644 index 00000000000..82df92619ea --- /dev/null +++ b/srcpkgs/texlive2022-bin/REMOVE @@ -0,0 +1,8 @@ +# This script will clear the TeXLive directory +# +case "${ACTION}" in +post) + rm -rf opt/texlive/2022 + rm -r opt/texlive2022-installer + ;; +esac diff --git a/srcpkgs/texlive2022-bin/files/void.profile b/srcpkgs/texlive2022-bin/files/void.profile new file mode 100644 index 00000000000..17ad30ed523 --- /dev/null +++ b/srcpkgs/texlive2022-bin/files/void.profile @@ -0,0 +1,8 @@ +# texlive.profile written for voidlinux +TEXDIR ../texlive/2022 +TEXMFCONFIG ~/.texlive2022/texmf-config +TEXMFHOME ~/texmf +TEXMFLOCAL ../texlive/texmf-local +TEXMFSYSCONFIG ../texlive/2022/texmf-config +TEXMFSYSVAR ../texlive/2022/texmf-var +TEXMFVAR ~/.texlive2022/texmf-var diff --git a/srcpkgs/texlive2022-bin/template b/srcpkgs/texlive2022-bin/template new file mode 100644 index 00000000000..902d4dc245d --- /dev/null +++ b/srcpkgs/texlive2022-bin/template @@ -0,0 +1,45 @@ +# Template file for 'texlive2022-bin' +pkgname=texlive2022-bin +version=2022 +revision=1 +archs="x86_64* i686 aarch64 arm*" +create_wrksrc=yes +depends="cairo pixman graphite gd poppler libsigsegv + zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl + ghostscript xz" +short_desc="TeX Live Binary distribution through tl-install" +maintainer="Leah Neukirchen " +license="GPL-2.0-or-later" +homepage="https://tug.org/texlive/" +distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz" +checksum=e67edec49df6b7c4a987a7d5a9b31bcf41258220f9ac841c7a836080cd334fb5 + +# Package build options +build_options="basic small medium full" +build_options_default="small" +desc_option_basic="Install TeXLive using scheme-basic" +desc_option_small="Install TeXLive using scheme-small" +desc_option_medium="Install TeXLive using scheme-medium" +desc_option_full="Install TeXLive using scheme-full" + +pre_install() { + rm -rf ${wrksrc}/install-tl*/tlpkg/installer/xz \ + ${wrksrc}/install-tl*/tlpkg/installer/wget +} + +do_install() { + vmkdir opt/texlive${version}-installer + vcopy "install-tl-*/*" /opt/texlive${version}-installer + vinstall ${FILESDIR}/void.profile 644 opt/texlive${version}-installer + if [ "$build_option_basic" ]; then + echo "selected_scheme scheme-basic" + elif [ "$build_option_small" ]; then + echo "selected_scheme scheme-small" + elif [ "$build_option_medium" = "medium" ];then + echo "selected_scheme scheme-medium" + elif [ "$build_option_full" ];then + echo "selected_scheme scheme-full" + fi >>${DESTDIR}/opt/texlive${version}-installer/void.profile + vlicense ${DESTDIR}/opt/texlive${version}-installer/LICENSE.CTAN + vlicense ${DESTDIR}/opt/texlive${version}-installer/LICENSE.TL +} From b166d5f901c54dd6f4529d1646f235bc500e19d8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 4 Apr 2022 19:25:10 +0200 Subject: [PATCH 0584/2369] xcalc: update to 1.1.1. --- srcpkgs/xcalc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xcalc/template b/srcpkgs/xcalc/template index d73849df763..90be0b7c502 100644 --- a/srcpkgs/xcalc/template +++ b/srcpkgs/xcalc/template @@ -1,6 +1,6 @@ # Template file for 'xcalc' pkgname=xcalc -version=1.1.0 +version=1.1.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config xorg-util-macros" @@ -9,8 +9,8 @@ short_desc="Scientific calculator for X" maintainer="Leah Neukirchen " license="MIT" homepage="http://www.x.org/archive/X11R6.8.1/doc/xcalc.1.html" -distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" -checksum=d5d746954465afc3da1f355d721882806568fb04b4d059c027702c0d16a3b5eb +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" +checksum=8cb08212c5322e8043f39b28699e13a43f000976c90b3c7fadd4fae2766326b4 post_install() { vlicense COPYING From 70dd911c012ea401dde6ad8067a0d9657fad4034 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 4 Apr 2022 19:26:24 +0200 Subject: [PATCH 0585/2369] xclock: update to 1.1.0. --- srcpkgs/xclock/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xclock/template b/srcpkgs/xclock/template index 68650d8d3ce..6d214076f83 100644 --- a/srcpkgs/xclock/template +++ b/srcpkgs/xclock/template @@ -1,6 +1,6 @@ # Template file for 'xclock' pkgname=xclock -version=1.0.9 +version=1.1.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config xorg-util-macros" @@ -9,8 +9,8 @@ short_desc="Analog and digital clock for X" maintainer="Leah Neukirchen " license="MIT" homepage="http://www.x.org/archive/X11R6.8.1/doc/xclock.1.html" -distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" -checksum=cf461fb2c6f2ac42c54d8429ee2010fdb9a1442a370adfbfe8a7bfaf33c123bb +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" +checksum=00d1be08b3471a16b1239acad11e26b80545c49c34d9d20deab0ce14515e098f post_install() { vlicense COPYING From 3a19508664d7d954b3d0ef1211c818900cc823a1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 4 Apr 2022 19:27:47 +0200 Subject: [PATCH 0586/2369] xdm: update to 1.1.13. --- srcpkgs/xdm/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xdm/template b/srcpkgs/xdm/template index 8eb910bf6c8..3a53a7ae30c 100644 --- a/srcpkgs/xdm/template +++ b/srcpkgs/xdm/template @@ -1,7 +1,7 @@ # Template file for 'xdm' pkgname=xdm -version=1.1.12 -revision=5 +version=1.1.13 +revision=1 build_style=gnu-configure configure_args="--with-random-device=/dev/urandom --with-utmp-file=/var/run/utmp @@ -21,8 +21,8 @@ short_desc="X Display Manager" maintainer="Leah Neukirchen " license="MIT" homepage="http://xorg.freedesktop.org" -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=0dd283f72dda098d09e2925b9278c95e21551e693a5802ab442d1b577d8327f4 +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz" +checksum=e58267e8f1478f2f5cd57cbcf2367a36973860c3131a450a3e0816585af03264 post_install() { vsv xdm From 7982423d34f62c3dfe2531436590aa82b7ae59b4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 4 Apr 2022 19:30:19 +0200 Subject: [PATCH 0587/2369] xedit: update to 1.2.3. --- srcpkgs/xedit/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xedit/template b/srcpkgs/xedit/template index 99f2001b161..5cdfccdeb59 100644 --- a/srcpkgs/xedit/template +++ b/srcpkgs/xedit/template @@ -1,7 +1,7 @@ # Template build file for 'xedit'. pkgname=xedit -version=1.2.2 -revision=3 +version=1.2.3 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libXaw-devel" @@ -9,8 +9,8 @@ short_desc="Simple text editor for X" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Leah Neukirchen " -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=69aa42885dfc06332ca22eb01cc7187e49206e6d65b74113a8ee4cc345fc2927 +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz" +checksum=bdd33afeeca881622e55d2cf28f07b4a98f083d0a2573c0b9048f25bdd62db2f post_install() { vlicense COPYING From 2303330c310d2954d05f454f85dde79052ad6cae Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 4 Apr 2022 19:31:06 +0200 Subject: [PATCH 0588/2369] xload: update to 1.1.4. --- srcpkgs/xload/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xload/template b/srcpkgs/xload/template index 74cbd8bbf5e..ea85f0afcc4 100644 --- a/srcpkgs/xload/template +++ b/srcpkgs/xload/template @@ -1,6 +1,6 @@ # Template file for 'xload' pkgname=xload -version=1.1.3 +version=1.1.4 revision=1 build_style=gnu-configure hostmakedepends="gettext pkg-config xorg-util-macros" @@ -9,8 +9,8 @@ short_desc="System load average display for X" maintainer="Leah Neukirchen " license="X11, MIT" homepage="http://www.x.org/archive/X11R6.8.1/doc/xload.1.html" -distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" -checksum=f34e4803871d771325cfe52bebd98cc5b6040d3f065184ec73de436f9a375907 +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" +checksum=8346b99120db24e0f42920f7f12e23e9b1b407d3a66ce419990387b608373031 post_install() { vlicense COPYING From dcc6dd43efff8bdf0a3a1e9c54e297bca5c9f790 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 4 Apr 2022 19:32:57 +0200 Subject: [PATCH 0589/2369] xlsfonts: update to 1.0.7. Adopted. --- srcpkgs/xlsfonts/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/xlsfonts/template b/srcpkgs/xlsfonts/template index 27caf717e52..830ae67c26f 100644 --- a/srcpkgs/xlsfonts/template +++ b/srcpkgs/xlsfonts/template @@ -1,16 +1,16 @@ -# Template build file for 'xlsfonts'. +# Template file for 'xlsfonts' pkgname=xlsfonts -version=1.0.6 +version=1.0.7 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libX11-devel" short_desc="Server font list displayer for X" -homepage="http://xorg.freedesktop.org" +maintainer="Leah Neukirchen " license="MIT" -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -maintainer="Orphaned " -checksum=89b80b3a030006ab6cef717be286c12f2477894b227158b1e6133274f6ebd368 +homepage="http://xorg.freedesktop.org" +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz" +checksum=7b726945a967b44c35cddee5edd74802907a239ce2e2e515730b8a32c8e50465 post_install() { vlicense COPYING From 556e641ec7ff76e4fa35d5d92d6a719b43124ccb Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Wed, 13 Oct 2021 08:31:15 -0400 Subject: [PATCH 0590/2369] python3-zeroconf: update to 0.38.4. --- srcpkgs/python3-zeroconf/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template index a08bf018db1..acae59ecd99 100644 --- a/srcpkgs/python3-zeroconf/template +++ b/srcpkgs/python3-zeroconf/template @@ -1,20 +1,21 @@ # Template file for 'python3-zeroconf' pkgname=python3-zeroconf -version=0.30.0 -revision=2 +version=0.38.4 +revision=1 wrksrc="python-zeroconf-${version}" build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-ifaddr" -checkdepends="python3-pytest python3-mypy $depends" +checkdepends="python3-pytest python3-pytest-cov python3-mypy + python3-pytest-asyncio $depends" short_desc="Pure Python3 implementation of multicast DNS service discovery" maintainer="Karl Nilsson " license="LGPL-2.1-or-later" homepage="https://github.com/jstasiak/python-zeroconf" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=bbb5e15625a96ac4dc4fba33519227ea8a6d1991000af51e976d01d2917a8d82 +checksum=74ead61490a7573d1cab1e9e9ea6fe846be0843c4ddd55633788d4670837c0eb do_check() { # IPv6 doesn't work on github CI - SKIP_IPV6=1 python3 -m pytest zeroconf/test.py + SKIP_IPV6=1 python3 -m pytest tests/ } From 8ca2557672cf795426f382d81523f72ddc7479d1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 00:04:32 -0400 Subject: [PATCH 0591/2369] chezmoi: update to 2.15.0. --- srcpkgs/chezmoi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 464d7ccc07c..abf8ff70d40 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,6 +1,6 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.14.0 +version=2.15.0 revision=1 build_style=go go_import_path="github.com/twpayne/chezmoi/v2" @@ -12,7 +12,7 @@ maintainer="classabbyamp " license="MIT" homepage="https://chezmoi.io/" distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz" -checksum=4d7a1baf7e3caa8f6976b1ea5e6ba81c75273b1dd1f0fc946134a82454720397 +checksum=d33a5df53bde7b94962c39788e44af41e52a7836bc6d43168c9b324da966996e export CGO_ENABLED=1 From 0998c3c0aa327f51a2acd9a6fb058bed1e5257a3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Apr 2022 21:29:38 +0200 Subject: [PATCH 0592/2369] apostrophe: update to 2.6.2. --- srcpkgs/apostrophe/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template index d130b8694cd..54a80188bda 100644 --- a/srcpkgs/apostrophe/template +++ b/srcpkgs/apostrophe/template @@ -1,6 +1,6 @@ # Template file for 'apostrophe' pkgname=apostrophe -version=2.6.1 +version=2.6.2 revision=1 wrksrc="$pkgname-v$version" build_style=meson @@ -9,9 +9,10 @@ hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext sassc" makedepends="libglib-devel gtk+3-devel libhandy1-devel" depends="python3-gobject python3-chardet python3-setuptools python3-pypandoc gspell iso-codes libhandy1 webkit2gtk" -short_desc="GTK+ based distraction free Markdown editor" +short_desc="GTK based distraction free Markdown editor" maintainer="Michal Vasilek " license="GPL-3.0-only" homepage="https://gitlab.gnome.org/World/apostrophe" +changelog="https://gitlab.gnome.org/World/apostrophe/-/raw/main/NEWS" distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz" -checksum=f1c38d97cc5413a21017b95c16f0e869fd0d316ec1a3c54ec5607534562cee5c +checksum=b06ca4593ceb21bcd7f9734e41ba3fb69f632b5ab24afcdc66500d18d242c068 From 7129092eed880378b81d4bd3a78f888d69c89c23 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Apr 2022 21:45:19 +0200 Subject: [PATCH 0593/2369] streamlink: update to 3.2.0. --- srcpkgs/streamlink/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template index 3d168cc74c7..5b8427c56e9 100644 --- a/srcpkgs/streamlink/template +++ b/srcpkgs/streamlink/template @@ -1,6 +1,6 @@ # Template file for 'streamlink' pkgname=streamlink -version=3.1.1 +version=3.2.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -14,7 +14,7 @@ license="BSD-2-Clause" homepage="https://streamlink.github.io/" changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md" distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz" -checksum=855cd31e900e3ae1d5328a37123bfffe2aec501a1d74bcdd12f0d2a2758060e4 +checksum=9770d2d83844c5378a73e14130dcb760abc856566caa0a41fc5b97a0ded5d926 make_check=ci-skip # some tests fail when running as root post_install() { From fa0118c3670331159e9a6f2ff10d783dd3f81d73 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Apr 2022 21:48:10 +0200 Subject: [PATCH 0594/2369] xorg-server-xwayland: update to 22.1.1. --- srcpkgs/xorg-server-xwayland/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template index 0506654b4ca..9cb01b318dd 100644 --- a/srcpkgs/xorg-server-xwayland/template +++ b/srcpkgs/xorg-server-xwayland/template @@ -1,6 +1,6 @@ # Template file for 'xorg-server-xwayland' pkgname=xorg-server-xwayland -version=22.1.0 +version=22.1.1 revision=1 wrksrc="xserver-xwayland-$version" build_style=meson @@ -17,7 +17,7 @@ maintainer="Michal Vasilek " license="MIT" homepage="https://xorg.freedesktop.org" distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz" -checksum=972d5456445049855a669c1418f20ecbc290c85b1b59602a01c6afa199203389 +checksum=42837e7b90e0d92aff4d7846f0609f8d3c0c6641bdd6add6e4e0c5c214371149 make_check=no # needs xtest repository post_install() { From 72f3407c7c3b3e642ff3823d6a10cf3e165be49a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Apr 2022 21:48:34 +0200 Subject: [PATCH 0595/2369] lagrange: update to 1.11.2. --- srcpkgs/lagrange/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template index 0da2bdd614f..41a9f935f8e 100644 --- a/srcpkgs/lagrange/template +++ b/srcpkgs/lagrange/template @@ -1,6 +1,6 @@ # Template file for 'lagrange' pkgname=lagrange -version=1.11.1 +version=1.11.2 revision=1 build_style=cmake hostmakedepends="pkg-config zip" @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://gmi.skyjake.fi/lagrange/" changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi" distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz" -checksum=a303f62b6e7372396d334f25eeaaa745827c28ac926dc12305b2b41596d748e8 +checksum=4e9a9ed38bcfc7b04856f0e2667d7afd535a8e06e367e2e4368ef5fb9105791f post_install() { vlicense LICENSE.md From 55e7c699bffb2f638a3a89342b5901350c09b752 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Apr 2022 21:51:01 +0200 Subject: [PATCH 0596/2369] python3-charset-normalizer: update to 2.0.12. --- srcpkgs/python3-charset-normalizer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template index 16fbe97b2ef..7c8809724b1 100644 --- a/srcpkgs/python3-charset-normalizer/template +++ b/srcpkgs/python3-charset-normalizer/template @@ -1,6 +1,6 @@ # Template file for 'python3-charset-normalizer' pkgname=python3-charset-normalizer -version=2.0.11 +version=2.0.12 revision=1 wrksrc="charset_normalizer-$version" build_style=python3-module @@ -13,7 +13,7 @@ license="MIT" homepage="https://charset-normalizer.readthedocs.io/" changelog="https://raw.githubusercontent.com/Ousret/charset_normalizer/master/CHANGELOG.md" distfiles="https://github.com/Ousret/charset_normalizer/archive/refs/tags/$version.tar.gz" -checksum=d7188036dd61de0e626717d0b5fe6365beac7ea03c77b354e874a1098ed2b18a +checksum=8dd3a1a5444741208d627993344516cb62909c8c3f5c55deaa5bee6a305ead7a pre_check() { vsed -i "s/--cov=charset_normalizer --cov-report=term-missing//" setup.cfg From 479baab1bf4b6fdbac717a2adfbaf4b4dab7e114 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Apr 2022 21:51:06 +0200 Subject: [PATCH 0597/2369] easyeffects: update to 6.2.4. --- srcpkgs/easyeffects/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template index bc1aaffed67..ac84ce15b06 100644 --- a/srcpkgs/easyeffects/template +++ b/srcpkgs/easyeffects/template @@ -1,6 +1,6 @@ # Template file for 'easyeffects' pkgname=easyeffects -version=6.2.3 +version=6.2.4 revision=1 build_style=meson hostmakedepends="pkg-config gettext itstool glib-devel" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/wwmm/easyeffects" changelog="https://raw.githubusercontent.com/wwmm/easyeffects/master/CHANGELOG.md" distfiles="https://github.com/wwmm/easyeffects/archive/v${version}.tar.gz" -checksum=525cb56847c5d85589a2351e012712ff7f66c951f530ba50f5acb86a988584aa +checksum=2d4e5638f209a887acb73b3d2bbea4bc5f83ded866bba40c1935ec40fb17658b pulseeffects_package() { depends="${sourcepkg}>=${version}_${revision}" From 61273487f74b3d3df87f2cffed1c32fe86ec8160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 3 Apr 2022 12:00:11 -0300 Subject: [PATCH 0598/2369] New package: threejs-sage-r122 --- srcpkgs/threejs-sage/template | 16 ++++++++++++++++ srcpkgs/threejs-sage/update | 1 + 2 files changed, 17 insertions(+) create mode 100644 srcpkgs/threejs-sage/template create mode 100644 srcpkgs/threejs-sage/update diff --git a/srcpkgs/threejs-sage/template b/srcpkgs/threejs-sage/template new file mode 100644 index 00000000000..cb5c87a19c1 --- /dev/null +++ b/srcpkgs/threejs-sage/template @@ -0,0 +1,16 @@ +# Template file for 'threejs-sage' +pkgname=threejs-sage +version=r122 +revision=1 +short_desc="Custom build of three.js for sagemath" +maintainer="Gonzalo Tornaría " +license="MIT" +homepage="https://github.com/sagemath/threejs-sage/" +distfiles="https://github.com/sagemath/threejs-sage/archive/refs/tags/${version}.tar.gz" +checksum=718767ab55876a3e957d1cfe89a322c6d9fa680fc737b9ca668aee6a3eac3bb8 + +do_install() { + vlicense LICENSE + vinstall version 644 usr/share/sagemath/threejs-sage + vinstall build/three.min.js 644 usr/share/sagemath/threejs-sage/$version +} diff --git a/srcpkgs/threejs-sage/update b/srcpkgs/threejs-sage/update new file mode 100644 index 00000000000..05c0c7ecebe --- /dev/null +++ b/srcpkgs/threejs-sage/update @@ -0,0 +1 @@ +site=https://mirrors.mit.edu/sage/spkg/upstream/threejs/ From b5d64a1fb1ecdd519a10e8b18ec4e96eb118daff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 28 Feb 2022 12:03:22 -0300 Subject: [PATCH 0599/2369] lrcalc: update to 2.1. --- common/shlibs | 2 +- srcpkgs/lrcalc/patches/includes.patch | 90 --------------------------- srcpkgs/lrcalc/template | 6 +- 3 files changed, 4 insertions(+), 94 deletions(-) delete mode 100644 srcpkgs/lrcalc/patches/includes.patch diff --git a/common/shlibs b/common/shlibs index 307cb13347f..e7af88140d1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4040,7 +4040,7 @@ libarb.so.2 arb-2.20.0_1 libec.so.8 eclib-20210625_1 libsymmetrica.so.2 symmetrica-3.0.1_1 libLfunction.so.1 lcalc-2.0.4_1 -liblrcalc.so.1 lrcalc-1.2_1 +liblrcalc.so.2 lrcalc-2.1_1 libwayland-client++.so.0 libwaylandpp-0.2.8_1 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1 libwayland-egl++.so.0 libwaylandpp-0.2.8_1 diff --git a/srcpkgs/lrcalc/patches/includes.patch b/srcpkgs/lrcalc/patches/includes.patch deleted file mode 100644 index 707da176a60..00000000000 --- a/srcpkgs/lrcalc/patches/includes.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 4a5e1c8c3c11efdb1cbb4239825a6bf4bf1c52f8 Mon Sep 17 00:00:00 2001 -From: Anders Skovsted Buch -Date: Sun, 29 Nov 2015 16:25:56 -0500 -Subject: [PATCH] Patch by Jeroen Demeyer to change include to - "vector.h", plus similar cases. - ---- - src/lrcalc.c | 2 +- - src/maple.c | 4 ++-- - src/schublib.h | 2 +- - src/symfcn.c | 6 +++--- - src/symfcn.h | 4 ++-- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/lrcalc.c b/src/lrcalc.c -index aff3f75..60df49e 100644 ---- a/src/lrcalc.c -+++ b/src/lrcalc.c -@@ -8,7 +8,7 @@ - #include - extern char *optarg; - --#include -+#include "vectarg.h" - - #include "symfcn.h" - #include "maple.h" -diff --git a/src/maple.c b/src/maple.c -index fdc0768..a5f4d14 100644 ---- a/src/maple.c -+++ b/src/maple.c -@@ -4,8 +4,8 @@ - */ - - #include --#include --#include -+#include "vector.h" -+#include "hashtab.h" - #include "maple.h" - - -diff --git a/src/schublib.h b/src/schublib.h -index a8e8511..864850c 100644 ---- a/src/schublib.h -+++ b/src/schublib.h -@@ -1,7 +1,7 @@ - #ifndef _SCHUBLIB_H - #define _SCHUBLIB_H - --#include -+#include "hashtab.h" - - hashtab *trans(vector *w, int vars, hashtab *res); - hashtab *monk(int i, hashtab *slc, int rank); -diff --git a/src/symfcn.c b/src/symfcn.c -index 4ffbe4b..fd5df5d 100644 ---- a/src/symfcn.c -+++ b/src/symfcn.c -@@ -5,9 +5,9 @@ - - #include - --#include --#include --#include -+#include "alloc.h" -+#include "vector.h" -+#include "hashtab.h" - - #include "symfcn.h" - -diff --git a/src/symfcn.h b/src/symfcn.h -index b8543b1..29bb00d 100644 ---- a/src/symfcn.h -+++ b/src/symfcn.h -@@ -1,8 +1,8 @@ - #ifndef _SYMFCN_H - #define _SYMFCN_H - --#include --#include -+#include "hashtab.h" -+#include "vector.h" - - int part_itr_sz(vector *part); - int part_itr_sub(vector *part, vector *outer); --- -2.1.1.1.g1fb337f - diff --git a/srcpkgs/lrcalc/template b/srcpkgs/lrcalc/template index 8b33c3cba6c..afa889b6d6a 100644 --- a/srcpkgs/lrcalc/template +++ b/srcpkgs/lrcalc/template @@ -1,14 +1,14 @@ # Template file for 'lrcalc' pkgname=lrcalc -version=1.2 -revision=2 +version=2.1 +revision=1 build_style=gnu-configure short_desc="Littlewood-Richardson Calculator" maintainer="Gonzalo Tornaría " license="GPL-3.0-or-later" homepage="https://sites.math.rutgers.edu/~asbuch/lrcalc/" distfiles="https://sites.math.rutgers.edu/~asbuch/lrcalc/lrcalc-$version.tar.gz" -checksum=792dd538a0d19698be2c5b8c138730bbb4820e8a44e03b001ae14bd5f1d7040b +checksum=996ac00e6ea8321ef09b34478f5379f613933c3254aeba624b6419b8afa5df57 lrcalc-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From faa83123a74a3fbfde81e6969488c15d797e214e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 28 Feb 2022 14:06:21 -0300 Subject: [PATCH 0600/2369] New package: python3-lrcalc-2.1 --- srcpkgs/python3-lrcalc/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/python3-lrcalc/template diff --git a/srcpkgs/python3-lrcalc/template b/srcpkgs/python3-lrcalc/template new file mode 100644 index 00000000000..9f335dac35d --- /dev/null +++ b/srcpkgs/python3-lrcalc/template @@ -0,0 +1,14 @@ +# Template file for 'python3-lrcalc' +pkgname=python3-lrcalc +version=2.1 +revision=1 +wrksrc=lrcalc-${version} +build_style=python3-module +hostmakedepends="python3-setuptools python3-Cython" +makedepends="python3-devel lrcalc-devel" +short_desc="Python bindings for the Littlewood-Richardson Calculator library" +maintainer="Gonzalo Tornaría " +license="GPL-3.0-or-later" +homepage="https://math.rutgers.edu/~asbuch/lrcalc" +distfiles="${PYPI_SITE}/l/lrcalc/lrcalc-${version}.tar.gz" +checksum=e3a0509aeda487b412b391a52e817ca36b5c063a8305e09fd54d53259dd6aaa9 From 0bcd05b71e3f2da646aa471bb6765e066f70d2a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 22 Jan 2022 16:35:34 -0300 Subject: [PATCH 0601/2369] lcalc: ignore a version irrelevant for us --- srcpkgs/lcalc/update | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 srcpkgs/lcalc/update diff --git a/srcpkgs/lcalc/update b/srcpkgs/lcalc/update new file mode 100644 index 00000000000..4cfe261c03b --- /dev/null +++ b/srcpkgs/lcalc/update @@ -0,0 +1,2 @@ +# this version only adds a fix for cygwin +ignore=2.0.5 From 8367492f6ef7a8fcb378390eabf50c360d15e90d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 22 Jan 2022 16:35:20 -0300 Subject: [PATCH 0602/2369] python3-gmpy2: ignore a version irrelevant for us --- srcpkgs/python3-gmpy2/update | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/python3-gmpy2/update b/srcpkgs/python3-gmpy2/update index b5703618d28..0d9a7f7d201 100644 --- a/srcpkgs/python3-gmpy2/update +++ b/srcpkgs/python3-gmpy2/update @@ -1 +1,3 @@ ignore="*a[1-9] *b[1-9] *rc[1-9]" +# this version only adds binary wheels for apple silicon +ignore="$ignore 2.1.2" From 300bcb86a8a4b0b434619091a0ca63804d4c89fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 28 Feb 2022 14:06:28 -0300 Subject: [PATCH 0603/2369] sagemath: rebuild for package updates - compatibility with lrcalc 2.1 (trac #31355) - fix doctests for ipython-8.1 (trac #33170) - fix doctests for scipy-1.8 (trac #33336) - fix doctests for sympy-1.10 (trac #33398) - fix doctests when sphinx is installed (trac #33585) - use new package threejs-sage for 3d plots --- .../trac-31355-upgrade_lrcalc_to_2.1.patch | 670 ++++++++++++++++++ .../trac-33170-fix_doctest_ipython_8.patch | 40 ++ .../trac-33170b-fix_doctest_ipython_8.1.patch | 13 + .../trac-33336-fix_doctest_scipy_1.8.patch | 19 + ...d9deaeaa6380ab2f0d50276d911233c00a04.patch | 99 +++ ...ff347454ac7f07e5918470b20e97b8f2357e.patch | 29 + ...0a0b14f67f4804e7113c3db41bbcf8a58296.patch | 26 + .../patches/zzz-skip_doctest_no_threejs.patch | 13 - srcpkgs/sagemath/template | 9 +- 9 files changed, 901 insertions(+), 17 deletions(-) create mode 100644 srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch create mode 100644 srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch create mode 100644 srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch create mode 100644 srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch create mode 100644 srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch create mode 100644 srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch create mode 100644 srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch delete mode 100644 srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch diff --git a/srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch b/srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch new file mode 100644 index 00000000000..4bd6f4f4e2d --- /dev/null +++ b/srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch @@ -0,0 +1,670 @@ +As produced by `git diff 9.5 9.6.beta3 -- src/sage/libs/lrcalc` + +diff --git a/src/sage/libs/lrcalc/lrcalc.pxd b/src/sage/libs/lrcalc/lrcalc.pxd +deleted file mode 100644 +index 10b88db93f2..00000000000 +--- a/src/sage/libs/lrcalc/lrcalc.pxd ++++ /dev/null +@@ -1,77 +0,0 @@ +-# distutils: libraries = lrcalc +- +-cdef extern from "lrcalc/hashtab.h": +- ctypedef struct hashtab: +- pass +- +- ctypedef struct hash_itr: +- pass +- +- ctypedef unsigned long hashkey_t +- ctypedef int (*cmp_t) (void* a, void* b) +- ctypedef hashkey_t (*hash_t) (void* a) +- +- hashtab* hash_new(cmp_t cm, hash_t hsh) +- void hash_free(hashtab *ht) +- +- void* hash_lookup(hashtab *ht, void *key) +- void* hash_insert(hashtab *ht, void *key, void *value) +- +- bint hash_good(hash_itr) +- void hash_first(hashtab* s, hash_itr itr) +- void hash_next(hash_itr itr) +- void* hash_key(hash_itr itr) +- void* hash_value(hash_itr itr) +- int hash_intvalue(hash_itr itr) +- +-cdef extern from "lrcalc/vector.h": +- ctypedef struct vector: +- size_t length +- int* array +- +- vector* v_new(int length) +- void v_free(vector* v) +- void v_print(vector *v) +- int v_length(vector* v) +- int v_elem(vector* v, int i) +- +- ctypedef struct vecpair: +- vector *first +- vector *second +- +- vector* vp_first(vecpair* vp) +- vector* vp_second(vecpair* vp) +- +-cdef extern from "lrcalc/list.h": +- cdef struct _list: +- void **array +- size_t allocated +- size_t length +- void l_free(_list *lst) +- +-cdef extern from "lrcalc/symfcn.h": +- long long lrcoef_c "lrcoef"(vector* outer, vector* inner1, vector* inner2) +- hashtab* mult_c "mult"(vector *sh1, vector *sh2, int maxrows) +- hashtab* skew_c "skew"(vector *outer, vector *inner, int maxrows) +- hashtab* coprod_c "coprod"(vector *part, int all) +- void fusion_reduce_c "fusion_reduce"(hashtab* ht, int rows, int cols, int opt_zero) +- _list *quantum_reduce_c "quantum_reduce"(hashtab* ht, int rows, int col) +- +- ctypedef struct skewtab: +- vector *outer +- vector *inner +- vector *conts +- int maxrows +- vector *conjugate +- int rows +- int cols +- int matrix[1] +- +- skewtab *st_new(vector *outer, vector *inner, vector *conts, int maxrows) +- int st_next(skewtab *st) +- void st_print(skewtab *st) +- void st_free(skewtab *st) +- +- +-cdef extern from "lrcalc/schublib.h": +- hashtab* mult_schubert_c "mult_schubert"(vector *sh1, vector *sh2, int rank) +diff --git a/src/sage/libs/lrcalc/lrcalc.pyx b/src/sage/libs/lrcalc/lrcalc.py +similarity index 60% +rename from src/sage/libs/lrcalc/lrcalc.pyx +rename to src/sage/libs/lrcalc/lrcalc.py +index b591081ec4c..b541bfacd89 100644 +--- a/src/sage/libs/lrcalc/lrcalc.pyx ++++ b/src/sage/libs/lrcalc/lrcalc.py +@@ -10,7 +10,8 @@ fusion products. All of the above are achieved by counting LR + appropriate shape and content by iterating through them. + Additionally, ``lrcalc`` handles products of Schubert polynomials. + +-The web page of ``lrcalc`` is ``_. ++The web page of ``lrcalc`` is ++``_. + + The following describes the Sage interface to this library. + +@@ -36,12 +37,13 @@ Schur expansion:: + [4, 2]: 1} + + Same product, but include only partitions with at most 3 rows. This +-corresponds to computing in the representation ring of gl(3):: ++corresponds to computing in the representation ring of `\mathfrak{gl}(3)`:: + + sage: lrcalc.mult([2,1], [2,1], 3) + {[2, 2, 2]: 1, [3, 2, 1]: 2, [3, 3]: 1, [4, 1, 1]: 1, [4, 2]: 1} + +-We can also compute the fusion product, here for sl(3) and level 2:: ++We can also compute the fusion product, here for `\mathfrak{sl}(3)` ++and level 2:: + + sage: lrcalc.mult([3,2,1], [3,2,1], 3,2) + {[4, 4, 4]: 1, [5, 4, 3]: 1} +@@ -77,42 +79,38 @@ Multiply two Schubert polynomials:: + [6, 2, 1, 4, 3, 5]: 1} + + Same product, but include only permutations of 5 elements in the result. +-This corresponds to computing in the cohomology ring of Fl(5):: ++This corresponds to computing in the cohomology ring of `Fl(5)`:: + + sage: lrcalc.mult_schubert([4,2,1,3], [1,4,2,5,3], 5) + {[4, 5, 1, 3, 2]: 1, [5, 3, 1, 4, 2]: 1, [5, 4, 1, 2, 3]: 1} + + List all Littlewood-Richardson tableaux of skew shape `\mu/\nu`; in + this example `\mu=[3,2,1]` and `\nu=[2,1]`. Specifying a third entry +-`maxrows` restricts the alphabet to `\{1,2,\ldots,maxrows\}`:: ++`M' = ``maxrows`` restricts the alphabet to `\{1,2,\ldots,M\}`:: + + sage: list(lrcalc.lrskew([3,2,1],[2,1])) + [[[None, None, 1], [None, 1], [1]], [[None, None, 1], [None, 1], [2]], + [[None, None, 1], [None, 2], [1]], [[None, None, 1], [None, 2], [3]]] + + sage: list(lrcalc.lrskew([3,2,1],[2,1],maxrows=2)) +- [[[None, None, 1], [None, 1], [1]], [[None, None, 1], [None, 1], [2]], [[None, None, 1], [None, 2], [1]]] ++ [[[None, None, 1], [None, 1], [1]], [[None, None, 1], [None, 1], [2]], ++ [[None, None, 1], [None, 2], [1]]] + + .. TODO:: + +- use this library in the :class:`SymmetricFunctions` code, to ++ Use this library in the :class:`SymmetricFunctions` code, to + make it easy to apply it to linear combinations of Schur functions. + + .. SEEALSO:: + + - :func:`lrcoef` +- + - :func:`mult` +- + - :func:`coprod` +- + - :func:`skew` +- + - :func:`lrskew` +- + - :func:`mult_schubert` + +-.. rubric:: Underlying algorithmic in lrcalc ++.. RUBRIC:: Underlying algorithmic in lrcalc + + Here is some additional information regarding the main low-level + C-functions in `lrcalc`. Given two partitions ``outer`` and ``inner`` +@@ -187,180 +185,24 @@ AUTHORS: + # https://www.gnu.org/licenses/ + # **************************************************************************** + +-from sage.rings.integer cimport Integer +-from sage.structure.parent cimport Parent + from sage.combinat.partition import _Partitions + from sage.combinat.permutation import Permutation +-from sage.combinat.skew_tableau import SkewTableau +- +- +-cdef vector* iterable_to_vector(it): +- """ +- Return an lrcalc vector (which is a list of integers) from a Python iterable. +- +- TESTS:: +- +- sage: from sage.libs.lrcalc.lrcalc import test_iterable_to_vector +- sage: x = test_iterable_to_vector(Partition([3,2,1])); x #indirect doctest +- [3, 2, 1] +- """ +- cdef vector* v +- cdef list itr = list(it) +- cdef int n = len(itr) +- cdef int i +- v = v_new(n) +- for i in range(n): +- v.array[i] = int(itr[i]) +- return v +- +- +-cdef list vector_to_list(vector *v): +- """ +- Converts a lrcalc vector to Python list. +- +- TESTS:: +- +- sage: from sage.libs.lrcalc.lrcalc import test_iterable_to_vector +- sage: x = test_iterable_to_vector([]); x #indirect doctest +- [] +- """ +- cdef int i, n +- n = v_length(v) +- cdef list result = [None]*n +- for i in range(n): +- result[i] = Integer(v_elem(v, i)) +- return result +- +- +-def test_iterable_to_vector(it): +- """ +- A wrapper function for the cdef function ``iterable_to_vector`` +- and ``vector_to_list``, to test that they are working correctly. ++from sage.combinat.skew_tableau import SemistandardSkewTableaux ++from sage.combinat.skew_partition import SkewPartition ++from sage.rings.integer import Integer ++import lrcalc + +- EXAMPLES:: +- +- sage: from sage.libs.lrcalc.lrcalc import test_iterable_to_vector +- sage: x = test_iterable_to_vector([3,2,1]); x +- [3, 2, 1] +- """ +- cdef vector *v = iterable_to_vector(it) +- result = vector_to_list(v) +- v_free(v) +- return result +- +- +-cdef skewtab_to_SkewTableau(skewtab *st): +- """ +- A wrapper function which transforms the data set ``st`` used in +- ``lrcalc`` to a ``SkewTableau`` in Sage. ++def _lrcalc_dict_to_sage(result): ++ r""" ++ Translate from lrcalc output format to Sage expected format. + + TESTS:: + +- sage: from sage.libs.lrcalc.lrcalc import test_skewtab_to_SkewTableau +- sage: test_skewtab_to_SkewTableau([],[]) +- [] +- """ +- inner = vector_to_list(st.inner) +- outer = vector_to_list(st.outer) +- return SkewTableau(expr=[[inner[y] for y in range(len(outer))], +- [[st.matrix[x + y * st.cols] + 1 +- for x in range(inner[y], outer[y])] +- for y in range(len(outer) - 1, -1, -1)]]) +- +- +-def test_skewtab_to_SkewTableau(outer, inner): +- """ +- A wrapper function for the cdef function ``skewtab_to_SkewTableau`` +- for testing purposes. +- +- It constructs the first LR skew tableau of shape ``outer/inner`` +- as an ``lrcalc`` ``skewtab``, and converts it to a +- :class:`SkewTableau`. +- +- EXAMPLES:: +- +- sage: from sage.libs.lrcalc.lrcalc import test_skewtab_to_SkewTableau +- sage: test_skewtab_to_SkewTableau([3,2,1],[]) +- [[1, 1, 1], [2, 2], [3]] +- sage: test_skewtab_to_SkewTableau([4,3,2,1],[1,1]).pp() +- . 1 1 1 +- . 2 2 +- 1 3 +- 2 +- """ +- cdef vector* o = iterable_to_vector(outer) +- cdef vector* i = iterable_to_vector(inner+[0]*(len(outer)-len(inner))) +- cdef skewtab* st = st_new(o, i, NULL, 0) +- return skewtab_to_SkewTableau(st) +- +- +-cdef dict sf_hashtab_to_dict(hashtab *ht): +- """ +- Return a dictionary representing a Schur function. The keys are +- partitions and the values are integers . +- +- EXAMPLES:: +- + sage: from sage.libs.lrcalc.lrcalc import mult +- sage: sorted(mult([1],[1]).items()) #indirect doctest +- [([1, 1], 1), ([2], 1)] +- sage: assert isinstance(mult([1],[1]),dict)#indirect doctest +- """ +- cdef hash_itr itr +- cdef dict result = {} +- cdef list p +- hash_first(ht, itr) +- while hash_good(itr): +- p = vector_to_list( hash_key(itr)) +- result[_Partitions(p)] = Integer(hash_intvalue(itr)) +- hash_next(itr) +- return result +- +- +-cdef dict schubert_hashtab_to_dict(hashtab *ht): +- """ +- Return a dictionary corresponding to a Schubert polynomial whose keys +- are permutations and whose values are integers . +- +- EXAMPLES:: +- +- sage: from sage.libs.lrcalc.lrcalc import mult_schubert +- sage: mult_schubert([3,2,1], [1,2,3]) #indirect doctest +- {[3, 2, 1]: 1} +- """ +- cdef hash_itr itr +- cdef dict result = {} +- hash_first(ht, itr) +- while hash_good(itr): +- p = vector_to_list( hash_key(itr)) +- result[Permutation(p)] = Integer(hash_intvalue(itr)) +- hash_next(itr) +- return result +- +- +-cdef dict vp_hashtab_to_dict(hashtab *ht): +- """ +- Return a dictionary corresponding to the coproduct of a Schur function whose keys are +- pairs of partitions and whose values are integers . +- +- EXAMPLES:: +- +- sage: from sage.libs.lrcalc.lrcalc import coprod +- sage: coprod([1]) #indirect doctest +- {([1], []): 1} ++ sage: mult([2,1],[3,2,1],3) # indirect doctest ++ {[3, 3, 3]: 1, [4, 3, 2]: 2, [4, 4, 1]: 1, [5, 2, 2]: 1, [5, 3, 1]: 1} + """ +- cdef hash_itr itr +- cdef vecpair* vp +- cdef dict result = {} +- hash_first(ht, itr) +- while hash_good(itr): +- vp = hash_key(itr) +- p1 = _Partitions(vector_to_list(vp_first(vp))) +- p2 = _Partitions(vector_to_list(vp_second(vp))) +- result[(p1, p2)] = Integer(hash_intvalue(itr)) +- hash_next(itr) +- return result +- ++ return {_Partitions(la): Integer(k) for la, k in result.items()} + + def lrcoef_unsafe(outer, inner1, inner2): + r""" +@@ -371,13 +213,11 @@ def lrcoef_unsafe(outer, inner1, inner2): + + INPUT: + +- - ``outer`` -- a partition (weakly decreasing list of non-negative integers). +- +- - ``inner1`` -- a partition. ++ - ``outer`` -- a partition (weakly decreasing list of non-negative integers) ++ - ``inner1`` -- a partition ++ - ``inner2`` -- a partition + +- - ``inner2`` -- a partition. +- +- .. warning:: ++ .. WARNING:: + + This function does not do any check on its input. If you want + to use a safer version, use :func:`lrcoef`. +@@ -392,18 +232,7 @@ def lrcoef_unsafe(outer, inner1, inner2): + sage: lrcoef_unsafe([2,1,1,1,1], [2,1], [2,1]) + 0 + """ +- cdef long long result +- cdef vector *o +- cdef vector *i1 +- cdef vector *i2 +- o = iterable_to_vector(outer) +- i1 = iterable_to_vector(inner1) +- i2 = iterable_to_vector(inner2) +- result = lrcoef_c(o, i1, i2) +- v_free(o) +- v_free(i1) +- v_free(i2) +- return Integer(result) ++ return Integer(lrcalc.lrcoef(outer, inner1, inner2)) + + + def lrcoef(outer, inner1, inner2): +@@ -415,11 +244,9 @@ def lrcoef(outer, inner1, inner2): + + INPUT: + +- - ``outer`` -- a partition (weakly decreasing list of non-negative integers). +- +- - ``inner1`` -- a partition. +- +- - ``inner2`` -- a partition. ++ - ``outer`` -- a partition (weakly decreasing list of non-negative integers) ++ - ``inner1`` -- a partition ++ - ``inner2`` -- a partition + + .. NOTE:: + +@@ -436,7 +263,6 @@ def lrcoef(outer, inner1, inner2): + 1 + sage: lrcoef([2,1,1,1,1], [2,1], [2,1]) + 0 +- + """ + return lrcoef_unsafe(_Partitions(outer), _Partitions(inner1), _Partitions(inner2)) + +@@ -451,13 +277,9 @@ def mult(part1, part2, maxrows=None, level=None, quantum=None): + INPUT: + + - ``part1`` -- a partition +- + - ``part2`` -- a partition +- + - ``maxrows`` -- (optional) an integer +- + - ``level`` -- (optional) an integer +- + - ``quantum`` -- (optional) an element of a ring + + If ``maxrows`` is specified, then only partitions with at most +@@ -479,7 +301,8 @@ def mult(part1, part2, maxrows=None, level=None, quantum=None): + sage: sorted(mult([2],[2]).items()) + [([2, 2], 1), ([3, 1], 1), ([4], 1)] + sage: sorted(mult([2,1],[2,1]).items()) +- [([2, 2, 1, 1], 1), ([2, 2, 2], 1), ([3, 1, 1, 1], 1), ([3, 2, 1], 2), ([3, 3], 1), ([4, 1, 1], 1), ([4, 2], 1)] ++ [([2, 2, 1, 1], 1), ([2, 2, 2], 1), ([3, 1, 1, 1], 1), ++ ([3, 2, 1], 2), ([3, 3], 1), ([4, 1, 1], 1), ([4, 2], 1)] + sage: sorted(mult([2,1],[2,1],maxrows=2).items()) + [([3, 3], 1), ([4, 2], 1)] + sage: mult([2,1],[3,2,1],3) +@@ -510,44 +333,24 @@ def mult(part1, part2, maxrows=None, level=None, quantum=None): + if quantum is not None and (level is None or maxrows is None): + raise ValueError('missing parameters maxrows or level') + +- cdef vector* v1 = iterable_to_vector(part1) +- cdef vector* v2 = iterable_to_vector(part2) +- if maxrows is None: +- maxrows = 0 +- cdef hashtab* ht = mult_c(v1, v2, int(maxrows)) +- cdef hashtab* tab +- cdef dict result +- + if quantum is None: + if level is not None: +- fusion_reduce_c(ht, int(maxrows), int(level), int(0)) +- result = sf_hashtab_to_dict(ht) +- v_free(v1) +- v_free(v2) +- hash_free(ht) +- return result ++ return _lrcalc_dict_to_sage(lrcalc.mult_fusion(part1, part2, maxrows, level)) ++ if maxrows is None: ++ maxrows = -1 ++ return _lrcalc_dict_to_sage(lrcalc.mult(part1, part2, maxrows)) + + # Otherwise do quantum multiplication +- cdef _list *qlist +- cdef dict temp +- qlist = quantum_reduce_c(ht, int(maxrows), int(level)) +- # The above call frees the memory associated with ht +- v_free(v1) +- v_free(v2) +- +- cdef Parent P = quantum.parent() +- result = {} +- for i in range(qlist.length): +- tab = (qlist.array[i]) +- temp = sf_hashtab_to_dict(tab) +- for k in temp: +- result[k] = result.get(k, P.zero()) + quantum**i * temp[k] +- hash_free(tab) +- l_free(qlist) +- return result +- +- +-def skew(outer, inner, maxrows=0): ++ result = lrcalc.mult_quantum(part1, part2, maxrows, level, degrees=True) ++ P = quantum.parent() ++ output = {} ++ for i,k in result.items(): ++ la = _Partitions(i[0]) ++ output[la] = output.get(la, P.zero()) + k * quantum**(i[1]) ++ return output ++ ++ ++def skew(outer, inner, maxrows=-1): + """ + Compute the Schur expansion of a skew Schur function. + +@@ -557,11 +360,9 @@ def skew(outer, inner, maxrows=0): + + INPUT: + +- - ``outer`` -- a partition. +- +- - ``inner`` -- a partition. +- +- - ``maxrows`` -- an integer or ``None``. ++ - ``outer`` -- a partition ++ - ``inner`` -- a partition ++ - ``maxrows`` -- an integer or ``None`` + + If ``maxrows`` is specified, then only partitions with at most + this number of rows are included in the result. +@@ -572,14 +373,7 @@ def skew(outer, inner, maxrows=0): + sage: sorted(skew([2,1],[1]).items()) + [([1, 1], 1), ([2], 1)] + """ +- cdef vector* v1 = iterable_to_vector(outer) +- cdef vector* v2 = iterable_to_vector(inner) +- cdef hashtab* ht = skew_c(v1, v2, int(maxrows)) +- result = sf_hashtab_to_dict(ht) +- v_free(v1) +- v_free(v2) +- hash_free(ht) +- return result ++ return _lrcalc_dict_to_sage(lrcalc.skew(outer, inner, maxrows)) + + + def coprod(part, all=0): +@@ -592,9 +386,8 @@ def coprod(part, all=0): + + INPUT: + +- - ``part`` -- a partition. +- +- - ``all`` -- an integer. ++ - ``part`` -- a partition ++ - ``all`` -- an integer + + If ``all`` is non-zero then all terms are included in the result. + If ``all`` is zero, then only pairs of partitions ``(part1, +@@ -609,12 +402,9 @@ def coprod(part, all=0): + sage: sorted(coprod([2,1]).items()) + [(([1, 1], [1]), 1), (([2], [1]), 1), (([2, 1], []), 1)] + """ +- cdef vector* v1 = iterable_to_vector(part) +- cdef hashtab* ht = coprod_c(v1, int(all)) +- result = vp_hashtab_to_dict(ht) +- v_free(v1) +- hash_free(ht) +- return result ++ result = lrcalc.coprod(part, all) ++ return {tuple([_Partitions(mu) for mu in la]): Integer(k) ++ for la, k in result.items()} + + + def mult_schubert(w1, w2, rank=0): +@@ -627,11 +417,9 @@ def mult_schubert(w1, w2, rank=0): + + INPUT: + +- - ``w1`` -- a permutation. +- +- - ``w2`` -- a permutation. +- +- - ``rank`` -- an integer. ++ - ``w1`` -- a permutation ++ - ``w2`` -- a permutation ++ - ``rank`` -- an integer + + If ``rank`` is non-zero, then only permutations from the symmetric + group `S(\mathrm{rank})` are included in the result. +@@ -646,33 +434,24 @@ def mult_schubert(w1, w2, rank=0): + ([6, 4, 3, 1, 2, 5], 1), ([6, 5, 2, 1, 3, 4], 1), + ([7, 3, 4, 1, 2, 5, 6], 1), ([7, 4, 2, 1, 3, 5, 6], 1)] + """ +- cdef vector* v1 = iterable_to_vector(w1) +- cdef vector* v2 = iterable_to_vector(w2) +- cdef hashtab* ht = mult_schubert_c(v1, v2, int(rank)) +- result = schubert_hashtab_to_dict(ht) +- v_free(v1) +- v_free(v2) +- hash_free(ht) +- return result ++ result = lrcalc.schubmult(w1, w2, rank) ++ return {Permutation(list(la)):Integer(k) for la,k in result.items()} + + +-def lrskew(outer, inner, weight=None, maxrows=0): ++def lrskew(outer, inner, weight=None, maxrows=-1): + r""" + Iterate over the skew LR tableaux of shape ``outer / inner``. + + INPUT: + + - ``outer`` -- a partition +- + - ``inner`` -- a partition +- + - ``weight`` -- a partition (optional) +- +- - ``maxrows`` -- an integer (optional) ++ - ``maxrows`` -- a positive integer (optional) + + OUTPUT: an iterator of :class:`SkewTableau` + +- Specifying ``maxrows`` restricts the alphabet to `\{1,2,\ldots,maxrows\}`. ++ Specifying ``maxrows`` = `M` restricts the alphabet to `\{1,2,\ldots,M\}`. + + Specifying ``weight`` returns only those tableaux of given content/weight. + +@@ -702,22 +481,40 @@ def lrskew(outer, inner, weight=None, maxrows=0): + + sage: list(lrskew([3,2,1],[2], weight=[3,1])) + [[[None, None, 1], [1, 1], [2]]] ++ ++ TESTS:: ++ ++ sage: from sage.libs.lrcalc.lrcalc import lrskew ++ sage: list(lrskew([3,2,1],[2], weight=[])) ++ [] ++ sage: list(lrskew([3,2,1],[2], weight=[0])) ++ [] ++ sage: list(lrskew([3,2,1],[3,2,1], weight=[])) ++ [[[None, None, None], [None, None], [None]]] ++ sage: list(lrskew([3,2,1],[3,2,1], weight=[0])) ++ [[[None, None, None], [None, None], [None]]] ++ sage: list(lrskew([3,2,1],[3,2,1], weight=[1])) ++ [] + """ +- cdef vector* o = iterable_to_vector(outer) +- cdef vector* i = iterable_to_vector(inner + [0]*(len(outer) - len(inner))) +- cdef skewtab* st = st_new(o, i, NULL, int(maxrows)) ++ iterator = lrcalc.lr_iterator(outer, inner, maxrows) ++ shape = SkewPartition([outer, inner]) + + if weight is None: +- yield skewtab_to_SkewTableau(st) +- while st_next(st): +- yield skewtab_to_SkewTableau(st) ++ ST = SemistandardSkewTableaux(shape) ++ for data in iterator: ++ yield ST.from_shape_and_word(shape, [i+1 for i in data]) + else: + wt = _Partitions(weight) +- r = skewtab_to_SkewTableau(st) +- if r.weight() == wt: +- yield r +- while st_next(st): +- r = skewtab_to_SkewTableau(st) +- if r.weight() == wt: +- yield r +- st_free(st) ++ ST = SemistandardSkewTableaux(shape, wt) ++ m = len(wt) ++ for data in iterator: ++ w = [0] * m ++ for j in data: ++ if j >= m: ++ # We know they are not equal, so make the check below quick ++ w = None ++ break ++ w[j] += 1 ++ if w == wt: ++ yield ST.from_shape_and_word(shape, [i+1 for i in data]) ++ diff --git a/srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch b/srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch new file mode 100644 index 00000000000..1e2e0ba9074 --- /dev/null +++ b/srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch @@ -0,0 +1,40 @@ +As produced by `git diff a90a3146{^^,}` + +diff --git a/src/sage/repl/interface_magic.py b/src/sage/repl/interface_magic.py +index 8a455b69b0e..a93e1c9e04c 100644 +--- a/src/sage/repl/interface_magic.py ++++ b/src/sage/repl/interface_magic.py +@@ -260,7 +260,7 @@ class InterfaceMagic(object): + 2 + 120 + sage: shell.run_cell('%%gap foo\n1+1;\n') +- ...File "", line unknown ++ ...File...... + SyntaxError: Interface magics have no options, got "foo" + + sage: shell.run_cell('%%gap?') +diff --git a/src/sage/repl/interpreter.py b/src/sage/repl/interpreter.py +index 7468afe52d7..06c47b7374a 100644 +--- a/src/sage/repl/interpreter.py ++++ b/src/sage/repl/interpreter.py +@@ -78,9 +78,9 @@ Check that Cython source code appears in tracebacks:: + dummy line + ... + ZeroDivisionError...Traceback (most recent call last) +- in ... ++ ...in ... + ----> 1 Integer(1)/Integer(0) +- .../sage/rings/integer.pyx in sage.rings.integer.Integer...div... ++ .../sage/rings/integer.pyx... in sage.rings.integer.Integer...div... + ... + -> ... raise ZeroDivisionError("rational division by zero") + ....: x = Rational.__new__(Rational) +@@ -423,7 +423,7 @@ def SagePreparseTransformer(lines): + sage: from sage.repl.interpreter import get_test_shell + sage: shell = get_test_shell() + sage: shell.run_cell(bad_syntax) +- File "", line unknown ++ File...... + SyntaxError: Mismatched ']' + + sage: shell.quit() diff --git a/srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch b/srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch new file mode 100644 index 00000000000..853813b0f5b --- /dev/null +++ b/srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch @@ -0,0 +1,13 @@ +Fix for ipython 8.1 + +--- a/src/sage/repl/interpreter.py ++++ b/src/sage/repl/interpreter.py +@@ -78,7 +78,7 @@ Check that Cython source code appears in tracebacks:: + dummy line + ... + ZeroDivisionError...Traceback (most recent call last) +- ...in ... ++ ... + ----> 1 Integer(1)/Integer(0) + .../sage/rings/integer.pyx... in sage.rings.integer.Integer...div... + ... diff --git a/srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch b/srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch new file mode 100644 index 00000000000..19b69700a4f --- /dev/null +++ b/srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch @@ -0,0 +1,19 @@ +commit 9c8235e44ffb509efa8a3ca6cdb55154e2b5066d +Author: Antonio Rojas +Date: Sun Feb 13 19:53:14 2022 +0100 + + Fix deprecation warning with scipy 1.8 + +diff --git a/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py b/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py +index e9b60dae5ec..7932167b41d 100644 +--- a/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py ++++ b/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py +@@ -356,7 +356,7 @@ Sage example in ./linsolve.tex, line 2230:: + + Sage example in ./linsolve.tex, line 2609:: + +- sage: from scipy.sparse.linalg.dsolve import * ++ sage: from scipy.sparse.linalg import factorized + sage: from scipy.sparse import lil_matrix + sage: from numpy import array + sage: n = 200 diff --git a/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch new file mode 100644 index 00000000000..9ba7ca5a6b7 --- /dev/null +++ b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch @@ -0,0 +1,99 @@ +From 609dd9deaeaa6380ab2f0d50276d911233c00a04 Mon Sep 17 00:00:00 2001 +From: Matthias Koeppe +Date: Fri, 4 Mar 2022 16:07:09 -0800 +Subject: sage.manifolds: Update doctests for SymPy 1.10 + +--- + src/sage/manifolds/continuous_map.py | 3 +-- + src/sage/manifolds/differentiable/diff_form.py | 4 ++-- + src/sage/manifolds/differentiable/tensorfield.py | 8 ++++---- + src/sage/manifolds/vector_bundle_fiber_element.py | 2 +- + 4 files changed, 8 insertions(+), 9 deletions(-) + +diff --git a/src/sage/manifolds/continuous_map.py b/src/sage/manifolds/continuous_map.py +index a6356e7..f6f9b6d 100644 +--- a/src/sage/manifolds/continuous_map.py ++++ b/src/sage/manifolds/continuous_map.py +@@ -1357,8 +1357,7 @@ class ContinuousMap(Morphism): + sage: Phi.coord_functions(c_uv, c_xyz) + Coordinate functions (u*v, u/v, u + v) on the Chart (M, (u, v)) + sage: Phi.coord_functions(c_UV, c_xyz) +- Coordinate functions (-U**2/4 + V**2/4, -(U + V)/(U - V), V) +- on the Chart (M, (U, V)) ++ Coordinate functions (-U**2/4 + V**2/4, (-U - V)/(U - V), V) on the Chart (M, (U, V)) + sage: Phi.coord_functions(c_UV, c_XYZ) + Coordinate functions ((-U**3 + U**2*V + U*V**2 + 2*U*V + 6*U - V**3 + - 2*V**2 + 6*V)/(2*(U - V)), (U**3/4 - U**2*V/4 - U*V**2/4 + U*V +diff --git a/src/sage/manifolds/differentiable/diff_form.py b/src/sage/manifolds/differentiable/diff_form.py +index 70dd8fb..0aa3469 100644 +--- a/src/sage/manifolds/differentiable/diff_form.py ++++ b/src/sage/manifolds/differentiable/diff_form.py +@@ -266,7 +266,7 @@ class DiffForm(TensorField): + + sage: s = a.wedge(b) + sage: s.display(eU) +- a∧b = -x*(2*x*y + 1) dx∧dy ++ a∧b = x*(-2*x*y - 1) dx∧dy + sage: s.display(eV) + a∧b = (u**3/8 + u**2*v/8 - u*v**2/8 + u/4 - v**3/8 + v/4) du∧dv + +@@ -275,7 +275,7 @@ class DiffForm(TensorField): + sage: f = M.scalar_field({c_xy: (x+y)^2, c_uv: u^2}, name='f') + sage: s = f*a + sage: s.display(eU) +- f*a = -y*(x**2 + 2*x*y + y**2) dx + x*(x**2 + 2*x*y + y**2) dy ++ f*a = y*(-x**2 - 2*x*y - y**2) dx + x*(x**2 + 2*x*y + y**2) dy + sage: s.display(eV) + f*a = u**2*v/2 du - u**3/2 dv + +diff --git a/src/sage/manifolds/differentiable/tensorfield.py b/src/sage/manifolds/differentiable/tensorfield.py +index 2775be9..6bc5c50 100644 +--- a/src/sage/manifolds/differentiable/tensorfield.py ++++ b/src/sage/manifolds/differentiable/tensorfield.py +@@ -334,7 +334,7 @@ class TensorField(ModuleElementWithMutability): + sage: f.display() # long time + t(a,b): S^2 → ℝ + on U: (x, y) ↦ -2*x*y - 3*x - y**2 +- on V: (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4) ++ on V: (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4) + + The vectors can be defined only on subsets of `S^2`, the domain of the + result is then the common subset:: +@@ -343,12 +343,12 @@ class TensorField(ModuleElementWithMutability): + sage: s.display() # long time + t(a,b): U → ℝ + (x, y) ↦ -2*x*y - 3*x - y**2 +- on W: (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4) ++ on W: (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4) + sage: s = t(a.restrict(U), b.restrict(W)) # long time + sage: s.display() # long time + t(a,b): W → ℝ + (x, y) ↦ -2*x*y - 3*x - y**2 +- (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4) ++ (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4) + + The tensor itself can be defined only on some open subset of `S^2`, + yielding a result whose domain is this subset:: +@@ -356,7 +356,7 @@ class TensorField(ModuleElementWithMutability): + sage: s = t.restrict(V)(a,b) # long time + sage: s.display() # long time + t(a,b): V → ℝ +- (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4) ++ (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4) + on W: (x, y) ↦ -2*x*y - 3*x - y**2 + + Tests regarding the multiplication by a scalar field:: +diff --git a/src/sage/manifolds/vector_bundle_fiber_element.py b/src/sage/manifolds/vector_bundle_fiber_element.py +index 29ee81d..048275a 100644 +--- a/src/sage/manifolds/vector_bundle_fiber_element.py ++++ b/src/sage/manifolds/vector_bundle_fiber_element.py +@@ -110,4 +110,4 @@ class VectorBundleFiberElement(FiniteRankFreeModuleElement): + desc += str(self._name) + " " + desc += "in the fiber of {} at {}".format(self._vbundle._name, + self._point) +- return desc +\ No newline at end of file ++ return desc +-- +cgit v1.0-1-gd88e + diff --git a/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch new file mode 100644 index 00000000000..f5ac180baa9 --- /dev/null +++ b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch @@ -0,0 +1,29 @@ +From c49eff347454ac7f07e5918470b20e97b8f2357e Mon Sep 17 00:00:00 2001 +From: Matthias Koeppe +Date: Fri, 4 Mar 2022 15:14:43 -0800 +Subject: src/sage/calculus/calculus.py: Update laplace doctest for sympy 1.10 + +--- + src/sage/calculus/calculus.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py +index 9c2f226..b335093 100644 +--- a/src/sage/calculus/calculus.py ++++ b/src/sage/calculus/calculus.py +@@ -1639,9 +1639,9 @@ def laplace(ex, t, s, algorithm='maxima'): + sage: laplace(dirac_delta(t), t, s) + 1 + sage: F, a, cond = laplace(dirac_delta(t), t, s, algorithm='sympy') +- sage: a, cond +- (-oo, True) +- sage: F # random - sympy <1.9 includes undefined heaviside(0) in answer ++ sage: a, cond # random - sympy <1.10 gives (-oo, True) ++ (0, True) ++ sage: F # random - sympy <1.9 includes undefined heaviside(0) in answer + 1 + sage: laplace(dirac_delta(t), t, s, algorithm='giac') + 1 +-- +cgit v1.0-1-gd88e + diff --git a/srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch b/srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch new file mode 100644 index 00000000000..8e7bb64f5b0 --- /dev/null +++ b/srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch @@ -0,0 +1,26 @@ +From a04a0a0b14f67f4804e7113c3db41bbcf8a58296 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= +Date: Mon, 28 Mar 2022 20:39:59 -0300 +Subject: Trac #33585: fix doctest when dochtml is missing... + +...but sphinx is available in PYTHONPATH. +--- + src/sage/misc/sagedoc.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py +index 4b3853f..08c4225 100644 +--- a/src/sage/misc/sagedoc.py ++++ b/src/sage/misc/sagedoc.py +@@ -1401,7 +1401,7 @@ class _sage_doc: + "...**File:**...**Type:**...**Definition:** identity_matrix..." + sage: identity_matrix.__doc__ in browse_sage_doc(identity_matrix, 'rst') + True +- sage: browse_sage_doc(identity_matrix, 'html', False) # optional - sphinx ++ sage: browse_sage_doc(identity_matrix, 'html', False) # optional - sphinx sagemath_doc_html + '...div...File:...Type:...Definition:...identity_matrix...' + + In the 'text' version, double colons have been replaced with +-- +cgit v1.0-1-gd88e + diff --git a/srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch b/srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch deleted file mode 100644 index 5cb62f56e90..00000000000 --- a/srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch +++ /dev/null @@ -1,13 +0,0 @@ - - we don't have threejs in void - ---- a/src/sage/repl/ipython_kernel/install.py -+++ b/src/sage/repl/ipython_kernel/install.py -@@ -124,7 +124,7 @@ class SageKernelSpec(object): - sage: spec = SageKernelSpec(prefix=tmp_dir()) - sage: spec.use_local_threejs() - sage: threejs = os.path.join(spec.nbextensions_dir, 'threejs-sage') -- sage: os.path.isdir(threejs) -+ sage: os.path.isdir(threejs) # optional - threejs - True - """ - src = THREEJS_DIR diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template index 710a9e80c05..0d793262d57 100644 --- a/srcpkgs/sagemath/template +++ b/srcpkgs/sagemath/template @@ -1,7 +1,7 @@ # Template file for 'sagemath' pkgname=sagemath version=9.5 -revision=1 +revision=2 wrksrc=sage-$version build_wrksrc=pkgs/sagemath-standard build_style=python3-module @@ -12,7 +12,7 @@ hostmakedepends="m4 pkg-config python3-Cython python3-Jinja2 python3-pkgconfig makedepends="arb-devel boost-devel brial-devel cliquer-devel ecl eclib-devel ecm-devel fflas-ffpack flintlib-devel gap-devel gd-devel giac-devel glpk-devel gsl-devel iml-devel lcalc-devel libbraiding-devel libhomfly-devel libmpc-devel - libpng-devel linbox-devel lrcalc-devel m4ri-devel m4rie-devel mpfi-devel + libpng-devel linbox-devel m4ri-devel m4rie-devel mpfi-devel mpfr-devel ntl-devel openblas-devel pari-devel planarity-devel python3-cypari2 python3-cysignals python3-devel python3-gmpy2 python3-memory_allocator python3-numpy rankwidth-devel singular symmetrica-devel zn_poly" @@ -20,13 +20,13 @@ depends="FlintQS eclib-devel fflas-ffpack flintlib-devel gcc-fortran gd-devel gfan giac gsl-devel gzip libpng-devel linbox-devel m4ri-devel maxima-ecl mpfr-devel nauty ntl-devel palp pari-devel pari-elldata-small pari-galdata pari-galpol-small pari-seadata-small pkg-config python3-Cython python3-cypari2 - python3-cysignals python3-devel python3-fpylll python3-ipython + python3-cysignals python3-devel python3-fpylll python3-ipython python3-lrcalc python3-ipython_ipykernel python3-jupyter_ipywidgets python3-matplotlib python3-memory_allocator python3-networkx python3-pip python3-pkgconfig python3-pplpy python3-primecountpy python3-requests python3-scipy python3-sympy python3-traitlets sage-data-combinatorial_designs sage-data-conway_polynomials sage-data-elliptic_curves sage-data-graphs - sage-data-polytopes_db sympow tachyon" + sage-data-polytopes_db sympow tachyon threejs-sage" checkdepends="$depends" short_desc="Open source mathematics software" maintainer="Gonzalo Tornaría " @@ -55,6 +55,7 @@ do_configure() { COMBINATORIAL_DESIGN_DATA_DIR = "/usr/share/sagemath/combinatorial_designs" CREMONA_MINI_DATA_DIR = "/usr/share/sagemath/cremona" CREMONA_LARGE_DATA_DIR = "/usr/share/sagemath/cremona" + THREEJS_DIR = "/usr/share/sagemath/threejs-sage" EOF # don't install sage-venv-config: it is used to set SAGE_VENV=/usr and From affd36bbb5e046bbbc982c8c5006a6b2b1f604b3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Apr 2022 22:12:37 +0200 Subject: [PATCH 0604/2369] wike: update to 1.7.2. --- srcpkgs/wike/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wike/template b/srcpkgs/wike/template index 32aa723af07..98faaf360b0 100644 --- a/srcpkgs/wike/template +++ b/srcpkgs/wike/template @@ -1,6 +1,6 @@ # Template file for 'wike' pkgname=wike -version=1.7.1 +version=1.7.2 revision=1 wrksrc="Wike-$version" build_style=meson @@ -11,4 +11,4 @@ maintainer="Michal Vasilek " license="GPL-3.0-or-later" homepage="https://github.com/hugolabe/Wike" distfiles="https://github.com/hugolabe/Wike/archive/refs/tags/$version.tar.gz" -checksum=b3fa3c0600e7234f77465fd7052136de3b397e66ad5c636f8282556aa60a2742 +checksum=8434cec2ca44392fd96fa9ed1594be40c74d91490039405996aa4c6fa64bd26c From d47f5dee52d6ed436eb8ad75dbaef13c141770f4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Apr 2022 22:12:24 +0200 Subject: [PATCH 0605/2369] python3-astroid: update to 2.11.2. --- srcpkgs/python3-astroid/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template index 4cfef4e92fd..ca5db18ccc7 100644 --- a/srcpkgs/python3-astroid/template +++ b/srcpkgs/python3-astroid/template @@ -1,6 +1,6 @@ # Template file for 'python3-astroid' pkgname=python3-astroid -version=2.9.3 +version=2.11.2 revision=1 wrksrc="astroid-${version}" build_style=python3-module @@ -13,4 +13,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/PyCQA/astroid" changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog" distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz" -checksum=07234423c3722df6aa067c15f5fa60adf4f1d6ae659d2ab147acb40a8a1904f7 +checksum=4a275523e2600c928ac95cda3ed7c1307dff2e6fbe24ef95ed867bda0fcaeab8 From e970f5661fde8578787671fd01120a5e0c681729 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Apr 2022 22:12:20 +0200 Subject: [PATCH 0606/2369] New package: python3-dill-0.3.4 --- srcpkgs/python3-dill/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/python3-dill/template diff --git a/srcpkgs/python3-dill/template b/srcpkgs/python3-dill/template new file mode 100644 index 00000000000..d40ce208e06 --- /dev/null +++ b/srcpkgs/python3-dill/template @@ -0,0 +1,13 @@ +# Template file for 'python3-dill' +pkgname=python3-dill +version=0.3.4 +revision=1 +wrksrc="dill-$version" +build_style=python3-module +depends="python3" +short_desc="Serialize all of Python" +maintainer="Michal Vasilek " +license="BSD-3-Clause" +homepage="https://dill.rtfd.io/" +distfiles="${PYPI_SITE}/d/dill/dill-${version}.zip" +checksum=9f9734205146b2b353ab3fec9af0070237b6ddae78452af83d2fca84d739e675 From ced349ec1958ae6dc736efda8bdc09f931d83e34 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Apr 2022 22:12:28 +0200 Subject: [PATCH 0607/2369] pylint: update to 2.13.4. --- srcpkgs/pylint/template | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template index f052f05f08b..54af1e2f085 100644 --- a/srcpkgs/pylint/template +++ b/srcpkgs/pylint/template @@ -1,12 +1,12 @@ # Template file for 'pylint' pkgname=pylint -version=2.12.2 -revision=2 +version=2.13.4 +revision=1 build_style=python3-module make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py" hostmakedepends="python3-setuptools" -depends="python3-astroid python3-isort python3-mccabe python3-toml - python3-platformdirs" +depends="python3-astroid python3-isort python3-mccabe python3-tomli + python3-platformdirs python3-dill" checkdepends="$depends python3-pytest python3-tkinter python3-six python3-GitPython git" short_desc="Python code static checker" @@ -15,11 +15,7 @@ license="GPL-2.0-or-later" homepage="https://www.pylint.org/" changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog" distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz" -checksum=411308682f3d4578bb769e7fa549c8f34edf1033871d2e8cd5c3ce16a5741c59 - -post_patch() { - vsed -e 's/mccabe>=0.6,<0.7/mccabe>=0.6,<=0.7/' -i setup.cfg -} +checksum=34a5550bfe94f4ba04eee95367572224bc16dbd2456b3ece5fb92e15399f6cd8 post_install() { # install example config and emacs files From f4380cced4f5c5f1e6d66fd6615da4856d5e5bc7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 4 Apr 2022 22:17:56 +0200 Subject: [PATCH 0608/2369] python3-mypy: update to 0.942. --- srcpkgs/python3-mypy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template index 663127eedbc..a92e1c803e4 100644 --- a/srcpkgs/python3-mypy/template +++ b/srcpkgs/python3-mypy/template @@ -1,6 +1,6 @@ # Template file for 'python3-mypy' pkgname=python3-mypy -version=0.931 +version=0.942 revision=1 wrksrc="mypy-${version}" build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Michal Vasilek " license="MIT" homepage="https://github.com/python/mypy" distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz" -checksum=0038b21890867793581e4cb0d810829f5fd4441aa75796b53033af3aa30430ce +checksum=17e44649fec92e9f82102b48a3bf7b4a5510ad0cd22fa21a104826b5db4903e2 make_check=no # needs pytest-xdist and many tests fail post_install() { From 5fad569a9b40f964c7cadf40fc64e4d822160af3 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Tue, 22 Mar 2022 12:52:26 +1100 Subject: [PATCH 0609/2369] bluez: update to 5.64. --- srcpkgs/bluez/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index e0a96039b6f..e9827e8e1d9 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,6 +1,6 @@ # Template file for 'bluez' pkgname=bluez -version=5.63 +version=5.64 revision=1 build_style=gnu-configure configure_args="--with-udevdir=/usr/lib/udev --disable-systemd @@ -15,7 +15,7 @@ maintainer="Érico Nogueira " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://www.bluez.org/" distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz" -checksum=9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76 +checksum=ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34 conf_files="/etc/bluetooth/main.conf" system_groups="bluetooth" From f7d4db87b3124c2e735e3213d2c051f7d7b2a39e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 11:50:25 +0200 Subject: [PATCH 0610/2369] New package: d-spy-1.2.0 --- srcpkgs/d-spy/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/d-spy/template diff --git a/srcpkgs/d-spy/template b/srcpkgs/d-spy/template new file mode 100644 index 00000000000..3d78d4d011c --- /dev/null +++ b/srcpkgs/d-spy/template @@ -0,0 +1,14 @@ +# Template file for 'd-spy' +pkgname=d-spy +version=1.2.0 +revision=1 +build_style=meson +hostmakedepends="pkg-config gettext glib-devel" +makedepends="libadwaita-devel" +short_desc="Like d-feet, but written in C and blisteringly fast" +maintainer="Michal Vasilek " +license="GPL-3.0-or-later" +homepage="https://gitlab.gnome.org/GNOME/d-spy" +changelog="https://gitlab.gnome.org/GNOME/d-spy/-/raw/main/NEWS" +distfiles="https://gitlab.gnome.org/GNOME/d-spy/-/archive/$version/d-spy-$version.tar.gz" +checksum=8be0a493e4a127f2c6052dd962162ba5f91c6da702f9b4cb77a9cbd6a1dbb4bc From 63a9bd9a21e526d82e3cc86bd4e12af614be7a80 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Mon, 4 Apr 2022 23:12:16 +0200 Subject: [PATCH 0611/2369] kodi: update to 19.4 --- .../kodi/patches/add-missing-includes.patch | 4 +- .../disable-static-texturepacker-build.patch | 2 +- srcpkgs/kodi/patches/fix-fileemu.patch | 16 ++++---- srcpkgs/kodi/patches/fix-musl.patch | 2 +- srcpkgs/kodi/patches/fmt8-support.patch | 7 ---- srcpkgs/kodi/patches/ppc64.patch | 8 ++-- srcpkgs/kodi/template | 38 +++++-------------- 7 files changed, 25 insertions(+), 52 deletions(-) delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch diff --git a/srcpkgs/kodi/patches/add-missing-includes.patch b/srcpkgs/kodi/patches/add-missing-includes.patch index 236bfa6fd0e..1b9a4509744 100644 --- a/srcpkgs/kodi/patches/add-missing-includes.patch +++ b/srcpkgs/kodi/patches/add-missing-includes.patch @@ -1,10 +1,10 @@ --- a/xbmc/filesystem/ZipManager.h.orig +++ b/xbmc/filesystem/ZipManager.h -@@ -33,6 +33,7 @@ +@@ -22,6 +22,7 @@ #include #include #include -+#include ++#include class CURL; diff --git a/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch index 369f1b24d76..766cae2005c 100644 --- a/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch +++ b/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch @@ -1,6 +1,6 @@ --- a/tools/depends/native/TexturePacker/Makefile 2016-04-24 08:48:30.000000000 +0200 +++ b/tools/depends/native/TexturePacker/Makefile 2016-07-16 15:12:39.875911293 +0200 -@@ -36,7 +36,7 @@ +@@ -38,7 +38,7 @@ -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); cp -a $(SOURCE)/* . cd $(PLATFORM); ./autogen.sh diff --git a/srcpkgs/kodi/patches/fix-fileemu.patch b/srcpkgs/kodi/patches/fix-fileemu.patch index 6cce7a4d352..a16fcb9ffa2 100644 --- a/srcpkgs/kodi/patches/fix-fileemu.patch +++ b/srcpkgs/kodi/patches/fix-fileemu.patch @@ -1,6 +1,6 @@ --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h 2019-01-30 19:20:09.336910851 +0100 +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h 2019-01-30 19:20:25.423668836 +0100 -@@ -12,7 +12,7 @@ +@@ -17,7 +17,7 @@ #define _onexit_t void* #endif @@ -11,8 +11,8 @@ typedef off64_t __off64_t; --- a/xbmc/cores/DllLoader/exports/wrapper.c 2019-01-30 19:24:16.396348561 +0100 +++ b/xbmc/cores/DllLoader/exports/wrapper.c 2019-01-30 19:25:38.562176774 +0100 -@@ -27,7 +27,7 @@ - #endif +@@ -23,7 +23,7 @@ + #include #include -#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) @@ -29,8 +29,8 @@ +#include #ifdef TARGET_POSIX #include "PlatformDefs.h" // for __stat64 - #include "XFileUtils.h" -@@ -1480,7 +1481,7 @@ + #endif +@@ -1479,7 +1480,7 @@ extern "C" int ret; ret = dll_fgetpos64(stream, &tmpPos); @@ -39,7 +39,7 @@ *pos = (fpos_t)tmpPos; #else pos->__pos = (off_t)tmpPos.__pos; -@@ -1493,8 +1494,9 @@ +@@ -1492,8 +1493,9 @@ extern "C" CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream); if (pFile != NULL) { @@ -51,7 +51,7 @@ #else pos->__pos = pFile->GetPosition(); #endif -@@ -1509,8 +1511,9 @@ +@@ -1508,8 +1510,9 @@ extern "C" int fd = g_emuFileWrapper.GetDescriptorByStream(stream); if (fd >= 0) { @@ -63,7 +63,7 @@ #else if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0) #endif -@@ -1532,7 +1535,7 @@ +@@ -1531,7 +1534,7 @@ extern "C" if (fd >= 0) { fpos64_t tmpPos; diff --git a/srcpkgs/kodi/patches/fix-musl.patch b/srcpkgs/kodi/patches/fix-musl.patch index c2eb622c98a..89120411841 100644 --- a/srcpkgs/kodi/patches/fix-musl.patch +++ b/srcpkgs/kodi/patches/fix-musl.patch @@ -1,6 +1,6 @@ --- a/xbmc/cores/DllLoader/ldt_keeper.c 2019-01-30 20:08:15.532823846 +0100 +++ b/xbmc/cores/DllLoader/ldt_keeper.c 2019-01-30 20:08:34.139580225 +0100 -@@ -49,7 +49,7 @@ +@@ -53,7 +53,7 @@ #ifdef __cplusplus extern "C" { #endif diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch deleted file mode 100644 index 0c6fc3eafdb..00000000000 --- a/srcpkgs/kodi/patches/fmt8-support.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/xbmc/utils/StringUtils.h 2021-02-19 02:17:59.000000000 +0400 -+++ b/xbmc/utils/StringUtils.h 2021-07-29 01:23:03.569130175 +0400 -@@ -39,0 +40,4 @@ -+#if FMT_VERSION >= 80000 -+#include -+#endif -+ diff --git a/srcpkgs/kodi/patches/ppc64.patch b/srcpkgs/kodi/patches/ppc64.patch index ab008d445a9..8bd3e7661ca 100644 --- a/srcpkgs/kodi/patches/ppc64.patch +++ b/srcpkgs/kodi/patches/ppc64.patch @@ -1,9 +1,9 @@ --- a/cmake/scripts/linux/ArchSetup.cmake 2019-01-30 21:03:03.146025973 +0100 +++ b/cmake/scripts/linux/ArchSetup.cmake 2019-01-30 21:03:47.810441038 +0100 -@@ -32,6 +32,12 @@ - elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64) - set(ARCH aarch64) - set(NEON True) +@@ -35,6 +35,12 @@ + elseif(CPU MATCHES riscv64) + set(ARCH riscv64) + set(NEON False) + elseif(CPU MATCHES ppc64le) + set(ARCH ppc64le-linux) + set(NEON False) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index a31240ff276..da81c7e2d0a 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi -version=19.0 -revision=4 +version=19.4 +revision=1 _codename="Matrix" wrksrc="xbmc-${version}-${_codename}" build_style=cmake @@ -17,7 +17,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.kodi.tv" distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz" -checksum=f7ef8a6f45862ae3b7ebfce4950d74f534be3cb4a0e67ce640963746b3f668f2 +checksum=cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da # Add CrossGUID dependency distfiles+=" http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz" checksum+=" 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10" @@ -94,6 +94,8 @@ if [ -z "$CROSS_BUILD" ]; then else hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel libwaylandpp-devel" + configure_args+=" -DWITH_JSONSCHEMABUILDER:PATH=$XBPS_BUILDDIR/$wrksrc/tools/JsonSchemaBuilder + -DWITH_TEXTUREPACKER:PATH=$XBPS_BUILDDIR/$wrksrc/tools/TexturePacker" fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then @@ -111,35 +113,13 @@ pre_configure() { . /etc/profile.d/10_openjdk11.sh - if [ "$CROSS_BUILD" ]; then - for i in JsonSchemaBuilder TexturePacker; do - cat > cmake/modules/Find$i.cmake < Date: Tue, 5 Apr 2022 07:50:05 +0700 Subject: [PATCH 0612/2369] python3-dill: fix build --- srcpkgs/python3-dill/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/python3-dill/template b/srcpkgs/python3-dill/template index d40ce208e06..e27236c340d 100644 --- a/srcpkgs/python3-dill/template +++ b/srcpkgs/python3-dill/template @@ -4,6 +4,7 @@ version=0.3.4 revision=1 wrksrc="dill-$version" build_style=python3-module +hostmakedepends="python3-setuptools" depends="python3" short_desc="Serialize all of Python" maintainer="Michal Vasilek " From 568d1a6a9f4b4f8b552d7b31cedd5127c5ce1bdc Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 5 Apr 2022 04:35:38 +0200 Subject: [PATCH 0613/2369] keepalived: update to 2.2.7. --- srcpkgs/keepalived/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template index c8dea3862ab..1d2ef18ca47 100644 --- a/srcpkgs/keepalived/template +++ b/srcpkgs/keepalived/template @@ -1,6 +1,6 @@ # Template file for 'keepalived' pkgname=keepalived -version=2.2.4 +version=2.2.7 revision=1 build_style=gnu-configure configure_args="--enable-sha1" @@ -10,8 +10,9 @@ short_desc="Failover and monitoring daemon for LVS clusters" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.keepalived.org/" +changelog="https://www.keepalived.org/release-notes/Release-${version}.html" distfiles="https://www.keepalived.org/software/keepalived-${version}.tar.gz" -checksum=0138d69087d44beaaa589527f0cfa6885958b320a837147d02b6b7df73ebc1df +checksum=c61940d874154a560a54627ecf7ef47adebdf832164368d10bf242a4d9b7d49d conf_files="/etc/keepalived/keepalived.conf" @@ -20,4 +21,5 @@ post_install() { rm -rf ${DESTDIR}/etc/rc.d ${DESTDIR}/etc/sysconfig vmkdir usr/share/examples/$pkgname mv ${DESTDIR}/etc/$pkgname/samples/* ${DESTDIR}/usr/share/examples/$pkgname + mv ${DESTDIR}/etc/keepalived/keepalived.conf{.sample,} } From 1b198759409dc427aeaf2b9d2c1da8ff2d658d60 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 5 Apr 2022 04:40:25 +0200 Subject: [PATCH 0614/2369] mc: update to 4.8.28. --- srcpkgs/mc/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template index 646125d1285..1c293a9c6a2 100644 --- a/srcpkgs/mc/template +++ b/srcpkgs/mc/template @@ -1,6 +1,6 @@ # Template file for 'mc' pkgname=mc -version=4.8.27 +version=4.8.28 revision=1 build_style=gnu-configure configure_args="--with-screen=slang --without-x" @@ -10,9 +10,10 @@ short_desc="User-friendly file manager and visual shell" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://midnight-commander.org/" +changelog="https://midnight-commander.org/wiki/NEWS-${version}" distfiles="https://www.midnight-commander.org/downloads/mc-${version}.tar.xz" #distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz" -checksum=31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4 +checksum=e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803 python_version=2 conf_files=" From d7765394ffab7e87f1dc3d443612ffd375381b47 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Mon, 28 Mar 2022 11:02:57 +0200 Subject: [PATCH 0615/2369] mutt: update to 2.2.2, build with zlib also remove --with-regex (not recognized since 1.13, and was wrong even before) --- srcpkgs/mutt/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index 7ae82f76bd8..6c0f0d04798 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -1,16 +1,16 @@ # Template file for 'mutt' pkgname=mutt -version=2.2.1 +version=2.2.2 revision=1 build_style=gnu-configure configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache - --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar + --enable-gpgme --with-idn2 --with-ssl --with-sasl --enable-sidebar --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr --sysconfdir=/etc/$pkgname --with-gdbm=${XBPS_CROSS_BASE}/usr" conf_files="/etc/${pkgname}/Muttrc" hostmakedepends="perl pkg-config" makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel - ncurses-devel" + ncurses-devel zlib-devel" depends="cyrus-sasl-modules mime-types" short_desc="Mutt Mail Client" maintainer="Đoàn Trần Công Danh " @@ -18,7 +18,7 @@ license="GPL-2.0-or-later" homepage="http://www.mutt.org" changelog="http://mutt.org/relnotes/${version%.*}" distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz" -checksum=b76d30d42b6c90aa9abf9f330e41800934eedf7b858a32c120ee3ae63587abb5 +checksum=10de870cf37646c0b3f5bcf579c3cc2fd9285bda1d04be9ad7c33ec2ee820fcc post_install() { # provided by mime-types From a24a9abd12e3434a5e772355af84ce88b58b0fc6 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 5 Apr 2022 16:55:26 +0200 Subject: [PATCH 0616/2369] syncthing: update to 1.19.2. --- srcpkgs/syncthing/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template index 6c2d860909c..6a267339527 100644 --- a/srcpkgs/syncthing/template +++ b/srcpkgs/syncthing/template @@ -1,6 +1,6 @@ # Template file for 'syncthing' pkgname=syncthing -version=1.19.1 +version=1.19.2 revision=1 build_style=go go_import_path="github.com/syncthing/syncthing" @@ -17,7 +17,7 @@ license="MPL-2.0" homepage="https://syncthing.net/" changelog="https://github.com/syncthing/syncthing/releases" distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz" -checksum=46319031c0805374baa382ee2b21290fb9dc595b70e905b97eb9a5643a78edc4 +checksum=81be2d3b22fa7282eee9cc1dc7569975fa62e7149700dcedaf03d372fb012a1e pre_build() { GOARCH= go generate \ From b71fe5a14372a89ebe04be1fbf1f5d2b95c66b1b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 19:03:40 +0200 Subject: [PATCH 0617/2369] python3-boto3: update to 1.21.33. --- 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 b96fa86eb16..c57a02f2fc2 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.19 +version=1.21.33 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=fb04acb6eb998652eb52381a580d3624490982a7b17d6080b0d78163874962b7 +checksum=873369a6b11334756f38ca0f310104e83c793c64a95d3b75581f2792582650d3 post_install() { vlicense LICENSE From 34d4d165f0c9914ebfaee6cc37c12027fe548241 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 19:03:43 +0200 Subject: [PATCH 0618/2369] python3-botocore: update to 1.24.33. --- srcpkgs/python3-botocore/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template index 0271e9204c1..63ae178c40d 100644 --- a/srcpkgs/python3-botocore/template +++ b/srcpkgs/python3-botocore/template @@ -1,6 +1,6 @@ # Template file for 'python3-botocore' pkgname=python3-botocore -version=1.23.23 +version=1.24.33 revision=1 wrksrc="botocore-${version}" build_style=python3-module From 2487db38f5b75129411ed92137a03c6577012182 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 19:03:46 +0200 Subject: [PATCH 0619/2369] aws-cli: update to 1.22.88. --- srcpkgs/aws-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template index 0448d39f5a6..6e543f67435 100644 --- a/srcpkgs/aws-cli/template +++ b/srcpkgs/aws-cli/template @@ -1,6 +1,6 @@ # Template file for 'aws-cli' pkgname=aws-cli -version=1.22.23 +version=1.22.88 revision=1 wrksrc="aws-cli-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Robert Lowry " license="Apache-2.0" homepage="https://github.com/aws/aws-cli" distfiles="https://github.com/aws/aws-cli/archive/${version}.tar.gz" -checksum=d5424e05c87963547d6c98440391c6729e4e4f8eb7a4c64520ff7eefeffe41f3 +checksum=cc0961786a5020fbe4708506e8aa39c90a07199f625e9ac62c1f2d8db7e8bd69 do_check() { # integration tests want aws credentials, have some other issues not worth fixing From 48249852b4edad474d7aa84cde7813a62e6dbfbe Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 19:05:20 +0200 Subject: [PATCH 0620/2369] python3-botocore: fix hash. --- srcpkgs/python3-botocore/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template index 63ae178c40d..f28f9298954 100644 --- a/srcpkgs/python3-botocore/template +++ b/srcpkgs/python3-botocore/template @@ -14,7 +14,7 @@ maintainer="Robert Lowry " license="Apache-2.0" homepage="https://github.com/boto/botocore" distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz" -checksum=6b23a1e91387c1a461f10b17bde9ace15b3c128ed385646ab058644dfedd2c47 +checksum=df97ad5dd13847d2684597798214bc35603c1bd9df7fef04ba5d583cb4229629 pre_check() { rm -r tests/functional/leak # these 6 tests fail, probably fixable From 48c4d9c884ffa29772c339c0cef52c7f25ceab70 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 4 Apr 2022 17:42:18 +0200 Subject: [PATCH 0621/2369] emacs: update to 28.1. Enable cairo and harfbuzz by default, as recommended by upstream. --- srcpkgs/emacs/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template index 9c4405ffc88..644e44cf4d0 100644 --- a/srcpkgs/emacs/template +++ b/srcpkgs/emacs/template @@ -1,6 +1,6 @@ # Template file for 'emacs' pkgname=emacs -version=27.2 +version=28.1 revision=1 build_style=gnu-configure configure_args="--with-file-notification=inotify --with-modules @@ -24,7 +24,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/emacs/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=b4a7cc4e78e63f378624e0919215b910af5bb2a0afc819fad298272e9f40c1b9 +checksum=28b1b3d099037a088f0a4ca251d7e7262eab5ea1677aabffa6c4426961ad75e1 nocross=yes nopie=yes @@ -33,7 +33,8 @@ build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus desc_option_xpm="Enable support for XPM images" desc_option_sound="Enable support for sound" desc_option_m17n="Enable support for m17n multilingual text processing" -build_options_default="jpeg tiff gif png xpm svg xml gnutls sound m17n json gmp" +build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n png sound + svg tiff xml xpm" pre_configure() { # Just configuring in different directories results in From df66547c4e0d858587ddb6ea2282ae2facb4dfa3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 20:28:08 +0200 Subject: [PATCH 0622/2369] xorg-cf-files: update to 1.0.7. --- srcpkgs/xorg-cf-files/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xorg-cf-files/template b/srcpkgs/xorg-cf-files/template index b7b8a7c1dac..4bec7c2ac82 100644 --- a/srcpkgs/xorg-cf-files/template +++ b/srcpkgs/xorg-cf-files/template @@ -1,7 +1,7 @@ # Template file for 'xorg-cf-files' pkgname=xorg-cf-files -version=1.0.6 -revision=4 +version=1.0.7 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config automake xorg-util-macros font-util" short_desc="X.Org imake program and related utilities" @@ -9,7 +9,7 @@ maintainer="Tj Vanderpoel (bougyman) " license="X11" homepage="https://www.x.org/wiki/" distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2" -checksum=4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d +checksum=74a771d5bb2189020399998dfa2329c3e038aa2e14dd3d4056144ed9a5976308 pre_configure() { autoreconf -fi From 352e3f0edcd428b9ebf37b709af39c0fea3914bb Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 20:29:48 +0200 Subject: [PATCH 0623/2369] msmtp: update to 1.8.20. --- srcpkgs/msmtp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template index 5f6d611259b..eb687ece82c 100644 --- a/srcpkgs/msmtp/template +++ b/srcpkgs/msmtp/template @@ -1,6 +1,6 @@ # Template file for 'msmtp' pkgname=msmtp -version=1.8.18 +version=1.8.20 revision=1 build_style=gnu-configure configure_args="$(vopt_with msmtpd) @@ -17,7 +17,7 @@ maintainer="Peter Bui " license="GPL-3.0-or-later" homepage="https://marlam.de/msmtp/" distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz" -checksum=14fc62af37ebdcc5ed19a245a05eb8376efe7016118f00c9c594bc999d5560a5 +checksum=d93ae2aafc0f48af7dc9d0b394df1bb800588b8b4e8d096d8b3cf225344eb111 build_options="idn sasl gnome msmtpd" build_options_default="idn sasl msmtpd" From 374ebe23b3f2e87caceb557a101da5d7ea486f71 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 20:30:37 +0200 Subject: [PATCH 0624/2369] xauth: update to 1.1.1. Adopted. --- srcpkgs/xauth/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xauth/template b/srcpkgs/xauth/template index 8569efad4d8..8cf9d80c606 100644 --- a/srcpkgs/xauth/template +++ b/srcpkgs/xauth/template @@ -1,16 +1,16 @@ # Template file for 'xauth' pkgname=xauth -version=1.1 +version=1.1.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xtrans libXau-devel libXext-devel libXmu-devel" short_desc="X authentication utility" -maintainer="Orphaned " +maintainer="Leah Neukirchen " license="MIT" homepage="http://xorg.freedesktop.org/" distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=6d1dd1b79dd185107c5b0fdd22d1d791ad749ad6e288d0cdf80964c4ffa7530c +checksum=164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92 post_install() { vlicense COPYING From edfd0c429f3b6e231f28038395057d02436c21bb Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 20:37:17 +0200 Subject: [PATCH 0625/2369] gnutls: update to 3.7.4. --- common/shlibs | 2 +- srcpkgs/gnutls/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index e7af88140d1..836cacc49b8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -224,7 +224,7 @@ libgpg-error.so.0 libgpg-error-1.6_1 liblzo2.so.2 lzo-2.03_1 libgcrypt.so.20 libgcrypt-1.6.1_1 libgnutls.so.30 gnutls-3.4.13_1 -libgnutlsxx.so.28 gnutls-3.2.13_1 +libgnutlsxx.so.30 gnutls-3.7.4_1 libgnutls-dane.so.0 gnutls-3.6.12_1 libdevmapper.so.1.02 device-mapper-2.02.110_1 libdevmapper-event.so.1.02 device-mapper-2.02.110_1 diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template index 960a133cf24..9f2d7f905b7 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -1,6 +1,6 @@ # Template file for 'gnutls' pkgname=gnutls -version=3.7.3 +version=3.7.4 revision=1 build_style=gnu-configure configure_args="--disable-guile --disable-static @@ -21,7 +21,7 @@ maintainer="Orphaned " license="GPL-3.0-only, LGPL-2.1-or-later" homepage="https://gnutls.org" distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz" -checksum=fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a +checksum=e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f pre_check() { # same as $PASS in tests/cert-tests/certtool.sh From 9fcbea703ec71fc6bdf44955ef0fd04bea80f1d0 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 20:40:25 +0200 Subject: [PATCH 0626/2369] appres: update to 1.0.6. --- srcpkgs/appres/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/appres/template b/srcpkgs/appres/template index 0d85dea763a..83e4b39f1bb 100644 --- a/srcpkgs/appres/template +++ b/srcpkgs/appres/template @@ -1,6 +1,6 @@ # Template build file for 'appres'. pkgname=appres -version=1.0.5 +version=1.0.6 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -9,8 +9,8 @@ short_desc="List X application resource database" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Leah Neukirchen " -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=ffad893712c81943b919e3cbfe46fc65259cc0d9eb96d5e658670e3fbb265928 +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz" +checksum=8b2257e2a0a1ad8330323aec23f07c333075d7fe4e6efd88e0c18fba8223590b post_install() { vlicense COPYING From d866530baa4a5f95fd35aeadb6c21928b5b59a11 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 20:41:04 +0200 Subject: [PATCH 0627/2369] editres: update to 1.0.8. --- srcpkgs/editres/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/editres/template b/srcpkgs/editres/template index 4890cbd590e..502eba67c06 100644 --- a/srcpkgs/editres/template +++ b/srcpkgs/editres/template @@ -1,6 +1,6 @@ # Template build file for 'editres'. pkgname=editres -version=1.0.7 +version=1.0.8 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -9,8 +9,8 @@ short_desc="Dynamic resource editor for X Toolkit applications" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Leah Neukirchen " -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=089ad34628e55a779b97e369f55fb12caefc96d684b508d9022eb9e12b775c11 +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz" +checksum=83cf5dffb1883635fd9c6a8dc48ff9e560f6c6d8ce1a0e929d5f409cba18b6f9 post_install() { vlicense COPYING From 17164ad84da925cc73cc7792cdd0c008b115b738 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 20:41:59 +0200 Subject: [PATCH 0628/2369] discount: update to 2.2.7b. --- srcpkgs/discount/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/discount/template b/srcpkgs/discount/template index d47f4651841..a075e4ad5a3 100644 --- a/srcpkgs/discount/template +++ b/srcpkgs/discount/template @@ -1,6 +1,6 @@ # Template file for 'discount' pkgname=discount -version=2.2.7 +version=2.2.7b revision=1 build_style=configure configure_script="./configure.sh" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="http://www.pell.portland.or.us/~orc/Code/discount" distfiles="https://github.com/Orc/discount/archive/v${version}.tar.gz" -checksum=72c1325ddfc40871d6810f1e272cf2d45b361f26357eb38f170fd04d737bb9f2 +checksum=48343272aa93ae913187ff678b3e52efa722f133e1efcaddc20cf775e8a517ec disable_parallel_build=yes do_install() { From 6fd236598088319cdc92f590ee79dd7eba3a6c63 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 20:42:38 +0200 Subject: [PATCH 0629/2369] fzf: update to 0.30.0. --- srcpkgs/fzf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template index 4b881ee7a6a..ec60af9ddc6 100644 --- a/srcpkgs/fzf/template +++ b/srcpkgs/fzf/template @@ -1,6 +1,6 @@ # Template file for 'fzf' pkgname=fzf -version=0.29.0 +version=0.30.0 revision=1 build_style=go go_import_path="github.com/junegunn/fzf" @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/junegunn/fzf" changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md" distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz" -checksum=a287a8806ce56d764100c5a6551721e16649fd98325f6bf112e96fb09fe3031b +checksum=a3428f510b7136e39104a002f19b2e563090496cb5205fa2e4c5967d34a20124 post_install() { cd ${wrksrc} From e1696cb023f14596919635baafb46cb8391eae3d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 20:44:11 +0200 Subject: [PATCH 0630/2369] libX11: update to 1.7.5. --- srcpkgs/libX11/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template index 53bd34be6e0..e47acb6ecf6 100644 --- a/srcpkgs/libX11/template +++ b/srcpkgs/libX11/template @@ -1,6 +1,6 @@ # Template file for 'libX11' pkgname=libX11 -version=1.7.4 +version=1.7.5 revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="http://xorg.freedesktop.org/" distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz" -checksum=0e7d48bfa0b0ee5705d14fe140cf4310744ed131f0a6241b7cf03db06000fe51 +checksum=5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151 do_configure() { ./configure ${configure_args} From bed26756cf8347f4780e04489481e769f6b41b79 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Apr 2022 20:45:44 +0200 Subject: [PATCH 0631/2369] listres: update to 1.0.5. --- srcpkgs/listres/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/listres/template b/srcpkgs/listres/template index e1b1866ddcf..00d1e32c60f 100644 --- a/srcpkgs/listres/template +++ b/srcpkgs/listres/template @@ -1,6 +1,6 @@ # Template build file for 'listres'. pkgname=listres -version=1.0.4 +version=1.0.5 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -9,8 +9,8 @@ short_desc="List resources in Xaw widgets" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Leah Neukirchen " -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=6a1229f478796e141d6658762f432ebbe1f6083b27550847d52239b3f7ec2b10 +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz" +checksum=ce2a00bbe7d2eb8d75177006f343c80443a22d52570c48a43c6fe70ea074dc9d post_install() { vlicense COPYING From 1358760e39446ec348441e882191bd616ed87c6c Mon Sep 17 00:00:00 2001 From: Florian Wagner Date: Mon, 4 Apr 2022 23:07:36 +0200 Subject: [PATCH 0632/2369] claws-mail: update to 4.1.0 --- srcpkgs/claws-mail/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template index 02a03465adf..118b7d60710 100644 --- a/srcpkgs/claws-mail/template +++ b/srcpkgs/claws-mail/template @@ -1,6 +1,6 @@ # Template file for 'claws-mail' pkgname=claws-mail -version=3.18.0 +version=4.1.0 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-python-plugin --disable-perl-plugin @@ -16,8 +16,9 @@ short_desc="GTK+ based, user-friendly, lightweight, and fast email client" maintainer="Jakub Skrzypnik " license="GPL-3.0-or-later" homepage="https://claws-mail.org" +changelog="https://claws-mail.org/NEWS" distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz" -checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb +checksum=0e1a9ca0db8d2a9e058ae30cdc7fc919779214ec3c56ee0c8a7f88cc23817a8e claws-mail-devel_package() { depends="${makedepends}" From 05a185be1d4df22131716595b021b77a4cd14bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?= Date: Tue, 5 Apr 2022 21:24:30 +0200 Subject: [PATCH 0633/2369] glfw: update to 3.3.7 Also add changelog url and update download URL to github project. --- srcpkgs/glfw/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/glfw/template b/srcpkgs/glfw/template index a9168faffc6..968accbe50d 100644 --- a/srcpkgs/glfw/template +++ b/srcpkgs/glfw/template @@ -1,7 +1,7 @@ # Template file for 'glfw' # update together with glfw-wayland pkgname=glfw -version=3.3.6 +version=3.3.7 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON" @@ -11,8 +11,9 @@ short_desc="Multi-platform library for creating windows with OpenGL contexts" maintainer="Enno Boland " license="Zlib" homepage="http://www.glfw.org" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=4e08897813668584b252065dc8bcb5a3cbcdd19918ede4dbc847fad7e35db7ec +changelog="https://www.glfw.org/changelog.html" +distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" +checksum=fd21a5f65bcc0fc3c76e0f8865776e852de09ef6fbc3620e09ce96d2b2807e04 glfw-devel_package() { depends="glfw>=${version}_${revision} $makedepends" From 29fb47a25e5a9b7f33871b4e73727a8a6c8b9e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?= Date: Tue, 5 Apr 2022 21:25:52 +0200 Subject: [PATCH 0634/2369] glfw-wayland: update to 3.3.7 Also add changelog url and update download URL to github project. --- srcpkgs/glfw-wayland/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/glfw-wayland/template b/srcpkgs/glfw-wayland/template index 720899cf56f..f2abe3a8a60 100644 --- a/srcpkgs/glfw-wayland/template +++ b/srcpkgs/glfw-wayland/template @@ -1,6 +1,6 @@ # Template file for 'glfw-wayland' pkgname=glfw-wayland -version=3.3.6 +version=3.3.7 revision=1 wrksrc=glfw-${version} build_style=cmake @@ -12,8 +12,9 @@ short_desc="Multi-platform library for creating windows with OpenGL contexts" maintainer="q66 " license="Zlib" homepage="http://www.glfw.org" -distfiles="${SOURCEFORGE_SITE}/glfw/glfw-${version}.tar.bz2" -checksum=4e08897813668584b252065dc8bcb5a3cbcdd19918ede4dbc847fad7e35db7ec +changelog="https://www.glfw.org/changelog.html" +distfiles="https://github.com/glfw/glfw/archive/${version}.tar.gz" +checksum=fd21a5f65bcc0fc3c76e0f8865776e852de09ef6fbc3620e09ce96d2b2807e04 provides="glfw-${version}_${revision}" replaces="glfw>=0" From 6d856ef1fa47fb7a07ef52234e45d4d4a4555bc1 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 5 Apr 2022 10:15:05 -0400 Subject: [PATCH 0635/2369] python3-phonenumbers: update to 8.12.46. --- srcpkgs/python3-phonenumbers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template index c4dd9b71d03..0a952e92092 100644 --- a/srcpkgs/python3-phonenumbers/template +++ b/srcpkgs/python3-phonenumbers/template @@ -1,6 +1,6 @@ # Template file for 'python3-phonenumbers' pkgname=python3-phonenumbers -version=8.12.45 +version=8.12.46 revision=1 wrksrc="phonenumbers-${version}" build_style=python3-module @@ -12,4 +12,4 @@ license="Apache-2.0" homepage="https://github.com/daviddrysdale/python-phonenumbers" changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md" distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz" -checksum=94e30f59b2be6c4310a90f3d5da53d49900bdb440484506f3333c694ebb0cdab +checksum=1c440f6336cb49893ff1a8326c70b4df693802ae981f210f545cd4215ac48133 From 4f88fec2b8fbfb82b196064245659cec6a9896e9 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 5 Apr 2022 10:17:04 -0400 Subject: [PATCH 0636/2369] python3-frozendict: update to 2.3.1. --- srcpkgs/python3-frozendict/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template index a212fa1c7c8..3946c2ee05b 100644 --- a/srcpkgs/python3-frozendict/template +++ b/srcpkgs/python3-frozendict/template @@ -1,6 +1,6 @@ # Template file for 'python3-frozendict' pkgname=python3-frozendict -version=2.3.0 +version=2.3.1 revision=1 wrksrc="frozendict-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer " license="LGPL-3.0-only" homepage="https://github.com/Marco-Sulla/python-frozendict" distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz" -checksum=da4231adefc5928e7810da2732269d3ad7b5616295b3e693746392a8205ea0b5 +checksum=bc91c69233eb916bb6ebc40988b6d849735770240efc9c60be45b4ab919c1bde do_check() { PYTHONPATH="$(cd build/lib* && pwd)" pytest3 From af06fb0f95ce0af23260ce7ba302fbdad89447e5 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 5 Apr 2022 10:13:41 -0400 Subject: [PATCH 0637/2369] synapse: update to 1.56.0. --- srcpkgs/synapse/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index 1c07111f424..984ad56e0a8 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,6 +1,6 @@ # Template file for 'synapse' pkgname=synapse -version=1.55.2 +version=1.56.0 revision=1 build_style=python3-module make_check_target=tests @@ -21,7 +21,7 @@ license="Apache-2.0" homepage="https://github.com/matrix-org/synapse" changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md" distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz" -checksum=8e06cb264d1631d2518f2f726c89d62c5ed7148b73fbb8190a9c120d3166e7c4 +checksum=7afda1fefa2af42966fdffa1f3ab6643674a738ad722e76bf94b873b8845c373 system_accounts="synapse" synapse_homedir="/var/lib/synapse" From f2c19dcdbe10bf0713fb51d7ff44bc0cc87fc98c Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Tue, 5 Apr 2022 11:25:36 +0200 Subject: [PATCH 0638/2369] slack-desktop: 4.25.0 --- 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 b90525004d6..ae1b738b622 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.24.0 +version=4.25.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=b557d264ae68cafe383d647dfd26f366ee94315f77132f64bff8f9ef44635197 +checksum=e88160a02ca489f0d54afca5bba1aeb17c886b6458eadcad73bffd959c85422c restricted=yes repository="nonfree" nopie=yes From 7dd3e15541c003854bfbd72673b68fe2e35176e1 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Tue, 5 Apr 2022 10:22:19 +0200 Subject: [PATCH 0639/2369] google-chrome: update to 100.0.4896.75 --- 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 a630fcdae46..5f9e67c864f 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,6 +1,6 @@ # Template file for 'google-chrome' pkgname=google-chrome -version=100.0.4896.60 +version=100.0.4896.75 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=05ba6d17d2704ffff1e1d554b40aaddabca9256b7e63ff73e99c469393de8a1f +checksum=856934272783e5a48fa63e30eb896040f5b46d6f394c1b3aa2e461cbf89b395b do_extract() { mkdir -p ${DESTDIR} From edea10e1542402ce9a1ca456d2fc024613ddfb2e Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sun, 3 Apr 2022 08:31:56 +0200 Subject: [PATCH 0640/2369] libvirt: update to 8.2.0. --- srcpkgs/libvirt/patches/823a62ec.patch | 48 -------------------------- srcpkgs/libvirt/template | 6 ++-- 2 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/libvirt/patches/823a62ec.patch diff --git a/srcpkgs/libvirt/patches/823a62ec.patch b/srcpkgs/libvirt/patches/823a62ec.patch deleted file mode 100644 index 5fcc644d3e5..00000000000 --- a/srcpkgs/libvirt/patches/823a62ec.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001 -From: Boris Fiuczynski -Date: Tue, 1 Mar 2022 18:47:59 +0100 -Subject: [PATCH] qemu: segmentation fault in virtqemud executing - qemuDomainUndefineFlags - -Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault. - -Stack trace of thread 664419: - #0 0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=) at ../src/qemu/qemu_driver.c:6618 - #1 0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=) at ../src/libvirt-domain.c:6519 - #2 0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=, rerr=0x3ff8287b950, client=) - at src/remote/remote_daemon_dispatch_stubs.h:13080 - #3 remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=, ret=0x0) - at src/remote/remote_daemon_dispatch_stubs.h:13059 - #4 0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010) - at ../src/rpc/virnetserverprogram.c:428 - #5 virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302 - #6 0x000003ff8758c260 in virNetServerProcessMsg (msg=, prog=, client=, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140 - #7 virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160 - #8 0x000003ff874c49aa in virThreadPoolWorker (opaque=) at ../src/util/virthreadpool.c:164 - #9 0x000003ff874c3f62 in virThreadHelper (data=) at ../src/util/virthread.c:256 - #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6 - #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6 - -Signed-off-by: Boris Fiuczynski -Reviewed-by: Jim Fehlig -Reviewed-by: Michal Privoznik ---- - src/qemu/qemu_driver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c -index bcd9bdb436..8337eed510 100644 ---- a/src/qemu/qemu_driver.c -+++ b/src/qemu/qemu_driver.c -@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, - } - } - -- if (vm->def->os.loader->nvram) { -+ if (vm->def->os.loader && vm->def->os.loader->nvram) { - nvram_path = g_strdup(vm->def->os.loader->nvram); - } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { - qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); --- -GitLab - diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index bf08aa899e0..e73c337822e 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,7 +1,7 @@ # Template file for 'libvirt' pkgname=libvirt -version=8.1.0 -revision=2 +version=8.2.0 +revision=1 build_style=meson configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run -Dpolkit=enabled" @@ -20,7 +20,7 @@ license="LGPL-2.1-or-later" homepage="https://libvirt.org" changelog="https://libvirt.org/news.html" distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz" -checksum=3c6c43becffeb34a3f397c616206aa69a893ff8bf5e8208393c84e8e75352934 +checksum=0ecd9c7dd52db7a2d124155ffa5e11de2fbd05014eceffbd1972b022d21becba # At least one test times out on CI but works locally make_check=ci-skip From bf375b44c3927a791096a06a88ce3fe7e41bd716 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sun, 3 Apr 2022 08:34:02 +0200 Subject: [PATCH 0641/2369] libvirt-python3: update to 8.2.0. --- srcpkgs/libvirt-python3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template index f74de9d9c8f..2aea5df86fe 100644 --- a/srcpkgs/libvirt-python3/template +++ b/srcpkgs/libvirt-python3/template @@ -1,6 +1,6 @@ # Template file for 'libvirt-python3' pkgname=libvirt-python3 -version=8.1.0 +version=8.2.0 revision=1 wrksrc="libvirt-python-${version}" build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://pypi.org/project/libvirt-python/" distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz" -checksum=a21ecfab6d29ac1bdd1bfd4aa3ef58447f9f70919aefecd03774613f65914e43 +checksum=f8b8cea67ff0d64d63029cc3410a4656e04ee9f26837a856bc0c287da55d053a do_check() { PYTHONPATH="$(cd build/lib.* && pwd)" pytest From 99094ecfd0366d74b64e0938718dde1865bcc6a4 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 6 Apr 2022 16:57:59 +0200 Subject: [PATCH 0642/2369] gscan2pdf: update to 2.12.6. --- srcpkgs/gscan2pdf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template index 295488de54b..c6486bd905f 100644 --- a/srcpkgs/gscan2pdf/template +++ b/srcpkgs/gscan2pdf/template @@ -1,6 +1,6 @@ # Template file for 'gscan2pdf'. pkgname=gscan2pdf -version=2.12.5 +version=2.12.6 revision=1 build_style=perl-module hostmakedepends="perl gettext" @@ -16,7 +16,7 @@ maintainer="Helmut Pozimski " license="GPL-3.0-or-later" homepage="http://gscan2pdf.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=305596f434c9fecbed80dddf6f0fb3786a60837a602280bd8d9d47906e69eac7 +checksum=f67b695043376ee4f71219de5f3f46f1b89bbf33a710ae97b748c9713bcb293d nocross=yes do_check() { From da6b404aa293c3df6de54a2c8827e010dab54f42 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 6 Apr 2022 16:58:52 +0200 Subject: [PATCH 0643/2369] wine-mono: update to 7.2.0. --- srcpkgs/wine-mono/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template index 06f2e20dd7e..ec9fa01077c 100644 --- a/srcpkgs/wine-mono/template +++ b/srcpkgs/wine-mono/template @@ -1,6 +1,6 @@ # Template file for 'wine-mono' pkgname=wine-mono -version=7.1.1 +version=7.2.0 revision=1 build_style=fetch short_desc="Mono built for running .NET applications with WINE" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later" homepage="https://wiki.winehq.org/Mono" distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi" -checksum=9dc8e5603b7bc64354eb94ae4ea0f6821424767a3ff44ff0d19e346a490c11ea +checksum=5f06eafbae3a49ecc31dfcea777075bd44f0cc126e4fb4e28ecefa06eb436323 do_install() { # The actual installation within WINE occurs at runtime in whatever From 5a91e8625aa189a87904ac97c6f98441ee3fd4aa Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 5 Apr 2022 17:15:45 +0200 Subject: [PATCH 0644/2369] firefox: update to 99.0. --- ...ktop-icon-path.patch => fix-firefox-desktop.patch} | 11 ++++++++--- srcpkgs/firefox/template | 7 ++++--- 2 files changed, 12 insertions(+), 6 deletions(-) rename srcpkgs/firefox/patches/{fix-desktop-icon-path.patch => fix-firefox-desktop.patch} (64%) diff --git a/srcpkgs/firefox/patches/fix-desktop-icon-path.patch b/srcpkgs/firefox/patches/fix-firefox-desktop.patch similarity index 64% rename from srcpkgs/firefox/patches/fix-desktop-icon-path.patch rename to srcpkgs/firefox/patches/fix-firefox-desktop.patch index c4664d3da7c..3f0273cba36 100644 --- a/srcpkgs/firefox/patches/fix-desktop-icon-path.patch +++ b/srcpkgs/firefox/patches/fix-firefox-desktop.patch @@ -1,6 +1,6 @@ ---- a/taskcluster/docker/firefox-snap/firefox.desktop 2019-01-18 19:31:39.428839442 +0100 -+++ b/taskcluster/docker/firefox-snap/firefox.desktop 2019-01-18 19:32:20.689063456 +0100 -@@ -154,7 +154,7 @@ +--- a/taskcluster/docker/firefox-snap/firefox.desktop ++++ b/taskcluster/docker/firefox-snap/firefox.desktop +@@ -154,11 +154,12 @@ Terminal=false X-MultipleArgs=false Type=Application @@ -9,3 +9,8 @@ Categories=GNOME;GTK;Network;WebBrowser; MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall; StartupNotify=true + Actions=NewWindow;NewPrivateWindow; ++StartupWMClass=Firefox + + [Desktop Action NewWindow] + Name=Open a New Window diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 6c1596b19e0..8ee3b78f809 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=98.0 +version=99.0 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=fd0a4c11d007d9045706667eb0f99f9b7422945188424cb937bfef530cb6f4dd +checksum=513f8d2cafa39a2d50f2c4a25cc48093e89f715a706b941170fa48e397976327 lib32disabled=yes @@ -32,7 +32,6 @@ build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland" case $XBPS_TARGET_MACHINE in armv[56]*) broken="required NEON extensions are not supported on armv6" ;; - armv7*) broken="currently broken" ;; ppc64*) ;; ppc*) broken="xptcall bitrot" ;; esac @@ -73,6 +72,8 @@ post_patch() { do_build() { cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig" + echo "MOZ_APP_REMOTINGNAME=Firefox" >>.mozconfig + case "$XBPS_TARGET_MACHINE" in *-musl) echo "ac_add_options --disable-jemalloc" >>.mozconfig From d4c83418fc3ad4b770fd81de6037e0f90bb27070 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 5 Apr 2022 17:15:53 +0200 Subject: [PATCH 0645/2369] firefox-i18n: update to 99.0. --- srcpkgs/firefox-i18n/template | 194 +++++++++++++++++----------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index 713c5914d0a..0e98d438bd2 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=98.0 +version=99.0 revision=1 build_style=meta short_desc="Firefox language packs" @@ -140,99 +140,99 @@ _pkgtmpl() { } } -checksum="dff169f590c9ba54034df42a131d067a30e6ed967fc0e5142705df22d8ea977f - b73f738bae53b0afbe28d087a889ab7c98e3b325cfd5122cc60eea59a7db8616 - 4f13f00bda1aafc6a2d97041fcb3740a4e8c1c049bba151b3791924d73d3ef06 - 02ab060f05a1a2af373c2a3fe48ef891fa6d1835ddee77ba9678f22bb4782e86 - b02d91316af55caf87abd7650b286f9c181eb7added7d021446ae2976ff69bbd - dfb07ae1cfc143166fdada9e378cb4f22e4ddda92d0e2c66e6a1d2742c51d0c0 - 4a0409fdc266d1e819a178d558d90b3209c8423cf2794ca0fce3eedea947faa6 - 567e77ed85bacaafbf82fbc90dfabae6e31be8acec5a2db8cfd28197d5bd1815 - b92173bf696785e4f64f74871996c75c9fe96854e3194ebf7ff1dcc9f817b0d8 - bbd223abe4457a1e7425f0cf035c7b6de33e26440d30af8655320ff9c68b124b - 8e98b9083a77a97886affbbf089e842b0286539fd93df18b031c8d7e8ac92d30 - d4a94e6f5753e5f4d2a777830a0cb23ac94298278328bd3579606ceb47d949eb - 360dc9fd3a91eac883ca28efd02c218d7365d889146278129ea27424ba452a58 - cd9bc801f9807b0b8f1dcb3ff8bed985cbe291ee95f25963617845d1d7de57b2 - fd5b0f3d1d81c74ebd53b4e2f221cc79dbe9c2a936e73b6a983cb666d6c8f7a6 - e2b37b8fa911c4bca068b0fce10db9fa28490c939c15fb8ffda785d396e6f33b - 2a0993286c9e5f1350a660636ec2b43c9c7d974ac9d1c2c979df888f81a90141 - 2fc6465bc4dd66c23deacfa7d055a2bf50eb2db9a0a10c20f6f3b5321879e33e - b88cd11ed43a4f67897434281a4ebd7ef7cb3f4c4d041822fb672d0812d98a2d - 9d3de3237d2e12e72f9244151ff9c24caccbd7e1a560718f8f41a0bb7e96e2c9 - 1cb6d182af78f237d0d01edba2263b01173377ddc0c9b1e7f5db1cf593765da8 - 52a7d3401c0d333fcf98b33bff2fddc88ae017476e0be74c73359c01d9f7eaee - 661374e104b98180fba058d4ab6574246d4d9244739decdfcece493338f1ed3f - ba74a4dba80b8cde6a4105cd6179a72005123d1c92898496a2793479c1921676 - c6259edeb1da7d3ca05ca4b3565408d02e48e3c7f7a254d56b41fdb3639cb56f - fddfbe98c0d309323981b685b134f000cc9c69518efc365c5c559ffd2c05b602 - bee9c9a60147bcf86f55bccace7fe63316fb79af7cd45b8ffe43abba980db8b9 - 8a4536988167922619e06721229fc91d087d56177ce2ad1a417dd52bc218814f - 1c11f7b7d2349d8bf0cbd3f6133d1f93b70b6d0176555d538e0bfb7774ea0de9 - 52bc04a4c244de19b4e02a60b79fd760df35a2b825363a1e94c5becd535413ec - d19315771ccaf194add0459e85a44a8a11dc04f2d9b426201fd4c7000e4defe0 - 3e0df7a54beb78791adfb9f56cc62c5cd01126e964fa90cc1bb65331b2d572f6 - 49b38e6fe6746b2c3e4bcf8a1b7bc828ac8c5784dbe5b1039edde51d2e942dd3 - 97751019d9f01120a0acf4153b3b06c2e476b83d5da8561bac349cdcba5fe095 - bb222cce7ff359eeef5cbaad871aa42214ab5b62872deead6cc57068d0f1fd8b - fcff68e01cbf4740e7816fb61a15853f9be14034b3fdde1a67b22f80dd43ff33 - bc7c2beadf026cd535635b540c2a8ca7953662b154b9e128378b6ab51ac62953 - b1f207489d09eec55d486b467ceb88bd289b7238ff506a01318d797811121f95 - 08dacf388f2a04796450d37c2a7db5270b3515c38ef0f0426ecc59915ae6b812 - cc7e4230277d9b54f114048f951880aaf4ed88af03a5791e0dc091ecb947e956 - cd6024b8bc6780265146720559fb1f828e36688eeec919044a62d365b440ba97 - 33c1d05921e6041db7d09279da354e2d406798ffd14c67b9cf204e339fc1caee - 0264439a560fef95488a5aa05783b24e39d16acbed6f1b389a75864ac60f3267 - f174f19aacd50078adceb236e9432feccaf0edc8aae9632191a4c38dab22b206 - 596b84ba309ed661429c8fe5a13baa38e773f40b3b17c997d61834afec92b535 - 6e2e243496089c084844868744ed2a736e621fc14fe95cdf3b5b7507d56b022e - 91449d6929c9c3068d0c724315e00d412f25c7ca72fddba53ac97c24f4214189 - 138ca2aaf0f0a2decba98db228ac835b1299c841932bf683deb635a8cf226616 - 299bacaffa3b2f8bc359b7bd33a9e4b5588546f7b75ea323ab63b6a25152ace1 - c9eaa1d9e843a07eed355db514c10f8df0e898f9f177dc96eb721643218c6314 - 5231901059f7a9d7b5bd7ff15168c469f2f7813c85c7266b70c20661e2eeb838 - c2d0f151ffd2e9daf33bbffc2d069fd65c258d7c69b29f38785e2e395d8ff6c0 - c2edbea7c2037a57524c4899a888eb0a3007593f0b39e8686a049b5dda10a768 - 95acf4112f5b67f22f8df330e53e6cf764e1648f6fbbebc7feb316dc3eb6cf8f - 22224ae5b1818b86a5ce7b5872ebcea1c071009a6fe1abcfcf26cfe36b53c6b8 - 035658f37f5a9c025db1386a89f5c05b72895b73c1a6826656055117afbd5239 - 627d5f227d5e39c98802dabf68096f2588ee988afcdb13b95470457bb1f1c44c - 7d5f86ab7a0f47947ccfebf496e7e8164d433ee7560c39661a0f3d88995d72c4 - 9623353017b1f980f43eae284662dbd2cd0b1ea1d8864e4fa6f86c83d78e7c06 - 1fb1f82cbaca4a5463b8375709dc2e865dae4492ef294c7c39324fb867e58272 - ad7df8473b55cc460476e05f265e7c496f711dbd6635b594e3d1cdd435ff6504 - 38416b1b2ca89bec7e71e2143ba27e64b2c3319ef45499346b47dc30fbca793c - b55d6775b6bb9254b87692e244fd7078ec93c031efa51b6d205cff98a1651484 - 66318b8528b59acba6be065989e51b5187a8735cc1be87fb25c835d9f5ae37af - 423f5a30c7174d2b41f5fcd38beaa232967990f66aec84769ce501402f5881a3 - 7933dfd5d65816c54c8ab3da1455d6810c4d1532790d95c54b0bc4adc055ff40 - a44392970b81bbc639822aaa9f73f7da4e64e39b91a402483d5bf98538fd88e4 - 0cf1c29300b3fee8659c630bd37867323c42422b50bd429e9ca196025fbf090c - ff56285588b4bcc927db05ac856e2bf69d4f6b31c63d254242551c0315719854 - cc1de1d246c39e1214186cbe88932b70e8e60121739faf9c88f24446e74445b8 - b97123397c9f1419bd6ce9c62a7be178c35683b64fe3c20046ee4aeeadd2f83b - b09681f50489150130ae682139d6427f1fc77c2cb2a9debdd5db9fc4ae307a1c - 84f5dc461c256fd058522acf368c5d83a4560a8a478be5f5d551a1a194598374 - 336a044de2b47ee875f27627059bef2dea0862908b2bd937416a2765ec91eeda - 3154deee82fe4fa24df33713a2a9688c1028c39df791732af097419dca83e3f6 - 973e3de5de51533ebd699879ec1679525e7b35a0a74218f68c29a1b4d2280c2d - 18344197c44ed32c4cf31df5c4424d0128b6791a57fb910ce42e1f68d282e13d - 87c4014428af7f4303f9accc16951be16dc7122a191d1465d0a5e0b60486ef80 - 6ca8549d8c1c91ca2136e49458b935974354640aa6bab2a8d2255868d56d87ed - 2a18628d8955170725121f5f5a2b4262e39456e9fd4a007bd387f2a14e235a50 - 96cbf50ad97ada93a6e0156557911911e46c7963b34951cfe5abd0be3dbfaade - ba6fd1a48128dfa48a1f3c70b28181e658abbbf549e104d08df3f27197475dcc - 7bb5c17d1f1e25cfc735867f005563ead7de99c19e27f05a0efeced067ab50be - b3712f4146b50e243a6b2056d062045a14c9d8057ba1430f5c2662dac06ac34e - 8f1c167582e3d46cf2d24887b47dd4830f0dd084aefd7371b61ef716932db352 - 29563c43673308e83437984ebe46e650a56e11be5fe2e1298946bc232287e121 - 9badcf85535fc5b2282bdaea3fc6ac15d0f9f560524015321f0ed5c075fe7e5b - 1b6c1b1374e257cb5f699f71dbd1d2d1a287588548610272598a85b8133fcaef - 3aed734f122676a568c68a98a3243570dea7b06cf5a65f1be1ce060da2fe6804 - a365cac889289ede9cf61a0fb73b8efe7cccf758167354ff43b29b3845777c82 - 20c519b8cf6f16eac1fbc00b93178eb78c076f10518faf4c43f9606de6fbab83 - 138ef57dc8947ef1580ee7fb0edc3459cd49a16ec296edabcfa913c784ee7320 - 1b4fd65008d7780b9af4857ef91b9d4eccb97cb3469d90a982713812ab7c1b11 - 1930509ac41ac78987f50332f9e44b66d0e27ad59fea56e933e05d4475012196 - d6c16dec9ea82842f64e11ff7f6b4194f9b513f904423291ec8e7782ab7024f8 - 54af90457d760ea7ac38b1b6d7b532996542192d0541004f9da9386fb5ea91ea" +checksum="e398f1b14ae79fcd74639a81b27c4cd38b09282ca625d1b72c69df09fc4ec1fc + a8cbef3ba5c35e33c0f1e02dcd2781cc362315d5b63e9e6065a22afbe460581f + 35b4f32eabd40875d518cb174858bb6d8ecff272f4ee677e0c108d8395707960 + 4f1a97c404347121c53799efd2a986860e030b7789e66e252d92b6a78012b681 + 580e9e9fde913ce410774d366bad95af3a67df52c688a6ad64ad59e8d33eab47 + 91236c6ecd7ee99927d5b69566cc30f4b1de6e7caca3336386f3e7bb995c96e2 + fa36e967b14e530993e3a50fcdc5f32e686f5b110f6cdee59b8c555c82294517 + c88a65b1f3c10085b0d5236a3e687b70cd9a620803393caf81b4ee0677330ef0 + c12d138948d4e5cebce1051f0cc750f8f9bfb23f733417e7e7b9596ee74a6980 + e4b9cdcb7c08beceecfef7d8b94d70a24e3f24404c73cd7cf5aed6572e293bf6 + 75d09dfb5c0b55b670c912feecd48bfdc7f936f31c41d8e4b2ede0e46d16f749 + 8780f97e115fbe8f156412757d1980517b85dc409fbbc8e0266bdcc7d0568c83 + 815c9a81efce33b19b9bcabd46093ea92bd062698575c83ea127f20a3495c984 + 76e9a327a69960f4ebd857b5b204d435d60461b7129aa70db90ebb28411ffaee + 8fdd5adfec75310172819a959a2b68ad3ecb614c94298be315804e730b43a160 + 8947c35c94f08bbb61a3beb8b106a776d0f0a3b2f247b9e49619ab9b9416bb19 + 7851a711a8de28c6e6c3c07814ef995263f4c3a48981742f1aa481389dab3897 + 8bb525f9045c91b3f539103eb398da1d1f71a580971a1adcc780198da36a2623 + 04cfc4a69fba8f3838d385179511954277cf1f6d8243663f338941c1e86a49ca + cd9f142ac06d16919b5f1102ae53f1241574057c75012198fe1dbdb7a8d63a8c + 8ff53385252becfbc2f15354ea57b873251584444129c137350e974dc488318c + 9a58559be92950e33051625e49dd3f5bae36c225b9a7030bec9a6aa78d45ba93 + 6e0f538d93f8b2d189c667c2aac37c6d1eb50fb802c4ee2ff310db15da57de56 + 2c051ea90460cda20296b1a69037e037b82258fe382c9031594974e75cbc10eb + 053dfbb9ad0feb3b54cab94bd8f5ac544ec598f9b819a7d163496f838104b8a5 + faa25b7302f249b9aaea768a7cf61f78f67e3637e9a62906361a1fae257d0161 + 54f02a1e948d2944b3889152b093200a0d31358df28f7309e5fb5d490616d317 + 7c104e3c70024163fc0fe7597df0a995b2e813319dc23268fe36e04f09f2ced7 + 2cf6b8e82042208407bfdbad01a3d5113c87f0bd37acb082452f1f6c22bf1485 + da05a0fe7a65ce243f0ec69ad60d93a3bc988383f983343a66b399a2de1a10a0 + 13da03264b7d522bcbb77cfb1fece6606f9efe742822325ced7627fe28add070 + 0d835b249070428d8d5e1c251ab46b19df71cc2858b69843a41eee897c27b396 + 5dbbe35e45b15dca15ba5de15aa55b4fce44d33fb456ca8184270c0f162567d7 + 9e6b2c13f0c2347fe27e189dea6dd8a3c5b23aaac668010213258bd26e0d3da7 + 1aa07979f8bb7d6039a11f64b3c93b3c70332def967af6fb426897b7c65fdba2 + c21b99ea6049d498bb446770801e3c9f8041bd11e0ae8164bd16a016f14f5578 + ed537abf79efa484fc920902d59ea1b840c6acf6fa540f435722f5c75a1bca90 + e9517bb3330ec5cb2a743dd56a69c912a35b6dafe6a7abeadfe1532a17963549 + cf97f81502f30c807fde8127c6f8ac1a9ea58508ba8d243ea0d6fbabe2ddc8b1 + 85b90f53e79bc2961b3f0c702ba5762ba7559c366d7682bc66b20514769c2a92 + bd31d635b44f039ad2f89e4ad1cd0f7fcbcec7e0d6d381f8bf89e17bb74aa952 + 10d597d44d8261cd0eebe024de51ba803c94792d13c5732d43ed9bec4db72783 + 33da29355095f9ae0383e21ae0c6d300d6a7f298c7e126e8747c71277b1175be + 84ff5d1b88c4205eba0f04e89daf4d91e9f25da4590367050917a6d34c629147 + 4de39e8b907391f197fe5d138f87985d74d3a34796c3963f2e33142164696f84 + 47e8c5ece6643d5c6cac713799c841e73c0bda691243ccd346b5e85b0a4810d1 + c196be8854dded19c2a85c5bb7f3ff3123da0d91852da7b16f844cb44e9d11fa + 7f97921badcf0c7ffeb92c6f1d1d2ada3afd0069e8e80a524ad3b7c0c1220f0a + 79d845fccaa1916f07dfd821c3ed95dd5647b70bd9a39e485caa66cc65a077f7 + 40ce23e0cc6e4fa5192e987bc835c1408d958a2fcfb8875370db517ff64c92a4 + 8f6f739077a383884d400c3062925e0e848be4942e3be0e378e589bfa3941c9c + 9f014d8807130a01ae008997393deb4c865c70482a4fe75f3cee0e9f8071246a + 240aa4b7091065ef0495c8f52eeb91b5a0cae03676c6ea4cedee9260e204dd6f + 788f7ab9bfbb7b692d4d28efad9ae3de964ef7bfa4e30f6f50a3bd178ac004ee + 04a7fbbc1b0769a5b66bb068385482e50c5f70298eba250235d259bc4aa3ea99 + 30a1707f4a57a2ba738eb27f5525daa12f0713e3bb7b1a3ebe2c710ac6e37a27 + bdc752daf3b4e8f8ea3980d98a01d7249f38dddf183909eb55a8c50ad30368e1 + 48332123774a79eed86d1e826021a05a3921ac5f95ca54e086f173c8e1e72fd1 + 31f2f1c2adabe35fd353d3720eb8458716f926e57c9d782518f943533cd1a72d + 4756150d141a8ce3e2bdca7fdb1b343466b19cb9a19adbfa25d86c39d0f7c933 + 024f3b186772c5381a458dda4a6b914fb2695f8c16e648c58d463072f10f5b57 + 8160d89f88b3c7d9e967377e513b8fc18e4a19faa55f95371db3553564db65bf + 6d2816247894f2e73ecb0258ee5a9b85b650542bac46a8587d547c8824e2d280 + d3e017f003c34a6768670ae2c8bbd5e3500f452647e36193614810ced595b2b3 + 7ceafc2a330620665c51e8b394d296ddb190d97f4cebcd0a247d0278d3a54274 + 6b6992a92df788fbd119446aabd9329b7edd1643a8dd1e3ca7b60dc7976b3b60 + 8dee92aa771ca1b0deb233b974f844b8025d4b25f2ff8be41d91c636565eb7f0 + b4fc00a30204c8c5b19c92bd3164b98955d9591366f89c194fe248bdbc0ce580 + 406335d53b11c42f34446adc68d6836a6841fc34af3c2f1fa621ddc2026017b4 + 7ac66cef872878f6e5568266d9c807da1cc4041ae51723cf387590954f73cf7d + 74c5306c711a4150cb6f89289067533a5438495a251d63cb06f586d27eafbeb4 + f3e67b76944280de1eb8df059bec0f0eafd06a4bc4e7c93e98c434a17192c084 + e13b87e04ee3fbf7ea0c02e4b176d6dc66dbd234b59cb245dfd225e65c5cdcd3 + bfab113c2dde187aaabfd89957c7dc840bbbb25c4f27b31fb422c9817035eaa8 + 7bde7feb01a40d3b89b78928154fcfc0eff8c77b086e360b940f61d45d7eadb0 + 18f2267d16b30aecfd2b6f9437cc79bca68084680b2770820323a968fd20c93e + 5bd5138456fae929520bbd821beddd1f934d156e3c99916e47df31b7bedaa32a + eb4db96ab4b78dede2d92db7c0c3dd4084971178f101a342655348a4b90a6487 + 07a06be606d6adacf1cb57cbf448ff18a7c13c90df9e11768ac3fe3e200569a2 + 090e6759314eb16b2169bd1f89387963ba81a0e565f1d77143f2da0e6d267e28 + 38cf5fa44116bc15f12db4506db386b147762838f25d991a0c39cdcd236533f6 + 448a4ab5be3d9f246f961705a02f31abcaa8c616351c4d05857c3db41ba83154 + 3fcfcc54f9ec4762b4b78ce0db9351ac59a717e4931d6267cacafa16d3d41057 + 7349863f4edfd79321be9b214384138596cbe16ecd2107cee58501e2511c438a + 4a50c82c68898c25dfdfcb95079750a455ba2e4d1397d5e51cc2991dce1be60b + 275ab1a945003153a10fd5bbebf8ce9af346e5ad2068c83eebdcd60ecf0ce99e + cce68831a20669468b108e3dd58dbc34cd981c874bdd299b715df838ba5ca0f9 + d6cdb55b0f8d7f3c9c4f3bc7906feb123f84243bfbd719eab75a6894cf455582 + 74012d5c8c22cc2f5780ae55020cdbe3c74f21671a2769fde907dbd63e0281bb + 14a02938f76ce51767746ecc104ff571f2da0429144ee981cd28af8b4eda3518 + dc05af8f59bdbf1c77d6d45dc1bf6bba634b782533e245993d852e39f145cfc9 + 557444ed827906476ec3385ffae1e1952acc5b3234840fc645ff892c9753b2f3 + 9925d116300b43f82061e1c04deae6c241cfb121d46364aa1f206e0d8bd9732a + aaf3249f295362530f04f23c00e309baa5a7a89c70bbf1a3a763b8ef66631ac8 + d289624c73955ff377057be150ff8d52118810a4adaf861fe51b7f0a0b80dbbf + 2f07d98e74625892478c321161f62db8c790d978dd4e5c3633c5cf5ef5d8d6b4" From eb5b0765a88ae6d02dc562a21c49f91f97db3c88 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 14:45:55 +0100 Subject: [PATCH 0646/2369] meson: update to 0.62.0. --- srcpkgs/meson/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index adfa2d52f7a..2a4453076e8 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,7 +1,7 @@ # Template file for 'meson' pkgname=meson -version=0.61.4 -revision=2 +version=0.62.0 +revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" depends="ninja python3-setuptools" @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://mesonbuild.com" changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz" -checksum=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9 +checksum=06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb # XXX: sanitizers aren't available on musl if [ "$XBPS_TARGET_LIBC" = glibc ]; then @@ -40,8 +40,6 @@ post_install() { vmkdir usr/share/vim/vimfiles cp -rt ${DESTDIR}/usr/share/vim/vimfiles data/syntax-highlighting/vim/*/ - vinstall data/syntax-highlighting/emacs/meson.el 644 usr/share/emacs/site-lisp - vcompletion data/shell-completions/bash/meson bash vcompletion data/shell-completions/zsh/_meson zsh } From a6dc739c0e32f34591fd2cf6ca36579b2d468607 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 16:07:16 +0100 Subject: [PATCH 0647/2369] accountsservice: fix for meson 0.62 --- srcpkgs/accountsservice/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template index c00a4077d8f..804d57e9e42 100644 --- a/srcpkgs/accountsservice/template +++ b/srcpkgs/accountsservice/template @@ -6,7 +6,7 @@ build_style=meson build_helper="gir" configure_args="-Dsystemdsystemunitdir=no $(vopt_bool gir introspection) $(vopt_bool elogind elogind)" -hostmakedepends="glib-devel pkg-config polkit" +hostmakedepends="glib-devel pkg-config polkit gettext" makedepends="polkit-devel $(vopt_if elogind elogind-devel)" short_desc="D-Bus interfaces for querying and manipulating user account information" maintainer="Enno Boland " From e2b0aa90acd2db4a092a7275f7e2c223497bff55 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 16:12:33 +0100 Subject: [PATCH 0648/2369] atomix: fix for meson 0.62 --- srcpkgs/atomix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template index a59e134ebd9..31f34e1efc5 100644 --- a/srcpkgs/atomix/template +++ b/srcpkgs/atomix/template @@ -3,7 +3,7 @@ pkgname=atomix version=3.34.0 revision=1 build_style=meson -hostmakedepends="glib-devel itstool pkg-config" +hostmakedepends="glib-devel itstool pkg-config gettext" makedepends="libgnome-games-support-devel" short_desc="GNOME puzzle game where you build molecules" maintainer="Orphaned " From ebdc57f0727d924c46dbf984092ff313c098e2f5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 16:21:38 +0100 Subject: [PATCH 0649/2369] babl: fix for meson 0.62 --- srcpkgs/babl/patches/meson-0.62.patch | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/babl/patches/meson-0.62.patch diff --git a/srcpkgs/babl/patches/meson-0.62.patch b/srcpkgs/babl/patches/meson-0.62.patch new file mode 100644 index 00000000000..a105c98cb0d --- /dev/null +++ b/srcpkgs/babl/patches/meson-0.62.patch @@ -0,0 +1,33 @@ +From b05b2826365a7dbc6ca1bf0977b848055cd0cbb6 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Sun, 13 Mar 2022 20:26:05 -0400 +Subject: [PATCH] meson: fix misspelled kwarg name + +set10 doesn't have a `Description` kwarg, it does have a `description` +kwarg though. + +This caused the conf variable to not have a description when it should +have one, and newer versions of Meson with better argument validation +error out with: + +meson.build:58:5: ERROR: configuration_data.set10 got unknown keyword arguments "Description" +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 55054f441..8c93be9d1 100644 +--- a/meson.build ++++ b/meson.build +@@ -55,7 +55,7 @@ lib_name = meson.project_name() + '-' + api_version + stability_version_number = (major_version != 0 ? minor_version : micro_version) + stable = (stability_version_number % 2 == 0) + +-conf.set10('BABL_UNSTABLE', not stable, Description: ++conf.set10('BABL_UNSTABLE', not stable, description: + 'Define to 1 if this is an unstable version of BABL.') + + conf.set ('BABL_MAJOR_VERSION', '@0@'.format(major_version)) +-- +GitLab + From dba94703b58f94087b8edb3b4a899f2632b62af5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 16:33:02 +0100 Subject: [PATCH 0650/2369] cawbird: fix for meson 0.62 --- srcpkgs/cawbird/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template index a307ed212e5..85c5d621bcc 100644 --- a/srcpkgs/cawbird/template +++ b/srcpkgs/cawbird/template @@ -3,7 +3,7 @@ pkgname=cawbird version=1.3.2 revision=2 build_style=meson -hostmakedepends="glib-devel pkg-config vala" +hostmakedepends="glib-devel pkg-config vala gettext" makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel json-glib-devel libglib-devel liboauth-devel libsoup-devel rest-devel sqlite-devel" From 192aa8a51f7afb871f25e41c2e9a92905fd4b908 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 16:54:30 +0100 Subject: [PATCH 0651/2369] clipped: fix for meson 0.62 --- srcpkgs/clipped/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/clipped/template b/srcpkgs/clipped/template index 3ced5834bfc..9386038b3f4 100644 --- a/srcpkgs/clipped/template +++ b/srcpkgs/clipped/template @@ -3,7 +3,7 @@ pkgname=clipped version=1.1.1 revision=1 build_style=meson -hostmakedepends="vala pkg-config" +hostmakedepends="vala pkg-config gettext" makedepends="libgee08-devel libXtst-devel sqlite-devel gtk+3-devel" short_desc="Clipboard manager" maintainer="Daniel Lewan " From 97e7420a7ae77938a4d685cd060217746784afab Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 18:01:30 +0100 Subject: [PATCH 0652/2369] eolie: fix for meson 0.62 --- srcpkgs/eolie/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/eolie/template b/srcpkgs/eolie/template index 52c0f08d2f4..d709b2c7cfc 100644 --- a/srcpkgs/eolie/template +++ b/srcpkgs/eolie/template @@ -6,7 +6,7 @@ _eolie_hash=bb4aad19272cc636bd17f2f6602127fe build_style=meson pycompile_module="eolie" hostmakedepends="appstream-glib desktop-file-utils glib-devel pkg-config - gobject-introspection python3-MarkupSafe" + gobject-introspection python3-MarkupSafe gettext" makedepends="gtk+3-devel libglib-devel python3-gobject-devel webkit2gtk-devel" depends="gtkspell3 python3-dateutil python3-gobject webkit2gtk python3-PyFxA" short_desc="Web browser for GNOME" From 2f9893cca8d9497531e73c2af121b23c607de759 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 19:03:54 +0100 Subject: [PATCH 0653/2369] gamehub: fix for meson 0.62 --- srcpkgs/gamehub/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template index e8f110b3eb8..7e8b35ef9af 100644 --- a/srcpkgs/gamehub/template +++ b/srcpkgs/gamehub/template @@ -4,7 +4,7 @@ version=0.16.1 revision=1 wrksrc="GameHub-${version}-2-master" build_style=meson -hostmakedepends="glib-devel pkg-config vala" +hostmakedepends="glib-devel pkg-config vala gettext" makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel libgee08-devel libsoup-devel sqlite-devel libxml2-devel polkit-devel libmanette-devel libX11-devel libXtst-devel" From b2cc876b09b7a0078cbfa072393b990f5a3c8cfd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 27 Mar 2022 09:57:24 +0200 Subject: [PATCH 0654/2369] gnome-multi-writer: fix for meson 0.62 --- srcpkgs/gnome-multi-writer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-multi-writer/template b/srcpkgs/gnome-multi-writer/template index 7d0e5085a6a..cc21737d060 100644 --- a/srcpkgs/gnome-multi-writer/template +++ b/srcpkgs/gnome-multi-writer/template @@ -4,7 +4,7 @@ version=3.32.1 revision=1 build_style=meson build_helper="gir" -hostmakedepends="docbook2mdoc glib-devel pkg-config polkit" +hostmakedepends="docbook2mdoc glib-devel pkg-config polkit gettext" makedepends="gtk+3-devel libgusb-devel udisks2-devel polkit-devel libcanberra-devel" short_desc="Writes ISO files to multiple USB devices at once" maintainer="Enno Boland " From edd3909cdb56bd0e55ffd74c615b523ec4b03439 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 27 Mar 2022 10:46:12 +0200 Subject: [PATCH 0655/2369] gnome-passbook: fix for meson 0.62 --- srcpkgs/gnome-passbook/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template index 7348a194450..30cd8e93b72 100644 --- a/srcpkgs/gnome-passbook/template +++ b/srcpkgs/gnome-passbook/template @@ -5,7 +5,7 @@ revision=3 _release_hash=5fea4e4fc19f1732d3a5270bc43eb8e9 wrksrc="passbook-${version}" build_style=meson -hostmakedepends="glib-devel pkg-config" +hostmakedepends="glib-devel pkg-config gettext" makedepends="gobject-introspection gtk+3-devel libglib-devel" depends="python3-pykeepass python3-gobject gtk+3" short_desc="Password manager for GNOME" From 2e6f4ce6880bf85af92b824803caa8905c07068c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 27 Mar 2022 09:57:42 +0200 Subject: [PATCH 0656/2369] gnome-power-manager: fix for meson 0.62 --- srcpkgs/gnome-power-manager/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template index 58422cd9da3..0c3c1ff4306 100644 --- a/srcpkgs/gnome-power-manager/template +++ b/srcpkgs/gnome-power-manager/template @@ -3,7 +3,7 @@ pkgname=gnome-power-manager version=3.32.0 revision=1 build_style=meson -hostmakedepends="glib-devel pkg-config" +hostmakedepends="glib-devel pkg-config gettext" makedepends="gtk+3-devel upower-devel" depends="desktop-file-utils hicolor-icon-theme upower" short_desc="GNOME power management tool" From 5ea25ad5e910d5b9ce8cc7be1dfd3e54cd954ae4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 27 Mar 2022 14:17:00 +0200 Subject: [PATCH 0657/2369] gupnp-tools: fix for meson 0.62 --- srcpkgs/gupnp-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template index 09507922f46..cad194d50f8 100644 --- a/srcpkgs/gupnp-tools/template +++ b/srcpkgs/gupnp-tools/template @@ -3,7 +3,7 @@ pkgname=gupnp-tools version=0.10.0 revision=2 build_style=meson -hostmakedepends="pkg-config glib-devel gobject-introspection" +hostmakedepends="pkg-config glib-devel gobject-introspection gettext" makedepends="gupnp-av-devel gtk+3-devel gtksourceview4-devel libxml2-devel libsoup-devel" short_desc="Free replacements of Intel UPnP tools that use GUPnP" From 249ccb435febe9f0a5ab883c0a628714ec6673d2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 27 Mar 2022 17:33:58 +0200 Subject: [PATCH 0658/2369] io.elementary.icons: fix for meson 0.62 --- srcpkgs/io.elementary.icons/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template index 95dbc0ca3dd..1e1945d0bb7 100644 --- a/srcpkgs/io.elementary.icons/template +++ b/srcpkgs/io.elementary.icons/template @@ -4,7 +4,7 @@ version=6.1.0 revision=1 wrksrc="icons-${version}" build_style=meson -hostmakedepends="xcursorgen librsvg-utils" +hostmakedepends="xcursorgen librsvg-utils gettext" # gdk-pixbuf needs librsvg to render SVG icons depends="librsvg" short_desc="Named, vector icons for elementary OS" From 935eee326369ad5ec3012f5dc40093dc4ae59a36 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 27 Mar 2022 17:34:06 +0200 Subject: [PATCH 0659/2369] quickDocs: fix for meson 0.62 --- srcpkgs/quickDocs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template index c4a22e6bbe7..b2cbb667c8d 100644 --- a/srcpkgs/quickDocs/template +++ b/srcpkgs/quickDocs/template @@ -3,7 +3,7 @@ pkgname=quickDocs version=2.2.6 revision=2 build_style=meson -hostmakedepends="vala pkg-config" +hostmakedepends="vala pkg-config gettext" makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel" short_desc="Fast developer docs reader" maintainer="Daniel Lewan " From 34ce8314477588adcb1e9361c0edc59c17a698b0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 27 Mar 2022 17:33:51 +0200 Subject: [PATCH 0660/2369] rygel: fix for meson 0.62 --- srcpkgs/rygel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template index 06c85e2bcf4..1493b825a56 100644 --- a/srcpkgs/rygel/template +++ b/srcpkgs/rygel/template @@ -6,7 +6,7 @@ build_style=meson build_helper="gir" configure_args="-Dexamples=false -Dtests=false -Dsystemd-user-units-dir=none" -hostmakedepends="pkg-config glib-devel vala docbook2x" +hostmakedepends="pkg-config glib-devel vala docbook2x gettext" makedepends="sqlite-devel gtk+3-devel libsoup-devel libgee08-devel gupnp-av-devel gupnp-dlna-devel tracker3-devel libmediaart-devel gssdp-devel gst1-editing-services-devel" From a2669275e1690e13c7eee6f22163d8e2321ce3c3 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 11:40:31 -0400 Subject: [PATCH 0661/2369] LimeSuite: update maintainer email --- srcpkgs/LimeSuite/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template index 44f119784ff..11e0af2aa63 100644 --- a/srcpkgs/LimeSuite/template +++ b/srcpkgs/LimeSuite/template @@ -28,7 +28,7 @@ makedepends="gnuplot wxWidgets-gtk3-devel libusb-devel SoapySDR-devel libfreeglu fltk-devel glew-devel sqlite-devel libgomp-devel $(vopt_if octave octave)" depends="wget" short_desc="Driver and GUI for LimeSDR/LMS7002M-based SDR platforms" -maintainer="classabbyamp " +maintainer="classabbyamp " license="Apache-2.0" homepage="https://myriadrf.org/projects/lime-suite/" distfiles="https://github.com/myriadrf/LimeSuite/archive/refs/tags/v${version}.tar.gz" From 95c96f9ae2625368aeaaee87b3abf0928353b8d2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 11:40:32 -0400 Subject: [PATCH 0662/2369] chezmoi: update maintainer email --- srcpkgs/chezmoi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index abf8ff70d40..2f0fb2f144b 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -8,7 +8,7 @@ go_build_tags="noembeddocs noupgrade" go_ldflags="-X main.version=${version} -X main.commit=v${version} -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ) -X main.builtBy=xbps" short_desc="Manage your dotfiles across multiple machines, securely" -maintainer="classabbyamp " +maintainer="classabbyamp " license="MIT" homepage="https://chezmoi.io/" distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz" From 9e02bea589d624415602782a086d4c2a39c8513b Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 11:40:33 -0400 Subject: [PATCH 0663/2369] helvum: update maintainer email --- srcpkgs/helvum/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template index 5a694dc43c2..6c5e27bfefc 100644 --- a/srcpkgs/helvum/template +++ b/srcpkgs/helvum/template @@ -7,7 +7,7 @@ hostmakedepends="pkg-config clang libclang" makedepends="gtk4-devel pipewire-devel glib-devel" depends="pipewire" short_desc="GTK patchbay for pipewire" -maintainer="classabbyamp " +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" From 6d369b2a065f59216959b7840571d55031903b8d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 11:40:34 -0400 Subject: [PATCH 0664/2369] hobbits: update maintainer email --- srcpkgs/hobbits/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template index 42f5c20ce13..fe6c7f5adda 100644 --- a/srcpkgs/hobbits/template +++ b/srcpkgs/hobbits/template @@ -6,7 +6,7 @@ build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake python3" makedepends="fftw-devel libusb-devel libpcap-devel python3-devel qt5-devel" short_desc="Multi-platform GUI for bit-based analysis, processing and visualization" -maintainer="classabbyamp " +maintainer="classabbyamp " license="MIT, GPL-2.0-or-later" homepage="https://mahlet-inc.github.io" changelog="https://raw.githubusercontent.com/Mahlet-Inc/hobbits/master/CHANGELOG.md" From fe3b12f9bb1a7e9021afcad53ebf2169a6126f29 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 11:40:34 -0400 Subject: [PATCH 0665/2369] mininet: update maintainer email --- srcpkgs/mininet/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mininet/template b/srcpkgs/mininet/template index 18862aeebdf..2ea62ca31ea 100644 --- a/srcpkgs/mininet/template +++ b/srcpkgs/mininet/template @@ -7,7 +7,7 @@ hostmakedepends="help2man python3-setuptools" depends="bash ethtool inetutils-telnet iperf iproute2 iputils libcgroup-utils net-tools openssh openvswitch psmisc python3-tkinter socat xbitmaps xhost xterm" short_desc="Emulator for rapid prototyping of Software Defined Networks" -maintainer="classabbyamp " +maintainer="classabbyamp " license="custom:MIT-like" homepage="http://mininet.org/" changelog="http://mininet.org/blog/categories/releases/" From ea9c2db293981cad9536fea709cd91208725d259 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 11:40:35 -0400 Subject: [PATCH 0666/2369] openjdk12-bootstrap: update maintainer email --- srcpkgs/openjdk12-bootstrap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template index 770fce5bb07..4861ad1efc4 100644 --- a/srcpkgs/openjdk12-bootstrap/template +++ b/srcpkgs/openjdk12-bootstrap/template @@ -39,7 +39,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel fontconfig-devel zlib-devel lcms2-devel" provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 12)" -maintainer="classabbyamp " +maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="https://openjdk.java.net" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" From b3dbf348d5e8ffa1f59167dbd2e80ba227c5582d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 11:40:35 -0400 Subject: [PATCH 0667/2369] openjdk13-bootstrap: update maintainer email --- srcpkgs/openjdk13-bootstrap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template index ccbafa36796..82c34b7999f 100644 --- a/srcpkgs/openjdk13-bootstrap/template +++ b/srcpkgs/openjdk13-bootstrap/template @@ -39,7 +39,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel fontconfig-devel zlib-devel lcms2-devel" provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 13)" -maintainer="classabbyamp " +maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="https://openjdk.java.net/" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" From 8b74fb2c7744d980c842d30dd26fc8e51ade18fa Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 11:40:36 -0400 Subject: [PATCH 0668/2369] openjdk14-bootstrap: update maintainer email --- srcpkgs/openjdk14-bootstrap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template index 62011285f35..5c15ca3f32c 100644 --- a/srcpkgs/openjdk14-bootstrap/template +++ b/srcpkgs/openjdk14-bootstrap/template @@ -39,7 +39,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel fontconfig-devel zlib-devel lcms2-devel openjdk13-bootstrap" provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 14)" -maintainer="classabbyamp " +maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" From 852174767ee3eba09814cfcfbb06962d611e5e07 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 11:40:37 -0400 Subject: [PATCH 0669/2369] openjdk15-bootstrap: update maintainer email --- srcpkgs/openjdk15-bootstrap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template index 70b38621be2..efbc69f9429 100644 --- a/srcpkgs/openjdk15-bootstrap/template +++ b/srcpkgs/openjdk15-bootstrap/template @@ -40,7 +40,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk14-bootstrap" provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 15)" -maintainer="classabbyamp " +maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz From a4bd9f5820a8afafacd855b055c95987aae8eb8d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 11:40:37 -0400 Subject: [PATCH 0670/2369] openjdk16-bootstrap: update maintainer email --- srcpkgs/openjdk16-bootstrap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template index 876bfe6de81..9bea476c683 100644 --- a/srcpkgs/openjdk16-bootstrap/template +++ b/srcpkgs/openjdk16-bootstrap/template @@ -40,7 +40,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk15-bootstrap" provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 16)" -maintainer="classabbyamp " +maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz From a7edb3edffe79ecc21fbfe2141c64afc0c47cc31 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 11:40:38 -0400 Subject: [PATCH 0671/2369] openjdk17: update maintainer email --- srcpkgs/openjdk17/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index 43f72e4d65c..19fa38707f0 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -40,7 +40,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel depends="${pkgname}-jre-${version}_${revision}" provides="java-environment-${version}_1" short_desc="OpenJDK Java Development Kit (version ${_java_ver})" -maintainer="classabbyamp " +maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz From db151901d8a84bec49f307ce32812b3f5bb8fbae Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 11:40:38 -0400 Subject: [PATCH 0672/2369] webhook: update maintainer email --- srcpkgs/webhook/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template index fb8b2168566..cf79527f937 100644 --- a/srcpkgs/webhook/template +++ b/srcpkgs/webhook/template @@ -5,7 +5,7 @@ revision=1 build_style=go go_import_path="github.com/adnanh/webhook" short_desc="Lightweight incoming webhook server to run shell commands" -maintainer="Abigail G " +maintainer="Abigail G " license="MIT" homepage="https://github.com/adnanh/webhook" distfiles="https://github.com/adnanh/webhook/archive/${version}.tar.gz" From b7440749b2729c7b8cca088fd8e1cf16bece5179 Mon Sep 17 00:00:00 2001 From: Ramdziana F Y Date: Wed, 6 Apr 2022 18:39:31 +0700 Subject: [PATCH 0673/2369] vivaldi: update to 5.2.2623.24 --- srcpkgs/vivaldi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template index 9108f67a4d2..b7a701c92dd 100644 --- a/srcpkgs/vivaldi/template +++ b/srcpkgs/vivaldi/template @@ -1,6 +1,6 @@ # Template file for 'vivaldi' pkgname=vivaldi -version=5.1.2567.73 +version=5.2.2623.24 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=efc4a4d39724840cbcc78317ef1a0e5e300cb8b9d655defee8e746626f845f12 +checksum=a97eb6f3cfc9b80fd5a2f742b8d0c5af093ab6f5346552c7821129689e2485c0 repository=nonfree restricted=yes nostrip=yes From 89de7311e4e6d981bb4eb9d903df604527b37055 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Fri, 1 Apr 2022 16:18:49 +0200 Subject: [PATCH 0674/2369] yq-go: update to 4.23.1. --- srcpkgs/yq-go/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template index 67a2a5c478c..9342a11e5de 100644 --- a/srcpkgs/yq-go/template +++ b/srcpkgs/yq-go/template @@ -1,6 +1,6 @@ # Template file for 'yq-go' pkgname=yq-go -version=4.21.1 +version=4.23.1 revision=1 wrksrc="yq-${version}" build_style=go @@ -11,14 +11,14 @@ license="MIT" homepage="https://github.com/mikefarah/yq" changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.txt" distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz" -checksum=27ba049e24a2f40db4010ad6574ce866fa1d43f4cb064de286e344e3c7911ef0 +checksum=f55ffb9c6d7926b06d5862eb6a9e9ea942ec2883286df8e2e3d6f0716cc36eed do_check() { go test -v } post_install() { - # this came after yq 'the jq wrapper for yaml' so yq has the right tp + # this came after yq 'the jq wrapper for yaml' so yq has the right to # /usr/bin/yq, rename it to yq-go mv -v "${DESTDIR}"/usr/bin/{yq,yq-go} From 3bbe0b537762fea7e7970ec27670452e71f0b5e3 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 21:55:59 -0400 Subject: [PATCH 0675/2369] arduino: update to 1.8.19. --- .../patches/disable-dependency-build.patch | 225 ------------------ srcpkgs/arduino/template | 4 +- 2 files changed, 2 insertions(+), 227 deletions(-) delete mode 100644 srcpkgs/arduino/patches/disable-dependency-build.patch diff --git a/srcpkgs/arduino/patches/disable-dependency-build.patch b/srcpkgs/arduino/patches/disable-dependency-build.patch deleted file mode 100644 index 6a7144c906c..00000000000 --- a/srcpkgs/arduino/patches/disable-dependency-build.patch +++ /dev/null @@ -1,225 +0,0 @@ ---- Arduino-1.8.13/build/build.xml.orig 2020-12-27 20:34:41.813419495 +0100 -+++ Arduino-1.8.13/build/build.xml 2020-12-27 20:32:58.075425211 +0100 -@@ -345,7 +345,7 @@ - - - -+ property="revision.base"> - - - -@@ -659,14 +659,6 @@ - - - -- -- -- -- -- -- -- -- - - - -@@ -684,14 +676,6 @@ - - - -- -- -- -- -- -- -- -- - - - -@@ -715,26 +699,9 @@ - - - -- -- -- -- -- -- -- -- -- - - - -- -- -- -- -- -- -- -- - - - -@@ -757,15 +724,6 @@ - - - -- -- -- -- -- -- -- -- -- - - - -@@ -775,15 +733,6 @@ - - - -- -- -- -- -- -- -- -- -- - - - -@@ -793,15 +742,6 @@ - - - -- -- -- -- -- -- -- -- -- - - - -@@ -936,7 +876,7 @@ - - - -+ description="Build .tar.xz of linux version"> - - - -@@ -960,23 +900,23 @@ - - - -+ description="Build .tar.xz of linux x86_32 version" /> - - -+ description="Build .tar.xz of linux x86_64 version" /> - - -+ description="Build .tar.xz of linux armhf version" /> - - -+ description="Build .tar.xz of linux aarch64 version" /> - - - - - - -+ description="Clean windows version"> - - - -@@ -1014,8 +954,8 @@ - - - -+ depends="revision-check, windows-checkos, subprojects-build" -+ description="Build windows version"> - - - -@@ -1130,12 +1070,12 @@ - - - -+ classname="net.sf.launch4j.ant.Launch4jTask" -+ classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" /> - - - -+ includes="application.ico, config.xml, config_debug.xml, arduino.l4j.ini, wrapper-manifest.xml"/> - - - -@@ -1206,22 +1146,22 @@ - - - -+ description="Build .tar.gz of source code"> - -+ addproperty="version" -+ defaultvalue="${revision}" /> - - - -+ prefix="arduino-${version}" -+ excludes="**/*.tgz, -+ **/*.bz2, -+ **/build/macosx/, -+ **/build/windows/, -+ **/work/, -+ **/.git/, -+ **/*.class" -+ /> - - - -@@ -1239,7 +1179,7 @@ - - - -+ depends="linux-clean, windows-clean, macosx-clean, subprojects-clean"> - - - diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template index 5d6531ec93f..19daa0c1b1e 100644 --- a/srcpkgs/arduino/template +++ b/srcpkgs/arduino/template @@ -1,6 +1,6 @@ # Template file for 'arduino' pkgname=arduino -version=1.8.13 +version=1.8.19 revision=1 archs="x86_64* i686* aarch64* arm*" wrksrc=$pkgname-$version @@ -15,7 +15,7 @@ homepage="http://arduino.cc/" distfiles=" https://github.com/arduino/Arduino/archive/${version}.tar.gz ${SOURCEFORGE_SITE}/astyle/astyle_3.0.1_linux.tar.gz" -checksum="2a2a7bf0a93d36dff2e27f50e490529f10ff73337d6a0b7b222fa6b1a529c9f7 +checksum="17839eb2a9bc7aeed3bb2a315898efdb3075ed605f98210b4a2d3b54199cc571 6c3ab029e0e4a75e2e603d449014374aa8269218fdd03a4aaa46ab743b1912fd" nostrip=yes nocross="cross build lacks essential libraries" From 04f1becae30d86600ecce18fe3e2563db55b8477 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 21:46:52 -0400 Subject: [PATCH 0676/2369] apache-storm: update to 2.4.0. --- srcpkgs/apache-storm/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template index bcb06f4ee08..7167174dd07 100644 --- a/srcpkgs/apache-storm/template +++ b/srcpkgs/apache-storm/template @@ -1,14 +1,14 @@ # Template file for 'apache-storm' pkgname=apache-storm -version=2.2.0 -revision=3 +version=2.4.0 +revision=1 depends="virtual?java-runtime python3 bash" short_desc="Distributed realtime computation system" maintainer="bougyman " license="Apache-2.0" homepage="https://storm.apache.org/" distfiles="http://apache.osuosl.org/storm/apache-storm-${version}/apache-storm-${version}.tar.gz" -checksum=f621163f349a8e85130bc3d2fbb34e3b08f9c039ccac5474f3724e47a3a38675 +checksum=54535c68848f05130647997f3fafe91a72bb9470a50d6d80997274d20cf1c0c6 python_version=3 system_accounts="storm" storm_homedir="/var/lib/apache-storm" From a852533adfbc6bd08eadb764e304a06ec7173b43 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 22 Mar 2022 02:07:12 -0400 Subject: [PATCH 0677/2369] sunxi-tools: update to 1.4.2, adopt. --- srcpkgs/sunxi-tools/template | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/srcpkgs/sunxi-tools/template b/srcpkgs/sunxi-tools/template index f4f547c7947..001d8385124 100644 --- a/srcpkgs/sunxi-tools/template +++ b/srcpkgs/sunxi-tools/template @@ -1,31 +1,17 @@ # Template file for 'sunxi-tools' pkgname=sunxi-tools -reverts=20150526_1 -version=20150226 -revision=3 -_commit=b80e7ce7bd5c2015465c2fd0e5990d47c05c7f8e -wrksrc="$pkgname-$_commit" -hostmakedepends="pkg-config git" +reverts="20140125_1 20150226_1 20150226_2 20150226_3 20150526_1" +version=1.4.2 +revision=1 +build_style="gnu-makefile" +make_build_target="tools misc" +make_install_target="install-tools install-misc" +hostmakedepends="pkg-config" makedepends="libusb-devel" short_desc="Tools to help hacking Allwinner AXX (aka sunxi) based devices" -maintainer="Orphaned " +maintainer="classabbyamp " license="GPL-2.0-or-later" homepage="https://github.com/linux-sunxi/sunxi-tools" -distfiles="$homepage/archive/$_commit.tar.gz" -checksum=93922d654df5153d468b0f7900f96fe858fe457894ff2dd0f5dfb5c94b65475b - -CFLAGS="-std=c99 -I./include" - -do_build() { - make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" -} -do_install() { - vinstall README 644 usr/share/doc/${pkgname} - - for f in fexc bootinfo fel usb-boot fel-gpio pio nand-part; do - vbin ${f} - done - cd ${DESTDIR}/usr/bin - ln -s fexc fex2bin - ln -s fexc bin2fex -} +distfiles="https://github.com/linux-sunxi/sunxi-tools/archive/refs/tags/v${version}.tar.gz" +checksum=81f48014a520cb83cac4e17f5ae627a637c4d6a422b60c693c5a705c92e43822 +make_check=no # it's a mess From e36eb3c533de8ef543c9722ab514e468818f6abc Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 6 Apr 2022 19:46:43 +0200 Subject: [PATCH 0678/2369] u-boot-tools: update to 2022.04. --- srcpkgs/u-boot-tools/template | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template index a25b02b4e51..d6aea6282b4 100644 --- a/srcpkgs/u-boot-tools/template +++ b/srcpkgs/u-boot-tools/template @@ -1,19 +1,19 @@ # Template file for 'u-boot-tools' pkgname=u-boot-tools -version=2022.01 +version=2022.04 revision=1 wrksrc="u-boot-${version}" build_style=gnu-makefile -make_build_args="HOSTSTRIP=: STRIP=:" -make_build_target="tools envtools" -hostmakedepends="bison flex" -makedepends="openssl-devel" +make_build_args="HOSTSTRIP=: STRIP=: NO_SDL=1" +make_build_target="tools-all tools-only envtools" +hostmakedepends="bison flex which" +makedepends="openssl-devel libuuid-devel gnutls-devel ncurses-libtinfo-devel" short_desc="Das U-Boot tools" maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://www.denx.de/wiki/U-Boot/" distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2" -checksum=81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 +checksum=68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0 if [ "$CROSS_BUILD" ]; then make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-" @@ -39,12 +39,14 @@ do_check() { do_install() { ln -sf fw_printenv tools/env/fw_setenv - for x in dumpimage fdtgrep fit_check_sign fit_info gen_eth_addr \ - gen_ethaddr_crc ifwitool img2srec mkenvimage mkimage proftool \ - spl_size_limit env/fw_printenv env/fw_setenv; do + for x in bmp_logo dumpimage fdtgrep fit_check_sign fit_info gen_eth_addr \ + gen_ethaddr_crc ifwitool img2srec kwboot mkeficapsule mkenvimage mkimage \ + proftool spl_size_limit env/fw_printenv env/fw_setenv; do vbin "tools/$x" + if [ -r "doc/${x}.1" ]; then + vman "doc/${x}.1" + fi done - vman doc/mkimage.1 } uboot-mkimage_package() { From 2d0f692abc4d99389a33da665f971799fabbcf54 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 5 Apr 2022 21:09:12 -0400 Subject: [PATCH 0679/2369] cpp-utilities: update to 5.14.0. --- srcpkgs/cpp-utilities/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template index 80d9c322855..e4b44dd0baf 100644 --- a/srcpkgs/cpp-utilities/template +++ b/srcpkgs/cpp-utilities/template @@ -1,6 +1,6 @@ # Template file for 'cpp-utilities' pkgname=cpp-utilities -version=5.13.0 +version=5.14.0 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" @@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/cpp-utilities" distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz" -checksum=6ddca61b4ff38785a927eb5e2491e2edbf00eb8d003360f46f247cbb18eab970 +checksum=7a173bb2355a9b5fef17d3fe6795f026f58afe63b1295f8567c042422e2cde0e cpp-utilities-devel_package() { short_desc+=" - development files" From ce5466dd56621e397b7fc65912b37325dbd7384d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 5 Apr 2022 21:09:45 -0400 Subject: [PATCH 0680/2369] qtutilities: update to 6.6.0. --- srcpkgs/qtutilities/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template index 8a7a238bc5b..d0e2622414d 100644 --- a/srcpkgs/qtutilities/template +++ b/srcpkgs/qtutilities/template @@ -1,6 +1,6 @@ # Template file for 'qtutilities' pkgname=qtutilities -version=6.5.3 +version=6.6.0 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/qtutilities" distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz" -checksum=17b5bf0db407ff1408ba1d2be6be3fc80de5dbd3fab78f6a66f55b6c4c0b6e22 +checksum=2dda37fd6e1cd957f0a2b395ce424ca23cfc893310c0cebc82d89dc960239d13 qtutilities-devel_package() { short_desc+=" - development files" From 1cfa443b467bb5832907f2c9553aaea39ebc8d09 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 5 Apr 2022 21:10:02 -0400 Subject: [PATCH 0681/2369] tagparser: update to 11.1.0. --- srcpkgs/tagparser/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template index 1ca3a1761bc..494b83e203e 100644 --- a/srcpkgs/tagparser/template +++ b/srcpkgs/tagparser/template @@ -1,6 +1,6 @@ # Template file for 'tagparser' pkgname=tagparser -version=11.0.0 +version=11.1.0 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/tagparser" distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz" -checksum=be31354dbf3cf7342de68d28f1a0ba4bd1464e312b661383fe2b0d8abdbe3e32 +checksum=dc3bd56ee7ddd3220062d2637b89dffc27747c3027c4b223a4697d693e55e2f1 tagparser-devel_package() { short_desc+=" - development files" From 55c68472889bd5afbabcf3824032fcfac652d308 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 5 Apr 2022 21:10:45 -0400 Subject: [PATCH 0682/2369] tageditor: update to 3.7.0. --- srcpkgs/tageditor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template index 52b5fc0057b..0f9ad2024a6 100644 --- a/srcpkgs/tageditor/template +++ b/srcpkgs/tageditor/template @@ -1,6 +1,6 @@ # Template file for 'tageditor' pkgname=tageditor -version=3.6.1 +version=3.7.0 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/tageditor" distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz" -checksum=98ad461669e4528f6eb74d3b0c7a29401a0bb90a68bc63a4b60060ec02889b09 +checksum=e3814efdb9ca9bc386b51c602f8f4f507e8698ecdaf39a5849ed1795ddaa5c38 build_options="qt webengine webkit script" build_options_default="qt" From 8789198b589166f152511779c2fd41c4049c5a77 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 5 Apr 2022 21:18:38 -0400 Subject: [PATCH 0683/2369] openmpi: update to 4.1.3. --- srcpkgs/openmpi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template index 1ed46e52321..08dc6cface8 100644 --- a/srcpkgs/openmpi/template +++ b/srcpkgs/openmpi/template @@ -1,6 +1,6 @@ # Template file for 'openmpi' pkgname=openmpi -version=4.1.2 +version=4.1.3 revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr @@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://www.open-mpi.org/" distfiles="${homepage}/software/ompi/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2" -checksum=9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527 +checksum=3d81d04c54efb55d3871a465ffb098d8d72c1f48ff1cbaf2580eb058567c0a3b nocross="configure attempts to run target binaries" lib32disabled=yes From 4560508470d7ab66d2c249e49f5d43ee804d9d6f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 5 Apr 2022 21:19:52 -0400 Subject: [PATCH 0684/2369] python3-Pillow: update to 9.1.0. --- srcpkgs/python3-Pillow/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template index 7fb866d05e7..f0df1881e24 100644 --- a/srcpkgs/python3-Pillow/template +++ b/srcpkgs/python3-Pillow/template @@ -1,6 +1,6 @@ # Template file for 'python3-Pillow' pkgname=python3-Pillow -version=9.0.1 +version=9.1.0 revision=1 wrksrc="Pillow-${version}" build_style=python3-module @@ -15,7 +15,7 @@ license="custom:PIL" homepage="https://python-pillow.org" changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst" distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz" -checksum=6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa +checksum=f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97 post_install() { vlicense LICENSE From 0f4887548d64b85be90115f0ce3cb0d3797841a7 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 5 Apr 2022 21:24:10 -0400 Subject: [PATCH 0685/2369] python3-aioamqp: update to 0.15.0. --- .../patches/01-python-3.10.patch | 345 ------------- .../patches/02-pamqp-3.1.0.patch | 469 ------------------ srcpkgs/python3-aioamqp/template | 6 +- 3 files changed, 3 insertions(+), 817 deletions(-) delete mode 100644 srcpkgs/python3-aioamqp/patches/01-python-3.10.patch delete mode 100644 srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch diff --git a/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch b/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch deleted file mode 100644 index 8d369bf7a6d..00000000000 --- a/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch +++ /dev/null @@ -1,345 +0,0 @@ -From a3ab4768a13540e8c8f566bca990a98f96cb3802 Mon Sep 17 00:00:00 2001 -From: dzen -Date: Thu, 5 Mar 2020 14:40:50 +0100 -Subject: [PATCH 1/2] Support newer Python - -Combines upstream commits to suppress asyncio deprecations: -- f004c52 -- 388d38f -- 0cdfe91 -- b4f0120 -- 23d84ca ---- - .travis.yml | 6 ++--- - Dockerfile | 2 +- - aioamqp/__init__.py | 4 ++-- - aioamqp/channel.py | 4 ++-- - aioamqp/protocol.py | 33 ++++++++++++++------------ - aioamqp/tests/test_basic.py | 2 +- - aioamqp/tests/test_connection_close.py | 2 +- - aioamqp/tests/test_connection_lost.py | 2 +- - aioamqp/tests/test_protocol.py | 4 ++-- - docs/changelog.rst | 4 ++++ - docs/introduction.rst | 2 +- - setup.cfg | 2 +- - setup.py | 2 +- - tox.ini | 2 +- - 14 files changed, 39 insertions(+), 32 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index 1069e7c..9d6e4ef 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -1,10 +1,10 @@ - language: python --dist: bionic -+dist: focal - python: --- 3.5 - - 3.6 --- 3.7-dev -+- 3.7 - - 3.8 -+- 3.9 - services: - - rabbitmq - env: -diff --git a/Dockerfile b/Dockerfile -index 7ec4545..1ea92f1 100644 ---- a/Dockerfile -+++ b/Dockerfile -@@ -1,4 +1,4 @@ --FROM python:3.5 -+FROM python:3.9 - - WORKDIR /usr/src/app - -diff --git a/aioamqp/__init__.py b/aioamqp/__init__.py -index 3e67936..030e7db 100644 ---- a/aioamqp/__init__.py -+++ b/aioamqp/__init__.py -@@ -10,7 +10,7 @@ from .version import __packagename__ - - - async def connect(host='localhost', port=None, login='guest', password='guest', -- virtualhost='/', ssl=None, login_method='AMQPLAIN', insist=False, -+ virtualhost='/', ssl=None, login_method='PLAIN', insist=False, - protocol_factory=AmqpProtocol, *, loop=None, **kwargs): - """Convenient method to connect to an AMQP broker - -@@ -69,7 +69,7 @@ async def connect(host='localhost', port=None, login='guest', password='guest', - - - async def from_url( -- url, login_method='AMQPLAIN', insist=False, protocol_factory=AmqpProtocol, **kwargs): -+ url, login_method='PLAIN', insist=False, protocol_factory=AmqpProtocol, **kwargs): - """ Connect to the AMQP using a single url parameter and return the client. - - For instance: -diff --git a/aioamqp/channel.py b/aioamqp/channel.py -index 7f0f402..b58bd5a 100644 ---- a/aioamqp/channel.py -+++ b/aioamqp/channel.py -@@ -31,7 +31,7 @@ class Channel: - self.cancellation_callbacks = [] - self.return_callback = return_callback - self.response_future = None -- self.close_event = asyncio.Event(loop=self._loop) -+ self.close_event = asyncio.Event() - self.cancelled_consumers = set() - self.last_consumer_tag = None - self.publisher_confirms = False -@@ -518,7 +518,7 @@ class Channel: - } - future = self._get_waiter('basic_consume' + ctag) - future.set_result(results) -- self._ctag_events[ctag] = asyncio.Event(loop=self._loop) -+ self._ctag_events[ctag] = asyncio.Event() - - async def basic_deliver(self, frame): - consumer_tag = frame.consumer_tag -diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py -index ddf1285..4938833 100644 ---- a/aioamqp/protocol.py -+++ b/aioamqp/protocol.py -@@ -79,8 +79,8 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - self.connection_tunning['heartbeat'] = kwargs.get('heartbeat') - - self.connecting = asyncio.Future(loop=self._loop) -- self.connection_closed = asyncio.Event(loop=self._loop) -- self.stop_now = asyncio.Future(loop=self._loop) -+ self.connection_closed = asyncio.Event() -+ self.stop_now = asyncio.Event() - self.state = CONNECTING - self.version_major = None - self.version_minor = None -@@ -91,14 +91,14 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - self.server_heartbeat = None - self._heartbeat_timer_recv = None - self._heartbeat_timer_send = None -- self._heartbeat_trigger_send = asyncio.Event(loop=self._loop) -+ self._heartbeat_trigger_send = asyncio.Event() - self._heartbeat_worker = None - self.channels = {} - self.server_frame_max = None - self.server_channel_max = None - self.channels_ids_ceil = 0 - self.channels_ids_free = set() -- self._drain_lock = asyncio.Lock(loop=self._loop) -+ self._drain_lock = asyncio.Lock() - - def connection_made(self, transport): - super().connection_made(transport) -@@ -171,16 +171,13 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - await self.wait_closed(timeout=timeout) - - async def wait_closed(self, timeout=None): -- await asyncio.wait_for(self.connection_closed.wait(), timeout=timeout, loop=self._loop) -+ await asyncio.wait_for(self.connection_closed.wait(), timeout=timeout) - if self._heartbeat_worker is not None: - try: -- await asyncio.wait_for(self._heartbeat_worker, timeout=timeout, loop=self._loop) -+ await asyncio.wait_for(self._heartbeat_worker, timeout=timeout) - except asyncio.CancelledError: - pass - -- async def close_ok(self, frame): -- self._stream_writer.close() -- - async def start_connection(self, host, port, login, password, virtualhost, ssl=False, - login_method='PLAIN', insist=False): - """Initiate a connection at the protocol level -@@ -188,7 +185,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - """ - - if login_method != 'PLAIN': -- logger.warning('only PLAIN login_method is supported, falling back to AMQPLAIN') -+ logger.warning('login_method %s is not supported, falling back to PLAIN', login_method) - - self._stream_writer.write(amqp_constants.PROTOCOL_HEADER) - -@@ -311,12 +308,12 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - channel.connection_closed(reply_code, reply_text, exception) - - async def run(self): -- while not self.stop_now.done(): -+ while not self.stop_now.is_set(): - try: - await self.dispatch_frame() - except exceptions.AmqpClosedConnection as exc: - logger.info("Close connection") -- self.stop_now.set_result(None) -+ self.stop_now.set() - - self._close_channels(exception=exc) - except Exception: # pylint: disable=broad-except -@@ -329,7 +326,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - the rest of the AmqpProtocol class. This is kept around for backwards - compatibility purposes only. - """ -- await self.stop_now -+ await self.stop_now.wait() - - async def send_heartbeat(self): - """Sends an heartbeat message. -@@ -403,6 +400,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - ) - await self._write_frame(0, request) - -+ async def close_ok(self, frame): -+ """In response to server close confirmation""" -+ self.stop_now.set() -+ self._stream_writer.close() -+ - async def server_close(self, frame): - """The server is closing the connection""" - self.state = CLOSING -@@ -414,6 +416,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - reply_text, reply_code, class_id, method_id) - self._close_channels(reply_code, reply_text) - await self._close_ok() -+ self.stop_now.set() - self._stream_writer.close() - - async def _close_ok(self): -@@ -456,11 +459,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - await self.ensure_open() - try: - channel_id = self.channels_ids_free.pop() -- except KeyError: -+ except KeyError as ex: - assert self.server_channel_max is not None, 'connection channel-max tuning not performed' - # channel-max = 0 means no limit - if self.server_channel_max and self.channels_ids_ceil > self.server_channel_max: -- raise exceptions.NoChannelAvailable() -+ raise exceptions.NoChannelAvailable() from ex - self.channels_ids_ceil += 1 - channel_id = self.channels_ids_ceil - channel = self.CHANNEL_FACTORY(self, channel_id, **kwargs) -diff --git a/aioamqp/tests/test_basic.py b/aioamqp/tests/test_basic.py -index d59ce19..00ec880 100644 ---- a/aioamqp/tests/test_basic.py -+++ b/aioamqp/tests/test_basic.py -@@ -58,7 +58,7 @@ class BasicCancelTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase): - - result = await self.channel.publish("payload", exchange_name, routing_key='') - -- await asyncio.sleep(5, loop=self.loop) -+ await asyncio.sleep(5) - - result = await self.channel.queue_declare(queue_name, passive=True) - self.assertEqual(result['message_count'], 1) -diff --git a/aioamqp/tests/test_connection_close.py b/aioamqp/tests/test_connection_close.py -index 9491548..c5d4188 100644 ---- a/aioamqp/tests/test_connection_close.py -+++ b/aioamqp/tests/test_connection_close.py -@@ -22,7 +22,7 @@ class CloseTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase): - # TODO: remove with python <3.4.4 support - self.assertTrue(transport._closing) - # make sure those 2 tasks/futures are properly set as finished -- await amqp.stop_now -+ await amqp.stop_now.wait() - await amqp.worker - - async def test_multiple_close(self): -diff --git a/aioamqp/tests/test_connection_lost.py b/aioamqp/tests/test_connection_lost.py -index 21c7819..d16d51b 100644 ---- a/aioamqp/tests/test_connection_lost.py -+++ b/aioamqp/tests/test_connection_lost.py -@@ -24,7 +24,7 @@ class ConnectionLostTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase): - self.assertEqual(amqp.state, OPEN) - self.assertTrue(channel.is_open) - amqp._stream_reader._transport.close() # this should have the same effect as the tcp connection being lost -- await asyncio.wait_for(amqp.worker, 1, loop=self.loop) -+ await asyncio.wait_for(amqp.worker, 1) - self.assertEqual(amqp.state, CLOSED) - self.assertFalse(channel.is_open) - self.assertTrue(self.callback_called) -diff --git a/aioamqp/tests/test_protocol.py b/aioamqp/tests/test_protocol.py -index 766a5d9..80d4187 100644 ---- a/aioamqp/tests/test_protocol.py -+++ b/aioamqp/tests/test_protocol.py -@@ -55,7 +55,7 @@ class ProtocolTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase): - connect.assert_called_once_with( - insist=False, - password='pass', -- login_method='AMQPLAIN', -+ login_method='PLAIN', - login='tom', - host='example.com', - protocol_factory=AmqpProtocol, -@@ -74,7 +74,7 @@ class ProtocolTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase): - connect.assert_called_once_with( - insist=False, - password='pass', -- login_method='AMQPLAIN', -+ login_method='PLAIN', - ssl=ssl_context, - login='tom', - host='example.com', -diff --git a/docs/changelog.rst b/docs/changelog.rst -index 0939ca4..8ac4f7b 100644 ---- a/docs/changelog.rst -+++ b/docs/changelog.rst -@@ -4,6 +4,10 @@ Changelog - Next release - ------------ - -+ * Add support for Python 3.9. -+ * Drop support for Python 3.5. -+ * Fix annoying auth method warning because of a wrong defined default argument (closes #214). -+ - Aioamqp 0.14.0 - -------------- - -diff --git a/docs/introduction.rst b/docs/introduction.rst -index ec86f61..d0e183a 100644 ---- a/docs/introduction.rst -+++ b/docs/introduction.rst -@@ -7,7 +7,7 @@ Aioamqp library is a pure-Python implementation of the AMQP 0.9.1 protocol using - Prerequisites - ------------- - --Aioamqp works only with python >= 3.5 using asyncio library. -+Aioamqp works only with python >= 3.6 using asyncio library. - - Installation - ------------ -diff --git a/setup.cfg b/setup.cfg -index 0ab7d0b..9a9f5ab 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -1,2 +1,2 @@ - [bdist_wheel] --python-tag = py35.py36.py37.py38 -+python-tag = py36.py37.py38.py39 -diff --git a/setup.py b/setup.py -index a740243..ea0e79f 100644 ---- a/setup.py -+++ b/setup.py -@@ -34,10 +34,10 @@ setuptools.setup( - "Operating System :: OS Independent", - "Programming Language :: Python", - "Programming Language :: Python :: 3", -- "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", -+ "Programming Language :: Python :: 3.9", - ], - platforms='all', - license='BSD' -diff --git a/tox.ini b/tox.ini -index 127cc7b..a1f5fcd 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -1,5 +1,5 @@ - [tox] --envlist = py35, py36, py37, py38 -+envlist = py36, py37, py38, py39 - skipsdist = true - skip_missing_interpreters = true - --- -2.34.1 - diff --git a/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch b/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch deleted file mode 100644 index 6f604f6746e..00000000000 --- a/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch +++ /dev/null @@ -1,469 +0,0 @@ -From bb59736dc0127f3bd5b632d0531058f7d98384f1 Mon Sep 17 00:00:00 2001 -From: dzen -Date: Thu, 12 Mar 2020 08:32:29 +0100 -Subject: [PATCH 2/2] Require pamqp 3.1.0 - -Combines upstream commits: -- 6de2e1a -- 95cb160 -- 9f08434 ---- - aioamqp/channel.py | 114 +++++++++++++++++++------------------- - aioamqp/frame.py | 1 - - aioamqp/properties.py | 6 +- - aioamqp/protocol.py | 22 ++++---- - aioamqp/tests/testcase.py | 2 +- - setup.py | 3 +- - 6 files changed, 76 insertions(+), 72 deletions(-) - -diff --git a/aioamqp/channel.py b/aioamqp/channel.py -index b58bd5a..b87392d 100644 ---- a/aioamqp/channel.py -+++ b/aioamqp/channel.py -@@ -9,7 +9,7 @@ import io - from itertools import count - import warnings - --import pamqp.specification -+import pamqp.commands - - from . import frame as amqp_frame - from . import exceptions -@@ -78,35 +78,35 @@ class Channel: - - async def dispatch_frame(self, frame): - methods = { -- pamqp.specification.Channel.OpenOk.name: self.open_ok, -- pamqp.specification.Channel.FlowOk.name: self.flow_ok, -- pamqp.specification.Channel.CloseOk.name: self.close_ok, -- pamqp.specification.Channel.Close.name: self.server_channel_close, -- -- pamqp.specification.Exchange.DeclareOk.name: self.exchange_declare_ok, -- pamqp.specification.Exchange.BindOk.name: self.exchange_bind_ok, -- pamqp.specification.Exchange.UnbindOk.name: self.exchange_unbind_ok, -- pamqp.specification.Exchange.DeleteOk.name: self.exchange_delete_ok, -- -- pamqp.specification.Queue.DeclareOk.name: self.queue_declare_ok, -- pamqp.specification.Queue.DeleteOk.name: self.queue_delete_ok, -- pamqp.specification.Queue.BindOk.name: self.queue_bind_ok, -- pamqp.specification.Queue.UnbindOk.name: self.queue_unbind_ok, -- pamqp.specification.Queue.PurgeOk.name: self.queue_purge_ok, -- -- pamqp.specification.Basic.QosOk.name: self.basic_qos_ok, -- pamqp.specification.Basic.ConsumeOk.name: self.basic_consume_ok, -- pamqp.specification.Basic.CancelOk.name: self.basic_cancel_ok, -- pamqp.specification.Basic.GetOk.name: self.basic_get_ok, -- pamqp.specification.Basic.GetEmpty.name: self.basic_get_empty, -- pamqp.specification.Basic.Deliver.name: self.basic_deliver, -- pamqp.specification.Basic.Cancel.name: self.server_basic_cancel, -- pamqp.specification.Basic.Ack.name: self.basic_server_ack, -- pamqp.specification.Basic.Nack.name: self.basic_server_nack, -- pamqp.specification.Basic.RecoverOk.name: self.basic_recover_ok, -- pamqp.specification.Basic.Return.name: self.basic_return, -- -- pamqp.specification.Confirm.SelectOk.name: self.confirm_select_ok, -+ pamqp.commands.Channel.OpenOk.name: self.open_ok, -+ pamqp.commands.Channel.FlowOk.name: self.flow_ok, -+ pamqp.commands.Channel.CloseOk.name: self.close_ok, -+ pamqp.commands.Channel.Close.name: self.server_channel_close, -+ -+ pamqp.commands.Exchange.DeclareOk.name: self.exchange_declare_ok, -+ pamqp.commands.Exchange.BindOk.name: self.exchange_bind_ok, -+ pamqp.commands.Exchange.UnbindOk.name: self.exchange_unbind_ok, -+ pamqp.commands.Exchange.DeleteOk.name: self.exchange_delete_ok, -+ -+ pamqp.commands.Queue.DeclareOk.name: self.queue_declare_ok, -+ pamqp.commands.Queue.DeleteOk.name: self.queue_delete_ok, -+ pamqp.commands.Queue.BindOk.name: self.queue_bind_ok, -+ pamqp.commands.Queue.UnbindOk.name: self.queue_unbind_ok, -+ pamqp.commands.Queue.PurgeOk.name: self.queue_purge_ok, -+ -+ pamqp.commands.Basic.QosOk.name: self.basic_qos_ok, -+ pamqp.commands.Basic.ConsumeOk.name: self.basic_consume_ok, -+ pamqp.commands.Basic.CancelOk.name: self.basic_cancel_ok, -+ pamqp.commands.Basic.GetOk.name: self.basic_get_ok, -+ pamqp.commands.Basic.GetEmpty.name: self.basic_get_empty, -+ pamqp.commands.Basic.Deliver.name: self.basic_deliver, -+ pamqp.commands.Basic.Cancel.name: self.server_basic_cancel, -+ pamqp.commands.Basic.Ack.name: self.basic_server_ack, -+ pamqp.commands.Basic.Nack.name: self.basic_server_nack, -+ pamqp.commands.Basic.RecoverOk.name: self.basic_recover_ok, -+ pamqp.commands.Basic.Return.name: self.basic_return, -+ -+ pamqp.commands.Confirm.SelectOk.name: self.confirm_select_ok, - } - - if frame.name not in methods: -@@ -144,7 +144,7 @@ class Channel: - - async def open(self): - """Open the channel on the server.""" -- request = pamqp.specification.Channel.Open() -+ request = pamqp.commands.Channel.Open() - return (await self._write_frame_awaiting_response( - 'open', self.channel_id, request, no_wait=False, check_open=False)) - -@@ -159,7 +159,7 @@ class Channel: - if not self.is_open: - raise exceptions.ChannelClosed("channel already closed or closing") - self.close_event.set() -- request = pamqp.specification.Channel.Close(reply_code, reply_text, class_id=0, method_id=0) -+ request = pamqp.commands.Channel.Close(reply_code, reply_text, class_id=0, method_id=0) - return (await self._write_frame_awaiting_response( - 'close', self.channel_id, request, no_wait=False, check_open=False)) - -@@ -169,7 +169,7 @@ class Channel: - self.protocol.release_channel_id(self.channel_id) - - async def _send_channel_close_ok(self): -- request = pamqp.specification.Channel.CloseOk() -+ request = pamqp.commands.Channel.CloseOk() - await self._write_frame(self.channel_id, request) - - async def server_channel_close(self, frame): -@@ -183,7 +183,7 @@ class Channel: - self.connection_closed(results['reply_code'], results['reply_text']) - - async def flow(self, active): -- request = pamqp.specification.Channel.Flow(active) -+ request = pamqp.commands.Channel.Flow(active) - return (await self._write_frame_awaiting_response( - 'flow', self.channel_id, request, no_wait=False, - check_open=False)) -@@ -201,7 +201,7 @@ class Channel: - - async def exchange_declare(self, exchange_name, type_name, passive=False, durable=False, - auto_delete=False, no_wait=False, arguments=None): -- request = pamqp.specification.Exchange.Declare( -+ request = pamqp.commands.Exchange.Declare( - exchange=exchange_name, - exchange_type=type_name, - passive=passive, -@@ -222,7 +222,7 @@ class Channel: - return future - - async def exchange_delete(self, exchange_name, if_unused=False, no_wait=False): -- request = pamqp.specification.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait) -+ request = pamqp.commands.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait) - return await self._write_frame_awaiting_response( - 'exchange_delete', self.channel_id, request, no_wait) - -@@ -235,7 +235,7 @@ class Channel: - no_wait=False, arguments=None): - if arguments is None: - arguments = {} -- request = pamqp.specification.Exchange.Bind( -+ request = pamqp.commands.Exchange.Bind( - destination=exchange_destination, - source=exchange_source, - routing_key=routing_key, -@@ -255,7 +255,7 @@ class Channel: - if arguments is None: - arguments = {} - -- request = pamqp.specification.Exchange.Unbind( -+ request = pamqp.commands.Exchange.Unbind( - destination=exchange_destination, - source=exchange_source, - routing_key=routing_key, -@@ -297,7 +297,7 @@ class Channel: - - if not queue_name: - queue_name = 'aioamqp.gen-' + str(uuid.uuid4()) -- request = pamqp.specification.Queue.Declare( -+ request = pamqp.commands.Queue.Declare( - queue=queue_name, - passive=passive, - durable=durable, -@@ -327,7 +327,7 @@ class Channel: - if_empty: bool, the queue is deleted if it has no messages. Raise if not. - no_wait: bool, if set, the server will not respond to the method - """ -- request = pamqp.specification.Queue.Delete( -+ request = pamqp.commands.Queue.Delete( - queue=queue_name, - if_unused=if_unused, - if_empty=if_empty, -@@ -346,7 +346,7 @@ class Channel: - if arguments is None: - arguments = {} - -- request = pamqp.specification.Queue.Bind( -+ request = pamqp.commands.Queue.Bind( - queue=queue_name, - exchange=exchange_name, - routing_key=routing_key, -@@ -367,7 +367,7 @@ class Channel: - if arguments is None: - arguments = {} - -- request = pamqp.specification.Queue.Unbind( -+ request = pamqp.commands.Queue.Unbind( - queue=queue_name, - exchange=exchange_name, - routing_key=routing_key, -@@ -383,7 +383,7 @@ class Channel: - logger.debug("Queue unbound") - - async def queue_purge(self, queue_name, no_wait=False): -- request = pamqp.specification.Queue.Purge( -+ request = pamqp.commands.Queue.Purge( - queue=queue_name, nowait=no_wait - ) - return (await self._write_frame_awaiting_response( -@@ -406,7 +406,7 @@ class Channel: - if properties is None: - properties = {} - -- method_request = pamqp.specification.Basic.Publish( -+ method_request = pamqp.commands.Basic.Publish( - exchange=exchange_name, - routing_key=routing_key, - mandatory=mandatory, -@@ -417,7 +417,7 @@ class Channel: - - header_request = pamqp.header.ContentHeader( - body_size=len(payload), -- properties=pamqp.specification.Basic.Properties(**properties) -+ properties=pamqp.commands.Basic.Properties(**properties) - ) - await self._write_frame(self.channel_id, header_request, drain=False) - -@@ -446,7 +446,7 @@ class Channel: - settings should apply per-consumer channel; and global=true to mean - that the QoS settings should apply per-channel. - """ -- request = pamqp.specification.Basic.Qos( -+ request = pamqp.commands.Basic.Qos( - prefetch_size, prefetch_count, connection_global - ) - return (await self._write_frame_awaiting_response( -@@ -490,7 +490,7 @@ class Channel: - if arguments is None: - arguments = {} - -- request = pamqp.specification.Basic.Consume( -+ request = pamqp.commands.Basic.Consume( - queue=queue_name, - consumer_tag=consumer_tag, - no_local=no_local, -@@ -561,7 +561,7 @@ class Channel: - callback, error) - - async def basic_cancel(self, consumer_tag, no_wait=False): -- request = pamqp.specification.Basic.Cancel(consumer_tag, no_wait) -+ request = pamqp.commands.Basic.Cancel(consumer_tag, no_wait) - return (await self._write_frame_awaiting_response( - 'basic_cancel', self.channel_id, request, no_wait=no_wait) - ) -@@ -575,7 +575,7 @@ class Channel: - logger.debug("Cancel ok") - - async def basic_get(self, queue_name='', no_ack=False): -- request = pamqp.specification.Basic.Get(queue=queue_name, no_ack=no_ack) -+ request = pamqp.commands.Basic.Get(queue=queue_name, no_ack=no_ack) - return (await self._write_frame_awaiting_response( - 'basic_get', self.channel_id, request, no_wait=False) - ) -@@ -606,11 +606,11 @@ class Channel: - future.set_exception(exceptions.EmptyQueue) - - async def basic_client_ack(self, delivery_tag, multiple=False): -- request = pamqp.specification.Basic.Ack(delivery_tag, multiple) -+ request = pamqp.commands.Basic.Ack(delivery_tag, multiple) - await self._write_frame(self.channel_id, request) - - async def basic_client_nack(self, delivery_tag, multiple=False, requeue=True): -- request = pamqp.specification.Basic.Nack(delivery_tag, multiple, requeue) -+ request = pamqp.commands.Basic.Nack(delivery_tag, multiple, requeue) - await self._write_frame(self.channel_id, request) - - async def basic_server_ack(self, frame): -@@ -620,15 +620,15 @@ class Channel: - fut.set_result(True) - - async def basic_reject(self, delivery_tag, requeue=False): -- request = pamqp.specification.Basic.Reject(delivery_tag, requeue) -+ request = pamqp.commands.Basic.Reject(delivery_tag, requeue) - await self._write_frame(self.channel_id, request) - - async def basic_recover_async(self, requeue=True): -- request = pamqp.specification.Basic.RecoverAsync(requeue) -+ request = pamqp.commands.Basic.RecoverAsync(requeue) - await self._write_frame(self.channel_id, request) - - async def basic_recover(self, requeue=True): -- request = pamqp.specification.Basic.Recover(requeue) -+ request = pamqp.commands.Basic.Recover(requeue) - return (await self._write_frame_awaiting_response( - 'basic_recover', self.channel_id, request, no_wait=False) - ) -@@ -681,7 +681,7 @@ class Channel: - delivery_tag = next(self.delivery_tag_iter) # pylint: disable=stop-iteration-return - fut = self._set_waiter('basic_server_ack_{}'.format(delivery_tag)) - -- method_request = pamqp.specification.Basic.Publish( -+ method_request = pamqp.commands.Basic.Publish( - exchange=exchange_name, - routing_key=routing_key, - mandatory=mandatory, -@@ -689,7 +689,7 @@ class Channel: - ) - await self._write_frame(self.channel_id, method_request, drain=False) - -- properties = pamqp.specification.Basic.Properties(**properties) -+ properties = pamqp.commands.Basic.Properties(**properties) - header_request = pamqp.header.ContentHeader( - body_size=len(payload), properties=properties - ) -@@ -710,7 +710,7 @@ class Channel: - async def confirm_select(self, *, no_wait=False): - if self.publisher_confirms: - raise ValueError('publisher confirms already enabled') -- request = pamqp.specification.Confirm.Select(nowait=no_wait) -+ request = pamqp.commands.Confirm.Select(nowait=no_wait) - - return (await self._write_frame_awaiting_response( - 'confirm_select', self.channel_id, request, no_wait) -diff --git a/aioamqp/frame.py b/aioamqp/frame.py -index d70cfd7..af27ab5 100644 ---- a/aioamqp/frame.py -+++ b/aioamqp/frame.py -@@ -42,7 +42,6 @@ import asyncio - import socket - - import pamqp.encode --import pamqp.specification - import pamqp.frame - - from . import exceptions -diff --git a/aioamqp/properties.py b/aioamqp/properties.py -index 56a3484..4232040 100644 ---- a/aioamqp/properties.py -+++ b/aioamqp/properties.py -@@ -1,4 +1,6 @@ - # pylint: disable=redefined-builtin -+import datetime -+ - from .constants import MESSAGE_PROPERTIES - - -@@ -37,7 +39,9 @@ def from_pamqp(instance): - props.reply_to = instance.reply_to - props.expiration = instance.expiration - props.message_id = instance.message_id -- props.timestamp = instance.timestamp -+ if instance.timestamp is not None: -+ # pamqp uses naive datetimes representing UTC, let's use TZ-aware datetimes -+ props.timestamp = instance.timestamp.replace(tzinfo=datetime.timezone.utc) - props.message_type = instance.message_type - props.user_id = instance.user_id - props.app_id = instance.app_id -diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py -index 4938833..6465400 100644 ---- a/aioamqp/protocol.py -+++ b/aioamqp/protocol.py -@@ -5,9 +5,9 @@ - import asyncio - import logging - -+import pamqp.commands - import pamqp.frame - import pamqp.heartbeat --import pamqp.specification - - from . import channel as amqp_channel - from . import constants as amqp_constants -@@ -159,7 +159,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - """Close connection (and all channels)""" - await self.ensure_open() - self.state = CLOSING -- request = pamqp.specification.Connection.Close( -+ request = pamqp.commands.Connection.Close( - reply_code=0, - reply_text='', - class_id=0, -@@ -251,11 +251,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - """Dispatch the received frame to the corresponding handler""" - - method_dispatch = { -- pamqp.specification.Connection.Close.name: self.server_close, -- pamqp.specification.Connection.CloseOk.name: self.close_ok, -- pamqp.specification.Connection.Tune.name: self.tune, -- pamqp.specification.Connection.Start.name: self.start, -- pamqp.specification.Connection.OpenOk.name: self.open_ok, -+ pamqp.commands.Connection.Close.name: self.server_close, -+ pamqp.commands.Connection.CloseOk.name: self.close_ok, -+ pamqp.commands.Connection.Tune.name: self.tune, -+ pamqp.commands.Connection.Start.name: self.start, -+ pamqp.commands.Connection.OpenOk.name: self.open_ok, - } - if frame_channel is None and frame is None: - frame_channel, frame = await self.get_frame() -@@ -392,7 +392,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - def credentials(): - return '\0{LOGIN}\0{PASSWORD}'.format(**auth) - -- request = pamqp.specification.Connection.StartOk( -+ request = pamqp.commands.Connection.StartOk( - client_properties=client_properties, - mechanism=mechanism, - locale=locale, -@@ -420,7 +420,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - self._stream_writer.close() - - async def _close_ok(self): -- request = pamqp.specification.Connection.CloseOk() -+ request = pamqp.commands.Connection.CloseOk() - await self._write_frame(0, request) - - async def tune(self, frame): -@@ -429,7 +429,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - self.server_heartbeat = frame.heartbeat - - async def tune_ok(self, channel_max, frame_max, heartbeat): -- request = pamqp.specification.Connection.TuneOk( -+ request = pamqp.commands.Connection.TuneOk( - channel_max, frame_max, heartbeat - ) - await self._write_frame(0, request) -@@ -439,7 +439,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol): - - async def open(self, virtual_host, capabilities='', insist=False): - """Open connection to virtual host.""" -- request = pamqp.specification.Connection.Open( -+ request = pamqp.commands.Connection.Open( - virtual_host, capabilities, insist - ) - await self._write_frame(0, request) -diff --git a/aioamqp/tests/testcase.py b/aioamqp/tests/testcase.py -index 120104b..d6d702b 100644 ---- a/aioamqp/tests/testcase.py -+++ b/aioamqp/tests/testcase.py -@@ -147,7 +147,7 @@ class RabbitTestCaseMixin: - if amqp is None: - amqp = self.amqp - -- server_version = tuple(int(x) for x in amqp.server_properties['version'].decode().split('.')) -+ server_version = tuple(int(x) for x in amqp.server_properties['version'].split('.')) - return server_version - - async def check_exchange_exists(self, exchange_name): -diff --git a/setup.py b/setup.py -index ea0e79f..1d0e923 100644 ---- a/setup.py -+++ b/setup.py -@@ -25,8 +25,9 @@ setuptools.setup( - 'aioamqp', - ], - install_requires=[ -- 'pamqp>=2.2.0,<3', -+ 'pamqp>=3.1.0', - ], -+ python_requires=">=3.6", - classifiers=[ - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", --- -2.34.1 - diff --git a/srcpkgs/python3-aioamqp/template b/srcpkgs/python3-aioamqp/template index e85e1bcdf14..63f195e8534 100644 --- a/srcpkgs/python3-aioamqp/template +++ b/srcpkgs/python3-aioamqp/template @@ -1,7 +1,7 @@ # Template file for 'python3-aioamqp' pkgname=python3-aioamqp -version=0.14.0 -revision=4 +version=0.15.0 +revision=1 wrksrc="aioamqp-aioamqp-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://github.com/polyconseil/aioamqp" distfiles="${homepage}/archive/${pkgname#*-}-${version}.tar.gz" -checksum=9fce69be1ed9bcc06b74683094f738556305215a1affd0fd7789c23a01c53ecd +checksum=4d30fe210c742496b5b78de0337f49524571240701eb6c2dc348b1b9d8f819a9 # Tests require unpackaged asynctest package make_check=no From 318e879de600e3f793ce86ecf63d6bee0b9c72db Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 5 Apr 2022 21:32:20 -0400 Subject: [PATCH 0686/2369] python3-hypothesis: update to 6.41.0. --- srcpkgs/python3-hypothesis/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template index df2addcb45d..d214e0ec6b6 100644 --- a/srcpkgs/python3-hypothesis/template +++ b/srcpkgs/python3-hypothesis/template @@ -1,6 +1,6 @@ # Template file for 'python3-hypothesis' pkgname=python3-hypothesis -version=6.40.0 +version=6.41.0 revision=1 wrksrc="hypothesis-hypothesis-python-${version}" build_wrksrc=hypothesis-python @@ -15,7 +15,7 @@ license="MPL-2.0" homepage="https://hypothesis.works/" changelog="https://hypothesis.readthedocs.io/en/latest/changes.html" distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz" -checksum=e68589666b903461e7437ea49043a7bd09a6e2cfd1cc32970b4ee19ffe2ed434 +checksum=0fa002e65956bedead5149d2ffa5875cbcb5ca1a3f95301fcf2ad5a241829d91 do_check() { # Manually run the tests that tox considers part of the "full" suite, From 8eb08e95240e32ac11363fdf0051d5a5d34c2c8e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 5 Apr 2022 22:43:05 -0400 Subject: [PATCH 0687/2369] python3-pandas: update to 1.4.2. --- srcpkgs/python3-pandas/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template index c538445fc05..b1f2f60e6da 100644 --- a/srcpkgs/python3-pandas/template +++ b/srcpkgs/python3-pandas/template @@ -1,6 +1,6 @@ # Template file for 'python3-pandas' pkgname=python3-pandas -version=1.4.1 +version=1.4.2 revision=1 wrksrc="pandas-${version}" build_style=python3-module @@ -14,7 +14,7 @@ license="BSD-3-Clause" homepage="https://pandas.pydata.org/" changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html" distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz" -checksum=123bf45a5d7fbd2980d2e4c348f6913406970f1558658e7f221324234c6c4825 +checksum=e2d97255e7cd13b3d3931b49f7be50055e02ca6dff60a68e403b125f8f85c4d2 pre_build() { # setup.py allows a -j argument to parallelize builds @@ -26,8 +26,8 @@ do_check() { # S3 tests seem to require python3-pytest-xdist PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest pandas \ --skip-slow --skip-network --skip-db -x -r EX \ - --ignore pandas/tests/io/parser/test_network.py \ - -m 'not single' -k 'not test_raw_roundtrip and not _s3' + --ignore pandas/tests/io/parser/test_network.py -m 'not single' \ + -k 'not test_raw_roundtrip and not _s3 and not test_show_versions' } post_install() { From d33dc9b479b7123eb0a5b792cd588ccb1fa89a29 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 5 Apr 2022 22:45:13 -0400 Subject: [PATCH 0688/2369] python3-pybind11: update to 2.9.2. --- srcpkgs/python3-pybind11/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pybind11/template b/srcpkgs/python3-pybind11/template index 9d757b052b8..b0d551b293e 100644 --- a/srcpkgs/python3-pybind11/template +++ b/srcpkgs/python3-pybind11/template @@ -1,6 +1,6 @@ # Template file for 'python3-pybind11' pkgname=python3-pybind11 -version=2.9.1 +version=2.9.2 revision=1 wrksrc="pybind11-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://github.com/pybind/pybind11" distfiles="https://github.com/pybind/pybind11/archive/v${version}.tar.gz" -checksum=c6160321dc98e6e1184cc791fbeadd2907bb4a0ce0e447f2ea4ff8ab56550913 +checksum=6bd528c4dbe2276635dc787b6b1f2e5316cf6b49ee3e150264e455a0d68d19c1 post_patch() { # These dependencies are not packaged and don't affect the man page From 2e2a3a9f8fc85dda13000db9652708965cbdb121 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 6 Apr 2022 11:45:56 -0400 Subject: [PATCH 0689/2369] python3-prompt_toolkit: update to 3.0.29. --- .../patches/dont-handle-sigint.patch | 51 +++++++++++++++++-- srcpkgs/python3-prompt_toolkit/template | 6 +-- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch b/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch index 60ce287a63d..4bcca9d1692 100644 --- a/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch +++ b/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch @@ -5,9 +5,10 @@ See: - https://github.com/prompt-toolkit/python-prompt-toolkit/issues/1576 - https://trac.sagemath.org/ticket/33360#comment:3 ---- a/prompt_toolkit/application/application.py 2022-02-11 05:06:37.000000000 -0300 -+++ b/prompt_toolkit/application/application.py 2022-02-21 10:43:13.828058001 -0300 -@@ -634,7 +634,7 @@ +diff -ur a/src/prompt_toolkit/application/application.py b/src/prompt_toolkit/application/application.py +--- a/src/prompt_toolkit/application/application.py ++++ b/src/prompt_toolkit/application/application.py +@@ -633,7 +633,7 @@ self, pre_run: Optional[Callable[[], None]] = None, set_exception_handler: bool = True, @@ -16,7 +17,7 @@ See: slow_callback_duration: float = 0.5, ) -> _AppResult: """ -@@ -859,7 +859,7 @@ +@@ -858,7 +858,7 @@ self, pre_run: Optional[Callable[[], None]] = None, set_exception_handler: bool = True, @@ -25,3 +26,45 @@ See: in_thread: bool = False, ) -> _AppResult: """ +diff -ur a/src/prompt_toolkit/application/dummy.py b/src/prompt_toolkit/application/dummy.py +--- a/src/prompt_toolkit/application/dummy.py ++++ b/src/prompt_toolkit/application/dummy.py +@@ -24,7 +24,7 @@ + self, + pre_run: Optional[Callable[[], None]] = None, + set_exception_handler: bool = True, +- handle_sigint: bool = True, ++ handle_sigint: bool = False, + in_thread: bool = False, + ) -> None: + raise NotImplementedError("A DummyApplication is not supposed to run.") +@@ -33,7 +33,7 @@ + self, + pre_run: Optional[Callable[[], None]] = None, + set_exception_handler: bool = True, +- handle_sigint: bool = True, ++ handle_sigint: bool = False, + slow_callback_duration: float = 0.5, + ) -> None: + raise NotImplementedError("A DummyApplication is not supposed to run.") +diff -ur a/src/prompt_toolkit/shortcuts/prompt.py b/src/prompt_toolkit/shortcuts/prompt.py +--- a/src/prompt_toolkit/shortcuts/prompt.py ++++ b/src/prompt_toolkit/shortcuts/prompt.py +@@ -900,7 +900,7 @@ + accept_default: bool = False, + pre_run: Optional[Callable[[], None]] = None, + set_exception_handler: bool = True, +- handle_sigint: bool = True, ++ handle_sigint: bool = False, + in_thread: bool = False, + ) -> _T: + """ +@@ -1135,7 +1135,7 @@ + accept_default: bool = False, + pre_run: Optional[Callable[[], None]] = None, + set_exception_handler: bool = True, +- handle_sigint: bool = True, ++ handle_sigint: bool = False, + ) -> _T: + + if message is not None: diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template index 26bcb33e82b..27fdeb83dab 100644 --- a/srcpkgs/python3-prompt_toolkit/template +++ b/srcpkgs/python3-prompt_toolkit/template @@ -1,7 +1,7 @@ # Template file for 'python3-prompt_toolkit' pkgname=python3-prompt_toolkit -version=3.0.28 -revision=2 +version=3.0.29 +revision=1 wrksrc="prompt_toolkit-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,7 +13,7 @@ license="BSD-3-Clause" homepage="https://github.com/prompt-toolkit/python-prompt-toolkit" changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG" distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz" -checksum=9f1cd16b1e86c2968f2519d7fb31dd9d669916f515612c269d14e9ed52b51650 +checksum=bd640f60e8cecd74f0dc249713d433ace2ddc62b65ee07f96d358e0b152b6ea7 conflicts="python3-prompt_toolkit2<=2.0.9_4" post_install() { From 157ff7e1c96669e8ef96faf5c4e6ac1e500fd0de Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 6 Apr 2022 11:50:08 -0400 Subject: [PATCH 0690/2369] python3-ultrajson: update to 5.2.0. --- .../python3-ultrajson/patches/no-strip.patch | 17 ----------------- srcpkgs/python3-ultrajson/template | 6 ++++-- 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/python3-ultrajson/patches/no-strip.patch diff --git a/srcpkgs/python3-ultrajson/patches/no-strip.patch b/srcpkgs/python3-ultrajson/patches/no-strip.patch deleted file mode 100644 index 50fb8f8339c..00000000000 --- a/srcpkgs/python3-ultrajson/patches/no-strip.patch +++ /dev/null @@ -1,17 +0,0 @@ -Effectively reverts - - https://github.com/ultrajson/ultrajson/commit/682c6601569980e9a8a05378d3c1478db30384bc - -to preserve a meaningful debug package. - ---- a/setup.py -+++ b/setup.py -@@ -20,7 +20,7 @@ - ], - include_dirs=["./python", "./lib", "./deps/double-conversion/double-conversion"], - extra_compile_args=["-D_GNU_SOURCE"], -- extra_link_args=["-lstdc++", "-lm"] + strip_flags, -+ extra_link_args=["-lstdc++", "-lm"], - ) - - with open("python/version_template.h") as f: diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template index 848f27d41e5..e7b0dd021f5 100644 --- a/srcpkgs/python3-ultrajson/template +++ b/srcpkgs/python3-ultrajson/template @@ -1,6 +1,6 @@ # Template file for 'python3-ultrajson' pkgname=python3-ultrajson -version=5.1.0 +version=5.2.0 revision=1 wrksrc="ujson-${version}" build_style=python3-module @@ -13,7 +13,9 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://github.com/ultrajson/ultrajson" distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz" -checksum=a88944d2f99db71a3ca0c63d81f37e55b660edde0b07216fb65a3e46403ef004 +checksum=163191b88842d874e081707d35de2e205e0e396e70fd068d1038879bca8b17ad + +export UJSON_BUILD_NO_STRIP=1 post_install() { vlicense LICENSE.txt From 9627800f6d511b5ecacda9042485beec80fb437c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 6 Apr 2022 20:58:09 +0200 Subject: [PATCH 0691/2369] u-boot-tools: fix cross and musl builds --- srcpkgs/u-boot-tools/patches/musl.patch | 10 ++++++++++ srcpkgs/u-boot-tools/template | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 srcpkgs/u-boot-tools/patches/musl.patch diff --git a/srcpkgs/u-boot-tools/patches/musl.patch b/srcpkgs/u-boot-tools/patches/musl.patch new file mode 100644 index 00000000000..7cf89c52b8f --- /dev/null +++ b/srcpkgs/u-boot-tools/patches/musl.patch @@ -0,0 +1,10 @@ +--- a/tools/termios_linux.h ++++ b/tools/termios_linux.h +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #if defined(BOTHER) && defined(TCGETS2) + #define termios termios2 diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template index d6aea6282b4..e7efda46885 100644 --- a/srcpkgs/u-boot-tools/template +++ b/srcpkgs/u-boot-tools/template @@ -17,6 +17,7 @@ checksum=68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0 if [ "$CROSS_BUILD" ]; then make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-" + hostmakedepends+=" u-boot-tools" fi post_extract() { @@ -25,6 +26,10 @@ post_extract() { -i include/env.h \ -i tools/mkimage.h \ -i tools/proftool.c + + if [ "$CROSS_BUILD" ]; then + vsed -e 's;^\t$(obj)/bmp_logo;\tbmp_logo;g' -i tools/Makefile + fi } do_configure() { From 0359a94ff379bbc33d4ab4864dfdff889d9269dd Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 6 Apr 2022 21:29:45 +0200 Subject: [PATCH 0692/2369] u-boot-tools: fix parallel build issues --- srcpkgs/u-boot-tools/template | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template index e7efda46885..e3908d65dfc 100644 --- a/srcpkgs/u-boot-tools/template +++ b/srcpkgs/u-boot-tools/template @@ -36,6 +36,12 @@ do_configure() { make ${makejobs} ${make_build_args} tools-only_defconfig } +do_build() { + make ${makejobs} ${make_build_args} tools-all + make ${makejobs} ${make_build_args} tools-only + make ${makejobs} ${make_build_args} envtools +} + do_check() { # skip tests for now. requires some gymnastics to make the python scripts # find libfdt. the most useful target appears to be "make tcheck" From 2ec6470af8dc1951962d19a1d883d70e850f8d6c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 6 Apr 2022 22:12:49 +0200 Subject: [PATCH 0693/2369] pylint: update to 2.13.5. --- srcpkgs/pylint/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template index 54af1e2f085..2d53ba7420f 100644 --- a/srcpkgs/pylint/template +++ b/srcpkgs/pylint/template @@ -1,6 +1,6 @@ # Template file for 'pylint' pkgname=pylint -version=2.13.4 +version=2.13.5 revision=1 build_style=python3-module make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py" @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://www.pylint.org/" changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog" distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz" -checksum=34a5550bfe94f4ba04eee95367572224bc16dbd2456b3ece5fb92e15399f6cd8 +checksum=5450fd8014baf1663fb4860b7e1dc4f4c4eb9649598a210d68e97be0973c783f post_install() { # install example config and emacs files From 8f522975719efef92b17cb006edc9e5df4b6a87c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 6 Apr 2022 22:17:27 +0200 Subject: [PATCH 0694/2369] lagrange: update to 1.12.1. --- srcpkgs/lagrange/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template index 41a9f935f8e..16787f411ee 100644 --- a/srcpkgs/lagrange/template +++ b/srcpkgs/lagrange/template @@ -1,6 +1,6 @@ # Template file for 'lagrange' pkgname=lagrange -version=1.11.2 +version=1.12.1 revision=1 build_style=cmake hostmakedepends="pkg-config zip" @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://gmi.skyjake.fi/lagrange/" changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi" distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz" -checksum=4e9a9ed38bcfc7b04856f0e2667d7afd535a8e06e367e2e4368ef5fb9105791f +checksum=8a342d9b7e980cd6d9771d72215dd543d411721685fb60fc2202e300cb5d6483 post_install() { vlicense LICENSE.md From b859b5e964f552696c27a87364699414ddf92065 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Thu, 31 Mar 2022 18:41:05 +0200 Subject: [PATCH 0695/2369] instaloader: update to 4.9. --- srcpkgs/instaloader/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template index 2252042b209..9c5bed15f2e 100644 --- a/srcpkgs/instaloader/template +++ b/srcpkgs/instaloader/template @@ -1,6 +1,6 @@ # Template file for 'instaloader' pkgname=instaloader -version=4.8.4 +version=4.9 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ maintainer="fosslinux " license="MIT" homepage="https://instaloader.github.io" distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz" -checksum=9615a12a5a01a8b6c9d99a2a047b21d81b341cfd77656b9261bda30ece0cd562 +checksum=7fa6147810eedcc1dedcdec8cfa1f220c9379ab8faeab6a336a7c181d944e2e4 post_install() { vlicense LICENSE From bb79b5814d61ba43fa2f89250135a1448e6f4865 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Sun, 3 Apr 2022 16:22:31 +0200 Subject: [PATCH 0696/2369] pipe-viewer: update to 0.2.0. --- srcpkgs/pipe-viewer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template index 3797428bc41..670d4181ab1 100644 --- a/srcpkgs/pipe-viewer/template +++ b/srcpkgs/pipe-viewer/template @@ -1,6 +1,6 @@ # Template file for 'pipe-viewer' pkgname=pipe-viewer -version=0.1.8 +version=0.2.0 revision=1 build_style=perl-ModuleBuild configure_args="--gtk" @@ -14,7 +14,7 @@ license="Artistic-2.0" homepage="https://github.com/trizen/pipe-viewer" changelog="https://github.com/trizen/pipe-viewer/releases" distfiles="https://github.com/trizen/pipe-viewer/archive/${version}.tar.gz" -checksum=b8f722cdddf0686bb75676b5baa850c1101b54f9c32f562eaac04a6e1863fb8d +checksum=3913ecfaa3006f645603fb76df9962829138ca62d4b0acaf8b8d4d2e58902f64 pipe-viewer-gtk_package() { depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir" From 43178d95f46cafd6c418344aee4d10e113b67f0e Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 4 Apr 2022 20:44:14 -0700 Subject: [PATCH 0697/2369] runc: update to 1.1.1 --- srcpkgs/runc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template index 2e40b2647d2..182e20b9985 100644 --- a/srcpkgs/runc/template +++ b/srcpkgs/runc/template @@ -1,6 +1,6 @@ # Template file for 'runc' pkgname=runc -version=1.1.0 +version=1.1.1 revision=1 build_style=go go_import_path=github.com/opencontainers/runc @@ -12,7 +12,7 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/opencontainers/runc" distfiles="https://github.com/opencontainers/runc/releases/download/v${version}/runc.tar.xz" -checksum=152e8975793aa45a6717e367bd1652f8147728d25adad339d2f70c4fd2ddc623 +checksum=75c1f0bb19b209412c52599e24b33ac306cf7caf772c97577b7ebe964837a54b post_build() { make man From 40179a9ac8ee1e9584b029ed203a7946d9a11b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Sun, 3 Apr 2022 21:57:24 +0200 Subject: [PATCH 0698/2369] sslscan: update to 2.0.13. --- srcpkgs/sslscan/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sslscan/template b/srcpkgs/sslscan/template index 6d9ceca254a..2c19a8a0dc7 100644 --- a/srcpkgs/sslscan/template +++ b/srcpkgs/sslscan/template @@ -1,6 +1,6 @@ # Template file for 'sslscan' pkgname=sslscan -version=2.0.12 +version=2.0.13 revision=1 build_style=gnu-makefile makedepends="openssl-devel" @@ -10,6 +10,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/rbsec/sslscan" changelog="https://github.com/rbsec/sslscan/raw/master/Changelog" distfiles="https://github.com/rbsec/sslscan/archive/refs/tags/${version}.tar.gz" -checksum=6eeda19f564635818d6dd20a1e93174484d62acb24eca8944df07496d32b9c65 +checksum=34549613e16ba5dbfca3d988672041b7b0ece6f408515d6ba8819e2d804b5833 # No test suite make_check=no From e40f4b4a8f652da88d17eceb4b83f3c88303858e Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 2 Apr 2022 14:40:04 -0700 Subject: [PATCH 0699/2369] python3-pluggy: update to 1.0.0 --- srcpkgs/python3-pluggy/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template index efaa7e25d2a..fa49c9826db 100644 --- a/srcpkgs/python3-pluggy/template +++ b/srcpkgs/python3-pluggy/template @@ -1,7 +1,7 @@ # Template file for 'python3-pluggy' pkgname=python3-pluggy -version=0.13.1 -revision=7 +version=1.0.0 +revision=1 wrksrc="pluggy-${version}" build_style=python3-module hostmakedepends="python3-setuptools_scm" @@ -12,9 +12,12 @@ maintainer="Piotr Wójcik " license="MIT" homepage="https://github.com/pytest-dev/pluggy" distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz" -checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0 +checksum=4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 do_check() { + # Must export PYTHONPATH so subprocesses see the variable + local _pypath="${PYTHONPATH}" + export PYTHONPATH="${PWD}/src:${PYTHONPATH}" python3 -m pytest } From d180ad387a84e5307ed9ac50f2b40f29dd612fae Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 2 Apr 2022 11:54:44 -0700 Subject: [PATCH 0700/2369] New package: python3-lsp-jsonrpc-1.0.0 --- srcpkgs/python3-lsp-jsonrpc/template | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/python3-lsp-jsonrpc/template diff --git a/srcpkgs/python3-lsp-jsonrpc/template b/srcpkgs/python3-lsp-jsonrpc/template new file mode 100644 index 00000000000..1455aa10879 --- /dev/null +++ b/srcpkgs/python3-lsp-jsonrpc/template @@ -0,0 +1,23 @@ +# Template file for 'python3-lsp-jsonrpc' +pkgname=python3-lsp-jsonrpc +version=1.0.0 +revision=1 +wrksrc="${pkgname/3}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-ultrajson" +checkdepends="python3-pytest python3-pytest-cov" +short_desc="Python server implementation of the JSON RPC 2.0 protocol" +maintainer="Cameron Nemo " +license="MIT" +homepage="https://github.com/python-lsp/python-lsp-jsonrpc" +distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" +checksum=7bec170733db628d3506ea3a5288ff76aa33c70215ed223abdb0d95e957660bd + +post_install() { + vlicense LICENSE +} + +do_check() { + python3 -m pytest --ignore=test/test_streams.py +} From 3144418dea08d83efef844811ce7857f9d3b77fe Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 2 Apr 2022 11:53:38 -0700 Subject: [PATCH 0701/2369] New package: python3-lsp-server-1.4.1 Substitute for python3-language-server Fixes #34192 --- srcpkgs/python3-language-server | 1 + .../patches/jedi_compat.patch | 37 ----------------- srcpkgs/python3-language-server/template | 30 -------------- srcpkgs/python3-lsp-server/template | 40 +++++++++++++++++++ 4 files changed, 41 insertions(+), 67 deletions(-) create mode 120000 srcpkgs/python3-language-server delete mode 100644 srcpkgs/python3-language-server/patches/jedi_compat.patch delete mode 100644 srcpkgs/python3-language-server/template create mode 100644 srcpkgs/python3-lsp-server/template diff --git a/srcpkgs/python3-language-server b/srcpkgs/python3-language-server new file mode 120000 index 00000000000..9054a5e99f7 --- /dev/null +++ b/srcpkgs/python3-language-server @@ -0,0 +1 @@ +python3-lsp-server \ No newline at end of file diff --git a/srcpkgs/python3-language-server/patches/jedi_compat.patch b/srcpkgs/python3-language-server/patches/jedi_compat.patch deleted file mode 100644 index 52e7e3c59ab..00000000000 --- a/srcpkgs/python3-language-server/patches/jedi_compat.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/palantir/python-language-server/pull/901 - -From: bnavigator -Date: Tue, 5 Jan 2021 01:17:33 +0100 -Subject: [PATCH] bump jedi compatibility: compare to Path-like object - ---- - pyls/plugins/symbols.py | 2 +- - setup.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pyls/plugins/symbols.py b/pyls/plugins/symbols.py -index 6468dd83..69a09fe9 100644 ---- a/pyls/plugins/symbols.py -+++ b/pyls/plugins/symbols.py -@@ -37,7 +37,7 @@ def pyls_document_symbols(config, document): - not sym_full_name.startswith('__main__')): - continue - -- if _include_def(d) and document.path == d.module_path: -+ if _include_def(d) and os.path.samefile(document.path, d.module_path): - tuple_range = _tuple_range(d) - if tuple_range in exclude: - continue -diff --git a/setup.py b/setup.py -index 12782990..99d2b312 100755 ---- a/setup.py -+++ b/setup.py -@@ -10,7 +10,7 @@ - 'configparser; python_version<"3.0"', - 'future>=0.14.0; python_version<"3"', - 'backports.functools_lru_cache; python_version<"3.2"', -- 'jedi>=0.17.2,<0.18.0', -+ 'jedi>=0.17.2,<0.19.0', - 'python-jsonrpc-server>=0.4.0', - 'pluggy', - 'ujson<=2.0.3 ; platform_system!="Windows" and python_version<"3.0"', diff --git a/srcpkgs/python3-language-server/template b/srcpkgs/python3-language-server/template deleted file mode 100644 index a443ec3fb51..00000000000 --- a/srcpkgs/python3-language-server/template +++ /dev/null @@ -1,30 +0,0 @@ -# Template file for 'python3-language-server' -pkgname=python3-language-server -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 - 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 - python3-yapf" -short_desc="Python implementation of the Language Server Protocol" -maintainer="k4leg " -license="MIT" -homepage="https://github.com/palantir/python-language-server" -distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" -checksum=9984c84a67ee2c5102c8e703215f407fcfa5e62b0ae86c9572d0ada8c4b417b0 -# Needs unpackaged rope and versioneer -# https://github.com/palantir/python-language-server/blob/develop/setup.py#L51 -make_check=no - -post_patch() { - vsed -i setup.py -e 's/\bujson<=1.35\b/ujson/' -} - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/python3-lsp-server/template b/srcpkgs/python3-lsp-server/template new file mode 100644 index 00000000000..cda7c928052 --- /dev/null +++ b/srcpkgs/python3-lsp-server/template @@ -0,0 +1,40 @@ +# Template file for 'python3-lsp-server' +pkgname=python3-lsp-server +version=1.4.1 +revision=1 +wrksrc="${pkgname/3}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel" +depends="python3-jedi python3-pluggy python3-lsp-jsonrpc 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 + python3-yapf flake8" +short_desc="Python implementation of the Language Server Protocol" +maintainer="Cameron Nemo " +license="MIT" +homepage="https://github.com/python-lsp/python-lsp-server" +distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" +checksum=be7f83298af9f0951a93972cafc9db04fd7cf5c05f20812515275f0ba70e342f + +do_check() { + python3 -m pytest \ + --ignore=test/plugins/test_completion.py \ + --ignore=test/plugins/test_pydocstyle_lint.py \ + --ignore=test/plugins/test_rope_rename.py +} + +post_install() { + vlicense LICENSE + ln -s pylsp "${DESTDIR}/usr/bin/pyls" +} + +python3-language-server_package() { + build_style=meta + depends="python3-lsp-server>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + pkg_install() { + vmove usr/bin/pyls + } +} From d7ca644841385be31fb1f0edd18b1796af82d332 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 2 Apr 2022 11:52:16 -0700 Subject: [PATCH 0702/2369] python3-jsonrpc-server: remove package --- srcpkgs/python3-jsonrpc-server/template | 22 ---------------------- srcpkgs/removed-packages/template | 3 ++- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/python3-jsonrpc-server/template diff --git a/srcpkgs/python3-jsonrpc-server/template b/srcpkgs/python3-jsonrpc-server/template deleted file mode 100644 index de96976ad0a..00000000000 --- a/srcpkgs/python3-jsonrpc-server/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'python3-jsonrpc-server' -pkgname=python3-jsonrpc-server -version=0.4.0 -revision=2 -wrksrc="${pkgname/3}-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-ultrajson" -short_desc="Python library implementing asynchronous JSON RPC server" -maintainer="k4leg " -license="MIT" -homepage="https://github.com/palantir/python-jsonrpc-server" -distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" -checksum=62c543e541f101ec5b57dc654efc212d2c2e3ea47ff6f54b2e7dcb36ecf20595 - -post_patch() { - vsed -i setup.py -e 's/\bujson<=1\.35\b/ujson/' -} - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index d5a5e66b8b1..a76ad553cbf 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=67 +revision=68 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -325,6 +325,7 @@ replaces=" python3-docker-pycreds<=0.4.0_4 python3-grako<=3.99.9_7 python3-idna-ssl<=1.1.0_3 + python3-jsonrpc-server<=0.4.0_2 python3-keepalive<=0.5_6 python3-pgpdump<=1.5_10 python3-lockfile<=0.12.2_7 From bd4502aac814ba5f292ac55df63e489dcd33af5e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Tue, 22 Mar 2022 20:47:59 +0100 Subject: [PATCH 0703/2369] dhcpcd: fix 'dhcpcd_open: Bad File Descriptor' with dhcpcd-qt. --- srcpkgs/dhcpcd/patches/revert-eloop.patch | 150 ++++++++++++++++++++++ srcpkgs/dhcpcd/template | 2 +- 2 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/dhcpcd/patches/revert-eloop.patch diff --git a/srcpkgs/dhcpcd/patches/revert-eloop.patch b/srcpkgs/dhcpcd/patches/revert-eloop.patch new file mode 100644 index 00000000000..e41beb84b62 --- /dev/null +++ b/srcpkgs/dhcpcd/patches/revert-eloop.patch @@ -0,0 +1,150 @@ +From 2b4fe4c12b5d4366ff21fabf3a6c3799f8e4fa53 Mon Sep 17 00:00:00 2001 +From: Roy Marples +Date: Fri, 12 Nov 2021 16:24:32 +0000 +Subject: [PATCH] Revert "eloop: Allow eloop to process all fds returned from + poll(2)" + +This stops dumping leases when privsep is compiled out. +This change works fine on master, but we also have eloop using +more of a native poll(2) style interface. +Easier for now to just revert this on the dhcpcd-9 branch. + +This reverts commit fe2b82eec25da908c3a1a71c2dc2402d9ff70e31. +--- + src/eloop.c | 56 ++++++++++++++++------------------------------------- + 1 file changed, 17 insertions(+), 39 deletions(-) + +diff --git a/src/eloop.c b/src/eloop.c +index a6ab43fb..c3330817 100644 +--- a/src/eloop.c ++++ b/src/eloop.c +@@ -32,7 +32,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -137,7 +136,6 @@ struct eloop { + TAILQ_HEAD (event_head, eloop_event) events; + size_t nevents; + struct event_head free_events; +- bool events_need_setup; + + struct timespec now; + TAILQ_HEAD (timeout_head, eloop_timeout) timeouts; +@@ -284,16 +282,11 @@ eloop_reduce_timers(struct eloop *eloop) + static void + eloop_event_setup_fds(struct eloop *eloop) + { +- struct eloop_event *e, *ne; ++ struct eloop_event *e; + struct pollfd *pfd; + + pfd = eloop->fds; +- TAILQ_FOREACH_SAFE(e, &eloop->events, next, ne) { +- if (e->fd == -1) { +- TAILQ_REMOVE(&eloop->events, e, next); +- TAILQ_INSERT_TAIL(&eloop->free_events, e, next); +- continue; +- } ++ TAILQ_FOREACH(e, &eloop->events, next) { + #ifdef ELOOP_DEBUG + fprintf(stderr, "%s(%d) fd=%d, rcb=%p, wcb=%p\n", + __func__, getpid(), e->fd, e->read_cb, e->write_cb); +@@ -308,7 +301,6 @@ eloop_event_setup_fds(struct eloop *eloop) + pfd->revents = 0; + pfd++; + } +- eloop->events_need_setup = false; + } + + size_t +@@ -376,8 +368,7 @@ eloop_event_add_rw(struct eloop *eloop, int fd, + } + + setup: +- e->pollfd = NULL; +- eloop->events_need_setup = true; ++ eloop_event_setup_fds(eloop); + return 0; + } + +@@ -403,10 +394,6 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only) + struct eloop_event *e; + + assert(eloop != NULL); +- if (fd == -1) { +- errno = EINVAL; +- return -1; +- } + + TAILQ_FOREACH(e, &eloop->events, next) { + if (e->fd == fd) +@@ -422,17 +409,16 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only) + goto remove; + e->write_cb = NULL; + e->write_cb_arg = NULL; +- if (e->pollfd != NULL) { +- e->pollfd->events &= ~POLLOUT; +- e->pollfd->revents &= ~POLLOUT; +- } +- return 1; ++ goto done; + } + + remove: +- e->fd = -1; ++ TAILQ_REMOVE(&eloop->events, e, next); ++ TAILQ_INSERT_TAIL(&eloop->free_events, e, next); + eloop->nevents--; +- eloop->events_need_setup = true; ++ ++done: ++ eloop_event_setup_fds(eloop); + return 1; + } + +@@ -750,9 +736,6 @@ eloop_start(struct eloop *eloop, sigset_t *signals) + } else + tsp = NULL; + +- if (eloop->events_need_setup) +- eloop_event_setup_fds(eloop); +- + n = ppoll(eloop->fds, (nfds_t)eloop->nevents, tsp, signals); + if (n == -1) { + if (errno == EINTR) +@@ -763,23 +746,18 @@ eloop_start(struct eloop *eloop, sigset_t *signals) + continue; + + TAILQ_FOREACH(e, &eloop->events, next) { +- /* Skip freshly added events */ +- if (e->pollfd == NULL) +- continue; +- if (e->pollfd->revents) +- n--; +- if (e->fd != -1 && e->pollfd->revents & POLLOUT) { +- if (e->write_cb != NULL) ++ if (e->pollfd->revents & POLLOUT) { ++ if (e->write_cb != NULL) { + e->write_cb(e->write_cb_arg); ++ break; ++ } + } +- if (e->fd != -1 && +- e->pollfd != NULL && e->pollfd->revents) +- { +- if (e->read_cb != NULL) ++ if (e->pollfd->revents) { ++ if (e->read_cb != NULL) { + e->read_cb(e->read_cb_arg); ++ break; ++ } + } +- if (n == 0) +- break; + } + } + diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index 12be60c1efc..0d26c1abfa5 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,7 +1,7 @@ # Template file for 'dhcpcd' pkgname=dhcpcd version=9.4.1 -revision=1 +revision=2 build_style=configure make_check_target=test configure_args=" From 763b867bf4ed5929f67d91a897360532a0ecd3f6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 6 Apr 2022 23:33:07 +0200 Subject: [PATCH 0704/2369] hwloc: update to 2.7.1. --- srcpkgs/hwloc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template index e96886b6cf5..52e01d23fb1 100644 --- a/srcpkgs/hwloc/template +++ b/srcpkgs/hwloc/template @@ -1,6 +1,6 @@ # Template file for 'hwloc' pkgname=hwloc -version=2.6.0 +version=2.7.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://www.open-mpi.org/projects/hwloc/" distfiles="https://www.open-mpi.org/software/hwloc/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2" -checksum=e1f073e44e28c296ff848dead5e9bd6e2426b77f95ead1792358958e859fa83a +checksum=0d4e1d36c3a72c5d61901bfd477337f5a4c7e0a975da57165237d00e35ef528d case "$XBPS_TARGET_MACHINE" in i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";; From 91e1921c4732525b870f4b5a76eb9abc6e46b922 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 6 Apr 2022 23:35:26 +0200 Subject: [PATCH 0705/2369] bmake: update to 20220330. --- srcpkgs/bmake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template index 19c6c5aa350..5eac7a6f158 100644 --- a/srcpkgs/bmake/template +++ b/srcpkgs/bmake/template @@ -1,6 +1,6 @@ # Template file for 'bmake' pkgname=bmake -version=20220303 +version=20220330 revision=1 create_wrksrc=yes short_desc="Portable version of the NetBSD make build tool" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://www.crufty.net/help/sjg/bmake.html" distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz" -checksum=793754b93fec97a0cf6cade0b0ad597bb7ea5057fd24311d4a562432df3e91cb +checksum=4b46d95b6ae4b3311ba805ff7d5a19b9e37ac0e86880e296e2111f565b545092 python_version=3 do_configure() { From 5b45dfb85907f9068e24c21a4640e33c6a9f6389 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 6 Apr 2022 16:40:06 -0500 Subject: [PATCH 0706/2369] Amass: update to 3.19.1. --- srcpkgs/Amass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template index 993c17d52c1..9293dab01c9 100644 --- a/srcpkgs/Amass/template +++ b/srcpkgs/Amass/template @@ -1,6 +1,6 @@ # Template file for 'Amass' pkgname=Amass -version=3.19.0 +version=3.19.1 revision=1 build_style=go go_import_path="github.com/OWASP/Amass/v3/..." @@ -9,4 +9,4 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://www.owasp.org/index.php/OWASP_Amass_Project" distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz" -checksum=539c2207f844c81cc9a6286e436f26a1fc0690bf424ea1885844dd33002b7ef6 +checksum=259dbef81ca63ceb85113c0f741c9212bacbac653bca2cd3e8022b256d08d426 From 52ae89040ed62bdff94e498f76282dbe41e0699c Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 6 Apr 2022 16:41:08 -0500 Subject: [PATCH 0707/2369] python3-rich: update to 12.2.0. --- srcpkgs/python3-rich/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template index c394edfbead..c3de71a5749 100644 --- a/srcpkgs/python3-rich/template +++ b/srcpkgs/python3-rich/template @@ -1,6 +1,6 @@ # Template file for 'python3-rich' pkgname=python3-rich -version=12.0.1 +version=12.2.0 revision=1 wrksrc="rich-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/willmcgugan/rich" distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz" -checksum=3fba9dd15ebe048e2795a02ac19baee79dc12cc50b074ef70f2958cd651b59a9 +checksum=ea74bc9dad9589d8eea3e3fd0b136d8bf6e428888955f215824c2894f0da8b47 make_check=extended # some checks only work on windows post_install() { From 11e9e047965b3c3dd60b8cad9786dce96b4a4c19 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 6 Apr 2022 16:43:25 -0500 Subject: [PATCH 0708/2369] ffuf: update to 1.4.1. --- srcpkgs/ffuf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template index 6ceffafb0e5..26f03774991 100644 --- a/srcpkgs/ffuf/template +++ b/srcpkgs/ffuf/template @@ -1,6 +1,6 @@ # Template file for 'ffuf' pkgname=ffuf -version=1.4.0 +version=1.4.1 revision=1 build_style=go go_import_path="github.com/ffuf/ffuf" @@ -9,7 +9,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/ffuf/ffuf" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=cc741088f15b5cfdeb596f1630a015cce0b4b112dc6daf857cd9878e7a1734c1 +checksum=89b4bd4b3bbad7402d9c81d0d9f21b679c80d0a19bb9a190e45e395736058889 post_install() { vlicense LICENSE From 56a9631a0d0c6a75557b11cdcfce8f142f5f1a51 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 6 Apr 2022 16:54:30 -0500 Subject: [PATCH 0709/2369] python3-youtubesearch: update to 1.6.4. --- srcpkgs/python3-youtubesearch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template index 3d88fc1126a..822d7eb70ee 100644 --- a/srcpkgs/python3-youtubesearch/template +++ b/srcpkgs/python3-youtubesearch/template @@ -1,6 +1,6 @@ # Template file for 'python3-youtubesearch' pkgname=python3-youtubesearch -version=1.6.3 +version=1.6.4 revision=1 wrksrc="youtube-search-python-${version}" build_style=python3-module @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/alexmercerind/youtube-search-python" distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=bdb34757c5e390c4d20989d04317acbceffa94293693cbeecb493b079440dbd3 +checksum=a9dcc4536fd839beb29b12d93e59fb92b294a0d83b94b882b16a445158d1f8da make_check=no # no tests defined post_install() { From 9ee4ce236ff10d8b2be8744fba6a8e64328e38d8 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 6 Apr 2022 16:55:41 -0500 Subject: [PATCH 0710/2369] sqlmap: update to 1.6.4. --- srcpkgs/sqlmap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template index c77f23f0393..74ce3a2ca71 100644 --- a/srcpkgs/sqlmap/template +++ b/srcpkgs/sqlmap/template @@ -1,6 +1,6 @@ # Template file for 'sqlmap' pkgname=sqlmap -version=1.6.3 +version=1.6.4 revision=1 pycompile_dirs="usr/libexec/sqlmap" depends="python3" @@ -9,7 +9,7 @@ maintainer="Andrew Benson " license="GPL-2.0-or-later" homepage="http://sqlmap.org" distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz" -checksum=a099cde73f57ba9e70ad7dd2f7473202a02929766471fc5701f64f2c16b304c2 +checksum=14585e4fc95006467e52685c4838f024654d7e23cbd84eb12762a55918b8d561 python_version=3 do_install() { From bcd498943006dd780aa127b91e1b79c446a69d5a Mon Sep 17 00:00:00 2001 From: 0x5c Date: Sat, 19 Mar 2022 18:54:35 -0400 Subject: [PATCH 0711/2369] base-files: add plugdev group Plugdev is used by many packages' udev rules for pluggable devices. Currently, some of those packages use the system_groups trigger to add it, some forget to add it, and others patch it to "users" or "uaccess" (which breaks the packages on systems that don't use logind). By adding plugdev to the default groups, we get rid of those problems. --- srcpkgs/base-files/files/group | 1 + srcpkgs/base-files/template | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/base-files/files/group b/srcpkgs/base-files/files/group index 0797f31c14d..b4e61903105 100644 --- a/srcpkgs/base-files/files/group +++ b/srcpkgs/base-files/files/group @@ -22,6 +22,7 @@ scanner:x:20: network:x:21: kvm:x:24: input:x:25: +plugdev:x:26: nogroup:x:99: users:x:100: xbuilder:x:101: diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index 758cd54ad14..bf7b7ef242b 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -1,7 +1,7 @@ # Template file for 'base-files' pkgname=base-files version=0.142 -revision=11 +revision=12 bootstrap=yes depends="xbps-triggers" short_desc="Void Linux base system files" @@ -29,7 +29,7 @@ conf_files=" replaces="base-directories>=0" # New system groups -system_groups="kvm:24" +system_groups="kvm:24 plugdev:26" do_install() { # Create bin and lib dirs and symlinks. From 760082f784b498fdbb9138f812390ded8df63c93 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Sat, 19 Mar 2022 19:17:56 -0400 Subject: [PATCH 0712/2369] openocd: drop system_groups Now that we have plugdev as a system group, we don't need to create it here. --- srcpkgs/openocd/template | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/srcpkgs/openocd/template b/srcpkgs/openocd/template index 3c45ba54dd5..5537a78575c 100644 --- a/srcpkgs/openocd/template +++ b/srcpkgs/openocd/template @@ -1,7 +1,7 @@ # Template file for 'openocd' pkgname=openocd version=0.11.0 -revision=3 +revision=4 build_style=gnu-configure configure_args=" --disable-werror @@ -49,8 +49,6 @@ homepage="http://openocd.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d -system_groups="plugdev" - CFLAGS="-fcommon" post_install() { From 83f1e11cc9a655d403ad6d01145642e270bf76eb Mon Sep 17 00:00:00 2001 From: 0x5c Date: Sat, 19 Mar 2022 19:23:15 -0400 Subject: [PATCH 0713/2369] wally-udev-rules: drop system_groups trigger Now that we have plugdev as a system group, we don't need to create it here. We also no longer need that INSTALL.msg --- srcpkgs/wally-udev-rules/INSTALL.msg | 3 --- srcpkgs/wally-udev-rules/template | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 srcpkgs/wally-udev-rules/INSTALL.msg diff --git a/srcpkgs/wally-udev-rules/INSTALL.msg b/srcpkgs/wally-udev-rules/INSTALL.msg deleted file mode 100644 index 6313b5615ba..00000000000 --- a/srcpkgs/wally-udev-rules/INSTALL.msg +++ /dev/null @@ -1,3 +0,0 @@ -Please add your user to the group 'plugdev' by executing the following: - -usermod -aG plugdev "$USER" diff --git a/srcpkgs/wally-udev-rules/template b/srcpkgs/wally-udev-rules/template index 83f37457047..173a99733c5 100644 --- a/srcpkgs/wally-udev-rules/template +++ b/srcpkgs/wally-udev-rules/template @@ -1,7 +1,7 @@ # Template file for 'wally-udev-rules' pkgname=wally-udev-rules version=2.1.1 -revision=1 +revision=2 build_style=fetch short_desc="Set of udev rules for ZSA keyboards, for usage with wally and oryx" maintainer="Jan Christian Grünhage " @@ -14,7 +14,6 @@ checksum="6c7d4d27745080269115c58c4c5d863b23c534635975f3bca581c52687721c52 269c9196bc65b2e62be549e3d34e56768fe702ff099b7780a1661ca4c92a0143 d2841d63f4e0bdfda102390ab1ca09136230d22f88538863b24b0c7fc68e548e" conf_files="/usr/lib/udev/rules.d/50-wally.rules /usr/lib/udev/rules.d/50-oryx.rules" -system_groups="plugdev" do_install() { vlicense license.md From 0a0f755f44886d418b63f5c435e818cae465cb94 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Sat, 19 Mar 2022 19:30:36 -0400 Subject: [PATCH 0714/2369] openrazer-meta: drop system_groups trigger Now that we have plugdev as a system group, we don't need to create it here. --- srcpkgs/openrazer-meta/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template index 5713a84bbd1..3cd401cb987 100644 --- a/srcpkgs/openrazer-meta/template +++ b/srcpkgs/openrazer-meta/template @@ -1,7 +1,7 @@ # Template file for 'openrazer-meta' pkgname=openrazer-meta version=3.0.1 -revision=2 +revision=3 wrksrc="openrazer-${version}" build_style=gnu-makefile make_install_target="setup_dkms udev_install daemon_install xdg_install @@ -36,7 +36,6 @@ openrazer-driver-dkms_package() { short_desc="Kernel driver for Razer devices (DKMS-variant)" depends="dkms" dkms_modules="openrazer-driver $version" - system_groups="plugdev" pkg_install() { vmove usr/lib/udev vmove usr/src From d82d6ad58bcb2259b5e89a3b5a613a56c5b9f354 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Apr 2022 14:03:21 -0400 Subject: [PATCH 0715/2369] elasticsearch: remove package - last updated in 2017 - contained vulnerable log4j - licence is a mess --- srcpkgs/elasticsearch/INSTALL | 14 ----- srcpkgs/elasticsearch/files/elasticsearch/run | 3 -- srcpkgs/elasticsearch/template | 52 ------------------- srcpkgs/elasticsearch/update | 1 - srcpkgs/removed-packages/template | 1 + 5 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 srcpkgs/elasticsearch/INSTALL delete mode 100755 srcpkgs/elasticsearch/files/elasticsearch/run delete mode 100644 srcpkgs/elasticsearch/template delete mode 100644 srcpkgs/elasticsearch/update diff --git a/srcpkgs/elasticsearch/INSTALL b/srcpkgs/elasticsearch/INSTALL deleted file mode 100644 index 622fb85bda9..00000000000 --- a/srcpkgs/elasticsearch/INSTALL +++ /dev/null @@ -1,14 +0,0 @@ -# INSTALL -case "$ACTION" in -post) - if [ "$UPDATE" != "yes" ]; then - # actions to execute if package is being installed. - install -d usr/share/elasticsearch/plugins - install -d -m0750 var/log/elasticsearch - install -d -m0750 var/lib/elasticsearch/data - chown -R elastic etc/elasticsearch - chown -R elastic var/lib/elasticsearch/data - chown -R elastic var/log/elasticsearch - fi - ;; -esac diff --git a/srcpkgs/elasticsearch/files/elasticsearch/run b/srcpkgs/elasticsearch/files/elasticsearch/run deleted file mode 100755 index 6b04b177081..00000000000 --- a/srcpkgs/elasticsearch/files/elasticsearch/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. /etc/profile # to pull in java path -exec chpst -u elastic elasticsearch 2>&1 diff --git a/srcpkgs/elasticsearch/template b/srcpkgs/elasticsearch/template deleted file mode 100644 index a149578d682..00000000000 --- a/srcpkgs/elasticsearch/template +++ /dev/null @@ -1,52 +0,0 @@ -# Template file for 'elasticsearch' -pkgname=elasticsearch -version=5.1.2 -revision=2 -wrksrc="elasticsearch-${version}" -# The only native part is libjnidispatch.so inside jna-*.jar, which is supplied -# only for a few archs, namely arm (armv6l and better), aarch64, ppc64le, x86, -# and x86_64; ppc64 is also supplied but elfv1 only, and all only for glibc. -# We could recompile this, but someone would need to add code to do that. -archs="i686 x86_64 aarch64 armv6l armv7l ppc64le" -depends="virtual?java-runtime" -short_desc="A distributed, open source search and analytics engine" -maintainer="dota? =op " -license="Apache-2.0" -homepage="http://www.elastic.co" -distfiles="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${version}.tar.gz" -checksum=74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 -system_accounts="elastic" -conf_files="/etc/elasticsearch/elasticsearch.yml /etc/elasticsearch/jvm.options /etc/elasticsearch/log4j2.properties" - -do_install() { - ES="usr/share/elasticsearch" - - rm -f bin/*.{bat,exe} - vmkdir $ES - - vcopy bin $ES - vcopy lib $ES - vcopy modules $ES - vcopy plugins $ES - - vmkdir usr/bin - - ln -sf /$ES/bin/elasticsearch "$DESTDIR/usr/bin" - - vmkdir etc/elasticsearch - vcopy config/* etc/elasticsearch - - ln -sf /etc/elasticsearch "$DESTDIR/$ES/config" - - vmkdir var/lib/elasticsearch/data - ln -sf /var/lib/elasticsearch/data "$DESTDIR/$ES/data" - - vmkdir var/log/elasticsearch - ln -sf /var/log/elasticsearch "$DESTDIR/$ES/logs" - - vlicense LICENSE.txt - vlicense NOTICE.txt - vdoc README.textile - - vsv elasticsearch -} diff --git a/srcpkgs/elasticsearch/update b/srcpkgs/elasticsearch/update deleted file mode 100644 index 32de96485c8..00000000000 --- a/srcpkgs/elasticsearch/update +++ /dev/null @@ -1 +0,0 @@ -site="https://www.elastic.co/downloads/elasticsearch" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index a76ad553cbf..240f1282f54 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -66,6 +66,7 @@ replaces=" dtkwm<=2.0.12_1 ebtables<=2.0.10.4_8 eclipse-ecj<=4.9_3 + elasticsearch<=5.1.2_2 electron7<=7.3.3_1 electron9<=9.4.1_1 emacs-gtk2<=27.2_1 From 7d9c9b29060a3b4b5b4f07d9a085fd3a3bbe2d49 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Sun, 20 Mar 2022 00:41:04 -0400 Subject: [PATCH 0716/2369] libsigrok: fix on systems without logind Fixes #23580 Closes #23581 (obsoletes the PR) --- srcpkgs/libsigrok/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libsigrok/template b/srcpkgs/libsigrok/template index 87939ce82fa..0243925a731 100644 --- a/srcpkgs/libsigrok/template +++ b/srcpkgs/libsigrok/template @@ -1,7 +1,7 @@ # Template file for 'libsigrok' pkgname=libsigrok version=0.5.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config doxygen python3" makedepends="glib-devel libzip-devel glibmm-devel libserialport-devel @@ -20,6 +20,7 @@ esac post_install() { vinstall contrib/60-libsigrok.rules 0644 /usr/lib/udev/rules.d vinstall contrib/61-libsigrok-uaccess.rules 0644 /usr/lib/udev/rules.d + vinstall contrib/61-libsigrok-plugdev.rules 0644 /usr/lib/udev/rules.d } libsigrok-devel_package() { From 4c960d966db3c052008734857c658eef2b922e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EF=BD=88=EF=BD=89=EF=BD=8C=EF=BD=8A=EF=BD=95=EF=BD=93?= =?UTF-8?q?=EF=BD=94=EF=BD=89?= Date: Wed, 9 Mar 2022 01:07:08 -0800 Subject: [PATCH 0717/2369] New package: sigi-3.1.0 --- srcpkgs/sigi/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/sigi/template diff --git a/srcpkgs/sigi/template b/srcpkgs/sigi/template new file mode 100644 index 00000000000..d9fc482b820 --- /dev/null +++ b/srcpkgs/sigi/template @@ -0,0 +1,22 @@ +# Template file for 'sigi' +pkgname=sigi +version=3.1.0 +revision=1 +build_style=cargo +short_desc="Organization tool for people who hate organization" +maintainer="J.R. Hill " +license="GPL-2.0-only" +homepage="https://github.com/hiljusti/sigi" +distfiles="https://crates.io/api/v1/crates/sigi/${version}/download>sigi-${version}.tar.gz" +checksum=967e492a89f05c3a373929a48e0a1a7712d4742b150216228feff4a7869297e3 + +pre_check() { + # CLI tests in the project rely on BATS (more than just bats-core) through + # git submodules. We skip those tests here until the other bats components + # are imported in Void or https://github.com/hiljusti/sigi/issues/19 + export SKIP_BATS_TESTS=1 +} + +post_install() { + vman sigi.1 +} From e7c1951cb4ae90b198240e135379ecfd03eb23fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 5 Apr 2022 21:46:03 -0300 Subject: [PATCH 0718/2369] pari: update to 2.13.4. --- srcpkgs/pari/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template index 9543739472a..8bac1e0343f 100644 --- a/srcpkgs/pari/template +++ b/srcpkgs/pari/template @@ -1,6 +1,6 @@ # Template file for 'pari' pkgname=pari -version=2.13.3 +version=2.13.4 revision=1 build_style=configure build_helper=qemu @@ -16,8 +16,9 @@ short_desc="Fast computations library in number theory" maintainer="Gonzalo Tornaría " license="GPL-2.0-or-later" homepage="https://pari.math.u-bordeaux.fr" +changelog="https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=blob_plain;f=CHANGES;hb=refs/heads/pari-${version%.*}" distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz" -checksum=ccba7f1606c6854f1443637bb57ad0958d41c7f4753f8ae8459f1d64c267a1ca +checksum=bcde9eceae1592814381c1697cdb7063567b6504201b1be47bb58920f3bce185 build_options="x11 pthreads" build_options_default="x11 pthreads" From fed3f319ccc13082a14282876d38211d1ddad622 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Apr 2022 13:30:28 +0200 Subject: [PATCH 0719/2369] virt-manager: update to 4.0.0 Closes #35955 --- ...le-compile-schemas-update-icon-cache.patch | 20 +++++++++++++++++++ srcpkgs/virt-manager/template | 13 ++++-------- 2 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch diff --git a/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch b/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch new file mode 100644 index 00000000000..ad8f6f798b2 --- /dev/null +++ b/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch @@ -0,0 +1,20 @@ +--- a/setup.py ++++ b/setup.py +@@ -264,17 +264,6 @@ class my_install(setuptools.command.install.install): + setuptools.command.install.install.finalize_options(self) + + def run(self): +- if not self.distribution.no_update_icon_cache: +- print("running gtk-update-icon-cache") +- icon_path = os.path.join(self.install_data, "share/icons/hicolor") +- self.spawn(["gtk-update-icon-cache", "-q", "-t", icon_path]) +- +- if not self.distribution.no_compile_schemas: +- print("compiling gsettings schemas") +- gschema_install = os.path.join(self.install_data, +- "share/glib-2.0/schemas") +- self.spawn(["glib-compile-schemas", gschema_install]) +- + setuptools.command.install.install.run(self) + + diff --git a/srcpkgs/virt-manager/template b/srcpkgs/virt-manager/template index f3f6a7424a1..3b66b6fd8a9 100644 --- a/srcpkgs/virt-manager/template +++ b/srcpkgs/virt-manager/template @@ -1,10 +1,10 @@ # Template file for 'virt-manager' pkgname=virt-manager -version=3.2.0 -revision=2 +version=4.0.0 +revision=1 build_style=python3-module pycompile_dirs="/usr/share/${pkgname}/virtManager" -hostmakedepends="gettext python3-docutils gtk-update-icon-cache" +hostmakedepends="gettext python3-docutils python3-setuptools" depends="virt-manager-tools>=${version}_${revision} libvirt-glib gtk-vnc spice-gtk gtksourceview4 dconf vte3 gir-freedesktop" _coredeps="python3-gobject libvirt-python3 libosinfo @@ -16,14 +16,9 @@ license="GPL-2.0-or-later" homepage="https://virt-manager.org" changelog="https://raw.githubusercontent.com/virt-manager/virt-manager/master/NEWS.md" distfiles="https://virt-manager.org/download/sources/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86 +checksum=515aaa2021a4bf352b0573098fe6958319b1ba8ec508ea37e064803f97f17086 python_version=3 -post_install() { - rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \ - $DESTDIR/usr/share/icons/hicolor/icon-theme.cache -} - virt-manager-tools_package() { short_desc="Programs to create and clone virtual machines" depends="${_coredeps} python3-argcomplete" From af269580ce6a6a85c47f3ad8dc4f3551dd53ffcd Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 7 Apr 2022 09:28:02 -0400 Subject: [PATCH 0720/2369] peek: undo compression of manual page --- srcpkgs/peek/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/peek/template b/srcpkgs/peek/template index f5bd1845c83..cc6ffed27c4 100644 --- a/srcpkgs/peek/template +++ b/srcpkgs/peek/template @@ -1,7 +1,7 @@ # Template file for 'peek' pkgname=peek version=1.5.1 -revision=2 +revision=3 build_style=meson hostmakedepends="glib-devel libxml2 gettext pkg-config txt2man vala" makedepends="gtk+3-devel libkeybinder3-devel" @@ -12,3 +12,8 @@ license="GPL-3.0-or-later" homepage="https://github.com/phw/peek" distfiles="https://github.com/phw/peek/archive/${version}.tar.gz" checksum=d2b52297d3941db2f10ad4dd00a6d5606728c0fee6af5f1594a036f88e478237 + +post_install() { + # Manual page is actually compressed; make sure the post-install hook finds it + mv ${DESTDIR}/usr/share/man/man1/peek.{1,1.gz} +} From 2f1143089e6b21f3a90585b915dac47a363cf270 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Tue, 11 Jan 2022 15:24:56 -0500 Subject: [PATCH 0721/2369] python3-utils: update to 3.1.0. --- srcpkgs/python3-utils/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-utils/template b/srcpkgs/python3-utils/template index 44f31ded573..a4db83649ac 100644 --- a/srcpkgs/python3-utils/template +++ b/srcpkgs/python3-utils/template @@ -1,17 +1,19 @@ # Template file for 'python3-utils' pkgname=python3-utils -version=2.5.6 -revision=2 +version=3.1.0 +revision=1 wrksrc="python-utils-${version}" build_style=python3-module +# skip coverage and mypy tests https://github.com/WoLpH/python-utils/issues/29 +make_check_args="-o addopts=--doctest-modules" hostmakedepends="python3-setuptools" -depends="python3-six" +checkdepends="python3-pytest python3-pytest-asyncio" short_desc="Convenient utilities not included with the standard Python3 install" maintainer="Karl Nilsson " license="BSD-3-Clause" homepage="https://github.com/WoLpH/python-utils" distfiles="https://github.com/WoLpH/python-utils/archive/v${version}.tar.gz" -checksum=e35044706c5c7863110ac31afc9fac66f5dc47d6450ebe26a6ac26473ce09d90 +checksum=6f20e784af79dd0f2c330c88496b3d08fa29e27bcfba398ba78f73d8ae85f670 post_install() { vlicense LICENSE From d2b7fe7cb9af72e838b47f4f3193743bdd7d8965 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Wed, 6 Apr 2022 19:27:08 -0400 Subject: [PATCH 0722/2369] python3-rtree: update to 1.0.0. --- srcpkgs/python3-rtree/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/python3-rtree/template b/srcpkgs/python3-rtree/template index 8fce4b16e21..26812e0af5f 100644 --- a/srcpkgs/python3-rtree/template +++ b/srcpkgs/python3-rtree/template @@ -1,9 +1,10 @@ # Template file for 'python3-rtree' pkgname=python3-rtree -version=0.9.5 -revision=4 +version=1.0.0 +revision=1 wrksrc="rtree-${version}" build_style=python3-module +make_check_target="tests" hostmakedepends="python3-setuptools libspatialindex-devel python3-wheel" makedepends="python3-devel libspatialindex-devel" depends="python3 libspatialindex" @@ -13,12 +14,8 @@ maintainer="Karl Nilsson " license="MIT" homepage="https://toblerity.org/rtree/" distfiles="https://github.com/Toblerity/rtree/archive/${version}.tar.gz" -checksum=8d6eebab672d4ac58d10a8f13a200d47502ce70153d43700ddbbde145a217e01 +checksum=b9cc215197cffeb3c7b8becfc6833d382f431381942e5529bcf276a874028fec post_install() { vlicense LICENSE.txt LICENSE } - -do_check() { - python3 -m pytest tests/ -} From 3fa690d31461f679f103575d233b827757fbb2df Mon Sep 17 00:00:00 2001 From: *1is7ac3* Isaac Quiroz Date: Sun, 27 Mar 2022 19:33:22 -0300 Subject: [PATCH 0723/2369] python3-chromecast: update to 10.3.0. --- srcpkgs/python3-chromecast/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template index cd54fcaf897..72f891be6a1 100644 --- a/srcpkgs/python3-chromecast/template +++ b/srcpkgs/python3-chromecast/template @@ -1,7 +1,7 @@ # Template file for 'python3-chromecast' pkgname=python3-chromecast -version=8.1.0 -revision=2 +version=10.3.0 +revision=1 wrksrc="pychromecast-${version}" build_style=python3-module hostmakedepends="python3-setuptools python3-protobuf python3-zeroconf python3-casttube" @@ -12,7 +12,7 @@ maintainer="Ulf " license="MIT" homepage="https://github.com/home-assistant-libs/pychromecast" distfiles="https://github.com/home-assistant-libs/pychromecast/archive/${version}.tar.gz" -checksum=f11d73cffa84b25417192c30e6ea46df470b65055e229c568f677372c4ded1de +checksum=325d8cfa686b7127de1783221f7ef3e81988c0631619bbacf3679ce647b1db1f post_install() { vlicense LICENSE From 26282598c20d973e54ef9952ccc7d677750dc781 Mon Sep 17 00:00:00 2001 From: Pulux Date: Fri, 25 Mar 2022 16:58:59 +0100 Subject: [PATCH 0724/2369] python3-Werkzeug: update to 2.0.3. Closes: #36337 [via git-merge-pr] --- srcpkgs/python3-Werkzeug/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-Werkzeug/template b/srcpkgs/python3-Werkzeug/template index e2b947031bb..ed6980da99e 100644 --- a/srcpkgs/python3-Werkzeug/template +++ b/srcpkgs/python3-Werkzeug/template @@ -1,6 +1,6 @@ # Template file for 'python3-Werkzeug' pkgname=python3-Werkzeug -version=2.0.2 +version=2.0.3 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Markus Berger " license="BSD-3-Clause" homepage="https://palletsprojects.com/p/werkzeug/" distfiles="${PYPI_SITE}/W/Werkzeug/Werkzeug-${version}.tar.gz" -checksum=aa2bb6fc8dee8d6c504c0ac1e7f5f7dc5810a9903e793b6f715a9f015bdadb9a +checksum=b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c do_check() { # Tests depend on xprocess and pytest-timeout, which aren't packaged From 70630f06bfbb2a3b8b6cec316acfdd6c9c23bc0b Mon Sep 17 00:00:00 2001 From: Pulux Date: Fri, 25 Mar 2022 16:55:44 +0100 Subject: [PATCH 0725/2369] python3-itsdangerous: update to 2.1.2. --- srcpkgs/python3-itsdangerous/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-itsdangerous/template b/srcpkgs/python3-itsdangerous/template index 6fa31a0342f..b770f01eef0 100644 --- a/srcpkgs/python3-itsdangerous/template +++ b/srcpkgs/python3-itsdangerous/template @@ -1,7 +1,7 @@ # Template file for 'python3-itsdangerous' pkgname=python3-itsdangerous -version=2.0.1 -revision=2 +version=2.1.2 +revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ maintainer="Markus Berger " license="BSD-3-Clause" homepage="http://github.com/mitsuhiko/itsdangerous" distfiles="${PYPI_SITE}/i/itsdangerous/itsdangerous-${version}.tar.gz" -checksum=9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0 +checksum=5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a post_install() { vlicense LICENSE.rst From 1ebdfcdd06426ddc85eebe1c47c0a43582158005 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Mar 2022 19:11:32 +0100 Subject: [PATCH 0726/2369] python3-keyring: update to 23.5.0. --- srcpkgs/python3-keyring/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template index 2fbc05352ae..298460551bf 100644 --- a/srcpkgs/python3-keyring/template +++ b/srcpkgs/python3-keyring/template @@ -1,10 +1,10 @@ # Template file for 'python3-keyring' pkgname=python3-keyring -version=23.1.0 -revision=2 +version=23.5.0 +revision=1 wrksrc="keyring-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools_scm" +build_style=python3-pep517 +hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-SecretStorage python3-importlib_metadata" checkdepends="python3-importlib_metadata python3-pytest python3-pytest-flake8 python3-pytest-cov" @@ -14,7 +14,7 @@ license="MIT" homepage="https://github.com/jaraco/keyring" changelog="https://raw.githubusercontent.com/jaraco/keyring/master/CHANGES.rst" distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz" -checksum=b7e0156667f5dcc73c1f63a518005cd18a4eb23fe77321194fefcc03748b21a4 +checksum=9012508e141a80bd1c0b6778d5c610dd9f8c464d75ac6774248500503f972fb9 post_install() { vlicense LICENSE From 9c0521522dc4ec0040559a79f13984ec1da1a624 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Apr 2022 14:16:57 +0200 Subject: [PATCH 0727/2369] perl-LWP: update to 6.62. --- srcpkgs/perl-LWP/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template index d3136bc16c9..b878123cf00 100644 --- a/srcpkgs/perl-LWP/template +++ b/srcpkgs/perl-LWP/template @@ -1,6 +1,6 @@ # Template file for 'perl-LWP' pkgname=perl-LWP -version=6.61 +version=6.62 revision=1 wrksrc="libwww-perl-${version}" build_style=perl-module @@ -17,4 +17,4 @@ maintainer="Leah Neukirchen " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/libwww-perl" distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz" -checksum=2f69069bd0df0ee222e25d41093bcc42e58d0a45885fba400356454c25621a5f +checksum=569ac15eb69d54b2a8d932403610690b89c68d6a987eab2f627c0639bae7de18 From e53ea65eb80eea1597669e4ccf40639b7c1a9d2d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Apr 2022 14:21:11 +0200 Subject: [PATCH 0728/2369] tgt: update to 1.0.82. --- srcpkgs/tgt/template | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template index 5bf3d09a707..653ebf2dc35 100644 --- a/srcpkgs/tgt/template +++ b/srcpkgs/tgt/template @@ -1,6 +1,6 @@ # Template file for 'tgt' pkgname=tgt -version=1.0.81 +version=1.0.82 revision=1 build_style=gnu-makefile make_install_args="sbindir=/usr/bin" @@ -13,17 +13,12 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://github.com/fujita/tgt" distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz" -checksum=f8a285549456f13fecf628131a73934ffcbb701bacb7d5802acee7b515ab5452 +checksum=35156277465e0ced5f3ca7e301110a937a7a2b90bbb5aecbca1349b91ada1c2c post_extract() { sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile - sed -i '/^LDFLAGS/d; /CC.*-o/s/$/ $(LDFLAGS)/' usr/Makefile - sed -i '1i#include ' usr/tgtd.h usr/util.h - sed -i '1i#include ' usr/libssc.c - sed -i '1i#include ' usr/bs_sg.c - sed -i 's/__always_inline/inline/g' usr/util.h - } + post_install() { for f in ${DESTDIR}/etc/tgt/examples/*; do vsconf $f From 16865d15f36e566dc7fa0378d469cf50d4fd24c3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Apr 2022 14:21:50 +0200 Subject: [PATCH 0729/2369] ugrep: update to 3.7.8. --- srcpkgs/ugrep/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template index 795927e8ab5..2c25a04aa89 100644 --- a/srcpkgs/ugrep/template +++ b/srcpkgs/ugrep/template @@ -1,6 +1,6 @@ # Template file for 'ugrep' pkgname=ugrep -version=3.7.7 +version=3.7.8 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=5490d6491267bb1aaaeac27a0ba41d502f4b1c1b8998b8cc377c91374603932d +checksum=b2e03615890b92df4487a2891bf47675429c469b1825d5d05600ed3a729b92c7 post_install() { vlicense LICENSE.txt LICENSE From c3aa068ea443d1d642d24d2803a59595066e0bb8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Apr 2022 17:10:09 +0200 Subject: [PATCH 0730/2369] texlive2021-bin: fix repo url. --- srcpkgs/texlive2021-bin/INSTALL | 4 ++-- srcpkgs/texlive2021-bin/template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/texlive2021-bin/INSTALL b/srcpkgs/texlive2021-bin/INSTALL index bc296786a54..9b4952b0cc6 100644 --- a/srcpkgs/texlive2021-bin/INSTALL +++ b/srcpkgs/texlive2021-bin/INSTALL @@ -5,10 +5,10 @@ post) cd opt/texlive2021-installer case "${ARCH}" in x86_64-musl) - ./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile -force-platform x86_64-linuxmusl + ./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/tlnet-final/ -profile void.profile -force-platform x86_64-linuxmusl ;; *) - ./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile + ./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/tlnet-final/ -profile void.profile ;; esac esac diff --git a/srcpkgs/texlive2021-bin/template b/srcpkgs/texlive2021-bin/template index c7bbe1f9fdb..3212ec2a5ff 100644 --- a/srcpkgs/texlive2021-bin/template +++ b/srcpkgs/texlive2021-bin/template @@ -1,7 +1,7 @@ # Template file for 'texlive2021-bin' pkgname=texlive2021-bin version=2021 -revision=2 +revision=3 archs="x86_64* i686 aarch64 arm*" create_wrksrc=yes depends="cairo pixman graphite gd poppler libsigsegv From 1f77f958815276df63384319bcb83450f94c292f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Apr 2022 17:10:35 +0200 Subject: [PATCH 0731/2369] texlive-bin: update to 2022. --- srcpkgs/texlive-bin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/texlive-bin/template b/srcpkgs/texlive-bin/template index af5517c46eb..26866c5e584 100644 --- a/srcpkgs/texlive-bin/template +++ b/srcpkgs/texlive-bin/template @@ -1,6 +1,6 @@ # Template file for 'texlive-bin' pkgname=texlive-bin -version=2021 +version=2022 revision=1 depends="texlive${version}-bin" short_desc="TeX Live Binary distribution through tl-install (newest version)" From ba6232a265b26f4d4a5e1458730043a6d51961b2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Apr 2022 18:08:58 +0200 Subject: [PATCH 0732/2369] cronie: backport upstream regression fix. https://github.com/cronie-crond/cronie/commit/62e53f1cdb9c1e12a01ee7814c92cd937d50328d Closes #36554. --- srcpkgs/cronie/patches/62e53f1.patch | 21 +++++++++++++++++++++ srcpkgs/cronie/template | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/cronie/patches/62e53f1.patch diff --git a/srcpkgs/cronie/patches/62e53f1.patch b/srcpkgs/cronie/patches/62e53f1.patch new file mode 100644 index 00000000000..160c0311641 --- /dev/null +++ b/srcpkgs/cronie/patches/62e53f1.patch @@ -0,0 +1,21 @@ +From 62e53f1cdb9c1e12a01ee7814c92cd937d50328d Mon Sep 17 00:00:00 2001 +From: w30023233 +Date: Wed, 23 Mar 2022 15:40:01 +0800 +Subject: [PATCH] Fix regression in handling 1-5 crontab entries + +--- + src/entry.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/entry.c b/src/entry.c +index e9e258b..bb7cb62 100644 +--- a/src/entry.c ++++ b/src/entry.c +@@ -595,6 +595,7 @@ get_range(bitstr_t * bits, int low, int high, const char *names[], + return (EOF); + + case R_RANGE: ++ unget_char(ch, file); + if (get_number(&num2, low, names, file) != EOF) { + state = R_RANGE_NUM2; + break; diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template index 526f59b4d83..e8f45b3ff90 100644 --- a/srcpkgs/cronie/template +++ b/srcpkgs/cronie/template @@ -1,7 +1,7 @@ # Template file for 'cronie' pkgname=cronie version=1.6.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-inotify --without-selinux --with-pam --enable-anacron --enable-pie --enable-relro" From a87ea0c2858d65450c5e30b715f2a0ff97652926 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Apr 2022 18:37:58 +0200 Subject: [PATCH 0733/2369] zlib: backport crc32 fix. https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Closes #36537. --- srcpkgs/zlib/patches/crc32.patch | 51 ++++++++++++++++++++++++++++++++ srcpkgs/zlib/template | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/zlib/patches/crc32.patch diff --git a/srcpkgs/zlib/patches/crc32.patch b/srcpkgs/zlib/patches/crc32.patch new file mode 100644 index 00000000000..85a6a7e3ab4 --- /dev/null +++ b/srcpkgs/zlib/patches/crc32.patch @@ -0,0 +1,51 @@ +From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Wed, 30 Mar 2022 11:14:53 -0700 +Subject: [PATCH] Correct incorrect inputs provided to the CRC functions. + +The previous releases of zlib were not sensitive to incorrect CRC +inputs with bits set above the low 32. This commit restores that +behavior, so that applications with such bugs will continue to +operate as before. +--- + crc32.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/crc32.c b/crc32.c +index a1bdce5c2..451887bc7 100644 +--- a/crc32.c ++++ b/crc32.c +@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) + #endif /* DYNAMIC_CRC_TABLE */ + + /* Pre-condition the CRC */ +- crc ^= 0xffffffff; ++ crc = (~crc) & 0xffffffff; + + /* Compute the CRC up to a word boundary. */ + while (len && ((z_size_t)buf & 7) != 0) { +@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) + #endif /* DYNAMIC_CRC_TABLE */ + + /* Pre-condition the CRC */ +- crc ^= 0xffffffff; ++ crc = (~crc) & 0xffffffff; + + #ifdef W + +@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2) + #ifdef DYNAMIC_CRC_TABLE + once(&made, make_crc_table); + #endif /* DYNAMIC_CRC_TABLE */ +- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2; ++ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff); + } + + /* ========================================================================= */ +@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op) + uLong crc2; + uLong op; + { +- return multmodp(op, crc1) ^ crc2; ++ return multmodp(op, crc1) ^ (crc2 & 0xffffffff); + } diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template index 6dbe3003220..d142f283fb0 100644 --- a/srcpkgs/zlib/template +++ b/srcpkgs/zlib/template @@ -1,7 +1,7 @@ # Template file for 'zlib' pkgname=zlib version=1.2.12 -revision=1 +revision=2 bootstrap=yes build_style=configure configure_args="--prefix=/usr --shared" From 000ae7643e3b8df6ba875bd83b88955d767e5289 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 17 Mar 2022 15:17:16 +0100 Subject: [PATCH 0734/2369] notion: update to 4.0.2. - Fix homepage - Fix musl (backport upstream patch) - Fix nonfree, upstream should be proper LGPL-2.1-or-later now - Use Lua 5.4 --- srcpkgs/notion/patches/stdout.patch | 89 +++++++++++++++++++++++++++++ srcpkgs/notion/template | 18 +++--- 2 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 srcpkgs/notion/patches/stdout.patch diff --git a/srcpkgs/notion/patches/stdout.patch b/srcpkgs/notion/patches/stdout.patch new file mode 100644 index 00000000000..b4200f680d2 --- /dev/null +++ b/srcpkgs/notion/patches/stdout.patch @@ -0,0 +1,89 @@ +From de9e19940c2c88c848b7f849fb014fafd77d7d93 Mon Sep 17 00:00:00 2001 +From: c0dev0id +Date: Sat, 10 Apr 2021 02:03:44 +0200 +Subject: [PATCH] Fix compilation on OpenBSD + +The variable name "stdout" is defined in stdio.h on OpenBSD already. +--- + mod_notionflux/mod_notionflux.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/mod_notionflux/mod_notionflux.c b/mod_notionflux/mod_notionflux.c +index f2bd4427..51949e07 100644 +--- a/mod_notionflux/mod_notionflux.c ++++ b/mod_notionflux/mod_notionflux.c +@@ -36,7 +36,7 @@ + + typedef struct{ + int fd; +- FILE *stdout; ++ FILE *stdoutput; + int ndata; + char *data; + } Buf; +@@ -64,9 +64,9 @@ static void close_conn(Buf *buf) + close(buf->fd); + buf->fd=-1; + buf->ndata=0; +- if(buf->stdout!=NULL){ +- fclose(buf->stdout); +- buf->stdout=NULL; ++ if(buf->stdoutput!=NULL){ ++ fclose(buf->stdoutput); ++ buf->stdoutput=NULL; + } + if(buf->data!=NULL){ + free(buf->data); +@@ -147,11 +147,11 @@ static void receive_data(int fd, void *buf_) + bool success=FALSE; + int idx=buf-bufs; + +- if(buf->stdout==NULL){ /* no fd received yet, must be the very beginning */ +- int stdout_fd=unix_recv_fd(fd); +- if(stdout_fd==-2) ++ if(buf->stdoutput==NULL){ /* no fd received yet, must be the very beginning */ ++ int stdoutput_fd=unix_recv_fd(fd); ++ if(stdoutput_fd==-2) + goto closefd; +- if(stdout_fd==-3){ ++ if(stdoutput_fd==-3){ + char const *err="Magic number mismatch on notionflux socket - " + "is notionflux the same version as notion?"; + writes(fd, "E"); +@@ -160,13 +160,13 @@ static void receive_data(int fd, void *buf_) + goto closefd; + } + +- if(stdout_fd==-1) { ++ if(stdoutput_fd==-1) { + if(errno==EWOULDBLOCK || errno==EAGAIN) + return; /* try again later */ + warn("No file descriptor received from notionflux, closing."); + goto closefd; + } +- if((buf->stdout=fdopen(stdout_fd, "w"))==NULL) { ++ if((buf->stdoutput=fdopen(stdoutput_fd, "w"))==NULL) { + warn("fdopen() failed on fd from notionflux"); + goto closefd; + } +@@ -239,9 +239,9 @@ EXTL_SAFE + EXTL_EXPORT + bool mod_notionflux_xwrite(int idx, const char *str) + { +- if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdout==NULL) ++ if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdoutput==NULL) + return FALSE; +- return fputs(str, bufs[idx].stdout)!=EOF; ++ return fputs(str, bufs[idx].stdoutput)!=EOF; + } + + static void connection_attempt(int lfd, void *UNUSED(data)) +@@ -410,7 +410,7 @@ bool mod_notionflux_init() + + for(i=0; i Date: Fri, 11 Mar 2022 16:00:18 +0100 Subject: [PATCH 0735/2369] xinit: remove skel files. We shipped two skeleton files for ~/.xinitrc and ~/.xsession, but the default behavior of xinit/startx is more useful than an .xinitrc that doesn't start a window manager, and the .xsession had a bug calling bash -i which resulted in appending the .xinitrc into the user history... drop this unnecessary stuff. Users can copy /etc/X11/xinit/xinitrc as a starting point. --- srcpkgs/xinit/files/xinitrc | 17 ----------------- srcpkgs/xinit/files/xsession | 10 ---------- srcpkgs/xinit/template | 8 ++------ 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/xinit/files/xinitrc delete mode 100644 srcpkgs/xinit/files/xsession diff --git a/srcpkgs/xinit/files/xinitrc b/srcpkgs/xinit/files/xinitrc deleted file mode 100644 index dbd080d0036..00000000000 --- a/srcpkgs/xinit/files/xinitrc +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# ~/.xinitrc -# -# Executed by startx (run your window manager from here) - -if [ -d /etc/X11/xinit/xinitrc.d ]; then - for f in /etc/X11/xinit/xinitrc.d/*; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -# exec gnome-session -# exec startkde -# exec startxfce4 -# ...or the Window Manager of your choice diff --git a/srcpkgs/xinit/files/xsession b/srcpkgs/xinit/files/xsession deleted file mode 100644 index a16dc0b8421..00000000000 --- a/srcpkgs/xinit/files/xsession +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# -# ~/.xsession -# -# Executed by xdm/gdm/kdm at login -# - -/bin/bash --login -i ~/.xinitrc - diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template index be836ebc94a..b687c0ccd2c 100644 --- a/srcpkgs/xinit/template +++ b/srcpkgs/xinit/template @@ -1,7 +1,7 @@ # Template file for 'xinit' pkgname=xinit version=1.4.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-xinitdir=/etc/X11/xinit" hostmakedepends="pkg-config" @@ -15,13 +15,9 @@ checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9 conf_files=" /etc/X11/xinit/xinitrc - /etc/X11/xinit/xserverrc - /etc/skel/.xinitrc - /etc/skel/.xsession" + /etc/X11/xinit/xserverrc" post_install() { - vinstall ${FILESDIR}/xinitrc 644 etc/skel .xinitrc - vinstall ${FILESDIR}/xsession 644 etc/skel .xsession vinstall ${FILESDIR}/xserverrc 644 etc/X11/xinit vlicense COPYING } From 7d1cb49a6daebde79132bbd3d910ed716bbf59f6 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 19:10:10 +0100 Subject: [PATCH 0736/2369] xine-lib: update to 1.2.12. --- srcpkgs/xine-lib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template index 51cbd363f7b..f713eff49b0 100644 --- a/srcpkgs/xine-lib/template +++ b/srcpkgs/xine-lib/template @@ -1,6 +1,6 @@ # Template file for 'xine-lib' pkgname=xine-lib -version=1.2.11 +version=1.2.12 revision=1 build_style=gnu-configure configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3 @@ -19,7 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://www.xine-project.org" changelog="https://sourceforge.net/projects/xine/files/xine-lib/${version}/README.txt/view" distfiles="${SOURCEFORGE_SITE}/xine/${pkgname}-${version}.tar.xz" -checksum=ef51b21d10dda1045fa7d711bd9171cfdaf0a5a2874233bcf16ffdf28ec07005 +checksum=d606270468e1540c2a89c0d7f5fdf11e17ecc0c2698cc0bcb1065ff26abee098 case "$XBPS_TARGET_MACHINE" in i686-musl) From d47d4e628a0e649aec62a2bf55001a9bd7ac1070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Mon, 14 Mar 2022 08:37:19 +0100 Subject: [PATCH 0737/2369] New package: python3-subprocess-tee-0.3.5 --- srcpkgs/python3-subprocess-tee/template | 26 +++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 srcpkgs/python3-subprocess-tee/template diff --git a/srcpkgs/python3-subprocess-tee/template b/srcpkgs/python3-subprocess-tee/template new file mode 100644 index 00000000000..39a0233dad7 --- /dev/null +++ b/srcpkgs/python3-subprocess-tee/template @@ -0,0 +1,26 @@ +# Template file for 'python3-subprocess-tee' +pkgname=python3-subprocess-tee +version=0.3.5 +revision=1 +wrksrc="${pkgname/python3-/}-${version}" +build_style=python3-pep517 +make_install_target="subprocess_tee-${version}-py3-none-any.whl" +hostmakedepends="python3-wheel python3-toml" +depends="python3" +short_desc="Replacement for subprocess.run capturing output while still printing it" +maintainer="Jan Christian Grünhage " +license="MIT" +homepage="https://github.com/pycontribs/subprocess-tee" +distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz" +checksum=ff5cced589a4b8ac973276ca1ba21bb6e3de600cde11a69947ff51f696efd577 +# requires molecule, which isn't packaged yet +make_check=no + +post_patch() { + # scm versioning is broken in this release + vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg +} + +post_install() { + vlicense LICENSE +} From 15c59d777eb01c7be8304d874d148c2bdc6d9636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Mon, 14 Mar 2022 08:38:01 +0100 Subject: [PATCH 0738/2369] New package: python3-ansible-compat-2.0.0 --- srcpkgs/python3-ansible-compat/template | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 srcpkgs/python3-ansible-compat/template diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template new file mode 100644 index 00000000000..bf03fe221d0 --- /dev/null +++ b/srcpkgs/python3-ansible-compat/template @@ -0,0 +1,24 @@ +# Template file for 'python3-ansible-compat' +pkgname=python3-ansible-compat +version=2.0.0 +revision=1 +wrksrc="${pkgname/python3-/}-${version}" +build_style=python3-pep517 +make_install_target="ansible_compat-${version}-py3-none-any.whl" +hostmakedepends="python3-wheel python3-toml" +depends="python3-subprocess-tee" +short_desc="Python package for working with various version of ansible" +maintainer="Jan Christian Grünhage " +license="MIT" +homepage="https://github.com/ansible-community/ansible-compat" +distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz" +checksum=4027da4ec2b524c263a801cc2dc6da2b98c2996cec258cef118a30c790467ed2 + +post_patch() { + # scm versioning is broken in this release + vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg +} + +post_install() { + vlicense LICENSE +} From 302cd0dcae2cd7b60d6937bc87e47d0655095eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Mon, 14 Mar 2022 08:38:12 +0100 Subject: [PATCH 0739/2369] python3-ansible-lint: update to 6.0.2. --- srcpkgs/python3-ansible-lint/template | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template index 78d31ea9063..00d8dc40f6a 100644 --- a/srcpkgs/python3-ansible-lint/template +++ b/srcpkgs/python3-ansible-lint/template @@ -1,18 +1,25 @@ # Template file for 'python3-ansible-lint' pkgname=python3-ansible-lint -version=5.4.0 +version=6.0.2 revision=1 wrksrc="${pkgname/python3-/}-${version}" build_style=python3-pep517 make_install_target="ansible_lint-${version}-py3-none-any.whl" hostmakedepends="python3-wheel python3-toml" -depends="ansible-core python3-yamllint python3-six python3-yaml python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch" +depends="ansible-core python3-yamllint python3-six python3-yaml + python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch + python3-ansible-compat" short_desc="Linter for Ansible files" maintainer="Jan Christian Grünhage " -license="MIT" +# Note about licensing from upstream: +# The ansible-lint project is distributed as GPLv3 due to use of GPLv3 runtime +# dependencies, like ansible and yamllint. For historical reasons, its own +# code-base remains licensed under a more liberal MIT license and any +# contributions made are accepted as being made under original MIT license. +license="GPL-3.0-only" homepage="https://github.com/ansible-community/ansible-lint" distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz" -checksum=2160a60b4ab034c04006d701a1779340ffb0f6e28f030ff8de958e1062a88962 +checksum=b539bc22d13e6de0cc2e25758e1d28b2bc01561a414ae37ceda3708b5a2a79ed # 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 @@ -22,7 +29,3 @@ post_patch() { # scm versioning is broken in this release vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg } - -post_install() { - vlicense LICENSE -} From bc110344637a88a17b7d886cfa734234451dd123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sat, 26 Mar 2022 12:20:51 +0100 Subject: [PATCH 0740/2369] ansible: update to 5.5.0. --- srcpkgs/ansible/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index eb132fa6838..063e24d1684 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=5.4.0 +version=5.5.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=2f0ecbd8a3232e520bf3e3bc23f40dda60b9ce7924ca194bd35f4de4027100fc +checksum=b8a76d737889c9bfd0e6b0f2276dcf8d836da667067a355776f3504d7a66d518 # 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 5067e239ec012034bedb6f709a9978cfa0afe519 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:50:25 -0400 Subject: [PATCH 0741/2369] openjdk12-bootstrap: fix version, xlint --- srcpkgs/openjdk12-bootstrap/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template index 4861ad1efc4..2b5d421a52f 100644 --- a/srcpkgs/openjdk12-bootstrap/template +++ b/srcpkgs/openjdk12-bootstrap/template @@ -1,15 +1,12 @@ # Template file for 'openjdk12-bootstrap' -_java_ver=12 -_java_min_ver=0 -_java_sec_ver=2 -_jdk_update=10 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk12-bootstrap -version="${_base_version}+${_jdk_update}" +version=12.0.2+10 revision=1 -wrksrc="jdk${_java_ver}u-jdk-${version}" +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib @@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel" -provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 12)" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="https://openjdk.java.net" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb +provides="java-environment-${version}_1 java-runtime-${version}_1" lib32disabled=yes nocross=yes From 3ad60fcaae007b5e516835e48d595af0ea7b3cfd Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:50:26 -0400 Subject: [PATCH 0742/2369] openjdk13-bootstrap: fix version, xlint --- srcpkgs/openjdk13-bootstrap/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template index 82c34b7999f..4a61e102381 100644 --- a/srcpkgs/openjdk13-bootstrap/template +++ b/srcpkgs/openjdk13-bootstrap/template @@ -1,15 +1,12 @@ # Template file for 'openjdk13-bootstrap' -_java_ver=13 -_java_min_ver=0 -_java_sec_ver=2 -_jdk_update=8 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk13-bootstrap -version="${_base_version}+${_jdk_update}" +version=13.0.2+8 revision=1 -wrksrc="jdk${_java_ver}u-jdk-${version}" +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib @@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel" -provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 13)" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="https://openjdk.java.net/" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0 +provides="java-environment-${version}_1 java-runtime-${version}_1" lib32disabled=yes nocross=yes From 284711a4584f1e4afdf40026c779f01dff9ecacf Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:50:27 -0400 Subject: [PATCH 0743/2369] openjdk14-bootstrap: fix version, xlint --- srcpkgs/openjdk14-bootstrap/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template index 5c15ca3f32c..768b9463319 100644 --- a/srcpkgs/openjdk14-bootstrap/template +++ b/srcpkgs/openjdk14-bootstrap/template @@ -1,15 +1,12 @@ # Template file for 'openjdk14-bootstrap' -_java_ver=14 -_java_min_ver=0 -_java_sec_ver=2 -_jdk_update=12 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk14-bootstrap -version="${_base_version}+${_jdk_update}" +version=14.0.2+12 revision=1 -wrksrc="jdk${_java_ver}u-jdk-${version}" +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib @@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel openjdk13-bootstrap" -provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 14)" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935 +provides="java-environment-${version}_1 java-runtime-${version}_1" nocross=yes # Build is still parallel, but don't use -jN. From 2eb1ceafd61754dd2aac4505f51ac0d5724e93fd Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:50:28 -0400 Subject: [PATCH 0744/2369] openjdk15-bootstrap: fix version, xlint --- srcpkgs/openjdk15-bootstrap/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template index efbc69f9429..7608f4dd265 100644 --- a/srcpkgs/openjdk15-bootstrap/template +++ b/srcpkgs/openjdk15-bootstrap/template @@ -1,15 +1,12 @@ # Template file for 'openjdk15-bootstrap' -_java_ver=15 -_java_min_ver=0 -_java_sec_ver=3 -_jdk_update=3 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk15-bootstrap -version="${_base_version}+${_jdk_update}" +version=15.0.3+3 revision=1 -wrksrc="jdk${_java_ver}u-jdk-${version}" +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib @@ -38,7 +35,6 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk14-bootstrap" -provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 15)" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" @@ -47,6 +43,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk- https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz" checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c" +provides="java-environment-${version}_1 java-runtime-${version}_1" nocross=yes # Build is still parallel, but don't use -jN. From 371d8d96eda23693b0194b2c9938a2a25df3c0c9 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:50:29 -0400 Subject: [PATCH 0745/2369] openjdk16-bootstrap: fix version, xlint --- srcpkgs/openjdk16-bootstrap/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template index 9bea476c683..28e70a17fd2 100644 --- a/srcpkgs/openjdk16-bootstrap/template +++ b/srcpkgs/openjdk16-bootstrap/template @@ -1,15 +1,12 @@ # Template file for 'openjdk16-bootstrap' -_java_ver=16 -_java_min_ver=0 -_java_sec_ver=2 -_jdk_update=7 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk16-bootstrap -version="${_base_version}+${_jdk_update}" +version=16.0.2+7 revision=1 -wrksrc="jdk${_java_ver}u-jdk-${_base_version}-${_jdk_update}" +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --enable-unlimited-crypto @@ -38,7 +35,6 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk15-bootstrap" -provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 16)" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" @@ -47,6 +43,7 @@ distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.ta https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz" checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c" +provides="java-environment-${version}_1 java-runtime-${version}_1" nocross=yes # Build is still parallel, but don't use -jN. From 37580bc1f6d84802fec943fabe75b7ca62d18060 Mon Sep 17 00:00:00 2001 From: Mizuno Jan Yuta Date: Fri, 8 Apr 2022 01:05:47 +0900 Subject: [PATCH 0746/2369] mdocml: fix readability issues in void-man-cgi. Fix: #36557 --- srcpkgs/mdocml/files/void.css | 37 +++++++++++++++++++++++++---------- srcpkgs/mdocml/template | 2 +- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/srcpkgs/mdocml/files/void.css b/srcpkgs/mdocml/files/void.css index 28914506699..4e2f7535721 100644 --- a/srcpkgs/mdocml/files/void.css +++ b/srcpkgs/mdocml/files/void.css @@ -1,8 +1,24 @@ /** Void style **/ -body { color: #333; } -a { color: #478061; } -a:hover { color: #000; } +html { + --fg: #333; + --bg: #fff; + --fg-accent: #478061; + --nav-fg: #fff; + --nav-bg: #478061; +} +@media (prefers-color-scheme: dark) { + html { + --fg: #ccc; + --bg: #222; + --fg-accent: #62b086; + --nav-fg: #fff; + --nav-bg: #295340; + } +} + +a, :link, :visited { color: var(--fg-accent); } +a:hover { color: var(--fg); } html { max-width: 100% } body { margin: 0 } @@ -11,29 +27,30 @@ body { margin: 0 } nav#void-nav { width:100%; min-height:50px; - background:#478061; + color:var(--nav-fg); + background-color:var(--nav-bg); z-index:110; font-size:14px } nav#void-nav ul { - float:right; + display:block; list-style:none; margin:0 } nav#void-nav ul li { - float:left; + display:inline-block; margin:0; - clear:initial } nav#void-nav ul li a { - display:block; + display:inline-block; padding:15px; line-height:20px; font-size:1.2em; - color:#fff; + color:var(--nav-fg); text-decoration: none } nav#void-nav ul li a:hover,nav#void-nav ul li a:focus { - background:#000; + color:#fff; + background-color:#000; text-decoration:none } diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template index 41e07f089ab..e8aa98cdb15 100644 --- a/srcpkgs/mdocml/template +++ b/srcpkgs/mdocml/template @@ -1,7 +1,7 @@ # Template file for 'mdocml' pkgname=mdocml version=1.14.6 -revision=1 +revision=2 wrksrc="mandoc-${version}" build_style=configure make_build_args="all man.cgi" From 20596dc3a1dde41a6c9a8033f6c1f2100e66cce1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Apr 2022 19:01:04 +0200 Subject: [PATCH 0747/2369] mdocml: add padding to void-mang-cgi, limit line length. --- srcpkgs/mdocml/files/void.css | 2 +- srcpkgs/mdocml/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mdocml/files/void.css b/srcpkgs/mdocml/files/void.css index 4e2f7535721..89a9fb4b321 100644 --- a/srcpkgs/mdocml/files/void.css +++ b/srcpkgs/mdocml/files/void.css @@ -22,7 +22,7 @@ a:hover { color: var(--fg); } html { max-width: 100% } body { margin: 0 } -#mandoc { max-width: 65em; margin: 0.8em } +.manual-text { max-width: 65em; padding: 0 1em; } nav#void-nav { width:100%; diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template index e8aa98cdb15..e18de8b7adf 100644 --- a/srcpkgs/mdocml/template +++ b/srcpkgs/mdocml/template @@ -1,7 +1,7 @@ # Template file for 'mdocml' pkgname=mdocml version=1.14.6 -revision=2 +revision=3 wrksrc="mandoc-${version}" build_style=configure make_build_args="all man.cgi" From ffa3542bfefadef048ebaf21b50fa6331b03b6be Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 7 Apr 2022 11:44:33 -0500 Subject: [PATCH 0748/2369] xmandump: update to 0.2.2. --- srcpkgs/xmandump/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template index ae17bbcefa4..b05027396ea 100644 --- a/srcpkgs/xmandump/template +++ b/srcpkgs/xmandump/template @@ -1,6 +1,6 @@ # Template file for 'xmandump' pkgname=xmandump -version=0.2.1 +version=0.2.2 revision=1 build_style=go go_import_path="github.com/void-linux/xmandump" @@ -10,7 +10,7 @@ maintainer="Érico Nogueira " license="ISC" homepage="https://github.com/void-linux/xmandump" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=ca261e075940c97cb3ad639e4c8b746fa93bc7559032bc1ada3858c63658d014 +checksum=c664b84b9eb26e6cf6d7bc0aceca9a2ccfcfb1c0a4e0611544117489941c00ca post_install() { vlicense LICENSE.txt LICENSE From fbb9436eb0aed0b08da1998cd2f978ef0794aee9 Mon Sep 17 00:00:00 2001 From: iaroki Date: Sat, 2 Apr 2022 23:59:42 +0300 Subject: [PATCH 0749/2369] vault: update to 1.10.0. --- srcpkgs/vault/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template index 4746d497419..49f6a4b405b 100644 --- a/srcpkgs/vault/template +++ b/srcpkgs/vault/template @@ -1,6 +1,6 @@ # Template file for 'vault' pkgname=vault -version=1.9.4 +version=1.10.0 revision=1 build_style=go go_import_path="github.com/hashicorp/vault" @@ -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=7ebae46e12ff353c3a9e861c4991410679a3c890d36c7c6fb17b43e9ea6f6115 +checksum=4b3303af72b9383369d6219dc88beaef3b343b262625e5d7c6a309ae9286d8c2 system_accounts="_vault" make_dirs="/var/lib/vault 0700 _vault _vault /etc/vault 0750 root _vault" From e3e54596400b97b4aee5e20e64569d1ba018032f Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sat, 2 Apr 2022 16:22:04 +0530 Subject: [PATCH 0750/2369] avrdude: update to 6.4, adopt --- srcpkgs/avrdude/template | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/srcpkgs/avrdude/template b/srcpkgs/avrdude/template index ec6866e05ba..5ebe45ae47e 100644 --- a/srcpkgs/avrdude/template +++ b/srcpkgs/avrdude/template @@ -1,15 +1,21 @@ # Template file for 'avrdude' pkgname=avrdude -version=6.3 -revision=3 +version=6.4 +revision=1 build_style=gnu-configure +configure_args="$(vopt_enable gpio linuxgpio) $(vopt_enable spi linuxspi)" hostmakedepends="flex" -makedepends="elfutils-devel libusb-devel libusb-compat-devel libftdi1-devel" +makedepends="elfutils-devel libusb-devel libusb-compat-devel libftdi1-devel + hidapi-devel" depends="avr-libc" short_desc="Utility to manipulate ROM and EEPROM of AVR microcontrollers" -maintainer="allan " +maintainer="Subhaditya Nath " license="GPL-2.0-only" homepage="http://www.nongnu.org/avrdude/" distfiles="$NONGNU_SITE/$pkgname/${pkgname}-$version.tar.gz" -checksum=0f9f731b6394ca7795b88359689a7fa1fba818c6e1d962513eb28da670e0a196 +checksum=a9be7066f70a9dcf4bf0736fcf531db6a3250aed1a24cc643add27641b7110f9 conf_files="/etc/avrdude.conf" +build_options="gpio spi" +desc_option_spi="Enable LINUXSPI support" +desc_option_gpio="Enable LINUXGPIO support" +build_options_default="${build_options}" From 665667d5aadc811d1fe8a4c0cbc6d34cc3c668fe Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 27 Mar 2022 12:08:58 +0200 Subject: [PATCH 0751/2369] exa: adopt and adjust dependencies --- srcpkgs/exa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template index d2eb81a34ec..660f997c809 100644 --- a/srcpkgs/exa/template +++ b/srcpkgs/exa/template @@ -3,10 +3,10 @@ pkgname=exa version=0.10.1 revision=1 build_style=cargo -hostmakedepends="pkg-config libgit2-devel" +hostmakedepends="pkg-config" makedepends="libgit2-devel" short_desc="Modern replacement for ls" -maintainer="Orphaned " +maintainer="Marcin Puc " license="MIT" homepage="https://the.exa.website/" distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz From 49f2f4bfeb7bfe3af0497b5eff82b78ad91f8e4d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Tue, 8 Mar 2022 12:47:25 +0100 Subject: [PATCH 0752/2369] muffin: update to 5.2.1. --- srcpkgs/muffin/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template index 830922739b4..cb8032a75d2 100644 --- a/srcpkgs/muffin/template +++ b/srcpkgs/muffin/template @@ -1,6 +1,6 @@ # Template file for 'muffin' pkgname=muffin -version=5.2.0 +version=5.2.1 revision=1 build_style=gnu-configure build_helper=gir @@ -15,8 +15,9 @@ short_desc="Cinnamon window manager based on Mutter" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/linuxmint/muffin" +changelog="https://raw.githubusercontent.com/linuxmint/muffin/master/debian/changelog" distfiles="https://github.com/linuxmint/muffin/archive/${version}.tar.gz" -checksum=8366569f27a62913dade9935e0688b3636ca11b8ee00a061c9fdcbb6b27f3e2f +checksum=356a9fce1f4e9f39a6e0156c5dcab1e4190113a191cf1422d1ea08dbea4bfda4 shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so libmuffin-cogl-path-0.so libmuffin-cogl-0.so" From c93bb8700a7745c694a87f3e2eecf85bd4ee088f Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Mon, 7 Mar 2022 16:12:00 +0100 Subject: [PATCH 0753/2369] libvdpau: update to 1.5. --- srcpkgs/libvdpau/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libvdpau/template b/srcpkgs/libvdpau/template index 8b1c817cfd0..fcc2b6fcfd5 100644 --- a/srcpkgs/libvdpau/template +++ b/srcpkgs/libvdpau/template @@ -1,6 +1,6 @@ # Template file for 'libvdpau' pkgname=libvdpau -version=1.4 +version=1.5 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="MIT" homepage="https://freedesktop.org/wiki/Software/VDPAU/" distfiles="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/libvdpau-${version}.tar.gz" -checksum=240dd8f9ec08de707529917677827ba12e13b9fc299eeb3af13ea05e7fc74aba +checksum=66490802f30426d30ff9e8af35263bbbbaa23b52d0a2d797d06959c3d19638fd post_install() { vlicense COPYING From 08329ee9e743b72e5f6bbf2752450350c4699d43 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Mon, 7 Mar 2022 16:12:04 +0100 Subject: [PATCH 0754/2369] vdpauinfo: update to 1.4. --- srcpkgs/vdpauinfo/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/vdpauinfo/template b/srcpkgs/vdpauinfo/template index 611b5d86401..9b71a655a93 100644 --- a/srcpkgs/vdpauinfo/template +++ b/srcpkgs/vdpauinfo/template @@ -1,16 +1,17 @@ # Template file for 'vdpauinfo' pkgname=vdpauinfo -version=1.0 -revision=3 +_glhash=8f047eac351672cc4316724edb6ad2b2 +version=1.4 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libvdpau-devel" short_desc="Command line utility for querying the capabilities of a VDPAU device" maintainer="Orphaned " license="MIT" -homepage="http://cgit.freedesktop.org/~aplattner/vdpauinfo" -distfiles="http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${version}.tar.gz" -checksum=4054960b7ae618c351ff1ce3e7831b5cbda964ae1fbf9969b7146404d3044bc4 +homepage="https://freedesktop.org/wiki/Software/VDPAU/" +distfiles="https://gitlab.freedesktop.org/vdpau/vdpauinfo/uploads/${_glhash}/vdpauinfo-${version}.tar.gz" +checksum=40188bc5671c139e58330dbcac2a6ced0064485cb4cdf368558feca17d7922a0 post_install() { vlicense COPYING From e10a7ebe88f1f2c6fbedaa6b3089bc44bda594fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 9 Feb 2022 17:53:05 +0100 Subject: [PATCH 0755/2369] cargo-deny: update to 0.11.3. --- srcpkgs/cargo-deny/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template index 6adc1fdd9cf..4045e5a8c56 100644 --- a/srcpkgs/cargo-deny/template +++ b/srcpkgs/cargo-deny/template @@ -1,6 +1,6 @@ # Template file for 'cargo-deny' pkgname=cargo-deny -version=0.10.1 +version=0.11.3 revision=1 build_style=cargo configure_args="--no-default-features" @@ -10,13 +10,18 @@ short_desc="Cargo plugin to help you manage large dependency graphs" maintainer="Jan Christian Grünhage " license="MIT, Apache-2.0" homepage="https://github.com/EmbarkStudios/cargo-deny" +changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-deny/main/CHANGELOG.md" distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz" -checksum=136764d16b6d60fc9ddec4989ab4cb2bdcee9a096d0f3cd40b1c574bcc1b7f44 +checksum=d9e6adc8342d69b84b4c4e6b1d34eaaf0750b4680a9c675c8c74659a8c27cfc8 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then broken="bitvec crate unimplemented for big endian" fi +post_patch() { + cargo update --package autocfg --precise 1.1.0 +} + post_install() { vlicense LICENSE-APACHE vlicense LICENSE-MIT From d98d90a280d8b518ca022603d978c8cf4b25af40 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 16:11:31 +0100 Subject: [PATCH 0756/2369] libva: update to 2.14.0. --- srcpkgs/libva/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template index bcf4c8003d7..093f7b86355 100644 --- a/srcpkgs/libva/template +++ b/srcpkgs/libva/template @@ -1,7 +1,7 @@ # Template file for 'libva' # NOTE: keep this pkg synchronized with libva-glx pkgname=libva -version=2.13.0 +version=2.14.0 revision=1 build_style=meson configure_args="-Dwith_glx=no" @@ -14,7 +14,7 @@ license="MIT" homepage="https://01.org/linuxmedia/vaapi" changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS" distfiles="https://github.com/intel/libva/archive/${version}.tar.gz" -checksum=6b7ec7d4fa204dad3f266450981f1f0892400c03afd3e00ac11f8ccade5aaaa1 +checksum=f21152a2170edda9d1c4dd463d52eaf62b553e83e553c0a946654523cca86d5e build_options="wayland" build_options_default="wayland" From b412c0cfd21a86b25fdd66feccc517e93d3d7633 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 16:11:35 +0100 Subject: [PATCH 0757/2369] libva-glx: update to 2.14.0. --- srcpkgs/libva-glx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libva-glx/template b/srcpkgs/libva-glx/template index 268daeda3f3..b8411bcb09f 100644 --- a/srcpkgs/libva-glx/template +++ b/srcpkgs/libva-glx/template @@ -7,7 +7,7 @@ # KEEP THIS PACKAGE SYNCHRONIZED WITH "libva". # pkgname=libva-glx -version=2.13.0 +version=2.14.0 revision=1 wrksrc="libva-${version}" build_style=meson @@ -20,7 +20,7 @@ license="MIT" homepage="https://01.org/linuxmedia/vaapi" changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS" distfiles="https://github.com/intel/libva/archive/${version}.tar.gz" -checksum=6b7ec7d4fa204dad3f266450981f1f0892400c03afd3e00ac11f8ccade5aaaa1 +checksum=f21152a2170edda9d1c4dd463d52eaf62b553e83e553c0a946654523cca86d5e post_install() { # We are only interested in the glx component, remove everything else. From bc00558485450291c2854167114862b2d696315e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 16:11:39 +0100 Subject: [PATCH 0758/2369] libva-utils: update to 2.14.0. --- srcpkgs/libva-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libva-utils/template b/srcpkgs/libva-utils/template index 0cf9bd48088..b98e3e9f73a 100644 --- a/srcpkgs/libva-utils/template +++ b/srcpkgs/libva-utils/template @@ -1,6 +1,6 @@ # Template file for 'libva-utils' pkgname=libva-utils -version=2.13.0 +version=2.14.0 revision=1 build_style=meson configure_args="-Ddrm=true -Dx11=true -Dwayland=true" @@ -13,7 +13,7 @@ license="MIT" homepage="https://01.org/linuxmedia/vaapi" changelog="https://raw.githubusercontent.com/intel/libva-utils/master/NEWS" distfiles="https://github.com/intel/libva-utils/archive/${version}.tar.gz" -checksum=128333faa9792a3b87586a80bfb70859dcdd81847ec9a722f785a601a48e1731 +checksum=0ad6410aaa27d7b15dadee0f4d775d54d6394b582bf315353a4657b49c78ac31 post_install() { vlicense COPYING From d752ab8f908d1dd2a758d53dbd10a863893e5697 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Sun, 13 Feb 2022 08:58:24 +0000 Subject: [PATCH 0759/2369] iproute2: update to 5.16.0. --- ...0001-lib-fix-ax25.h-include-for-musl.patch | 36 +++++++++++++++++++ srcpkgs/iproute2/template | 4 +-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch diff --git a/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch b/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch new file mode 100644 index 00000000000..401965b0a34 --- /dev/null +++ b/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch @@ -0,0 +1,36 @@ +From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Thu, 13 Jan 2022 08:14:13 +0000 +Subject: [PATCH] lib: fix ax25.h include for musl + +ax25.h isn't guaranteed to be avilable in netax25/*; +it's dependent on our choice of libc (it's not available +on musl at least) [0]. + +Let's use the version from linux-headers. + +[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers +Bug: https://bugs.gentoo.org/831102 + +Signed-off-by: Sam James +Signed-off-by: Stephen Hemminger +--- + lib/ax25_ntop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c +index cfd0e04b06f9..3a72a43e9b77 100644 +--- a/lib/ax25_ntop.c ++++ b/lib/ax25_ntop.c +@@ -2,7 +2,7 @@ + + #include + #include +-#include ++#include + + #include "utils.h" + +-- +2.35.1 + diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template index 8f517150839..9dbba00b6fe 100644 --- a/srcpkgs/iproute2/template +++ b/srcpkgs/iproute2/template @@ -1,6 +1,6 @@ # Template file for 'iproute2' pkgname=iproute2 -version=5.12.0 +version=5.16.0 revision=1 build_style=configure make_install_args="SBINDIR=/usr/bin" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://wiki.linuxfoundation.org/networking/iproute2" distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=9d268db98a36ee2a0e3ff3b92b2efff66fc1138a51e409bdef6ab3cfe15f326f +checksum=c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f conf_files=" /etc/iproute2/ematch_map From 95cddada7d7b822a885c5360bf3c353805f0a197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sun, 6 Feb 2022 12:01:07 -0300 Subject: [PATCH 0760/2369] findutils: update to 4.9.0. --- srcpkgs/findutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template index b35980a49d9..aae4919f2ee 100644 --- a/srcpkgs/findutils/template +++ b/srcpkgs/findutils/template @@ -1,6 +1,6 @@ # Template file for 'findutils' pkgname=findutils -version=4.8.0 +version=4.9.0 revision=1 bootstrap=yes build_style=gnu-configure @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/findutils" changelog="https://git.savannah.gnu.org/cgit/findutils.git/plain/NEWS" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164 +checksum=a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe if [ "$XBPS_TARGET_LIBC" = musl ]; then export ac_cv_lib_error_at_line=no From e3901bf5448c0f1609e94001fac3711a7f73f359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Tue, 1 Feb 2022 23:06:24 +0100 Subject: [PATCH 0761/2369] ethtool: update to 5.16. --- srcpkgs/ethtool/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template index 66add241d5e..26ea94680d6 100644 --- a/srcpkgs/ethtool/template +++ b/srcpkgs/ethtool/template @@ -1,6 +1,6 @@ # Template file for 'ethtool' pkgname=ethtool -version=5.14 +version=5.16 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -8,6 +8,6 @@ makedepends="libmnl-devel" short_desc="Utility for controlling network drivers and hardware" maintainer="Enno Boland " license="GPL-2.0-only" -homepage="http://www.kernel.org/pub/software/network/ethtool/" -distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=bb13db91915cacd7a492b65b65df07a67e4b974ddbeaf76205b1945a23d27686 +homepage="https://www.kernel.org/pub/software/network/ethtool/" +distfiles="https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz" +checksum=aa2fef1936dd4a11755dfa0bdb93f0ec5bea45208d27c9754bc3abe1aa42c1cb From f21b5104fc204b52752d35dc6bd8ea4264922379 Mon Sep 17 00:00:00 2001 From: Bleznudd Date: Thu, 17 Feb 2022 17:38:13 +0100 Subject: [PATCH 0762/2369] setzer: update to 0.4.4. --- srcpkgs/setzer/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template index dbf10bb0770..ab0d86c3ec3 100644 --- a/srcpkgs/setzer/template +++ b/srcpkgs/setzer/template @@ -1,14 +1,14 @@ # Template file for 'setzer' pkgname=setzer -version=0.4.2 +version=0.4.4 revision=1 wrksrc=Setzer-${version} build_style=meson hostmakedepends="gettext" -depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4 python3-pdfminer.six python3-pexpect" +depends="poppler-glib virtual?tex gspell python3-gobject gtksourceview4 python3-pdfminer.six python3-pexpect" short_desc="Simple yet full-featured LaTeX editor written in Python with Gtk" maintainer="Bleznudd " license="GPL-3.0-or-later" homepage="https://github.com/cvfosammmm/setzer" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=50b5d273120f81b1f0a7efbcc0ce1fb1623518fe18b23ded45a82e8166003d3b +checksum=2b380c2d100970e25f851f42c354ed10e0c51de86c7b28ec1252173c22c393ce From 29662f6e057df9c18e46508b70672772fcab34da Mon Sep 17 00:00:00 2001 From: Erica Z Date: Mon, 20 Dec 2021 19:57:16 +0100 Subject: [PATCH 0763/2369] font-ibm-plex-ttf: update to 6.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When there’s a choice between hinted and unhinted variants for a font family, this template chooses the former. This is more or less an arbitrary choice, since I’m unaware of any specific guidelines of this sort. It’s impossible to include both, as the files themselves overlap, and including neither (where applicable) would completely remove support for some languages. --- srcpkgs/font-ibm-plex-ttf/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/font-ibm-plex-ttf/template b/srcpkgs/font-ibm-plex-ttf/template index c5226d6761f..b1717b8831c 100644 --- a/srcpkgs/font-ibm-plex-ttf/template +++ b/srcpkgs/font-ibm-plex-ttf/template @@ -1,6 +1,6 @@ # Template file for 'font-ibm-plex-ttf' pkgname=font-ibm-plex-ttf -version=5.2.1 +version=6.0.0 revision=1 wrksrc="plex-${version}" depends="font-util" @@ -9,13 +9,14 @@ maintainer="Felipe Nogueira " license="OFL-1.1" homepage="https://github.com/IBM/plex" distfiles="https://github.com/IBM/plex/archive/v${version}.tar.gz" -checksum=6b43a97a116a4beba474b9a9c646fb6ded8ba255fa8d3b252e669f67cbeb9d7f +checksum=e78cc68cb40ccca0318facade727a0deb32f73e931a2e31bb2fcaf8a6d386dff font_dirs="/usr/share/fonts/TTF" do_install() { vmkdir usr/share/fonts/TTF vcopy "IBM-Plex-*/fonts/complete/ttf/*.ttf" usr/share/fonts/TTF + vcopy "IBM-Plex-*/fonts/complete/ttf/hinted/*.ttf" usr/share/fonts/TTF } font-ibm-plex-otf_package() { @@ -25,5 +26,6 @@ font-ibm-plex-otf_package() { pkg_install() { vmkdir usr/share/fonts/OTF vcopy "IBM-Plex-*/fonts/complete/otf/*.otf" usr/share/fonts/OTF + vcopy "IBM-Plex-*/fonts/complete/otf/hinted/*.otf" usr/share/fonts/OTF } } From f43894ae8eec60524fada7367f9d93c0be909ca6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Apr 2022 19:21:41 +0200 Subject: [PATCH 0764/2369] e2fsprogs: update to 1.46.5. --- srcpkgs/e2fsprogs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template index f58472ff7a8..a32c50b823b 100644 --- a/srcpkgs/e2fsprogs/template +++ b/srcpkgs/e2fsprogs/template @@ -1,6 +1,6 @@ # Template file for 'e2fsprogs' pkgname=e2fsprogs -version=1.46.4 +version=1.46.5 revision=1 build_style=gnu-configure configure_args="--enable-elf-shlibs --disable-fsck @@ -17,7 +17,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://e2fsprogs.sourceforge.net/" distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz" -checksum=b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713 +checksum=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e conf_files="/etc/mke2fs.conf /etc/e2scrub.conf" do_check() { From eeb55a1956440b772c29aa344a02aa30cf4ec611 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Tue, 15 Mar 2022 20:28:48 +0530 Subject: [PATCH 0765/2369] musikcube: update to 0.97.0, adopt - Added patch to fix MPRIS support detection - Moved openmpt plugin to a separate package `musikcube-openmpt` --- srcpkgs/musikcube-openmpt | 1 + .../patches/fix-install-locations.patch | 26 ++++++------ .../patches/fix-mpris-detection.patch | 25 +++++++++++ srcpkgs/musikcube/template | 41 +++++++++++-------- 4 files changed, 63 insertions(+), 30 deletions(-) create mode 120000 srcpkgs/musikcube-openmpt create mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch diff --git a/srcpkgs/musikcube-openmpt b/srcpkgs/musikcube-openmpt new file mode 120000 index 00000000000..b3cc8e74bf4 --- /dev/null +++ b/srcpkgs/musikcube-openmpt @@ -0,0 +1 @@ +musikcube \ No newline at end of file diff --git a/srcpkgs/musikcube/patches/fix-install-locations.patch b/srcpkgs/musikcube/patches/fix-install-locations.patch index 63537349f45..590f27bf1a7 100644 --- a/srcpkgs/musikcube/patches/fix-install-locations.patch +++ b/srcpkgs/musikcube/patches/fix-install-locations.patch @@ -1,11 +1,11 @@ Currently all ELF files (binaries and libraries), get installed to /usr/share/musikcube. This patch moves all those files to their normal locations and fixes the code to expect that -diff --git CMakeLists.txt CMakeLists.txt -index d685695f..5ac43f1f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -208,7 +208,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") +diff --git a/.cmake/InstallFiles.cmake b/.cmake/InstallFiles.cmake +index 62d3c003..01ef58ac 100644 +--- a/.cmake/InstallFiles.cmake ++++ b/.cmake/InstallFiles.cmake +@@ -4,7 +4,7 @@ if (APPLE) install(FILES ${plugins} DESTINATION share/musikcube/plugins) else () file(GLOB plugins "bin/plugins/*.so") @@ -13,9 +13,9 @@ index d685695f..5ac43f1f 100644 + install(FILES ${plugins} DESTINATION lib/musikcube/plugins) endif () - file(GLOB sdk_headers "src/musikcore/sdk/*.h") -@@ -237,20 +237,12 @@ endif() - if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + if (${BUILD_STANDALONE} MATCHES "true") +@@ -43,20 +43,12 @@ endif() + if (APPLE) install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube) else() - install(FILES "bin/libmusikcore.so" DESTINATION share/musikcube) @@ -36,7 +36,7 @@ index d685695f..5ac43f1f 100644 DESTINATION bin/ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE -@@ -260,14 +252,6 @@ install( +@@ -66,14 +58,6 @@ install( # executable and shell script for daemon install( FILES bin/musikcubed @@ -51,12 +51,12 @@ index d685695f..5ac43f1f 100644 DESTINATION bin/ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE -diff --git src/musikcore/support/Common.cpp src/musikcore/support/Common.cpp -index 58bc4d2f..1670c2f7 100644 +diff --git a/src/musikcore/support/Common.cpp b/src/musikcore/support/Common.cpp +index 31703117..53aa8a88 100644 --- a/src/musikcore/support/Common.cpp +++ b/src/musikcore/support/Common.cpp -@@ -90,65 +90,11 @@ namespace musik { namespace core { - } +@@ -82,65 +82,11 @@ static inline void silentDelete(const std::string fn) { + namespace musik { namespace core { std::string GetPluginDirectory() { - std::string path(GetApplicationDirectory()); diff --git a/srcpkgs/musikcube/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch new file mode 100644 index 00000000000..dc7035d0669 --- /dev/null +++ b/srcpkgs/musikcube/patches/fix-mpris-detection.patch @@ -0,0 +1,25 @@ +In Void linux, elogind provides libsystemd + +diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake +index ce0eea9b..5b067671 100644 +--- a/.cmake/AddOsSpecificPlugins.cmake ++++ b/.cmake/AddOsSpecificPlugins.cmake +@@ -6,7 +6,7 @@ endif() + + # systemd / MPRIS detection + if (NOT ENABLE_MPRIS MATCHES "false") +- find_library(LIB_SYSTEMD NAMES systemd) ++ find_library(LIB_SYSTEMD NAMES elogind) + if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND") + message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD}) + message(STATUS "[mpris] setting ENABLE_MPRIS=true") +diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt +index fdee62d2..7a941d08 100644 +--- a/src/plugins/mpris/CMakeLists.txt ++++ b/src/plugins/mpris/CMakeLists.txt +@@ -6,4 +6,4 @@ find_package(PkgConfig) + pkg_check_modules (SYSTEMD REQUIRED libsystemd) + + add_library(mpris SHARED ${mpris_SOURCES}) +-target_link_libraries(mpris systemd) ++target_link_libraries(mpris elogind) diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index d8d4e73d6b4..01afa616123 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -1,40 +1,39 @@ # Template file for 'musikcube' pkgname=musikcube -version=0.96.10 +version=0.97.0 revision=1 build_style=cmake make_cmd=make -configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true - -DENABLE_PIPEWIRE=true -DENABLE_BUNDLED_TAGLIB=false" +configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DENABLE_PIPEWIRE=true + -DENABLE_BUNDLED_TAGLIB=false" hostmakedepends="pkg-config" makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel - sndio-devel pipewire-devel" + sndio-devel pipewire-devel ncurses-libtinfo-devel libopenmpt-devel + $(vopt_if elogind elogind-devel)" short_desc="Terminal-based music player in c++" -maintainer="eater <=@eater.me>" +maintainer="Subhaditya Nath " license="BSD-3-Clause" homepage="https://musikcube.com/" distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz" -checksum=91fd984e68b6ef66f1be1ecdf0c84607453ec6ec80632ece688ac745c7719ea5 - -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" - configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'" -fi +checksum=ab170c5100251fcd6c8fd3c32eea45e9854c6c6272c6b0970bffbfc55d0b2ec5 +build_options="elogind" +desc_option_elogind="Support MPRIS interface via elogind" +build_options_default="elogind" export CMAKE_GENERATOR="Unix Makefiles" -#XXX: Otherwise xbps-install ffmpeg-devel will complain about unresolving shlibs -# SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1' -makedepends+=" libglvnd" +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" +fi post_install() { vlicense LICENSE.txt } musikcube-devel_package() { - depends="musikcube-${version}_${revision}" + depends="${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -42,7 +41,7 @@ musikcube-devel_package() { } musikcube-sndio_package() { - depends="musikcube>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - sndio output plugin" pkg_install() { vmove usr/lib/musikcube/plugins/libsndioout.so @@ -50,9 +49,17 @@ musikcube-sndio_package() { } musikcube-pipewire_package() { - depends="musikcube>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - pipewire output plugin" pkg_install() { vmove usr/lib/musikcube/plugins/libpipewireout.so } } + +musikcube-openmpt_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - openmpt decoder plugin" + pkg_install() { + vmove usr/lib/musikcube/plugins/libopenmptdecoder.so + } +} From 061fd6b23c8bd20ce9c8c15c950f4521f8027f1e Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Wed, 23 Mar 2022 11:54:41 +0100 Subject: [PATCH 0766/2369] btrbk: update depends from pv to mbuffer --- srcpkgs/btrbk/template | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/btrbk/template b/srcpkgs/btrbk/template index 5bc9c8d0ca3..e4fa9196d21 100644 --- a/srcpkgs/btrbk/template +++ b/srcpkgs/btrbk/template @@ -1,11 +1,11 @@ # Template file for 'btrbk' pkgname=btrbk version=0.31.3 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="BINDIR=/usr/bin" hostmakedepends="ruby-asciidoctor" -depends="perl btrfs-progs openssh pv" +depends="perl btrfs-progs mbuffer openssh" short_desc="Backup tool for btrfs subvolumes" maintainer="Enno Boland " license="GPL-3.0-or-later" @@ -14,7 +14,3 @@ changelog=https://github.com/digint/btrbk/blob/master/ChangeLog distfiles="http://digint.ch/download/btrbk/releases/${pkgname}-${version}.tar.xz" checksum=62f5494965dd594f81065e1ba17f9978d60343f72ee75ed18cda1a349cdda7d3 conf_files="/etc/btrbk/*" - -post_install() { - rm -r $DESTDIR/usr/lib/systemd -} From e876b4e85976c1b68f3b8cb5c0df7bcf4e407e2c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 1 Mar 2022 00:39:05 +0100 Subject: [PATCH 0767/2369] rspamd: remove gmime-devel build dependency * not used since 1.5.0 --- srcpkgs/rspamd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template index e8df21abe54..9d57ca1906c 100644 --- a/srcpkgs/rspamd/template +++ b/srcpkgs/rspamd/template @@ -7,8 +7,8 @@ build_style=cmake configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd -DDBDIR=/var/lib/rspamd" hostmakedepends="perl pkg-config ragel" -makedepends="LuaJIT-devel fann-devel file-devel gd-devel gmime-devel - hiredis-devel icu-devel libevent-devel sqlite-devel" +makedepends="LuaJIT-devel fann-devel file-devel gd-devel + hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel" short_desc="Fast, free and open-source spam filtering system" maintainer="Enno Boland " license="Apache-2.0" From 8d7e602972476cb99e0c8666531e0fe183e6e246 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 1 Mar 2022 00:40:02 +0100 Subject: [PATCH 0768/2369] grilo-plugins: remove useless build dependencies * replace intltool with gettext * remove gupnp-av-devel build dep, not used since 2014 * remove gmime-devel build dep, not used since 0.3.8 --- srcpkgs/grilo-plugins/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template index 1cab3d09af2..65d0eb1640d 100644 --- a/srcpkgs/grilo-plugins/template +++ b/srcpkgs/grilo-plugins/template @@ -3,10 +3,10 @@ pkgname=grilo-plugins version=0.3.14 revision=1 build_style=meson -hostmakedepends="pkg-config intltool itstool glib-devel gperf tracker3" +hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker3" # XXX missing plugins: fakemetadata. -makedepends="grilo-devel gom-devel gupnp-av-devel json-glib-devel - libquvi-devel rest-devel sqlite-devel libgcrypt-devel gmime-devel +makedepends="grilo-devel gom-devel json-glib-devel + libquvi-devel rest-devel sqlite-devel libgcrypt-devel tracker3-devel totem-pl-parser-devel libgdata-devel libmediaart-devel gstreamer1-devel libdmapsharing-devel lua53-devel gnome-online-accounts-devel avahi-glib-libs-devel" From 90eddf76c5733b7b15b05e23a15bfff3136f7cdc Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Wed, 6 Apr 2022 11:55:29 -0700 Subject: [PATCH 0769/2369] python3-identify: update to 2.4.12 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 65fd70ec42c..7d2c231b672 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.4.11 +version=2.4.12 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=2986942d3974c8f2e5019a190523b0b0e2a07cb8e89bf236727fb4b26f27f8fd +checksum=3f3244a559290e7d3deb9e9adc7b33594c1bc85a9dd82e0f1be519bf12a1ec17 post_install() { vlicense LICENSE From 138aebeee3bae988feef75d6e6adc92d8cf3fde3 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Wed, 6 Apr 2022 11:56:29 -0700 Subject: [PATCH 0770/2369] pre-commit: fix update checks Signed-off-by: Joseph Benden --- srcpkgs/pre-commit/update | 1 + 1 file changed, 1 insertion(+) create mode 100644 srcpkgs/pre-commit/update diff --git a/srcpkgs/pre-commit/update b/srcpkgs/pre-commit/update new file mode 100644 index 00000000000..c44d58c699e --- /dev/null +++ b/srcpkgs/pre-commit/update @@ -0,0 +1 @@ +pattern="pre_commit-\K[0-9.]+(?=.tar.gz)" From b8b4a58e9e614a486767a28ddfd07783f8d7c65e Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Wed, 6 Apr 2022 11:56:57 -0700 Subject: [PATCH 0771/2369] pre-commit: update to 2.18.1 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 3eecb71e113..58e2730dde1 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.17.0 +version=2.18.1 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=c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a +checksum=5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10 make_check=no # No tests available post_install() { From 4fec3d6697e4008220d3ed209436f3902dc5a41f Mon Sep 17 00:00:00 2001 From: Anton Baranov Date: Tue, 5 Apr 2022 12:37:54 -0400 Subject: [PATCH 0772/2369] New package: vcsh-2.0.4 Signed-off-by: Anton Baranov --- srcpkgs/vcsh/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/vcsh/template diff --git a/srcpkgs/vcsh/template b/srcpkgs/vcsh/template new file mode 100644 index 00000000000..59a8186aa75 --- /dev/null +++ b/srcpkgs/vcsh/template @@ -0,0 +1,14 @@ +# Template file for 'vcsh' +pkgname=vcsh +version=2.0.4 +revision=1 +build_style=gnu-configure +hostmakedepends="git" +depends="git" +short_desc="Version Control System for home directory" +maintainer="Anton Baranov " +license="GPL-2.0-or-later" +homepage="https://github.com/RichiH/vcsh" +changelog="https://raw.githubusercontent.com/RichiH/vcsh/main/changelog" +distfiles="${homepage}/releases/download/v${version}/vcsh-${version}.tar.xz" +checksum=5bf425d89f474c340fbb47a5df8987573a9ef3928658b3e9876b07cae1333cf2 From 769ea65a5e0c81be65ea930034aad39652df3321 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 22:12:40 +0100 Subject: [PATCH 0773/2369] xbps-src: add strict mode --- common/environment/setup/vsed.sh | 7 ++++++- common/travis/build.sh | 2 +- xbps-src | 11 ++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/common/environment/setup/vsed.sh b/common/environment/setup/vsed.sh index 5b5bf427c23..c74c086a4ce 100644 --- a/common/environment/setup/vsed.sh +++ b/common/environment/setup/vsed.sh @@ -57,8 +57,13 @@ vsed() { newdigest="$($XBPS_DIGEST_CMD "$f")" newdigest="${newdigest%% *}" + msgfunc=msg_warn + if [ -n "$XBPS_STRICT" ]; then + msgfunc=msg_error + fi + if [ "$olddigest" = "$newdigest" ]; then - msg_warn "$pkgver: vsed: regex \"$rx\" didn't change file \"$f\"\n" + $msgfunc "$pkgver: vsed: regex \"$rx\" didn't change file \"$f\"\n" fi olddigest="${newdigest}" done diff --git a/common/travis/build.sh b/common/travis/build.sh index f5cf9cffc06..007a61f994d 100755 --- a/common/travis/build.sh +++ b/common/travis/build.sh @@ -13,7 +13,7 @@ fi PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates)) for pkg in ${PKGS}; do - /hostrepo/xbps-src -j$(nproc) -H "$HOME"/hostdir $arch $test pkg "$pkg" + /hostrepo/xbps-src -j$(nproc) -s -H "$HOME"/hostdir $arch $test pkg "$pkg" [ $? -eq 1 ] && exit 1 done diff --git a/xbps-src b/xbps-src index ff249015ed0..8488c5a3a49 100755 --- a/xbps-src +++ b/xbps-src @@ -216,6 +216,9 @@ $(print_cross_targets) This alternative repository will also be used to resolve dependencies with highest priority order than others. +-s + Make vsed warnings errors. + -t Create a temporary masterdir to not pollute the current one. Note that the existing masterdir must be fully populated with binary-bootstrap first. Once the target has finished, this temporary masterdir will be removed. @@ -357,7 +360,7 @@ readonly XBPS_SRC_VERSION="113" export XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch) XBPS_OPTIONS= -XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qQKr:tV" +XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qsQKr:tV" # Preprocess arguments in order to allow options before and after XBPS_TARGET. eval set -- $(getopt "$XBPS_OPTSTRING" "$@"); @@ -389,6 +392,7 @@ while getopts "$XBPS_OPTSTRING" opt; do Q) XBPS_ARG_CHECK_PKGS=yes; XBPS_OPTIONS+=" -Q";; K) XBPS_ARG_CHECK_PKGS=full; XBPS_OPTIONS+=" -K";; r) XBPS_ARG_ALT_REPOSITORY="$OPTARG"; XBPS_OPTIONS+=" -r $OPTARG";; + s) XBPS_ARG_STRICT=yes; XBPS_OPTIONS+=" -s";; t) XBPS_ARG_TEMP_MASTERDIR=1; XBPS_OPTIONS+=" -t -C";; V) echo "xbps-src-$XBPS_SRC_VERSION $(xbps-uhelper -V)" && exit 0;; --) shift; break;; @@ -471,6 +475,7 @@ fi [ -n "$XBPS_ARG_QUIET" ] && XBPS_QUIET=1 [ -n "$XBPS_ARG_PRINT_VARIABLES" ] && XBPS_PRINT_VARIABLES="$XBPS_ARG_PRINT_VARIABLES" [ -n "$XBPS_ARG_ALT_REPOSITORY" ] && XBPS_ALT_REPOSITORY="$XBPS_ARG_ALT_REPOSITORY" +[ -n "$XBPS_ARG_STRICT" ] && XBPS_STRICT="$XBPS_ARG_STRICT" [ -n "$XBPS_ARG_CROSS_BUILD" ] && XBPS_CROSS_BUILD="$XBPS_ARG_CROSS_BUILD" [ -n "$XBPS_ARG_CHECK_PKGS" ] && XBPS_CHECK_PKGS="$XBPS_ARG_CHECK_PKGS" [ -n "$XBPS_ARG_MAKEJOBS" ] && XBPS_MAKEJOBS="$XBPS_ARG_MAKEJOBS" @@ -478,7 +483,7 @@ fi export XBPS_BUILD_ONLY_ONE_PKG XBPS_SKIP_REMOTEREPOS XBPS_BUILD_FORCEMODE \ XBPS_INFORMATIVE_RUN XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \ XBPS_USE_GIT_REVS XBPS_CHECK_PKGS XBPS_DEBUG_PKGS XBPS_SKIP_DEPS \ - XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_CROSS_BUILD \ + XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_CROSS_BUILD \ XBPS_MAKEJOBS XBPS_PRINT_VARIABLES # The masterdir/hostdir variables are forced and readonly in chroot @@ -626,7 +631,7 @@ readonly XBPS_CMPVER_CMD="xbps-uhelper cmpver" export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \ XBPS_SRCPKGDIR XBPS_COMMONDIR XBPS_BUILDDIR \ - XBPS_REPOSITORY XBPS_ALT_REPOSITORY XBPS_SRCDISTDIR XBPS_DIGEST_CMD \ + XBPS_REPOSITORY XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_SRCDISTDIR XBPS_DIGEST_CMD \ XBPS_UHELPER_CMD XBPS_INSTALL_CMD XBPS_QUERY_CMD XBPS_BUILD_ONLY_ONE_PKG \ XBPS_RINDEX_CMD XBPS_RECONFIGURE_CMD XBPS_REMOVE_CMD XBPS_CHECKVERS_CMD \ XBPS_CMPVER_CMD XBPS_FETCH_CMD XBPS_VERSION XBPS_BUILDSTYLEDIR \ From 68ce66db261915b9989c673680ad9d2cb98f8602 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 7 Mar 2022 10:48:07 +0200 Subject: [PATCH 0774/2369] CopyQ: update to 6.1.0. --- srcpkgs/CopyQ/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template index c7fa15c9d05..1c7e3e041f9 100644 --- a/srcpkgs/CopyQ/template +++ b/srcpkgs/CopyQ/template @@ -1,6 +1,6 @@ # Template file for 'CopyQ' pkgname=CopyQ -version=6.0.1 +version=6.1.0 revision=1 build_style=cmake hostmakedepends="qt5-tools-devel extra-cmake-modules pkg-config @@ -14,4 +14,4 @@ license="GPL-3.0-or-later" homepage="https://hluk.github.io/CopyQ/" changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES.md" distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz" -checksum=8d0b0fa840993fa100e888a5a1098e2769e3c234cd44236d75039e5c6e517645 +checksum=d235b31224264e7fa463020f1a934143aa287a4d9cb9bbb6883563ad66e84099 From 749f0841d8461b1c254d46f76d98a25d51525d15 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Thu, 17 Feb 2022 11:37:42 -0700 Subject: [PATCH 0775/2369] protonmail-bridge: update to 2.1.1. Signed-off-by: Joseph Benden --- srcpkgs/protonmail-bridge/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template index 05cb9f62a13..056676f69b8 100644 --- a/srcpkgs/protonmail-bridge/template +++ b/srcpkgs/protonmail-bridge/template @@ -1,6 +1,6 @@ # Template file for 'protonmail-bridge' pkgname=protonmail-bridge -version=1.8.12 +version=2.1.1 revision=1 archs="x86_64" build_style=fetch @@ -10,7 +10,7 @@ maintainer="Rich G " license="GPL-3.0-or-later" homepage="https://protonmail.com/bridge" distfiles="https://protonmail.com/download/bridge/protonmail-bridge_${version}-1_amd64.deb" -checksum=90eff7d27e4835e3a204019cafa7062467ec45688a1a6d407896976bdeb1f8ea +checksum=9c6c1daa0dac1835e72c886064b0e9a38749f96bdf47719f08eaac787d43bca7 restricted=yes noverifyrdeps=yes From 32455c52a328acac973ca88cf070bd6b93b353ee Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 7 Apr 2022 21:20:06 +0200 Subject: [PATCH 0776/2369] New package: mokutil-0.5.0 --- srcpkgs/mokutil/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/mokutil/template diff --git a/srcpkgs/mokutil/template b/srcpkgs/mokutil/template new file mode 100644 index 00000000000..06225c57553 --- /dev/null +++ b/srcpkgs/mokutil/template @@ -0,0 +1,17 @@ +# Template file for 'mokutil' +pkgname=mokutil +version=0.5.0 +revision=1 +build_style=gnu-configure +hostmakedepends="autoconf automake pkg-config" +makedepends="keyutils-devel libefivar-devel openssl-devel" +short_desc="Utility to manipulate machine owner keys" +maintainer="Duncaen " +license="GPL-3.0-or-later" +homepage="https://github.com/lcp/mokutil" +distfiles="https://github.com/lcp/mokutil/archive/refs/tags/${version}.tar.gz" +checksum=af7616855f817e7eb54043071e51c8651bc8cc479ac455fbfe35203d98de8181 + +pre_configure() { + autoreconf -fi +} From 646995222b0521ea88b7cd684c4612a9daae050d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Apr 2022 19:18:14 +0200 Subject: [PATCH 0777/2369] printrun: remove package --- srcpkgs/printrun/template | 20 -------------------- srcpkgs/printrun/update | 1 - srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 srcpkgs/printrun/template delete mode 100644 srcpkgs/printrun/update diff --git a/srcpkgs/printrun/template b/srcpkgs/printrun/template deleted file mode 100644 index d18d21df3e6..00000000000 --- a/srcpkgs/printrun/template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'printrun' -pkgname=printrun -version=1.6.0 -revision=4 -wrksrc="Printrun-printrun-${version}" -build_style=python2-module -hostmakedepends="python-setuptools python-pyserial" -depends="python wxPython python-pyserial python-pyglet python-numpy" -short_desc="3D printing host suite" -maintainer="Jasper Chan " -license="GPL-3.0-or-later" -homepage="http://www.pronterface.com" -distfiles="https://github.com/kliment/Printrun/archive/printrun-${version}.tar.gz" -checksum=fefcb4c5793fc77205a14263bc915616cde0523cd60704f356191b9ae34ba65d - -post_install() { - for file in ${DESTDIR}/usr/bin/*.py; do - mv -- "$file" "${file%%.py}" - done -} diff --git a/srcpkgs/printrun/update b/srcpkgs/printrun/update deleted file mode 100644 index 091ee4faee7..00000000000 --- a/srcpkgs/printrun/update +++ /dev/null @@ -1 +0,0 @@ -ignore="[12][0-9][0-9][0-9][01][0-9][0-3][0-9]" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 240f1282f54..9940f101c83 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -266,6 +266,7 @@ replaces=" phonon-backend-gstreamer<=4.9.0_2 phonon-backend-vlc<=0.9.1_3 polkit-qt<=0.112.0_5 + printrun<=1.6.0_4 pritunl-client<=1.0.1865.25_2 profile-sync-daemon<=5.75_4 profont<=1.0_2 From e663fe3564e3c0f8dafa3936fb69517f834a6bb3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Apr 2022 19:26:06 +0200 Subject: [PATCH 0778/2369] python-pyglet: remove package --- srcpkgs/python3-pyglet | 1 - .../template | 22 ++++++------------- .../{python-pyglet => python3-pyglet}/update | 0 srcpkgs/removed-packages/template | 1 + 4 files changed, 8 insertions(+), 16 deletions(-) delete mode 120000 srcpkgs/python3-pyglet rename srcpkgs/{python-pyglet => python3-pyglet}/template (54%) rename srcpkgs/{python-pyglet => python3-pyglet}/update (100%) diff --git a/srcpkgs/python3-pyglet b/srcpkgs/python3-pyglet deleted file mode 120000 index 0da9a8d712f..00000000000 --- a/srcpkgs/python3-pyglet +++ /dev/null @@ -1 +0,0 @@ -python-pyglet \ No newline at end of file diff --git a/srcpkgs/python-pyglet/template b/srcpkgs/python3-pyglet/template similarity index 54% rename from srcpkgs/python-pyglet/template rename to srcpkgs/python3-pyglet/template index e5444022ba3..cb833302199 100644 --- a/srcpkgs/python-pyglet/template +++ b/srcpkgs/python3-pyglet/template @@ -1,27 +1,19 @@ -# Template file for 'python-pyglet' -pkgname=python-pyglet +# Template file for 'python3-pyglet' +pkgname=python3-pyglet version=1.4.10 revision=4 wrksrc="pyglet-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools unzip" -depends="python" -short_desc="Cross-platform windowing and multimedia library for Python2" +build_style=python3-module +hostmakedepends="python3-setuptools unzip" +depends="python3" +short_desc="Cross-platform windowing and multimedia library for Python3" maintainer="Jasper Chan " license="BSD-3-Clause" homepage="https://www.pyglet.org" distfiles="${PYPI_SITE}/p/pyglet/pyglet-${version}.zip" checksum=c57e3e18246f45e4d6bb3d29e39d128d6e72b05f4212b10353adc3ba260ceb65 +make_check=no # pyglet requires an X server with GLX post_install() { vlicense LICENSE } - -python3-pyglet_package() { - depends="python3" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - vlicense LICENSE - } -} diff --git a/srcpkgs/python-pyglet/update b/srcpkgs/python3-pyglet/update similarity index 100% rename from srcpkgs/python-pyglet/update rename to srcpkgs/python3-pyglet/update diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 9940f101c83..222727ba8e7 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -307,6 +307,7 @@ replaces=" python-pycryptodome<=3.9.7_3 python-pydns<=2.3.6_4 python-pyenet<=1.3.13.post7_2 + python-pyglet<=1.4.10_4 python-pyside<=1.2.2_7 python-pystache<=0.5.4_6 python-pytest-relaxed<=1.1.2_2 From a9a4eca7fda79536ce66cc67f07b015a9e4bc325 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 2 Apr 2022 19:01:07 +0200 Subject: [PATCH 0779/2369] gradio: remove package archived repository, doesn't build with vala 0.56 Closes: #32470 --- srcpkgs/removed-packages/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 222727ba8e7..e4808ef3d79 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -95,6 +95,7 @@ replaces=" goat<=0.0.0.28022016_10 goffice0.8<=0.8.17_6 goproxy<=7.0_1 + gradio<=7.2_1 grv<=0.3.1_3 gsettings-qt<=0.1+17.10.20170824_3 gst1-python<=1.18.3_1 From 678c68c373294bc70d9a74a68e1119c9ef86ae74 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 1 Apr 2022 01:03:42 +0200 Subject: [PATCH 0780/2369] vala-panel-appmenu: remove gtk2 subpackage --- common/shlibs | 1 - srcpkgs/appmenu-gtk-module | 1 - srcpkgs/removed-packages/template | 1 + srcpkgs/vala-panel-appmenu/template | 18 ++++-------------- 4 files changed, 5 insertions(+), 16 deletions(-) delete mode 120000 srcpkgs/appmenu-gtk-module diff --git a/common/shlibs b/common/shlibs index 836cacc49b8..848b488bb2d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3631,7 +3631,6 @@ libibverbs.so.1 rdma-core-22.1_1 librdmacm.so.1 rdma-core-22.1_1 libdvdcss.so.2 libdvdcss-1.4.2_1 libvalapanel.so.0 vala-panel-0.4.87_1 -libappmenu-gtk2-parser.so.0 appmenu-gtk-module-0.7.1_1 libappmenu-gtk3-parser.so.0 appmenu-gtk3-module-0.7.1_1 libqhttpengine.so.1 qhttpengine-1.0.1_1 libqmdnsengine.so.0 qmdnsengine-0.1.0_1 diff --git a/srcpkgs/appmenu-gtk-module b/srcpkgs/appmenu-gtk-module deleted file mode 120000 index ae1083c7375..00000000000 --- a/srcpkgs/appmenu-gtk-module +++ /dev/null @@ -1 +0,0 @@ -vala-panel-appmenu \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index e4808ef3d79..57df15daae2 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -18,6 +18,7 @@ replaces=" albert<=0.16.1_4 apg<=2.2.3_5 appdata-tools<=0.1.8_2 + appmenu-gtk-module<=0.7.6_1 arm-mem-git<=20131108_2 arptables<=0.0.4_3 atom<=1.44.0_1 diff --git a/srcpkgs/vala-panel-appmenu/template b/srcpkgs/vala-panel-appmenu/template index 198254fdf47..b32b9c6d15c 100644 --- a/srcpkgs/vala-panel-appmenu/template +++ b/srcpkgs/vala-panel-appmenu/template @@ -2,10 +2,10 @@ pkgname=vala-panel-appmenu _glhash=18896e602f40b03fcb0a8437a2e197d4 version=0.7.6 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config vala bamf glib-devel gettext" -makedepends="vala-devel bamf-devel gtk+-devel gtk+3-devel +makedepends="vala-devel bamf-devel gtk+3-devel libxkbcommon-devel libpeas-devel libdbusmenu-glib-devel xfce4-panel-devel xfconf-devel libmate-panel-devel libXt-devel vala-panel-devel" @@ -19,26 +19,16 @@ checksum=2856added014bb6e5238aacda1016e2520d9a58d4ba6d7b33b2707ea48e1c592 appmenu-gtk-module-devel_package() { short_desc="GTK module for exposing menus - development files" - depends="appmenu-gtk-module-${version}_${revision} - appmenu-gtk3-module-${version}_${revision}" + depends="appmenu-gtk3-module-${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/libappmenu-gtk2*.so" vmove "usr/lib/libappmenu-gtk3*.so" } } -appmenu-gtk-module_package() { - short_desc="GTK module for exposing menus" - pkg_install() { - vmove usr/lib/gtk-2.0 - vmove "usr/lib/libappmenu-gtk2*.so.*" - } -} - appmenu-gtk3-module_package() { - short_desc="GTK3 module for exposing menus" + short_desc="GTK module for exposing menus" pkg_install() { vmove usr/lib/gtk-3.0 vmove "usr/lib/libappmenu-gtk3*.so.*" From f0db437278b44f2e8c85f19228944c1268aed63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 9 Feb 2022 18:08:48 +0100 Subject: [PATCH 0781/2369] gitui: update to 0.20.1. --- srcpkgs/gitui/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template index 929eca8cd19..c2466612dd9 100644 --- a/srcpkgs/gitui/template +++ b/srcpkgs/gitui/template @@ -1,6 +1,6 @@ # Template file for 'gitui' pkgname=gitui -version=0.19.0 +version=0.20.1 revision=1 build_style=cargo hostmakedepends="pkg-config python3" @@ -11,7 +11,11 @@ license="MIT" homepage="https://github.com/extrawurst/gitui" changelog="https://github.com/extrawurst/gitui/blob/master/CHANGELOG.md" distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz" -checksum=bcbffb592a5ae49658c79ac7b0daefe4bac3d2b988fdbaf0e868b8c308962f0d +checksum=eccec120dfd4c5c33a74d331a53f3d0c6cb7200e26b0c4c7873278eb951bc379 + +post_patch() { + cargo update --package autocfg --precise 1.1.0 +} post_install() { vlicense LICENSE.md From 5719bd46a4668fd86fdb5e827ff791680f881cd2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Apr 2022 23:12:52 +0200 Subject: [PATCH 0782/2369] nemo: remove unused tracker build dependency --- srcpkgs/nemo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template index 4f9acf52fab..4144c409f77 100644 --- a/srcpkgs/nemo/template +++ b/srcpkgs/nemo/template @@ -7,7 +7,7 @@ build_helper=gir pycompile_dirs="/usr/share/nemo/actions/myaction.py" hostmakedepends="gettext-devel glib-devel intltool pkg-config" makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel - libexif-devel libnotify-devel tracker-devel xapps-devel libgsf-devel" + libexif-devel libnotify-devel xapps-devel libgsf-devel" depends="cinnamon-translations dconf gvfs" short_desc="Cinnamon file manager (nautilus fork)" maintainer="Orphaned " From e54418820942bad8e34df4125f0d38e670a084b5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 26 Dec 2021 18:21:26 +0100 Subject: [PATCH 0783/2369] New package: kalendar-0.4.0 --- srcpkgs/kalendar/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/kalendar/template diff --git a/srcpkgs/kalendar/template b/srcpkgs/kalendar/template new file mode 100644 index 00000000000..0cdfbd27c3e --- /dev/null +++ b/srcpkgs/kalendar/template @@ -0,0 +1,19 @@ +# Template file for 'kalendar' +pkgname=kalendar +version=0.4.0 +revision=1 +build_style=cmake +hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake + kcoreaddons kconfig" +makedepends="qt5-devel qt5-declarative-devel qt5-quickcontrols2-devel + qt5-svg-devel qt5-location-devel kirigami2-devel kdbusaddons-devel ki18n-devel + kcalendarcore-devel kconfigwidgets-devel kwindowsystem-devel kcoreaddons-devel + kcontacts-devel kitemmodels-devel kxmlgui-devel knotifications-devel + kiconthemes-devel kservice-devel akonadi5-devel akonadi-contacts-devel + calendarsupport-devel eventviews-devel" +short_desc="Calendar application using Akonadi" +maintainer="Michal Vasilek " +license="GPL-3.0-or-later" +homepage="https://invent.kde.org/pim/kalendar" +distfiles="${KDE_SITE}/kalendar/kalendar-${version}.tar.xz" +checksum=d64b19caab3e1365cce58ae27b76417b515cf3a07777ed1905f82cfbf0d1947a From 175f0785c16d761be24e21f18c0f71f2611210c6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 8 Apr 2022 01:07:40 +0200 Subject: [PATCH 0784/2369] gzip: update to 1.12. --- srcpkgs/gzip/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gzip/template b/srcpkgs/gzip/template index d2cf4853c9f..037dd3b27a4 100644 --- a/srcpkgs/gzip/template +++ b/srcpkgs/gzip/template @@ -1,6 +1,6 @@ # Template file for 'gzip' pkgname=gzip -version=1.11 +version=1.12 revision=1 bootstrap=yes build_style=gnu-configure @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/gzip/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907 +checksum=ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956 case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" DEFS=NO_ASM gl_cv_func_fflush_stdin=yes" ;; From be70e16d10ffd3fbe782328cc8626a7811938cd4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 8 Apr 2022 12:58:50 +0200 Subject: [PATCH 0785/2369] yt-dlp: update to 2022.04.08. --- srcpkgs/yt-dlp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template index 967cb7e75b0..95c9db3e951 100644 --- a/srcpkgs/yt-dlp/template +++ b/srcpkgs/yt-dlp/template @@ -1,6 +1,6 @@ # Template file for 'yt-dlp' pkgname=yt-dlp -version=2022.03.08.1 +version=2022.04.08 revision=1 wrksrc="$pkgname" build_style=python3-module @@ -13,7 +13,7 @@ license="Unlicense" homepage="https://github.com/yt-dlp/yt-dlp" changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md" distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz" -checksum=135fd7bbf81c2639419b191d8e5abb80cd8a9801b7ed8e92a331a4107e820ab2 +checksum=a9ea3753977dd82f051f0674fbdc3eb5ff49a67246f4bd3cac5745702828d1db do_check() { PYTHON=/usr/bin/python3 make offlinetest From f1a4674c3788c8d4f574ebdf3b360cbc2759a70b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 8 Apr 2022 13:00:01 +0200 Subject: [PATCH 0786/2369] nemo: fix build --- srcpkgs/nemo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template index 4144c409f77..75938f0d5c6 100644 --- a/srcpkgs/nemo/template +++ b/srcpkgs/nemo/template @@ -7,7 +7,7 @@ build_helper=gir pycompile_dirs="/usr/share/nemo/actions/myaction.py" hostmakedepends="gettext-devel glib-devel intltool pkg-config" makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel - libexif-devel libnotify-devel xapps-devel libgsf-devel" + libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel" depends="cinnamon-translations dconf gvfs" short_desc="Cinnamon file manager (nautilus fork)" maintainer="Orphaned " From 5b8020cf83c7f58297c92e08b802281381f88830 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 8 Apr 2022 14:20:31 +0200 Subject: [PATCH 0787/2369] whois: update to 5.5.13. --- srcpkgs/whois/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template index 46bb8347a81..ecc647d8196 100644 --- a/srcpkgs/whois/template +++ b/srcpkgs/whois/template @@ -1,6 +1,6 @@ # Template file for 'whois' pkgname=whois -version=5.5.12 +version=5.5.13 revision=1 wrksrc=whois build_style=gnu-makefile @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://www.linux.it/~md/software" changelog="https://raw.githubusercontent.com/rfc1036/whois/next/debian/changelog" distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.tar.xz" -checksum=f1c5bab781b7f2357dab1039e8875d41ff7b5d03a78c27443fa26351952a0822 +checksum=62e613f116d5635aea6684238db00b030a6602ffc79462e4a0a8e62cb184b5d7 alternatives=" whois:whois:/usr/bin/gwhois From cbab7dabbdcfd3cb17870017cb78c3adce448028 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 8 Apr 2022 17:03:17 +0200 Subject: [PATCH 0788/2369] nm-tray: update to 0.5.0. --- srcpkgs/nm-tray/patches/ftbfs.patch | 10 ---------- srcpkgs/nm-tray/template | 6 +++--- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 srcpkgs/nm-tray/patches/ftbfs.patch diff --git a/srcpkgs/nm-tray/patches/ftbfs.patch b/srcpkgs/nm-tray/patches/ftbfs.patch deleted file mode 100644 index 1458bb63a9a..00000000000 --- a/srcpkgs/nm-tray/patches/ftbfs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/nmmodel.cpp -+++ b/src/nmmodel.cpp -@@ -45,6 +45,7 @@ COPYRIGHT_HEADER*/ - #include - #include - #include -+#include - - namespace - { diff --git a/srcpkgs/nm-tray/template b/srcpkgs/nm-tray/template index bda727cc43b..03b6cd85e1b 100644 --- a/srcpkgs/nm-tray/template +++ b/srcpkgs/nm-tray/template @@ -1,7 +1,7 @@ # Template file for 'nm-tray' pkgname=nm-tray -version=0.4.3 -revision=2 +version=0.5.0 +revision=1 build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools pkg-config" makedepends="qt5-tools-devel networkmanager-qt5-devel" @@ -11,4 +11,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://github.com/palinek/nm-tray" distfiles="https://github.com/palinek/nm-tray/archive/${version}.tar.gz" -checksum=1611c053582189091efa74c2f26277afc872a57cfd4ec9e54463f68c25ad284b +checksum=3db9fdfcf274392f040ee2e7370be41aaae5d700277979f661718e6d893c5ff5 From 28b083c4e672b5538d92621b395ad8daaa51a80c Mon Sep 17 00:00:00 2001 From: Philipp David Date: Mon, 10 Jan 2022 11:32:22 +0100 Subject: [PATCH 0789/2369] New package: PolyMC-1.1.1 --- srcpkgs/PolyMC/files/README.voidlinux | 6 ++++++ srcpkgs/PolyMC/template | 30 +++++++++++++++++++++++++++ srcpkgs/PolyMC/update | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 srcpkgs/PolyMC/files/README.voidlinux create mode 100644 srcpkgs/PolyMC/template create mode 100644 srcpkgs/PolyMC/update diff --git a/srcpkgs/PolyMC/files/README.voidlinux b/srcpkgs/PolyMC/files/README.voidlinux new file mode 100644 index 00000000000..16ee7f91717 --- /dev/null +++ b/srcpkgs/PolyMC/files/README.voidlinux @@ -0,0 +1,6 @@ +Void-specific instructions: +============================ + +You may not have the correct version of java installed for running specific +versions of Minecraft. For Minecraft version 1.17 and up install openjdk17-jre +and for older ones openjdk8-jre. diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template new file mode 100644 index 00000000000..3b3b0deb346 --- /dev/null +++ b/srcpkgs/PolyMC/template @@ -0,0 +1,30 @@ +# Template file for 'PolyMC' +pkgname=PolyMC +version=1.1.1 +revision=1 +build_style=cmake +configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_PORTABLE=0 + -DLauncher_VERSION_BUILD=${revision}" +hostmakedepends="openjdk8 qt5-host-tools qt5-qmake" +makedepends="qt5-devel" +depends="virtual?java-runtime qt5-imageformats xrandr" +short_desc="Custom launcher for Minecraft" +maintainer="Philipp David " +license="GPL-3.0-only" +homepage="https://polymc.org/" +distfiles="https://github.com/PolyMC/PolyMC/releases/download/${version}/PolyMC-${version}.tar.gz" +checksum=7ade9abc3a6f61ed27a129c10084c783cc9a3266484a53e29dabcc1cbb0ba5c4 + +case "$XBPS_TARGET_MACHINE" in + armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";; +esac + +post_patch() { + vsed -i buildconfig/BuildConfig.cpp.in \ + -e 's/"-" + QString/"_" + QString/' + rm -rf .git +} + +post_install() { + vdoc ${FILESDIR}/README.voidlinux +} diff --git a/srcpkgs/PolyMC/update b/srcpkgs/PolyMC/update new file mode 100644 index 00000000000..7517baa7a2f --- /dev/null +++ b/srcpkgs/PolyMC/update @@ -0,0 +1,2 @@ +site=https://github.com/PolyMC/PolyMC/tags +pattern='tag/\K[\d]+\.[\d]+(\.[\d]+)?' From 67ae77e06fa416b865e5e98ef657d49d880de99c Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 9 Apr 2022 09:47:49 +0200 Subject: [PATCH 0790/2369] wine: update to 7.6. --- srcpkgs/wine/patches/musl-limits.patch | 4 ++-- srcpkgs/wine/patches/musl-rpath.patch | 8 ++++---- srcpkgs/wine/patches/musl-uid-t.patch | 4 ++-- srcpkgs/wine/template | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch index 45cb7cbd510..7546d45c760 100644 --- a/srcpkgs/wine/patches/musl-limits.patch +++ b/srcpkgs/wine/patches/musl-limits.patch @@ -1,5 +1,5 @@ ---- a/wine-7.5/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 -+++ b/wine-7.5/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 +--- a/wine-7.6/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 ++++ b/wine-7.6/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 @@ -29,7 +29,8 @@ #include #include diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch index 4ed5e2642d9..e0b6f862663 100644 --- a/srcpkgs/wine/patches/musl-rpath.patch +++ b/srcpkgs/wine/patches/musl-rpath.patch @@ -1,7 +1,7 @@ diff --git a/configure b/configure index 774a95ce003..d408e77cc78 100755 ---- a/wine-7.5/configure -+++ b/wine-7.5/configure +--- a/wine-7.6/configure ++++ b/wine-7.6/configure @@ -11137,6 +11137,38 @@ fi LIBWINE_DEPENDS="wine.map" @@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755 diff --git a/configure.ac b/configure.ac index 8c5066a3de6..01ede86df1e 100644 ---- a/wine-7.5/configure.ac -+++ b/wine-7.5/configure.ac +--- a/wine-7.6/configure.ac ++++ b/wine-7.6/configure.ac @@ -916,6 +916,9 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version") AC_SUBST(LIBWINE_DEPENDS,"wine.map") diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch index a358997c396..a95011e3cca 100644 --- a/srcpkgs/wine/patches/musl-uid-t.patch +++ b/srcpkgs/wine/patches/musl-uid-t.patch @@ -1,5 +1,5 @@ ---- a/wine-7.5/server/security.h 2022-01-29 08:23:43.759508270 +0100 -+++ b/wine-7.5/server/security.h 2022-01-29 08:24:07.976443565 +0100 +--- a/wine-7.6/server/security.h 2022-01-29 08:23:43.759508270 +0100 ++++ b/wine-7.6/server/security.h 2022-01-29 08:24:07.976443565 +0100 @@ -22,6 +22,7 @@ #define __WINE_SERVER_SECURITY_H diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index e9598ba932a..86d0acf0883 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=7.5 +version=7.6 revision=1 _pkgver=${version/r/-r} create_wrksrc=yes @@ -13,8 +13,8 @@ license="LGPL-2.1-or-later" homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz" -checksum="462c3185aedeec851067a5165d648f5499fb93c1b655f46b825f4bc11914e281 - 3b3a10654c90b210ab8dbf9d0aa2d2e3f4179a73e56e7c2101008e77903afead" +checksum="eeab772f091328a3fb9db89aacab6be087c3d59c168ef2b41af5ec5010cf0328 + bdd1a095b9c4cddce4663825e2ad331c5bf1ac8b2288b0b380a665d0ca987a23" build_options="mingw staging xshm" build_options_default="mingw xshm" From 5f526c115b2237c5e92df51f5795fd5a95453583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 10:56:14 +0200 Subject: [PATCH 0791/2369] peshming: update to 0.5.1. --- srcpkgs/peshming/template | 4 ++-- srcpkgs/peshming/update | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/peshming/update diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template index 0b07235208a..7db23fad88b 100644 --- a/srcpkgs/peshming/template +++ b/srcpkgs/peshming/template @@ -1,6 +1,6 @@ # Template file for 'peshming' pkgname=peshming -version=0.5.0 +version=0.5.1 revision=1 wrksrc="peshming" build_style=cargo @@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage " license="AGPL-3.0-only" homepage="https://git.jcg.re/jcgruenhage/peshming" distfiles="https://git.jcg.re/jcgruenhage/peshming/archive/v${version}.tar.gz" -checksum=9b737124e38d4dc6ac91f0e8bc07aab4d5acbbb019c544feb1aa92d6ab0ea8c5 +checksum=b7b2999dbb75eb8915244cd7959a8f38f3e00f7f6e38f6c406a4d5e44aa372b4 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; diff --git a/srcpkgs/peshming/update b/srcpkgs/peshming/update new file mode 100644 index 00000000000..b0e92186394 --- /dev/null +++ b/srcpkgs/peshming/update @@ -0,0 +1,2 @@ +site=https://git.jcg.re/jcgruenhage/peshming/tags +pattern='v\K\d.\d.\d(?=)' From 1c592277c78469e032f79b202eaa0802e83649cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 12:22:33 +0200 Subject: [PATCH 0792/2369] topgrade: update to 8.3.0. --- srcpkgs/topgrade/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template index 461b8868524..f560ee84573 100644 --- a/srcpkgs/topgrade/template +++ b/srcpkgs/topgrade/template @@ -1,6 +1,6 @@ # Template file for 'topgrade' pkgname=topgrade -version=8.2.0 +version=8.3.0 revision=1 build_style=cargo short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else" @@ -8,7 +8,7 @@ maintainer="jcgruenhage " license="GPL-3.0-only" homepage="https://github.com/r-darwish/topgrade" distfiles="https://github.com/r-darwish/topgrade/archive/v${version}.tar.gz" -checksum=54fe60ef70b21b34c50c0d342ec120aff3a9522ef44a9737f42d5700aed7a1c3 +checksum=a818cbdc64aafe77a589299d5717988fd5e5403af0998a9945b9d17a5b6f499b post_install() { vman topgrade.8 From 4a57d6ea46342d2644a789cb495547172df61cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 12:29:59 +0200 Subject: [PATCH 0793/2369] cargo-about: update to 0.5.1. --- srcpkgs/cargo-about/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cargo-about/template b/srcpkgs/cargo-about/template index 048f21085fa..2bfdb47d5c6 100644 --- a/srcpkgs/cargo-about/template +++ b/srcpkgs/cargo-about/template @@ -1,6 +1,6 @@ # Template file for 'cargo-about' pkgname=cargo-about -version=0.4.7 +version=0.5.1 revision=1 # depends on rustls/ring archs="x86_64* aarch64* i686* arm*" @@ -11,7 +11,7 @@ license="MIT, Apache-2.0" homepage="https://github.com/EmbarkStudios/cargo-about" changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-about/main/CHANGELOG.md" distfiles="https://github.com/EmbarkStudios/cargo-about/archive/${version}.tar.gz" -checksum=186e44af7edde48e682b2670ef52ef21687629900f5220bbd3742cb2d665bb49 +checksum=11808327e3702643b7d3f1756e6b28a49c1a963295a480818b3520d6c331b339 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then broken="broken on architectures without atomic8" From d5f26c682e647219176573cfe398fc89bb8dc097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 12:53:10 +0200 Subject: [PATCH 0794/2369] cargo-geiger: update to 0.11.2. --- srcpkgs/cargo-geiger/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template index ffe49404187..d88a94ef7cd 100644 --- a/srcpkgs/cargo-geiger/template +++ b/srcpkgs/cargo-geiger/template @@ -1,6 +1,6 @@ # Template file for 'cargo-geiger' pkgname=cargo-geiger -version=0.11.1 +version=0.11.2 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_wrksrc="${pkgname}" @@ -12,10 +12,14 @@ maintainer="Jan Christian Grünhage " license="MIT, Apache-2.0" homepage="https://github.com/rust-secure-code/cargo-geiger" distfiles="https://github.com/rust-secure-code/cargo-geiger/archive/cargo-geiger-${version}.tar.gz" -checksum=d3c88fc3bdb574108504a1a49ae7b8ee5b55b1744a47d58214d0f088d2b2ef00 +checksum=425638232f4c617a1dde1071f865c5140546bf9b6b61b9a9a186d0a5c146ac03 post_install() { vlicense LICENSE-MIT vlicense LICENSE-APACHE vdoc README.md } + +post_patch() { + cargo update -p autocfg:1.0.1 --precise 1.1.0 +} From 3e5f4505f0cb245817eb325aaed61f4dd1d7fdad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 13:27:32 +0200 Subject: [PATCH 0795/2369] ruplacer: update to 0.6.4. --- srcpkgs/ruplacer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ruplacer/template b/srcpkgs/ruplacer/template index 2a48b9af819..226155a2452 100644 --- a/srcpkgs/ruplacer/template +++ b/srcpkgs/ruplacer/template @@ -1,6 +1,6 @@ # Template file for 'ruplacer' pkgname=ruplacer -version=0.6.2 +version=0.6.4 revision=1 build_style=cargo short_desc="Find and replace text in source files" @@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage " license="BSD-3-Clause" homepage="https://github.com/dmerejkowsky/ruplacer" distfiles="https://github.com/dmerejkowsky/ruplacer/archive/refs/tags/v${version}.tar.gz" -checksum=54533bb5ee33a5580f6d1160e92f4adf436350937dd2705de14ed9af185ee875 +checksum=4f66e8970942e55dc287c585eef7a21394aefa49df746cef429f9e5bc6714c7a post_install() { vlicense LICENSE From 04a70489d6f5bd4bd26bfdc3dc778181765615ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 13:39:06 +0200 Subject: [PATCH 0796/2369] i3status-rust: update to 0.21.9. --- 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 6973e02571b..9c358e111e5 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.8 +version=0.21.9 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=259fdcb3ce067c6f9089fc0d7e60b856d838fff3dfb7e7e4dc5c96742c1a1be1 +checksum=579d3479c3cbbc6c95e277a708cda6f72d906e269dda83409bb23c7cecb10d0e post_install() { vmkdir usr/share/i3status-rust From 438de38afcf72f178df31f83388989f861fba4ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 13:46:19 +0200 Subject: [PATCH 0797/2369] onefetch: update to 2.12.0. --- srcpkgs/onefetch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template index 88f21bc3b35..1eda291b053 100644 --- a/srcpkgs/onefetch/template +++ b/srcpkgs/onefetch/template @@ -1,6 +1,6 @@ # Template file for 'onefetch' pkgname=onefetch -version=2.11.0 +version=2.12.0 revision=1 build_style=cargo short_desc="Git repository summary on your terminal" @@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage " license="MIT" homepage="https://github.com/o2sh/onefetch" distfiles="https://github.com/o2sh/onefetch/archive/v${version}.tar.gz" -checksum=ffd3cc3bd24e299ede1fada2b2da8bf066d59219da167477e1997c860650c192 +checksum=f57b16dfa2bb95dd1fb805257a1761baa20d69eb9ce7c311d369609894c53897 post_install() { vlicense LICENSE.md From df291160291d025230b8301370e1e9c37e18a32d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 13:51:45 +0200 Subject: [PATCH 0798/2369] dua-cli: update to 2.17.1. --- srcpkgs/dua-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template index 6db14e89464..ea5c1c27dad 100644 --- a/srcpkgs/dua-cli/template +++ b/srcpkgs/dua-cli/template @@ -1,6 +1,6 @@ # Template file for 'dua-cli' pkgname=dua-cli -version=2.17.0 +version=2.17.1 revision=1 build_style=cargo short_desc="Tool to conveniently learn about the disk usage of directories" @@ -9,7 +9,7 @@ license="MIT" homepage="https://github.com/Byron/dua-cli" changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md" distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz" -checksum=f10bd2c7b69c7bed1f94554d92732d54c803677a6957d986701164989a8227b1 +checksum=d9af81b30f83d080472e91da3e07b42294904827ad5274d9aaf51d346072d2f1 post_install() { vlicense LICENSE From c5d8357f6e8fbc1074874afcb447f60360771e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 13:56:21 +0200 Subject: [PATCH 0799/2369] eva: update to 0.3.0. --- srcpkgs/eva/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/eva/template b/srcpkgs/eva/template index 08157fddc9b..d364c98f951 100644 --- a/srcpkgs/eva/template +++ b/srcpkgs/eva/template @@ -1,6 +1,6 @@ # Template file for 'eva' pkgname=eva -version=0.2.7 +version=0.3.0 revision=1 build_style=cargo short_desc="Simple calculator REPL, similar to bc(1)" @@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage " license="MIT" homepage="https://github.com/NerdyPepper/eva" distfiles="https://github.com/NerdyPepper/eva/archive/v${version}.tar.gz" -checksum=72b2e47e987102d67c9dcbb60e26c4ff0b20e6f844d0d2b9d91c3f073374aee0 +checksum=05e2cdcfd91e6abef91cb01ad3074583b8289f6e74054e070bfbf6a4e684865e post_install() { vlicense LICENSE From 322321558e7e55c38352571368b6ce8d66354b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Fri, 8 Apr 2022 13:51:25 +0200 Subject: [PATCH 0800/2369] exiftool: update to 12.41. --- srcpkgs/exiftool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 5a0a83e5e79..6cf6714bf0a 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=12.40 +version=12.41 revision=1 wrksrc="Image-ExifTool-${version}" build_style=perl-module @@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://exiftool.org/" changelog="https://exiftool.org/history.html" distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz" -checksum=7ae3f6e1183926aff8a0440eb8071bb5b2a335fc1522597f109780ab16617f5f +checksum=654f401daab0045a8364fa59d3f69b6f9bf23bcef157a3c928e373884a6f9370 From f835248948679e11c01eadfa1421a870cd04a9d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Fri, 8 Apr 2022 13:35:48 +0200 Subject: [PATCH 0801/2369] croc: update to 9.5.3. --- srcpkgs/croc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template index 7e851d9af75..4ff52c773d4 100644 --- a/srcpkgs/croc/template +++ b/srcpkgs/croc/template @@ -1,6 +1,6 @@ # Template file for 'croc' pkgname=croc -version=9.5.2 +version=9.5.3 revision=1 build_style=go go_import_path=github.com/schollz/croc/v${version%%.*} @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="MIT" homepage="https://github.com/schollz/croc" distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz" -checksum=9fcbb82fa78122b0a2279fe9b4c4c7ff6af7b0599f275c04481ad5ed162d2952 +checksum=7f8ac260c786bc3f1e3c577e6ac3d3e27d0d8cffa90d7a8d21cec85fe6f22abc post_install() { vlicense LICENSE From 0f23b9715d135925423bfe871f523bdcff262e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 11:03:02 +0200 Subject: [PATCH 0802/2369] ansible-core: update to 2.12.4. --- 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 80236532b36..600682ca693 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.3 +version=2.12.4 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=8a135a9f74c97cab67759293744ad34350f719523e8bd9bb9008df4cf953af20 +checksum=827af75985a6f04b980bd371027bf038cb187640628557298acb9983a8f2c2da conflicts="ansible<2.10.1_1" replaces="ansible-base<2.11.0_1" # Tests are currently broken for ansible on python 3.10 From 4987dde1668876478fc0320f14e641c85cfcf654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 11:03:06 +0200 Subject: [PATCH 0803/2369] ansible: update to 5.6.0. --- srcpkgs/ansible/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 063e24d1684..50439199bcd 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=5.5.0 +version=5.6.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=b8a76d737889c9bfd0e6b0f2276dcf8d836da667067a355776f3504d7a66d518 +checksum=acd30731434154da376ceeeb416ee1541cdfb8ea3c648023a55a34cb3ecaf9f3 # 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 4c9d1019800a6876d17a871df173604787df00ff Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 3 Apr 2022 18:48:38 +0200 Subject: [PATCH 0804/2369] dust: update to 0.8.0. --- srcpkgs/dust/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dust/template b/srcpkgs/dust/template index 02468de2d8d..b6f611ecc65 100644 --- a/srcpkgs/dust/template +++ b/srcpkgs/dust/template @@ -1,6 +1,6 @@ # Template file for 'dust' pkgname=dust -version=0.7.5 +version=0.8.0 revision=1 build_style=cargo short_desc="More intuitive version of du" @@ -8,7 +8,7 @@ maintainer="Neel " license="Apache-2.0" homepage="https://github.com/bootandy/dust" distfiles="https://github.com/bootandy/dust/archive/v${version}.tar.gz" -checksum=f892aaf7a0a7852e12d01b2ced6c2484fb6dc5fe7562abdf0c44a2d08aa52618 +checksum=dc033a6fb4f31520ab1bb403dd910aed04037964ab1406363cce2185a8bd3d3b post_install() { vdoc README.md From 6ab738045079e894ad62f73a2012db1e38ec9b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 11:38:45 +0200 Subject: [PATCH 0805/2369] python3-ansible-compat: update to 2.0.2. --- srcpkgs/python3-ansible-compat/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template index bf03fe221d0..919455b7e64 100644 --- a/srcpkgs/python3-ansible-compat/template +++ b/srcpkgs/python3-ansible-compat/template @@ -1,6 +1,6 @@ # Template file for 'python3-ansible-compat' pkgname=python3-ansible-compat -version=2.0.0 +version=2.0.2 revision=1 wrksrc="${pkgname/python3-/}-${version}" build_style=python3-pep517 @@ -12,11 +12,11 @@ maintainer="Jan Christian Grünhage " license="MIT" homepage="https://github.com/ansible-community/ansible-compat" distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz" -checksum=4027da4ec2b524c263a801cc2dc6da2b98c2996cec258cef118a30c790467ed2 +checksum=c651995dc323ef145bab857fee6540febc881fb71b7feafe8163d49e273163a5 post_patch() { # scm versioning is broken in this release - vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg + vsed -e "/name =/a version = ${version}" -i setup.cfg } post_install() { From 13b473fb61a76d9452cd2cc30f3249703396e013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sat, 9 Apr 2022 11:24:41 +0200 Subject: [PATCH 0806/2369] gip: update to 0.7.1. --- srcpkgs/gip/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template index 83ebc476bc8..239695acc77 100644 --- a/srcpkgs/gip/template +++ b/srcpkgs/gip/template @@ -1,7 +1,7 @@ # Template file for 'gip' pkgname=gip -version=0.7.0 -revision=2 +version=0.7.1 +revision=1 build_style=cargo hostmakedepends="pkg-config" makedepends="openssl-devel" @@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage " license="MIT" homepage="https://github.com/dalance/gip" distfiles="https://github.com/dalance/gip/archive/v${version}.tar.gz" -checksum=69a23f438279a570293fab165f94a7e251a49b9b8de96703a0ab2542facffcb9 +checksum=b0cc949cbd25d6dc1e61d08092a78f95f65fb600601d03a407878774385a4060 post_install() { vlicense LICENSE-MIT From ec6e74f74c315188c371eededd3fd6eb0ff9bfd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 8 Apr 2022 14:26:19 +0200 Subject: [PATCH 0807/2369] git-cliff: update to 0.6.1. --- srcpkgs/git-cliff/template | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template index 0d14d547541..4d87260c9d2 100644 --- a/srcpkgs/git-cliff/template +++ b/srcpkgs/git-cliff/template @@ -1,8 +1,9 @@ # Template file for 'git-cliff' pkgname=git-cliff -version=0.6.0 +version=0.6.1 revision=1 build_style=cargo +build_helper=qemu make_install_args="--path git-cliff" make_check_args="-- --skip repo::test::git_log" # This test fails without a git repo short_desc="Changelog generator based on conventional commits" @@ -11,8 +12,14 @@ license="GPL-3.0-only" homepage="https://github.com/orhun/git-cliff" changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md" distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz" -checksum=451db5e7ce904f33cf5772cd67400015829e5b7b3d18955bc3e8f88977b63793 +checksum=045fb10ad0ee340172397f2bb6521c7ee0a83dca2c9f9d177300601f6c60184f post_install() { vdoc README.md + + OUT_DIR=${PWD} vtargetrun ${DESTDIR}/usr/bin/git-cliff-completions + + vcompletion "_git-cliff" zsh + vcompletion "git-cliff.fish" fish + vcompletion "git-cliff.bash" bash } From 41635fa4ea87ed4e40ab61fb9c4a2ea4fbc38118 Mon Sep 17 00:00:00 2001 From: toluschr Date: Mon, 25 May 2020 19:49:29 +0200 Subject: [PATCH 0808/2369] New package: gamemode-1.6.1 --- common/shlibs | 2 ++ srcpkgs/gamemode/patches/001-fix-musl.patch | 10 ++++++ srcpkgs/gamemode/template | 39 +++++++++++++++++++++ srcpkgs/libgamemode | 1 + srcpkgs/libgamemode-devel | 1 + 5 files changed, 53 insertions(+) create mode 100644 srcpkgs/gamemode/patches/001-fix-musl.patch create mode 100644 srcpkgs/gamemode/template create mode 120000 srcpkgs/libgamemode create mode 120000 srcpkgs/libgamemode-devel diff --git a/common/shlibs b/common/shlibs index 848b488bb2d..673c62085f5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3597,6 +3597,8 @@ libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1 libvkd3d-utils.so.1 vkd3d-1.1_1 libvkd3d-shader.so.1 vkd3d-1.3_1 libvkd3d.so.1 vkd3d-1.1_1 +libgamemode.so.0 libgamemode-1.6.1_1 +libgamemodeauto.so.0 libgamemode-1.6.1_1 libgaminggear.so.0 libgaminggear-0.15.1_1 libgaminggearfx.so.0 libgaminggear-0.15.1_1 libgaminggearwidget.so.0 libgaminggear-0.15.1_1 diff --git a/srcpkgs/gamemode/patches/001-fix-musl.patch b/srcpkgs/gamemode/patches/001-fix-musl.patch new file mode 100644 index 00000000000..c54c0bad41f --- /dev/null +++ b/srcpkgs/gamemode/patches/001-fix-musl.patch @@ -0,0 +1,10 @@ +--- a/daemon/gamemode-context.c ++++ b/daemon/gamemode-context.c +@@ -50,6 +50,7 @@ POSSIBILITY OF SUCH DAMAGE. + #include + #include /* TODO: Move usage to gamemode-dbus.c */ + #include ++#include + + /** + * The GameModeClient encapsulates the remote connection, providing a list diff --git a/srcpkgs/gamemode/template b/srcpkgs/gamemode/template new file mode 100644 index 00000000000..0bf9bea530e --- /dev/null +++ b/srcpkgs/gamemode/template @@ -0,0 +1,39 @@ +# Template file for 'gamemode' +pkgname=gamemode +version=1.6.1 +revision=1 +build_style=meson +configure_args="-Dwith-sd-bus-provider=elogind" +hostmakedepends="pkg-config" +makedepends="inih-devel dbus-devel elogind-devel" +depends="lib${pkgname}>=${version}_${revision}" +short_desc="Optimise Linux system performance on demand" +maintainer="Kenneth Dodrill " +license="BSD-3-Clause" +homepage="https://github.com/FeralInteractive/gamemode" +distfiles="https://github.com/FeralInteractive/gamemode/archive/${version}.tar.gz" +checksum=4377b88b5147ebf8d3f9a7a1f94c6d00f1e9624cd171d5af942ce9766be3747f + +post_install() { + vsconf example/gamemode.ini + vlicense LICENSE.txt + vdoc README.md +} + +libgamemode_package() { + short_desc+=" - shared libraries" + pkg_install() { + # For compatibility reasons, all shlibs should go in libgamemode + vmove "usr/lib/*.so*" + } +} + +libgamemode-devel_package() { + short_desc+=" - development files" + depends="lib${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove usr/include + } +} diff --git a/srcpkgs/libgamemode b/srcpkgs/libgamemode new file mode 120000 index 00000000000..d1810c733eb --- /dev/null +++ b/srcpkgs/libgamemode @@ -0,0 +1 @@ +gamemode \ No newline at end of file diff --git a/srcpkgs/libgamemode-devel b/srcpkgs/libgamemode-devel new file mode 120000 index 00000000000..d1810c733eb --- /dev/null +++ b/srcpkgs/libgamemode-devel @@ -0,0 +1 @@ +gamemode \ No newline at end of file From a9b1e7739785f8e742d72e1c9f624d9396a24328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Tue, 22 Mar 2022 09:14:19 +0100 Subject: [PATCH 0809/2369] doctl: update to 1.73.0. --- srcpkgs/doctl/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template index 0580a504f27..e42f75c749f 100644 --- a/srcpkgs/doctl/template +++ b/srcpkgs/doctl/template @@ -1,13 +1,17 @@ # Template file for 'doctl' pkgname=doctl -version=1.71.0 +version=1.73.0 revision=1 build_style=go go_import_path="github.com/digitalocean/doctl/cmd/doctl" -go_build_tags="v${version}" +_maj_min=${version%*.*} +_major=${_maj_min%.*} +_minor=${_maj_min#*.} +_patch=${version#*.*.*} +go_ldflags="-X github.com/digitalocean/doctl.Major=$_major -X github.com/digitalocean/doctl.Minor=$_minor -X github.com/digitalocean/doctl.Patch=$_patch -X github.com/digitalocean/doctl.Label=voidlinux" short_desc="Command line tool for DigitalOcean services" 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=62a14c05bd4b8442f0a610f9eba7237fe67e1afc397750893cdf2b741aebfd54 +checksum=cc7a6f91febf4d40f8afca0fe4ddfa7aa9be3572e3a0124fca2865e35b52ef00 From fd1e34f504c302f422bcb3200587bf7a5ac2b45e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 9 Apr 2022 12:37:47 +0200 Subject: [PATCH 0810/2369] libxmlb: update to 0.3.8. --- srcpkgs/libxmlb/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libxmlb/template b/srcpkgs/libxmlb/template index 6d8a900ae0a..78b2d76bfde 100644 --- a/srcpkgs/libxmlb/template +++ b/srcpkgs/libxmlb/template @@ -1,6 +1,6 @@ # Template file for 'libxmlb' pkgname=libxmlb -version=0.2.1 +version=0.3.8 revision=1 build_style=meson build_helper="gir" @@ -13,7 +13,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://github.com/hughsie/libxmlb" distfiles="https://github.com/hughsie/libxmlb/archive/${version}.tar.gz" -checksum=2bf0cae179f1a9b6a63d294c06d324ea97266fc34656589b2865535ab2322529 +checksum=83b94d04b4bdff4f94abc9f078d1372422276cf47590cfd1935948d48021deda build_options="gir" build_options_default="gir" @@ -23,13 +23,13 @@ post_install() { } libxmlb-devel_package() { - depends="libxmlb>=${version}_${revision} ${makedepends}" + depends="${sourcepkg}>=${version}_${revision} ${makedepends}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - if [ "$build_options_gir" ]; then + if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi } From 0879accd824a1976c4c260930bb547811eecb51e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 9 Apr 2022 12:34:53 +0200 Subject: [PATCH 0811/2369] AppStream: update to 0.15.2. --- srcpkgs/AppStream/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template index 9cba83f64c2..b2d92072924 100644 --- a/srcpkgs/AppStream/template +++ b/srcpkgs/AppStream/template @@ -1,6 +1,6 @@ # Template file for 'AppStream' pkgname=AppStream -version=0.14.6 +version=0.15.2 revision=1 wrksrc="appstream-${version}" build_style=meson @@ -8,16 +8,16 @@ build_helper="gir qemu" configure_args="$(vopt_bool gir gir) $(vopt_bool vala vapi) -Dstemming=false -Dapidocs=false -Dqt=true" hostmakedepends="docbook-xsl gettext glib-devel gperf libxslt pkg-config - qt5-host-tools $(vopt_if vala vala)" -makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel lmdb-devel + qt5-host-tools $(vopt_if vala vala) itstool" +makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel libxmlb-devel libsoup-devel libcurl-devel" short_desc="Tools and libraries to work with AppStream metadata" -maintainer="Orphaned " +maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://github.com/ximion/appstream" changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS" distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz" -checksum=fd71649aeefe1cb561f1921193b253033d21566bdcce849c93e37fdb21113560 +checksum=70c95545ac2cde87c9ba4a292648ed64ed1211fb24d792b5b9e84f870a83fe9d conf_files="/etc/appstream.conf" triggers="appstream-cache" From e8bc0307fca589b7bfc1f156f3d26cd56aa2618f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Apr 2022 22:57:19 +0200 Subject: [PATCH 0812/2369] gnome: remove gnome-documents from gnome-apps --- srcpkgs/gnome/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 0984bf8205a..0b291009471 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,7 @@ # Template file for 'gnome' pkgname=gnome version=41.0 -revision=1 +revision=2 build_style=meta short_desc="GNOME meta-package for Void Linux" maintainer="Enno Boland " @@ -58,7 +58,6 @@ _apps_depends=" gnome-clocks>=40.0 gnome-dictionary>=40.0 gnome-disk-utility>=${version} - gnome-documents>=3.34.0 gnome-font-viewer>=${version} gnome-maps>=${version} gnome-music>=${version} From 04443dd410fcc6fc04deaca96418166fbe46f616 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 27 Feb 2022 22:57:11 +0100 Subject: [PATCH 0813/2369] gnome-games: remove package * archived project, uses tracker2 --- srcpkgs/gnome-games/patches/meson-0.61.patch | 20 -------------------- srcpkgs/gnome-games/template | 15 --------------- srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch delete mode 100644 srcpkgs/gnome-games/template diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch deleted file mode 100644 index 0a3b006b227..00000000000 --- a/srcpkgs/gnome-games/patches/meson-0.61.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/data/meson.build -+++ b/data/meson.build -@@ -44,7 +44,7 @@ mime_types = [ - desktop_conf = configuration_data() - desktop_conf.set('icon', application_id) - desktop_conf.set('mimetypes', ';'.join(mime_types) + ';') --desktop_file = i18n.merge_file ('desktop-file', -+desktop_file = i18n.merge_file ( - type: 'desktop', - input: configure_file( - input: files('org.gnome.Games.desktop.in.in'), -@@ -70,7 +70,7 @@ endif - - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) --appdata_file = i18n.merge_file ('appdata-file', -+appdata_file = i18n.merge_file ( - input: configure_file( - input: files('org.gnome.Games.appdata.xml.in.in'), - output: 'org.gnome.Games.appdata.xml.in', diff --git a/srcpkgs/gnome-games/template b/srcpkgs/gnome-games/template deleted file mode 100644 index 61df4a3bc7f..00000000000 --- a/srcpkgs/gnome-games/template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'gnome-games' -pkgname=gnome-games -version=40.0 -revision=1 -build_style=meson -hostmakedepends="gettext glib-devel pkg-config vala-devel" -makedepends="libarchive-devel grilo-devel gtk+3-devel libglib-devel - libmanette-devel librsvg-devel libsoup-devel libxml2-devel retro-gtk-devel - sqlite-devel tracker-devel libhandy1-devel" -short_desc="Browse and play your games" -maintainer="Enno Boland " -license="GPL-3.0-or-later" -homepage="https://wiki.gnome.org/Apps/Games" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=32cd413f89292a74b0a84a5a30d0f4878ce42caea36374b1fb4dce3b4f6adf0f diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 57df15daae2..6511980ca21 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -88,6 +88,7 @@ replaces=" gksu<=2.0.2_4 glibmm-doc<=2.64.2_2 gnome-doc-utils<=0.20.10_9 + gnome-games<=40.0_1 gnome-getting-started-docs<=3.38.1_1 gnome-shell-mousewheel-zoom<=0.8.0_2 gnome-twitch<=0.4.2_1 From 7f69235c2a53b1ff9cda336e11611cc9ba9982e5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 27 Feb 2022 22:57:35 +0100 Subject: [PATCH 0814/2369] gnome-documents: remove package * archived project, uses tracker2 --- .../gnome-documents/patches/meson-0.61.patch | 18 --------------- srcpkgs/gnome-documents/template | 23 ------------------- srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch delete mode 100644 srcpkgs/gnome-documents/template diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch deleted file mode 100644 index 131d3450940..00000000000 --- a/srcpkgs/gnome-documents/patches/meson-0.61.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/data/meson.build -+++ b/data/meson.build -@@ -56,7 +56,6 @@ foreach app: documents_apps - appdata = app + '.appdata.xml' - - appdata_file = i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, -@@ -76,7 +75,6 @@ foreach app: documents_apps - desktop = app + '.desktop' - - desktop_file = i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop + '.in', - output: desktop, diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template deleted file mode 100644 index 7e45b825e71..00000000000 --- a/srcpkgs/gnome-documents/template +++ /dev/null @@ -1,23 +0,0 @@ -# Template file for 'gnome-documents' -pkgname=gnome-documents -version=3.34.0 -revision=2 -build_helper="gir" -build_style=meson -hostmakedepends="docbook-xsl gettext itstool pkg-config glib-devel libxslt gdk-pixbuf - librsvg" -makedepends="clutter-gtk-devel evince-devel gjs-devel gnome-desktop-devel - libgdata-devel libgepub-devel librsvg-devel libzapojit-devel tracker-devel - vala-devel webkit2gtk-devel" -depends="desktop-file-utils hicolor-icon-theme libgepub tracker tracker-miners - gjs gnome-online-miners evince" -short_desc="Documents Manager for GNOME" -maintainer="Enno Boland " -license="GPL-2.0-or-later" -homepage="https://wiki.gnome.org/Apps/Documents" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d8a90e84aef3a78fcaa91dc12a24a473a5778a47eb4c2354d0e35d558f29f0e2 -lib32disabled=yes - -build_options="gir" -build_options_default="gir" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 6511980ca21..f1dcebc2b8c 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -88,6 +88,7 @@ replaces=" gksu<=2.0.2_4 glibmm-doc<=2.64.2_2 gnome-doc-utils<=0.20.10_9 + gnome-documents<=3.34.0_2 gnome-games<=40.0_1 gnome-getting-started-docs<=3.38.1_1 gnome-shell-mousewheel-zoom<=0.8.0_2 From fbb012334e643ee87ee79db25d6cbb13c0c8b0f3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Apr 2022 23:29:56 +0200 Subject: [PATCH 0815/2369] gnome-online-miners: import a patch for tracker3 --- .../patches/tracker3.patch | 1554 +++++++++++++++++ srcpkgs/gnome-online-miners/template | 11 +- 2 files changed, 1562 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/gnome-online-miners/patches/tracker3.patch diff --git a/srcpkgs/gnome-online-miners/patches/tracker3.patch b/srcpkgs/gnome-online-miners/patches/tracker3.patch new file mode 100644 index 00000000000..c948f65c795 --- /dev/null +++ b/srcpkgs/gnome-online-miners/patches/tracker3.patch @@ -0,0 +1,1554 @@ +From 53869ebc2783c9d08bb32d59c543ab692770c121 Mon Sep 17 00:00:00 2001 +From: Sam Thursfield +Date: Fri, 15 May 2020 01:11:24 +0200 +Subject: [PATCH 1/5] Use GInitable interface for GomMiner class + +This allows for better error reporting. +--- + src/gom-application.c | 7 +++++- + src/gom-miner.c | 58 +++++++++++++++++++++++++++++-------------- + 2 files changed, 45 insertions(+), 20 deletions(-) + +diff --git a/src/gom-application.c b/src/gom-application.c +index fadd388..bfa99ec 100644 +--- a/src/gom-application.c ++++ b/src/gom-application.c +@@ -229,10 +229,15 @@ gom_application_constructed (GObject *object) + { + GomApplication *self = GOM_APPLICATION (object); + const gchar *display_name; ++ GError *error = NULL; + + G_OBJECT_CLASS (gom_application_parent_class)->constructed (object); + +- self->miner = g_object_new (self->miner_type, NULL); ++ self->miner = g_initable_new (self->miner_type, NULL, &error, NULL); ++ ++ if (self->miner == NULL) ++ g_error ("%s", error->message); ++ + display_name = gom_miner_get_display_name (self->miner); + gom_dbus_set_display_name (self->skeleton, display_name); + } +diff --git a/src/gom-miner.c b/src/gom-miner.c +index 7147b33..1dd9bb8 100644 +--- a/src/gom-miner.c ++++ b/src/gom-miner.c +@@ -28,7 +28,11 @@ + + #include "gom-miner.h" + +-G_DEFINE_TYPE (GomMiner, gom_miner, G_TYPE_OBJECT) ++static void gom_miner_initable_interface_init (GInitableIface *iface); ++ ++G_DEFINE_TYPE_WITH_CODE (GomMiner, gom_miner, G_TYPE_OBJECT, ++ G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gom_miner_initable_interface_init)) ++ + + struct _GomMinerPrivate { + GoaClient *client; +@@ -132,20 +136,21 @@ gom_miner_dispose (GObject *object) + } + + static void +-gom_miner_init_goa (GomMiner *self) ++gom_miner_init_goa (GomMiner *self, ++ GError **error) + { + GoaAccount *account; + GoaObject *object; + const gchar *provider_type; + GList *accounts, *l; + GomMinerClass *miner_class = GOM_MINER_GET_CLASS (self); ++ GError *inner_error = NULL; + +- self->priv->client = goa_client_new_sync (NULL, &self->priv->client_error); ++ self->priv->client = goa_client_new_sync (NULL, &inner_error); + +- if (self->priv->client_error != NULL) ++ if (inner_error) + { +- g_critical ("Unable to create GoaClient: %s - indexing for %s will not work", +- self->priv->client_error->message, miner_class->goa_provider_type); ++ g_propagate_error (error, inner_error); + return; + } + +@@ -170,16 +175,34 @@ gom_miner_init_goa (GomMiner *self) + g_list_free_full (accounts, g_object_unref); + } + +-static void +-gom_miner_constructed (GObject *obj) ++static gboolean ++gom_miner_initable_init (GInitable *initable, ++ GCancellable *cancellable, ++ GError **error) + { +- GomMiner *self = GOM_MINER (obj); ++ GError *inner_error = NULL; ++ GomMiner *self; + +- G_OBJECT_CLASS (gom_miner_parent_class)->constructed (obj); ++ self = GOM_MINER (initable); + +- gom_miner_init_goa (self); ++ self->priv->connection = tracker_sparql_connection_get (cancellable, &inner_error); ++ if (inner_error) ++ { ++ g_propagate_prefixed_error (error, inner_error, "Unable to connect to Tracker store: "); ++ return FALSE; ++ } ++ ++ gom_miner_init_goa (self, &inner_error); ++ if (inner_error) ++ { ++ g_propagate_prefixed_error (error, inner_error, "Unable to connect to GNOME Online Accounts: "); ++ return FALSE; ++ } ++ ++ return TRUE; + } + ++ + static void + gom_miner_init (GomMiner *self) + { +@@ -187,14 +210,12 @@ gom_miner_init (GomMiner *self) + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GOM_TYPE_MINER, GomMinerPrivate); + self->priv->display_name = g_strdup (""); ++} + +- self->priv->connection = tracker_sparql_connection_get (NULL, &self->priv->connection_error); +- if (self->priv->connection_error != NULL) +- { +- g_critical ("Unable to create TrackerSparqlConnection: %s - indexing for %s will not work", +- self->priv->connection_error->message, +- klass->goa_provider_type); +- } ++static void ++gom_miner_initable_interface_init (GInitableIface *iface) ++{ ++ iface->init = gom_miner_initable_init; + } + + static void +@@ -202,7 +223,6 @@ gom_miner_class_init (GomMinerClass *klass) + { + GObjectClass *oclass = G_OBJECT_CLASS (klass); + +- oclass->constructed = gom_miner_constructed; + oclass->dispose = gom_miner_dispose; + + cleanup_pool = g_thread_pool_new (cleanup_job, NULL, 1, FALSE, NULL); +-- +GitLab + + +From a2b53970e1c1486a61a1522010e345732ed6ca54 Mon Sep 17 00:00:00 2001 +From: Sam Thursfield +Date: Fri, 15 May 2020 01:19:58 +0200 +Subject: [PATCH 2/5] Initial port to Tracker 3 + +Each miner now stores its data in a private Tracker database, under +the $XDG_CACHE_HOME/gnome-online-miners/$busname directory. + +Each miner now supports the org.freedesktop.Tracker3.Endpoint D-Bus +interface which apps can use to query data directly from the miners. +--- + configure.ac | 4 +- + src/gom-application.c | 4 +- + src/gom-miner.c | 120 +++++++++++++++++++++++++++++++++++++++++- + src/gom-miner.h | 1 + + src/gom-tracker.c | 2 +- + 5 files changed, 125 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e91e4af..8ee6315 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -21,7 +21,7 @@ AC_HEADER_STDC + + GDATA_MIN_VERSION=0.15.2 + GFBGRAPH_MIN_VERSION=0.2.2 +-GLIB_MIN_VERSION=2.35.1 ++GLIB_MIN_VERSION=2.56.0 + GOA_MIN_VERSION=3.13.3 + GRILO_MIN_VERSION=0.3.0 + ZAPOJIT_MIN_VERSION=0.0.2 +@@ -36,7 +36,7 @@ PKG_CHECK_MODULES(GIO, [gio-2.0 gio-unix-2.0]) + PKG_CHECK_MODULES(GOA, [goa-1.0 >= $GOA_MIN_VERSION]) + AC_DEFINE([GOA_API_IS_SUBJECT_TO_CHANGE], [], [We are aware that GOA's API can change]) + +-PKG_CHECK_MODULES(TRACKER, [tracker-miner-2.0 tracker-sparql-2.0]) ++PKG_CHECK_MODULES(TRACKER, [tracker-sparql-3.0]) + + # Facebook + AC_ARG_ENABLE([facebook], [AS_HELP_STRING([--enable-facebook], [Enable Facebook miner])], [], [enable_facebook=yes]) +diff --git a/src/gom-application.c b/src/gom-application.c +index bfa99ec..86546ed 100644 +--- a/src/gom-application.c ++++ b/src/gom-application.c +@@ -233,7 +233,9 @@ gom_application_constructed (GObject *object) + + G_OBJECT_CLASS (gom_application_parent_class)->constructed (object); + +- self->miner = g_initable_new (self->miner_type, NULL, &error, NULL); ++ self->miner = g_initable_new (self->miner_type, NULL, &error, ++ "bus-name", g_application_get_application_id (G_APPLICATION (self)), ++ NULL); + + if (self->miner == NULL) + g_error ("%s", error->message); +diff --git a/src/gom-miner.c b/src/gom-miner.c +index 1dd9bb8..f349d01 100644 +--- a/src/gom-miner.c ++++ b/src/gom-miner.c +@@ -38,7 +38,9 @@ struct _GomMinerPrivate { + GoaClient *client; + GError *client_error; + ++ gchar *bus_name; + TrackerSparqlConnection *connection; ++ TrackerEndpointDBus *endpoint; + GError *connection_error; + + gchar *display_name; +@@ -62,6 +64,14 @@ typedef struct { + gpointer service; + } InsertSharedContentData; + ++typedef enum ++{ ++ PROP_BUS_NAME = 1, ++ N_PROPERTIES ++} GomMinerProperty; ++ ++static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, }; ++ + static GThreadPool *cleanup_pool; + + static void cleanup_job (gpointer data, gpointer user_data); +@@ -135,6 +145,58 @@ gom_miner_dispose (GObject *object) + G_OBJECT_CLASS (gom_miner_parent_class)->dispose (object); + } + ++static void ++gom_miner_init_database (GomMiner *self, ++ GCancellable *cancellable, ++ GError **error) ++{ ++ TrackerSparqlConnectionFlags flags; ++ g_autoptr (GFile) store_path = NULL; ++ g_autoptr (GDBusConnection) bus = NULL; ++ GError *inner_error = NULL; ++ ++ flags = TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STEMMER | ++ TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_UNACCENT | ++ TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STOP_WORDS | ++ TRACKER_SPARQL_CONNECTION_FLAGS_FTS_IGNORE_NUMBERS; ++ ++ store_path = g_file_new_build_filename (g_get_user_cache_dir (), ++ "gnome-online-miners", ++ self->priv->bus_name, ++ NULL); ++ ++ self->priv->connection = tracker_sparql_connection_new (flags, ++ store_path, ++ tracker_sparql_get_ontology_nepomuk (), ++ cancellable, ++ &inner_error); ++ ++ if (inner_error) ++ { ++ g_propagate_error (error, inner_error); ++ return; ++ } ++ ++ bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &inner_error); ++ ++ if (inner_error) ++ { ++ g_propagate_error (error, inner_error); ++ return; ++ } ++ ++ self->priv->endpoint = tracker_endpoint_dbus_new (self->priv->connection, ++ bus, ++ NULL, /* object path */ ++ cancellable, ++ &inner_error); ++ if (inner_error) ++ { ++ g_propagate_error (error, inner_error); ++ return; ++ } ++} ++ + static void + gom_miner_init_goa (GomMiner *self, + GError **error) +@@ -185,10 +247,10 @@ gom_miner_initable_init (GInitable *initable, + + self = GOM_MINER (initable); + +- self->priv->connection = tracker_sparql_connection_get (cancellable, &inner_error); ++ gom_miner_init_database (self, cancellable, &inner_error); + if (inner_error) + { +- g_propagate_prefixed_error (error, inner_error, "Unable to connect to Tracker store: "); ++ g_propagate_prefixed_error (error, inner_error, "Unable to set up Tracker database: "); + return FALSE; + } + +@@ -212,6 +274,47 @@ gom_miner_init (GomMiner *self) + self->priv->display_name = g_strdup (""); + } + ++static void ++gom_miner_set_property (GObject *object, ++ guint property_id, ++ const GValue *value, ++ GParamSpec *pspec) ++{ ++ GomMiner *self = GOM_MINER (object); ++ ++ switch ((GomMinerProperty) property_id) ++ { ++ case PROP_BUS_NAME: ++ g_free (self->priv->bus_name); ++ self->priv->bus_name = g_value_dup_string (value); ++ break; ++ ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); ++ break; ++ } ++} ++ ++static void ++gom_miner_get_property (GObject *object, ++ guint property_id, ++ GValue *value, ++ GParamSpec *pspec) ++{ ++ GomMiner *self = GOM_MINER (object); ++ ++ switch ((GomMinerProperty) property_id) ++ { ++ case PROP_BUS_NAME: ++ g_value_set_string (value, self->priv->bus_name); ++ break; ++ ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); ++ break; ++ } ++} ++ + static void + gom_miner_initable_interface_init (GInitableIface *iface) + { +@@ -224,6 +327,19 @@ gom_miner_class_init (GomMinerClass *klass) + GObjectClass *oclass = G_OBJECT_CLASS (klass); + + oclass->dispose = gom_miner_dispose; ++ oclass->set_property = gom_miner_set_property; ++ oclass->get_property = gom_miner_get_property; ++ ++ obj_properties[PROP_BUS_NAME] = g_param_spec_string ("bus-name", ++ "Bus Name", ++ "D-Bus name of the miner", ++ NULL /* default value */, ++ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | ++ G_PARAM_STATIC_STRINGS); ++ ++ g_object_class_install_properties (oclass, ++ N_PROPERTIES, ++ obj_properties); + + cleanup_pool = g_thread_pool_new (cleanup_job, NULL, 1, FALSE, NULL); + +diff --git a/src/gom-miner.h b/src/gom-miner.h +index 8f83139..5dcfc8d 100644 +--- a/src/gom-miner.h ++++ b/src/gom-miner.h +@@ -61,6 +61,7 @@ typedef struct _GomMinerPrivate GomMinerPrivate; + typedef struct { + GomMiner *miner; + TrackerSparqlConnection *connection; ++ gchar *bus_name; + + GoaAccount *account; + GHashTable *services; +diff --git a/src/gom-tracker.c b/src/gom-tracker.c +index 68818c4..5666c16 100644 +--- a/src/gom-tracker.c ++++ b/src/gom-tracker.c +@@ -408,7 +408,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection + gchar *retval = NULL; + gchar *select = NULL; + +- g_return_val_if_fail (TRACKER_SPARQL_IS_CONNECTION (connection), NULL); ++ g_return_val_if_fail (TRACKER_IS_SPARQL_CONNECTION (connection), NULL); + g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); + g_return_val_if_fail (make != NULL || model != NULL, NULL); +-- +GitLab + + +From 3e77eff8a677c1ecd9aa129094ed857da802d787 Mon Sep 17 00:00:00 2001 +From: Sam Thursfield +Date: Fri, 15 May 2020 01:37:28 +0200 +Subject: [PATCH 3/5] Add DataObject class to our resources + +We need this to set nie:dataSource property. I don't understand +how this worked in the past. +--- + src/gom-tracker.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gom-tracker.c b/src/gom-tracker.c +index 5666c16..63a4c29 100644 +--- a/src/gom-tracker.c ++++ b/src/gom-tracker.c +@@ -208,7 +208,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection + insert = g_string_new (NULL); + g_string_append_printf + (insert, +- "INSERT OR REPLACE %s { <%s> a nie:InformationElement ; %s %s }", ++ "INSERT OR REPLACE %s { <%s> a nie:InformationElement, nie:DataObject ; %s %s }", + graph_str, resource, property_name, quoted); + g_free (quoted); + +-- +GitLab + + +From e742a60cf9dea1391d1ff409ce5696d21f423bed Mon Sep 17 00:00:00 2001 +From: Sam Thursfield +Date: Fri, 15 May 2020 02:13:11 +0200 +Subject: [PATCH 4/5] Organize data into content-based graphs + +Previously GOM used a graph per account and per resource but this +cannot be done in Tracker 3. + +In Tracker 3, each graph is stored as a separate SQLite database +and currently a maximum of ten graphs can be included in a single +query due to SQLite's limitations. + +The new layout is modelled after how tracker-miner-fs uses graphs: +we use a graph per content type (Contacts, Documents, Pictures), +plus an extra graph to store accounts and folders/collections. +--- + src/gom-facebook-miner.c | 12 ++--- + src/gom-flickr-miner.c | 24 +++++----- + src/gom-gdata-miner.c | 31 ++++++------ + src/gom-media-server-miner.c | 10 ++-- + src/gom-miner.c | 40 ++++++++++++---- + src/gom-miner.h | 1 - + src/gom-owncloud-miner.c | 22 +++++---- + src/gom-tracker.c | 93 +++++++++++++++++------------------- + src/gom-tracker.h | 14 +++++- + src/gom-zpj-miner.c | 22 ++++----- + 10 files changed, 150 insertions(+), 119 deletions(-) + +diff --git a/src/gom-facebook-miner.c b/src/gom-facebook-miner.c +index ff42ca5..fc89096 100644 +--- a/src/gom-facebook-miner.c ++++ b/src/gom-facebook-miner.c +@@ -70,7 +70,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job, + (connection, + cancellable, error, + &resource_exists, +- datasource_urn, identifier, ++ TRACKER_PICTURES_GRAPH, identifier, + "nfo:RemoteDataObject", class, NULL); + + if (*error != NULL) +@@ -239,7 +239,7 @@ account_miner_job_process_album (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:url", album_link); + + if (*error != NULL) +@@ -248,7 +248,7 @@ account_miner_job_process_album (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:description", album_description); + + if (*error != NULL) +@@ -257,7 +257,7 @@ account_miner_job_process_album (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:title", album_name); + + if (*error != NULL) +@@ -274,7 +274,7 @@ account_miner_job_process_album (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nco:creator", contact_resource); + g_free (contact_resource); + +@@ -284,7 +284,7 @@ account_miner_job_process_album (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:contentCreated", album_created_time); + + if (*error != NULL) +diff --git a/src/gom-flickr-miner.c b/src/gom-flickr-miner.c +index 9ac338e..dc7349e 100644 +--- a/src/gom-flickr-miner.c ++++ b/src/gom-flickr-miner.c +@@ -143,14 +143,14 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + (connection, + cancellable, error, + &resource_exists, +- datasource_urn, identifier, ++ TRACKER_PICTURES_GRAPH, identifier, + "nfo:RemoteDataObject", class, NULL); + + if (*error != NULL) + goto out; + + gom_tracker_update_datasource (connection, datasource_urn, +- resource_exists, identifier, resource, ++ resource_exists, TRACKER_PICTURES_GRAPH, resource, + cancellable, error); + + if (*error != NULL) +@@ -166,7 +166,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + parent_resource_urn = gom_tracker_sparql_connection_ensure_resource + (connection, cancellable, error, + NULL, +- datasource_urn, parent_identifier, ++ TRACKER_PICTURES_GRAPH, parent_identifier, + "nfo:RemoteDataObject", "nfo:DataContainer", NULL); + g_free (parent_identifier); + +@@ -176,7 +176,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:isPartOf", parent_resource_urn); + g_free (parent_resource_urn); + +@@ -187,7 +187,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:title", grl_media_get_title (entry->media)); + + if (*error != NULL) +@@ -202,7 +202,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + created_time = modification_date = grl_media_get_creation_date (entry->media); + new_mtime = g_date_time_to_unix (modification_date); + mtime_changed = gom_tracker_update_mtime (connection, new_mtime, +- resource_exists, identifier, resource, ++ resource_exists, TRACKER_PICTURES_GRAPH, resource, + cancellable, error); + + if (*error != NULL) +@@ -221,7 +221,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:contentCreated", date); + g_free (date); + } +@@ -233,7 +233,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:url", url); + + if (*error != NULL) +@@ -242,7 +242,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:description", grl_media_get_description (entry->media)); + + if (*error != NULL) +@@ -254,7 +254,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:mimeType", mime); + g_free (mime); + +@@ -265,7 +265,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + contact_resource = gom_tracker_utils_ensure_contact_resource + (connection, + cancellable, error, +- datasource_urn, grl_media_get_author (entry->media)); ++ TRACKER_PICTURES_GRAPH, grl_media_get_author (entry->media)); + + if (*error != NULL) + goto out; +@@ -273,7 +273,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nco:creator", contact_resource); + g_free (contact_resource); + +diff --git a/src/gom-gdata-miner.c b/src/gom-gdata-miner.c +index 7872431..d0deb80 100644 +--- a/src/gom-gdata-miner.c ++++ b/src/gom-gdata-miner.c +@@ -120,7 +120,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection, + (connection, + cancellable, error, + &resource_exists, +- datasource_urn, identifier, ++ TRACKER_DOCUMENTS_GRAPH, identifier, + "nfo:RemoteDataObject", class, NULL); + + if (*error != NULL) +@@ -187,7 +187,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection, + parent_resource_urn = gom_tracker_sparql_connection_ensure_resource + (connection, cancellable, error, + NULL, +- datasource_urn, parent_resource_id, ++ GOM_GRAPH, parent_resource_id, + "nfo:RemoteDataObject", "nfo:DataContainer", NULL); + g_free (parent_resource_id); + +@@ -219,7 +219,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection, + gom_tracker_sparql_connection_toggle_favorite + (connection, + cancellable, error, +- resource, starred); ++ TRACKER_PICTURES_GRAPH, resource, starred); + + if (*error != NULL) + goto out; +@@ -400,14 +400,14 @@ account_miner_job_process_photo (TrackerSparqlConnection *connection, + (connection, + cancellable, error, + &resource_exists, +- datasource_urn, identifier, ++ TRACKER_PICTURES_GRAPH, identifier, + "nfo:RemoteDataObject", "nmm:Photo", NULL); + + if (*error != NULL) + goto out; + + gom_tracker_update_datasource (connection, datasource_urn, +- resource_exists, identifier, resource, ++ resource_exists, TRACKER_PICTURES_GRAPH, resource, + cancellable, error); + if (*error != NULL) + goto out; +@@ -566,6 +566,7 @@ account_miner_job_process_photo (TrackerSparqlConnection *connection, + equipment_resource = gom_tracker_utils_ensure_equipment_resource (connection, + cancellable, + error, ++ TRACKER_PICTURES_GRAPH, + make, + model); + +@@ -665,7 +666,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection, + (connection, + cancellable, error, + &resource_exists, +- datasource_urn, identifier, ++ TRACKER_PICTURES_GRAPH, identifier, + "nfo:RemoteDataObject", "nfo:DataContainer", + NULL); + +@@ -674,7 +675,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection, + + gom_tracker_update_datasource + (connection, datasource_urn, +- resource_exists, identifier, resource, ++ resource_exists, TRACKER_PICTURES_GRAPH, resource, + cancellable, error); + + if (*error != NULL) +@@ -685,7 +686,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection, + */ + new_mtime = gdata_entry_get_updated (GDATA_ENTRY (album)); + mtime_changed = gom_tracker_update_mtime (connection, new_mtime, +- resource_exists, identifier, resource, ++ resource_exists, TRACKER_PICTURES_GRAPH, resource, + cancellable, error); + + if (*error != NULL) +@@ -703,7 +704,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:url", alternate_uri); + + if (*error != NULL) +@@ -713,7 +714,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:description", summary); + + if (*error != NULL) +@@ -723,7 +724,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:title", title); + + if (*error != NULL) +@@ -743,7 +744,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nco:creator", contact_resource); + g_free (contact_resource); + +@@ -755,7 +756,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:contentCreated", date); + g_free (date); + +@@ -865,7 +866,7 @@ insert_shared_content_photos (TrackerSparqlConnection *connection, + if (!gom_tracker_sparql_connection_insert_or_replace_triple (connection, + cancellable, + &local_error, +- datasource_urn, ++ TRACKER_PICTURES_GRAPH, + source_urn, + "nie:relatedTo", + photo_resource_urn)) +@@ -878,7 +879,7 @@ insert_shared_content_photos (TrackerSparqlConnection *connection, + if (!gom_tracker_sparql_connection_insert_or_replace_triple (connection, + cancellable, + &local_error, +- datasource_urn, ++ TRACKER_PICTURES_GRAPH, + photo_resource_urn, + "nie:links", + source_urn)) +diff --git a/src/gom-media-server-miner.c b/src/gom-media-server-miner.c +index 490869e..32e08c6 100644 +--- a/src/gom-media-server-miner.c ++++ b/src/gom-media-server-miner.c +@@ -65,14 +65,14 @@ account_miner_job_process_photo (GomAccountMinerJob *job, + (connection, + cancellable, error, + &resource_exists, +- datasource_urn, identifier, ++ TRACKER_PICTURES_GRAPH, identifier, + "nfo:RemoteDataObject", class, NULL); + + if (*error != NULL) + goto out; + + gom_tracker_update_datasource (connection, datasource_urn, +- resource_exists, identifier, resource, ++ resource_exists, TRACKER_PICTURES_GRAPH, resource, + cancellable, error); + if (*error != NULL) + goto out; +@@ -81,7 +81,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:url", photo->url); + + if (*error != NULL) +@@ -90,7 +90,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:mimeType", photo->mimetype); + + if (*error != NULL) +@@ -99,7 +99,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:title", photo->name); + + if (*error != NULL) +diff --git a/src/gom-miner.c b/src/gom-miner.c +index f349d01..32892fa 100644 +--- a/src/gom-miner.c ++++ b/src/gom-miner.c +@@ -376,7 +376,7 @@ gom_miner_ensure_datasource (GomMiner *self, + " <%s> a nie:DataSource ; nao:identifier \"%s\" . " + " <%s> a nie:InformationElement ; nie:rootElementOf <%s> ; nie:version \"%d\"" + "}", +- datasource_urn, ++ GOM_GRAPH, + datasource_urn, klass->miner_identifier, + root_element_urn, datasource_urn, klass->version); + +@@ -401,8 +401,8 @@ gom_account_miner_job_query_existing (GomAccountMinerJob *job, + + select = g_string_new (NULL); + g_string_append_printf (select, +- "SELECT ?urn nao:identifier(?urn) WHERE { ?urn nie:dataSource <%s> }", +- job->datasource_urn); ++ "SELECT ?urn ?id WHERE { GRAPH <%s> { ?urn nie:dataSource <%s> ; nao:identifier ?id . } }", ++ GOM_GRAPH, job->datasource_urn); + + cursor = tracker_sparql_connection_query (job->connection, + select->str, +@@ -415,9 +415,21 @@ gom_account_miner_job_query_existing (GomAccountMinerJob *job, + + while (tracker_sparql_cursor_next (cursor, cancellable, error)) + { +- g_hash_table_insert (job->previous_resources, +- g_strdup (tracker_sparql_cursor_get_string (cursor, 1, NULL)), +- g_strdup (tracker_sparql_cursor_get_string (cursor, 0, NULL))); ++ const gchar *urn, *identifier; ++ ++ urn = tracker_sparql_cursor_get_string (cursor, 0, NULL); ++ identifier = tracker_sparql_cursor_get_string (cursor, 1, NULL); ++ ++ if (identifier != NULL) ++ { ++ g_hash_table_insert (job->previous_resources, ++ g_strdup (identifier), ++ g_strdup (urn)); ++ } ++ else ++ { ++ g_warning ("Missing identifier for urn %s", urn); ++ } + } + + g_object_unref (cursor); +@@ -489,16 +501,19 @@ gom_account_miner_job (GTask *task, + if (error != NULL) + goto out; + ++ g_debug ("account miner: Querying existing accounts stored in database"); + gom_account_miner_job_query_existing (job, &error); + + if (error != NULL) + goto out; + ++ g_debug ("account miner: Querying remote server"); + gom_account_miner_job_query (job, &error); + + if (error != NULL) + goto out; + ++ g_debug ("account miner: Removing stale accounts"); + gom_account_miner_job_cleanup_previous (job, &error); + + if (error != NULL) +@@ -752,10 +767,15 @@ cleanup_job (gpointer data, + + /* find all our datasources in the tracker DB */ + select = g_string_new (NULL); +- g_string_append_printf (select, "SELECT ?datasource nie:version(?root) WHERE { " +- "?datasource a nie:DataSource . " +- "?datasource nao:identifier \"%s\" . " +- "OPTIONAL { ?root nie:rootElementOf ?datasource } }", ++ g_string_append_printf (select, ++ "SELECT ?datasource nie:version(?root) WHERE { " ++ " GRAPH <%s> { " ++ " ?datasource a nie:DataSource . " ++ " ?datasource nao:identifier \"%s\" . " ++ " OPTIONAL { ?root nie:rootElementOf ?datasource } " ++ " }" ++ "}", ++ GOM_GRAPH, + klass->miner_identifier); + + cursor = tracker_sparql_connection_query (self->priv->connection, +diff --git a/src/gom-miner.h b/src/gom-miner.h +index 5dcfc8d..8f83139 100644 +--- a/src/gom-miner.h ++++ b/src/gom-miner.h +@@ -61,7 +61,6 @@ typedef struct _GomMinerPrivate GomMinerPrivate; + typedef struct { + GomMiner *miner; + TrackerSparqlConnection *connection; +- gchar *bus_name; + + GoaAccount *account; + GHashTable *services; +diff --git a/src/gom-owncloud-miner.c b/src/gom-owncloud-miner.c +index 34d303b..623f2e1 100644 +--- a/src/gom-owncloud-miner.c ++++ b/src/gom-owncloud-miner.c +@@ -100,14 +100,14 @@ account_miner_job_process_file (GomAccountMinerJob *job, + (connection, + cancellable, error, + &resource_exists, +- datasource_urn, identifier, ++ TRACKER_DOCUMENTS_GRAPH, identifier, + "nfo:RemoteDataObject", class, NULL); + + if (*error != NULL) + goto out; + + gom_tracker_update_datasource (connection, datasource_urn, +- resource_exists, identifier, resource, ++ resource_exists, TRACKER_DOCUMENTS_GRAPH, resource, + cancellable, error); + + if (*error != NULL) +@@ -117,7 +117,7 @@ account_miner_job_process_file (GomAccountMinerJob *job, + modification_time = g_date_time_new_from_timeval_local (&tv); + new_mtime = g_date_time_to_unix (modification_time); + mtime_changed = gom_tracker_update_mtime (connection, new_mtime, +- resource_exists, identifier, resource, ++ resource_exists, TRACKER_DOCUMENTS_GRAPH, resource, + cancellable, error); + + if (*error != NULL) +@@ -133,7 +133,7 @@ account_miner_job_process_file (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_DOCUMENTS_GRAPH, resource, + "nie:url", uri); + + if (*error != NULL) +@@ -156,7 +156,7 @@ account_miner_job_process_file (GomAccountMinerJob *job, + parent_resource_urn = gom_tracker_sparql_connection_ensure_resource + (connection, cancellable, error, + NULL, +- datasource_urn, parent_identifier, ++ GOM_GRAPH, parent_identifier, + "nfo:RemoteDataObject", "nfo:DataContainer", NULL); + g_checksum_reset (checksum); + g_free (parent_identifier); +@@ -168,7 +168,7 @@ account_miner_job_process_file (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_DOCUMENTS_GRAPH, resource, + "nie:isPartOf", parent_resource_urn); + g_free (parent_resource_urn); + +@@ -182,7 +182,7 @@ account_miner_job_process_file (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_DOCUMENTS_GRAPH, resource, + "nie:mimeType", mime); + + if (*error != NULL) +@@ -194,7 +194,7 @@ account_miner_job_process_file (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_DOCUMENTS_GRAPH, resource, + "nfo:fileName", display_name); + + if (*error != NULL) +@@ -416,6 +416,11 @@ query_owncloud (GomAccountMinerJob *job, + mount = g_volume_get_mount (volume); + if (mount == NULL) + { ++ g_autofree gchar *volume_name; ++ ++ volume_name = g_volume_get_name (volume); ++ g_debug ("Mounting Online Account volume %s", volume_name); ++ + data.error = error; + + context = g_main_context_new (); +@@ -436,6 +441,7 @@ query_owncloud (GomAccountMinerJob *job, + } + + root = g_mount_get_root (mount); ++ g_debug ("Got volume from gnome-online-accounts: root is %s", g_file_peek_path (root)); + account_miner_job_traverse_dir (job, connection, previous_resources, datasource_urn, root, TRUE, cancellable, error); + + g_object_unref (root); +diff --git a/src/gom-tracker.c b/src/gom-tracker.c +index 63a4c29..0d1766c 100644 +--- a/src/gom-tracker.c ++++ b/src/gom-tracker.c +@@ -26,16 +26,11 @@ + #include "gom-tracker.h" + #include "gom-utils.h" + +-static gchar * +-_tracker_utils_format_into_graph (const gchar *graph) +-{ +- return (graph != NULL) ? g_strdup_printf ("INTO <%s> ", graph) : g_strdup (""); +-} +- + static gboolean + gom_tracker_sparql_connection_get_string_attribute (TrackerSparqlConnection *connection, + GCancellable *cancellable, + GError **error, ++ const gchar *graph, + const gchar *resource, + const gchar *attribute, + gchar **value) +@@ -45,8 +40,8 @@ gom_tracker_sparql_connection_get_string_attribute (TrackerSparqlConnection *con + const gchar *string_value = NULL; + gboolean res; + +- g_string_append_printf (select, "SELECT ?val { <%s> %s ?val }", +- resource, attribute); ++ g_string_append_printf (select, "SELECT ?val { GRAPH <%s> { <%s> %s ?val } }", ++ graph, resource, attribute); + cursor = tracker_sparql_connection_query (connection, + select->str, + cancellable, error); +@@ -86,7 +81,8 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti + const gchar *class, + ...) + { +- GString *select, *insert, *inner; ++ GString *select, *inner; ++ gchar *insert; + va_list args; + const gchar *arg; + TrackerSparqlCursor *cursor; +@@ -98,6 +94,8 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti + gchar *key = NULL, *val = NULL; + gboolean exists = FALSE; + ++ g_return_val_if_fail (graph != NULL, NULL); ++ + /* build the inner query with all the classes */ + va_start (args, class); + inner = g_string_new (NULL); +@@ -112,7 +110,7 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti + /* query if such a resource is already in the DB */ + select = g_string_new (NULL); + g_string_append_printf (select, +- "SELECT ?urn WHERE { ?urn %s }", inner->str); ++ "SELECT ?urn WHERE { GRAPH <%s> { ?urn %s } }", graph, inner->str); + + cursor = tracker_sparql_connection_query (connection, + select->str, +@@ -138,19 +136,12 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti + } + + /* not found, create the resource */ +- insert = g_string_new (NULL); +- graph_str = _tracker_utils_format_into_graph (graph); +- +- g_string_append_printf (insert, "INSERT %s { _:res %s }", +- graph_str, inner->str); +- g_free (graph_str); +- g_string_free (inner, TRUE); +- ++ insert = g_strdup_printf ("INSERT INTO <%s> { _:res %s }", ++ graph, inner->str); + insert_res = +- tracker_sparql_connection_update_blank (connection, insert->str, ++ tracker_sparql_connection_update_blank (connection, insert, + G_PRIORITY_DEFAULT, NULL, error); +- +- g_string_free (insert, TRUE); ++ g_free (insert); + + if (*error != NULL) + goto out; +@@ -194,10 +185,10 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection + const gchar *property_value) + { + GString *insert; +- gchar *graph_str, *quoted; ++ gchar *quoted; + gboolean retval = TRUE; + +- graph_str = _tracker_utils_format_into_graph (graph); ++ g_return_val_if_fail (graph != NULL, FALSE); + + /* the "null" value must not be quoted */ + if (property_value == NULL) +@@ -208,8 +199,8 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection + insert = g_string_new (NULL); + g_string_append_printf + (insert, +- "INSERT OR REPLACE %s { <%s> a nie:InformationElement, nie:DataObject ; %s %s }", +- graph_str, resource, property_name, quoted); ++ "INSERT OR REPLACE INTO <%s> { <%s> a nie:InformationElement, nie:DataObject ; %s %s }", ++ graph, resource, property_name, quoted); + g_free (quoted); + + g_debug ("Insert or replace triple: query %s", insert->str); +@@ -223,8 +214,6 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection + if (*error != NULL) + retval = FALSE; + +- g_free (graph_str); +- + return retval; + } + +@@ -271,6 +260,7 @@ gboolean + gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connection, + GCancellable *cancellable, + GError **error, ++ const gchar *graph, + const gchar *resource, + gboolean favorite) + { +@@ -279,15 +269,15 @@ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connecti + gboolean retval = TRUE; + + if (favorite) +- op_str = "INSERT OR REPLACE"; ++ op_str = "INSERT OR REPLACE INTO"; + else +- op_str = "DELETE"; ++ op_str = "DELETE FROM"; + + update = g_string_new (NULL); + g_string_append_printf + (update, +- "%s { <%s> nao:hasTag nao:predefined-tag-favorite }", +- op_str, resource); ++ "%s <%s> { <%s> nao:hasTag nao:predefined-tag-favorite }", ++ op_str, graph, resource); + + g_debug ("Toggle favorite: query %s", update->str); + +@@ -321,9 +311,13 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection, + mail_uri = g_strconcat ("mailto:", email, NULL); + select = g_string_new (NULL); + g_string_append_printf (select, +- "SELECT ?urn WHERE { ?urn a nco:Contact . " +- "?urn nco:hasEmailAddress ?mail . " +- "FILTER (fn:contains(?mail, \"%s\" )) }", mail_uri); ++ "SELECT ?urn WHERE { " ++ " GRAPH <%s> { " ++ " ?urn a nco:Contact . " ++ " ?urn nco:hasEmailAddress ?mail . " ++ " FILTER (fn:contains(?mail, \"%s\" )) " ++ " }" ++ "}", TRACKER_CONTACTS_GRAPH, mail_uri); + + cursor = tracker_sparql_connection_query (connection, + select->str, +@@ -351,8 +345,9 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection, + insert = g_string_new (NULL); + + g_string_append_printf (insert, +- "INSERT { <%s> a nco:EmailAddress ; nco:emailAddress \"%s\" . " ++ "INSERT INTO <%s> { <%s> a nco:EmailAddress ; nco:emailAddress \"%s\" . " + "_:res a nco:Contact ; nco:hasEmailAddress <%s> ; nco:fullname \"%s\" . }", ++ TRACKER_CONTACTS_GRAPH, + mail_uri, email, + mail_uri, fullname); + +@@ -397,6 +392,7 @@ gchar * + gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection, + GCancellable *cancellable, + GError **error, ++ const gchar *graph, + const gchar *make, + const gchar *model) + { +@@ -416,7 +412,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection + equip_uri = tracker_sparql_escape_uri_printf ("urn:equipment:%s:%s:", + make != NULL ? make : "", + model != NULL ? model : ""); +- select = g_strdup_printf ("SELECT <%s> WHERE { }", equip_uri); ++ select = g_strdup_printf ("ASK { GRAPH <%s> { <%s> a nfo:Equipment } }", graph, equip_uri); + + local_error = NULL; + cursor = tracker_sparql_connection_query (connection, select, cancellable, &local_error); +@@ -436,20 +432,19 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection + + if (res) + { +- const gchar *cursor_uri; +- +- cursor_uri = tracker_sparql_cursor_get_string (cursor, 0, NULL); +- if (g_strcmp0 (cursor_uri, equip_uri) == 0) ++ if (tracker_sparql_cursor_get_boolean (cursor, 0)) + { +- /* return the found resource */ +- retval = g_strdup (cursor_uri); ++ /* The resource exists */ ++ retval = equip_uri; ++ equip_uri = NULL; + g_debug ("Found resource in the store: %s", retval); + goto out; + } + } + + /* not found, create the resource */ +- insert = g_strdup_printf ("INSERT { <%s> a nfo:Equipment ; nfo:manufacturer \"%s\" ; nfo:model \"%s\" }", ++ insert = g_strdup_printf ("INSERT INTO <%s> { <%s> a nfo:Equipment ; nfo:manufacturer \"%s\" ; nfo:model \"%s\" }", ++ graph, + equip_uri, + make, + model); +@@ -480,7 +475,7 @@ void + gom_tracker_update_datasource (TrackerSparqlConnection *connection, + const gchar *datasource_urn, + gboolean resource_exists, +- const gchar *identifier, ++ const gchar *graph, + const gchar *resource, + GCancellable *cancellable, + GError **error) +@@ -498,7 +493,7 @@ gom_tracker_update_datasource (TrackerSparqlConnection *connection, + + res = gom_tracker_sparql_connection_get_string_attribute + (connection, cancellable, error, +- resource, "nie:dataSource", &old_value); ++ graph, resource, "nie:dataSource", &old_value); + g_clear_error (error); + + if (res) +@@ -514,7 +509,7 @@ gom_tracker_update_datasource (TrackerSparqlConnection *connection, + if (set_datasource) + gom_tracker_sparql_connection_set_triple + (connection, cancellable, error, +- identifier, resource, ++ graph, resource, + "nie:dataSource", datasource_urn); + } + +@@ -522,7 +517,7 @@ gboolean + gom_tracker_update_mtime (TrackerSparqlConnection *connection, + gint64 new_mtime, + gboolean resource_exists, +- const gchar *identifier, ++ const gchar *graph, + const gchar *resource, + GCancellable *cancellable, + GError **error) +@@ -536,7 +531,7 @@ gom_tracker_update_mtime (TrackerSparqlConnection *connection, + { + res = gom_tracker_sparql_connection_get_string_attribute + (connection, cancellable, error, +- resource, "nie:contentLastModified", &old_value); ++ graph, resource, "nie:contentLastModified", &old_value); + g_clear_error (error); + + if (res) +@@ -552,7 +547,7 @@ gom_tracker_update_mtime (TrackerSparqlConnection *connection, + date = gom_iso8601_from_timestamp (new_mtime); + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, cancellable, error, +- identifier, resource, ++ graph, resource, + "nie:contentLastModified", date); + g_free (date); + +diff --git a/src/gom-tracker.h b/src/gom-tracker.h +index 94a39e8..a5ae6fd 100644 +--- a/src/gom-tracker.h ++++ b/src/gom-tracker.h +@@ -29,6 +29,14 @@ + + G_BEGIN_DECLS + ++/* The graph where we store account meta information */ ++#define GOM_GRAPH "tracker.api.gnome.org/ontology/v3/gnome-online-miners" ++ ++/* Graphs where we store content information */ ++#define TRACKER_CONTACTS_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Contacts" ++#define TRACKER_DOCUMENTS_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Documents" ++#define TRACKER_PICTURES_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Pictures" ++ + gchar *gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connection, + GCancellable *cancellable, + GError **error, +@@ -57,6 +65,7 @@ gboolean gom_tracker_sparql_connection_set_triple (TrackerSparqlConnection *conn + gboolean gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connection, + GCancellable *cancellable, + GError **error, ++ const gchar *graph, + const gchar *resource, + gboolean favorite); + +@@ -69,20 +78,21 @@ gchar* gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *conne + gchar *gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection, + GCancellable *cancellable, + GError **error, ++ const gchar *graph, + const gchar *make, + const gchar *model); + + void gom_tracker_update_datasource (TrackerSparqlConnection *connection, + const gchar *datasource_urn, + gboolean resource_exists, +- const gchar *identifier, ++ const gchar *graph, + const gchar *resource, + GCancellable *cancellable, + GError **error); + gboolean gom_tracker_update_mtime (TrackerSparqlConnection *connection, + gint64 new_mtime, + gboolean resource_exists, +- const gchar *identifier, ++ const gchar *graph, + const gchar *resource, + GCancellable *cancellable, + GError **error); +diff --git a/src/gom-zpj-miner.c b/src/gom-zpj-miner.c +index 6dff947..1372de5 100644 +--- a/src/gom-zpj-miner.c ++++ b/src/gom-zpj-miner.c +@@ -70,14 +70,14 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + (connection, + cancellable, error, + &resource_exists, +- datasource_urn, identifier, ++ TRACKER_PICTURES_GRAPH, identifier, + "nfo:RemoteDataObject", class, NULL); + + if (*error != NULL) + goto out; + + gom_tracker_update_datasource (connection, datasource_urn, +- resource_exists, identifier, resource, ++ resource_exists, TRACKER_PICTURES_GRAPH, resource, + cancellable, error); + + if (*error != NULL) +@@ -86,7 +86,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + updated_time = zpj_skydrive_entry_get_updated_time (entry); + new_mtime = g_date_time_to_unix (updated_time); + mtime_changed = gom_tracker_update_mtime (connection, new_mtime, +- resource_exists, identifier, resource, ++ resource_exists, TRACKER_PICTURES_GRAPH, resource, + cancellable, error); + + if (*error != NULL) +@@ -102,7 +102,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:url", identifier); + + if (*error != NULL) +@@ -119,7 +119,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + parent_resource_urn = gom_tracker_sparql_connection_ensure_resource + (connection, cancellable, error, + NULL, +- datasource_urn, parent_identifier, ++ TRACKER_PICTURES_GRAPH, parent_identifier, + "nfo:RemoteDataObject", "nfo:DataContainer", NULL); + g_free (parent_identifier); + +@@ -129,7 +129,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:isPartOf", parent_resource_urn); + g_free (parent_resource_urn); + +@@ -142,7 +142,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:mimeType", mime); + g_free (mime); + +@@ -154,7 +154,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:description", zpj_skydrive_entry_get_description (entry)); + + if (*error != NULL) +@@ -163,7 +163,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nfo:fileName", name); + + if (*error != NULL) +@@ -180,7 +180,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nco:creator", contact_resource); + g_free (contact_resource); + +@@ -192,7 +192,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job, + gom_tracker_sparql_connection_insert_or_replace_triple + (connection, + cancellable, error, +- datasource_urn, resource, ++ TRACKER_PICTURES_GRAPH, resource, + "nie:contentCreated", date); + g_free (date); + +-- +GitLab + + +From 34259944dd9e6e167663c97080142f6e8b7f00f2 Mon Sep 17 00:00:00 2001 +From: Sam Thursfield +Date: Mon, 27 Jul 2020 23:48:49 +0200 +Subject: [PATCH 5/5] Update for API changes in Tracker 2.99 + +--- + src/gom-miner.c | 3 --- + src/gom-tracker.c | 22 ++++++---------------- + 2 files changed, 6 insertions(+), 19 deletions(-) + +diff --git a/src/gom-miner.c b/src/gom-miner.c +index 32892fa..d9ccf67 100644 +--- a/src/gom-miner.c ++++ b/src/gom-miner.c +@@ -382,7 +382,6 @@ gom_miner_ensure_datasource (GomMiner *self, + + tracker_sparql_connection_update (self->priv->connection, + datasource_insert->str, +- G_PRIORITY_DEFAULT, + cancellable, + error); + +@@ -469,7 +468,6 @@ gom_account_miner_job_cleanup_previous (GomAccountMinerJob *job, + + tracker_sparql_connection_update (job->connection, + delete->str, +- G_PRIORITY_DEFAULT, + cancellable, + error); + +@@ -709,7 +707,6 @@ cleanup_job_do_cleanup (CleanupJob *job, GCancellable *cancellable) + + tracker_sparql_connection_update (self->priv->connection, + update->str, +- G_PRIORITY_DEFAULT, + cancellable, + &error); + g_string_free (update, TRUE); +diff --git a/src/gom-tracker.c b/src/gom-tracker.c +index 0d1766c..5f49f73 100644 +--- a/src/gom-tracker.c ++++ b/src/gom-tracker.c +@@ -138,9 +138,7 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti + /* not found, create the resource */ + insert = g_strdup_printf ("INSERT INTO <%s> { _:res %s }", + graph, inner->str); +- insert_res = +- tracker_sparql_connection_update_blank (connection, insert, +- G_PRIORITY_DEFAULT, NULL, error); ++ insert_res = tracker_sparql_connection_update_blank (connection, insert, NULL, error); + g_free (insert); + + if (*error != NULL) +@@ -205,9 +203,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection + + g_debug ("Insert or replace triple: query %s", insert->str); + +- tracker_sparql_connection_update (connection, insert->str, +- G_PRIORITY_DEFAULT, cancellable, +- error); ++ tracker_sparql_connection_update (connection, insert->str, cancellable, error); + + g_string_free (insert, TRUE); + +@@ -235,9 +231,7 @@ gom_tracker_sparql_connection_set_triple (TrackerSparqlConnection *connection, + "DELETE { <%s> %s ?val } WHERE { <%s> %s ?val }", resource, + property_name, resource, property_name); + +- tracker_sparql_connection_update (connection, delete->str, +- G_PRIORITY_DEFAULT, cancellable, +- error); ++ tracker_sparql_connection_update (connection, delete->str, cancellable, error); + + g_string_free (delete, TRUE); + if (*error != NULL) +@@ -281,9 +275,7 @@ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connecti + + g_debug ("Toggle favorite: query %s", update->str); + +- tracker_sparql_connection_update (connection, update->str, +- G_PRIORITY_DEFAULT, cancellable, +- error); ++ tracker_sparql_connection_update (connection, update->str, cancellable, error); + + g_string_free (update, TRUE); + +@@ -351,9 +343,7 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection, + mail_uri, email, + mail_uri, fullname); + +- insert_res = +- tracker_sparql_connection_update_blank (connection, insert->str, +- G_PRIORITY_DEFAULT, cancellable, error); ++ insert_res = tracker_sparql_connection_update_blank (connection, insert->str, cancellable, error); + + g_string_free (insert, TRUE); + +@@ -450,7 +440,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection + model); + + local_error = NULL; +- tracker_sparql_connection_update (connection, insert, G_PRIORITY_DEFAULT, cancellable, &local_error); ++ tracker_sparql_connection_update (connection, insert, cancellable, &local_error); + if (local_error != NULL) + { + g_propagate_error (error, local_error); +-- +GitLab + diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template index 644ac3558c9..a9b2f37d69a 100644 --- a/srcpkgs/gnome-online-miners/template +++ b/srcpkgs/gnome-online-miners/template @@ -1,12 +1,13 @@ # Template file for 'gnome-online-miners' pkgname=gnome-online-miners version=3.34.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel" +hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel autoconf + automake libtool autoconf-archive" makedepends="libzapojit-devel libgdata-devel grilo-devel - tracker-devel gfbgraph-devel gnome-online-accounts-devel" + tracker3-devel gfbgraph-devel gnome-online-accounts-devel" depends="libzapojit>=0.0.3_3" short_desc="GNOME service that crawls through your online content" maintainer="Orphaned " @@ -15,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeOnlineMiners" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=845c2260fb12f14315c800d04d60f37e076c7c7b4222587ae75f108562fa52d8 lib32disabled=yes + +pre_configure() { + autoreconf -fi +} From 72be0bd5e58363f1d45e6adbefccb599b97e44f7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 9 Apr 2022 13:10:44 +0200 Subject: [PATCH 0816/2369] removed-packages: revbump --- srcpkgs/removed-packages/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index f1dcebc2b8c..5d6d2c15334 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=68 +revision=69 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " From 62ac20e034347a38f346d130599408e9c15c2dda Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 8 Apr 2022 15:46:34 +0200 Subject: [PATCH 0817/2369] fio: update to 3.30. --- srcpkgs/fio/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template index e5b15d2b690..9bbb31a8574 100644 --- a/srcpkgs/fio/template +++ b/srcpkgs/fio/template @@ -1,6 +1,6 @@ # Template file for 'fio' pkgname=fio -version=3.29 +version=3.30 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=configure @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://github.com/axboe/fio" distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz" -checksum=3ad22ee9c545afae914f399886e9637a43d1b3aa5dfcf6966ed83e633759acb7 +checksum=305647377527a2827223065582dd8a9269e69866426b341699d55bb4e4d3cc71 python_version=3 case "$XBPS_TARGET_MACHINE" in @@ -30,7 +30,7 @@ do_configure() { } post_install() { - vdoc HOWTO + vdoc HOWTO.rst for f in examples/*; do vsconf "$f" done From 129c1ce325caa9ad710ae97eda49f9b5fdc90d1f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 8 Apr 2022 15:48:06 +0200 Subject: [PATCH 0818/2369] xclock: update to 1.1.1. --- srcpkgs/xclock/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xclock/template b/srcpkgs/xclock/template index 6d214076f83..83dbebfea74 100644 --- a/srcpkgs/xclock/template +++ b/srcpkgs/xclock/template @@ -1,6 +1,6 @@ # Template file for 'xclock' pkgname=xclock -version=1.1.0 +version=1.1.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config xorg-util-macros" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="http://www.x.org/archive/X11R6.8.1/doc/xclock.1.html" distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" -checksum=00d1be08b3471a16b1239acad11e26b80545c49c34d9d20deab0ce14515e098f +checksum=df7ceabf8f07044a2fde4924d794554996811640a45de40cb12c2cf1f90f742c post_install() { vlicense COPYING From a9e95a8406a761c26e744ad367198c53467a849e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 8 Apr 2022 15:50:53 +0200 Subject: [PATCH 0819/2369] scite: update to 5.2.2. --- srcpkgs/scite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template index 4943d99f3fc..e48c6adadb4 100644 --- a/srcpkgs/scite/template +++ b/srcpkgs/scite/template @@ -1,6 +1,6 @@ # Template file for 'scite' pkgname=scite -version=5.2.1 +version=5.2.2 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=0e7a1daca03d9eea20b2857b722ffd57788799235803bb7b84694af5a1707e07 +checksum=ad33019fdcf001ed441e88169593c3efebe77542f10bbc3e5a20a34e196586e0 post_extract() { sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile From d27f48eca340dd00d26db8a1a596b7fd5bca07a4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 9 Apr 2022 16:04:20 +0200 Subject: [PATCH 0820/2369] python3-pipenv: update to 2022.4.8. --- srcpkgs/python3-pipenv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template index 707476ccc36..ea94ef51e08 100644 --- a/srcpkgs/python3-pipenv/template +++ b/srcpkgs/python3-pipenv/template @@ -1,6 +1,6 @@ # Template file for 'python3-pipenv' pkgname=python3-pipenv -version=2022.3.28 +version=2022.4.8 revision=1 wrksrc="pipenv-${version}" build_style=python3-module @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/pypa/pipenv" changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst" distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz" -checksum=4e7aae62dad7679ce81b54cc3451be19fb2c469e269335b36b14132fe5ceecb3 +checksum=53562bf69d9e5238f99a1e2101c356746b1c0aefa5dceb9b8a84a5a3e201de0d conflicts="python-pipenv>=0" post_extract() { From 56fe54cbac3b66e7ab9d7fcfe6335693e1cdb5ea Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 9 Apr 2022 10:02:29 -0500 Subject: [PATCH 0821/2369] xmandump: update to 0.2.3. --- srcpkgs/xmandump/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template index b05027396ea..8ca5f3a280d 100644 --- a/srcpkgs/xmandump/template +++ b/srcpkgs/xmandump/template @@ -1,6 +1,6 @@ # Template file for 'xmandump' pkgname=xmandump -version=0.2.2 +version=0.2.3 revision=1 build_style=go go_import_path="github.com/void-linux/xmandump" @@ -10,7 +10,7 @@ maintainer="Érico Nogueira " license="ISC" homepage="https://github.com/void-linux/xmandump" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=c664b84b9eb26e6cf6d7bc0aceca9a2ccfcfb1c0a4e0611544117489941c00ca +checksum=d8c356bd2722558e9bfe1e55aefc0c44f6aecb52e998f4e7608e544a90cd6d89 post_install() { vlicense LICENSE.txt LICENSE From d6fc5518d55fdc81d75f6ddb72f06e25eeb00196 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 2 Apr 2022 00:02:47 -0500 Subject: [PATCH 0822/2369] .github/workflows: Enable actions/stale --- .github/workflows/stale.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index abdc83c9d38..91ac19e4f63 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -12,10 +12,8 @@ jobs: steps: - uses: actions/stale@v4 with: - stale-issue-message: 'Issues become stale 90 days after last activity and are closed 7 days after that. If this issue is still relevant bump it or assign it.' - stale-pr-message: 'Pull Requests become stale 90 days after last activity and are closed 7 days after that. If this pull request is still relevant bump it or assign it.' + stale-issue-message: 'Issues become stale 90 days after last activity and are closed 14 days after that. If this issue is still relevant bump it or assign it.' + stale-pr-message: 'Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.' days-before-stale: 90 - days-before-close: 7 - debug-only: true + days-before-close: 14 exempt-all-assignees: true - operations-per-run: 1000 From 246c2da38d256fba1e0def84313c375cafe33c5d Mon Sep 17 00:00:00 2001 From: Erich Ericson Date: Sun, 19 Dec 2021 18:41:33 +0100 Subject: [PATCH 0823/2369] MultiMC: remove package --- srcpkgs/MultiMC/files/MultiMC.sh | 2 -- srcpkgs/MultiMC/template | 50 ------------------------------- srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 srcpkgs/MultiMC/files/MultiMC.sh delete mode 100644 srcpkgs/MultiMC/template diff --git a/srcpkgs/MultiMC/files/MultiMC.sh b/srcpkgs/MultiMC/files/MultiMC.sh deleted file mode 100644 index 271794952e8..00000000000 --- a/srcpkgs/MultiMC/files/MultiMC.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/libexec/multimc/multimc -d ~/.multimc diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template deleted file mode 100644 index a842a76ac79..00000000000 --- a/srcpkgs/MultiMC/template +++ /dev/null @@ -1,50 +0,0 @@ -# Template file for 'MultiMC' -pkgname=MultiMC -version=0.6.13 -revision=1 -wrksrc="Launcher-${version}" -_commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4" -_nbtversion="multimc-0.6.1" -_quazipversion="multimc-3" -build_style=cmake -configure_args='-DMultiMC_BUILD_PLATFORM=Void -DMultiMC_LAYOUT=lin-system' -hostmakedepends="openjdk8 xxd git qt5-qmake qt5-host-tools tar" -makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel" -depends="virtual?java-environment qt5-svg" -short_desc="Instanced Minecraft client" -maintainer="Orphaned " -license="Apache-2.0" -homepage="http://multimc.org" -distfiles="https://github.com/MultiMC/Launcher/archive/${version}.tar.gz - https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz - https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz" -checksum="d77d07e77754875a8a4abd5a2f4d0e01593aa7ffb4860efe993eb2755e8a3164 - 36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07 - ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18" -skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz" - -# Restricted since we don't have permissions to ship builds with the -# MultiMC name, artwork or the API endpoints. -restricted=yes - -case "$XBPS_TARGET_MACHINE" in - armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";; -esac - -pre_configure() { - export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk - export PATH=$PATH:$JAVA_HOME/bin - tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_nbtversion}.tar.gz" -C "${wrksrc}/libraries/libnbtplusplus" --strip-components 1 - tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quazipversion}.tar.gz" -C "${wrksrc}/libraries/quazip" --strip-components 1 -} - -post_install() { - vmkdir usr/libexec/multimc - mv "${DESTDIR}/usr/bin/multimc" "${DESTDIR}/usr/libexec/multimc" - vbin "${FILESDIR}/MultiMC.sh" MultiMC - vinstall build/libMultiMC_nbt++.so 755 /usr/lib - vinstall build/libMultiMC_quazip.so 755 /usr/lib - vinstall launcher/package/linux/multimc.desktop 644 /usr/share/applications - vsed -i "${DESTDIR}/usr/share/applications/multimc.desktop" -e 's/Exec=multimc/Exec=MultiMC/' - vinstall launcher/resources/multimc/scalable/multimc.svg 644 /usr/share/pixmaps -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 5d6d2c15334..6859fe29da9 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -11,6 +11,7 @@ homepage="https://voidlinux.org" replaces=" ImageMagick6<=6.9.12.12_2 MoinMoin<=1.9.11_1 + MultiMC<=0.6.13_1 Platinum9-theme<=0.0.0.20170720_3 Venom<=0.5.5_1 XorCurses<=0.2.2_1 From b55fba325c77ac8cd687717f1b64c85197b9d1f2 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 9 Apr 2022 17:51:34 +0200 Subject: [PATCH 0824/2369] icdiff: update to 2.0.5. --- .../icdiff/patches/tests-disable-format-and-lint.patch | 10 ++++++++++ srcpkgs/icdiff/template | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch diff --git a/srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch b/srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch new file mode 100644 index 00000000000..6e3daa16d90 --- /dev/null +++ b/srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch @@ -0,0 +1,10 @@ +--- a/test.sh ++++ b/test.sh +@@ -204,6 +204,7 @@ + fi + } + ++exit 0 + ensure_installed "black" + echo 'Running black formatter...' + if ! black icdiff --line-length 79 --check; then diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template index 35e1d87c683..14f656a597b 100644 --- a/srcpkgs/icdiff/template +++ b/srcpkgs/icdiff/template @@ -1,7 +1,7 @@ # Template file for 'icdiff' pkgname=icdiff -version=2.0.4 -revision=2 +version=2.0.5 +revision=1 wrksrc="${pkgname}-release-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,7 +13,7 @@ license="Python-2.0" homepage="http://www.jefftk.com/icdiff" changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog" distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz" -checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac +checksum=e1c278222891acde5d5b47e31b89f765fdf022b8908057f583032530982fe5b4 replaces="python3-icdiff>=0" provides="python3-icdiff-${version}_${revision}" From 7bdf0c736aa1821a84bbece5cda1cd5dc5113e93 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 9 Apr 2022 17:54:27 +0200 Subject: [PATCH 0825/2369] drumkv1: update to 0.9.25. --- srcpkgs/drumkv1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/drumkv1/template b/srcpkgs/drumkv1/template index ff9633954f9..d26d6962543 100644 --- a/srcpkgs/drumkv1/template +++ b/srcpkgs/drumkv1/template @@ -1,6 +1,6 @@ # Template file for 'drumkv1' pkgname=drumkv1 -version=0.9.24 +version=0.9.25 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://drumkv1.sourceforge.io/" changelog="https://github.com/rncbc/drumkv1/raw/master/ChangeLog" distfiles="https://download.sourceforge.net/drumkv1/drumkv1-${version}.tar.gz" -checksum=b3d7a4105e94c3b29235d2d00ae74d0be6a00d62e791c968056aa64ff7ac6012 +checksum=cc89d3aaf617ec86fba448b61bb5376445bc5a65b102dd797caad14f2659a05c From 9b62dadae9019d47842a138b694669fcbec8463c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 9 Apr 2022 17:54:34 +0200 Subject: [PATCH 0826/2369] padthv1: update to 0.9.25. --- srcpkgs/padthv1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/padthv1/template b/srcpkgs/padthv1/template index 59ab088017c..c5f6158d1a2 100644 --- a/srcpkgs/padthv1/template +++ b/srcpkgs/padthv1/template @@ -1,6 +1,6 @@ # Template file for 'padthv1' pkgname=padthv1 -version=0.9.24 +version=0.9.25 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://padthv1.sourceforge.io/" changelog="https://github.com/rncbc/padthv1/raw/master/ChangeLog" distfiles="https://download.sourceforge.net/padthv1/padthv1-${version}.tar.gz" -checksum=abdbad3bae84f665bada488f0e41d2e75b810e88fa63b64e884856f8a9b8785c +checksum=6acabd7a9ffa45a0ebab48715c6342bc7530491599936378d4b89d47d211ca85 From 4bf058e51145a1056a5efd6f43d19fd13855a40d Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 9 Apr 2022 17:54:39 +0200 Subject: [PATCH 0827/2369] samplv1: update to 0.9.25. --- srcpkgs/samplv1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/samplv1/template b/srcpkgs/samplv1/template index c694da880ba..5e7a8ecec54 100644 --- a/srcpkgs/samplv1/template +++ b/srcpkgs/samplv1/template @@ -1,6 +1,6 @@ # Template file for 'samplv1' pkgname=samplv1 -version=0.9.24 +version=0.9.25 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://samplv1.sourceforge.io/" changelog="https://github.com/rncbc/samplv1/raw/master/ChangeLog" distfiles="https://download.sourceforge.net/samplv1/samplv1-${version}.tar.gz" -checksum=ff0bfbaacfb514cb1a0194b0a43ca121f7679640a293f907fb1bbb2640d373b0 +checksum=acf035da8c0f38ccd0a9bd0327d250c6338d8af56c824bf20f90673b07580534 From b86c4dcf66f42458b8050e4cd65afb0d12ae2fea Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 9 Apr 2022 17:54:42 +0200 Subject: [PATCH 0828/2369] synthv1: update to 0.9.25. --- srcpkgs/synthv1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/synthv1/template b/srcpkgs/synthv1/template index e835002bd2f..6d8775be3be 100644 --- a/srcpkgs/synthv1/template +++ b/srcpkgs/synthv1/template @@ -1,6 +1,6 @@ # Template file for 'synthv1' pkgname=synthv1 -version=0.9.24 +version=0.9.25 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -11,4 +11,4 @@ license="GPL-2.0-or-later" homepage="https://synthv1.sourceforge.io/" changelog="https://github.com/rncbc/synthv1/raw/master/ChangeLog" distfiles="https://download.sourceforge.net/synthv1/synthv1-${version}.tar.gz" -checksum=74857bf2497023dd0ebe59222e548d870598312b18a5826c54f4033c0fbd3d55 +checksum=02f05fcd45c896d6194fb10cb8ec64329193e3c194ce7e0b13a5f2e4cc0026c4 From 9e1b9f8eb5bebc9bddb5af300cc635ed9f4c87e6 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sat, 9 Apr 2022 09:02:28 -0700 Subject: [PATCH 0829/2369] eudev: add udev_dir pkg-config variable --- ...80239647d37e5cfe320c422cce879c2e0d2c.patch | 20 +++++++++++++++++++ srcpkgs/eudev/template | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch diff --git a/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch new file mode 100644 index 00000000000..b36b84f7549 --- /dev/null +++ b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch @@ -0,0 +1,20 @@ +From 9d9e80239647d37e5cfe320c422cce879c2e0d2c Mon Sep 17 00:00:00 2001 +From: oreo639 <31916379+Oreo639@users.noreply.github.com> +Date: Sat, 9 Apr 2022 05:39:56 -0700 +Subject: [PATCH] udev: add udev_dir as synonym of udevdir + +--- + src/udev/udev.pc.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in +index 4a9d867b8..cccebb245 100644 +--- a/src/udev/udev.pc.in ++++ b/src/udev/udev.pc.in +@@ -3,4 +3,5 @@ Description: eudev + Version: @UDEV_VERSION@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-udevdir=@udevlibexecdir@ ++udev_dir=@udevlibexecdir@ ++udevdir=${udev_dir} diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template index df783c562bc..68c50149e02 100644 --- a/srcpkgs/eudev/template +++ b/srcpkgs/eudev/template @@ -4,7 +4,7 @@ _UDEV_VERSION="243" # compatible udev version provided pkgname=eudev version=3.2.10 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-hwdb --enable-manpages --disable-introspection" hostmakedepends="pkg-config gperf" From 3462eb8717c0503b3d00e6e33f48fe51169f1e57 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 10 Apr 2022 01:40:24 +0200 Subject: [PATCH 0830/2369] firefox: fix build on platforms like ppc* --- srcpkgs/firefox/patches/fix-build-tier3.patch | 366 ++++++++++++++++++ 1 file changed, 366 insertions(+) create mode 100644 srcpkgs/firefox/patches/fix-build-tier3.patch diff --git a/srcpkgs/firefox/patches/fix-build-tier3.patch b/srcpkgs/firefox/patches/fix-build-tier3.patch new file mode 100644 index 00000000000..c7f5b7ea1f7 --- /dev/null +++ b/srcpkgs/firefox/patches/fix-build-tier3.patch @@ -0,0 +1,366 @@ +commit 8a0c895dee94b3c15e56557eb1dd0114477a6056 +Author: q66 +Date: Sun Apr 10 00:38:30 2022 +0200 + + fix build on tier 3 platforms + + https://bugzilla.mozilla.org/show_bug.cgi?id=1758610 + +diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +index 0fa127b..78c8961 100644 +--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp ++++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +@@ -814,7 +814,7 @@ MediaResult FFmpegVideoDecoder::DoDecode( + # ifdef MOZ_WAYLAND_USE_VAAPI + // Create VideoFramePool in case we need it. + if (!mVideoFramePool && mEnableHardwareDecoding) { +- mVideoFramePool = MakeUnique(); ++ mVideoFramePool = MakeUnique>(); + } + + // Release unused VA-API surfaces before avcodec_receive_frame() as +diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h +index b1a2f73..c77d76f 100644 +--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h ++++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h +@@ -16,6 +16,9 @@ + #if LIBAVCODEC_VERSION_MAJOR >= 57 && LIBAVUTIL_VERSION_MAJOR >= 56 + # include "mozilla/layers/TextureClient.h" + #endif ++#ifdef MOZ_WAYLAND_USE_VAAPI ++# include "FFmpegVideoFramePool.h" ++#endif + + struct _VADRMPRIMESurfaceDescriptor; + typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor; +@@ -23,7 +26,6 @@ typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor; + namespace mozilla { + + class ImageBufferWrapper; +-class VideoFramePool; + + template + class FFmpegVideoDecoder : public FFmpegDataDecoder {}; +@@ -138,7 +140,7 @@ class FFmpegVideoDecoder + AVBufferRef* mVAAPIDeviceContext; + bool mEnableHardwareDecoding; + VADisplay mDisplay; +- UniquePtr mVideoFramePool; ++ UniquePtr> mVideoFramePool; + static nsTArray mAcceleratedFormats; + #endif + RefPtr mImageAllocator; +diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp +index 7943e09..673b3fc 100644 +--- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp ++++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + + #include "FFmpegVideoFramePool.h" ++#include "PlatformDecoderModule.h" + #include "FFmpegLog.h" + #include "mozilla/widget/DMABufLibWrapper.h" + #include "libavutil/pixfmt.h" +@@ -15,11 +16,11 @@ + + namespace mozilla { + +-RefPtr VideoFrameSurfaceVAAPI::GetAsImage() { ++RefPtr VideoFrameSurface::GetAsImage() { + return new layers::DMABUFSurfaceImage(mSurface); + } + +-VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface) ++VideoFrameSurface::VideoFrameSurface(DMABufSurface* aSurface) + : mSurface(aSurface), + mLib(nullptr), + mAVHWFramesContext(nullptr), +@@ -30,22 +31,22 @@ VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface) + MOZ_ASSERT(mSurface); + MOZ_RELEASE_ASSERT(mSurface->GetAsDMABufSurfaceYUV()); + mSurface->GlobalRefCountCreate(); +- FFMPEG_LOG("VideoFrameSurfaceVAAPI: creating surface UID = %d", ++ FFMPEG_LOG("VideoFrameSurface: creating surface UID = %d", + mSurface->GetUID()); + } + +-void VideoFrameSurfaceVAAPI::LockVAAPIData(AVCodecContext* aAVCodecContext, +- AVFrame* aAVFrame, +- FFmpegLibWrapper* aLib) { +- FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI locking dmabuf surface UID = %d", ++void VideoFrameSurface::LockVAAPIData(AVCodecContext* aAVCodecContext, ++ AVFrame* aAVFrame, ++ FFmpegLibWrapper* aLib) { ++ FFMPEG_LOG("VideoFrameSurface: VAAPI locking dmabuf surface UID = %d", + mSurface->GetUID()); + mLib = aLib; + mAVHWFramesContext = aLib->av_buffer_ref(aAVCodecContext->hw_frames_ctx); + mHWAVBuffer = aLib->av_buffer_ref(aAVFrame->buf[0]); + } + +-void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) { +- FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI releasing dmabuf surface UID = %d", ++void VideoFrameSurface::ReleaseVAAPIData(bool aForFrameRecycle) { ++ FFMPEG_LOG("VideoFrameSurface: VAAPI releasing dmabuf surface UID = %d", + mSurface->GetUID()); + + // It's possible to unref GPU data while IsUsed() is still set. +@@ -67,43 +68,43 @@ void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) { + } + } + +-VideoFrameSurfaceVAAPI::~VideoFrameSurfaceVAAPI() { +- FFMPEG_LOG("VideoFrameSurfaceVAAPI: deleting dmabuf surface UID = %d", ++VideoFrameSurface::~VideoFrameSurface() { ++ FFMPEG_LOG("VideoFrameSurface: deleting dmabuf surface UID = %d", + mSurface->GetUID()); + // We're about to quit, no need to recycle the frames. + ReleaseVAAPIData(/* aForFrameRecycle */ false); + } + +-VideoFramePool::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {} ++VideoFramePool::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {} + +-VideoFramePool::~VideoFramePool() { ++VideoFramePool::~VideoFramePool() { + MutexAutoLock lock(mSurfaceLock); + mDMABufSurfaces.Clear(); + } + +-void VideoFramePool::ReleaseUnusedVAAPIFrames() { ++void VideoFramePool::ReleaseUnusedVAAPIFrames() { + MutexAutoLock lock(mSurfaceLock); + for (const auto& surface : mDMABufSurfaces) { +- auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI(); +- if (!vaapiSurface->IsUsed()) { +- vaapiSurface->ReleaseVAAPIData(); ++ if (!surface->IsUsed()) { ++ surface->ReleaseVAAPIData(); + } + } + } + +-RefPtr VideoFramePool::GetFreeVideoFrameSurface() { ++RefPtr> ++VideoFramePool::GetFreeVideoFrameSurface() { + for (auto& surface : mDMABufSurfaces) { + if (surface->IsUsed()) { + continue; + } +- auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI(); +- vaapiSurface->ReleaseVAAPIData(); ++ surface->ReleaseVAAPIData(); + return surface; + } + return nullptr; + } + +-RefPtr VideoFramePool::GetVideoFrameSurface( ++RefPtr> ++VideoFramePool::GetVideoFrameSurface( + VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext, + AVFrame* aAVFrame, FFmpegLibWrapper* aLib) { + if (aVaDesc.fourcc != VA_FOURCC_NV12 && aVaDesc.fourcc != VA_FOURCC_YV12 && +@@ -113,7 +114,7 @@ RefPtr VideoFramePool::GetVideoFrameSurface( + } + + MutexAutoLock lock(mSurfaceLock); +- RefPtr videoSurface = GetFreeVideoFrameSurface(); ++ RefPtr> videoSurface = GetFreeVideoFrameSurface(); + if (!videoSurface) { + RefPtr surface = + DMABufSurfaceYUV::CreateYUVSurface(aVaDesc); +@@ -121,7 +122,7 @@ RefPtr VideoFramePool::GetVideoFrameSurface( + return nullptr; + } + FFMPEG_LOG("Created new VA-API DMABufSurface UID = %d", surface->GetUID()); +- RefPtr surf = new VideoFrameSurfaceVAAPI(surface); ++ RefPtr> surf = new VideoFrameSurface(surface); + if (!mTextureCreationWorks) { + mTextureCreationWorks = Some(surface->VerifyTextureCreation()); + } +@@ -138,11 +139,8 @@ RefPtr VideoFramePool::GetVideoFrameSurface( + } + FFMPEG_LOG("Reusing VA-API DMABufSurface UID = %d", surface->GetUID()); + } +- +- auto* vaapiSurface = videoSurface->AsVideoFrameSurfaceVAAPI(); +- vaapiSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib); +- vaapiSurface->MarkAsUsed(); +- ++ videoSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib); ++ videoSurface->MarkAsUsed(); + return videoSurface; + } + +diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h +index c506d22..c89b418 100644 +--- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h ++++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h +@@ -7,8 +7,9 @@ + #ifndef __FFmpegVideoFramePool_h__ + #define __FFmpegVideoFramePool_h__ + +-#include "FFmpegVideoDecoder.h" + #include "FFmpegLibWrapper.h" ++#include "FFmpegLibs.h" ++#include "FFmpegLog.h" + + #include "mozilla/layers/DMABUFSurfaceImage.h" + #include "mozilla/widget/DMABufLibWrapper.h" +@@ -16,43 +17,16 @@ + + namespace mozilla { + +-class VideoFramePool; +-class VideoFrameSurfaceVAAPI; +- +-class VideoFrameSurface { +- public: +- NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface) +- +- VideoFrameSurface() = default; +- +- virtual VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() { return nullptr; } +- +- virtual void SetYUVColorSpace(gfx::YUVColorSpace aColorSpace) = 0; +- virtual void SetColorRange(gfx::ColorRange aColorRange) = 0; +- +- virtual RefPtr GetDMABufSurface() { return nullptr; }; +- virtual RefPtr GetAsImage() = 0; +- +- // Don't allow VideoFrameSurface plain copy as it leads to +- // unexpected DMABufSurface/HW buffer releases and we don't want to +- // deep copy them. +- VideoFrameSurface(const VideoFrameSurface&) = delete; +- const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete; +- +- protected: +- virtual ~VideoFrameSurface(){}; +-}; +- +-// VideoFrameSurfaceVAAPI holds a reference to GPU data with a video frame. ++// VideoFrameSurface holds a reference to GPU data with a video frame. + // + // Actual GPU pixel data are stored at DMABufSurface and + // DMABufSurface is passed to gecko GL rendering pipeline via. + // DMABUFSurfaceImage. + // +-// VideoFrameSurfaceVAAPI can optionally hold VA-API ffmpeg related data to keep ++// VideoFrameSurface can optionally hold VA-API ffmpeg related data to keep + // GPU data locked untill we need them. + // +-// VideoFrameSurfaceVAAPI is used for both HW accelerated video decoding ++// VideoFrameSurface is used for both HW accelerated video decoding + // (VA-API) and ffmpeg SW decoding. + // + // VA-API scenario +@@ -72,13 +46,24 @@ class VideoFrameSurface { + // Unfortunately there isn't any obvious way how to mark particular VASurface + // as used. The best we can do is to hold a reference to particular AVBuffer + // from decoded AVFrame and AVHWFramesContext which owns the AVBuffer. +-class VideoFrameSurfaceVAAPI final : public VideoFrameSurface { +- friend class VideoFramePool; ++template ++class VideoFrameSurface {}; ++template <> ++class VideoFrameSurface; ++ ++template ++class VideoFramePool {}; ++template <> ++class VideoFramePool; ++ ++template <> ++class VideoFrameSurface { ++ friend class VideoFramePool; + + public: +- explicit VideoFrameSurfaceVAAPI(DMABufSurface* aSurface); ++ NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface) + +- VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() final { return this; } ++ explicit VideoFrameSurface(DMABufSurface* aSurface); + + void SetYUVColorSpace(mozilla::gfx::YUVColorSpace aColorSpace) { + mSurface->GetAsDMABufSurfaceYUV()->SetYUVColorSpace(aColorSpace); +@@ -93,6 +78,12 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface { + + RefPtr GetAsImage(); + ++ // Don't allow VideoFrameSurface plain copy as it leads to ++ // unexpected DMABufSurface/HW buffer releases and we don't want to ++ // deep copy them. ++ VideoFrameSurface(const VideoFrameSurface&) = delete; ++ const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete; ++ + protected: + // Lock VAAPI related data + void LockVAAPIData(AVCodecContext* aAVCodecContext, AVFrame* aAVFrame, +@@ -107,7 +98,7 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface { + void MarkAsUsed() { mSurface->GlobalRefAdd(); } + + private: +- virtual ~VideoFrameSurfaceVAAPI(); ++ virtual ~VideoFrameSurface(); + + const RefPtr mSurface; + const FFmpegLibWrapper* mLib; +@@ -116,23 +107,24 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface { + }; + + // VideoFramePool class is thread-safe. +-class VideoFramePool final { ++template <> ++class VideoFramePool { + public: + VideoFramePool(); + ~VideoFramePool(); + +- RefPtr GetVideoFrameSurface( ++ RefPtr> GetVideoFrameSurface( + VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext, + AVFrame* aAVFrame, FFmpegLibWrapper* aLib); + void ReleaseUnusedVAAPIFrames(); + + private: +- RefPtr GetFreeVideoFrameSurface(); ++ RefPtr> GetFreeVideoFrameSurface(); + + private: + // Protect mDMABufSurfaces pool access + Mutex mSurfaceLock; +- nsTArray> mDMABufSurfaces; ++ nsTArray>> mDMABufSurfaces; + // We may fail to create texture over DMABuf memory due to driver bugs so + // check that before we export first DMABuf video frame. + Maybe mTextureCreationWorks; +diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build +index de2611e..8ffdaae 100644 +--- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build ++++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build +@@ -30,6 +30,9 @@ if CONFIG['MOZ_WAYLAND']: + CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS'] + DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1 + USE_LIBS += ['mozva'] ++ UNIFIED_SOURCES += [ ++ '../FFmpegVideoFramePool.cpp', ++ ] + + include("/ipc/chromium/chromium-config.mozbuild") + +diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build +index 7d28420..1da28a1 100644 +--- a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build ++++ b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build +@@ -30,6 +30,9 @@ if CONFIG["MOZ_WAYLAND"]: + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1 + USE_LIBS += ["mozva"] ++ UNIFIED_SOURCES += [ ++ "../FFmpegVideoFramePool.cpp", ++ ] + + include("/ipc/chromium/chromium-config.mozbuild") + From a3b6b003348b0ce8637d90af03df60dca1e5234a Mon Sep 17 00:00:00 2001 From: b-l-a-i-n-e Date: Wed, 5 Jan 2022 13:08:39 -0800 Subject: [PATCH 0831/2369] ruby-build: update to 20211227. --- srcpkgs/ruby-build/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ruby-build/template b/srcpkgs/ruby-build/template index 8ba698addb7..778d5e71650 100644 --- a/srcpkgs/ruby-build/template +++ b/srcpkgs/ruby-build/template @@ -1,6 +1,6 @@ # Template file for 'ruby-build' pkgname=ruby-build -version=20211203 +version=20211227 revision=1 depends="bash" short_desc="Compile and install Ruby" @@ -8,7 +8,7 @@ maintainer="b-l-a-i-n-e " license="MIT" homepage="https://github.com/rbenv/ruby-build" distfiles="https://github.com/rbenv/ruby-build/archive/refs/tags/v${version}.tar.gz" -checksum=f6a9149b24c7452a512395bc43d9837171de5f43ef0cf191a4a24b013f6a2eed +checksum=7a07eae6d6948f79a8ffecd7a493fb887e10326c429fe55cfe1bda65146db824 do_install() { vbin bin/ruby-build From b5f2cd07187027cda1e2094ef6b656780d7a9151 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Sun, 10 Apr 2022 01:26:47 -0400 Subject: [PATCH 0832/2369] neomutt: update to 20220408. --- srcpkgs/neomutt/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index 3e9e433395f..3e703630df8 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,6 +1,6 @@ # Template file for 'neomutt' pkgname=neomutt -version=20211029 +version=20220408 revision=1 create_wrksrc=true build_wrksrc="${pkgname}-${version}" @@ -19,11 +19,11 @@ short_desc="Mutt with misc fixes and feature patches" maintainer="Toyam Cox " license="GPL-2.0-or-later" homepage="https://neomutt.org/" -_test_files_hash=8e4fc46e731da0863c04b005885f92aa925b6367 +_test_files_hash=dc9fb32a701eb9dce4fda93c27da1d9b5be23231 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz" -checksum="08245cfa7aec80b895771fd1adcbb7b86e9c0434dfa64574e3c8c4d692aaa078 - 818ff9642ac396e18854486078320ce03a58c8aa8f7d6af44d1b0b5de822ccc3" +checksum="bb138adb09b1f164fe690749e991a5505bf4f50b6ad478ffb085c609d5617cc7 + bda7c7f9f7bac528398040a46da505f906913a86f5db65cdbab743d595ee2947" python_version=3 # fix: From 2bde7b3a85787ed795caf94091aeaa33712041a9 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sat, 2 Apr 2022 18:51:49 -0700 Subject: [PATCH 0833/2369] upower: update to 0.99.17 --- .../upower/patches/fix-gtk-doc-disable.patch | 58 +++++++++++++++++++ srcpkgs/upower/template | 38 ++++++------ 2 files changed, 77 insertions(+), 19 deletions(-) create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch new file mode 100644 index 00000000000..5005d91e197 --- /dev/null +++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch @@ -0,0 +1,58 @@ +From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Sun, 20 Mar 2022 15:32:55 -0700 +Subject: [PATCH] meson: Don't search for gtk-doc if disabled + +--- + doc/meson.build | 38 ++++++++++++++++++++------------------ + 1 file changed, 20 insertions(+), 18 deletions(-) + +diff --git a/doc/meson.build b/doc/meson.build +index dc93a16..5fc253c 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -27,21 +27,23 @@ version_xml = configure_file( + input: 'version.xml.in', + configuration: cdata) + +-gnome.gtkdoc('UPower', +- main_xml: 'upower-docs.xml', +- src_dir: meson.source_root() / 'libupower-glib', +- dependencies: [ libupower_glib_dep ], +- scan_args: ['--rebuild-types', '--rebuild-sections'], +- content_files: [ +- version_xml, +- ifaces_refs, +- 'man/UPower.xml', +- 'man/upowerd.xml', +- 'man/upower.xml', +- '../COPYING', +- ], +- ignore_headers: [ +- 'config.h', +- ], +- install: get_option('gtk-doc') +-) ++if get_option('gtk-doc') ++ gnome.gtkdoc('UPower', ++ main_xml: 'upower-docs.xml', ++ src_dir: meson.source_root() / 'libupower-glib', ++ dependencies: [ libupower_glib_dep ], ++ scan_args: ['--rebuild-types', '--rebuild-sections'], ++ content_files: [ ++ version_xml, ++ ifaces_refs, ++ 'man/UPower.xml', ++ 'man/upowerd.xml', ++ 'man/upower.xml', ++ '../COPYING', ++ ], ++ ignore_headers: [ ++ 'config.h', ++ ], ++ install: true ++ ) ++endif +-- +GitLab + diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template index b87ec0d5f9e..654c901f129 100644 --- a/srcpkgs/upower/template +++ b/srcpkgs/upower/template @@ -1,39 +1,36 @@ # Template file for 'upower' pkgname=upower -version=0.99.13 +version=0.99.17 revision=1 -_distver="${version//./_}" -wrksrc="upower-UPOWER_${_distver}" -build_style=gnu-configure +wrksrc="upower-v${version}" build_helper="gir" -configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)" +build_style=meson +configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no + -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)" conf_files="/etc/UPower/UPower.conf" -hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc - intltool libtool libxslt pkg-config which" +hostmakedepends="gettext glib-devel gobject-introspection + $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config which" makedepends="libusb-devel libgudev-devel dbus-glib-devel libimobiledevice-devel polkit-devel" checkdepends="python3-dbus python3-packaging" short_desc="Abstraction for enumerating power devices" maintainer="cinerea0 " license="GPL-2.0-or-later" -homepage="https://upower.freedesktop.org" -distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2" -checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d +homepage="https://gitlab.freedesktop.org/upower/upower" +changelog="https://gitlab.freedesktop.org/upower/upower/-/raw/master/NEWS" +distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2" +checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d provides="upower0-${version}_${revision}" replaces="upower0>=0" # Package build options -build_options="gir" +build_options="gir gtk_doc" build_options_default="gir" -post_patch() { - vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/' -} - -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" +fi libupower-glib3_package() { short_desc+=" - runtime library" @@ -49,9 +46,12 @@ upower-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi - vmove "usr/lib/*.so" + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/gtk-doc + fi } } From 7518dbb16a9486e6bdbfc810d0d5532556478cfe Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Fri, 1 Apr 2022 11:00:05 +0200 Subject: [PATCH 0834/2369] vscode: update to 1.66.0. --- srcpkgs/vscode/patches/product.patch | 12 +++--------- srcpkgs/vscode/patches/ripgrep.patch | 14 +++++++------- srcpkgs/vscode/template | 10 +++++++--- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index a7e2b79925b..624ca63afcb 100644 --- a/srcpkgs/vscode/patches/product.patch +++ b/srcpkgs/vscode/patches/product.patch @@ -1,21 +1,15 @@ diff --git a/product.json b/product.json -index 9d630f23cd7..eea95dce319 100644 +index df18127dcc67..d3006752bd98 100644 --- a/product.json +++ b/product.json -@@ -27,6 +27,9 @@ +@@ -27,7 +27,15 @@ "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/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/out/vs/workbench/contrib/webview/browser/pre/", - "extensionAllowedProposedApi": [ - "ms-vscode.vscode-js-profile-flame", -@@ -34,6 +37,11 @@ - "GitHub.remotehub", - "GitHub.remotehub-insiders" - ], + "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/", + "extensionsGallery": { + "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", + "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch index ff0dfc233e4..3fdc568a9e5 100644 --- a/srcpkgs/vscode/patches/ripgrep.patch +++ b/srcpkgs/vscode/patches/ripgrep.patch @@ -5,27 +5,27 @@ during build, which unbreaks build on platforms where MS deos not ship a prebuilt ripgrep. diff --git a/package.json b/package.json -index 5d6022a2a40..f66ee44eef0 100644 +index de2cf9e04a9b..1995e3bb9a7e 100644 --- a/package.json +++ b/package.json -@@ -63,7 +63,7 @@ +@@ -62,7 +62,7 @@ + "@microsoft/applicationinsights-web": "^2.6.4", "@parcel/watcher": "2.0.5", - "@vscode/debugprotocol": "1.51.0", "@vscode/iconv-lite-umd": "0.7.0", -- "@vscode/ripgrep": "^1.14.1", +- "@vscode/ripgrep": "^1.14.2", + "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git", - "@vscode/sqlite3": "4.0.12", + "@vscode/sqlite3": "5.0.7", "@vscode/sudo-prompt": "9.3.1", "@vscode/vscode-languagedetection": "1.0.21", diff --git a/remote/package.json b/remote/package.json -index 4bc40998093..9d22d408c02 100644 +index c7fc7a2e931f..8842b784df2c 100644 --- a/remote/package.json +++ b/remote/package.json @@ -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": "^1.14.2", + "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git", "@vscode/vscode-languagedetection": "1.0.21", "applicationinsights": "1.4.2", diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 620c9a6928a..0b9efda224d 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,8 +1,9 @@ # Template file for 'vscode' pkgname=vscode -version=1.65.2 +version=1.66.0 revision=1 _electronver=13.6.7 +_npmver=8.6.0 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" @@ -11,7 +12,7 @@ maintainer="shizonic , Alex Lohr " license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" -checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e +checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7 nocross=yes # x64 build does not cut it, it contains native code if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then @@ -46,7 +47,10 @@ do_build() { /usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \ --target=$_electronver \ --tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz - yarn install --ignore-engines --arch=x64 + + npm install -g npm@${_npmver} && \ + yarn install --ignore-engines --arch=x64 + export CFLAGS="$CFLAGS -I/usr/include/node" yarn run gulp vscode-linux-x64-min } From ba082a801eb5f8df13c307bbaeac56206af17db2 Mon Sep 17 00:00:00 2001 From: octeep Date: Fri, 1 Apr 2022 17:55:08 +0100 Subject: [PATCH 0835/2369] New package: wireproxy-1.0.1 --- srcpkgs/wireproxy/files/wireproxy/run | 7 +++++++ srcpkgs/wireproxy/template | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 srcpkgs/wireproxy/files/wireproxy/run create mode 100644 srcpkgs/wireproxy/template diff --git a/srcpkgs/wireproxy/files/wireproxy/run b/srcpkgs/wireproxy/files/wireproxy/run new file mode 100644 index 00000000000..7ba16434072 --- /dev/null +++ b/srcpkgs/wireproxy/files/wireproxy/run @@ -0,0 +1,7 @@ +#!/bin/sh + +[ -r ./conf ] && . ./conf + +export HOME=/var/lib/wireproxy + +exec chpst -u _wireproxy wireproxy --config ${CONFFILE:-/etc/wireproxy/config} diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template new file mode 100644 index 00000000000..984027a4f69 --- /dev/null +++ b/srcpkgs/wireproxy/template @@ -0,0 +1,24 @@ +# Template file for 'wireproxy' +pkgname=wireproxy +version=1.0.1 +revision=1 +build_style=go +go_import_path="github.com/octeep/wireproxy" +go_package="${go_import_path}/cmd/wireproxy" +short_desc="Wireguard client that exposes itself as a socks5 proxy" +maintainer="Wind Wong " +license="ISC" +homepage="https://github.com/octeep/wireproxy" +distfiles="https://github.com/octeep/wireproxy/archive/v${version}.tar.gz" +checksum=e21eac22ef1b12dc2d7b3e5b58dcff183af9c1547be3e55a7e6c71394f053e1e +make_dirs=" + /etc/wireproxy 0750 root _wireproxy + /var/lib/wireproxy 0700 _wireproxy _wireproxy" + +system_accounts="_wireproxy" +_wireproxy_homedir="/var/lib/wireproxy" + +post_install() { + vsv wireproxy + vlicense LICENSE +} From 15f5a8668b4d033b5ead8510f9a58ba45aa9ec31 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 30 Mar 2022 00:38:27 +0200 Subject: [PATCH 0836/2369] patch_args: allow use of --directory parameter patch(1) has a -d/--directory parameter which allows us to specify a directory where the patch will be applied. This is especially useful when we have multiple distfiles and want to patch in $build_wrksrc because that's where the patch is usually applied. Problem is, that the -i parameter is also relative to the the -d parameter and thus fails to find the patch, when -d is set. We solve that by using standard input instead of -i. --- common/hooks/do-patch/00-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/hooks/do-patch/00-patches.sh b/common/hooks/do-patch/00-patches.sh index 9f7e21f017d..64659dc3028 100644 --- a/common/hooks/do-patch/00-patches.sh +++ b/common/hooks/do-patch/00-patches.sh @@ -31,7 +31,7 @@ _process_patch() { cd "$wrksrc" msg_normal "$pkgver: patching: ${_patch}.\n" - patch -s ${_args} -i ${_patch} 2>/dev/null + patch -s ${_args} <${_patch} 2>/dev/null } hook() { From c96d298aac82a31b7a336390130a2c91667f47c9 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 30 Mar 2022 00:57:00 +0200 Subject: [PATCH 0837/2369] wine: patch into $build_wrksrc --- srcpkgs/wine/patches/musl-limits.patch | 4 ++-- srcpkgs/wine/patches/musl-rpath.patch | 9 +++++++-- srcpkgs/wine/patches/musl-uid-t.patch | 4 ++-- srcpkgs/wine/template | 3 +++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch index 7546d45c760..6a46158221b 100644 --- a/srcpkgs/wine/patches/musl-limits.patch +++ b/srcpkgs/wine/patches/musl-limits.patch @@ -1,5 +1,5 @@ ---- a/wine-7.6/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 -+++ b/wine-7.6/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 +--- a/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 ++++ b/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 @@ -29,7 +29,8 @@ #include #include diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch index e0b6f862663..f522f7ecea2 100644 --- a/srcpkgs/wine/patches/musl-rpath.patch +++ b/srcpkgs/wine/patches/musl-rpath.patch @@ -1,7 +1,7 @@ diff --git a/configure b/configure index 774a95ce003..d408e77cc78 100755 ---- a/wine-7.6/configure -+++ b/wine-7.6/configure +--- a/configure ++++ b/configure @@ -11137,6 +11137,38 @@ fi LIBWINE_DEPENDS="wine.map" @@ -43,8 +43,13 @@ index 774a95ce003..d408e77cc78 100755 diff --git a/configure.ac b/configure.ac index 8c5066a3de6..01ede86df1e 100644 +<<<<<<< HEAD --- a/wine-7.6/configure.ac +++ b/wine-7.6/configure.ac +======= +--- a/configure.ac ++++ b/configure.ac +>>>>>>> 6dccb4ef9c (wine: patch into $build_wrksrc) @@ -916,6 +916,9 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version") AC_SUBST(LIBWINE_DEPENDS,"wine.map") diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch index a95011e3cca..ac8dfca3bb2 100644 --- a/srcpkgs/wine/patches/musl-uid-t.patch +++ b/srcpkgs/wine/patches/musl-uid-t.patch @@ -1,5 +1,5 @@ ---- a/wine-7.6/server/security.h 2022-01-29 08:23:43.759508270 +0100 -+++ b/wine-7.6/server/security.h 2022-01-29 08:24:07.976443565 +0100 +--- a/server/security.h 2022-01-29 08:23:43.759508270 +0100 ++++ b/server/security.h 2022-01-29 08:24:07.976443565 +0100 @@ -22,6 +22,7 @@ #define __WINE_SERVER_SECURITY_H diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 86d0acf0883..beb10898af9 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -25,6 +25,8 @@ desc_option_xshm="Enable support for the X Shared Memory Extension" lib32mode=full archs="i686* x86_64*" +patch_args="-Np1 --directory=${build_wrksrc}" + _nopie=no if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then # build system adds -fno-PIC for 32bit builds, which, @@ -48,6 +50,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel depends="libXi libXinerama libXcomposite libXcursor libOSMesa desktop-file-utils hicolor-icon-theme liberation-fonts-ttf gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}" +# This testsuite might hang indefinitely make_check=extended case $XBPS_TARGET_MACHINE in From 7c26b26fb288690183a1f396db59b7c334b348c6 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 9 Apr 2022 13:38:04 +0200 Subject: [PATCH 0838/2369] chatterino2: patch into $build_wrksrc --- .../patches/0001-fix-desktop-icon-name.patch | 4 ++-- srcpkgs/chatterino2/patches/cmake.patch | 12 ++++++------ srcpkgs/chatterino2/template | 5 +++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch index 9f41d03190b..1b0a6d6140e 100644 --- a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch +++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch @@ -1,7 +1,7 @@ diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop index 6ee45354..ece81f5c 100644 ---- a/chatterino2/resources/com.chatterino.chatterino.desktop -+++ b/chatterino2/resources/com.chatterino.chatterino.desktop +--- a/resources/com.chatterino.chatterino.desktop ++++ b/resources/com.chatterino.chatterino.desktop @@ -4,7 +4,7 @@ Version=1.0 Name=Chatterino Comment=Chat client for Twitch diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch index a59d0a4eb9f..8a564356695 100644 --- a/srcpkgs/chatterino2/patches/cmake.patch +++ b/srcpkgs/chatterino2/patches/cmake.patch @@ -1,7 +1,7 @@ diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake index 82905436..b0b89a4e 100644 ---- a/chatterino2/cmake/FindLRUCache.cmake -+++ b/chatterino2/cmake/FindLRUCache.cmake +--- a/cmake/FindLRUCache.cmake ++++ b/cmake/FindLRUCache.cmake @@ -1,6 +1,6 @@ include(FindPackageHandleStandardArgs) @@ -12,8 +12,8 @@ index 82905436..b0b89a4e 100644 diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake index 4671874c..119284c2 100644 ---- a/chatterino2/cmake/FindPajladaSerialize.cmake -+++ b/chatterino2/cmake/FindPajladaSerialize.cmake +--- a/cmake/FindPajladaSerialize.cmake ++++ b/cmake/FindPajladaSerialize.cmake @@ -1,6 +1,6 @@ include(FindPackageHandleStandardArgs) @@ -24,8 +24,8 @@ index 4671874c..119284c2 100644 diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake index f4c964ec..75efba20 100644 ---- a/chatterino2/cmake/FindPajladaSignals.cmake -+++ b/chatterino2/cmake/FindPajladaSignals.cmake +--- a/cmake/FindPajladaSignals.cmake ++++ b/cmake/FindPajladaSignals.cmake @@ -1,6 +1,6 @@ include(FindPackageHandleStandardArgs) diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template index e1f99ac9e9f..7bf7d6a37d0 100644 --- a/srcpkgs/chatterino2/template +++ b/srcpkgs/chatterino2/template @@ -9,7 +9,7 @@ _signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc" _qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9" _sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b" create_wrksrc=yes -build_wrksrc="chatterino2" +build_wrksrc="chatterino2-${version}" build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel @@ -40,8 +40,9 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then LIBS="-latomic" fi +patch_args="-Np1 --directory=${build_wrksrc}" + post_extract() { - mv "chatterino2-${version}" "${build_wrksrc}" rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \ ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \ ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \ From 18aac206e740934a93f945c3293189818eab1bd9 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Wed, 16 Mar 2022 15:29:25 +0200 Subject: [PATCH 0839/2369] goodvibes: update to 0.7.3. --- srcpkgs/goodvibes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template index 1a73cd22523..97c1ae97171 100644 --- a/srcpkgs/goodvibes/template +++ b/srcpkgs/goodvibes/template @@ -1,6 +1,6 @@ # Template file for 'goodvibes' pkgname=goodvibes -version=0.7.2 +version=0.7.4 revision=1 wrksrc="goodvibes-v${version}" build_style=meson @@ -14,7 +14,7 @@ license="GPL-3.0-only" homepage="https://gitlab.com/goodvibes/goodvibes" changelog="https://gitlab.com/goodvibes/goodvibes/-/raw/master/NEWS" distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz" -checksum=5f96ba7b8654f331181c8ee0e697d042a195406712a547e7954159e5d66795ba +checksum=9940c56cb18064f966c2f881fbc7876004eba06f1ea249e01c652477853017cf if [ "$CROSS_BUILD" ]; then hostmakedepends+=" glib-devel" From 26be6d2c8279e9b63e1ce16bea4b00a0fe18b621 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 19 Mar 2022 02:50:03 +0100 Subject: [PATCH 0840/2369] screenkey: update to 1.5. --- srcpkgs/screenkey/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/screenkey/template b/srcpkgs/screenkey/template index 4541a207058..f199b36bc9e 100644 --- a/srcpkgs/screenkey/template +++ b/srcpkgs/screenkey/template @@ -1,15 +1,15 @@ # Template file for 'screenkey' pkgname=screenkey -version=1.4 -revision=2 +version=1.5 +revision=1 build_style=python3-module -hostmakedepends="intltool python3-setuptools python3-distutils-extra - python3-Babel" -depends="gtk+3 libX11 python3-gobject" -checkdepends="${depends} libXtst" +hostmakedepends="python3-setuptools python3-Babel" +depends="gtk+3 libX11 python3-gobject python3-cairo python3-dbus" +checkdepends="$depends" short_desc="Screencast tool to display your keys" maintainer="Steve Prybylski " license="GPL-3.0-or-later" -homepage="http://www.thregr.org/~wavexx/software/screenkey" +homepage="https://www.thregr.org/~wavexx/software/screenkey" +changelog="https://www.thregr.org/~wavexx/software/screenkey/NEWS.html" distfiles="${homepage}/releases/screenkey-${version}.tar.gz" -checksum=d7347e31fab4a5b18da431e3fc26f39700e99a505eb0c0168295adc12c8dd4f7 +checksum=cc8471b83f7ba7a754e1da0631cfa9c32b9217da93597afc1c3283e3a1ae4112 From 53249dd3b7d688dc5ecf0c374b530bed63d99427 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 27 Mar 2022 22:35:11 +0200 Subject: [PATCH 0841/2369] New package: orage-4.16.0 --- srcpkgs/orage/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/orage/template diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template new file mode 100644 index 00000000000..0cfc8994c78 --- /dev/null +++ b/srcpkgs/orage/template @@ -0,0 +1,17 @@ +# Template file for 'orage' +pkgname=orage +version=4.16.0 +revision=1 +build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" +hostmakedepends="pkg-config intltool flex glib-devel dbus-glib-devel" +makedepends="libical-devel libnotify-devel gtk+3-devel popt-devel + libxfce4util-devel libxfce4ui-devel xfce4-panel-devel" +depends="hicolor-icon-theme desktop-file-utils" +short_desc="Simple calendar application for Xfce" +maintainer="tibequadorian " +license="GPL-2.0-or-later" +homepage="https://docs.xfce.org/apps/orage/start" +changelog="https://gitlab.xfce.org/apps/orage/-/raw/master/NEWS" +distfiles="https://archive.xfce.org/src/apps/orage/${version%.*}/orage-$version.tar.bz2" +checksum=26111a3b6a2007c82f1e0a1e0591b774a0b132f3a7f1cde53d9be661b2f11700 From 35b596e722b449b6d701fbd1fb18c72d3e0592fa Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Fri, 8 Apr 2022 10:47:59 +0700 Subject: [PATCH 0842/2369] upterm: update to 0.8.2 --- srcpkgs/upterm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template index 362f919c40e..fd99190dedb 100644 --- a/srcpkgs/upterm/template +++ b/srcpkgs/upterm/template @@ -1,6 +1,6 @@ # Template file for 'upterm' pkgname=upterm -version=0.7.6 +version=0.8.2 revision=1 build_style=go go_import_path="github.com/owenthereal/upterm" @@ -10,7 +10,7 @@ maintainer="Hervy Qurrotul Ainur Rozi " license="Apache-2.0" homepage="https://github.com/owenthereal/upterm/" distfiles="https://github.com/owenthereal/upterm/archive/refs/tags/v$version.tar.gz" -checksum=26ceb5eee035d4e1a08240aced75a20f2e54b1e192eef0bf5eb51d0195997f8c +checksum=4b85cf8207ffce051f2c391905fd58514c98c3fd5ff890d7340fcfd3a0ea7b8e post_install() { vcompletion etc/completion/upterm.zsh_completion zsh From ed5232a17f7ecbbccaf72136b263b20f9b3278c4 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 7 Apr 2022 18:42:16 -0400 Subject: [PATCH 0843/2369] dendrite: update to 0.8.1. --- srcpkgs/dendrite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template index 1bef12b9564..fffd933f62c 100644 --- a/srcpkgs/dendrite/template +++ b/srcpkgs/dendrite/template @@ -1,6 +1,6 @@ # Template file for 'dendrite' pkgname=dendrite -version=0.7.0 +version=0.8.1 revision=1 build_style=go go_import_path="github.com/matrix-org/dendrite" @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://matrix.org/docs/projects/server/dendrite" changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md" distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz" -checksum=26c378bff1738b0e8422c7bd425be4763f22225f422ae1854c78644e4ca8bc42 +checksum=e26d306b008c9a88da31449e51df4c97e991d99b7954ab130f4fcf00371aa503 system_accounts="_dendrite" _dendrite_homedir="/var/lib/dendrite" From 18edc19e20e9fa7ac5ff55c7bec757f388e4e906 Mon Sep 17 00:00:00 2001 From: anelki Date: Thu, 7 Apr 2022 16:43:47 -0500 Subject: [PATCH 0844/2369] Signal-Desktop: update to 5.38.0. --- 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 a0b15428b92..05be4f346a9 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.37.0 +version=5.38.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=bd674ea6ba0582862f26a8fed1557d21f68161ef05891e67ca4cb653bf0f8d1a +checksum=da693cf3fd7535f8569bbdc6f64387e274daab49c2798cacc804c784e401115d nostrip_files="signal-desktop" post_extract() { From 78ca8bebffcedfa735e24dfc16cb118c707f3a27 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Wed, 6 Apr 2022 22:31:09 -0400 Subject: [PATCH 0845/2369] just: update to 1.1.2. --- srcpkgs/just/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/just/template b/srcpkgs/just/template index 7dc9fe4fbeb..f3857ec4f01 100644 --- a/srcpkgs/just/template +++ b/srcpkgs/just/template @@ -1,6 +1,6 @@ # Template file for 'just' pkgname=just -version=1.1.1 +version=1.1.2 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=b985def8260965773422fc6c665fa37aeb7304280560dbf8f641479ba00e2da0 +checksum=5f04ce85dc2de7609d68c336a7c51f477f8ff079d8b209a0d72183615e3f1e55 make_check=ci-skip # test fails when run as root # Fix failing test From 1af2cbab7e745ebbd2ed1d37ec395f1a1f7ad26a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Mon, 4 Apr 2022 12:40:05 +0200 Subject: [PATCH 0846/2369] qjackctl: update to 0.9.7. --- srcpkgs/qjackctl/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template index 4e746124bdd..8fb8a4ad535 100644 --- a/srcpkgs/qjackctl/template +++ b/srcpkgs/qjackctl/template @@ -1,6 +1,6 @@ # Template file for 'qjackctl' pkgname=qjackctl -version=0.9.6 +version=0.9.7 revision=1 build_style=cmake configure_args="$(vopt_bool jack_session CONFIG_JACK_SESSION)" @@ -11,8 +11,9 @@ short_desc="JACK Audio Connection Kit - Qt GUI Interface" maintainer="tibequadorian " license="GPL-2.0-or-later" homepage="https://qjackctl.sourceforge.io" +changelog="https://qjackctl.sourceforge.io/qjackctl-downloads.html" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=39ca2b9d83acfdd16a4c9b3eccd80e1483e1f9a446626f5d00ac297e6f8a166b +checksum=524843618152070c90a40a18d0e9a16e784424ce54231aff5c0ced12f2769080 build_options="jack_session" build_options_default="jack_session" From 845d33390281c67d20a3d1677ba60a606757bd81 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sat, 2 Apr 2022 21:39:14 +0530 Subject: [PATCH 0847/2369] CPU-X: update to 4.3.0, adopt --- .../CPU-X/patches/musl-ctrl-not-defined.patch | 15 -------- srcpkgs/CPU-X/template | 36 ++++++++++--------- 2 files changed, 19 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch diff --git a/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch b/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch deleted file mode 100644 index 77b7abec77b..00000000000 --- a/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/tui_ncurses.c 2021-10-07 14:38:03.886862860 -0400 -+++ b/src/tui_ncurses.c 2021-10-07 14:49:43.258142532 -0400 -@@ -262,6 +262,12 @@ - /* Convert keys when an alternative mapping is used */ - #define ALT_CODE 27 - #define ALT(x) (x & ALT_CODE) -+ -+/* glibc's term.h pulls in sys/ttydefaults.h which has it, but musl's does not. */ -+#ifndef CTRL -+#define CTRL(x) (x&037) -+#endif -+ - static int convert_char(int ch) - { - int i = 0; diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template index 19a01be5978..36246fc521f 100644 --- a/srcpkgs/CPU-X/template +++ b/srcpkgs/CPU-X/template @@ -1,30 +1,32 @@ # Template file for 'CPU-X' pkgname=CPU-X -version=4.2.0 +version=4.3.0 revision=1 archs="x86_64* i686*" build_style=cmake -hostmakedepends="nasm pkg-config gettext" -makedepends="libcpuid-devel ncurses-devel pciutils-devel - procps-ng-devel glfw-devel $(vopt_if gtk3 'gtk+3-devel')" +hostmakedepends="pkg-config nasm" +makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel + glfw-devel ocl-icd-devel procps-ng-devel libstatgrab + $(vopt_if gtk3 gtk+3-devel)" +checkdepends="mawk nawk grep" short_desc="Free software that gathers information on CPU, motherboard and more" -maintainer="Orphaned " +maintainer="Subhaditya Nath " license="GPL-3.0-or-later" homepage="https://x0rg.github.io/CPU-X/" changelog="https://raw.githubusercontent.com/X0rg/CPU-X/master/ChangeLog.md" distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz" -checksum=3bd8aabe98273012adc6fa25f31cf0f631f0a34c2ec39392fb5f6885551cee1f -# tests depend on: -# having mawk and nawk installed which breaks chroot-gawk -# grep -P, which `chroot-grep` is compiled without -make_check=no - +checksum=6ad7a8ac2d6c687a38a895fbbfbf2de690311676ac374d5857588bb983839433 build_options="gtk3" build_options_default="gtk3" -case "$XBPS_TARGET_MACHINE" in - *-musl) - makedepends+=" libexecinfo-devel" - LDFLAGS="-lexecinfo" - ;; -esac +if [ "$XBPS_TARGET_LIBC" = musl ]; then + makedepends+=" libexecinfo-devel" + LDFLAGS="-lexecinfo" +fi + +# Tests depend on the -P flag of grep, which is not available in chroot-grep +# and installing grep as checkdepends breaks base-chroot. +# So, only run tests in CI, where the masterdir is ephemeral anyway. +if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then + make_check=no # breaks base-chroot +fi From e465f26b93d18f3ad08d58e88aa582f94e862a00 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Fri, 25 Mar 2022 10:31:24 +0100 Subject: [PATCH 0848/2369] fluidsynth: update to 2.2.6. --- srcpkgs/fluidsynth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template index 146a550f658..3f65b393d92 100644 --- a/srcpkgs/fluidsynth/template +++ b/srcpkgs/fluidsynth/template @@ -1,6 +1,6 @@ # Template file for 'fluidsynth' pkgname=fluidsynth -version=2.2.5 +version=2.2.6 revision=1 build_style=cmake make_check_target=check @@ -13,7 +13,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="http://www.fluidsynth.org/" distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz" -checksum=9037e703617f91c4c36039a5059e0f624164799d856af715bcd8a23c07ba03b8 +checksum=ca90fe675cacd9a7b442662783c4e7fa0e1fd638b28d64105a4e3fe0f618d20f libfluidsynth_package() { short_desc+=" - runtime library" From 3949d770ff88339928b00f59275e9a9626fe3729 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Sat, 2 Apr 2022 19:23:11 +0200 Subject: [PATCH 0849/2369] gotop: update to 4.1.3. --- srcpkgs/gotop/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template index 035f5749e4d..c8c7a842b4b 100644 --- a/srcpkgs/gotop/template +++ b/srcpkgs/gotop/template @@ -1,19 +1,21 @@ # Template file for 'gotop' pkgname=gotop -version=4.1.2 +version=4.1.3 revision=1 build_style=go +build_helper=qemu go_ldflags="-X main.Version=v${version}" go_import_path="github.com/xxxserxxx/gotop/v4" go_package="$go_import_path/cmd/gotop" -hostmakedepends="git" short_desc="Terminal based graphical activity monitor" maintainer="SolitudeSF " license="MIT" homepage="https://github.com/xxxserxxx/gotop" distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz" -checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da +checksum=c0a02276e718b988d1220dc452063759c8634d42e1c01a04c021486c1e61612d post_install() { vlicense LICENSE + vtargetrun ${DESTDIR}/usr/bin/gotop --create-manpage > gotop.1 + vman gotop.1 } From ad6edde0f72052d3673f13657efad705b1cfb4fa Mon Sep 17 00:00:00 2001 From: Gerardo Di iorio Date: Thu, 31 Mar 2022 21:17:01 +0200 Subject: [PATCH 0850/2369] pgweb: update to 0.11.11. --- srcpkgs/pgweb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template index 9144e3d93eb..2e511d41844 100644 --- a/srcpkgs/pgweb/template +++ b/srcpkgs/pgweb/template @@ -1,6 +1,6 @@ # Template file for 'pgweb' pkgname=pgweb -version=0.11.10 +version=0.11.11 revision=1 build_style=go go_import_path="github.com/sosedoff/pgweb" @@ -9,7 +9,7 @@ maintainer="Gerardo Di Iorio " license="MIT" homepage="https://sosedoff.github.io/pgweb" distfiles="https://github.com/sosedoff/pgweb/archive/v${version}.tar.gz" -checksum=df2d16daa6f8fa9735b713199691ef74136f19fbbee14778248e41e247a1b93b +checksum=4d8c64db7ec463a9366d404cbaf12215db855a5bdbf09253494d79dedd92db98 post_install() { vdoc README.md From 04a8070e96c14c9b7dec531c826938ff965ed018 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 27 Mar 2022 20:44:36 +0200 Subject: [PATCH 0851/2369] x42-plugins: update to 20220327. --- srcpkgs/x42-plugins/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template index 8df0ec80330..328c03b09de 100644 --- a/srcpkgs/x42-plugins/template +++ b/srcpkgs/x42-plugins/template @@ -1,6 +1,6 @@ # Template file for 'x42-plugins' pkgname=x42-plugins -version=20220107 +version=20220327 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="tibequadorian " license="GPL-2.0-or-later" homepage="https://x42-plugins.com" distfiles="https://gareus.org/misc/x42-plugins/x42-plugins-${version}.tar.xz" -checksum=fa5ce09114077ba9a889dde1e9acff8aab765cbe6f6f2334063493c0c06f7772 +checksum=221b8fa939426c2c44c53e41f40bb8d91410978b0312fcfaf8786cb93d36295b pre_build() { export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG" From 45eedd538c3d233b418e2fe07b73199911b8c370 Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Thu, 31 Mar 2022 11:13:14 +0700 Subject: [PATCH 0852/2369] mdBook: update to 0.4.17 --- srcpkgs/mdBook/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template index 465ff1a1bbb..d2aa033512f 100644 --- a/srcpkgs/mdBook/template +++ b/srcpkgs/mdBook/template @@ -1,6 +1,6 @@ # Template file for 'mdBook' pkgname=mdBook -version=0.4.14 +version=0.4.17 revision=1 build_style=cargo short_desc="Create book from markdown files. Like Gitbook but implemented in Rust" @@ -9,7 +9,7 @@ license="MPL-2.0" homepage="https://github.com/rust-lang/mdBook" changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md" distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz" -checksum=59fd3e417e9d09deac89e20467194dd9f93854c2f1a87e845816c5cec676765c +checksum=9523d0bed63ce35eec5a8259eb963651cd7e37ec5644ef551134068a2fb72f89 post_install() { vlicense LICENSE From 41e3b9c3d0bf4c98ce726e41276e1f1ce9bdd7ad Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 9 Apr 2022 22:42:33 +0200 Subject: [PATCH 0853/2369] ugrep: update to 3.7.9. --- srcpkgs/ugrep/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template index 2c25a04aa89..5025d63a7eb 100644 --- a/srcpkgs/ugrep/template +++ b/srcpkgs/ugrep/template @@ -1,6 +1,6 @@ # Template file for 'ugrep' pkgname=ugrep -version=3.7.8 +version=3.7.9 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=b2e03615890b92df4487a2891bf47675429c469b1825d5d05600ed3a729b92c7 +checksum=016e771756574a2a0b026ec50f7e7f3898d39cb61771ce98bc225c34d86a03be post_install() { vlicense LICENSE.txt LICENSE From 85f4e60b8a802b3140ef2c4797e0c44275fdd4c6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 10 Apr 2022 14:30:56 +0200 Subject: [PATCH 0854/2369] libmnl: update to 1.0.5. --- srcpkgs/libmnl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libmnl/template b/srcpkgs/libmnl/template index 9c624e2a358..7ecb5b44a35 100644 --- a/srcpkgs/libmnl/template +++ b/srcpkgs/libmnl/template @@ -1,14 +1,14 @@ # Template file for 'libmnl' pkgname=libmnl -version=1.0.4 -revision=2 +version=1.0.5 +revision=1 build_style=gnu-configure short_desc="Minimalistic user-space library oriented to Netlink developers" maintainer="Leah Neukirchen " license="LGPL-2.1-or-later" homepage="http://www.netfilter.org/projects/libmnl/" distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2" -checksum=171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81 +checksum=274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525 libmnl-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 198463dce795d5c15beda425fc3a0f3d74043327 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 10 Apr 2022 14:35:40 +0200 Subject: [PATCH 0855/2369] skaffold: update to 1.38.0. --- srcpkgs/skaffold/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template index faa9823d1cc..af2d37f0aeb 100644 --- a/srcpkgs/skaffold/template +++ b/srcpkgs/skaffold/template @@ -1,6 +1,6 @@ # Template file for 'skaffold' pkgname=skaffold -version=1.37.1 +version=1.38.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=8dfea015256761525d8c0e54713642bcd7ead3e3c96ff58e301d0b77b9ef3bd5 +checksum=42f8f8a6f8f55f8031c87de3c3d35334f2e1f71c2a2120d3cc1a15f8ed71ba31 From 8eeec0db2e58be907fdf7f7097c48dd9798fc4dc Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Fri, 8 Apr 2022 01:03:06 +0200 Subject: [PATCH 0856/2369] revive: update to 1.2.1. --- srcpkgs/revive/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template index 55a01144736..38f2018570e 100644 --- a/srcpkgs/revive/template +++ b/srcpkgs/revive/template @@ -1,16 +1,16 @@ # Template file for 'revive' pkgname=revive -version=1.1.4 +version=1.2.1 revision=1 build_style=go -go_ldflags="-X main.version=$version -X main.builtBy=xbps" +go_ldflags="-X github.com/mgechev/revive/cli.version=$version" go_import_path="github.com/mgechev/revive" short_desc="Drop-in replacement for golint" maintainer="Roberto Ricci " license="MIT" homepage="https://revive.run/" distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz" -checksum=afe0d11a614d5ca706485b7f6ca1e53b374b45017ea75f14149a4434d3ef74b5 +checksum=47e9f371e934fe4dfce44098fd54a0aaeaa47079184a14ad263990a24fab1b35 do_check() { go test -v ./... From baea33e0e684cfc16089b0ffd98b76b381370cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 7 Apr 2022 22:26:45 -0300 Subject: [PATCH 0857/2369] New package: python3-fastjsonschema-2.15.3 --- srcpkgs/python3-fastjsonschema/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/python3-fastjsonschema/template diff --git a/srcpkgs/python3-fastjsonschema/template b/srcpkgs/python3-fastjsonschema/template new file mode 100644 index 00000000000..290431fadfc --- /dev/null +++ b/srcpkgs/python3-fastjsonschema/template @@ -0,0 +1,20 @@ +# Template file for 'python3-fastjsonschema' +pkgname=python3-fastjsonschema +version=2.15.3 +revision=1 +wrksrc=python-fastjsonschema-${version} +build_style=python3-module +make_check_args="--deselect tests/benchmarks/test_benchmark.py" +hostmakedepends="python3-setuptools" +checkdepends="python3-pytest" +short_desc="Fastest Python implementation of JSON schema" +maintainer="Gonzalo Tornaría " +license="BSD-3-Clause" +homepage="https://github.com/seznam/python-fastjsonschema" +changelog="https://raw.githubusercontent.com/horejsek/python-fastjsonschema/master/CHANGELOG.txt" +distfiles="https://github.com/horejsek/python-fastjsonschema/archive/refs/tags/v${version}.tar.gz" +checksum=94e59a36c0efbf75a1a790fed15b51c9876b81204a5184c0c89075c68b10e7ec + +post_install() { + vlicense LICENSE +} From 09e23551d2d1e3256d58829012478cec9e0cd58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 4 Apr 2022 02:55:34 -0300 Subject: [PATCH 0858/2369] python3-jupyter_nbformat: update to 5.3.0. --- srcpkgs/python3-jupyter_nbformat/template | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template index 4bea7989e2a..27f3267b459 100644 --- a/srcpkgs/python3-jupyter_nbformat/template +++ b/srcpkgs/python3-jupyter_nbformat/template @@ -1,26 +1,22 @@ # Template file for 'python3-jupyter_nbformat' pkgname=python3-jupyter_nbformat -version=5.1.3 -revision=2 +version=5.3.0 +revision=1 wrksrc="nbformat-${version}" build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-jsonschema python3-traitlets - python3-ipython_genutils python3-jupyter_core" + python3-ipython_genutils python3-jupyter_core + python3-fastjsonschema" checkdepends="python3-pytest python3-testpath $depends" short_desc="Jupyter notebook format" maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://github.com/jupyter/nbformat" distfiles="${PYPI_SITE}/n/nbformat/nbformat-${version}.tar.gz" -checksum=b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8 +checksum=fcc5ab8cb74e20b19570b5be809e2dba9b82836fd2761a89066ad43394ba29f5 conflicts="python-jupyter_nbformat<=4.4.0_3" -do_check() { - # Tests require a non-existent notebook file - python3 -m pytest -k 'not test_upgrade_v4_to_4_dot_5 and not test_sample_notebook' -} - post_install() { vlicense COPYING.md LICENSE } From cfc8c1dee732475ee5a1bb06ff2a6b5e1d7832b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 4 Apr 2022 02:55:37 -0300 Subject: [PATCH 0859/2369] python3-jupyter_nbconvert: update to 6.4.5. --- srcpkgs/python3-jupyter_nbconvert/template | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template index ee8f7f8ba36..baebe44c04c 100644 --- a/srcpkgs/python3-jupyter_nbconvert/template +++ b/srcpkgs/python3-jupyter_nbconvert/template @@ -1,13 +1,16 @@ # Template file for 'python3-jupyter_nbconvert' pkgname=python3-jupyter_nbconvert -version=6.0.7 -revision=2 +version=6.4.5 +revision=1 wrksrc="nbconvert-${version}" build_style=python3-module +# WebPDF export depends on unpackaged pyppeteer +make_check_args="-m not(network) -k not(test_webpdf_without_chromium)" hostmakedepends="python3-setuptools" depends="python3-mistune python3-Jinja2 python3-jupyterlab_pygments python3-nbclient python3-jupyter_core python3-entrypoints python3-testpath - python3-bleach python3-pandocfilters python3-defusedxml" + python3-bleach python3-pandocfilters python3-defusedxml + python3-BeautifulSoup4" checkdepends="python3-pytest python3-ipython_ipykernel python3-jupyter_ipywidgets python3-Pebble pandoc inkscape $depends" short_desc="Converting Jupyter notebooks" @@ -15,14 +18,9 @@ maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://github.com/jupyter/nbconvert" distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz" -checksum=cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002 +checksum=21163a8e2073c07109ca8f398836e45efdba2aacea68d6f75a8a545fef070d4e conflicts="python-jupyter_nbconvert<=5.4.1_2" -do_check() { - # WebPDF export depends on unpackaged pyppeteer - python3 -m pytest -k 'not TestWebPDFExporter and not test_webpdf_with_chromium' -} - post_install() { vlicense LICENSE } From 23aa1b4120fdf1b4628676e4a2cd59201e709f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 4 Apr 2022 02:55:41 -0300 Subject: [PATCH 0860/2369] python3-jupyter_notebook: update to 6.4.10. --- srcpkgs/python3-jupyter_notebook/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template index ca9e1d43df2..d7e7230fdf9 100644 --- a/srcpkgs/python3-jupyter_notebook/template +++ b/srcpkgs/python3-jupyter_notebook/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_notebook' pkgname=python3-jupyter_notebook -version=6.3.0 -revision=2 +version=6.4.10 +revision=1 wrksrc="notebook-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -15,7 +15,7 @@ maintainer="Alessio Sergi " license="BSD-3-Clause" homepage="https://jupyter.org/" distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz" -checksum=cbc9398d6c81473e9cdb891d2cae9c0d3718fca289dda6d26df5cb660fcadc7d +checksum=2408a76bc6289283a8eecfca67e298ec83c67db51a4c2e1b713dd180bb39e90e conflicts="python-jupyter_notebook<=5.7.0_2" # Tests require unpackaged selenium make_check=no From 5369dc2b4869326e36a8c6ba6e3c36f8c8ba2c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 4 Apr 2022 02:57:15 -0300 Subject: [PATCH 0861/2369] python3-Jinja2: update to 3.1.1. This update was reverted earlier (3d6eb58) because of an incompatibility with nbconvert-6.0.7 which is fixed in current nbconvert-6.4.5. --- srcpkgs/python3-Jinja2/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template index 6a4c28214cc..5fbc7ee2fa8 100644 --- a/srcpkgs/python3-Jinja2/template +++ b/srcpkgs/python3-Jinja2/template @@ -1,7 +1,6 @@ # Template file for 'python3-Jinja2' pkgname=python3-Jinja2 -reverts="3.1.1_1" -version=3.0.3 +version=3.1.1 revision=2 wrksrc="Jinja2-${version}" build_style=python3-module @@ -14,7 +13,7 @@ license="BSD-3-Clause" homepage="http://jinja.pocoo.org/" changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst" distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz" -checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 +checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9 post_install() { vlicense LICENSE.rst From 4fe9d08138d9c53d97be86e7af347b178b38e3c6 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 10 Apr 2022 17:32:13 -0400 Subject: [PATCH 0862/2369] qwt: update to 6.2.0. --- common/shlibs | 2 +- srcpkgs/qwt/template | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 673c62085f5..0ac24701898 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1981,7 +1981,7 @@ libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1 libx265.so.199 x265-3.5_1 libQt5Xdg.so.3 libqtxdg-3.1.0_1 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1 -libqwt.so.6 qwt-6.1.3_1 +libqwt.so.6.2 qwt-6.2.0_1 liblxqt-qt5.so.0 liblxqt-0.8.0_1 liblxqt-globalkeys-qt5.so.0 lxqt-globalkeys-0.8.0_1 liblxqt-globalkeys-ui-qt5.so.0 lxqt-globalkeys-0.8.0_1 diff --git a/srcpkgs/qwt/template b/srcpkgs/qwt/template index f03bbd1af60..b5fdae7aa7f 100644 --- a/srcpkgs/qwt/template +++ b/srcpkgs/qwt/template @@ -1,6 +1,6 @@ # Template file for 'qwt' pkgname=qwt -version=6.1.5 +version=6.2.0 revision=1 build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools" @@ -10,7 +10,7 @@ maintainer="Giuseppe Fierro " license="LGPL-2.1-only, Qwt-exception-1.0" homepage="https://qwt.sourceforge.io/" distfiles="https://sourceforge.net/projects/${pkgname}/files/${pkgname}/${version}/${pkgname}-${version}.tar.bz2" -checksum=4076de63ec2b5e84379ddfebf27c7b29b8dc9074f3db7e2ca61d11a1d8adc041 +checksum=9194f6513955d0fd7300f67158175064460197abab1a92fa127a67a4b0b71530 post_patch() { vsed -e '/^\s*QWT_INSTALL_PREFIX/ s|=.*|= /usr|' \ @@ -31,6 +31,8 @@ qwt-devel_package() { pkg_install() { vmove usr/include vmove "usr/lib/*.so" + vmove usr/lib/qt5 + vmove usr/lib/pkgconfig } } @@ -39,5 +41,6 @@ qwt-doc_package() { short_desc+=" - doc files" pkg_install() { vmove usr/share/doc + mv "${PKGDESTDIR}/usr/share/doc/qwt/man" "${PKGDESTDIR}/usr/share" } } From b9097e90ead26fa7fd3db9b4ab41c425aa0fa6c4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 10 Apr 2022 17:35:00 -0400 Subject: [PATCH 0863/2369] linssid: rebuild for qwt --- srcpkgs/linssid/patches/project.patch | 6 ++++-- srcpkgs/linssid/patches/qwt-6.2.patch | 28 +++++++++++++++++++++++++++ srcpkgs/linssid/template | 2 +- 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/linssid/patches/qwt-6.2.patch diff --git a/srcpkgs/linssid/patches/project.patch b/srcpkgs/linssid/patches/project.patch index dd03c910c7b..8adc2028ec4 100644 --- a/srcpkgs/linssid/patches/project.patch +++ b/srcpkgs/linssid/patches/project.patch @@ -1,8 +1,10 @@ --- a/linssid-app/linssid-app.pro +++ b/linssid-app/linssid-app.pro -@@ -5,7 +5,7 @@ +@@ -3,9 +3,9 @@ + TARGET = linssid + VERSION = 3.6 CONFIG -= debug_and_release app_bundle lib_bundle --CONFIG += release +-CONFIG += release +CONFIG += release qwt PKGCONFIG += -QT = core gui widgets svg diff --git a/srcpkgs/linssid/patches/qwt-6.2.patch b/srcpkgs/linssid/patches/qwt-6.2.patch new file mode 100644 index 00000000000..c05221ea6e1 --- /dev/null +++ b/srcpkgs/linssid/patches/qwt-6.2.patch @@ -0,0 +1,28 @@ +--- a/linssid-app/MainForm.cpp ++++ b/linssid-app/MainForm.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -1036,7 +1037,7 @@ + MainForm::cellDataRay[tbi].signal ) ); + } + } else { +- MainForm::cellDataRay[tbi].pBandCurve->setSamples(0, 0, 0); ++ MainForm::cellDataRay[tbi].pBandCurve->setSamples(static_cast(NULL), static_cast(NULL), 0); + } + // now the signal history plot + int ixStart; +@@ -1055,7 +1056,7 @@ + &(MainForm::cellDataRay[tbi].pHistory->signal[ixStart]), ixLength); + } else { + +- MainForm::cellDataRay[tbi].pTimeCurve->setSamples(0, 0, 0); ++ MainForm::cellDataRay[tbi].pTimeCurve->setSamples(static_cast(NULL), static_cast(NULL), 0); + } + } + MainForm::mainFormWidget.chan24Plot->replot(); diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template index 3347f193c3e..937c8a0745e 100644 --- a/srcpkgs/linssid/template +++ b/srcpkgs/linssid/template @@ -1,7 +1,7 @@ # Template file for 'linssid' pkgname=linssid version=3.6 -revision=3 +revision=4 build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="boost-devel qwt-devel" From 9b342c56f07eb84439654852099530d399bcb0f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 29 Dec 2021 18:36:58 -0300 Subject: [PATCH 0864/2369] libmtp: update to 1.1.19. Also: use group `plugdev` to grant r/w permission to mtp devices. --- srcpkgs/libmtp/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template index 5bf05cd6bbe..1114a4d7bb8 100644 --- a/srcpkgs/libmtp/template +++ b/srcpkgs/libmtp/template @@ -1,9 +1,10 @@ # Template file for 'libmtp' pkgname=libmtp -version=1.1.18 +version=1.1.19 revision=1 build_style=gnu-configure -configure_args="--disable-static --with-udev=/usr/lib/udev" +configure_args="--disable-static --with-udev=/usr/lib/udev + --with-udev-group=plugdev" hostmakedepends="pkg-config" makedepends="libgcrypt-devel libusb-devel" short_desc="Library for Microsoft's Media Transfer Protocol (MTP)" @@ -11,7 +12,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="http://libmtp.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0 +checksum=deb4af6f63f5e71215cfa7fb961795262920b4ec6cb4b627f55b30b18aa33228 if [ "$CROSS_BUILD" ]; then # XXX needs host mtp-hotplug From 16b70b0ef75bbfbb5d73fa1772b1da2455abddeb Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 10 Apr 2022 21:36:20 -0400 Subject: [PATCH 0865/2369] Revert "python3-Jinja2: update to 3.1.1." Removal of jinja2.Markup still breaks salt; back to 3.0.3 *again*. This reverts commit 5369dc2b4869326e36a8c6ba6e3c36f8c8ba2c6a. --- srcpkgs/python3-Jinja2/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template index 5fbc7ee2fa8..fb6d7e585a9 100644 --- a/srcpkgs/python3-Jinja2/template +++ b/srcpkgs/python3-Jinja2/template @@ -1,7 +1,8 @@ # Template file for 'python3-Jinja2' pkgname=python3-Jinja2 -version=3.1.1 -revision=2 +reverts="3.1.1_1 3.1.1_2" +version=3.0.3 +revision=3 wrksrc="Jinja2-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,7 +14,7 @@ license="BSD-3-Clause" homepage="http://jinja.pocoo.org/" changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst" distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz" -checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9 +checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 post_install() { vlicense LICENSE.rst From ef092ce23e3f4dbe47885f3e1999d81344183e8a Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Mon, 11 Apr 2022 09:40:43 +0200 Subject: [PATCH 0866/2369] vscode: update to 1.66.1 + fix issue with node-gyp compilation, which may also depend on npm --- srcpkgs/vscode/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 0b9efda224d..3e3956fa564 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.66.0 +version=1.66.1 revision=1 _electronver=13.6.7 _npmver=8.6.0 @@ -11,8 +11,8 @@ short_desc="Microsoft Code for Linux" maintainer="shizonic , Alex Lohr " license="MIT" homepage="https://code.visualstudio.com/" -distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" -checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7 +distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz" +checksum=243a25d7214ceba5abf510dc890c64a8cc36ccacd97f4b8c666b8b7bab9c5a28 nocross=yes # x64 build does not cut it, it contains native code if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then @@ -38,6 +38,9 @@ do_configure() { } do_build() { + # Update to a more recent npm version to fix some issues + npm install -g npm@${_npmver} + # The default memory limit may be too low for current versions of node # to successfully build vscode. This sets it to 4GB, but # change this number if it still doesn't work for your system. @@ -48,8 +51,7 @@ do_build() { --target=$_electronver \ --tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz - npm install -g npm@${_npmver} && \ - yarn install --ignore-engines --arch=x64 + yarn install --ignore-engines --arch=x64 export CFLAGS="$CFLAGS -I/usr/include/node" yarn run gulp vscode-linux-x64-min From 20870b78ae83f4026fd5551bf8c463ce703fa2c0 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sat, 19 Feb 2022 10:51:01 +0100 Subject: [PATCH 0867/2369] New package: cocogitto-5.0.1 --- srcpkgs/cocogitto/template | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 srcpkgs/cocogitto/template diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template new file mode 100644 index 00000000000..79a78e4b597 --- /dev/null +++ b/srcpkgs/cocogitto/template @@ -0,0 +1,34 @@ +# Template file for 'cocogitto' +pkgname=cocogitto +version=5.0.1 +revision=1 +build_style=cargo +build_helper=qemu +hostmakedepends="pkg-config" +makedepends="libgit2-devel" +short_desc="Conventional Commits toolbox" +maintainer="Marcin Puc " +license="MIT" +homepage="https://github.com/cocogitto/cocogitto" +changelog="https://github.com/cocogitto/cocogitto/blob/main/CHANGELOG.md" +distfiles="https://github.com/cocogitto/cocogitto/archive/${version}.tar.gz" +checksum=fee00736ec4b8ce72c8d8f904d0b734372b11ce7c3711166814eca38bf0cda8f +# Test suite is not atomic, relies on user environment such as git user configuration +make_check=no + +post_build() { + TARGET_DIR="target/${RUST_TARGET}/release" + + for shell in bash zsh fish; do + vtargetrun ${TARGET_DIR}/cog generate-completions ${shell} > cog.${shell} + done +} + +post_install() { + vlicense LICENSE + vdoc README.md + + for shell in bash zsh fish; do + vcompletion cog.${shell} ${shell} cog + done +} From 4b496dd74e43dc03f1eaf7e1f8da4ea8e501ec7c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Mon, 11 Apr 2022 02:11:31 +0200 Subject: [PATCH 0868/2369] certbot: update to 1.26.0. --- srcpkgs/certbot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template index aa8de157d59..a6eea0f1837 100644 --- a/srcpkgs/certbot/template +++ b/srcpkgs/certbot/template @@ -1,6 +1,6 @@ # Template file for 'certbot' pkgname=certbot -version=1.25.0 +version=1.26.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=9633d21051fe7fd076d64cb41963de61d300d7c30f4b491c8d18cb8306357509 +checksum=9d136fab6968829db9774a264a96a7923a5482d0c90894b009253f374d480693 From 4930b3ef529ffebe8868e6822f9205004bc25654 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Mon, 11 Apr 2022 02:11:33 +0200 Subject: [PATCH 0869/2369] certbot-apache: update to 1.26.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 1f5c098c802..50396f46779 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.25.0 +version=1.26.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=91dbd326c5ee4fe7a2ef5f1c3c525863a7f4ed5f228e1c7c10048d18fe18d0a1 +checksum=efb573a1fd926ecf74618286d21ac3f7539b2be426face7f1364dcca8b0e316e From d5ec9b9aaba6f8161f07be3005788df5eed9be50 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Mon, 11 Apr 2022 02:11:36 +0200 Subject: [PATCH 0870/2369] certbot-nginx: update to 1.26.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 b635785e5d0..b9df8e8b1c9 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.25.0 +version=1.26.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=433a7237e841c462a67f9195fb7d7711ac6ed6d27bedb981c71238ef5348d62b +checksum=c9f2ee27dfb98525e507f516f8c1cd37a5b61f3090bcf64284fee95cfcf6ab10 From 71c2a0e9d25c61b034f575fbefa8ef6520290099 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Mon, 11 Apr 2022 02:11:40 +0200 Subject: [PATCH 0871/2369] python3-acme: update to 1.26.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 19e374d105a..ab158b8dccc 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.25.0 +version=1.26.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=e3fbe36fcfa27ec46f450369498f3486370ab53a0fd7db91557a23d58b3969fa +checksum=7269209192189c5b0bd5bc69388229737e23e52e8422315e2fcd3aff4c8e13c8 From da3e5d237de86cdfb021d8184fc9972fee7623ba Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 11 Apr 2022 16:38:22 +0200 Subject: [PATCH 0872/2369] minify: update to 2.11.1. --- srcpkgs/minify/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template index 198a6c4ab9e..7131527fa00 100644 --- a/srcpkgs/minify/template +++ b/srcpkgs/minify/template @@ -1,6 +1,6 @@ # Template file for 'minify' pkgname=minify -version=2.10.0 +version=2.11.1 revision=1 build_style=go go_import_path="github.com/tdewolff/minify/v2" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/tdewolff/minify" distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz" -checksum=a26c531d5071c6bd5d2300b4906fd2c7e227a19c23549219ccfae2c20114c60e +checksum=f238ffcb9ed6ff3c413442e3c5bfe9409809cc3de67db29ebc541d83168a09ea post_install() { vlicense LICENSE From caba67c635f5ae8475545c26f985781085439aea Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 11 Apr 2022 16:47:02 +0200 Subject: [PATCH 0873/2369] perl-Config-General: update to 2.65. --- srcpkgs/perl-Config-General/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/perl-Config-General/template b/srcpkgs/perl-Config-General/template index b1162c8191c..97eacd23613 100644 --- a/srcpkgs/perl-Config-General/template +++ b/srcpkgs/perl-Config-General/template @@ -1,7 +1,7 @@ # Template file for 'perl-Config-General' pkgname=perl-Config-General -version=2.63 -revision=3 +version=2.65 +revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" @@ -9,7 +9,7 @@ makedepends="${hostmakedepends}" depends="${makedepends}" short_desc="Config::General - Generic Config Module" maintainer="Leah Neukirchen " -license="Artistic-1.0-Perl, GPL-1.0-or-later" +license="Artistic-2.0" homepage="https://metacpan.org/release/Config-General" distfiles="${CPAN_SITE}/Config/${pkgname/perl-/}-$version.tar.gz" -checksum=0a9bf977b8aabe76343e88095d2296c8a422410fd2a05a1901f2b20e2e1f6fad +checksum=4d6d5754be3a9f30906836f0cc10e554c8832e14e7a1341efb15b05d706fc58f From 22d695afc1ed4ac0a27223aeaa5689f81077528d Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 11 Apr 2022 10:01:49 -0400 Subject: [PATCH 0874/2369] greetd: set shell for agreety, change default vt --- srcpkgs/greetd/patches/change-default-vt.patch | 13 +++++++++++++ srcpkgs/greetd/patches/fix-shell.patch | 17 +++++++++++++++++ srcpkgs/greetd/template | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/greetd/patches/change-default-vt.patch create mode 100644 srcpkgs/greetd/patches/fix-shell.patch diff --git a/srcpkgs/greetd/patches/change-default-vt.patch b/srcpkgs/greetd/patches/change-default-vt.patch new file mode 100644 index 00000000000..3dad6174058 --- /dev/null +++ b/srcpkgs/greetd/patches/change-default-vt.patch @@ -0,0 +1,13 @@ +diff --git a/config.toml b/config.toml +index 3768a6e315..2a933309b4 100644 +--- a/config.toml ++++ b/config.toml +@@ -1,7 +1,7 @@ + [terminal] + # The VT to run the greeter on. Can be "next", "current" or a number + # designating the VT. +-vt = 1 ++vt = 7 + + # The default session, also known as the greeter. + [default_session] diff --git a/srcpkgs/greetd/patches/fix-shell.patch b/srcpkgs/greetd/patches/fix-shell.patch new file mode 100644 index 00000000000..fbe416cbed8 --- /dev/null +++ b/srcpkgs/greetd/patches/fix-shell.patch @@ -0,0 +1,17 @@ +# $SHELL is not set, use /bin/sh because it's available +diff --git a/config.toml b/config.toml +index 3768a6e..c323af2 100644 +--- a/config.toml ++++ b/config.toml +@@ -6,9 +6,9 @@ vt = 1 + # The default session, also known as the greeter. + [default_session] + +-# `agreety` is the bundled agetty/login-lookalike. You can replace `$SHELL` ++# `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh` + # with whatever you want started, such as `sway`. +-command = "agreety --cmd $SHELL" ++command = "agreety --cmd /bin/sh" + + # The user to run the command as. The privileges this user must have depends + # on the greeter. A graphical greeter may for example require the user to be diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template index cf5f3c400b0..0f5e9c88f50 100644 --- a/srcpkgs/greetd/template +++ b/srcpkgs/greetd/template @@ -1,7 +1,7 @@ # Template file for 'greetd' pkgname=greetd version=0.8.0 -revision=1 +revision=2 build_style=cargo conf_files="/etc/greetd/config.toml" hostmakedepends="pkg-config scdoc" From 3f667bc64b4a4521c0d9346659bbce6f6fc32abd Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sun, 3 Apr 2022 22:33:58 +0530 Subject: [PATCH 0875/2369] Waybar: update to 0.9.12 --- srcpkgs/Waybar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template index c6470c6d330..fd4fb7928d0 100644 --- a/srcpkgs/Waybar/template +++ b/srcpkgs/Waybar/template @@ -1,6 +1,6 @@ # Template file for 'Waybar' pkgname=Waybar -version=0.9.9 +version=0.9.12 revision=1 _date_version=3.0.0 build_style=meson @@ -29,7 +29,7 @@ changelog="https://github.com/Alexays/Waybar/releases" distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz https://github.com/HowardHinnant/date/archive/v${_date_version}.tar.gz https://github.com/mesonbuild/hinnant-date/releases/download/${_date_version}-1/hinnant-date.zip" -checksum="23a94538538f43a6db4c1c5f7e09e75ab743ded1ccfc737e1f3e0971fe4cdd87 +checksum="1f3f6692de99567c43939e7ad2e96f8c6a5ef83f760ad6f77865e46a3c6811d6 87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3 6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe" From 54e6e66e1486a9e47668e461c9e69f2c5671f5fe Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Mon, 11 Apr 2022 02:40:10 +0200 Subject: [PATCH 0876/2369] chatterino2: update to 2.3.5. --- srcpkgs/chatterino2/template | 25 +++++++++++-------------- srcpkgs/chatterino2/update | 2 ++ 2 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 srcpkgs/chatterino2/update diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template index 7bf7d6a37d0..977fa977149 100644 --- a/srcpkgs/chatterino2/template +++ b/srcpkgs/chatterino2/template @@ -1,19 +1,19 @@ # Template file for 'chatterino2' pkgname=chatterino2 -version=2.3.4 +version=2.3.5 revision=1 -_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868" +_libcommuni_commit="a7b32cd6fa0640721b6114b31d37d79ebf832411" _serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469" -_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c" -_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc" -_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9" +_settings_commit="04792d853c7f83c9d7ab4df00279442a658d3be3" +_signals_commit="25e4ec3b8d6ea94a5e65a26e7cfcbbce3b87c5d6" _sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b" create_wrksrc=yes build_wrksrc="chatterino2-${version}" build_style=cmake +configure_args="-DUSE_SYSTEM_QTKEYCHAIN=ON" hostmakedepends="qt5-qmake qt5-host-tools" makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel - boost-devel openssl-devel rapidjson websocketpp" + qtkeychain-qt5-devel boost-devel openssl-devel rapidjson websocketpp" depends="qt5-imageformats qt5-svg" short_desc="Chat client for twitch.tv" maintainer="Orphaned " @@ -25,14 +25,12 @@ distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${versio https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz - https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz" -checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c - ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4 +checksum="f1fff3523f5a3f633430d44f7ca6c6c718a515258d50004a855e69e4aa989b4e + d6fd560851357d1e52f93604314215c75b291104e054c84a16c34d7d83d40f14 d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63 - 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5 - 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46 - 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7 + 702e97d8f2fcaec65256e6f691c3ed055924430ce64b29ebe74f3769a9d50d71 + ae098841b0f33079366eff8bc44fe3f2f2f65e70259c1cc9ff8d727c4edf974c f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then @@ -46,12 +44,11 @@ post_extract() { rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \ ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \ ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \ - ${build_wrksrc}/lib/qtkeychain ${build_wrksrc}/cmake/sanitizers-cmake + ${build_wrksrc}/cmake/sanitizers-cmake mv "libcommuni-${_libcommuni_commit}" "${build_wrksrc}/lib/libcommuni" mv "serialize-${_serialize_commit}" "${build_wrksrc}/lib/serialize" mv "settings-${_settings_commit}" "${build_wrksrc}/lib/settings" mv "signals-${_signals_commit}" "${build_wrksrc}/lib/signals" - mv "qtkeychain-${_qtkeychain_commit}" "${build_wrksrc}/lib/qtkeychain" mv "sanitizers-cmake-${_sanitizers_cmake_commit}" "${build_wrksrc}/cmake/sanitizers-cmake" } diff --git a/srcpkgs/chatterino2/update b/srcpkgs/chatterino2/update new file mode 100644 index 00000000000..16563536cb3 --- /dev/null +++ b/srcpkgs/chatterino2/update @@ -0,0 +1,2 @@ +site="https://github.com/Chatterino/chatterino2/releases" +pattern="v\K[0-9.]+(?=\.tar\.gz)" From 17ac31fa0162695f5dbd39e7722261ef9cd5049f Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Mon, 11 Apr 2022 02:22:52 +0200 Subject: [PATCH 0877/2369] arc-theme: update to 20220405. --- srcpkgs/arc-theme/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/arc-theme/template b/srcpkgs/arc-theme/template index 4839b87942f..86b487ffa9a 100644 --- a/srcpkgs/arc-theme/template +++ b/srcpkgs/arc-theme/template @@ -1,6 +1,6 @@ # Template file for 'arc-theme' pkgname=arc-theme -version=20220223 +version=20220405 revision=1 build_style=meson hostmakedepends="glib-devel pkg-config gnome-shell sassc inkscape cinnamon" @@ -11,4 +11,4 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/jnsh/arc-theme" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=b9a58efc296c3036905b9f8d19518c5c815e5140dd399ad9b81cc17d319a9093 +checksum=657d6cc743facba0f7f56939653b3d0ed4c55b2ce17fef0d050ed32c1aae5f1e From c990d33d47f8d898a3df17b5220f359eef2b83e6 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Mar 2022 11:38:40 +0100 Subject: [PATCH 0878/2369] protontricks: update to 1.8.1. --- srcpkgs/protontricks/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template index 208a55032a3..f7d7182b65c 100644 --- a/srcpkgs/protontricks/template +++ b/srcpkgs/protontricks/template @@ -1,18 +1,18 @@ # Template file for 'protontricks' pkgname=protontricks -version=1.8.0 +version=1.8.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3-vdf winetricks python3-setuptools" +checkdepends="$depends" 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=d56b53c4ea4286ae20588072433c30193143a75654ea216db389503a63661b09 -make_check=no # no tests in pypi tarball +checksum=2a2f1349fd7263b4a82b8443f9c423f79ce104697a87e9a53fb2fae21d7ce5ac post_install() { # Remove `protontricks-desktop-install`, since we From d74c11a8b32b9065ed749a9a398a1cd01ef68187 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 10 Apr 2022 14:49:44 -0400 Subject: [PATCH 0879/2369] chezmoi: update to 2.15.1. --- srcpkgs/chezmoi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 2f0fb2f144b..bacfc8c9b29 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,6 +1,6 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.15.0 +version=2.15.1 revision=1 build_style=go go_import_path="github.com/twpayne/chezmoi/v2" @@ -12,7 +12,7 @@ maintainer="classabbyamp " license="MIT" homepage="https://chezmoi.io/" distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz" -checksum=d33a5df53bde7b94962c39788e44af41e52a7836bc6d43168c9b324da966996e +checksum=0100dcf8b70774595f56859e5d1b635319ba584ad7b280946352be328f36d679 export CGO_ENABLED=1 From ad58df33ad32e738aa20ac0679e9834272722a4f Mon Sep 17 00:00:00 2001 From: Jovan Lanik Date: Thu, 31 Mar 2022 21:48:32 +0200 Subject: [PATCH 0880/2369] aml: update to 0.2.1 --- srcpkgs/aml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aml/template b/srcpkgs/aml/template index 5c1754fc6d7..cc0598dfe91 100644 --- a/srcpkgs/aml/template +++ b/srcpkgs/aml/template @@ -1,6 +1,6 @@ # Template file for 'aml' pkgname=aml -version=0.1.0 +version=0.2.1 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -9,7 +9,7 @@ maintainer="Zach Dykstra " license="ISC" homepage="https://github.com/any1/aml" distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz" -checksum=50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff +checksum=c5af3f690b64a7f4dc7141b11f23a4bef190a921f9d71ce70ce0698b5ec58eb0 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" From 2e650fb0f140c72b2b0c09859997aa39d29149e9 Mon Sep 17 00:00:00 2001 From: Jovan Lanik Date: Thu, 31 Mar 2022 21:48:50 +0200 Subject: [PATCH 0881/2369] neatvnc: update to 0.4.0 --- srcpkgs/neatvnc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/neatvnc/template b/srcpkgs/neatvnc/template index a861c8e6356..8dd902a8cb4 100644 --- a/srcpkgs/neatvnc/template +++ b/srcpkgs/neatvnc/template @@ -1,6 +1,6 @@ # Template file for 'neatvnc' pkgname=neatvnc -version=0.3.2 +version=0.4.0 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Zach Dykstra " license="ISC" homepage="https://github.com/any1/neatvnc" distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz" -checksum=8329354f83bcc654146082a8a9f2d0be4bac5bd8c76b6c31790b7b9c5857e318 +checksum=8a833d488f579e4acf7abb1c7832f8e571bddd6da054e71ed9be3b8396955a81 post_install() { vlicense COPYING From f19e66d7b713f664074d7cac09d4d31488f785ad Mon Sep 17 00:00:00 2001 From: Jovan Lanik Date: Thu, 31 Mar 2022 21:49:20 +0200 Subject: [PATCH 0882/2369] wayvnc: update to 0.4.1 --- srcpkgs/wayvnc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template index bf948d97827..196e986fe9a 100644 --- a/srcpkgs/wayvnc/template +++ b/srcpkgs/wayvnc/template @@ -1,6 +1,6 @@ # Template file for 'wayvnc' pkgname=wayvnc -version=0.3.1 +version=0.4.1 revision=1 build_style=meson hostmakedepends="pkg-config ninja scdoc wayland-devel" @@ -10,7 +10,7 @@ maintainer="Zach Dykstra " license="ISC" homepage="https://github.com/any1/wayvnc" distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz" -checksum=7b68af5bfa5e19352aaa5140e6c2418f90bfe6a949775bd236b06796c56e27f5 +checksum=1813a22644a9043f96a53756bfee68d65f976de8b8f65c86f56782d22286d271 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" From cd123a5e52a0c7632b6825ab39c4351212f52014 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 8 Apr 2022 23:36:03 +0300 Subject: [PATCH 0883/2369] notcurses: update to 3.0.8. --- srcpkgs/notcurses/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template index 9581a8e3de8..724e7b7f247 100644 --- a/srcpkgs/notcurses/template +++ b/srcpkgs/notcurses/template @@ -1,6 +1,6 @@ # Template file for 'notcurses' pkgname=notcurses -version=3.0.7 +version=3.0.8 revision=1 build_style=cmake configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)" @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://nick-black.com/dankwiki/index.php/Notcurses" changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md" distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz" -checksum=db461c6ba07a8e3735a51a1d2e706d249ae30436519f543fa5931d414019c770 +checksum=56c33ffe2a2bc4d0b6e3ac14bdf620cf41e3293789135f76825057d0166974fd build_options="man" desc_option_man="Use pandoc for manpages" From 97ffc20f17a326481a0ef099b72414eea42040e0 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Sun, 10 Apr 2022 15:27:41 +0200 Subject: [PATCH 0884/2369] vultr-cli: update to 2.12.2. --- srcpkgs/vultr-cli/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template index 34e0073e173..20612aeff1c 100644 --- a/srcpkgs/vultr-cli/template +++ b/srcpkgs/vultr-cli/template @@ -1,6 +1,6 @@ # Template file for 'vultr-cli' pkgname=vultr-cli -version=2.12.1 +version=2.12.2 revision=1 build_style=go go_import_path=github.com/vultr/vultr-cli/v2 @@ -8,6 +8,6 @@ short_desc="Official command line tool for Vultr services" maintainer="Frank Steinborn " license="Apache-2.0" homepage="https://github.com/vultr/vultr-cli" -changelog="https://github.com/vultr/vultr-cli/blob/master/CHANGELOG.md" +changelog="https://raw.githubusercontent.com/vultr/vultr-cli/master/CHANGELOG.md" distfiles="https://github.com/vultr/vultr-cli/archive/refs/tags/v${version}.tar.gz" -checksum=e2a9c7243d48d44f88917cbc241512774f8f2c6e305ef5aaaf026177a2620ae6 +checksum=875a273d573ef53ab3329d3ecd9e3745d7d8963e0b3ff992435fb20881ea49a7 From 0533f9968583d0a16fb1eb47ad8f59cd96da3c5c Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 3 Apr 2022 00:58:37 -0400 Subject: [PATCH 0885/2369] hobbits: update to 0.53.1. --- srcpkgs/hobbits/patches/backports.patch | 78 ++++++++++++++++++++ srcpkgs/hobbits/patches/python_version.patch | 11 --- srcpkgs/hobbits/template | 39 ++++++++-- 3 files changed, 109 insertions(+), 19 deletions(-) create mode 100644 srcpkgs/hobbits/patches/backports.patch delete mode 100644 srcpkgs/hobbits/patches/python_version.patch diff --git a/srcpkgs/hobbits/patches/backports.patch b/srcpkgs/hobbits/patches/backports.patch new file mode 100644 index 00000000000..3348b37ae5f --- /dev/null +++ b/srcpkgs/hobbits/patches/backports.patch @@ -0,0 +1,78 @@ +Backports some changes sent upstream to better support plain cmake builds + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1cc283d..5795a97 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,7 +15,10 @@ if (UNIX AND NOT APPLE) + set(LINUX TRUE) + endif() + +-if (EXISTS "${CMAKE_SOURCE_DIR}/.version") ++if (DEFINED BUILD_VERSION) ++ message("Using build version from command-line") ++ set(VERSION_STRING "${BUILD_VERSION}") ++elseif (EXISTS "${CMAKE_SOURCE_DIR}/.version") + message("Getting build version from .version file") + file (STRINGS "${CMAKE_SOURCE_DIR}/.version" BUILD_VERSION) + string(REGEX REPLACE "\n$" "" BUILD_VERSION "${BUILD_VERSION}") +@@ -106,7 +143,13 @@ else() + endif() + + # PFFFT +- find_package(PFFFT REQUIRED) ++ option(USE_SYSTEM_PFFFT "Use a system-provided version of pffft" OFF) ++ if(USE_SYSTEM_PFFFT) ++ message(STATUS "Using system pffft") ++ find_package(PFFFT REQUIRED) ++ else() ++ add_subdirectory(external) ++ endif() + + endif() + +@@ -124,7 +167,7 @@ elseif( MANUAL_PYTHON_PATH ) + set ( Python3_ROOT_DIR "${MANUAL_PYTHON_PATH}" ) + endif() + +-find_package (Python3 3.9 EXACT COMPONENTS Interpreter Development REQUIRED) ++find_package (Python3 3.9 COMPONENTS Interpreter Development REQUIRED) + message("Python3 Libs: ${Python3_LIBRARIES}") + + # +diff --git a/cmake/PackExternalDeps.cmake b/cmake/PackExternalDeps.cmake +index 4be07c7..330be03 100644 +--- a/cmake/PackExternalDeps.cmake ++++ b/cmake/PackExternalDeps.cmake +@@ -145,7 +145,7 @@ endfunction(pack_python) + function(pack_pffft) + install(FILES ${PFFFT_LIBRARIES} + DESTINATION "${CMAKE_INSTALL_LIBDIR}") +-endfunction(pack_pcap) ++endfunction(pack_pffft) + + function(pack_pcap) + if (LINUX) +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +new file mode 100644 +index 0000000..ea1c9a3 +--- /dev/null ++++ b/external/CMakeLists.txt +@@ -0,0 +1,17 @@ ++ ++# can't assume the target system has the required SIMD instructions ++option(PFFFT_ENABLE_SIMD "Enable SIMD support for pffft" OFF) ++ ++message(STATUS "Using bundled pffft") ++add_library(pffft STATIC pffft/pffft.c) ++if(PFFFT_ENABLE_SIMD) ++ message(STATUS "Enabling SIMD support for pffft") ++else() ++ message(STATUS "Disabling SIMD support for pffft") ++ target_compile_definitions(pffft PUBLIC PFFFT_SIMD_DISABLE) ++endif() ++target_compile_options(pffft PUBLIC "${PFFFT_CFLAGS}") ++target_link_libraries(pffft m) ++target_include_directories(pffft INTERFACE pffft) ++ ++add_library(PFFFT::PFFFT ALIAS pffft) diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch deleted file mode 100644 index 47b1490c4b0..00000000000 --- a/srcpkgs/hobbits/patches/python_version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2021-10-07 11:31:22.000000000 -0400 -+++ b/CMakeLists.txt 2021-10-25 21:16:59.429406408 -0400 -@@ -124,7 +124,7 @@ - set ( Python3_ROOT_DIR "${MANUAL_PYTHON_PATH}" ) - endif() - --find_package (Python3 3.9 EXACT COMPONENTS Interpreter Development REQUIRED) -+find_package (Python3 3.9 COMPONENTS Interpreter Development REQUIRED) - message("Python3 Libs: ${Python3_LIBRARIES}") - - # diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template index fe6c7f5adda..8260fa1988d 100644 --- a/srcpkgs/hobbits/template +++ b/srcpkgs/hobbits/template @@ -1,28 +1,51 @@ # Template file for 'hobbits' pkgname=hobbits -version=0.52.0 +version=0.53.1 revision=1 +_pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215 +_pffft_dir="jpommier-pffft-${_pffft_commit:0:12}" +create_wrksrc=yes +build_wrksrc="hobbits-${version}" build_style=cmake +configure_args="-DBUILD_VERSION=${version} $(vopt_bool simd PFFFT_ENABLE_SIMD)" hostmakedepends="pkg-config qt5-host-tools qt5-qmake python3" -makedepends="fftw-devel libusb-devel libpcap-devel python3-devel qt5-devel" +makedepends="libusb-devel libpcap-devel python3-devel qt5-devel" short_desc="Multi-platform GUI for bit-based analysis, processing and visualization" maintainer="classabbyamp " -license="MIT, GPL-2.0-or-later" +license="MIT, custom:FFTPACK" homepage="https://mahlet-inc.github.io" changelog="https://raw.githubusercontent.com/Mahlet-Inc/hobbits/master/CHANGELOG.md" -distfiles="https://github.com/Mahlet-Inc/hobbits/archive/refs/tags/v${version}.tar.gz" -checksum=3332e02380ab46649f0ec2066b63b6e0fb04b55cdca973d28880f1607ebbf27e +distfiles="https://github.com/Mahlet-Inc/hobbits/archive/refs/tags/v${version}.tar.gz + https://bitbucket.org/jpommier/pffft/get/${_pffft_commit}.tar.gz" +checksum="e63c51228c3f00f56a2ebf79fec1975544b1c6c986d58dff69643da46148316b + @0b9f0e99ace190e607961f72953394aa0f0387826d4e478027111d71d56839a8" +patch_args="-Np1 --directory=${build_wrksrc}" + +build_options="simd" +desc_option_simd="Enable SIMD support (SSE, Altivec, or NEON)" + +# by default, don't use SIMD on unsupported platforms +# SSE, Altivec, or NEON support is needed to enable this +case "$XBPS_TARGET_MACHINE" in + aarch64*|ppc64*|x86_64*) build_options_default="simd" +esac case "$XBPS_TARGET_MACHINE" in arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char" esac -pre_configure() { - # upstream provides no way to set the version through configure_args - echo "${version}" > .version +post_extract() { + # until upstream merges Mahlet-Inc/hobbits#143 and releases a new version, + # the directory must be added, instead of removing the submodule + # rm -rf ${build_wrksrc}/external/pffft + mkdir ${build_wrksrc}/external + mv ${_pffft_dir} ${build_wrksrc}/external/pffft } post_install() { vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps + # capture the FFTPACK license from the header comment of pffft.c + sed -E '/\*\//,$d; 1s/\/\* //; s/^[[:blank:]]+//' external/pffft/pffft.c > LICENSE.pffft + vlicense LICENSE.pffft vlicense LICENSE.txt } From 48d513b514df95ad5f2bc4b6b0814a9b7059aa30 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 12 Apr 2022 00:05:11 +0200 Subject: [PATCH 0886/2369] onefetch: broken on big endian --- srcpkgs/onefetch/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template index 1eda291b053..82a46672d35 100644 --- a/srcpkgs/onefetch/template +++ b/srcpkgs/onefetch/template @@ -10,6 +10,10 @@ homepage="https://github.com/o2sh/onefetch" distfiles="https://github.com/o2sh/onefetch/archive/v${version}.tar.gz" checksum=f57b16dfa2bb95dd1fb805257a1761baa20d69eb9ce7c311d369609894c53897 +if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then + broken="exr crate unimplemented for BE" +fi + post_install() { vlicense LICENSE.md } From 21142d0f2093af05f8fff4c71cac9ecd1ebc7043 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 12 Apr 2022 17:37:16 +0200 Subject: [PATCH 0887/2369] ruby: update to 3.1.2. --- srcpkgs/ruby/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index 85524a7796b..4c62a19620d 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -2,7 +2,7 @@ _ruby_abiver=3.1.0 pkgname=ruby -version=3.1.1 +version=3.1.2 revision=1 build_style=gnu-configure configure_args="--enable-shared --disable-rpath @@ -16,7 +16,7 @@ homepage="http://www.ruby-lang.org/en/" maintainer="Leah Neukirchen " license="Ruby, BSD-2-Clause" distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa +checksum=ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a case "$XBPS_TARGET_MACHINE" in *-musl) # Broken on the builders but successfully built locally From bc77aaf4e5aa2d2ab0fe07df5f310190c784c9cd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 12 Apr 2022 19:39:32 +0200 Subject: [PATCH 0888/2369] yj: update to 5.1.0. --- srcpkgs/yj/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template index 895e663988d..395a2c6b15b 100644 --- a/srcpkgs/yj/template +++ b/srcpkgs/yj/template @@ -1,13 +1,13 @@ # Template file for 'yj' pkgname=yj -version=5.0.0 +version=5.1.0 revision=1 build_style=go -go_import_path="github.com/sclevine/yj" +go_import_path="github.com/sclevine/yj/v${version%%.*}" hostmakedepends="git" short_desc="Convert YAML <=> TOML <=> JSON <=> HCL" maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/sclevine/yj" distfiles="https://github.com/sclevine/yj/archive/v${version}.tar.gz" -checksum=df9a4f5b6d067842ea3da68ff92c374b98560dce1086337d39963a1346120574 +checksum=9a3e9895181d1cbd436a1b02ccf47579afacd181c73f341e697a8fe74f74f99d From 542b67255aa170db67651420bba9110a7cd332e6 Mon Sep 17 00:00:00 2001 From: Martin Dimov Date: Fri, 8 Apr 2022 02:18:39 +0300 Subject: [PATCH 0889/2369] pcsc-tools: update to 1.6.0. --- srcpkgs/pcsc-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pcsc-tools/template b/srcpkgs/pcsc-tools/template index 0825d36dd71..b29c25b70ce 100644 --- a/srcpkgs/pcsc-tools/template +++ b/srcpkgs/pcsc-tools/template @@ -1,6 +1,6 @@ # Template file for 'pcsc-tools' pkgname=pcsc-tools -version=1.5.8 +version=1.6.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -11,4 +11,4 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://ludovic.rousseau.free.fr/softwares/pcsc-tools" distfiles="http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=87c1edbdb8c9735063f688aa3e05e3893a88e78b322dc69af80757ed90282212 +checksum=651c8dd74bcb33db4c16935ce5d80dd1aa6eb20ba9d5c4b9631a098326ef8b9f From 1ac83895e5892abbc15ace100fb66ec074375368 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 12 Apr 2022 01:27:48 -0400 Subject: [PATCH 0890/2369] dbeaver: force jdk11 regardless of alternatives setting fixes #34857 --- srcpkgs/dbeaver/patches/force-jdk11.patch | 11 +++++++++++ srcpkgs/dbeaver/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/dbeaver/patches/force-jdk11.patch diff --git a/srcpkgs/dbeaver/patches/force-jdk11.patch b/srcpkgs/dbeaver/patches/force-jdk11.patch new file mode 100644 index 00000000000..47290b3e863 --- /dev/null +++ b/srcpkgs/dbeaver/patches/force-jdk11.patch @@ -0,0 +1,11 @@ +--- a/product/community/DBeaver.product ++++ b/product/community/DBeaver.product +@@ -9,7 +9,7 @@ + + + +- ++ -vm /usr/lib/jvm/openjdk11/bin + -vm ../Eclipse/jre/Contents/Home/bin/java + + -XX:+IgnoreUnrecognizedVMOptions --add-modules=ALL-SYSTEM -Dosgi.requiredJavaVersion=11 -Xms64m -Xmx1024m diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index 276af880242..74a67e77e4f 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -1,7 +1,7 @@ # Template file for 'dbeaver' pkgname=dbeaver version=22.0.1 -revision=1 +revision=2 # the build downloads binaries linked to glibc archs="x86_64 aarch64" hostmakedepends="apache-maven" From 0bbbf6c41fd518154c227b5fe3ea9db07833f29c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 12 Apr 2022 00:00:38 -0300 Subject: [PATCH 0891/2369] iperf: update to 2.1.7. --- .../iperf/patches/fix-gettcpinfo-musl.patch | 20 ------------- .../patches/reorder-includes-for-musl.patch | 28 ------------------- srcpkgs/iperf/template | 12 ++++++-- 3 files changed, 10 insertions(+), 50 deletions(-) delete mode 100644 srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch delete mode 100644 srcpkgs/iperf/patches/reorder-includes-for-musl.patch diff --git a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch b/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch deleted file mode 100644 index 71d8abf7058..00000000000 --- a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch +++ /dev/null @@ -1,20 +0,0 @@ -It seems there was a broken commit meant to fix compilation on win32, -but this broke compilation on musl. - -See: - -https://sourceforge.net/p/iperf2/code/ci/c8f861a0a07b0606a581f2658c71959ad9417923/ - -for the broken commit. The current patch fixes that by completing the -definition of gettcpinfo() to what it was before the broken commit. - ---- a/compat/gettcpinfo.c 2021-12-05 17:49:56.000000000 -0300 -+++ b/compat/gettcpinfo.c 2021-12-11 19:29:24.850947483 -0300 -@@ -99,4 +99,7 @@ - }; - #else - inline void gettcpinfo (int sock, struct ReportStruct *sample) { -+ sample->tcpstats.rtt = 1; -+ sample->tcpstats.isValid = false; -+}; - #endif diff --git a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch b/srcpkgs/iperf/patches/reorder-includes-for-musl.patch deleted file mode 100644 index 066620c8666..00000000000 --- a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch +++ /dev/null @@ -1,28 +0,0 @@ -Change order of includes to fix compilation with musl libc - ---- a/include/headers.h 2021-08-16 14:27:51.000000000 -0300 -+++ b/include/headers.h 2021-10-01 23:42:09.471528972 -0300 -@@ -106,11 +106,6 @@ - #include - #endif - --#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN)) --#include --#include --#endif -- - - // AF_PACKET HEADERS - #if defined(HAVE_LINUX_FILTER_H) && defined(HAVE_AF_PACKET) -@@ -146,6 +141,11 @@ - #define IPV6HDRLEN 40 - #endif // HAVE_AF_PACKET - -+#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN)) -+#include -+#include -+#endif -+ - #ifdef WIN32 - - /* Windows config file */ diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template index 555b5670914..7157ebba77c 100644 --- a/srcpkgs/iperf/template +++ b/srcpkgs/iperf/template @@ -1,6 +1,6 @@ # Template file for 'iperf' pkgname=iperf -version=2.1.6 +version=2.1.7 revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --enable-multicast --enable-threads @@ -9,8 +9,16 @@ short_desc="Perform network throughput tests" maintainer="Gonzalo Tornaría " license="NCSA" homepage="https://iperf.fr/" +changelog="https://sourceforge.net/p/iperf2/code/ci/master/tree/doc/RELEASE_NOTES?format=raw" distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz" -checksum=4a43e44439b95622aebeee55754a17d1c94076032e90620dfc1ab9908cb9e080 +checksum=1aba2e1d7aa43641ef841951ed88e16cffba898460e0c51e6b2806f3ff20e9d4 + +if [ "$XBPS_TARGET_LIBC" = musl ]; then + # do not define struct ethhdr in to avoid + # redefinition in + CFLAGS="-D__UAPI_DEF_ETHHDR=0" + CXXFLAGS="-D__UAPI_DEF_ETHHDR=0" +fi post_install() { vlicense COPYING LICENSE From 500d29607af5a578a02bfa1ef019718e05ce705a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Tue, 12 Apr 2022 03:32:14 +0200 Subject: [PATCH 0892/2369] stagit: update to 1.1. * take over maintainership --- srcpkgs/stagit/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template index f5828d25ed5..7e78e61ac80 100644 --- a/srcpkgs/stagit/template +++ b/srcpkgs/stagit/template @@ -1,16 +1,16 @@ # Template file for 'stagit' pkgname=stagit -version=1.0 +version=1.1 revision=1 build_style=gnu-makefile make_install_args="MANPREFIX=/usr/share/man" makedepends="libgit2-devel" short_desc="Static git page generator" -maintainer="Steve Prybylski " +maintainer="tibequadorian " license="MIT" homepage="https://codemadness.org/git/stagit/log.html" distfiles="https://codemadness.org/releases/stagit/${pkgname}-${version}.tar.gz" -checksum=10a0e31bb57d6da0dea84728cabed95b8f7d83fde13bb76e0ce18ef71ab68d8f +checksum=66f6ad1be3d6b6455faf9cfdd29329644b7ff2aa3123fbf1375169c60bda75c5 LDFLAGS="-lgit2" post_install() { From 162aebd320b8af83c82ebf2a19f343e1ca846a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 11 Apr 2022 17:49:21 -0300 Subject: [PATCH 0893/2369] threejs-sage: make it available as a jupyter nbextension Adds a symlink in /usr/share/jupyter/nbextensions, so that the js is available in a jupyter notebook. Otherwise, using 3d plots in the jupyter notebook will hit jsdelivr.net. --- srcpkgs/threejs-sage/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/threejs-sage/template b/srcpkgs/threejs-sage/template index cb5c87a19c1..9cdb0fb3848 100644 --- a/srcpkgs/threejs-sage/template +++ b/srcpkgs/threejs-sage/template @@ -1,7 +1,7 @@ # Template file for 'threejs-sage' pkgname=threejs-sage version=r122 -revision=1 +revision=2 short_desc="Custom build of three.js for sagemath" maintainer="Gonzalo Tornaría " license="MIT" @@ -13,4 +13,8 @@ do_install() { vlicense LICENSE vinstall version 644 usr/share/sagemath/threejs-sage vinstall build/three.min.js 644 usr/share/sagemath/threejs-sage/$version + + # make threejs available as a jupyter notebook extension + vmkdir usr/share/jupyter/nbextensions + ln -s /usr/share/sagemath/threejs-sage ${DESTDIR}/usr/share/jupyter/nbextensions } From ecb4c586957c8dbe1e745367c43999ceb1a1e959 Mon Sep 17 00:00:00 2001 From: skmpz Date: Mon, 11 Apr 2022 22:30:18 +0400 Subject: [PATCH 0894/2369] libusb: update to 1.0.26. --- .../libusb/patches/late-transfer-free.patch | 136 ------------------ srcpkgs/libusb/template | 6 +- 2 files changed, 3 insertions(+), 139 deletions(-) delete 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 deleted file mode 100644 index f4d913bbbd8..00000000000 --- a/srcpkgs/libusb/patches/late-transfer-free.patch +++ /dev/null @@ -1,136 +0,0 @@ -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 4f192264d4b..ff718223a77 100644 --- a/srcpkgs/libusb/template +++ b/srcpkgs/libusb/template @@ -1,7 +1,7 @@ # Template file for 'libusb' pkgname=libusb -version=1.0.25 -revision=2 +version=1.0.26 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="eudev-libudev-devel" @@ -11,7 +11,7 @@ license="LGPL-2.1-or-later" homepage="https://libusb.info" changelog="https://raw.githubusercontent.com/libusb/libusb/master/ChangeLog" distfiles="https://github.com/libusb/libusb/releases/download/v${version}/libusb-${version}.tar.bz2" -checksum=8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849 +checksum=12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5 libusb-devel_package() { short_desc+=" - development files" From 87b972a28e645e57a046bae1b52346045d5a8890 Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Mon, 11 Apr 2022 12:14:44 -0600 Subject: [PATCH 0895/2369] yad: update to 11.1 --- srcpkgs/yad/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template index 960ed74e8cc..a9d75e6930e 100644 --- a/srcpkgs/yad/template +++ b/srcpkgs/yad/template @@ -1,6 +1,6 @@ # Template file for 'yad' pkgname=yad -version=11.0 +version=11.1 revision=1 build_style=gnu-configure configure_args="--enable-icon-browser" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/v1cont/yad" changelog="https://raw.githubusercontent.com/v1cont/yad/master/NEWS" distfiles="https://github.com/v1cont/yad/releases/download/v${version}/yad-${version}.tar.xz" -checksum=af20b5a7120ba303ca8845db62c9a7410ae5b5224a3eb3563cd70774a745b9f2 +checksum=ca61d422d6d464d7f473d1e5bd14d3ca05d311ef203f1c67bbea7c23bf0eae2f pre_configure() { autoreconf -ivf From e4563d8ff250c3253b8d73aa3518c3b5f6ffe9ca Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 10 Apr 2022 23:45:27 -0400 Subject: [PATCH 0896/2369] polybar: update to 3.6.2, adopt. --- srcpkgs/polybar/template | 44 +++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template index 169724754f5..9a2021d3538 100644 --- a/srcpkgs/polybar/template +++ b/srcpkgs/polybar/template @@ -1,31 +1,33 @@ # Template file for 'polybar' pkgname=polybar -version=3.5.7 +version=3.6.2 revision=1 build_style=cmake -configure_args=" - -DENABLE_ALSA=$(vopt_if alsa ON OFF) - -DENABLE_CURL=$(vopt_if curl ON OFF) - -DENABLE_I3=$(vopt_if i3 ON OFF) - -DENABLE_MPD=$(vopt_if mpd ON OFF) - -DENABLE_NETWORK=$(vopt_if network ON OFF) - -DENABLE_PULSEAUDIO=$(vopt_if pulseaudio ON OFF) - -DWITH_XCOMPOSITE=ON" -hostmakedepends="pkg-config xcb-proto python3 python3-Sphinx" +configure_args="-DBUILD_CONFIG=OFF -DBUILD_DOC_HTML=OFF + $(vopt_bool alsa ENABLE_ALSA) + $(vopt_bool curl ENABLE_CURL) + $(vopt_bool i3 ENABLE_I3) + $(vopt_bool mpd ENABLE_MPD) + $(vopt_bool network ENABLE_NETWORK) + $(vopt_bool pulseaudio ENABLE_PULSEAUDIO)" +hostmakedepends="pkg-config xcb-proto python3 python3-Sphinx python3-packaging" makedepends="cairo-devel xcb-util-image-devel xcb-util-wm-devel xcb-util-xrm-devel - zlib-devel xcb-util-renderutil-devel xcb-util-cursor-devel libxcb-devel + zlib-devel xcb-util-renderutil-devel xcb-util-cursor-devel libxcb-devel libuv-devel $(vopt_if alsa "alsa-lib-devel") $(vopt_if curl "libcurl-devel") $(vopt_if i3 "i3-devel jsoncpp-devel") $(vopt_if mpd "libmpdclient-devel") - $(vopt_if network "wireless_tools-devel") + $(vopt_if network "libnl3-devel") $(vopt_if pulseaudio "pulseaudio-devel")" short_desc="Fast and easy-to-use status bar" -maintainer="Michael Carlberg " +maintainer="classabbyamp " license="MIT" homepage="https://github.com/polybar/polybar" -distfiles="${homepage}/releases/download/${version}/polybar-${version}.tar.gz" -checksum=73210e6d74217acb953b253990b4302343b7b6a7870fe1da9a1855daa44123db +changelog="https://raw.githubusercontent.com/polybar/polybar/master/CHANGELOG.md" +distfiles="https://github.com/polybar/polybar/releases/download/${version}/polybar-${version}.tar.gz" +checksum=73becc942e7d2418bc72bd194f2037a2a86792219fd561b663a8509fd5f547a0 +# tries to download and build unstable/unreleased googletest during configure +make_check=no build_options="alsa curl i3 mpd network pulseaudio" build_options_default="$build_options" @@ -35,21 +37,13 @@ desc_option_i3="Enable support for i3" desc_option_mpd="Enable support for MPD" desc_option_network="Enable support for network" -CXXFLAGS="-Wno-error=deprecated-declarations" - -if [ "$build_option_network" ]; then - case "$XBPS_TARGET_MACHINE" in - *-musl) CXXFLAGS+=" -D_LINUX_IF_ETHER_H" ;; - esac -fi - if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES='-latomic'" fi post_install() { - rm -rf ${DESTDIR}/usr/share/doc/polybar - vdoc config + rm -r ${DESTDIR}/usr/share/doc/polybar + vsconf doc/config.ini vlicense LICENSE } From 3ad841c73157ba0f61039dd2542f206ccc2016bc Mon Sep 17 00:00:00 2001 From: Piraty Date: Tue, 12 Apr 2022 00:54:09 +0200 Subject: [PATCH 0897/2369] botan: update to 2.19.1. drop update file as botan does semver for a long time now Closes: #34285 Closes: #36646 --- common/shlibs | 2 +- srcpkgs/botan/template | 10 ++++------ srcpkgs/botan/update | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index 0ac24701898..fc5a031056f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2897,7 +2897,7 @@ libKDb3.so.4 kdb-3.1.0_1 libKPropertyWidgets3.so.4 kproperty-3.1.0_1 libKPropertyCore3.so.4 kproperty-3.1.0_1 libKReport3.so.4 kreport-3.1.0_1 -libbotan-2.so.16 botan-2.16.0_3 +libbotan-2.so.19 botan-2.19.1_1 libswipl.so.8 swi-prolog-8.2.4_2 libpcre2-16.so.0 libpcre2-10.22_1 libpcre2-32.so.0 libpcre2-10.22_1 diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template index 282bceabd3c..65a626714fd 100644 --- a/srcpkgs/botan/template +++ b/srcpkgs/botan/template @@ -1,10 +1,9 @@ # Template file for 'botan' pkgname=botan -version=2.16.0 -revision=4 +version=2.19.1 +revision=1 wrksrc="${pkgname^}-${version}" build_style=gnu-makefile -pycompile_module="botan.py" hostmakedepends="doxygen python3" makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel" short_desc="Crypto library written in C++" @@ -12,11 +11,10 @@ maintainer="Orphaned " license="BSD-2-Clause" homepage="https://botan.randombit.net/" distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz" -checksum=92ed6ebc918d86bd1b04221ca518af4cf29cc326c4760740bd2d22e61cea2628 +checksum=e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560 python_version=3 LDFLAGS="-pthread" -CXXFLAGS="-O3" do_configure() { local _args _cpu @@ -78,7 +76,7 @@ do_configure() { } do_check() { - ./botan-test + make check } post_install() { diff --git a/srcpkgs/botan/update b/srcpkgs/botan/update index 04f08c11ede..e69de29bb2d 100644 --- a/srcpkgs/botan/update +++ b/srcpkgs/botan/update @@ -1 +0,0 @@ -pattern='\K[0-9]+\.[0-9]*[02468]\.[0-9]+' From 5677ffa43aea532dc56865e6a811531606929b15 Mon Sep 17 00:00:00 2001 From: Piraty Date: Tue, 12 Apr 2022 00:55:52 +0200 Subject: [PATCH 0898/2369] corectrl: update to 1.2.3. --- srcpkgs/corectrl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template index 513afe8b595..ad16c9a8de7 100644 --- a/srcpkgs/corectrl/template +++ b/srcpkgs/corectrl/template @@ -1,6 +1,6 @@ # Template file for 'corectrl' pkgname=corectrl -version=1.2.2 +version=1.2.3 revision=1 wrksrc=${pkgname}-v${version} build_style=cmake @@ -15,7 +15,7 @@ maintainer="Lorem " license="GPL-3.0-or-later" homepage="https://gitlab.com/corectrl/corectrl" distfiles="${homepage}/-/archive/v${version}/corectrl-v${version}.tar.gz" -checksum=ecfbdb3d99974a64fe6fab90f4bb543154ddc7004eeac14ef65b4ae6e661ca57 +checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From ddeb984ea4762eb84d0885d2135b1866eb27d555 Mon Sep 17 00:00:00 2001 From: Piraty Date: Tue, 12 Apr 2022 09:53:48 +0200 Subject: [PATCH 0899/2369] qownnotes: update to 22.4.0. --- srcpkgs/qownnotes/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template index b55900e3023..db79662ba4b 100644 --- a/srcpkgs/qownnotes/template +++ b/srcpkgs/qownnotes/template @@ -1,6 +1,6 @@ # Template file for 'qownnotes' pkgname=qownnotes -version=21.12.3 +version=22.4.0 revision=1 build_style=qmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" @@ -13,8 +13,8 @@ license="GPL-2.0-only" homepage="https://www.qownnotes.org" changelog="https://www.qownnotes.org/changelog.html" distfiles="https://download.tuxfamily.org/${pkgname}/src/${pkgname}-${version}.tar.xz" -checksum=a92df38f9c88f381af77800c339fe6aa8196a7a260081b0a48f61f1ae4c28029 +checksum=96b682608ecdf303e2c5d5eb2341812db3c3848e15bc4832ba5d426f01bdbd66 pre_build() { - sed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri + vsed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri } From 84913bfb57cef3d1cb41779c81d222ba6025670b Mon Sep 17 00:00:00 2001 From: Omar Zeghouani Date: Mon, 21 Mar 2022 11:18:31 +0000 Subject: [PATCH 0900/2369] libluv: update to 1.43.0.0. --- srcpkgs/libluv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template index ac7ef54a6ff..191d877e10f 100644 --- a/srcpkgs/libluv/template +++ b/srcpkgs/libluv/template @@ -1,6 +1,6 @@ # Template file for 'libluv' pkgname=libluv -version=1.41.0.0 +version=1.43.0.0 revision=1 _distver="${version%.*}-${version##*.}" wrksrc=luv-${_distver} @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://github.com/luvit/luv" distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in" -checksum="4018f293d71c2d75757b64fcdacf982729c9dc8b0bf8eda4015a8818a5a29321 +checksum="567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2 be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e" skip_extraction="libluv.pc.in" From edad0630fdce9ee68d8f5b6012eb828753c63515 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Mar 2022 17:04:42 +0100 Subject: [PATCH 0901/2369] corectrl: add missing glxinfo dependency and simplify libatomic handling By Piraty: distilled from the PR Closes: #36298 [via git-merge-pr] --- srcpkgs/corectrl/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template index ad16c9a8de7..0cfa3f79298 100644 --- a/srcpkgs/corectrl/template +++ b/srcpkgs/corectrl/template @@ -1,7 +1,7 @@ # Template file for 'corectrl' pkgname=corectrl version=1.2.3 -revision=1 +revision=2 wrksrc=${pkgname}-v${version} build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -9,7 +9,7 @@ hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake kcoreaddons kauth" makedepends="botan-devel kauth-devel karchive-devel qt5-charts-devel qt5-tools-devel libdrm-devel qt5-svg-devel" -depends="dbus hicolor-icon-theme qt5-quickcontrols2 qt5-svg" +depends="dbus hicolor-icon-theme qt5-quickcontrols2 qt5-svg glxinfo" short_desc="User-friendly hardware control application" maintainer="Lorem " license="GPL-3.0-or-later" @@ -19,6 +19,5 @@ checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" - LDFLAGS+=" -latomic" - configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" + LIBS="-latomic" fi From 4e11c4d559af8c5f2be494c8cd9060603ac4f7ff Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Tue, 12 Apr 2022 21:07:51 +0200 Subject: [PATCH 0902/2369] vscode: update to 1.66.2 --- srcpkgs/vscode/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 3e3956fa564..6d3b3d72d00 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.66.1 +version=1.66.2 revision=1 _electronver=13.6.7 _npmver=8.6.0 @@ -12,7 +12,7 @@ maintainer="shizonic , Alex Lohr " license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz" -checksum=243a25d7214ceba5abf510dc890c64a8cc36ccacd97f4b8c666b8b7bab9c5a28 +checksum=1b70f202b570763e85f67abd8693eeb9c88c6a066a4b579aca5c0c42ecb1b47f nocross=yes # x64 build does not cut it, it contains native code if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then From 8850c6af5594ba93e2e811000cc1dcdd6bb5f5e8 Mon Sep 17 00:00:00 2001 From: vikigenius Date: Tue, 12 Apr 2022 10:56:58 -0400 Subject: [PATCH 0903/2369] zola: update to 0.15.3 --- srcpkgs/zola/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template index dcf2a8701cf..460a4b9e483 100644 --- a/srcpkgs/zola/template +++ b/srcpkgs/zola/template @@ -1,6 +1,6 @@ # Template file for 'zola' pkgname=zola -version=0.15.2 +version=0.15.3 revision=1 build_style=cargo hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ license="MIT" homepage="https://github.com/getzola/zola" changelog="https://raw.githubusercontent.com/getzola/zola/master/CHANGELOG.md" distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz" -checksum=9f6b1527e728cef3536e42a18fbc06647b388fb34fc07cc7aca82e44f4fa3447 +checksum=89a590549249e60a01f1a1f66ee23fedc711afd4e9a669ee1328e5c99ea958c8 case "$XBPS_TARGET_MACHINE" in x86_64*|i686*|arm*|aarch64*) ;; From 986debb16ad793ec975cd153996e0806ee794c83 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 10 Apr 2022 19:32:51 +0300 Subject: [PATCH 0904/2369] python3-click-log: fix tests. --- srcpkgs/python3-click-log/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/python3-click-log/template b/srcpkgs/python3-click-log/template index 6f966c248fc..07f1c5b0eba 100644 --- a/srcpkgs/python3-click-log/template +++ b/srcpkgs/python3-click-log/template @@ -6,6 +6,7 @@ wrksrc="click-log-${version}" build_style="python3-module" hostmakedepends="python3-setuptools" depends="python3-click" +checkdepends="$depends python3-pytest" short_desc="Logging integration for Click (Python3)" maintainer="Oliver Kiddle " license="MIT" From f7df791eddf4386746b871b9776915a1b5c6ddfc Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 10 Apr 2022 19:33:13 +0300 Subject: [PATCH 0905/2369] python3-click-plugins: fix tests. --- srcpkgs/python3-click-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-click-plugins/template b/srcpkgs/python3-click-plugins/template index 142900633bb..3fffc0e849f 100644 --- a/srcpkgs/python3-click-plugins/template +++ b/srcpkgs/python3-click-plugins/template @@ -4,9 +4,9 @@ version=1.1.1 revision=4 wrksrc="click-plugins-${version}" build_style=python3-module -pycompile_module="click-plugins" hostmakedepends="python3-setuptools" depends="python3-click" +checkdepends="$depends python3-pytest" short_desc="Python3-click module extension to register CLI commands" maintainer="Alex Childs " license="BSD-2-Clause" From 08114bf08b553ac401d9e613791b46433e9af622 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 10 Apr 2022 19:33:43 +0300 Subject: [PATCH 0906/2369] python3-click-repl: disable tests. --- srcpkgs/python3-click-repl/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/python3-click-repl/template b/srcpkgs/python3-click-repl/template index b5cf6e495fc..d4c78ba7233 100644 --- a/srcpkgs/python3-click-repl/template +++ b/srcpkgs/python3-click-repl/template @@ -12,6 +12,8 @@ license="MIT" homepage="https://github.com/click-contrib/click-repl" distfiles="${PYPI_SITE}/c/click-repl/click-repl-${version}.tar.gz" checksum=b9f29d52abc4d6059f8e276132a111ab8d94980afe6a5432b9d996544afa95d5 +# The tarball from PyPI has no tests. +make_check=no post_install() { vlicense LICENSE From b9a31a08656d961a9151c344cbed5762662cea97 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 10 Apr 2022 19:35:14 +0300 Subject: [PATCH 0907/2369] python3-click-threading: fix tests. --- srcpkgs/python3-click-threading/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/python3-click-threading/template b/srcpkgs/python3-click-threading/template index b639065db3d..66bd90de3fd 100644 --- a/srcpkgs/python3-click-threading/template +++ b/srcpkgs/python3-click-threading/template @@ -6,6 +6,7 @@ wrksrc="click-threading-${version}" build_style="python3-module" hostmakedepends="python3-setuptools" depends="python3-click" +checkdepends="$depends python3-pytest" short_desc="Multithreaded Click apps made easy (Python3)" maintainer="Oliver Kiddle " license="MIT" From 1cfed1c265efa532f077191dcb587e9553c094b3 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 10 Apr 2022 19:35:25 +0300 Subject: [PATCH 0908/2369] python3-userpath: fix tests. --- srcpkgs/python3-userpath/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-userpath/template b/srcpkgs/python3-userpath/template index b557bc2528a..8fc30c9a52f 100644 --- a/srcpkgs/python3-userpath/template +++ b/srcpkgs/python3-userpath/template @@ -4,9 +4,9 @@ version=1.7.0 revision=2 wrksrc="userpath-${version}" build_style=python3-module -pycompile_module="userpath" hostmakedepends="python3-setuptools" depends="python3-click" +checkdepends="$depends python3-pytest" short_desc="Cross-platform tool for adding locations to the user PATH" maintainer="Leah Neukirchen " license="MIT, Apache-2.0" From d14a2566c237d48a9fa84439889459259c86326e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 13 Apr 2022 20:57:27 +0200 Subject: [PATCH 0909/2369] subversion: update to 1.14.2. --- srcpkgs/subversion/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template index acf378142fd..8ad17826494 100644 --- a/srcpkgs/subversion/template +++ b/srcpkgs/subversion/template @@ -3,8 +3,8 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/subversion-kwallet-auth". # pkgname=subversion -version=1.14.1 -revision=3 +version=1.14.2 +revision=1 build_style=gnu-configure configure_args="--disable-javahl --disable-static --config-cache --with-gnome-keyring --with-editor=vi --disable-mod-activation @@ -21,7 +21,7 @@ license="Apache-2.0, BSD-3-Clause" homepage="http://subversion.apache.org/" changelog="https://subversion.apache.org/docs/release-notes/${version%.*}.html" distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2" -checksum=2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9 +checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28 pre_configure() { # Based on native build values From d6a74ca70cb0460bb0662d9f29cb836c5d38e00e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 12:52:43 +0200 Subject: [PATCH 0910/2369] gucci: update to 1.5.4. --- srcpkgs/gucci/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template index a4d816647e7..37773ceba89 100644 --- a/srcpkgs/gucci/template +++ b/srcpkgs/gucci/template @@ -1,6 +1,6 @@ # Template file for 'gucci' pkgname=gucci -version=1.5.3 +version=1.5.4 revision=1 build_style=go go_import_path="github.com/noqcks/gucci" @@ -10,8 +10,8 @@ short_desc="Simple CLI templating tool written in Go" maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/noqcks/gucci" -distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz" -checksum=f52c12fbf566d42e666618d24258488eac6035a76369c2db4b741fed8792de76 +distfiles="https://github.com/noqcks/gucci/archive/refs/tags/${version}.tar.gz" +checksum=c6e30e088c341eb6988e2b50fc477deef81882d8a517e130a8eef22c81f32823 post_install() { vlicense LICENSE From f6fde30fe7c52145e7ad2ffd38751b3f286563e4 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sun, 27 Mar 2022 12:30:11 +0300 Subject: [PATCH 0911/2369] rssguard: update to 4.2.1. Also: - change build_style to cmake (upstream), - adjust dependencies. --- srcpkgs/rssguard/template | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template index f34e5808717..300f07694c4 100644 --- a/srcpkgs/rssguard/template +++ b/srcpkgs/rssguard/template @@ -1,18 +1,20 @@ # Template file for 'rssguard' pkgname=rssguard -version=4.1.2 +version=4.2.1 revision=1 -build_style=qmake -configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false" -hostmakedepends="qt5-qmake qt5-host-tools" -makedepends="qt5-tools-devel kdeclarative-devel qt5-multimedia-devel" +build_style=cmake +configure_args="-DUSE_WEBENGINE="false"" +hostmakedepends="qt5-host-tools qt5-qmake" +makedepends="qt5-tools-devel qt5-devel kdeclarative-devel qt5-multimedia-devel + qt5-plugin-sqlite qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-mysql + qt5-plugin-tds" depends="desktop-file-utils qt5-plugin-sqlite" short_desc="Simple (yet powerful) Qt5 feed reader" maintainer="mobinmob " license="GPL-3.0-only" homepage="https://github.com/martinrotter/rssguard" distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz" -checksum=3e9c6b25cad846aa2047f737d961fe007c88873d9e9772ec8e238908c6f8df95 +checksum=b404e3d8310c58ffb337bf1d2eb2c7cc10a692b00ed2666af30bd0153413cc05 post_install() { # Install rssguard icon manually From a39a2c4bb45cee016232ddbc842fa651317d971c Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Wed, 13 Apr 2022 17:43:00 +0200 Subject: [PATCH 0912/2369] setxkbmap: update to 1.3.3. --- srcpkgs/setxkbmap/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/setxkbmap/template b/srcpkgs/setxkbmap/template index 9fafe9eb721..02a6f5de245 100644 --- a/srcpkgs/setxkbmap/template +++ b/srcpkgs/setxkbmap/template @@ -1,16 +1,16 @@ # Template file for 'setxkbmap' pkgname=setxkbmap -version=1.3.2 +version=1.3.3 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="libX11-devel libxkbfile-devel" +makedepends="libX11-devel libxkbfile-devel libXrandr-devel" short_desc="Set the keyboard map using the X Keyboard Extension" maintainer="Orphaned " license="MIT" -homepage="http://xorg.freedesktop.org" -distfiles="${XORG_SITE}/app/setxkbmap-${version}.tar.bz2" -checksum=8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5 +homepage="https://gitlab.freedesktop.org/xorg/app/setxkbmap" +distfiles="${XORG_SITE}/app/setxkbmap-${version}.tar.xz" +checksum=b560c678da6930a0da267304fa3a41cc5df39a96a5e23d06f14984c87b6f587b post_install() { vlicense COPYING From 24fd0f9ecac5d692a837c70fbc1bfd9f4f18d3bd Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 3 Apr 2022 16:14:08 +0200 Subject: [PATCH 0913/2369] font-cozette: update to 1.13.0 --- srcpkgs/font-cozette/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template index 7a2e5766938..ad6b3acd0d1 100644 --- a/srcpkgs/font-cozette/template +++ b/srcpkgs/font-cozette/template @@ -1,7 +1,7 @@ # Template file for 'font-cozette' pkgname=font-cozette -version=1.11.3 -revision=2 +version=1.13.0 +revision=1 create_wrksrc=yes hostmakedepends="font-util bdftopcf" depends="font-util" @@ -9,8 +9,9 @@ short_desc="Bitmap programming font optimized for coziness" maintainer="Isaac Freund " license="MIT" homepage="https://github.com/slavfox/Cozette" +changelog="https://github.com/slavfox/Cozette/raw/master/CHANGELOG.md" distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip" -checksum=0976f61ba68b3a261568819bce0b89d43ae2892ad51e5da399dab8a5894cbbc8 +checksum=11590b29856d9ffb2dc6c606009168ea87a3ecde7bcbe9fe542bc34b406c868d font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF" do_install() { From b5b3a321199c9366d08a5c05edac5e9570fbd5a6 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Wed, 13 Apr 2022 17:38:50 +0200 Subject: [PATCH 0914/2369] cocogitto: update to 5.1.0 --- srcpkgs/cocogitto/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template index 79a78e4b597..b20e575819a 100644 --- a/srcpkgs/cocogitto/template +++ b/srcpkgs/cocogitto/template @@ -1,6 +1,6 @@ # Template file for 'cocogitto' pkgname=cocogitto -version=5.0.1 +version=5.1.0 revision=1 build_style=cargo build_helper=qemu @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/cocogitto/cocogitto" changelog="https://github.com/cocogitto/cocogitto/blob/main/CHANGELOG.md" distfiles="https://github.com/cocogitto/cocogitto/archive/${version}.tar.gz" -checksum=fee00736ec4b8ce72c8d8f904d0b734372b11ce7c3711166814eca38bf0cda8f +checksum=662bb909c6468124ad19a90bc07a4f24345167486bd19542375ead7a8f20de02 # Test suite is not atomic, relies on user environment such as git user configuration make_check=no From 1e5ce80941037bddef28d95f4e98a886f6fdfa7d Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Wed, 13 Apr 2022 17:45:30 +0200 Subject: [PATCH 0915/2369] zellij: update to 0.28.1 --- srcpkgs/zellij/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template index 911ba18464e..20a338d9103 100644 --- a/srcpkgs/zellij/template +++ b/srcpkgs/zellij/template @@ -1,7 +1,7 @@ # Template file for 'zellij' pkgname=zellij -version=0.27.0 -revision=2 +version=0.28.1 +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 archs="x86_64* aarch64* i686*" @@ -15,7 +15,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=6159482c25d3cb55b04d23230812f4450e88ff0975161594297a7deef8979a38 +checksum=8c9495e70b1c0179200d6137dd892776c7153b0b54115edf0f39fd732bb62efe post_build() { ZELLIJ="target/${RUST_TARGET}/release/zellij" From 511ffe6071009c1e6c9a3463c1b1f7a327189e4c Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Wed, 13 Apr 2022 21:12:54 +0200 Subject: [PATCH 0916/2369] github-cli: update to 2.8.0 --- srcpkgs/github-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template index e4ed029ac23..35576bf8ee8 100644 --- a/srcpkgs/github-cli/template +++ b/srcpkgs/github-cli/template @@ -1,6 +1,6 @@ # Template file for 'github-cli' pkgname=github-cli -version=2.5.2 +version=2.8.0 revision=1 wrksrc="cli-${version}" build_style=go @@ -13,7 +13,7 @@ license="MIT" homepage="https://cli.github.com" changelog="https://github.com/cli/cli/releases" distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz" -checksum=cbf22fea4574047ca3a356ee4ef629d62b872f4c4ff4e4b78fe4f89ca431858e +checksum=d4aed3f4325bc518cf4af6fc7989ab35b498e42e8f97ba0e6bb07d7e3b14886a pre_build() { local _date From 282366ddb8c68b6457bdcfc8629b0cc9b0cec08c Mon Sep 17 00:00:00 2001 From: RunningDroid Date: Wed, 13 Apr 2022 15:30:35 -0400 Subject: [PATCH 0917/2369] btop: update to 1.2.6. --- srcpkgs/btop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/btop/template b/srcpkgs/btop/template index 4b2064c29e4..3667b71a317 100644 --- a/srcpkgs/btop/template +++ b/srcpkgs/btop/template @@ -1,6 +1,6 @@ # Template file for 'btop' pkgname=btop -version=1.2.5 +version=1.2.6 revision=1 build_style=gnu-makefile short_desc="Monitor of resources" @@ -9,4 +9,4 @@ license="Apache-2.0" homepage="https://github.com/aristocratos/btop" changelog="https://raw.githubusercontent.com/aristocratos/btop/main/CHANGELOG.md" distfiles="https://github.com/aristocratos/btop/archive/refs/tags/v${version}.tar.gz" -checksum=93ff23276f2c626282037766542543dad5964fb6117c7902c4a4899607f8c95f +checksum=3631f39c847c884064dd0babf34487a3b8b87a9d61d89aa5185418ffdc4741d8 From a5f0de5c09ee332e4d89523e80fc524a58da9775 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Wed, 13 Apr 2022 10:32:50 +0200 Subject: [PATCH 0918/2369] mutt: update to 2.2.3. --- srcpkgs/mutt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index 6c0f0d04798..4c65fcdec66 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -1,6 +1,6 @@ # Template file for 'mutt' pkgname=mutt -version=2.2.2 +version=2.2.3 revision=1 build_style=gnu-configure configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache @@ -18,7 +18,7 @@ license="GPL-2.0-or-later" homepage="http://www.mutt.org" changelog="http://mutt.org/relnotes/${version%.*}" distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz" -checksum=10de870cf37646c0b3f5bcf579c3cc2fd9285bda1d04be9ad7c33ec2ee820fcc +checksum=978addcdab454f447ed7d1de84b5767e714c30714285bf82e4a1745071d18d89 post_install() { # provided by mime-types From 531e0f227a0720e1ac53f5e87e951f3ba436e10a Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Wed, 13 Apr 2022 20:58:41 +0200 Subject: [PATCH 0919/2369] links: update to 2.26 --- srcpkgs/links/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/links/template b/srcpkgs/links/template index 554ef120c0b..b1b4d5d6629 100644 --- a/srcpkgs/links/template +++ b/srcpkgs/links/template @@ -1,6 +1,6 @@ # Template file for 'links' pkgname=links -version=2.25 +version=2.26 revision=1 build_style=gnu-configure configure_args="--with-ssl --enable-graphics" @@ -11,7 +11,7 @@ maintainer="Toyam Cox " license="GPL-2.0-or-later" homepage="http://links.twibright.com/" distfiles="http://links.twibright.com/download/links-${version}.tar.bz2" -checksum=2dd78508698e8279ef4f09a3a2a21e9595040113402da6c553974414fb49dd2c +checksum=f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb post_install() { mkdir -p ${DESTDIR}/usr/share/doc/ From 036a38e9e1402202b02db493a236b14f3e25a79a Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Wed, 13 Apr 2022 20:59:13 +0200 Subject: [PATCH 0920/2369] links-x11: update to 2.26 --- srcpkgs/links-x11/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template index 6e37599354a..83708d05a3c 100644 --- a/srcpkgs/links-x11/template +++ b/srcpkgs/links-x11/template @@ -1,6 +1,6 @@ # Template file for 'links-x11' pkgname=links-x11 -version=2.25 +version=2.26 revision=1 wrksrc="${pkgname%-x11}-${version}" build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="newbluemoon " license="GPL-2.0-or-later" homepage="http://links.twibright.com/" distfiles="http://links.twibright.com/download/links-${version}.tar.bz2" -checksum=2dd78508698e8279ef4f09a3a2a21e9595040113402da6c553974414fb49dd2c +checksum=f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb conflicts="links" post_install() { From 3e29d6c827a99fc136b88c0d46645665fe18b9f6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:45:24 +0200 Subject: [PATCH 0921/2369] ocaml: update to 4.14.0. --- srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 16 ++++++++-------- srcpkgs/ocaml/template | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch index 333276741c7..a26f6a639e1 100644 --- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch +++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch @@ -18,25 +18,25 @@ .globl caml_system__frametable .type caml_system__frametable, @object caml_system__frametable: ---- ocaml-4.11.0/configure.ac -+++ ocaml-4.11.0/configure.ac +--- ocaml-4.14.0/configure.ac ++++ ocaml-4.14.0/configure.ac @@ -1006,7 +1006,7 @@ AS_IF([test $arch != "none" && $arch64 ], # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader. AS_CASE([$arch], -- [amd64|s390x|none], -+ [amd64|s390x|power|none], +- [amd64|arm64|s390x|none], ++ [amd64|arm64|s390x|power|none], # ocamlopt generates PIC code or doesn't generate code at all [], [AS_CASE([$host], ---- ocaml-4.11.0/configure -+++ ocaml-4.11.0/configure +--- ocaml-4.14.0/configure ++++ ocaml-4.14.0/configure @@ -13886,7 +13886,7 @@ # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader. case $arch in #( -- amd64|s390x|none) : -+ amd64|s390x|power|none) : +- amd64|arm64|s390x|none) : ++ amd64|arm64|s390x|power|none) : # ocamlopt generates PIC code or doesn't generate code at all ;; #( *) : diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template index 629c13791df..7de25d70b82 100644 --- a/srcpkgs/ocaml/template +++ b/srcpkgs/ocaml/template @@ -1,7 +1,7 @@ # Template file for 'ocaml' pkgname=ocaml -version=4.13.1 -revision=2 +version=4.14.0 +revision=1 build_style="gnu-configure" configure_args="--with-pic --libdir=/usr/lib/ocaml" make_build_target="world.opt" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="QPL-1.0, LGPL-2.1-only" homepage="http://ocaml.org/" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" -checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4 +checksum=39f44260382f28d1054c5f9d8bf4753cb7ad64027da792f7938344544da155e8 nocross=yes export ASPP="cc -c" From cd86ed221bba88985a492aa9a995d25a8db7ac50 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:47:06 +0200 Subject: [PATCH 0922/2369] ocaml-findlib: update to 1.9.3. --- srcpkgs/ocaml-findlib/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template index 73cca5a2caf..04be12e64f5 100644 --- a/srcpkgs/ocaml-findlib/template +++ b/srcpkgs/ocaml-findlib/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-findlib' pkgname=ocaml-findlib -version=1.9.1 -revision=3 +version=1.9.3 +revision=1 wrksrc="findlib-${version}" build_style=configure configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man" @@ -12,7 +12,7 @@ maintainer="John Regan " license="MIT" homepage="http://projects.camlcity.org/projects/findlib.html" distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz" -checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2 +checksum=c310fcb62838d9e50f0b6d6c5ceefcbe4fe056f72496950ae7d5c6cdaae2cc41 nocross=yes nopie=yes disable_parallel_build=yes From 5949ec090e062212710e5e1a57b0f8f83a8bb060 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:48:00 +0200 Subject: [PATCH 0923/2369] ocaml-num: rebuild for ocaml-4.14.0_1. --- srcpkgs/ocaml-num/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template index bfce4e7baf9..739ffcf5d41 100644 --- a/srcpkgs/ocaml-num/template +++ b/srcpkgs/ocaml-num/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-num' pkgname=ocaml-num version=1.4 -revision=3 +revision=4 wrksrc="num-${version}" build_style=gnu-makefile make_install_target="findlib-install" From 8a7a7f953264f044aa29e51f9159f2b0b6ed06b9 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:49:19 +0200 Subject: [PATCH 0924/2369] ocaml-zarith: rebuild for ocaml-4.14.0_1. --- srcpkgs/ocaml-zarith/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template index d6c12772723..936b5cd3f60 100644 --- a/srcpkgs/ocaml-zarith/template +++ b/srcpkgs/ocaml-zarith/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-zarith' pkgname=ocaml-zarith version=1.12 -revision=3 +revision=4 wrksrc="Zarith-release-${version}" build_style=configure make_check_target="tests" From 8791e9c8fcfab6b805f44dd628d73b457f6ced76 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:50:43 +0200 Subject: [PATCH 0925/2369] ocamlbuild: rebuild for ocaml-4.14.0_1. --- srcpkgs/ocamlbuild/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template index 077d5cc7f63..b1349909f78 100644 --- a/srcpkgs/ocamlbuild/template +++ b/srcpkgs/ocamlbuild/template @@ -1,7 +1,7 @@ # Template file for 'ocamlbuild' pkgname=ocamlbuild version=0.14.1 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="PREFIX=/usr" make_install_args="PREFIX=/usr" @@ -13,3 +13,5 @@ homepage="https://github.com/ocaml/ocamlbuild" distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz" checksum=4e1279ff0ef80c862eaa5207a77020d741e89ef94f0e4a92a37c4188dbf08256 nocross=yes + +export CHECK_IF_PREINSTALLED=false From e08f8810c55ea44b68fc77175af71eb9b8d2cfc1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:51:59 +0200 Subject: [PATCH 0926/2369] ocaml-stdcompat: update to 18. --- srcpkgs/ocaml-stdcompat/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template index 2035a9a2c4f..65a0d6fbc78 100644 --- a/srcpkgs/ocaml-stdcompat/template +++ b/srcpkgs/ocaml-stdcompat/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-stdcompat' pkgname=ocaml-stdcompat -version=16 -revision=2 +version=18 +revision=1 wrksrc="stdcompat-${version}" build_style=gnu-configure configure_args="--libdir=/usr/lib/ocaml" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="BSD-2-Clause" homepage="https://github.com/thierry-martinez/stdcompat" distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz" -checksum=100152e25f138351cb265146cd8717fa9dbfbff54b48ce771e30a4e05fc1ec09 +checksum=483a8d526eb19709a1a3092fb8978302e3a9d3bb783d807fb9ee53d96c3ec607 nocross=yes disable_parallel_build=yes From 848a2734eb0b342fad4a019ffee5b8d72a0f2d64 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:53:13 +0200 Subject: [PATCH 0927/2369] hivex: rebuild for ocaml-4.14.0_1. --- srcpkgs/hivex/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template index 448c06ddc9f..f6f12d1b70f 100644 --- a/srcpkgs/hivex/template +++ b/srcpkgs/hivex/template @@ -1,7 +1,7 @@ # Template file for 'hivex' pkgname=hivex version=1.3.21 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-ocaml" # currently ocaml is broken hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy" From 3b38b33d0933b7f007f65db935e641ee4ef71dcc Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:53:32 +0200 Subject: [PATCH 0928/2369] opam: rebuild for ocaml-4.14.0_1. --- srcpkgs/opam/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template index 236a2f963b7..ca5c64092ac 100644 --- a/srcpkgs/opam/template +++ b/srcpkgs/opam/template @@ -1,7 +1,7 @@ # Template file for 'opam' pkgname=opam version=2.1.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--docdir=/usr/share/doc/${pkgname}" make_build_args="lib-ext all" From e2a60f2bb3ef3fa84295577a0667b8d8809e68f7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:53:52 +0200 Subject: [PATCH 0929/2369] ocaml-lablgtk2: rebuild for ocaml-4.14.0_1. --- srcpkgs/ocaml-lablgtk2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template index c835e6b19d5..6ff864eb172 100644 --- a/srcpkgs/ocaml-lablgtk2/template +++ b/srcpkgs/ocaml-lablgtk2/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-lablgtk2' pkgname=ocaml-lablgtk2 version=2.18.10 -revision=4 +revision=5 wrksrc="lablgtk-${version}" build_style=gnu-configure configure_args="--without-glade --without-gnomeui --without-gtksourceview" From 416482f62ccb20c538e9a30bed960399e0b868e6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:56:12 +0200 Subject: [PATCH 0930/2369] pdfsandwich: rebuild for ocaml-4.14.0_1. --- srcpkgs/pdfsandwich/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template index f3603e064c9..82f2f934fdc 100644 --- a/srcpkgs/pdfsandwich/template +++ b/srcpkgs/pdfsandwich/template @@ -1,7 +1,7 @@ # Template file for 'pdfsandwich' pkgname=pdfsandwich version=0.1.7 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="ocaml perl" makedepends="ocaml" From 3b73a8c85416fad9695148d3c4335827908091b2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:56:17 +0200 Subject: [PATCH 0931/2369] supermin: rebuild for ocaml-4.14.0_1. --- srcpkgs/supermin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template index 357fc3f255f..5f80c3515b3 100644 --- a/srcpkgs/supermin/template +++ b/srcpkgs/supermin/template @@ -1,7 +1,7 @@ # Template file for 'supermin' pkgname=supermin version=5.2.2 -revision=1 +revision=2 _release_series=5.2-stable build_style=gnu-configure hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl" From fb832a912c5b2604b76f5b062e82fa3c022d539f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:56:24 +0200 Subject: [PATCH 0932/2369] z3: rebuild for ocaml-4.14.0_1. --- srcpkgs/z3/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index 2d5bf7a8095..dea059c98d0 100644 --- a/srcpkgs/z3/template +++ b/srcpkgs/z3/template @@ -1,7 +1,7 @@ # Template file for 'z3' pkgname=z3 version=4.8.15 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_style=configure configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)" From 9073b1462771c57ca3dee665afc372ce878bc749 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:01:53 +0200 Subject: [PATCH 0933/2369] coccinelle: rebuild for ocaml-4.14.0_1. --- srcpkgs/coccinelle/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template index 211c9bdb439..709b45fd2f6 100644 --- a/srcpkgs/coccinelle/template +++ b/srcpkgs/coccinelle/template @@ -1,7 +1,7 @@ # Template file for 'coccinelle' pkgname=coccinelle version=1.1.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--without-pdflatex --enable-release --enable-opt --with-python=/usr/bin/python3" From 109ef05021d9d220e3f48eca1b8d390ee51e208f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:03:56 +0200 Subject: [PATCH 0934/2369] libguestfs: rebuild for ocaml-4.14.0_1. --- srcpkgs/libguestfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index 8d669017077..c6c56f8142b 100644 --- a/srcpkgs/libguestfs/template +++ b/srcpkgs/libguestfs/template @@ -1,7 +1,7 @@ # Template file for 'libguestfs' pkgname=libguestfs version=1.48.0 -revision=1 +revision=2 _version_short=${version%.*} build_style=gnu-configure make_install_args="INSTALLDIRS=vendor" From 88ac3abc18933896777f4f320cefe3ae0d5daf4f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:04:56 +0200 Subject: [PATCH 0935/2369] unison: rebuild for ocaml-4.14.0_1. --- srcpkgs/unison/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template index 783573c120e..97eb209e2e8 100644 --- a/srcpkgs/unison/template +++ b/srcpkgs/unison/template @@ -1,7 +1,7 @@ # Template file for 'unison' pkgname=unison version=2.52.0 -revision=1 +revision=2 hostmakedepends="ocaml" short_desc="File-synchronization tool" maintainer="allan " From f7b436f38bcebe32b09000aa9e5d99493b6cd56e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:08:51 +0200 Subject: [PATCH 0936/2369] camlp5: rebuild for ocaml-4.14.0_1. --- srcpkgs/camlp5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template index 2d07ecc842b..74e0809e16d 100644 --- a/srcpkgs/camlp5/template +++ b/srcpkgs/camlp5/template @@ -1,7 +1,7 @@ # Template file for 'camlp5' pkgname=camlp5 version=8.00.03 -revision=1 +revision=2 wrksrc="camlp5-rel${version}" build_style=configure configure_args="-mandir /usr/share/man" From b73b867711dabfa66ea79999adaac83d448cff3f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:12:31 +0200 Subject: [PATCH 0937/2369] dune: rebuild for ocaml-4.14.0_1. --- srcpkgs/dune/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template index 178746cfc29..30c34cb44c0 100644 --- a/srcpkgs/dune/template +++ b/srcpkgs/dune/template @@ -1,7 +1,7 @@ # Template file for 'dune' pkgname=dune version=3.0.3 -revision=1 +revision=2 makedepends="ocaml" depends="ocaml" short_desc="Composable build system for OCaml" From a5e9a6a3742820a61b3cf38171056175f015104c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:18:07 +0200 Subject: [PATCH 0938/2369] New package: ocaml-camlp-streams-5.0 --- srcpkgs/ocaml-camlp-streams/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/ocaml-camlp-streams/template diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template new file mode 100644 index 00000000000..ce728427d28 --- /dev/null +++ b/srcpkgs/ocaml-camlp-streams/template @@ -0,0 +1,22 @@ +# Template file for 'ocaml-camlp-streams' +pkgname=ocaml-camlp-streams +version=5.0 +revision=1 +wrksrc="camlp-streams-${version}" +makedepends="ocaml dune" +short_desc="Stream and Genlex libraries for use with Camlp4 and Camlp5" +maintainer="Leah Neukirchen " +license="LGPL-2.1-only,OCaml-LGPL-linking-exception" +homepage="https://github.com/ocaml/camlp-streams" +distfiles="https://github.com/ocaml/camlp-streams/archive/v${version}.tar.gz" +checksum=daa618bb57a876075a1801d9dcde7dee83635766185f565af913dff43ea4d226 +nocross=yes +disable_parallel_build=yes + +do_build() { + dune build --display=short +} +do_install() { + dune install --prefix=/usr --destdir="$DESTDIR" \ + --libdir=/usr/lib/ocaml --docdir=/usr/share/doc +} From fc9635ccf15023bd594f1f3f3108b3bfb70ed563 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:23:36 +0200 Subject: [PATCH 0939/2369] camlp5: rebuild for ocaml-4.14.0_1. --- srcpkgs/camlp5/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template index 74e0809e16d..1118f618ba1 100644 --- a/srcpkgs/camlp5/template +++ b/srcpkgs/camlp5/template @@ -1,11 +1,12 @@ # Template file for 'camlp5' pkgname=camlp5 version=8.00.03 -revision=2 +revision=3 wrksrc="camlp5-rel${version}" build_style=configure configure_args="-mandir /usr/share/man" hostmakedepends="ocaml perl ocaml-findlib" +makedepends="ocaml-camlp-streams" short_desc="OCaml preprocessor and pretty-printer" maintainer="Leah Neukirchen " license="BSD-3-Clause" From d45d473edb659f8673857c7138e1804b553dceba Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:23:46 +0200 Subject: [PATCH 0940/2369] coq: rebuild for ocaml-4.14.0_1. --- srcpkgs/coq/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template index fcfbc92cb2f..5db6a99c5e5 100644 --- a/srcpkgs/coq/template +++ b/srcpkgs/coq/template @@ -1,7 +1,7 @@ # Template file for 'coq' pkgname=coq version=8.15.1 -revision=1 +revision=2 hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith" short_desc="Proof assistant written in OCaml" maintainer="Leah Neukirchen " From e7788be42b275c8e70d08d660094cd0d922cff04 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:30:50 +0200 Subject: [PATCH 0941/2369] mathcomp: rebuild for coq-8.15.1_2. --- srcpkgs/mathcomp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template index 5946de08e18..9bdea51dcf4 100644 --- a/srcpkgs/mathcomp/template +++ b/srcpkgs/mathcomp/template @@ -1,7 +1,7 @@ # Template file for 'mathcomp' pkgname=mathcomp version=1.14.0 -revision=1 +revision=2 wrksrc="math-comp-mathcomp-${version}" build_wrksrc="mathcomp" build_style=gnu-makefile From 5311c2d45a90484e08dd72c0412f45326acb949a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:48:14 +0200 Subject: [PATCH 0942/2369] xen: rebuild for ocaml-4.14.0_1. --- srcpkgs/xen/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index deb572fe8b9..cca4b6211be 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -1,7 +1,7 @@ # Template file for 'xen' pkgname=xen version=4.14.1 -revision=5 +revision=6 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63 # TODO: arm / aarch64 @@ -10,8 +10,9 @@ build_style=gnu-configure configure_args="$(vopt_enable stubdom) --disable-systemd --with-system-seabios=/usr/share/seabios/bios.bin --with-sysconfig-leaf-dir=conf.d --with-rundir=/run" -hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git - ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget" +hostmakedepends="acpica-utils automake bin86 bison fig2dev flex gettext + ghostscript git ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar + texinfo wget" makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel From 0edb5ab2a418753c1d5c93711cf2ece6612e3b2a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 22:03:19 +0200 Subject: [PATCH 0943/2369] zeroinstall: rebuild for ocaml-4.14.0_1. --- srcpkgs/zeroinstall/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template index eb8e1ea2428..40d8740b130 100644 --- a/srcpkgs/zeroinstall/template +++ b/srcpkgs/zeroinstall/template @@ -1,7 +1,7 @@ # Template file for 'zeroinstall' pkgname=zeroinstall version=2.17 -revision=5 +revision=6 wrksrc="0install-v${version}" build_style=gnu-makefile make_install_target="install_system" From 78e4400cddc2f002300d9bc8629bcb6f6f300209 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 14 Apr 2022 14:27:09 +0200 Subject: [PATCH 0944/2369] opam: disable tests in ci. --- srcpkgs/opam/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template index ca5c64092ac..dd27afd02a0 100644 --- a/srcpkgs/opam/template +++ b/srcpkgs/opam/template @@ -17,6 +17,7 @@ distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz" checksum=735e717532f135064940fe3fef573acce6b1bbdc5e146470c2ac20fc8510a470 nocross=yes disable_parallel_build=yes +make_check=ci-skip # uses bwrap post_install() { rm -rf ${DESTDIR}/usr/doc From 8839c680dc09b8de140f40c9003cc7c07c23ff81 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 5 Apr 2022 11:59:21 -0400 Subject: [PATCH 0945/2369] python3-pyppmd: update to 0.18.2. enable tests by ignoring/disabling pytest-benchmark --- srcpkgs/python3-pyppmd/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template index 4034cde0547..a80c2a5f038 100644 --- a/srcpkgs/python3-pyppmd/template +++ b/srcpkgs/python3-pyppmd/template @@ -1,18 +1,18 @@ # Template file for 'python3-pyppmd' pkgname=python3-pyppmd -version=0.17.3 +version=0.18.2 revision=1 wrksrc="pyppmd-${version}" build_style=python3-module +make_check_args="--noconftest --ignore=tests/test_benchmark.py" hostmakedepends="python3-setuptools_scm" makedepends="python3-devel" depends="python3" +checkdepends="python3-pytest python3-py-cpuinfo python3-hypothesis" short_desc="Python interface for PPM variation H and I.2" maintainer="Joel Beckmeyer " license="LGPL-2.0-or-later" homepage="https://github.com/miurahr/pyppmd" changelog="https://raw.githubusercontent.com/miurahr/pyppmd/main/Changelog.rst" distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz" -checksum=05a4765833623d5cc1c9afc27d9b05fb64f0319711beffe0b44d9695eb1beb0a -# testing requires unpackaged plugin pytest-benchmark -make_check=no +checksum=732b28ea25afa41a282c986178b29e60ea5ec2e2b67f66997af943f73d4673e0 From 0e1782368165918d6f7cfea4d982a579cf94e9e5 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 5 Apr 2022 11:59:34 -0400 Subject: [PATCH 0946/2369] python3-pyzstd: update to 0.15.2. fix tests with custom do_check --- .../patches/support_pytest.patch | 30 +++++++++++++++++++ srcpkgs/python3-pyzstd/template | 8 ++--- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/python3-pyzstd/patches/support_pytest.patch diff --git a/srcpkgs/python3-pyzstd/patches/support_pytest.patch b/srcpkgs/python3-pyzstd/patches/support_pytest.patch new file mode 100644 index 00000000000..05ffa75fab5 --- /dev/null +++ b/srcpkgs/python3-pyzstd/patches/support_pytest.patch @@ -0,0 +1,30 @@ +From b7ff78fc31ea054339693d6bf835134b8b9fbaa3 Mon Sep 17 00:00:00 2001 +From: Ma Lin +Date: Tue, 12 Apr 2022 13:00:30 +0800 +Subject: [PATCH] unittests supports pytest + + +--- + tests/test_zstd.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/tests/test_zstd.py b/tests/test_zstd.py +index 263a753..0d254b9 100644 +--- a/tests/test_zstd.py ++++ b/tests/test_zstd.py +@@ -3231,9 +3231,6 @@ def cb(a,b,c,d): + compress_stream(io.BytesIO(b''), io.BytesIO(), callback=cb) + decompress_stream(io.BytesIO(b''), io.BytesIO(), callback=cb) + +-def test_main(): +- unittest.main() +- + # uncompressed size 130KB, more than a zstd block. + # with a frame epilogue, 4 bytes checksum. + TEST_DAT_130KB = (b'(\xb5/\xfd\xa4\x00\x08\x02\x00\xcc\x87\x03:\xaaYN4pf\xc8\xae\x06b\x02' +@@ -4419,4 +4416,4 @@ def test_main(): + b'\xb7\x99\x1b\xce\xc9\t*\x98\x97\xb43z\x01h\x9fu\xf1') + + if __name__ == "__main__": +- test_main() ++ unittest.main() diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template index 708b8a193d9..c097aeb44a0 100644 --- a/srcpkgs/python3-pyzstd/template +++ b/srcpkgs/python3-pyzstd/template @@ -1,6 +1,6 @@ # Template file for 'python3-pyzstd' pkgname=python3-pyzstd -version=0.15.0 +version=0.15.2 revision=1 wrksrc="pyzstd-${version}" build_style=python3-module @@ -8,14 +8,14 @@ make_build_args="--dynamic-link-zstd" hostmakedepends="python3-setuptools" makedepends="python3-devel libzstd-devel" depends="python3" +checkdepends="python3-pytest" short_desc="Python bindings to zstd, API is similar to bz2/lzma/zlib module" maintainer="Joel Beckmeyer " license="BSD-3-Clause" homepage="https://github.com/animalize/pyzstd" +changelog="https://raw.githubusercontent.com/animalize/pyzstd/dev/README.rst" distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz" -checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36 -# test is broken and can't be run by setup.py or pytest -make_check=no +checksum=eda9d2874a8f3823eea882125f304620f592693b3af0101c484bfc75726c8c59 post_install() { vlicense LICENSE From 4e2532326e65c73120f4a7a63d4bee951cd2a99d Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 5 Apr 2022 12:00:01 -0400 Subject: [PATCH 0947/2369] python3-pybcj: update to 0.5.1. enable tests with pytest --- srcpkgs/python3-pybcj/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template index 9e0e806f958..a0776b79662 100644 --- a/srcpkgs/python3-pybcj/template +++ b/srcpkgs/python3-pybcj/template @@ -1,15 +1,16 @@ # Template file for 'python3-pybcj' pkgname=python3-pybcj -version=0.5.0 +version=0.5.1 revision=1 wrksrc="pybcj-${version}" build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="python3-devel" depends="python3" +checkdepends="python3-pytest python3-hypothesis" short_desc="BCJ(Branch-Call-Jump) filter for python" maintainer="Joel Beckmeyer " license="LGPL-2.1-or-later" homepage="https://github.com/miurahr/pybcj" distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz" -checksum=8de74f338874c698e405a72181eb0ea2e011ed5a6567e0feca524275f113bb0f +checksum=376d039200639a52cba47fb04ffda39aad39715d9e988405fee0e5d60080d111 From 52f88dd53acc03c4d00a9b378c7f77e1db66e78b Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 5 Apr 2022 13:39:53 -0400 Subject: [PATCH 0948/2369] New package: python3-zipfile-deflate64-0.2.0 --- srcpkgs/python3-zipfile-deflate64/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/python3-zipfile-deflate64/template diff --git a/srcpkgs/python3-zipfile-deflate64/template b/srcpkgs/python3-zipfile-deflate64/template new file mode 100644 index 00000000000..5f2c506b3e1 --- /dev/null +++ b/srcpkgs/python3-zipfile-deflate64/template @@ -0,0 +1,16 @@ +# Template file for 'python3-zipfile-deflate64' +pkgname=python3-zipfile-deflate64 +version=0.2.0 +revision=1 +wrksrc="zipfile-deflate64-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools_scm" +makedepends="python3-devel" +depends="python3" +short_desc="Extract Deflate64 ZIP archives with Python's zipfile API" +maintainer="Joel Beckmeyer " +license="Apache-2.0" +homepage="https://github.com/brianhelba/zipfile-deflate64" +distfiles="${PYPI_SITE}/z/zipfile-deflate64/zipfile-deflate64-${version}.tar.gz" +checksum=875a3299de102edf1c17f8cafcc528b1ca80b62dc4814b9cb56867ec59fbfd18 +make_check=no # no tests included From 465e83587a1e8e68a882fc90cb5ccd4772ff3abe Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 5 Apr 2022 12:00:36 -0400 Subject: [PATCH 0949/2369] python3-py7zr: update to 0.18.3. enable tests by ignoring/disabling pytest-benchmark Closes: #36538 [via git-merge-pr] --- srcpkgs/python3-py7zr/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template index 7dcdc642f60..0113cb1dec2 100644 --- a/srcpkgs/python3-py7zr/template +++ b/srcpkgs/python3-py7zr/template @@ -1,20 +1,19 @@ # Template file for 'python3-py7zr' pkgname=python3-py7zr -version=0.16.4 -revision=2 +version=0.18.3 +revision=1 wrksrc="py7zr-${version}" build_style=python3-module +make_check_args="--ignore=tests/test_benchmark.py --noconftest" hostmakedepends="python3-setuptools_scm" depends="python3-texttable python3-pycryptodomex python3-Brotli python3-pyzstd python3-pyppmd python3-pybcj - python3-multivolumefile" + python3-multivolumefile python3-zipfile-deflate64" +checkdepends="python3-pytest python3-pytest-timeout python3-py-cpuinfo $depends" short_desc="7zip in python3 with various compressions, and AES encryption" maintainer="Joel Beckmeyer " license="LGPL-2.1-or-later" homepage="https://github.com/miurahr/py7zr" changelog="https://raw.githubusercontent.com/miurahr/py7zr/master/Changelog.rst" distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz" -checksum=9b584dcd71b0e8c385cc66ae8e370bdbc29d1f07139d5cee770dc221fa338cf9 -# testing requires unpackaged modules: -# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling -make_check=no +checksum=d5bdc81536316f209a3ca4e1ce6e2ef11d8a519d613be47bcdd084bf655f400f From 72dc6cfda90e207121fa60e1a635c10d049e8598 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 16 Mar 2022 23:34:55 +0100 Subject: [PATCH 0950/2369] libqalculate: update to 4.1. previously 'qalculate', rearranged subpackages in a way which makes more sense. --- srcpkgs/libqalculate | 1 - srcpkgs/libqalculate-devel | 2 +- srcpkgs/{qalculate => libqalculate}/template | 27 ++++++++++---------- srcpkgs/qalculate | 1 + 4 files changed, 15 insertions(+), 16 deletions(-) delete mode 120000 srcpkgs/libqalculate rename srcpkgs/{qalculate => libqalculate}/template (59%) create mode 120000 srcpkgs/qalculate diff --git a/srcpkgs/libqalculate b/srcpkgs/libqalculate deleted file mode 120000 index 2cf8203b787..00000000000 --- a/srcpkgs/libqalculate +++ /dev/null @@ -1 +0,0 @@ -qalculate \ No newline at end of file diff --git a/srcpkgs/libqalculate-devel b/srcpkgs/libqalculate-devel index 2cf8203b787..2822077292d 120000 --- a/srcpkgs/libqalculate-devel +++ b/srcpkgs/libqalculate-devel @@ -1 +1 @@ -qalculate \ No newline at end of file +libqalculate \ No newline at end of file diff --git a/srcpkgs/qalculate/template b/srcpkgs/libqalculate/template similarity index 59% rename from srcpkgs/qalculate/template rename to srcpkgs/libqalculate/template index d24fcba07f0..0414d879df4 100644 --- a/srcpkgs/qalculate/template +++ b/srcpkgs/libqalculate/template @@ -1,29 +1,28 @@ -# Template file for 'qalculate' -# NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk" -# and "srcpkgs/qalculate-qt" -pkgname=qalculate -version=3.20.1 -revision=3 -wrksrc="lib${pkgname}-${version}" +# Template file for 'libqalculate' +# NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt' +pkgname=libqalculate +version=4.1.0 +revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config doxygen" makedepends="libxml2-devel cln-devel readline-devel libcurl-devel icu-devel mpfr-devel" -short_desc="Multi-purpose desktop calculator" +short_desc="Multi-purpose desktop calculator library" maintainer="Artem Zhurikhin " license="GPL-2.0-or-later" homepage="https://qalculate.github.io" +changelog="https://qalculate.github.io/news.html" distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz" -checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7 +checksum=d943e5285bdc0b3cd77b8f7a10391d7c753fc19b0ddd48e5d4179decf709d6ff -libqalculate_package() { - short_desc+=" - library files" - replaces="libqalculate-data>=0" +qalculate_package() { + short_desc="Multi-purpose desktop calculator - CLI version" pkg_install() { - vmove usr/lib/libqalculate.so.* - vmove usr/share/qalculate + vmove usr/bin/qalc + vmove usr/share/man/man1/qalc.1 } } + libqalculate-devel_package() { short_desc+=" - development files" depends="libqalculate>=${version}_${revision} libxml2-devel cln-devel gmp-devel mpfr-devel" diff --git a/srcpkgs/qalculate b/srcpkgs/qalculate new file mode 120000 index 00000000000..2822077292d --- /dev/null +++ b/srcpkgs/qalculate @@ -0,0 +1 @@ +libqalculate \ No newline at end of file From 088c0d7e7768c93e795fc9bb9df50aadf59e40c6 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 16 Mar 2022 23:35:05 +0100 Subject: [PATCH 0951/2369] qalculate-gtk: update to 4.1.0. --- srcpkgs/qalculate-gtk/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template index a3857198927..642bd9e5da8 100644 --- a/srcpkgs/qalculate-gtk/template +++ b/srcpkgs/qalculate-gtk/template @@ -1,8 +1,7 @@ # Template file for 'qalculate-gtk' -# NOTE: keep this package synchronized with "srcpkgs/qalculate" -# and "srcpkgs/qalculate-qt" +# NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-qt' pkgname=qalculate-gtk -version=3.20.1 +version=4.1.0 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config glib-devel" @@ -12,5 +11,6 @@ short_desc="Multi-purpose desktop calculator - GTK+ version" maintainer="Artem Zhurikhin " license="GPL-2.0-or-later" homepage="https://qalculate.github.io" +changelog="https://qalculate.github.io/news.html" distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz" -checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136 +checksum=8bab126f4f87e9321572f10e9262bf095c7e72470d4b61e2a173d273673bdeca From d500d03ec1c271c19509482c9f8d08b4485d76b0 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 16 Mar 2022 23:35:06 +0100 Subject: [PATCH 0952/2369] qalculate-qt: update to 4.1.0. Closes: #36179 [via git-merge-pr] --- srcpkgs/qalculate-qt/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template index c960ee0eed6..d1995bdec69 100644 --- a/srcpkgs/qalculate-qt/template +++ b/srcpkgs/qalculate-qt/template @@ -1,8 +1,7 @@ # Template file for 'qalculate-qt' -# NOTE: keep this package synchronized with "srcpkgs/qalculate" -# and "srcpkgs/qalculate-gtk" +# NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-gtk' pkgname=qalculate-qt -version=3.20.1 +version=4.1.0 revision=1 build_style=qmake hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools" @@ -12,5 +11,6 @@ short_desc="Multi-purpose desktop calculator - QT version" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://qalculate.github.io" +changelog="https://qalculate.github.io/news.html" distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz" -checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a +checksum=b54b880750bf75e756f074c1fb6a38dcfe23ad9a53954b83a8a86981c6cb824e From 909583f3bf74db15a0fe218d2c5d797ec37fda09 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Thu, 14 Apr 2022 10:32:13 +0200 Subject: [PATCH 0953/2369] kalendar: update to 1.0.0, add deps, do check --- srcpkgs/kalendar/template | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kalendar/template b/srcpkgs/kalendar/template index 0cdfbd27c3e..6ab59681780 100644 --- a/srcpkgs/kalendar/template +++ b/srcpkgs/kalendar/template @@ -1,6 +1,6 @@ # Template file for 'kalendar' pkgname=kalendar -version=0.4.0 +version=1.0.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake @@ -10,10 +10,17 @@ makedepends="qt5-devel qt5-declarative-devel qt5-quickcontrols2-devel kcalendarcore-devel kconfigwidgets-devel kwindowsystem-devel kcoreaddons-devel kcontacts-devel kitemmodels-devel kxmlgui-devel knotifications-devel kiconthemes-devel kservice-devel akonadi5-devel akonadi-contacts-devel - calendarsupport-devel eventviews-devel" + calendarsupport-devel eventviews-devel qqc2-desktop-style-devel kio-devel" +depends="qqc2-desktop-style kdepim-runtime qt5-location kirigami2" +checkdepends="dbus kdepim-runtime" short_desc="Calendar application using Akonadi" maintainer="Michal Vasilek " license="GPL-3.0-or-later" homepage="https://invent.kde.org/pim/kalendar" distfiles="${KDE_SITE}/kalendar/kalendar-${version}.tar.xz" -checksum=d64b19caab3e1365cce58ae27b76417b515cf3a07777ed1905f82cfbf0d1947a +checksum=ca4e840dc17a4e39111f5fb16bfcab29e34a10b9c840d22b81c52890f0c9fae0 + +do_check() { + cd build + dbus-run-session ctest --output-on-failure --force-new-ctest-process +} From 004d6d4e0c5bd003cdf4cb0e46790a36a6a9ab62 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 14 Apr 2022 14:53:31 +0200 Subject: [PATCH 0954/2369] xsnow: update to 3.5.0. --- srcpkgs/xsnow/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template index a4f26810b13..198362e39dd 100644 --- a/srcpkgs/xsnow/template +++ b/srcpkgs/xsnow/template @@ -1,18 +1,19 @@ # Template file for 'xsnow' pkgname=xsnow -version=3.4.4 +version=3.5.0 revision=1 build_style=gnu-configure build_helper=qemu hostmakedepends="pkg-config" -makedepends="libXext-devel libXpm-devel libXt-devel libX11-devel gtk+3-devel" +makedepends="gsl-devel gtk+3-devel libX11-devel libXext-devel libXpm-devel + libXt-devel" short_desc="Snow for your X11 sessions" maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html" changelog="https://ratrabbit.nl/ratrabbit/xsnow/changelog/index.html" distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz" -checksum=7cf332e40c4ab29164716a617ff22331cfd942d6b29634e12b16dc32dbce8d17 +checksum=884bb7478f839c120ebd031642fdae54b1f700352faac87b509a2ff221a57ff9 pre_build() { if [ "$CROSS_BUILD" ]; then From de0aaf8fb1aa339b6c138615f8441ba631b31be1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 14 Apr 2022 16:32:43 +0200 Subject: [PATCH 0955/2369] mathcomp: mark nocross. --- srcpkgs/mathcomp/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template index 9bdea51dcf4..07332745080 100644 --- a/srcpkgs/mathcomp/template +++ b/srcpkgs/mathcomp/template @@ -12,6 +12,7 @@ license="CECILL-B" homepage="https://github.com/math-comp/math-comp" distfiles="https://github.com/math-comp/math-comp/archive/${pkgname}-${version}.tar.gz" checksum=d259cc95a2f8f74c6aa5f3883858c9b79c6e87f769bde9a415115fa4876ebb31 +nocross="ocaml" do_install() { make install DESTDIR="${DESTDIR}" 'COQLIB:=$(shell coqtop -where)/' From adccfa8e0ae006882484d250280847b94839979e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 14 Apr 2022 17:19:17 +0200 Subject: [PATCH 0956/2369] linux5.10: update to 5.10.111. --- 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 0912977245d..28935f5c70d 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.109 +version=5.10.111 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=18fb22ecb249669ea775474aee614dcb0697cab299068074fd9f0bafa32113dc +checksum=1831b3d8765592ce91e51441bb179d908f6bcfe8c78d03c2bec8c675c4a0ab1a python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR. From 1b2c3962f22e1524ec05d23c03da6c70c0968774 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 14 Apr 2022 17:21:09 +0200 Subject: [PATCH 0957/2369] linux5.15: update to 5.15.34. --- 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 236c406a512..9b2bc0aed3f 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.32 +version=5.15.34 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 - eacc8609dfcecb637f813ef4d2e13f48bdeb6143be929358f3b3cb4254f9c563" + b1a34733513b1080e763532101def34af73b4ca5e4f9b442c3e7d378a1598088" skip_extraction="patch-${version}.xz" python_version=3 From c0c9934abbccc5e036782313f55e1a544e9f6b0b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 14 Apr 2022 17:30:18 +0200 Subject: [PATCH 0958/2369] linux5.16: update to 5.16.20. --- srcpkgs/linux5.16/files/arm64-dotconfig | 3 ++- srcpkgs/linux5.16/files/i386-dotconfig | 4 ++-- srcpkgs/linux5.16/files/ppc64-dotconfig | 5 +++-- srcpkgs/linux5.16/files/ppc64le-dotconfig | 5 +++-- srcpkgs/linux5.16/files/x86_64-dotconfig | 3 ++- srcpkgs/linux5.16/template | 4 ++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/srcpkgs/linux5.16/files/arm64-dotconfig b/srcpkgs/linux5.16/files/arm64-dotconfig index e4b9d7a609a..a5f05f407ac 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.16 Kernel Configuration +# Linux/arm64 5.16.20 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -3277,6 +3277,7 @@ CONFIG_NET_DSA_XRS700X=m CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_QCA8K=m +CONFIG_NET_DSA_REALTEK=m CONFIG_NET_DSA_REALTEK_SMI=m CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m diff --git a/srcpkgs/linux5.16/files/i386-dotconfig b/srcpkgs/linux5.16/files/i386-dotconfig index a7c014b0984..bd1d764ded6 100644 --- a/srcpkgs/linux5.16/files/i386-dotconfig +++ b/srcpkgs/linux5.16/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 5.16.11 Kernel Configuration +# Linux/i386 5.16.20 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2911,6 +2911,7 @@ CONFIG_NET_DSA_XRS700X=m CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_QCA8K=m +CONFIG_NET_DSA_REALTEK=m # CONFIG_NET_DSA_REALTEK_SMI is not set # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set @@ -10031,7 +10032,6 @@ CONFIG_STRIP_ASM_SYMS=y # CONFIG_HEADERS_INSTALL is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y -# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set CONFIG_FRAME_POINTER=y # CONFIG_VMLINUX_MAP is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set diff --git a/srcpkgs/linux5.16/files/ppc64-dotconfig b/srcpkgs/linux5.16/files/ppc64-dotconfig index b204dc8f8a7..b451a42c14c 100644 --- a/srcpkgs/linux5.16/files/ppc64-dotconfig +++ b/srcpkgs/linux5.16/files/ppc64-dotconfig @@ -1,8 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.16.11 Kernel Configuration +# Linux/powerpc 5.16.20 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="powerpc64-linux-musl-gcc (GCC) 10.2.1 20201203" +CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=100201 CONFIG_CLANG_VERSION=0 @@ -2922,6 +2922,7 @@ CONFIG_NET_DSA_XRS700X=m CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_QCA8K=m +CONFIG_NET_DSA_REALTEK=m # CONFIG_NET_DSA_REALTEK_SMI is not set # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set diff --git a/srcpkgs/linux5.16/files/ppc64le-dotconfig b/srcpkgs/linux5.16/files/ppc64le-dotconfig index 564de8e6096..ac8f74360c6 100644 --- a/srcpkgs/linux5.16/files/ppc64le-dotconfig +++ b/srcpkgs/linux5.16/files/ppc64le-dotconfig @@ -1,8 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.16.11 Kernel Configuration +# Linux/powerpc 5.16.20 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="powerpc64le-linux-musl-gcc (GCC) 10.2.1 20201203" +CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=100201 CONFIG_CLANG_VERSION=0 @@ -2801,6 +2801,7 @@ CONFIG_NET_DSA_XRS700X=m CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_QCA8K=m +CONFIG_NET_DSA_REALTEK=m # CONFIG_NET_DSA_REALTEK_SMI is not set # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set diff --git a/srcpkgs/linux5.16/files/x86_64-dotconfig b/srcpkgs/linux5.16/files/x86_64-dotconfig index dbffc48dfc4..b8c5717c6ea 100644 --- a/srcpkgs/linux5.16/files/x86_64-dotconfig +++ b/srcpkgs/linux5.16/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.16.11 Kernel Configuration +# Linux/x86_64 5.16.20 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2968,6 +2968,7 @@ CONFIG_NET_DSA_SJA1105=m # CONFIG_NET_DSA_XRS700X_I2C is not set # CONFIG_NET_DSA_XRS700X_MDIO is not set CONFIG_NET_DSA_QCA8K=m +CONFIG_NET_DSA_REALTEK=m # CONFIG_NET_DSA_REALTEK_SMI is not set # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set diff --git a/srcpkgs/linux5.16/template b/srcpkgs/linux5.16/template index 3f8c094faf2..71cb0aba3ca 100644 --- a/srcpkgs/linux5.16/template +++ b/srcpkgs/linux5.16/template @@ -1,6 +1,6 @@ # Template file for 'linux4.16' pkgname=linux5.16 -version=5.16.18 +version=5.16.20 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 - 3bb88aa87c3f7788ad84ca5cbf3946ed9fbb3fddb9fca2458944fba5ebd2ab16" + 619cd0e39db62b581107cd71dbc1fc52654f94d4306fd02e806ab599f06d0cd8" skip_extraction="patch-${version}.xz" python_version=3 From 7ce971f655928a21bfd3fa9ffe49bf8c2b7746ce Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 14 Apr 2022 14:33:43 -0400 Subject: [PATCH 0959/2369] .github/workflows/build.yaml: only run on changes in srcpkgs/ --- .github/workflows/build.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 503f1e1f4b6..2ae7a3e728f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,9 +2,13 @@ name: Check build on: pull_request: + paths: + - 'srcpkgs/**' push: branches: - 'ci-**' + paths: + - 'srcpkgs/**' jobs: # Lint changed templates. From 5a364062990826bda6f64a816fda9f7816cb34c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 14 Apr 2022 16:18:18 -0300 Subject: [PATCH 0960/2369] tiptop: fix homepage and distfiles --- srcpkgs/tiptop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tiptop/template b/srcpkgs/tiptop/template index 14019890862..93c71833c5a 100644 --- a/srcpkgs/tiptop/template +++ b/srcpkgs/tiptop/template @@ -8,8 +8,8 @@ makedepends="ncurses-devel libxml2-devel" short_desc="Performance monitoring tool using hardware counters" maintainer="Leah Neukirchen " license="GPL-2.0-only" -homepage="http://tiptop.gforge.inria.fr/" -distfiles="http://tiptop.gforge.inria.fr/releases/${pkgname}-${version}.tar.gz" +homepage="https://gitlab.inria.fr/rohou/tiptop" +distfiles="https://files.inria.fr/pacap/tiptop/tiptop-$version.tar.gz" checksum=51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2" From f27382d6ef6c19746925ac7aabaf7dcb2508c06c Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 14 Apr 2022 13:04:10 -0400 Subject: [PATCH 0961/2369] github-cli: add manpages fixes #36689 --- srcpkgs/github-cli/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template index 35576bf8ee8..28c6acf2aaf 100644 --- a/srcpkgs/github-cli/template +++ b/srcpkgs/github-cli/template @@ -1,7 +1,7 @@ # Template file for 'github-cli' pkgname=github-cli version=2.8.0 -revision=1 +revision=2 wrksrc="cli-${version}" build_style=go build_helper=qemu @@ -24,6 +24,7 @@ pre_build() { } post_build() { + CGO_ENABLED=0 GOARCH="" go run script/build.go manpages gh=$(find $GOPATH/bin -name gh) for shell in bash fish zsh; do vtargetrun $gh completion -s $shell > github-cli.$shell @@ -33,6 +34,7 @@ post_build() { post_install() { vlicense LICENSE + vcopy share/man usr/share for shell in bash fish zsh; do vcompletion github-cli.$shell $shell gh done From 80c34fd8738e1d6bbf782e45c4f27e1e29244c94 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 14 Apr 2022 16:34:08 +0200 Subject: [PATCH 0962/2369] pianobar: update to 2022.04.01. --- srcpkgs/pianobar/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template index b7d991fef5a..a9b29e91993 100644 --- a/srcpkgs/pianobar/template +++ b/srcpkgs/pianobar/template @@ -1,6 +1,6 @@ # Template file for 'pianobar' pkgname=pianobar -version=2020.11.28 +version=2022.04.01 revision=1 build_style=gnu-makefile make_build_args="V=1" @@ -11,8 +11,9 @@ short_desc="Free/open-source, console-based client for Pandora radio" maintainer="Ulf " license="MIT" homepage="https://6xq.net/pianobar/" -distfiles="https://github.com/PromyLOPh/pianobar/archive/${version}.tar.gz" -checksum=f8cdd564e2a12ee0740c54e8bc4028b328e9afb041d9ea40bcb762e08034b9e9 +changelog="https://raw.githubusercontent.com/PromyLOPh/pianobar/master/ChangeLog" +distfiles="https://6xq.net/pianobar/pianobar-${version}.tar.bz2" +checksum=1670b28865a8b82a57bb6dfea7f16e2fa4145d2f354910bb17380b32c9b94763 post_install() { vlicense COPYING From 0b21b0a0b22117160646512a3e3cebfd4933964d Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Wed, 13 Apr 2022 10:56:22 +0200 Subject: [PATCH 0963/2369] go: update to 1.18.1. --- .../fix-ppc64le-startup-detection.patch | 81 ------------------- srcpkgs/go/template | 4 +- 2 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 srcpkgs/go/patches/fix-ppc64le-startup-detection.patch diff --git a/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch b/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch deleted file mode 100644 index 6cc2ab33724..00000000000 --- a/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 946167906ed8646c433c257b074a10e01f0a7dab Mon Sep 17 00:00:00 2001 -From: "Paul E. Murphy" -Date: Tue, 22 Mar 2022 11:52:02 -0500 -Subject: [PATCH] runtime: make static/dynamic startup detection work with musl - on ppc64le - -The glibc loader explicitly sets the first doubleword on the stack (R1) -to $0 to indicate it was dynamically loaded. - -An ELFv2 ABI compliant loader will set R3/R4 to argc/argv when starting -the process, and R13 to TLS. musl is not compliant. Instead it passes -argc/argv like the kernel, but R3/R4 are in an undefined state and R13 -is valid. - -With the knowledge above, the startup code can be modified to -dynamically handle all three cases when linked internally. - -Fixes #51787 - -Change-Id: I5de33862c161900d9161817388bbc13a65fdc69c -Reviewed-on: https://go-review.googlesource.com/c/go/+/394654 -Reviewed-by: Cherry Mui -Run-TryBot: Paul Murphy -TryBot-Result: Gopher Robot -Trust: Paul Murphy -Trust: Lynn Boger ---- - src/runtime/rt0_linux_ppc64le.s | 32 +++++++++++++++++++++----------- - 1 file changed, 21 insertions(+), 11 deletions(-) - -diff --git a/src/runtime/rt0_linux_ppc64le.s b/src/runtime/rt0_linux_ppc64le.s -index 4f7c6e6c99f6..66f7e7b22a41 100644 ---- a/go/src/runtime/rt0_linux_ppc64le.s -+++ b/go/src/runtime/rt0_linux_ppc64le.s -@@ -147,25 +147,35 @@ TEXT _main<>(SB),NOSPLIT,$-8 - // In a statically linked binary, the stack contains argc, - // argv as argc string pointers followed by a NULL, envv as a - // sequence of string pointers followed by a NULL, and auxv. -- // There is no TLS base pointer. -+ // The TLS pointer should be initialized to 0. - // -- // In a dynamically linked binary, r3 contains argc, r4 -- // contains argv, r5 contains envp, r6 contains auxv, and r13 -+ // In an ELFv2 compliant dynamically linked binary, R3 contains argc, -+ // R4 contains argv, R5 contains envp, R6 contains auxv, and R13 - // contains the TLS pointer. - // -- // Figure out which case this is by looking at r4: if it's 0, -- // we're statically linked; otherwise we're dynamically -- // linked. -- CMP R0, R4 -- BNE dlink -- -- // Statically linked -+ // When loading via glibc, the first doubleword on the stack points -+ // to NULL a value. (that is *(uintptr)(R1) == 0). This is used to -+ // differentiate static vs dynamicly linked binaries. -+ // -+ // If loading with the musl loader, it doesn't follow the ELFv2 ABI. It -+ // passes argc/argv similar to the linux kernel, R13 (TLS) is -+ // initialized, and R3/R4 are undefined. -+ MOVD (R1), R12 -+ CMP R0, R12 -+ BEQ tls_and_argcv_in_reg -+ -+ // Arguments are passed via the stack (musl loader or a static binary) - MOVD 0(R1), R3 // argc - ADD $8, R1, R4 // argv -+ -+ // Did the TLS pointer get set? If so, don't change it (e.g musl). -+ CMP R0, R13 -+ BNE tls_and_argcv_in_reg -+ - MOVD $runtime·m0+m_tls(SB), R13 // TLS - ADD $0x7000, R13 - --dlink: -+tls_and_argcv_in_reg: - BR main(SB) - - TEXT main(SB),NOSPLIT,$-8 diff --git a/srcpkgs/go/template b/srcpkgs/go/template index 58f0b0fc248..44423832896 100644 --- a/srcpkgs/go/template +++ b/srcpkgs/go/template @@ -1,6 +1,6 @@ # Template file for 'go' pkgname=go -version=1.18 +version=1.18.1 revision=1 create_wrksrc=yes build_wrksrc=go @@ -11,7 +11,7 @@ license="BSD-3-Clause" homepage="https://go.dev/" changelog="https://go.dev/doc/devel/release.html" distfiles="https://go.dev/dl/go${version}.src.tar.gz" -checksum=38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6 +checksum=efd43e0f1402e083b73a03d444b7b6576bb4c539ac46208b63a916b69aca4088 nostrip=yes noverifyrdeps=yes From 5f74db02567aee8140f78cefa6f12304154b1a3c Mon Sep 17 00:00:00 2001 From: blackbeard420 Date: Mon, 11 Apr 2022 18:03:40 -0400 Subject: [PATCH 0964/2369] kitty: update to 0.25.0 --- srcpkgs/kitty/template | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template index 2c012bece18..7f4507a6f0a 100644 --- a/srcpkgs/kitty/template +++ b/srcpkgs/kitty/template @@ -1,6 +1,6 @@ # Template file for 'kitty' pkgname=kitty -version=0.24.4 +version=0.25.0 revision=1 pycompile_dirs="usr/lib/kitty" hostmakedepends="pkg-config python3 wayland-devel wayland-protocols" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://sw.kovidgoyal.net/kitty/" changelog="https://sw.kovidgoyal.net/kitty/changelog.html" distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz" -checksum=d8cd0b4967bb61e2a3427b57cb9f45f278813fb6b986f97b370c8c50aa058d18 +checksum=1a2c81bf46687d4141d3182dc984bbc0330791705af152199e5b5815dae933de python_version=3 LDFLAGS+=" -Wl,-z,stack-size=2097152" @@ -27,10 +27,6 @@ do_build() { if [ "$CROSS_BUILD" ]; then CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}" fi - case "$XBPS_TARGET_MACHINE" in - *-musl) - vsed -e 's/pow10/pow_10/g' -i kitty/parser.c;; - esac python3 setup.py linux-package --prefix=${DESTDIR}/usr --update-check-interval=0 --verbose } From 4339eab3d8c273d8309a9b9ef0031500ed05b6fb Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Tue, 12 Apr 2022 02:44:55 +0200 Subject: [PATCH 0965/2369] budgie-desktop: update to 10.6.1. --- srcpkgs/budgie-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template index a65c395c994..02d90c307ea 100644 --- a/srcpkgs/budgie-desktop/template +++ b/srcpkgs/budgie-desktop/template @@ -1,6 +1,6 @@ # Template file for 'budgie-desktop' pkgname=budgie-desktop -version=10.6 +version=10.6.1 revision=1 build_style=meson build_helper=gir @@ -18,7 +18,7 @@ maintainer="Orphaned " license="GPL-2.0-only, LGPL-2.1-only" homepage="https://github.com/BuddiesOfBudgie/budgie-desktop" distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz" -checksum=ba297a10b547e6d7bf164406750b5c5dae98a7524978b30b4ad3cba9624def9e +checksum=b320cfdff8fab37286f0ca6669ef2907f551fa2a38cabd764cbf7b9e6181e166 budgie-desktop-devel_package() { short_desc+=" - development files" From 74d5a9eb5b4c4c145fe7ea13ad29e148d077d050 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Tue, 12 Apr 2022 02:44:58 +0200 Subject: [PATCH 0966/2369] budgie-screensaver: update to 5.0.1. --- srcpkgs/budgie-screensaver/patches/musl.patch | 12 ------------ srcpkgs/budgie-screensaver/template | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/budgie-screensaver/patches/musl.patch diff --git a/srcpkgs/budgie-screensaver/patches/musl.patch b/srcpkgs/budgie-screensaver/patches/musl.patch deleted file mode 100644 index 6f5c265f83a..00000000000 --- a/srcpkgs/budgie-screensaver/patches/musl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/subprocs.c b/src/subprocs.c -index a378658..ba37650 100644 ---- a/src/subprocs.c -+++ b/src/subprocs.c -@@ -36,6 +36,7 @@ - # define fork vfork - #endif /* VMS */ - -+#define _POSIX_SOURCE - #include /* for the signal names */ - - #include diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template index b877543d33a..16ed0e384e8 100644 --- a/srcpkgs/budgie-screensaver/template +++ b/srcpkgs/budgie-screensaver/template @@ -1,6 +1,6 @@ # Template file for 'budgie-screensaver' pkgname=budgie-screensaver -version=5.0 +version=5.0.1 revision=1 build_style=meson hostmakedepends="pkg-config intltool glib-devel" @@ -10,4 +10,4 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="https://github.com/BuddiesOfBudgie/budgie-screensaver" distfiles="https://github.com/BuddiesOfBudgie/budgie-screensaver/releases/download/v${version}/budgie-screensaver-v${version}.tar.xz" -checksum=611969a9f53e5d3148cad7445e95c94bfff6ea61c2f339969ecb5d9b51f6b871 +checksum=81fe6cccd938d9ef8d6cd46bbbad654ab8f7d108bbf1f96e9bf89b3ed5bafa0a From 7281c31aa546fe4ea8e255acc5d33ed4ec5de5e4 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Sat, 9 Apr 2022 20:54:53 -0400 Subject: [PATCH 0967/2369] libnma: update to 1.8.38. --- srcpkgs/libnma/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template index 148ae51d6de..9d2a53119d0 100644 --- a/srcpkgs/libnma/template +++ b/srcpkgs/libnma/template @@ -1,6 +1,6 @@ # Template file for 'libnma' pkgname=libnma -version=1.8.36 +version=1.8.38 revision=1 build_style=meson build_helper="gir" @@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/libnma" changelog="https://gitlab.gnome.org/GNOME/libnma/-/raw/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d99415f4cdff642230019ec5cdd2b1fbf1ec550a8ae865219f75482a642b7b7a +checksum=5ed93eae18456ff5a8a4f408178c1ee198dc8d3a46c65f9075b101916e64e8b4 replaces="libnm-gtk>=0" if [ "$CROSS_BUILD" ]; then From 038ce32010e7148a02ea7f936df6c374150dbeba Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 14 Apr 2022 23:47:14 +0200 Subject: [PATCH 0968/2369] ocaml-findlib: remove ocamlbuild/META, it's part of ocamlbuild. --- srcpkgs/ocaml-findlib/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template index 04be12e64f5..20c08327167 100644 --- a/srcpkgs/ocaml-findlib/template +++ b/srcpkgs/ocaml-findlib/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-findlib' pkgname=ocaml-findlib version=1.9.3 -revision=1 +revision=2 wrksrc="findlib-${version}" build_style=configure configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man" @@ -21,4 +21,6 @@ do_install() { make prefix="$DESTDIR" install vbin src/findlib/ocamlfind_opt vlicense LICENSE + + rm -rf ${DESTDIR}/usr/lib/ocaml/ocamlbuild } From c16bf1e4feffc55c4698c18eeefe4b004091a407 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 14 Apr 2022 19:30:06 -0400 Subject: [PATCH 0969/2369] .github/workflows/stale.yml: increase operations limit By setting `ascending` to `true`, the most stale issues and PRs will be caught first. By increasing the operations limit from the default (30) to 250, more stale issues/PRs will be caught each run, increasing the speed of the burndown. --- .github/workflows/stale.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 91ac19e4f63..9dbb76cd2a3 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -17,3 +17,5 @@ jobs: days-before-stale: 90 days-before-close: 14 exempt-all-assignees: true + ascending: true + operations-per-run: 250 From b9ceee011efa4db36dd8c302409f490ed4fe3344 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 10 Apr 2022 04:47:01 +0200 Subject: [PATCH 0970/2369] .github/workflows/stale.yml: don't tag issues with request label as stale Closes: #36609 [via git-merge-pr] --- .github/workflows/stale.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 9dbb76cd2a3..160897fedef 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -19,3 +19,4 @@ jobs: exempt-all-assignees: true ascending: true operations-per-run: 250 + exempt-issue-labels: request From 08f4883ad87f2b0f662a2c94af9ceb6747907f1c Mon Sep 17 00:00:00 2001 From: akierig Date: Thu, 14 Apr 2022 15:37:27 -0500 Subject: [PATCH 0971/2369] Signal-Desktop: update to 5.39.0. --- 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 05be4f346a9..c02e6864b8a 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.38.0 +version=5.39.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=da693cf3fd7535f8569bbdc6f64387e274daab49c2798cacc804c784e401115d +checksum=0e5f237bd2db6f9e32d58d28c99727bdd069cffb6abf9c68b62c30c8a6ca83d9 nostrip_files="signal-desktop" post_extract() { From 8a00ac62f1f827f97c057387e21de4bc5387e5d4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Apr 2022 10:05:48 +0200 Subject: [PATCH 0972/2369] New package: Mousai-0.6.6 --- srcpkgs/Mousai/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/Mousai/template diff --git a/srcpkgs/Mousai/template b/srcpkgs/Mousai/template new file mode 100644 index 00000000000..1b97a385155 --- /dev/null +++ b/srcpkgs/Mousai/template @@ -0,0 +1,13 @@ +# Template file for 'Mousai' +pkgname=Mousai +version=0.6.6 +revision=1 +build_style=meson +hostmakedepends="python3 gettext glib-devel pkg-config" +depends="python3-gobject python3-requests libadwaita" +short_desc="Identify any songs in seconds" +maintainer="Michal Vasilek " +license="GPL-3.0-or-later" +homepage="https://github.com/SeaDve/Mousai" +distfiles="https://github.com/SeaDve/Mousai/archive/refs/tags/v$version.tar.gz" +checksum=a1e5cb29ad16405abcab8b5e1eec82fc170e5f535f8c55b57f18c80acb18a0ae From 23627745a6fbf7a07cadf5de200f2d706d8420b7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 8 Apr 2022 15:36:44 +0200 Subject: [PATCH 0973/2369] openssh: update to 9.0p1. --- srcpkgs/openssh/patches/ppoll_time64.patch | 26 ---------------------- srcpkgs/openssh/template | 6 ++--- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/openssh/patches/ppoll_time64.patch diff --git a/srcpkgs/openssh/patches/ppoll_time64.patch b/srcpkgs/openssh/patches/ppoll_time64.patch deleted file mode 100644 index 199361c6902..00000000000 --- a/srcpkgs/openssh/patches/ppoll_time64.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 -From: Darren Tucker -Date: Sat, 26 Feb 2022 14:06:14 +1100 -Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox. - -Should fix sandbox violations on (some? at least i386 and armhf) 32bit -Linux platforms. Patch from chutzpahu at gentoo.org and cjwatson at -debian.org via bz#3396. ---- - sandbox-seccomp-filter.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index 2e065ba3ed..4ce80cb2a7 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_ppoll - SC_ALLOW(__NR_ppoll), - #endif -+#ifdef __NR_ppoll_time64 -+ SC_ALLOW(__NR_ppoll_time64), -+#endif - #ifdef __NR_poll - SC_ALLOW(__NR_poll), - #endif diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index fe446fc131d..02a2dec35f4 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,7 +1,7 @@ # Template file for 'openssh' pkgname=openssh -version=8.9p1 -revision=2 +version=9.0p1 +revision=1 build_style=gnu-configure configure_args="--datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody @@ -23,7 +23,7 @@ maintainer="Leah Neukirchen " license="BSD-2-Clause, ISC" homepage="https://www.openssh.com" distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz" -checksum=fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7 +checksum=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd" make_dirs="/var/chroot/ssh 0755 root root" From cbd4e5d216921cc3025e40c15d4f0af6d99d87ff Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 8 Apr 2022 15:36:36 +0200 Subject: [PATCH 0974/2369] gnome-ssh-askpass: update to 9.0p1. --- srcpkgs/gnome-ssh-askpass/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template index 558193ab2a1..692556f6836 100644 --- a/srcpkgs/gnome-ssh-askpass/template +++ b/srcpkgs/gnome-ssh-askpass/template @@ -1,7 +1,7 @@ # Template file for 'gnome-ssh-askpass' pkgname=gnome-ssh-askpass -version=8.9p1 -revision=2 +version=9.0p1 +revision=1 wrksrc="openssh-${version}" build_wrksrc="contrib" build_style=gnu-makefile @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause, BSD-2-Clause" homepage="http://www.openssh.org" distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz" -checksum=fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7 +checksum=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a alternatives=" ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass From 57ee40db20e5fbf9b83fbd0793d1c327acafc891 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 11 Feb 2022 21:28:12 +0100 Subject: [PATCH 0975/2369] bctoolbox: update to 5.1.17. --- srcpkgs/bctoolbox/template | 4 ++-- srcpkgs/bctoolbox/update | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/bctoolbox/update diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template index 128235dc7d3..3d6b1bf167a 100644 --- a/srcpkgs/bctoolbox/template +++ b/srcpkgs/bctoolbox/template @@ -1,6 +1,6 @@ # Template file for 'bctoolbox' pkgname=bctoolbox -version=5.0.55 +version=5.1.17 revision=1 build_style=cmake configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-only" homepage="https://gitlab.linphone.org/BC/public/bctoolbox" distfiles="https://gitlab.linphone.org/BC/public/bctoolbox/-/archive/${version}/bctoolbox-${version}.tar.gz" -checksum=64409771baf978f826eb052c0349fd9350b5aef8fd4135c988627dc6489ace81 +checksum=cbfea331dde994122a8bf04f05c03da6592aa53612f1da93eca3932d5460f231 bctoolbox-devel_package() { depends="bctoolbox-${version}_${revision}" diff --git a/srcpkgs/bctoolbox/update b/srcpkgs/bctoolbox/update new file mode 100644 index 00000000000..d81a9df130e --- /dev/null +++ b/srcpkgs/bctoolbox/update @@ -0,0 +1 @@ +site=https://gitlab.linphone.org/BC/public/bctoolbox/-/tags From a0e636270cf0a2d4fbff30992452ed7d4ce76e05 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 11 Feb 2022 21:28:23 +0100 Subject: [PATCH 0976/2369] belcard: update to 5.1.12. --- srcpkgs/belcard/template | 4 ++-- srcpkgs/belcard/update | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/belcard/update diff --git a/srcpkgs/belcard/template b/srcpkgs/belcard/template index 292ec35f189..1d117f953d9 100644 --- a/srcpkgs/belcard/template +++ b/srcpkgs/belcard/template @@ -1,6 +1,6 @@ # Template file for 'belcard' pkgname=belcard -version=5.0.55 +version=5.1.12 revision=1 build_style=cmake configure_args="-DENABLE_STATIC=FALSE -DENABLE_UNIT_TESTS=FALSE" @@ -10,7 +10,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://linphone.org" distfiles="https://gitlab.linphone.org/BC/public/belcard/-/archive/${version}/belcard-${version}.tar.gz" -checksum=6b8f6188630eb5aeec671c8c9d417aa37b04a2d3b0b0944866bcbf6a3b2baec2 +checksum=529c6cc7edbc505495a850713020eb4d09a6aaa8d19983322f68ef0705081efe belcard-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/belcard/update b/srcpkgs/belcard/update new file mode 100644 index 00000000000..b9a3c00d7d7 --- /dev/null +++ b/srcpkgs/belcard/update @@ -0,0 +1 @@ +site=https://gitlab.linphone.org/BC/public/belcard/-/tags From 31bfbce471b149136eae1311ea9a66d9ba444d60 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 11 Feb 2022 21:29:05 +0100 Subject: [PATCH 0977/2369] belle-sip: update to 5.1.12. --- srcpkgs/belle-sip/template | 4 ++-- srcpkgs/belle-sip/update | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/belle-sip/update diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template index d1d46c11bd3..ccf66d4b985 100644 --- a/srcpkgs/belle-sip/template +++ b/srcpkgs/belle-sip/template @@ -1,6 +1,6 @@ # Template file for 'belle-sip' pkgname=belle-sip -version=5.0.55 +version=5.1.12 revision=1 build_style=cmake configure_args="-DANTLR3_JAR_PATH=/usr/share/java/antlr3.jar -DENABLE_STRICT=OFF @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://www.linphone.org" distfiles="https://gitlab.linphone.org/BC/public/belle-sip/-/archive/${version}/belle-sip-${version}.tar.gz" -checksum=f97e1dd8ab8eea4363187128d4ccf0223701c6efcd1e382226da25bd62ca3b24 +checksum=1a827db2d42eadd6825dc12f8c413ca3cf925e8084e5821d94f66d49b5c6f2db belle-sip-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/belle-sip/update b/srcpkgs/belle-sip/update new file mode 100644 index 00000000000..f1c298cb081 --- /dev/null +++ b/srcpkgs/belle-sip/update @@ -0,0 +1 @@ +site=https://gitlab.linphone.org/BC/public/belle-sip/-/tags From 6c7d8b4222008f48699053cde5fe26ca2203b816 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 11 Feb 2022 21:29:08 +0100 Subject: [PATCH 0978/2369] belr: update to 5.1.12. --- srcpkgs/belr/template | 4 ++-- srcpkgs/belr/update | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/belr/update diff --git a/srcpkgs/belr/template b/srcpkgs/belr/template index 2e93a5492da..299dc179a41 100644 --- a/srcpkgs/belr/template +++ b/srcpkgs/belr/template @@ -1,6 +1,6 @@ # Template file for 'belr' pkgname=belr -version=5.0.55 +version=5.1.12 revision=1 build_style=cmake configure_args="-DENABLE_STATIC=FALSE -DENABLE_TESTS=NO" @@ -10,7 +10,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://www.linphone.org" distfiles="https://gitlab.linphone.org/BC/public/belr/-/archive/${version}/belr-${version}.tar.gz" -checksum=6ef5ea9b730d5206cf278f6dd0dc0e3c87ab61a222f08cee50148b6868f6023b +checksum=77f86470e12f8371a77c9b911705b585f97e0b983c31f33d529d3d19dc97fb56 belr-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/belr/update b/srcpkgs/belr/update new file mode 100644 index 00000000000..88120719007 --- /dev/null +++ b/srcpkgs/belr/update @@ -0,0 +1 @@ +site=https://gitlab.linphone.org/BC/public/belr/-/tags From 96cd2048971936195c06f8eb73e469cfb97d5b1d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 11 Feb 2022 21:29:15 +0100 Subject: [PATCH 0979/2369] bzrtp: update to 5.1.12. --- srcpkgs/bzrtp/template | 4 ++-- srcpkgs/bzrtp/update | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/bzrtp/update diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template index 8f0b9823668..463d7f82ec9 100644 --- a/srcpkgs/bzrtp/template +++ b/srcpkgs/bzrtp/template @@ -1,6 +1,6 @@ # Template file for 'bzrtp' pkgname=bzrtp -version=5.0.55 +version=5.1.12 revision=1 build_style=cmake configure_args="-DENABLE_TESTS=FALSE -DENABLE_STATIC=FALSE" @@ -10,7 +10,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://www.linphone.org" distfiles="https://gitlab.linphone.org/BC/public/bzrtp/-/archive/${version}/bzrtp-${version}.tar.gz" -checksum=53e94486fdb2bece03ebe0daf49b5d476cab977babec364cd04407aca25be4c2 +checksum=c1b44db05ab6d4df7a29d53c6aaff9a6cd79ce73d46d406f01d737e3c4cfb01e bzrtp-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/bzrtp/update b/srcpkgs/bzrtp/update new file mode 100644 index 00000000000..31738d52c44 --- /dev/null +++ b/srcpkgs/bzrtp/update @@ -0,0 +1 @@ +site=https://gitlab.linphone.org/BC/public/bzrtp/-/tags From aab646fa5afa4dee4afa69d25798a98224db0fa7 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 11 Feb 2022 21:29:19 +0100 Subject: [PATCH 0980/2369] linphone: update to 5.1.21. --- srcpkgs/linphone/template | 7 +++---- srcpkgs/linphone/update | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/linphone/update diff --git a/srcpkgs/linphone/template b/srcpkgs/linphone/template index c98b8c7e950..d1af2d791c3 100644 --- a/srcpkgs/linphone/template +++ b/srcpkgs/linphone/template @@ -1,10 +1,9 @@ # Template file for 'linphone' pkgname=linphone -version=5.0.56 -# 5.0.57 requires an unreleased mediastreamer2 +version=5.1.21 revision=1 -build_style="cmake" wrksrc="liblinphone-${version}" +build_style="cmake" configure_args="-DENABLE_STRICT=FALSE -DENABLE_ADVANCED_IM=FALSE -DENABLE_DB_STORAGE=FALSE -DENABLE_LIME=NO -DENABLE_LIME_X3DH=NO -DENABLE_UNIT_TESTS=NO @@ -21,7 +20,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://www.linphone.org" distfiles="https://gitlab.linphone.org/BC/public/liblinphone/-/archive/${version}/liblinphone-${version}.tar.gz" -checksum=56bc789cda2507644477c1fad84169b3a39b9c26bad859763c6be66fb705c2db +checksum=1bf7e6642bd36c8002291eda62109daac4c8f7125952e874b95969b02ab43405 pre_build() { echo "#define MS2_GIT_VERSION=unknown" > coreapi/gitversion.h diff --git a/srcpkgs/linphone/update b/srcpkgs/linphone/update new file mode 100644 index 00000000000..ccc0e69a4e3 --- /dev/null +++ b/srcpkgs/linphone/update @@ -0,0 +1,2 @@ +pkgname=liblinphone +site=https://gitlab.linphone.org/BC/public/liblinphone/-/tags From 181e3d1b34482f505216031898f64eeca6602e1d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 11 Feb 2022 21:29:26 +0100 Subject: [PATCH 0981/2369] mediastreamer: update to 5.1.20. --- srcpkgs/mediastreamer/template | 4 ++-- srcpkgs/mediastreamer/update | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/mediastreamer/update diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template index ba8b3dcc19e..42f7cf4824e 100644 --- a/srcpkgs/mediastreamer/template +++ b/srcpkgs/mediastreamer/template @@ -1,6 +1,6 @@ # Template file for 'mediastreamer' pkgname=mediastreamer -version=5.0.55 +version=5.1.20 revision=1 wrksrc="mediastreamer2-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://www.linphone.org/technical-corner/mediastreamer2" distfiles="https://gitlab.linphone.org/BC/public/mediastreamer2/-/archive/${version}/mediastreamer2-${version}.tar.gz" -checksum=4c15baa786f637c630afa7989ebdd8c8f9d424548cb02400e03fb5fe2d61e1ee +checksum=f3f86284d48610c58cc5c104a56f392039495f3aded64b180c904877f42ecdb0 mediastreamer-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/mediastreamer/update b/srcpkgs/mediastreamer/update new file mode 100644 index 00000000000..9fcd24e296b --- /dev/null +++ b/srcpkgs/mediastreamer/update @@ -0,0 +1,2 @@ +pkgname=mediastreamer2 +site=https://gitlab.linphone.org/BC/public/mediastreamer2/-/tags From 816812e22311d26c84c481c4ca0e25a062b6aa93 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 11 Feb 2022 21:29:36 +0100 Subject: [PATCH 0982/2369] ortp: update to 5.1.12. --- srcpkgs/ortp/template | 4 ++-- srcpkgs/ortp/update | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/ortp/update diff --git a/srcpkgs/ortp/template b/srcpkgs/ortp/template index f8b08f2b9be..f5092b2eeff 100644 --- a/srcpkgs/ortp/template +++ b/srcpkgs/ortp/template @@ -1,6 +1,6 @@ # Template file for 'ortp' pkgname=ortp -version=5.0.55 +version=5.1.12 revision=1 build_style=cmake configure_args="-DENABLE_STATIC=OFF" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://www.linphone.org/technical-corner/ortp" distfiles="https://gitlab.linphone.org/BC/public/ortp/-/archive/${version}/ortp-${version}.tar.gz" -checksum=2851d825f06ecfeeac921b73d7a932e2c8fcdbf49c83b09cd600db3e8025bc28 +checksum=dcd1b7c4876e8ca808c8c827329e90997bda51e8646399d426b529cddd727ee4 ortp-devel_package() { depends="bctoolbox-devel ortp-${version}_${revision}" diff --git a/srcpkgs/ortp/update b/srcpkgs/ortp/update new file mode 100644 index 00000000000..b1ec91983b2 --- /dev/null +++ b/srcpkgs/ortp/update @@ -0,0 +1 @@ +site=https://gitlab.linphone.org/BC/public/ortp/-/tags From 3f139f433db28247d53a1b9ab5ffb38f33af4e61 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 11 Feb 2022 22:17:06 +0100 Subject: [PATCH 0983/2369] linphone-desktop: update to 4.4.1. --- srcpkgs/linphone-desktop/template | 6 +++--- srcpkgs/linphone-desktop/update | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/linphone-desktop/template b/srcpkgs/linphone-desktop/template index 8699388aa9f..44d72fc1466 100644 --- a/srcpkgs/linphone-desktop/template +++ b/srcpkgs/linphone-desktop/template @@ -1,20 +1,20 @@ # Template file for 'linphone-desktop' pkgname=linphone-desktop -version=4.3.2 +version=4.4.1 revision=1 build_wrksrc="linphone-app" # The root cmake is glue code for their vendored libs build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools qt5-declarative" makedepends="bctoolbox-devel belcard-devel belle-sip-devel linphone-devel mediastreamer-devel qt5-declarative-devel qt5-quickcontrols2-devel - qt5-svg-devel qt5-tools-devel" + qt5-svg-devel qt5-tools-devel qt5-webview-devel" depends="qt5>=5.9_1 qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects" short_desc="Linphone qt desktop" maintainer="John " license="GPL-3.0-or-later" homepage="https://www.linphone.org/" distfiles="https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/${version}/linphone-desktop-${version}.tar.gz" -checksum=dc7580816b5c289d9a4f21e9b3392a9b4a1a947c64ffbd6af504c8c01e3af111 +checksum=589e8ccc82e64fb1b7dbdc70b841240e02686079896d02bbe7dff782cc30bf8f replaces="linphone-gui>=0" CFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\"" CXXFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\"" diff --git a/srcpkgs/linphone-desktop/update b/srcpkgs/linphone-desktop/update index 7510d1a49c2..aaa59859d2f 100644 --- a/srcpkgs/linphone-desktop/update +++ b/srcpkgs/linphone-desktop/update @@ -1 +1 @@ -pkgname=linphoneqt +site=https://gitlab.linphone.org/BC/public/linphone-desktop/-/tags From bd598448b8d00156f0be03203c779e45268bde76 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 15 Apr 2022 16:19:20 +0200 Subject: [PATCH 0984/2369] lollypop: update to 1.4.33. --- srcpkgs/lollypop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template index 569c4e29177..02145a66a80 100644 --- a/srcpkgs/lollypop/template +++ b/srcpkgs/lollypop/template @@ -1,6 +1,6 @@ # Template file for 'lollypop' pkgname=lollypop -version=1.4.30 +version=1.4.33 revision=1 build_style=meson hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config" @@ -14,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=393c3ed6431026b3214f380b7aa74ee31b054203855f7f5c928b1d25ad1b8ef5 +checksum=b1f806b3b844400131c7dc1bfad46843fc9ffcfbbf1fdeeab6bc348a74803529 From 049616636ead3476687b71f615f9193099ad3282 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 15 Apr 2022 16:44:11 +0200 Subject: [PATCH 0985/2369] cloud-hypervisor: update to 23.0. --- srcpkgs/cloud-hypervisor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template index 3ecf069b2b0..c94d8e45e3f 100644 --- a/srcpkgs/cloud-hypervisor/template +++ b/srcpkgs/cloud-hypervisor/template @@ -1,6 +1,6 @@ # Template file for 'cloud-hypervisor' pkgname=cloud-hypervisor -version=22.1 +version=23.0 revision=1 archs="aarch64* x86_64*" build_style=cargo @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="Apache-2.0, BSD-3-Clause" homepage="https://github.com/cloud-hypervisor/cloud-hypervisor" distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz" -checksum=73675ed730b5f23c4ce585918acff7496dcb585a4b91a672981c485bc7d94c37 +checksum=80f058d3ae00e23f4762fcc1c7091f22a14801c5913298f54fbfb8591da52ba9 post_install() { vlicense LICENSE-APACHE From 6cce52a5c7e3de2b884d5bb795470828e1dda731 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 15 Apr 2022 16:46:43 +0200 Subject: [PATCH 0986/2369] libavif: update to 0.10.1. --- common/shlibs | 2 +- srcpkgs/libavif/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index fc5a031056f..0d2a9fcc9b8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4069,7 +4069,7 @@ libstemmer.so.2 libstemmer-2.1.0_1 libdecor-0.so.0 libdecor-0.1.0_1 libprimecount.so.7 primecount-7.2_1 libprimesieve.so.9 primesieve-7.7_1 -libavif.so.13 libavif-0.9.3_1 +libavif.so.14 libavif-0.10.1_1 libkdumpfile.so.9 libkdumpfile-0.4.1_1 libamd.so.2 SuiteSparse-5.10.1_1 libcholmod.so.3 SuiteSparse-5.10.1_1 diff --git a/srcpkgs/libavif/template b/srcpkgs/libavif/template index 8b62eac56af..6b210252322 100644 --- a/srcpkgs/libavif/template +++ b/srcpkgs/libavif/template @@ -1,6 +1,6 @@ # Template file for 'libavif' pkgname=libavif -version=0.9.3 +version=0.10.1 revision=1 build_style=cmake configure_args="-DAVIF_BUILD_APPS=ON -DAVIF_BUILD_GDK_PIXBUF=ON @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="BSD-2-Clause" homepage="https://github.com/AOMediaCodec/libavif" distfiles="https://github.com/AOMediaCodec/libavif/archive/refs/tags/v${version}.tar.gz" -checksum=bcd9a1f57f982a9615eb7e2faf87236dc88eb1d0c886f3471c7440ead605060d +checksum=66e82854ceb84a3e542bc140a343bc90e56c68f3ecb4fff63e636c136ed9a05e post_install() { vlicense LICENSE From e8553134eaa151190228b5f33bf9308f90be6adb Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 15 Apr 2022 16:47:01 +0200 Subject: [PATCH 0987/2369] efl: rebuild for libavif-0.10.1_1. --- srcpkgs/efl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index b7267b1905f..714080ade25 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,7 +1,7 @@ # Template file for 'efl' pkgname=efl version=1.26.2 -revision=1 +revision=2 build_style=meson configure_args=" -Dbuild-examples=false From ecfbf48feefc5f466c7bf82ead3516a62e46282b Mon Sep 17 00:00:00 2001 From: yopito Date: Sat, 21 Aug 2021 17:52:02 +0200 Subject: [PATCH 0988/2369] memtest86+: switch to upstream binary source built package has been reported to fail with more than 4GB of RAM. Closes: #11691 --- .../patches/00.memtest86+-5.01-no-scp.patch | 10 -- .../01.memtest86+-5.01-no-optimization.patch | 18 ---- .../02.memtest86+-5.01-compile-fix.patch | 27 ----- .../03.memtest86+-5.01-crash-fix.patch | 100 ------------------ .../04.memtest86+-5.01-fgnu89-inline.patch | 15 --- ....memtest86+-5.01-fno-stack-protector.patch | 11 -- srcpkgs/memtest86+/template | 20 ++-- 7 files changed, 7 insertions(+), 194 deletions(-) delete mode 100644 srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch delete mode 100644 srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch delete mode 100644 srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch delete mode 100644 srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch delete mode 100644 srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch delete mode 100644 srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch diff --git a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch b/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch deleted file mode 100644 index d998fc5a418..00000000000 --- a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -21,7 +21,6 @@ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ - - - all: clean memtest.bin memtest -- scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus - - # Link it statically once so I know I don't have undefined - # symbols and then link it dynamically so I have full diff --git a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch b/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch deleted file mode 100644 index d6453654a2b..00000000000 --- a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch +++ /dev/null @@ -1,18 +0,0 @@ -Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix -these patches were taken from Mageia -upstream report containing link to the patches: -http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later - -Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ - ---- a/Makefile~ 2014-01-08 01:30:11.355900076 +0000 -+++ b/Makefile 2014-01-08 01:31:19.387555469 +0000 -@@ -12,7 +12,7 @@ - AS=as -32 - CC=gcc - --CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ -+CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ - -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector - - OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ diff --git a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch b/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch deleted file mode 100644 index 348d5b152d2..00000000000 --- a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix -these patches were taken from Mageia -upstream report containing link to the patches: -http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later - -Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ - ---- a/io.h~ 2013-08-10 02:01:58.000000000 +0000 -+++ b/io.h 2014-01-08 01:29:12.404465515 +0000 -@@ -31,7 +31,7 @@ - */ - - #define __OUT1(s,x) \ --extern inline void __out##s(unsigned x value, unsigned short port) { -+static inline void __out##s(unsigned x value, unsigned short port) { - - #define __OUT2(s,s1,s2) \ - __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" -@@ -43,7 +43,7 @@ - __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } - - #define __IN1(s) \ --extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; -+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; - - #define __IN2(s,s1,s2) \ - __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" diff --git a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch b/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch deleted file mode 100644 index 56f40d7bcfa..00000000000 --- a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch +++ /dev/null @@ -1,100 +0,0 @@ -Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix -these patches were taken from Mageia -upstream report containing link to the patches: -http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later - -Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ - ---- a/controller.c -+++ b/controller.c -@@ -2,6 +2,8 @@ - * MemTest86+ V5 Specific code (GPL V2.0) - * By Samuel DEMEULEMEESTER, sdemeule@memtest.org - * http://www.canardpc.com - http://www.memtest.org -+ * -+ * Edited by David McInnis Oct 4, 2014 - */ - - //#include "defs.h" -@@ -292,7 +294,7 @@ static void setup_nhm(void) - - /* First, locate the PCI bus where the MCH is located */ - -- for(i = 0; i < sizeof(possible_nhm_bus); i++) { -+ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { - pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); - pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); - vid &= 0xFFFF; -@@ -327,7 +329,7 @@ static void setup_nhm32(void) - ctrl.mode = ECC_NONE; - - /* First, locate the PCI bus where the MCH is located */ -- for(i = 0; i < sizeof(possible_nhm_bus); i++) { -+ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { - pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); - pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); - vid &= 0xFFFF; -@@ -1424,7 +1426,7 @@ static void poll_fsb_amd64(void) { - unsigned long dramchr; - float clockratio; - double dramclock; -- unsigned int dummy[3]; -+ unsigned int dummy[4]; - int ram_type; - - float coef = 10; -@@ -2851,13 +2853,13 @@ static void poll_timings_nf4ie(void) { - - static void poll_timings_i875(void) { - -- ulong dev6, dev62; -+ ulong dev6; - ulong temp; - float cas; - int rcd, rp, ras, chan; - long *ptr, *ptr2; - -- pci_conf_read( 0, 6, 0, 0x40, 4, &dev62); -+ pci_conf_read( 0, 6, 0, 0x40, 4, &dev6); - ptr2=(long*)(dev6+0x68); - - /* Read the MMR Base Address & Define the pointer */ ---- a/init.c -+++ b/init.c -@@ -7,6 +7,8 @@ - * - * Released under version 2 of the Gnu Public License. - * By Chris Brady -+ * -+ * Edited by David McInnis October 4, 2014 - */ - - -@@ -914,7 +916,6 @@ void cpu_type(void) - default: - cprint(0, COL_MID, "Unknown Intel"); - break; -- break; - } - - } ---- a/main.c -+++ b/main.c -@@ -422,7 +422,7 @@ void test_start(void) - //initialise_cpus(); - btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0); - /* Draw the screen and get system information */ -- init(); -+ init(); - - /* Set defaults and initialize variables */ - set_defaults(); -@@ -737,7 +737,7 @@ void test_start(void) - /* Do the same test for each CPU */ - if (++cpu_sel >= act_cpus) - { -- cpu_sel = 0; -+ cpu_sel = 0; - next_test(); - } else { - continue; diff --git a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch b/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch deleted file mode 100644 index d044e72094c..00000000000 --- a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch +++ /dev/null @@ -1,15 +0,0 @@ -"Fix compilation of inline assembly with new gcc" - -Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ - ---- a/Makefile -+++ b/Makefile -@@ -13,7 +13,7 @@ AS=as -32 - CC=gcc - - CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ -- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -+ -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -fgnu89-inline - - OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ - config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \ diff --git a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch b/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch deleted file mode 100644 index ddb3d596868..00000000000 --- a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile 2019-03-29 16:41:29.629879497 +0100 -+++ b/Makefile 2019-03-29 16:41:55.351031244 +0100 -@@ -53,7 +53,7 @@ - $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c - - test.o: test.c -- $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c -+ $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector test.c - - random.o: random.c - $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template index c4850769d62..ecffaa62c40 100644 --- a/srcpkgs/memtest86+/template +++ b/srcpkgs/memtest86+/template @@ -1,26 +1,20 @@ # Template file for 'memtest86+' pkgname=memtest86+ version=5.01 -revision=5 -archs="i686 x86_64" -short_desc="Advanced Memory Diagnostic Tool" +revision=6 +archs="i686* x86_64*" +short_desc="Advanced Memory Diagnostic Tool - upstream binary" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.memtest.org" -distfiles="http://www.memtest.org/download/${version}/${pkgname}-${version}.tar.gz" -checksum=142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 +distfiles="https://www.memtest.org/download/${version}/memtest86+-${version}.bin.gz" +checksum=78f6625b093de69537d99ed68e35b2a9e5d666504cb2533affab1967bd888fc8 +create_wrksrc=yes nostrip=yes noverifyrdeps=yes -if [ "$XBPS_MACHINE" = "x86_64" ]; then - makedepends="gcc-multilib" -fi - -do_build() { - make -} do_install() { - vinstall memtest.bin 755 boot memtest86+ + vinstall memtest86+-5.01.bin 755 boot memtest86+ vinstall ${FILESDIR}/20_memtest86+ 755 etc/grub.d } From aeda392de8b8616188ee214ef5e0a8eca6cc4a83 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Fri, 15 Apr 2022 11:44:22 -0400 Subject: [PATCH 0989/2369] neomutt: update to 20220415. --- srcpkgs/neomutt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index 3e703630df8..75fadd569cb 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,6 +1,6 @@ # Template file for 'neomutt' pkgname=neomutt -version=20220408 +version=20220415 revision=1 create_wrksrc=true build_wrksrc="${pkgname}-${version}" @@ -22,7 +22,7 @@ homepage="https://neomutt.org/" _test_files_hash=dc9fb32a701eb9dce4fda93c27da1d9b5be23231 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz" -checksum="bb138adb09b1f164fe690749e991a5505bf4f50b6ad478ffb085c609d5617cc7 +checksum="84982cb4c2fed63e90d71fab45faa90738bfc58050430606135cbd8924d94682 bda7c7f9f7bac528398040a46da505f906913a86f5db65cdbab743d595ee2947" python_version=3 From 565d587294c9218f38d44c6a782330e3e7df6528 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 15 Apr 2022 18:17:14 +0200 Subject: [PATCH 0990/2369] chromium: update to 100.0.4896.127. --- srcpkgs/chromium/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 96b34227a32..f655d29f3ba 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=100.0.4896.60 +version=100.0.4896.127 revision=1 archs="i686* x86_64* aarch64* armv7l* ppc64le*" short_desc="Google's attempt at creating a safer, faster, and more stable browser" @@ -9,7 +9,7 @@ maintainer="Duncaen " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc +checksum=4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d lib32disabled=yes From cb488810ab82597d04c374f4be550cc01bef731b Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 15 Apr 2022 17:45:38 +0200 Subject: [PATCH 0991/2369] libqalculate: update to 4.1.1. --- srcpkgs/libqalculate/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libqalculate/template b/srcpkgs/libqalculate/template index 0414d879df4..f0f03656d4c 100644 --- a/srcpkgs/libqalculate/template +++ b/srcpkgs/libqalculate/template @@ -1,7 +1,7 @@ # Template file for 'libqalculate' # NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt' pkgname=libqalculate -version=4.1.0 +version=4.1.1 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config doxygen" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://qalculate.github.io" changelog="https://qalculate.github.io/news.html" distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz" -checksum=d943e5285bdc0b3cd77b8f7a10391d7c753fc19b0ddd48e5d4179decf709d6ff +checksum=b5611a91293be40fbe8723a81937e25ffb54e6ad6e60f282d044ed92f2d97002 qalculate_package() { short_desc="Multi-purpose desktop calculator - CLI version" From 81e968595ee3b12dd46089980d68bddeac4414f2 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 15 Apr 2022 17:45:44 +0200 Subject: [PATCH 0992/2369] qalculate-qt: update to 4.1.1. --- srcpkgs/qalculate-qt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template index d1995bdec69..0f1ac9de856 100644 --- a/srcpkgs/qalculate-qt/template +++ b/srcpkgs/qalculate-qt/template @@ -1,7 +1,7 @@ # Template file for 'qalculate-qt' # NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-gtk' pkgname=qalculate-qt -version=4.1.0 +version=4.1.1 revision=1 build_style=qmake hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools" @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://qalculate.github.io" changelog="https://qalculate.github.io/news.html" distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz" -checksum=b54b880750bf75e756f074c1fb6a38dcfe23ad9a53954b83a8a86981c6cb824e +checksum=463e506331e8a49ec5ee355fe74da25d7a5cae945f5228081603be1f6d31f49f From ada5870e30ee25a1f8d5f07b2130159d243a88ae Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 15 Apr 2022 17:45:46 +0200 Subject: [PATCH 0993/2369] qalculate-gtk: update to 4.1.1. --- srcpkgs/qalculate-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template index 642bd9e5da8..ca1ab2e7dd9 100644 --- a/srcpkgs/qalculate-gtk/template +++ b/srcpkgs/qalculate-gtk/template @@ -1,7 +1,7 @@ # Template file for 'qalculate-gtk' # NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-qt' pkgname=qalculate-gtk -version=4.1.0 +version=4.1.1 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config glib-devel" @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://qalculate.github.io" changelog="https://qalculate.github.io/news.html" distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz" -checksum=8bab126f4f87e9321572f10e9262bf095c7e72470d4b61e2a173d273673bdeca +checksum=8bf7dee899ba480e4f82c70cb374ed1229da28f7d3b9b475a089630a8eeb32e5 From 6f28dd09da925b52f1128b5ec6ed24f8f75a1257 Mon Sep 17 00:00:00 2001 From: lane-brain Date: Wed, 13 Apr 2022 23:00:33 -0400 Subject: [PATCH 0994/2369] New package: libgccjit-10.2.1_pre1 --- common/shlibs | 1 + srcpkgs/libgccjit-devel | 1 + srcpkgs/libgccjit/files/gccgo-musl.patch | 1 + srcpkgs/libgccjit/files/libgccjit-musl.patch | 63 ++++++ srcpkgs/libgccjit/files/libgnarl-musl.patch | 1 + srcpkgs/libgccjit/files/libssp-musl.patch | 1 + srcpkgs/libgccjit/patches | 1 + srcpkgs/libgccjit/template | 216 +++++++++++++++++++ srcpkgs/libgccjit/update | 2 + 9 files changed, 287 insertions(+) create mode 120000 srcpkgs/libgccjit-devel create mode 120000 srcpkgs/libgccjit/files/gccgo-musl.patch create mode 100644 srcpkgs/libgccjit/files/libgccjit-musl.patch create mode 120000 srcpkgs/libgccjit/files/libgnarl-musl.patch create mode 120000 srcpkgs/libgccjit/files/libssp-musl.patch create mode 120000 srcpkgs/libgccjit/patches create mode 100644 srcpkgs/libgccjit/template create mode 100644 srcpkgs/libgccjit/update diff --git a/common/shlibs b/common/shlibs index 0d2a9fcc9b8..ae4bb44c57a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -59,6 +59,7 @@ libitm.so.1 libitm-4.7.3_1 liblto_plugin.so.0 gcc-4.7.3_1 libgcc_s.so.1 libgcc-4.4.0_1 libgo.so.16 libgo-10.2.0_1 +libgccjit.so.0 libgccjit-10.2.1pre1_1 libperl.so.5.34 perl-5.34.0_1 libgmp.so.10 gmp-5.0.1_1 libgmpxx.so.4 gmpxx-6.0.0_2 diff --git a/srcpkgs/libgccjit-devel b/srcpkgs/libgccjit-devel new file mode 120000 index 00000000000..ad6b9f7639f --- /dev/null +++ b/srcpkgs/libgccjit-devel @@ -0,0 +1 @@ +libgccjit \ No newline at end of file diff --git a/srcpkgs/libgccjit/files/gccgo-musl.patch b/srcpkgs/libgccjit/files/gccgo-musl.patch new file mode 120000 index 00000000000..a093af85773 --- /dev/null +++ b/srcpkgs/libgccjit/files/gccgo-musl.patch @@ -0,0 +1 @@ +../../gcc/files/gccgo-musl.patch \ No newline at end of file diff --git a/srcpkgs/libgccjit/files/libgccjit-musl.patch b/srcpkgs/libgccjit/files/libgccjit-musl.patch new file mode 100644 index 00000000000..d2ed16928c8 --- /dev/null +++ b/srcpkgs/libgccjit/files/libgccjit-musl.patch @@ -0,0 +1,63 @@ +diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c +index 5bccf591a..35f5e35ef 100644 +--- a/gcc/jit/jit-playback.c ++++ b/gcc/jit/jit-playback.c +@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License + along with GCC; see the file COPYING3. If not see + . */ + ++#include ++ + #include "config.h" + #include "system.h" + #include "coretypes.h" +@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3. If not see + #include "diagnostic.h" + #include "stmt.h" + +-#include +- + #include "jit-playback.h" + #include "jit-result.h" + #include "jit-builtins.h" +diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c +index a237d574f..5785e3269 100644 +--- a/gcc/jit/jit-recording.c ++++ b/gcc/jit/jit-recording.c +@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License + along with GCC; see the file COPYING3. If not see + . */ + ++#include ++ + #include "config.h" + #include "system.h" + #include "coretypes.h" +@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3. If not see + #include "pretty-print.h" + #include "toplev.h" + +-#include +- + #include "jit-builtins.h" + #include "jit-recording.h" + #include "jit-playback.h" +diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c +index f9c33c63c..75f21d275 100644 +--- a/gcc/jit/libgccjit.c ++++ b/gcc/jit/libgccjit.c +@@ -18,13 +18,13 @@ You should have received a copy of the GNU General Public License + along with GCC; see the file COPYING3. If not see + . */ + ++#include + #include "config.h" + #include "system.h" + #include "coretypes.h" + #include "timevar.h" + #include "typed-splay-tree.h" + #include "cppbuiltin.h" +-#include + + #include "libgccjit.h" + #include "jit-recording.h" diff --git a/srcpkgs/libgccjit/files/libgnarl-musl.patch b/srcpkgs/libgccjit/files/libgnarl-musl.patch new file mode 120000 index 00000000000..33ccc9789f9 --- /dev/null +++ b/srcpkgs/libgccjit/files/libgnarl-musl.patch @@ -0,0 +1 @@ +../../gcc/files/libgnarl-musl.patch \ No newline at end of file diff --git a/srcpkgs/libgccjit/files/libssp-musl.patch b/srcpkgs/libgccjit/files/libssp-musl.patch new file mode 120000 index 00000000000..37a7489360f --- /dev/null +++ b/srcpkgs/libgccjit/files/libssp-musl.patch @@ -0,0 +1 @@ +../../gcc/files/libssp-musl.patch \ No newline at end of file diff --git a/srcpkgs/libgccjit/patches b/srcpkgs/libgccjit/patches new file mode 120000 index 00000000000..c42218ef09d --- /dev/null +++ b/srcpkgs/libgccjit/patches @@ -0,0 +1 @@ +../gcc/patches \ No newline at end of file diff --git a/srcpkgs/libgccjit/template b/srcpkgs/libgccjit/template new file mode 100644 index 00000000000..6f1d6256dcd --- /dev/null +++ b/srcpkgs/libgccjit/template @@ -0,0 +1,216 @@ +# Template file for 'libgccjit' +# Revbump libtool when updating gcc, since it hardcodes some internal compiler paths +# which use the version number. + +pkgname=libgccjit +# we are using a 10-stable git snapshot alpine is using in order +# to get regression fixes not yet incorporate into a stable release +# it should be possible to switch back to stable with 10.3 or 11 +version=10.2.1pre1 +revision=1 +_patchver="${version%pre*}" +_minorver="${_patchver%.*}" +_majorver="${_minorver%.*}" +_gmp_version=6.2.0 +_mpfr_version=4.1.0 +_mpc_version=1.1.0 +_isl_version=0.21 +wrksrc=gcc-${version/pre/_pre} +short_desc="Just-In-Time Compilation library for GCC" +maintainer="Lane Biocini " +homepage="https://gcc.gnu.org" +license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" +# *-musl builders have issues fetching https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz +distfiles=" + https://dev.alpinelinux.org/~nenolod/gcc-${version/pre/_pre}.tar.xz + https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz + ${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz + ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz + ${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2" +checksum="772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590 + 258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526 + 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f + 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e + d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859" +nopie=yes +lib32disabled=yes +makedepends="zlib-devel" +hostmakedepends="tar texinfo perl flex" +depends="gcc" +checkdepends="dejagnu" + +post_extract() { + mv ${XBPS_BUILDDIR}/gmp-${_gmp_version} ${wrksrc}/gmp + mv ${XBPS_BUILDDIR}/mpfr-${_mpfr_version} ${wrksrc}/mpfr + mv ${XBPS_BUILDDIR}/mpc-${_mpc_version} ${wrksrc}/mpc + mv ${XBPS_BUILDDIR}/isl-${_isl_version} ${wrksrc}/isl +} + +pre_configure() { + if [ "$XBPS_TARGET_LIBC" = musl ]; then + for p in ${FILESDIR}/*-musl.patch; do + patch -p1 -i $p + done + fi +} + +do_configure() { + # Define triplet for gcc build target + case "$XBPS_TARGET_MACHINE" in + i686) _target_triplet="i686-pc-linux-gnu";; + i686-musl) _target_triplet="i686-linux-musl";; + x86_64) _target_triplet="x86_64-unknown-linux-gnu";; + x86_64-musl) _target_triplet="x86_64-linux-musl";; + armv5tel) _target_triplet="arm-linux-gnueabi";; + armv5tel-musl) _target_triplet="arm-linux-musleabi";; + armv6l) _target_triplet="arm-linux-gnueabihf";; + armv7l) _target_triplet="armv7l-linux-gnueabihf";; + armv6l-musl) _target_triplet="arm-linux-musleabihf";; + armv7l-musl) _target_triplet="armv7l-linux-musleabihf";; + aarch64) _target_triplet="aarch64-linux-gnu";; + aarch64-musl) _target_triplet="aarch64-linux-musl";; + ppc) _target_triplet="powerpc-linux-gnu";; + ppc-musl) _target_triplet="powerpc-linux-musl";; + ppcle) _target_triplet="powerpcle-linux-gnu";; + ppcle-musl) _target_triplet="powerpcle-linux-musl";; + ppc64le) _target_triplet="powerpc64le-linux-gnu";; + ppc64le-musl) _target_triplet="powerpc64le-linux-musl";; + ppc64) _target_triplet="powerpc64-linux-gnu";; + ppc64-musl) _target_triplet="powerpc64-linux-musl";; + mips-musl) _target_triplet="mips-linux-musl";; + mipshf-musl) _target_triplet="mips-linux-muslhf";; + mipsel-musl) _target_triplet="mipsel-linux-musl";; + mipselhf-musl) _target_triplet="mipsel-linux-muslhf";; + esac + + local _langs _args _hash + _hash=gnu + case "$XBPS_TARGET_MACHINE" in + mipselhf-musl) _args+=" --with-arch=mips32r2 --with-float=hard"; _hash=sysv;; + mipsel-musl) _args+=" --with-arch=mips32r2 --with-float=soft"; _hash=sysv;; + mipshf-musl) _args+=" --with-arch=mips32r2 --with-float=hard";; + mips-musl) _args+=" --with-arch=mips32r2 --with-float=soft";; + armv5*) _args+=" --with-arch=armv5te --with-float=soft";; + armv6l*) _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard";; + armv7l*) _args+=" --with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard";; + aarch64*) _args+=" --with-arch=armv8-a";; + ppc64le*) _args+=" --with-abi=elfv2 --enable-secureplt --enable-targets=powerpcle-linux";; + ppc64*) _args+=" --with-abi=elfv2 --enable-secureplt --enable-targets=powerpc-linux";; + ppc*) _args+=" --enable-secureplt";; + esac + + # fix: unknown long double size, cannot define BFP_FMT + case "$XBPS_TARGET_MACHINE" in + ppc*-musl) _args+=" --disable-decimal-float";; + esac + + if [ "$CROSS_BUILD" ]; then + export CC_FOR_TARGET="$CC" + export GCC_FOR_TARGET="$CC" + export CXX_FOR_TARGET="$CXX" + + _args+=" --host=$XBPS_CROSS_TRIPLET" + _args+=" --with-build-sysroot=${XBPS_CROSS_BASE}" + elif [ -z "$CHROOT_READY" ]; then + export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib${XBPS_TARGET_WORDSIZE}" + _args+=" --build=${_target_triplet}" + else + _args+=" --build=${_target_triplet}" + fi + + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + _args+=" --disable-gnu-unique-object" + _args+=" --disable-symvers" + _args+=" libat_cv_have_ifunc=no" + else + _args+=" --enable-gnu-unique-object" + fi + + case "$XBPS_TARGET_MACHINE" in + ppc*) _args+=" --disable-vtable-verify";; + *) _args+=" --enable-vtable-verify";; + esac + + export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" + export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" + + # Disable explicit -fno-PIE, gcc will figure this out itself. + export CFLAGS="${CFLAGS//-fno-PIE/}" + export CXXFLAGS="${CXXFLAGS//-fno-PIE/}" + export LDFLAGS="${LDFLAGS//-no-pie/}" + + # Needs explicit -fPIC + export CFLAGS+=" -fPIC" + export CXXFLAGS+=" -fPIC" + + _args+=" --prefix=/usr" + _args+=" --mandir=/usr/share/man" + _args+=" --infodir=/usr/share/info" + _args+=" --libexecdir=/usr/lib${XBPS_TARGET_WORDSIZE}" + _args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}" + _args+=" --enable-threads=posix" + _args+=" --enable-__cxa_atexit" + _args+=" --disable-multilib" + _args+=" --with-system-zlib" + _args+=" --enable-shared" + _args+=" --enable-lto" + _args+=" --enable-plugins" + _args+=" --enable-linker-build-id" + _args+=" --disable-werror" + _args+=" --disable-nls" + _args+=" --enable-default-pie" + _args+=" --enable-default-ssp" + _args+=" --enable-checking=release" + _args+=" --disable-libstdcxx-pch" + _args+=" --with-isl" + _args+=" --with-linker-hash-style=$_hash" + _args+=" --disable-sjlj-exceptions" + _args+=" --disable-target-libiberty" + + # libgccjit compilation specific + _args+=" --enable-host-shared" + _args+=" --disable-bootstrap" + _args+=" --disable-libquadmath" + _args+=" --disable-libquadmath-support" + _args+=" --disable-libgomp" + _args+=" --disable-liboffloadmic" + _args+=" --disable-libada" + _args+=" --disable-libvtv" + _args+=" --disable-libsanitizer" + _args+=" --with-bugurl='https://github.com/void-linux/void-packages/issues'" + + mkdir -p build + cd build + + # If we are checking packages, we need to have c++ compiled + [ -z "$XBPS_CHECK_PKGS" ] && _langs="jit" || _langs="jit,c++" + _args+=" --enable-languages=${_langs}" + CONFIG_SHELL=/bin/bash \ + ${wrksrc}/configure ${_args} +} + +do_build() { + make -C build ${makejobs} +} + +do_check() { + make -C build/gcc check-jit RUNTESTFLAGS="-v -v -v" +} + +do_install() { + make -C build/gcc DESTDIR=${DESTDIR} jit.install-common jit.install-info +} + +post_install() { + vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION +} + +libgccjit-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/*.so + vmove usr/share/info + } +} diff --git a/srcpkgs/libgccjit/update b/srcpkgs/libgccjit/update new file mode 100644 index 00000000000..fb8dd58f204 --- /dev/null +++ b/srcpkgs/libgccjit/update @@ -0,0 +1,2 @@ +site="https://gcc.gnu.org/releases.html" +pattern="GCC \K[\d.]+(?=\<)" From f6461971ae93f2a89bfd1d720907ed3740bfb87d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 14 Apr 2022 15:54:16 +0200 Subject: [PATCH 0995/2369] emacs: enable support for native-compilation. This enables native-compilation and provides precompiled elisp files for emacs-x11 and emacs-gtk3. The plain console emacs stays without support for native compilation to keep it lean, as native-compilation pulls in libgccjit (27MB) and gcc (172MB + deps) as well as emacs-common-eln (15MB). On slow machines, native compilation can be disabled by setting (setq comp-deferred-compilation nil) in your .emacs. --- srcpkgs/emacs-common-eln | 1 + srcpkgs/emacs/template | 46 +++++++++++++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 10 deletions(-) create mode 120000 srcpkgs/emacs-common-eln diff --git a/srcpkgs/emacs-common-eln b/srcpkgs/emacs-common-eln new file mode 120000 index 00000000000..a7642dd168d --- /dev/null +++ b/srcpkgs/emacs-common-eln @@ -0,0 +1 @@ +emacs \ No newline at end of file diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template index 644e44cf4d0..aae0e3f6d22 100644 --- a/srcpkgs/emacs/template +++ b/srcpkgs/emacs/template @@ -1,13 +1,14 @@ # Template file for 'emacs' pkgname=emacs version=28.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-file-notification=inotify --with-modules $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png) $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick) $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt) - $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)" + $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp) + $(vopt_with nativecomp native-compilation)" hostmakedepends="pkg-config tar" makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel dbus-devel acl-devel @@ -17,7 +18,8 @@ makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel $(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel) $(vopt_if sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel) $(vopt_if json jansson-devel) $(vopt_if harfbuzz harfbuzz-devel) - $(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel)" + $(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel) + $(vopt_if nativecomp libgccjit-devel)" depends="emacs-common-${version}_${revision}" short_desc="GNU Emacs editor" maintainer="Leah Neukirchen " @@ -29,12 +31,16 @@ nocross=yes nopie=yes # Package build options -build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp" -desc_option_xpm="Enable support for XPM images" -desc_option_sound="Enable support for sound" +build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp nativecomp" +desc_option_cairo="Enable support for drawing with Cairo" +desc_option_gmp="Enable support for big numbers using GMP" +desc_option_json="Enable support for native JSON parsing" desc_option_m17n="Enable support for m17n multilingual text processing" -build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n png sound - svg tiff xml xpm" +desc_option_nativecomp="Enable support for native compilation" +desc_option_sound="Enable support for sound" +desc_option_xpm="Enable support for XPM images" +build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n nativecomp + png sound svg tiff xml xpm" pre_configure() { # Just configuring in different directories results in @@ -47,7 +53,8 @@ pre_configure() { do_configure() { cd $wrksrc/nox - ./configure --without-x $(vopt_with dbus) ${configure_args} + ./configure --without-x $(vopt_with dbus) ${configure_args} \ + --without-native-compilation cd $wrksrc/x11 ./configure --with-x-toolkit=athena --without-toolkit-scroll-bars \ @@ -60,12 +67,13 @@ do_configure() { do_build() { make ${makejobs} -C nox - make ${makejobs} -C x11 + make ${makejobs} -C x11 $(vopt_if nativecomp NATIVE_FULL_AOT=1) make ${makejobs} -C gtk3 } do_install() { make DESTDIR=$DESTDIR -C ${wrksrc}/nox install + make DESTDIR=$DESTDIR -C ${wrksrc}/x11 install-eln rm -f ${DESTDIR}/usr/bin/ctags rm -f ${DESTDIR}/usr/lib/systemd/user/emacs.service rm -f ${DESTDIR}/usr/share/man/man1/ctags.1* @@ -84,8 +92,23 @@ emacs-common_package() { } } +emacs-common-eln_package() { + short_desc+=" - common precompiled elisp" + if [ -z "$build_option_nativecomp" ]; then + build_style=meta + fi + pkg_install() { + if [ "$build_option_nativecomp" ]; then + vmove usr/lib/emacs + fi + } +} + emacs-x11_package() { depends="emacs-common-${version}_${revision}" + if [ "$build_option_nativecomp" ]; then + depends+=" emacs-common-eln-${version}_${revision}" + fi provides="emacs-${version}_${revision}" replaces="emacs>=0" short_desc+=" - X11 version" @@ -99,6 +122,9 @@ emacs-x11_package() { emacs-gtk3_package() { depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme" + if [ "$build_option_nativecomp" ]; then + depends+=" emacs-common-eln-${version}_${revision}" + fi provides="emacs-${version}_${revision}" replaces="emacs>=0" short_desc+=" - GTK+3 version" From e6c65a974e9d5fbe88f6c66f4facd996bb31df4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 16 Apr 2022 23:00:09 +0700 Subject: [PATCH 0996/2369] chroot-git: update to 2.35.2. --- srcpkgs/chroot-git/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index 08a014086a9..94331ab41a8 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -1,6 +1,6 @@ # Template file for 'chroot-git' pkgname=chroot-git -version=2.35.1 +version=2.35.2 revision=1 bootstrap=yes wrksrc="git-${version}" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://git-scm.com/" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=d768528e6443f65a203036266f1ca50f9d127ba89751e32ead37117ed9191080 +checksum=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3 if [ "$CHROOT_READY" ]; then checkdepends="perl gnupg" From 583ba4556723599962b211e0c4ea5ecf0edd9219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 16 Apr 2022 22:59:30 +0700 Subject: [PATCH 0997/2369] git: update to 2.35.2. --- srcpkgs/git/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 929472b982b..865c814fca5 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,6 +1,6 @@ # Template file for 'git' pkgname=git -version=2.35.1 +version=2.35.2 revision=1 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto" makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel" @@ -14,7 +14,7 @@ license="GPL-2.0-only" homepage="https://git-scm.com/" changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=d768528e6443f65a203036266f1ca50f9d127ba89751e32ead37117ed9191080 +checksum=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3 replaces="git-perl>=0" register_shell=/usr/bin/git-shell python_version=3 From 6f74471d6f4dce490e6767ff6ce545d8b7b32341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 16 Apr 2022 23:05:27 +0700 Subject: [PATCH 0998/2369] chroot-git: update to 2.35.3. --- srcpkgs/chroot-git/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index 94331ab41a8..18efb65c4f6 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -1,6 +1,6 @@ # Template file for 'chroot-git' pkgname=chroot-git -version=2.35.2 +version=2.35.3 revision=1 bootstrap=yes wrksrc="git-${version}" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://git-scm.com/" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3 +checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2 if [ "$CHROOT_READY" ]; then checkdepends="perl gnupg" From e385193d22953620f2419231d5e9200138ce38c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 16 Apr 2022 23:05:31 +0700 Subject: [PATCH 0999/2369] git: update to 2.35.3. --- srcpkgs/git/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 865c814fca5..8b05a0f5802 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,6 +1,6 @@ # Template file for 'git' pkgname=git -version=2.35.2 +version=2.35.3 revision=1 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto" makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel" @@ -14,7 +14,7 @@ license="GPL-2.0-only" homepage="https://git-scm.com/" changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3 +checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2 replaces="git-perl>=0" register_shell=/usr/bin/git-shell python_version=3 From e8c5062adf61debde0be191a56c0239a793984fb Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 10 Apr 2022 20:17:28 +0300 Subject: [PATCH 1000/2369] checkbashisms: update to 2.22.1. --- srcpkgs/checkbashisms/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/checkbashisms/template b/srcpkgs/checkbashisms/template index 69f7fbfbb7d..1da339030ff 100644 --- a/srcpkgs/checkbashisms/template +++ b/srcpkgs/checkbashisms/template @@ -1,6 +1,6 @@ # Template file for 'checkbashisms' pkgname=checkbashisms -version=2.21.7 +version=2.22.1 revision=1 wrksrc="devscripts-${version}" depends="perl" @@ -11,7 +11,7 @@ license="GPL-2.0-or-later" homepage="https://tracker.debian.org/pkg/devscripts" changelog="https://salsa.debian.org/debian/devscripts/-/raw/master/debian/changelog" distfiles="${DEBIAN_SITE}/main/d/devscripts/devscripts_${version}.tar.xz" -checksum=b03ae9a3214ea5492aa51519deddf0d46f8e59996b66aea1ed0dc1a1c5466ab1 +checksum=35dd5e6029d27be35b96e8c6e38b8aa6fba791a21371dac2de0f8cdee5fe33d5 pre_install() { vsed -i "s|###VERSION###|${version}|" scripts/checkbashisms.pl From 27f3057db6bf942c85b41f714f06f776458d56d7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 16 Apr 2022 18:31:18 +0200 Subject: [PATCH 1001/2369] emacs: remove emacs-common-eln, put eln into binary packages. The builds have different hashes, so the .eln files cannot be shared. --- srcpkgs/emacs-common-eln | 1 - srcpkgs/emacs/template | 28 +++++----------------------- 2 files changed, 5 insertions(+), 24 deletions(-) delete mode 120000 srcpkgs/emacs-common-eln diff --git a/srcpkgs/emacs-common-eln b/srcpkgs/emacs-common-eln deleted file mode 120000 index a7642dd168d..00000000000 --- a/srcpkgs/emacs-common-eln +++ /dev/null @@ -1 +0,0 @@ -emacs \ No newline at end of file diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template index aae0e3f6d22..b3130b1198d 100644 --- a/srcpkgs/emacs/template +++ b/srcpkgs/emacs/template @@ -1,7 +1,7 @@ # Template file for 'emacs' pkgname=emacs version=28.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-file-notification=inotify --with-modules $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png) @@ -68,12 +68,11 @@ do_configure() { do_build() { make ${makejobs} -C nox make ${makejobs} -C x11 $(vopt_if nativecomp NATIVE_FULL_AOT=1) - make ${makejobs} -C gtk3 + make ${makejobs} -C gtk3 $(vopt_if nativecomp NATIVE_FULL_AOT=1) } do_install() { make DESTDIR=$DESTDIR -C ${wrksrc}/nox install - make DESTDIR=$DESTDIR -C ${wrksrc}/x11 install-eln rm -f ${DESTDIR}/usr/bin/ctags rm -f ${DESTDIR}/usr/lib/systemd/user/emacs.service rm -f ${DESTDIR}/usr/share/man/man1/ctags.1* @@ -84,6 +83,7 @@ do_install() { emacs-common_package() { short_desc+=" - common files" + replaces="emacs-common-eln>=0" pkg_install() { vmove usr/share/emacs vmove usr/share/man @@ -92,23 +92,8 @@ emacs-common_package() { } } -emacs-common-eln_package() { - short_desc+=" - common precompiled elisp" - if [ -z "$build_option_nativecomp" ]; then - build_style=meta - fi - pkg_install() { - if [ "$build_option_nativecomp" ]; then - vmove usr/lib/emacs - fi - } -} - emacs-x11_package() { depends="emacs-common-${version}_${revision}" - if [ "$build_option_nativecomp" ]; then - depends+=" emacs-common-eln-${version}_${revision}" - fi provides="emacs-${version}_${revision}" replaces="emacs>=0" short_desc+=" - X11 version" @@ -116,15 +101,12 @@ emacs-x11_package() { make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/x11 install rm -f ${PKGDESTDIR}/usr/bin/ctags rm -rf ${PKGDESTDIR}/usr/share - rm -rf ${PKGDESTDIR}/usr/lib + rm -rf ${PKGDESTDIR}/usr/lib/systemd } } emacs-gtk3_package() { depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme" - if [ "$build_option_nativecomp" ]; then - depends+=" emacs-common-eln-${version}_${revision}" - fi provides="emacs-${version}_${revision}" replaces="emacs>=0" short_desc+=" - GTK+3 version" @@ -132,6 +114,6 @@ emacs-gtk3_package() { make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/gtk3 install rm -f ${PKGDESTDIR}/usr/bin/ctags rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info} - rm -rf ${PKGDESTDIR}/usr/lib + rm -rf ${PKGDESTDIR}/usr/lib/systemd } } From 12d37f24c98b269ed37915f9c59b0925411e9db5 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 16 Apr 2022 20:17:15 +0200 Subject: [PATCH 1002/2369] gzip: restore zless. Don't depend on less to reduce bootstrap size. --- srcpkgs/gzip/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gzip/template b/srcpkgs/gzip/template index 037dd3b27a4..a01bc8cc511 100644 --- a/srcpkgs/gzip/template +++ b/srcpkgs/gzip/template @@ -1,9 +1,10 @@ # Template file for 'gzip' pkgname=gzip version=1.12 -revision=1 +revision=2 bootstrap=yes build_style=gnu-configure +configure_args="ac_cv_prog_LESS=less" short_desc="GNU compression utility (replacement for compress)" maintainer="Enno Boland " license="GPL-3.0-or-later" From e4cc32f921d2decaab91ead7c663d4b9552080b2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 16 Apr 2022 14:39:39 -0400 Subject: [PATCH 1003/2369] common/travis/fetch_upstream.sh: fix CI for new git version --- common/travis/fetch_upstream.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh index 45315563e0b..5c0256fdbe1 100755 --- a/common/travis/fetch_upstream.sh +++ b/common/travis/fetch_upstream.sh @@ -8,5 +8,8 @@ elif command -v git >/dev/null 2>&1; then GIT_CMD=$(command -v git) fi +# required by git 2.35.2+ +$GIT_CMD config --global --add safe.directory /__w/void-packages/void-packages + /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m' $GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master From 8a7eb20ce332ada19d3e4bca26419c79494913a4 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 17 Apr 2022 05:25:00 +0200 Subject: [PATCH 1004/2369] emacs: disable nativecomp on 32-bit ppc --- srcpkgs/emacs/template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template index b3130b1198d..d876ebfe168 100644 --- a/srcpkgs/emacs/template +++ b/srcpkgs/emacs/template @@ -39,9 +39,15 @@ desc_option_m17n="Enable support for m17n multilingual text processing" desc_option_nativecomp="Enable support for native compilation" desc_option_sound="Enable support for sound" desc_option_xpm="Enable support for XPM images" -build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n nativecomp +build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n png sound svg tiff xml xpm" +case "$XBPS_TARGET_MACHINE" in + ppc64*) build_options_default+=" nativecomp";; + ppc*) ;; # assembler errors + *) build_options_default+=" nativecomp";; +esac + pre_configure() { # Just configuring in different directories results in # spurious emacs rebuilds with incompatible build numbers. From 3c93a6830847421a6814de96a054eb268cbf6670 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 9 Apr 2022 21:06:11 +0300 Subject: [PATCH 1005/2369] xfce4-terminal: update to 1.0.1. --- srcpkgs/xfce4-terminal/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template index b25c1f0ab75..07c3bfaa46e 100644 --- a/srcpkgs/xfce4-terminal/template +++ b/srcpkgs/xfce4-terminal/template @@ -1,7 +1,7 @@ # Template file for 'xfce4-terminal' pkgname=xfce4-terminal -version=0.8.10 -revision=3 +version=1.0.1 +revision=1 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="intltool pkg-config" @@ -11,5 +11,6 @@ short_desc="Modern terminal emulator primarly for the Xfce desktop environment" maintainer="Frank Steinborn " license="GPL-2.0-or-later" homepage="https://docs.xfce.org/apps/xfce4-terminal/start" +changelog="https://gitlab.xfce.org/apps/xfce4-terminal/-/raw/master/NEWS" distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=7a3337c198e01262a0412384823185753ac8a0345be1d6776a7e9bbbcbf33dc7 +checksum=1d3690871d3fe97f8be0908ace0443819e513f6366f851682aafe17059e1eba5 From 6623c600b6a526f045b2518994efaeaa40642d0f Mon Sep 17 00:00:00 2001 From: Jose G Perez Taveras Date: Sun, 17 Apr 2022 04:22:01 -0400 Subject: [PATCH 1006/2369] font-iosevka: update to 15.2.0. --- 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 e293af01166..c971135ce5f 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.1.0 +version=15.2.0 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 - 4bb10d12681546fa129f9105706d6f55c346b75418a19793fb300f0bd4e5991d - e05995a4b66592d5868b7e667bba8a5f1822499fc53c6cd7a8abf3e40f8b8895" + b6b6bb50cd3c3db49739bea9fb5c92c22647631eb1b5a35aa7f48358c07ef529 + 45c853ac53b638457d943c0ccf7cf12ca77219ba7e092d7ac17ed965c5482da9" font_dirs="/usr/share/fonts/TTF" From e8c42bd0d16b84f3d8516282aff210a72d182274 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 17 Apr 2022 19:15:57 +0200 Subject: [PATCH 1007/2369] gettext: fix build with automake 1.16.4 Closes: #34866, #34810 --- srcpkgs/gettext/patches/automake-1.16.4.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 srcpkgs/gettext/patches/automake-1.16.4.patch diff --git a/srcpkgs/gettext/patches/automake-1.16.4.patch b/srcpkgs/gettext/patches/automake-1.16.4.patch new file mode 100644 index 00000000000..9de0e0b1208 --- /dev/null +++ b/srcpkgs/gettext/patches/automake-1.16.4.patch @@ -0,0 +1,52 @@ +From d1836dbbd6a90b4c0ab79bc5292c023f08b49511 Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sun, 8 Aug 2021 02:08:43 +0200 +Subject: [PATCH] libtextstyle: Make gl_INIT_PACKAGE work with Automake >= + 1.16.4. + +Reported and analyzed by Nicole Mazzuca in +. + +* m4/init-package-version.m4 (gl_INIT_PACKAGE): Use a new macro gl_INIT_EMPTY. +(gl_INIT_DUMMY): Expand to empty in two steps, via a new macro gl_INIT_DUMMY2. +--- + libtextstyle/m4/init-package-version.m4 | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/libtextstyle/m4/init-package-version.m4 b/libtextstyle/m4/init-package-version.m4 +index f131a844f..a26b1ab88 100644 +--- a/libtextstyle/m4/init-package-version.m4 ++++ b/libtextstyle/m4/init-package-version.m4 +@@ -1,5 +1,5 @@ +-# init-package-version.m4 serial 1 (gettext-0.18) +-dnl Copyright (C) 1992-2009 Free Software Foundation, Inc. ++# init-package-version.m4 serial 2 ++dnl Copyright (C) 1992-2021 Free Software Foundation, Inc. + dnl This file is free software, distributed under the terms of the GNU + dnl General Public License. As a special exception to the GNU General + dnl Public License, this file may be distributed as part of a program +@@ -77,7 +77,7 @@ AC_DEFUN([gl_INIT_PACKAGE], + m4_bpatsubst(m4_dquote( + m4_defn([AM_INIT_AUTOMAKE])), + [AC_PACKAGE_NAME], [gl_INIT_DUMMY])), +- [AC_PACKAGE_TARNAME], [gl_INIT_DUMMY])), ++ [AC_PACKAGE_TARNAME], [gl_INIT_EMPTY])), + [AC_PACKAGE_VERSION], [gl_INIT_DUMMY]) + [AC_SUBST([PACKAGE], [$1]) + AC_SUBST([VERSION], [$2]) +@@ -85,7 +85,11 @@ AC_DEFUN([gl_INIT_PACKAGE], + m4_define([AM_INIT_AUTOMAKE], + m4_defn([gl_RPL_INIT_AUTOMAKE])) + ]) +-m4_define([gl_INIT_DUMMY], []) ++m4_define([gl_INIT_EMPTY], []) ++dnl Automake 1.16.4 no longer accepts an empty value for gl_INIT_DUMMY. ++dnl But a macro that later expands to empty works. ++m4_define([gl_INIT_DUMMY], [gl_INIT_DUMMY2]) ++m4_define([gl_INIT_DUMMY2], []) + AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [ + m4_ifval([$2], + [m4_fatal([After gl_INIT_PACKAGE, the two-argument form of AM_INIT_AUTOMAKE cannot be used.])]) +-- +2.17.1 + From 1ccc884f1c412f5b0e98fa16c6d21bc11704356d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 15 Dec 2021 22:38:17 +0100 Subject: [PATCH 1008/2369] xbps-src: make -E ignore remote repositories with -N --- common/xbps-src/shutils/common.sh | 10 +++++++++- xbps-src | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index 47ff365e9ff..36038af980c 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -472,7 +472,15 @@ setup_pkg() { fi makejobs="-j$XBPS_MAKEJOBS" if [ -n "$XBPS_BINPKG_EXISTS" ]; then - local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver 2>/dev/null)" + local extraflags="" + if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then + extraflags="-i" + # filter out remote repositories + for repo in $(xbps-query -L | awk '{ print $2 }' | grep '^/host/'); do + extraflags+=" --repository=$repo" + done + fi + local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver $extraflags 2>/dev/null)" if [ "$_binpkgver" = "$pkgver" ]; then if [ -z "$XBPS_DEPENDENCY" ]; then local _repo="$($XBPS_QUERY_XCMD -R -prepository $pkgver 2>/dev/null)" diff --git a/xbps-src b/xbps-src index 8488c5a3a49..47023a72353 100755 --- a/xbps-src +++ b/xbps-src @@ -157,7 +157,7 @@ $(print_cross_targets) -C Do not remove build directory, automatic dependencies and package destdir after successful install. --E If a binary package exists in a local repository for the target package, +-E If a binary package exists in a repository for the target package, do not try to build it, exit immediately. -f Force running the specified stage (configure/build/install/pkg) From 0d0d944ce21453c31bb0594a39a9edec74d27785 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:37 +0200 Subject: [PATCH 1009/2369] attica: update to 5.93.0. --- srcpkgs/attica/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template index 1222f0cc9a6..47179ef8bd6 100644 --- a/srcpkgs/attica/template +++ b/srcpkgs/attica/template @@ -1,6 +1,6 @@ # Template file for 'attica' pkgname=attica -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/attica" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bf647c7736acbbb99ff1557339f71b5efd5a7591b2af83b482d37d35516bc933 +checksum=81c18009911beb07d1868de78dd7fc1c4b1e8312bd95d916f4d4a80a800592e1 do_check() { cd build From 905170e59de0e5aab82bd339018e7d49474ed251 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:39 +0200 Subject: [PATCH 1010/2369] baloo5: update to 5.93.0. --- srcpkgs/baloo5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template index 9f6d3c93f69..f687851bcda 100644 --- a/srcpkgs/baloo5/template +++ b/srcpkgs/baloo5/template @@ -1,6 +1,6 @@ # Template file for 'baloo5' pkgname=baloo5 -version=5.92.0 +version=5.93.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/Baloo" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=283570583da0f85b2001ca600b9657e3a3fb9c2dcdd3ea8728553e212e50a475 +checksum=25d11569fddb8ad0dddbaa91cedd3d96f0ad58a2cc23de920950db6ba3aed5cd do_check() { cd build From 736d6f4e9fd2fa167dc9a6ac9865dafc59c20a51 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:41 +0200 Subject: [PATCH 1011/2369] bluez-qt5: update to 5.93.0. --- srcpkgs/bluez-qt5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template index 2893e694f79..e6939e618cf 100644 --- a/srcpkgs/bluez-qt5/template +++ b/srcpkgs/bluez-qt5/template @@ -1,6 +1,6 @@ # Template file for 'bluez-qt5' pkgname=bluez-qt5 -version=5.92.0 +version=5.93.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/bluez-qt" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=f58d2483ed2db9cb77621bce3b3c6babd8d1153954030c0dc52ce399c6d28ab6 +checksum=ab5d84eaa37791b57c8379282a3c3afd7ef0b2ebbef83c3f12f6b3bfd9123624 do_check() { cd build From 2f9d97ec3f15c1185d11688461d0da13d07f030c Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:42 +0200 Subject: [PATCH 1012/2369] breeze-icons: update to 5.93.0. --- srcpkgs/breeze-icons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template index 017805c6058..4aa9c5c952b 100644 --- a/srcpkgs/breeze-icons/template +++ b/srcpkgs/breeze-icons/template @@ -1,6 +1,6 @@ # Template file for 'breeze-icons' pkgname=breeze-icons -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-3.0-or-later" homepage="https://community.kde.org/Frameworks" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=49e09663989fd3498d61cb7518c741c87a702689b6d6074097d628264a064366 +checksum=4367dfa6b48aa645a3680489be96e03a9a6fc20f57277b3ca5e37ce8df4d03e6 nostrip=yes if [ -z "$CROSS_BUILD" ]; then From a81a0ae5105ed5b64cc44bb5c7ff3335a24a2d35 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:44 +0200 Subject: [PATCH 1013/2369] extra-cmake-modules: update to 5.93.0. --- srcpkgs/extra-cmake-modules/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template index 9c034a06303..19615d19ee4 100644 --- a/srcpkgs/extra-cmake-modules/template +++ b/srcpkgs/extra-cmake-modules/template @@ -1,6 +1,6 @@ # Template file for 'extra-cmake-modules' pkgname=extra-cmake-modules -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_HTML_DOCS=ON" @@ -12,7 +12,7 @@ maintainer="John " license="BSD-3-Clause" homepage="https://invent.kde.org/frameworks/extra-cmake-modules" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f89a238bc5f28738db25e29296b75b4f795e3e9bfe3a8f1f9390648749d303ef +checksum=093dea7b11647bc5f74e6971d47ef15b5c410cba2b4620acae00f008d5480b21 python_version=3 do_check() { From ab19d219c23c14cebb2c98191704e9e22e78716a Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:45 +0200 Subject: [PATCH 1014/2369] frameworkintegration: update to 5.93.0. --- srcpkgs/frameworkintegration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template index 9840b077f5c..130a97e3755 100644 --- a/srcpkgs/frameworkintegration/template +++ b/srcpkgs/frameworkintegration/template @@ -1,6 +1,6 @@ # Template file for 'frameworkintegration' pkgname=frameworkintegration -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules pkg-config @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/frameworkintegration" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bd8ef6f6656c9756a56fbfa1dc91273426ef3ea5fae3e7a4c7dbeddfbbe3ec5d +checksum=156e54c9ee679bda943a279c28c6a834ca02e991b3f53a1b92f8c3931388a2a6 frameworkintegration-devel_package() { short_desc+=" - development" From 6231af123984c8992308361e575baf0ead18a859 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:47 +0200 Subject: [PATCH 1015/2369] kactivities5-stats: update to 5.93.0. --- srcpkgs/kactivities5-stats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template index 8957274d1f8..5fa940f06ee 100644 --- a/srcpkgs/kactivities5-stats/template +++ b/srcpkgs/kactivities5-stats/template @@ -1,6 +1,6 @@ # Template file for 'kactivities5-stats' pkgname=kactivities5-stats -version=5.92.0 +version=5.93.0 revision=1 wrksrc="${pkgname/5/}-${version}" build_style=cmake @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://api.kde.org/frameworks/kactivities/html/index.html" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz" -checksum=2206132e0edbb8271f77bb6c45e794b8d3baa3d9b4f94aba005556f9fa3ff751 +checksum=f1069872228e05aea349a0d3f7961da27d1aad3e4c28d0a408fceb98edef03a8 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" From bc6d23e91101927a553248164ffc700f03232bd0 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:48 +0200 Subject: [PATCH 1016/2369] kactivities5: update to 5.93.0. --- srcpkgs/kactivities5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template index 75438b590ee..467b2ed2fed 100644 --- a/srcpkgs/kactivities5/template +++ b/srcpkgs/kactivities5/template @@ -1,6 +1,6 @@ # Template file for 'kactivities5' pkgname=kactivities5 -version=5.92.0 +version=5.93.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kactivities" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=fc06b6fc111f5ed8450c1c1c96f36188328b2292001ca3bf3293d0f68678dbcd +checksum=eb6b204382d3bba1b32b5752a3e8382a5a7bbd8be4b95b774c68c501a2f16843 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools" From 94d6c4dea0cc502cd4d8925928286322858145ac Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:50 +0200 Subject: [PATCH 1017/2369] kapidox: update to 5.93.0. --- srcpkgs/kapidox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template index 164a36aa99a..5e8664d5b6e 100644 --- a/srcpkgs/kapidox/template +++ b/srcpkgs/kapidox/template @@ -1,6 +1,6 @@ # Template file for 'kapidox' pkgname=kapidox -version=5.92.0 +version=5.93.0 revision=1 build_style=python3-module hostmakedepends="python3 python3-setuptools" @@ -11,7 +11,7 @@ maintainer="John " license="BSD-2-Clause, CC0-1.0" homepage="https://invent.kde.org/frameworks/kapidox" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4f5201de5878bc3fb24f9e2ebd387c0a12d7a27c407636bc878bab5a3999a56d +checksum=4228326a35342de8f0a301ed8afa379ef2102d99588a79808e7e86f2a4f81d5b post_install() { vlicense LICENSES/BSD-2-Clause.txt From a9da4fbc0254a9b8486753b626e286357bb782d9 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:51 +0200 Subject: [PATCH 1018/2369] karchive: update to 5.93.0. --- srcpkgs/karchive/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template index 109cc7a0ec2..dcc4a9d14cb 100644 --- a/srcpkgs/karchive/template +++ b/srcpkgs/karchive/template @@ -1,6 +1,6 @@ # Template file for 'karchive' pkgname=karchive -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/karchive" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5076a28c3a10ab755454c752fa563a4be7ad890f391c43aaa2ee4ee4b6a99fae +checksum=61e326a840860270b7f8b9e8966462085b4f309be5c3a84c3b265eb95694c7fb karchive-devel_package() { short_desc+=" - development" From 75395089e953946636ec56bb7022aaaefb31ba16 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:53 +0200 Subject: [PATCH 1019/2369] kauth: update to 5.93.0. --- srcpkgs/kauth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template index 05ea13c55c3..8877514c6a7 100644 --- a/srcpkgs/kauth/template +++ b/srcpkgs/kauth/template @@ -1,6 +1,6 @@ # Template file for 'kauth' pkgname=kauth -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kauth" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=44824bf68ee510d8aa0189a9d4b44568b0fe20d17ba45e3b739db1927bfa4728 +checksum=34580078bfdf631835f3ac52955f2149209908b935a7cfec6fe5b4956c3ada6c do_check() { cd build From 5472e214e42a06d4e67f564d40296e6e7d707138 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:55 +0200 Subject: [PATCH 1020/2369] kbookmarks: update to 5.93.0. --- srcpkgs/kbookmarks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template index c845e8909a6..cf60805f220 100644 --- a/srcpkgs/kbookmarks/template +++ b/srcpkgs/kbookmarks/template @@ -1,6 +1,6 @@ # Template file for 'kbookmarks' pkgname=kbookmarks -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only" homepage="https://invent.kde.org/frameworks/kbookmarks" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=99504e761621b56e07a561e1caea196fe4623c9334b889f081e3da8e4a19d543 +checksum=3eeff795ff99be90b0d59c6e5fbef02022e9fb48c9b4dab098a3c27e10fd863f kbookmarks-devel_package() { short_desc+=" - development" From 8733dc71ea90211c39f284693839f5ed1c68cdba Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:56 +0200 Subject: [PATCH 1021/2369] kcalendarcore: update to 5.93.0. --- srcpkgs/kcalendarcore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template index 3359712d3db..4e7766af00c 100644 --- a/srcpkgs/kcalendarcore/template +++ b/srcpkgs/kcalendarcore/template @@ -1,7 +1,7 @@ # Template file for 'kcalendarcore' pkgname=kcalendarcore reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1" -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6ff2e68dfb8b92e0f181f3f19d20991bfd589b4a047b313af908c41391560b3a +checksum=1609bc141739fce0abed59a353a0e356f4fa7a1b3659d3bc77737010875c1d3f replaces="kcalcore>=0" do_check() { From 6f7dbe7cdc37270a01449b38e44212fc1d17b39f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:58 +0200 Subject: [PATCH 1022/2369] kcmutils: update to 5.93.0. --- srcpkgs/kcmutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template index bf26425f364..19bea867195 100644 --- a/srcpkgs/kcmutils/template +++ b/srcpkgs/kcmutils/template @@ -1,6 +1,6 @@ # Template file for 'kcmutils' pkgname=kcmutils -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.0-only" homepage="https://invent.kde.org/frameworks/kcmutils" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=dd49e658fc85c215442a7fa9d2435819f0bef13c997a6c2a51557b82e1bc8d3a +checksum=1445f978b7ffd69fd7c25d965812755679c4fdba23eb9837da37a8b5b2d30d6d kcmutils-devel_package() { short_desc+=" - development" From 6c4cb15b4c4feb44a739cfa799abdb533b368599 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:42:59 +0200 Subject: [PATCH 1023/2369] kcodecs: update to 5.93.0. --- srcpkgs/kcodecs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template index 3ccc8f79b63..0a5c8577d24 100644 --- a/srcpkgs/kcodecs/template +++ b/srcpkgs/kcodecs/template @@ -1,6 +1,6 @@ # Template file for 'kcodecs' pkgname=kcodecs -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kcodecs" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d6e5b7a453948d5fa0482715eaf4a0c9abe5b902a0aca15540a04b1a1b60d275 +checksum=0efc5c8baab3142f8a0ab9369b255061772a57a80fb616b7305bf98235b2288b kcodecs-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 4d4d08676415c6199cbeb214302211cdee2d4d86 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:00 +0200 Subject: [PATCH 1024/2369] kcompletion: update to 5.93.0. --- srcpkgs/kcompletion/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template index 8514a8625df..fb4b7970b80 100644 --- a/srcpkgs/kcompletion/template +++ b/srcpkgs/kcompletion/template @@ -1,6 +1,6 @@ # Template file for 'kcompletion' pkgname=kcompletion -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kcompletion" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=08f1525c6cee8babe399c941bb85d04be9dade0341d1d85c6beccd2e93dc7ceb +checksum=7f8c9355e8875b619ca852741e972f41c252aa2e95b439161acc7b32d9e8fb9c kcompletion-devel_package() { short_desc+=" - development" From f6684f1df40e5b784393911156215b34406ef9b1 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:02 +0200 Subject: [PATCH 1025/2369] kconfig: update to 5.93.0. --- srcpkgs/kconfig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template index 44dc8ae429d..402cf928ecb 100644 --- a/srcpkgs/kconfig/template +++ b/srcpkgs/kconfig/template @@ -1,6 +1,6 @@ # Template file for 'kconfig' pkgname=kconfig -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kconfig" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7801b641b88368a0c021272073c692337b42ee28f0025d106942c8ce873b0523 +checksum=71857c20d4829017c22dd6d46ae5a642c86344960e21bc1520458fb76d02c06e do_check() { cd build From 7d9a060f758ec673a388347605758a8c80172614 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:03 +0200 Subject: [PATCH 1026/2369] kconfigwidgets: update to 5.93.0. --- srcpkgs/kconfigwidgets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template index f14d66ae93e..a8fec7e42db 100644 --- a/srcpkgs/kconfigwidgets/template +++ b/srcpkgs/kconfigwidgets/template @@ -1,6 +1,6 @@ # Template file for 'kconfigwidgets' pkgname=kconfigwidgets -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kconfigwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4259eed35d9ac307ecc30e64833bad7a89ef58fc7125054eb39716d27a4a274a +checksum=db18e0f2217ead6dd6f5877551902d5da86aa026686e3c564f5f96be279f24bb kconfigwidgets-devel_package() { short_desc+=" - development" From 44235d1595f7ccea05dec9b28df1da403164eda3 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:05 +0200 Subject: [PATCH 1027/2369] kcontacts: update to 5.93.0. --- srcpkgs/kcontacts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template index 544ae3c7f4c..bf35f07ce99 100644 --- a/srcpkgs/kcontacts/template +++ b/srcpkgs/kcontacts/template @@ -1,7 +1,7 @@ # Template file for 'kcontacts' pkgname=kcontacts reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1" -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcontacts" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1276006e50f507216a8241ca4b26b02c67c42e5bee26a6b391db6ae4f72533ce +checksum=5d7c8c6c6ccfa99188d9e4d7ab6165ec5b2bceea59a01edc6b309910fd604c75 kcontacts-devel_package() { short_desc+=" - development" From 45736a909f13e4339f1c4d46a8afe64b6ad39aab Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:06 +0200 Subject: [PATCH 1028/2369] kcoreaddons: update to 5.93.0. --- srcpkgs/kcoreaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template index 4838e315b9d..0db03a77e30 100644 --- a/srcpkgs/kcoreaddons/template +++ b/srcpkgs/kcoreaddons/template @@ -1,6 +1,6 @@ # Template file for 'kcoreaddons' pkgname=kcoreaddons -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcoreaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=df5f718f324aa2b58191438c8aa5f7498a7997eff990d16ffbc9f19efd1a6667 +checksum=920a278af97dea3add06770a6f3604744c20d667973cb71cf477145785dbf043 post_install() { vsed -e 's;${_IMPORT_PREFIX};/usr;g' \ From ddaf48bbb5e81471514ffd69f20d7857e69c853f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:07 +0200 Subject: [PATCH 1029/2369] kcrash: update to 5.93.0. --- srcpkgs/kcrash/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template index b9fadfc544d..c05bc460033 100644 --- a/srcpkgs/kcrash/template +++ b/srcpkgs/kcrash/template @@ -1,6 +1,6 @@ # Template file for 'kcrash' pkgname=kcrash -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kcrash" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9bc5605b5026f55d9c2c1ca32c79842c3ad0f5c042e480fe1e7027b2692526c7 +checksum=2ff8d6c6924b2b752ef4a929390606bb55ce2aa55c582927269bd65556992dd6 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons" From f663fe3de0473fefb7d41f3a4a2d4772918be7a2 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:09 +0200 Subject: [PATCH 1030/2369] kdav: update to 5.93.0. --- srcpkgs/kdav/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template index caa894c1356..32b1865fbe2 100644 --- a/srcpkgs/kdav/template +++ b/srcpkgs/kdav/template @@ -1,7 +1,7 @@ # Template file for 'kdav' pkgname=kdav reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1" -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kdav" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f3b16c473b104f83f6124f96f2b06a6c72a447eb19ba31a90e3f4725e732b1c4 +checksum=a7d3d40120f0a1b20f8492ea1635507a95e041582f5496a133de24720934ad68 kdav-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From 34b581fe0771ddb54db45838578b8009b353f02a Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:10 +0200 Subject: [PATCH 1031/2369] kdbusaddons: update to 5.93.0. --- srcpkgs/kdbusaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template index 74165252917..5e03127aa8a 100644 --- a/srcpkgs/kdbusaddons/template +++ b/srcpkgs/kdbusaddons/template @@ -1,6 +1,6 @@ # Template file for 'kdbusaddons' pkgname=kdbusaddons -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdbusaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7c03f33cc49ffa80e509f654f410cb142e917bceb2f35f08836dc46ed268ae54 +checksum=cc2c74501e65b97af1849ff454e51393f3a07755c155854bdee741a006822ad9 do_check() { cd build From b71c4e4bf628ac6c61e75768995f3c1dd9b819f4 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:11 +0200 Subject: [PATCH 1032/2369] kdeclarative: update to 5.93.0. --- srcpkgs/kdeclarative/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template index 2c6a351f34f..96902ea275a 100644 --- a/srcpkgs/kdeclarative/template +++ b/srcpkgs/kdeclarative/template @@ -1,6 +1,6 @@ # Template file for 'kdeclarative' pkgname=kdeclarative -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules pkg-config @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdeclarative" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fe964d77fea37c04eee3863d2b4227b76e33f16583906c284b532a461982d5b3 +checksum=08a945c793aa8d89d87c42d29c9c11e7c28c47916ae728369ab478892d325067 do_check() { cd build From 21c138b5b722c1f3f04c0145b7e6f15e0b1b0a77 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:13 +0200 Subject: [PATCH 1033/2369] kded: update to 5.93.0. --- srcpkgs/kded/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template index 15d1ebbf684..30238cc5f87 100644 --- a/srcpkgs/kded/template +++ b/srcpkgs/kded/template @@ -1,6 +1,6 @@ # Template file for 'kded' pkgname=kded -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kded" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8335531b856cb361ab2e5b390b333eb3405bac4e2bc7c0305994704bd0540e6c +checksum=1992310921cccaf8fa2ca1abc8328aec5bc2e60a3d9f562f25b30885378159df if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools" From cba2d56b8fbcef2f5071b526e1d7579907f7233f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:15 +0200 Subject: [PATCH 1034/2369] kdelibs4support: update to 5.93.0. --- srcpkgs/kdelibs4support/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template index 5e8bc71495b..ae42683b9b1 100644 --- a/srcpkgs/kdelibs4support/template +++ b/srcpkgs/kdelibs4support/template @@ -1,6 +1,6 @@ # Template file for 'kdelibs4support' pkgname=kdelibs4support -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON @@ -17,7 +17,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdelibs4support" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=292e5e84ad8d7de90f0666b51f085a25b7a9faf521c58379d470d2994004ede0 +checksum=6a3e1d80cc6babc12930f24f9afd1ed10b46ae58ea71d44a466178212b07377c if [ "$CROSS_BUILD" ]; then # gettaddrinfo runtime test is always fine (can't be achieved in crossbuild) From 1eb49831c8fc6c6f20bbc327282f28dd94fd67eb Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:16 +0200 Subject: [PATCH 1035/2369] kdesignerplugin: update to 5.93.0. --- srcpkgs/kdesignerplugin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template index 8b811b77758..b81b6562cf6 100644 --- a/srcpkgs/kdesignerplugin/template +++ b/srcpkgs/kdesignerplugin/template @@ -1,6 +1,6 @@ # Template file for 'kdesignerplugin' pkgname=kdesignerplugin -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-only" homepage="https://invent.kde.org/frameworks/kdesignerplugin" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=066859b345da224f5edb601a5f448540330c9a286980b0c34169646c26a22a4e +checksum=f19ab4fc1ed58b89642d8f9f75a5da2f2ef0093c97183f336ffeb7208e628aaf if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools" From 6e2dbce64449d42f470256dc256d64da8019b644 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:17 +0200 Subject: [PATCH 1036/2369] kdesu: update to 5.93.0. --- srcpkgs/kdesu/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template index 0ba31e7e1a3..1271d28ade3 100644 --- a/srcpkgs/kdesu/template +++ b/srcpkgs/kdesu/template @@ -1,6 +1,6 @@ # Template file for 'kdesu' pkgname=kdesu -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only" homepage="https://invent.kde.org/frameworks/kdesu" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4687dc87a9ada0675801e0c575467bb5f7f7fe21b67ae2ffd1fed80736f95efa +checksum=7f029d9a8959f0e2ca516ab3fb6b4ebd49ca0f0d19c72369451b6894d8138dbf kdesu-devel_package() { short_desc+=" - development" From e4b3d7be1a5c6e397863731d6a47f077f855fab9 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:19 +0200 Subject: [PATCH 1037/2369] kdewebkit: update to 5.93.0. --- srcpkgs/kdewebkit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template index df9fd862a13..c667f015e07 100644 --- a/srcpkgs/kdewebkit/template +++ b/srcpkgs/kdewebkit/template @@ -1,6 +1,6 @@ # Template file for 'kdewebkit' pkgname=kdewebkit -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kdewebkit" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=4d0a773cad86a642cb90d9844757569f2e2e9d1e96ccf78f73bee885c908d1b6 +checksum=a2fe9b5660763d4dd74244c00bf7b1a407438279a81f2a3ef3813ea250fd2f55 kdewebkit-devel_package() { short_desc+=" - development" From ea8118e30e199e3d58e21f9e841242fc1f71c2d2 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:20 +0200 Subject: [PATCH 1038/2369] kdnssd: update to 5.93.0. --- srcpkgs/kdnssd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template index a48bf7f3e25..42554c85407 100644 --- a/srcpkgs/kdnssd/template +++ b/srcpkgs/kdnssd/template @@ -1,6 +1,6 @@ # Template file for 'kdnssd' pkgname=kdnssd -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kdnssd" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5f36af49faab84d8ae7ec46f1ba3300c9cdd3d8820dd1e7e48c5c37bcdd844d4 +checksum=dc97364f14b5867ea5bb2986f6ad3c84ab1acc952f50d460b3e9aed03f2f903b kdnssd-devel_package() { short_desc+=" - development" From a6c0d3e8f17b9a201150bc971a011ba430d42e8f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:21 +0200 Subject: [PATCH 1039/2369] kdoctools: update to 5.93.0. --- srcpkgs/kdoctools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template index 5e38783fc1b..a43404728d1 100644 --- a/srcpkgs/kdoctools/template +++ b/srcpkgs/kdoctools/template @@ -1,6 +1,6 @@ # Template file for 'kdoctools' pkgname=kdoctools -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake build_helper=qemu @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdoctools" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=86a3aeb8b91dec0e1cd81b646654ebd750a8aedfac9b4d53b9b0019a91720870 +checksum=25e83ff151c53667b94e25a5c41993796164683a43913820a5651f3610b65d5c if [ "$CROSS_BUILD" ]; then configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper" From 197aa60187a38cdabbf919ceafd7d239e5516395 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:23 +0200 Subject: [PATCH 1040/2369] kemoticons: update to 5.93.0. --- srcpkgs/kemoticons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template index 2a4fa32fee0..5b7281e3bca 100644 --- a/srcpkgs/kemoticons/template +++ b/srcpkgs/kemoticons/template @@ -1,6 +1,6 @@ # Template file for 'kemoticons' pkgname=kemoticons -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later, CC-BY-4.0" homepage="https://invent.kde.org/frameworks/kemoticons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fdcfe30941c18a9cb29b58459fbb2ae54a55fd5a0e8688f0c59a7cc7ebf09f07 +checksum=83ca3df374935cf103a8fdaa85900d0acadbffc9d3aa8bfed073e804cd5ae410 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" From 4efa437da8ed7cba4fc0da5907ca15a0101ec64b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:25 +0200 Subject: [PATCH 1041/2369] kfilemetadata5: update to 5.93.0. --- srcpkgs/kfilemetadata5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template index ab36e2d8649..eb162fdff6d 100644 --- a/srcpkgs/kfilemetadata5/template +++ b/srcpkgs/kfilemetadata5/template @@ -1,6 +1,6 @@ # Template file for 'kfilemetadata5' pkgname=kfilemetadata5 -version=5.92.0 +version=5.93.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kfilemetadata" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=d624d3551094cf73d802b6e95bcd78577ce9eb1e9cbb9a8f340dcad066ea15ce +checksum=3015c071a5f068f6e45d36238aa0243d3788a95ec84362ba79ed0369e676a816 kfilemetadata5-devel_package() { short_desc+=" - development" From 54ae1c0dd9b1e58c24603d2261c2474917fc51ef Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:26 +0200 Subject: [PATCH 1042/2369] kglobalaccel: update to 5.93.0. --- srcpkgs/kglobalaccel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template index 2405d1b174d..7df12f5a247 100644 --- a/srcpkgs/kglobalaccel/template +++ b/srcpkgs/kglobalaccel/template @@ -1,6 +1,6 @@ # Template file for 'kglobalaccel' pkgname=kglobalaccel -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kglobalaccel" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=be7b1e279b63678ec4042f896b159d11c115d05e9831cde6cd67ef4b8e581452 +checksum=c806b8f2b029c7632d99c55cb711f9f4c1697555fde53ad4f67167efee97b712 kglobalaccel-devel_package() { short_desc+=" - development" From b10ebf93c9f930a26eb1be9c457b20fa367898f8 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:27 +0200 Subject: [PATCH 1043/2369] kguiaddons: update to 5.93.0. --- srcpkgs/kguiaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template index ea01d37e9ab..72f3ba0d1e7 100644 --- a/srcpkgs/kguiaddons/template +++ b/srcpkgs/kguiaddons/template @@ -1,6 +1,6 @@ # Template file for 'kguiaddons' pkgname=kguiaddons -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kguiaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0f6775a565f22900b0de53daa5fe73f7d7e592663e0bb442a8e26ffab27fdf5f +checksum=27f26392140bd1abcb86c154fd6fd87e50b2493787827b2b1cacaf76544af40a kguiaddons-devel_package() { short_desc+=" - development" From 8adedbcb6590d28a7d6ce0b9d0f450957ef54920 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:29 +0200 Subject: [PATCH 1044/2369] kholidays: update to 5.93.0. --- srcpkgs/kholidays/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template index 163b2dad1ca..eaa54144eb2 100644 --- a/srcpkgs/kholidays/template +++ b/srcpkgs/kholidays/template @@ -1,7 +1,7 @@ # Template file for 'kholidays' pkgname=kholidays reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1" -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kholidays" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0ed382c49fb10af87bfa3845a3919ed097c9f808f3a5dbb631ef4e68c86b4b10 +checksum=0d4a1fb823501ee73b2c4d80468777adedf93c80f36b3a680cad91cc6704b841 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" From 5793558c1c09d252d5da97798cb74f5f0330271b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:30 +0200 Subject: [PATCH 1045/2369] khtml: update to 5.93.0. --- srcpkgs/khtml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template index 7415d7e78a2..de17fc72af8 100644 --- a/srcpkgs/khtml/template +++ b/srcpkgs/khtml/template @@ -1,6 +1,6 @@ # Template file for 'khtml' pkgname=khtml -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/khtml" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=91a1d79ea382a25614810cd59f800f0a34c6e86c69ef6d0a08d2655f2a93171a +checksum=31bfb6752ed7248b98e2bdc723e8e10c11b5fc9f7bf7edd8dedad1162f86614b khtml-devel_package() { short_desc+=" - development" From 96163abe33368330ef20e47ae24cd3ae3200e7d2 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:32 +0200 Subject: [PATCH 1046/2369] ki18n: update to 5.93.0. --- srcpkgs/ki18n/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template index 8b0d17610f5..956d6aa7040 100644 --- a/srcpkgs/ki18n/template +++ b/srcpkgs/ki18n/template @@ -1,6 +1,6 @@ # Template file for 'ki18n' pkgname=ki18n -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/ki18n" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=058032e8e9556f1dadcf0c2bd633da6cfc9673e966dd113388e2b8aee2395777 +checksum=c2705400d175f18612dfe1afb28dc14accf614f7cfd65409dfa7fdcde5237339 ki18n-devel_package() { short_desc+=" - development" From 75875e511bd3239445074bab1643be3078897667 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:34 +0200 Subject: [PATCH 1047/2369] kiconthemes: update to 5.93.0. --- srcpkgs/kiconthemes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template index 65250bdb3ac..532d5ec8121 100644 --- a/srcpkgs/kiconthemes/template +++ b/srcpkgs/kiconthemes/template @@ -1,6 +1,6 @@ # Template file for 'kiconthemes' pkgname=kiconthemes -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-only, GPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kiconthemes" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2128710ff8bf0a7bbb699fe3a45b231c6b4607ba3e3a3a5d03c25c809233cb23 +checksum=75f7c5b34f4f1a228b4cbd81a284dbfdc0c0810ddd3a39e69f9363ab3598e2b4 kiconthemes-devel_package() { short_desc+=" - development" From 57b376170ff3fe4a0dd39b8f92127e311475a75f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:35 +0200 Subject: [PATCH 1048/2369] kidletime: update to 5.93.0. --- srcpkgs/kidletime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template index e9ed68131b1..0556c9a0e3d 100644 --- a/srcpkgs/kidletime/template +++ b/srcpkgs/kidletime/template @@ -1,6 +1,6 @@ # Template file for 'kidletime' pkgname=kidletime -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kidletime" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e12f14229f7ee587becb5a693374045c460d38c55d61e21eefd78b8db39280d7 +checksum=4d9315dfe1faaeb62eae5ba60f683483de56317826d9b8da2bd58feebcb7b7d9 kidletime-devel_package() { short_desc+=" - development" From 5f52c386e2e5174aa30304c7e764507ed3580952 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:37 +0200 Subject: [PATCH 1049/2369] kimageformats: update to 5.93.0. --- srcpkgs/kimageformats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template index ebd6e81db29..bc8b9f09a2c 100644 --- a/srcpkgs/kimageformats/template +++ b/srcpkgs/kimageformats/template @@ -1,6 +1,6 @@ # Template file for 'kimageformats' pkgname=kimageformats -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DKIMAGEFORMATS_HEIF=ON" @@ -12,4 +12,4 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kimageformats" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ce049989125a49dc9bf8d2a2f2f5a2fec79e25a6343087b024fefd0131eca369 +checksum=15b0ed9de57af95979e0e40496b980f243cd81e2a400d5f64d12478e1dddc7d0 From 50401325aead4e387c217c47068c6683f656f5d3 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:39 +0200 Subject: [PATCH 1050/2369] kinit: update to 5.93.0. --- srcpkgs/kinit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template index a0b0aaee911..f94cc0038dd 100644 --- a/srcpkgs/kinit/template +++ b/srcpkgs/kinit/template @@ -1,6 +1,6 @@ # Template file for 'kinit' pkgname=kinit -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only" homepage="https://invent.kde.org/frameworks/kinit" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=cb517912bf17d4b4f015cb1ab935eebadc52ece050f21b33fcb4e799b0c5f3ce +checksum=db36a3bd5b30163b7a4ed8c7a907bec585acab841306755b0d8d32ef3d1ce498 kinit-devel_package() { short_desc+=" - development" From d7f75b0f828a005f992fce86cc7a85a39fe93f1e Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:41 +0200 Subject: [PATCH 1051/2369] kio: update to 5.93.0. --- srcpkgs/kio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template index ba96fa5e727..3047212a796 100644 --- a/srcpkgs/kio/template +++ b/srcpkgs/kio/template @@ -1,6 +1,6 @@ # Template file for 'kio' pkgname=kio -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON @@ -16,7 +16,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kio" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d4433f9890f71afe3d7d268e978e0ade96f506a38e41f7d57ffe832d96d44cb3 +checksum=d290a4bcfb5ec9eb9047c84a7c420df831131b92ab6c9d28a3aa0eef9f5d4c44 do_check() { : # Pain to get working in limited enviroment, excpects e.g. real disks From b41775d1abf538fe5d6ddc79b106e4e6017b728b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:42 +0200 Subject: [PATCH 1052/2369] kirigami2: update to 5.93.0. --- srcpkgs/kirigami2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template index 1b85d94048f..f504292b636 100644 --- a/srcpkgs/kirigami2/template +++ b/srcpkgs/kirigami2/template @@ -1,6 +1,6 @@ # Template file for 'kirigami2' pkgname=kirigami2 -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="https://techbase.kde.org/Kirigami" distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz" -checksum=0adaff98ea70c577c9e6d7a688e5c52529a59f56a7d0c8ffce295f342e203d5c +checksum=a7c2a824eb776011ae9dc94698588e8c6988ac399669723631fab26edd47ab8f kirigami2-devel_package() { short_desc+=" - development" From 0dac5351d956034e70e08189acecf1947badf991 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:44 +0200 Subject: [PATCH 1053/2369] kitemmodels: update to 5.93.0. --- srcpkgs/kitemmodels/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template index beaa9faddb9..bbf9bbf094c 100644 --- a/srcpkgs/kitemmodels/template +++ b/srcpkgs/kitemmodels/template @@ -1,6 +1,6 @@ # Template file for 'kitemmodels' pkgname=kitemmodels -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kitemmodels" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e65c7f58d602b4b8160b34a3a841d1c7aac77695b73e53aa715765cf42a8e89b +checksum=5bb9918b92ac37f1bc52c5abe04e8dbea54f31fa0101edad6d9e92c3a9f0485b kitemmodels-devel_package() { short_desc+=" - development" From f9cdb9da24ab2037dc84a8c616602fb5e88f21a3 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:45 +0200 Subject: [PATCH 1054/2369] kitemviews: update to 5.93.0. --- srcpkgs/kitemviews/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template index ab3405ab835..4518704713d 100644 --- a/srcpkgs/kitemviews/template +++ b/srcpkgs/kitemviews/template @@ -1,6 +1,6 @@ # Template file for 'kitemviews' pkgname=kitemviews -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kitemviews" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=058b4d4228387558b03aceb0ed286cbbe89ea07bb6fed968beba0b51678886d6 +checksum=93f01dec3b795b28cc6f6859873ebb941a9504eaafd13ff9f72b987d71e55abf kitemviews-devel_package() { short_desc+=" - development" From 37b6b1768d4bc92b73583b75c24c5a5d2d3f9a70 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:46 +0200 Subject: [PATCH 1055/2369] kjobwidgets: update to 5.93.0. --- srcpkgs/kjobwidgets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template index cbe04600c92..c79eb99642d 100644 --- a/srcpkgs/kjobwidgets/template +++ b/srcpkgs/kjobwidgets/template @@ -1,6 +1,6 @@ # Template file for 'kjobwidgets' pkgname=kjobwidgets -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kjobwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=df24b96f77ddbd2f63a6c2a3c54c4e712ef11a63b93c0b02d949d85af2fb8526 +checksum=62449b747d6fa5b32a1cb317b2b614172e42be3b85f39b02d6a07adc267c39fb kjobwidgets-devel_package() { short_desc+=" - development" From 60eae4039dea0607f771ad8e231fd6e6ada87f37 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:48 +0200 Subject: [PATCH 1056/2369] kjs: update to 5.93.0. --- srcpkgs/kjs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template index 6990b50f3fe..263bf627d7a 100644 --- a/srcpkgs/kjs/template +++ b/srcpkgs/kjs/template @@ -1,6 +1,6 @@ # Template file for 'kjs' pkgname=kjs -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kjs" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=04072d527501c92f1e0144e9dcc114e108bfb5a2b50bed8a9b037474aaa6f118 +checksum=85aa01de9c2775564c895d3efbcfb8cc68da9a84f511176fef16742cbbf90942 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs" From 06c180cf37bb3f80857b83c0857d5b1d0464f84c Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:49 +0200 Subject: [PATCH 1057/2369] kjsembed: update to 5.93.0. --- srcpkgs/kjsembed/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template index f606b2123fb..d93a1a3b818 100644 --- a/srcpkgs/kjsembed/template +++ b/srcpkgs/kjsembed/template @@ -1,6 +1,6 @@ # Template file for 'kjsembed' pkgname=kjsembed -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="gettext kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kjsembed" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=d7c26538a0b7ac804565840d61df2681ea4b729abb6ecfbfcae3c20536ca6035 +checksum=fa55d3bf0b3f9026eb573cc909b1fbe53bea7090f3da465e9bb293dc0f81d424 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools" From aabdc8cc8f2c10bf8efd0643249bddbfd79caea9 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:50 +0200 Subject: [PATCH 1058/2369] kmediaplayer: update to 5.93.0. --- srcpkgs/kmediaplayer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template index 5c9a97d7230..5ebec5415b1 100644 --- a/srcpkgs/kmediaplayer/template +++ b/srcpkgs/kmediaplayer/template @@ -1,6 +1,6 @@ # Template file for 'kmediaplayer' pkgname=kmediaplayer -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules @@ -11,7 +11,7 @@ maintainer="John " license="X11" homepage="https://invent.kde.org/frameworks/kmediaplayer" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=fe38eb2ed593e2e68909129a042d52121b12b9350524a7a1463c24c9c58a97a6 +checksum=ada8afb5b0fea3af2112812792eff062d3830dfde4d8784b7e1fc3711e74830a kmediaplayer-devel_package() { short_desc+=" - development" From 6d95e6ecd29313f8cc03c091538166d10ba30080 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:52 +0200 Subject: [PATCH 1059/2369] knewstuff: update to 5.93.0. --- srcpkgs/knewstuff/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template index ba2a38d746c..dc604a8611c 100644 --- a/srcpkgs/knewstuff/template +++ b/srcpkgs/knewstuff/template @@ -1,6 +1,6 @@ # Template file for 'knewstuff' pkgname=knewstuff -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/knewstuff" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4b14aee55d7701c72d05030fad508a5cb89fee34656d4d84c2d977a3c2a66c3f +checksum=2adc48e26c04c05f61f6ff1007f77ea43036b76d769535617e88d3f35ebb5759 knewstuff-devel_package() { short_desc+=" - development" From be85510ebf9fa2ceb23a048eb862e08669c2f1c9 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:53 +0200 Subject: [PATCH 1060/2369] knotifications: update to 5.93.0. --- srcpkgs/knotifications/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template index 27a83bf27de..782d259b261 100644 --- a/srcpkgs/knotifications/template +++ b/srcpkgs/knotifications/template @@ -1,6 +1,6 @@ # Template file for 'knotifications' pkgname=knotifications -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/knotifications" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8c4e095e3d96140f19e9f2e2dbc74df174e29416455671fc6680828038ea94b7 +checksum=fe191b1fe55881d7e212a3b70fe08d53e47c32793d38f5d5a4d82b796796da4b knotifications-devel_package() { short_desc+=" - development" From d121ab0e8829f9b90248a20ecffe23202bb56f6f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:54 +0200 Subject: [PATCH 1061/2369] knotifyconfig: update to 5.93.0. --- srcpkgs/knotifyconfig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template index f33e7ca6330..1ac13b7254d 100644 --- a/srcpkgs/knotifyconfig/template +++ b/srcpkgs/knotifyconfig/template @@ -1,6 +1,6 @@ # Template file for 'knotifyconfig' pkgname=knotifyconfig -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/knotifyconfig" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f7f452e3197886a2afdfaa5a2954d412eb0ae2bc47ce742902765c053239313a +checksum=cc9de166631555451965cd007b82f0ab529d6b909bc259e26e59feee586619cd knotifyconfig-devel_package() { short_desc+=" - development" From eb21776d159444cbc03e85b969f785477d64b188 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:56 +0200 Subject: [PATCH 1062/2369] kpackage: update to 5.93.0. --- srcpkgs/kpackage/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template index 7488611aa6d..0c03af3cb83 100644 --- a/srcpkgs/kpackage/template +++ b/srcpkgs/kpackage/template @@ -1,6 +1,6 @@ # Template file for 'kpackage' pkgname=kpackage -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kpackage" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=361f75fb4e3dff46e6dab42d858488af58fd40f3af1f7a39881ea9240cd866ab +checksum=8de6ecd6ed1cf746b9919d93283aa650922211b51bb2d22027102f67c42ec5cd post_install() { vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \ From 0cd29b1a199831d88ea66306bfe991f515ce4653 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:57 +0200 Subject: [PATCH 1063/2369] kparts: update to 5.93.0. --- srcpkgs/kparts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template index 681aec45914..9ed54c4d5bd 100644 --- a/srcpkgs/kparts/template +++ b/srcpkgs/kparts/template @@ -1,6 +1,6 @@ # Template file for 'kparts' pkgname=kparts -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kparts" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=094e18b2e9119f1c197c625235e639204ab5aa1910b13ae4317c8145b4fe3318 +checksum=c888e9664cc71a2f52904fa42d6bcedaa76c50c720ef0bee8d8b0c98bbcd1675 do_check() { : # test can not find packages assets?! From 428dc72ed871333984678771666adc13d82b19fd Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:43:59 +0200 Subject: [PATCH 1064/2369] kpeople: update to 5.93.0. --- srcpkgs/kpeople/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template index 717d2756b92..b6d0c705401 100644 --- a/srcpkgs/kpeople/template +++ b/srcpkgs/kpeople/template @@ -1,6 +1,6 @@ # Template file for 'kpeople' pkgname=kpeople -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kpeople" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b313729131bfbdb0ffd24ded926a2c6604dd06a18bd612c2ead6aa886f29c571 +checksum=d3e1266982fa2abdd7b216d018569ea83c71312e2cfa35a0bee845e8bb49f371 do_check() { cd build From 5e859c642bd0fae34fa5f307bb87746a9071a7a3 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:00 +0200 Subject: [PATCH 1065/2369] kplotting: update to 5.93.0. --- srcpkgs/kplotting/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template index 6b6fa4db6f8..a39daf53e9c 100644 --- a/srcpkgs/kplotting/template +++ b/srcpkgs/kplotting/template @@ -1,6 +1,6 @@ # Template file for 'kplotting' pkgname=kplotting -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kplotting" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c95d63e2e4c4abbf625ec1cfe749314c1a90dc5be4a90a1ea1617bc969071ed1 +checksum=586d1b694213f55259ffb6a96a10648baff6e3ce45c58d7c44734d6096b6a26d kplotting-devel_package() { short_desc+=" - development" From 1749a6c5decb8dfc0cfea6296325c2a3f8d8c47d Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:01 +0200 Subject: [PATCH 1066/2369] kpty: update to 5.93.0. --- srcpkgs/kpty/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template index 47612b152d6..c5e5c306e49 100644 --- a/srcpkgs/kpty/template +++ b/srcpkgs/kpty/template @@ -1,6 +1,6 @@ # Template file for 'kpty' pkgname=kpty -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kpty" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=cb1dac5f8f7ba059ef967a2cf3d1580a29a8d7b373ef67e82e0ac4f0285ee052 +checksum=2a05154dbf9eb082f32f33b494dc36c3b24a59c14521167f3306a04c3649ec12 kpty-devel_package() { short_desc+=" - development" From d721b5584dc77789d1802b10b6cc6c13b8d022d4 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:03 +0200 Subject: [PATCH 1067/2369] kquickcharts: update to 5.93.0. --- srcpkgs/kquickcharts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template index d2d5278ba25..4fe68d7329a 100644 --- a/srcpkgs/kquickcharts/template +++ b/srcpkgs/kquickcharts/template @@ -1,6 +1,6 @@ # Template file for 'kquickcharts' pkgname=kquickcharts -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-only OR LGPL-3.0-only" homepage="https://community.kde.org/Frameworks" distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz" -checksum=1a430e2909b137466cf41c334a60ebc01e4cde82e71acbb167cd64d1f13e8678 +checksum=24346ac484d1d785bff27e0de5d29a7f7d3d73568074f8bdaeb869ff1004a848 do_check() { cd build From b42da4064dca8b0d07b4bac719dd2f12e228b95e Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:04 +0200 Subject: [PATCH 1068/2369] kross: update to 5.93.0. --- srcpkgs/kross/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template index 14c6ba42f54..31a60cd2c56 100644 --- a/srcpkgs/kross/template +++ b/srcpkgs/kross/template @@ -1,6 +1,6 @@ # Template file for 'kross' pkgname=kross -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args=" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kross" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=129e2840eb1f33c95d50cde79a82f784cf735c3f1ae636f15dcf695c0b0c1ebf +checksum=2ba6fd2438731b1704537889120c0dcdf1eb36bffd1e921736e85834a5551ac3 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From a2631edd34ea0130022acf46932248862b5d6afb Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:05 +0200 Subject: [PATCH 1069/2369] krunner: update to 5.93.0. --- srcpkgs/krunner/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template index 4fab48018a1..6eb7f598ef0 100644 --- a/srcpkgs/krunner/template +++ b/srcpkgs/krunner/template @@ -1,6 +1,6 @@ # Template file for 'krunner' pkgname=krunner -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/krunner" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3fc80c5d66359e4593115b58fcd055ca9cab8f23376123094e13c5d4bdc48fed +checksum=2dc6b9169d415d87f5e2d82e2263183f42589cc1e962c9d6d0c60b6dfa48c991 do_check() { cd build From f1ab2c1261b1cbec2d69c1938780fa3d2f14368f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:07 +0200 Subject: [PATCH 1070/2369] kservice: update to 5.93.0. --- srcpkgs/kservice/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template index adda7f1fe8b..de717b3257a 100644 --- a/srcpkgs/kservice/template +++ b/srcpkgs/kservice/template @@ -1,6 +1,6 @@ # Template file for 'kservice' pkgname=kservice -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kservice" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=52e2d9654bbade7db91c647192b78bc3ac1feedc0c279e9c371142aa5ec82ef8 +checksum=46cf92f837fb890e311c5affaaa8b01d1d66b47dd272a30ae148472ef3e67431 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools" From f2185b29bbaf0f610201ac488c61fa4c0cee43d4 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:08 +0200 Subject: [PATCH 1071/2369] ksolid: update to 5.93.0. --- srcpkgs/ksolid/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template index d954a2e1318..d38f0b79b18 100644 --- a/srcpkgs/ksolid/template +++ b/srcpkgs/ksolid/template @@ -1,6 +1,6 @@ # Template file for 'ksolid' pkgname=ksolid -version=5.92.0 +version=5.93.0 revision=1 wrksrc="${pkgname#k}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/solid" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz" -checksum=8926c859af4b6b14e0967fc3b76ca0e76de27d0ab544087eefdffe40518b5a9c +checksum=22eff3f94608793fecb532e097d9022a14c828a0ffad0f73666088153f0d6bea libksolid_package() { short_desc+=" - runtime library" From 4b33d351961246b02c886cd34a62a5613ae8e803 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:10 +0200 Subject: [PATCH 1072/2369] ktexteditor: update to 5.93.0. --- srcpkgs/ktexteditor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template index 3dcd6b5a743..6e0d131bcd2 100644 --- a/srcpkgs/ktexteditor/template +++ b/srcpkgs/ktexteditor/template @@ -1,6 +1,6 @@ # Template file for 'ktexteditor' pkgname=ktexteditor -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args=" @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/ktexteditor" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bcd01c3ca07d02106de1c68156e568ded7686ca9557b30a04f7b4e24cf43fb8c +checksum=7af437b882cd2da9cf9780cb660f9242b9c2400a5ff55cf6ca8608b6e62bd6c3 do_check() { cd build From b1133489c4f4941c75e165032b1a727c417ad56b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:11 +0200 Subject: [PATCH 1073/2369] ktextwidgets: update to 5.93.0. --- srcpkgs/ktextwidgets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template index 2768b6f1ddc..d685d6d0a91 100644 --- a/srcpkgs/ktextwidgets/template +++ b/srcpkgs/ktextwidgets/template @@ -1,6 +1,6 @@ # Template file for 'ktextwidgets' pkgname=ktextwidgets -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/ktextwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fe867bf498a5170a9fba91dff652b68fa5cae2af8864dbe89a6e54638ff90b0c +checksum=e27f588929db35f485ebbd6ddec45ec0c56f86844935013f8a39df8bdfb7c215 ktextwidgets-devel_package() { short_desc+=" - development" From 7c1ca04d0c2605317daa8fdb7c0a828a4f0b159b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:12 +0200 Subject: [PATCH 1074/2369] kunitconversion: update to 5.93.0. --- srcpkgs/kunitconversion/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template index 73f122a4fc6..0629a5319eb 100644 --- a/srcpkgs/kunitconversion/template +++ b/srcpkgs/kunitconversion/template @@ -1,6 +1,6 @@ # Template file for 'kunitconversion' pkgname=kunitconversion -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kunitconversion" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=47e2b4c4b329562044954a67edda4d5ade953bd2a9760f6214c5f8f17239f09e +checksum=9baefb6aed92d2b32727f9492f1322a9e0b17b609c2d82296f4ee10b55a02fc8 kunitconversion-devel_package() { short_desc+=" - development" From a3ec14e99bb3243c4f9f7ad9cc9a1fc1c09fb6d2 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:14 +0200 Subject: [PATCH 1075/2369] kwallet: update to 5.93.0. --- srcpkgs/kwallet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template index 6d2b98d6a7a..9df7aac1b7e 100644 --- a/srcpkgs/kwallet/template +++ b/srcpkgs/kwallet/template @@ -1,6 +1,6 @@ # Template file for 'kwallet' pkgname=kwallet -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwallet" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=71aca76cb0edbf569827709b073bff2edb5c129a85638df4bc666d70786740e5 +checksum=ed56f6477efb250b454f7b7861a16a5ea972487c1373647b7094047ce20fddeb kwallet-devel_package() { short_desc+=" - development" From b946719e44e9268c2134146d39522a82d9ff8cee Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:15 +0200 Subject: [PATCH 1076/2369] kwayland: update to 5.93.0. --- srcpkgs/kwayland/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template index 41c3aee7518..f67e288b91a 100644 --- a/srcpkgs/kwayland/template +++ b/srcpkgs/kwayland/template @@ -1,6 +1,6 @@ # Template file for 'kwayland' pkgname=kwayland -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwayland" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=95e097cefbe4e260129d77ab9fe3013818b85b9aee6e4744acfa1ada96fed195 +checksum=1648a273ad1c0c1895a0edff9a3e97eb151e1e3533362e0f01d72706ac0a7abe kwayland-devel_package() { short_desc+=" - development" From acc13db5295b1d4d72b7fc9753fb2de66c9d5d71 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:17 +0200 Subject: [PATCH 1077/2369] kwidgetsaddons: update to 5.93.0. --- srcpkgs/kwidgetsaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template index 324be77968b..1b80c8140b8 100644 --- a/srcpkgs/kwidgetsaddons/template +++ b/srcpkgs/kwidgetsaddons/template @@ -1,6 +1,6 @@ # Template file for 'kwidgetsaddons' pkgname=kwidgetsaddons -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwidgetsaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d0e3558d6a7ed550f31d319e6b52d6ed61d693a1aa50e6dd4f430a1324111f2c +checksum=9c35e17d8c6faae58bfd48180bf968b813e6bfe2d49041b3285f8e326842a410 do_check() { cd build From 9d60b24cfd0b2305c11b2f3bff778fc48a702765 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:18 +0200 Subject: [PATCH 1078/2369] kwindowsystem: update to 5.93.0. --- srcpkgs/kwindowsystem/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template index dd6ffc7afaa..f33ceba374d 100644 --- a/srcpkgs/kwindowsystem/template +++ b/srcpkgs/kwindowsystem/template @@ -1,6 +1,6 @@ # Template file for 'kwindowsystem' pkgname=kwindowsystem -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake # Check stage requires a running X Server @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwindowsystem" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=dcdbbd2b4f2372fc225141361a7d9ae4a8f28ed77a266dc22c20be473fdc7d80 +checksum=97cb223a4d1a7487a3ed496e10ff5e8c320ea7458eb34cbe4ed114bc19ebe4a1 kwindowsystem-devel_package() { short_desc+=" - development" From 5c1f0bcd12028a32976d1ddebdac2d0255433b0d Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:20 +0200 Subject: [PATCH 1079/2369] kxmlgui: update to 5.93.0. --- srcpkgs/kxmlgui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template index 4f30b9703ae..92a6b2d152d 100644 --- a/srcpkgs/kxmlgui/template +++ b/srcpkgs/kxmlgui/template @@ -1,6 +1,6 @@ # Template file for 'kxmlgui' pkgname=kxmlgui -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kxmlgui" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e08b4c0d3cc39f788d918bd2ba331966a8af5208233c38a27f029f93a597b743 +checksum=74ba65d95fac0cd09cb66e14d199efc739e1a8c9aec25812f41cfc64d7f4b099 do_check() { cd build From a0bff87ae5ad31c50bdf1e63d164f56beb2d57a7 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:21 +0200 Subject: [PATCH 1080/2369] kxmlrpcclient: update to 5.93.0. --- srcpkgs/kxmlrpcclient/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template index 619fe8a1d3e..20010cf52f3 100644 --- a/srcpkgs/kxmlrpcclient/template +++ b/srcpkgs/kxmlrpcclient/template @@ -1,6 +1,6 @@ # Template file for 'kxmlrpcclient' pkgname=kxmlrpcclient -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later, BSD-2-Clause" homepage="https://invent.kde.org/frameworks/kxmlrpcclient" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=0e32dca201f8b3d241e985c8dd8854774569d08167a9f3f060a141551e19beab +checksum=0cb41aff9f5660d95ee6d669f9c70692b55c089d0e1b9705e19b19fc2c49376c post_install() { vlicense LICENSES/BSD-2-Clause.txt From f9b97b0324f901dc3385a0bc6323d604443bc401 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:22 +0200 Subject: [PATCH 1081/2369] modemmanager-qt5: update to 5.93.0. --- srcpkgs/modemmanager-qt5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template index 920b6b1f570..b669557f11b 100644 --- a/srcpkgs/modemmanager-qt5/template +++ b/srcpkgs/modemmanager-qt5/template @@ -1,6 +1,6 @@ # Template file for 'modemmanager-qt5' pkgname=modemmanager-qt5 -version=5.92.0 +version=5.93.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/modemmanager-qt" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=7ed0b4f48a781fa9166e0446ac14fc21036195cb3d800ce21a546cac02fe5898 +checksum=3aedde6936524b9d0dea07ead34f44fcff50da2ccc0da73d6208893e270a67a8 do_check() { cd build From 6e3d99121a2c66160495d4fdf7da363a97ec8272 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:24 +0200 Subject: [PATCH 1082/2369] networkmanager-qt5: update to 5.93.0. --- srcpkgs/networkmanager-qt5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template index bc475ea1215..de46374e651 100644 --- a/srcpkgs/networkmanager-qt5/template +++ b/srcpkgs/networkmanager-qt5/template @@ -1,6 +1,6 @@ # Template file for 'networkmanager-qt5' pkgname=networkmanager-qt5 -version=5.92.0 +version=5.93.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/networkmanager-qt" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=51ddc8ec0ea60c87c49d5a6709eed86fe1e066d57d059a7f9e774c97b81bfa64 +checksum=b8588ce2d811094682f51ea6150f3c58baa398fc91339bcb511bf60bc0eba960 do_check() { cd build From bba4990adbfe9c2f2f9006683d48de06312e67b0 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:57 +0200 Subject: [PATCH 1083/2369] bluedevil: update to 5.24.4. --- srcpkgs/bluedevil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template index a3eb6e45043..b76585975dd 100644 --- a/srcpkgs/bluedevil/template +++ b/srcpkgs/bluedevil/template @@ -1,6 +1,6 @@ # Template file for 'bluedevil' pkgname=bluedevil -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/bluedevil" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=9dd1566eae8bb793330f2f54ab34cd75ed79e7f3924bf78149077b122cc49ec2 +checksum=83778e9cd952c6efeb786395d3fb9f5d4e6aa65d2ef2bc02ad7d256a3201f0d6 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel" From b079033308da0fbcd991c55fbbd8e8318315b7a1 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:44:59 +0200 Subject: [PATCH 1084/2369] breeze-gtk: update to 5.24.4. --- srcpkgs/breeze-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template index 8e1a152f177..20473061da4 100644 --- a/srcpkgs/breeze-gtk/template +++ b/srcpkgs/breeze-gtk/template @@ -1,6 +1,6 @@ # Template file for 'breeze-gtk' pkgname=breeze-gtk -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules sassc python3 python3-cairo" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/breeze-gtk" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=2911bb2f99ad42ec820cc2adcbf1f8a6f18ba437f72ce216562e12584fd042a4 +checksum=b2fe8150a8576fb39d26b809e6b9cb06e2c2d2b039558ad75307d62ed857a168 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel" From 46b52a6bf4e5a82009754452aa93f501db5b17a2 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:03 +0200 Subject: [PATCH 1085/2369] plasma-framework: update to 5.93.0. --- srcpkgs/plasma-framework/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template index 2ab058fb303..2ccf8a0c297 100644 --- a/srcpkgs/plasma-framework/template +++ b/srcpkgs/plasma-framework/template @@ -1,6 +1,6 @@ # Template file for 'plasma-framework' pkgname=plasma-framework -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/plasma-framework" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c6c2bc624564c74fd80bce170a1c763803d5207ef86108b5724fcba73c3506f7 +checksum=d4a2c687ea2ea8dfe7c256eb58441fc458102ed4b445dc24685513dd96b5c322 do_check() { cd build From 4d04e70e7a95b834d62e2f13eee19cdd1af1caa4 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:05 +0200 Subject: [PATCH 1086/2369] prison: update to 5.93.0. --- srcpkgs/prison/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template index 5f1e84c53f7..fdd1d0b1a11 100644 --- a/srcpkgs/prison/template +++ b/srcpkgs/prison/template @@ -1,6 +1,6 @@ # Template file for 'prison' pkgname=prison -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen @@ -12,7 +12,7 @@ maintainer="John " license="MIT" homepage="https://community.kde.org/Frameworks" distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz" -checksum=7e6fee9fd56be6c4589c106a3c16a28a4aa5832a24dcefe88302a9ad113ee41e +checksum=1f43de6622cf263c6b71f9a801174e2791c09b5a0d52c602715659ddfb82fb56 post_install() { vlicense LICENSES/BSD-3-Clause.txt From 5f0afeef188647ca1172a569463317ec167333b5 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:06 +0200 Subject: [PATCH 1087/2369] purpose: update to 5.93.0. --- srcpkgs/purpose/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template index dc71877ba34..4c9f91568f2 100644 --- a/srcpkgs/purpose/template +++ b/srcpkgs/purpose/template @@ -1,6 +1,6 @@ # Template file for 'purpose' pkgname=purpose -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/purpose" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=94613e180550f9d15443ced1f2d93b566350d9a981205b4f98923714dc4f400a +checksum=dc0bc0c7c5d9b27e21856132ceeb3893555a36f3944ebc97da2eb76a74e92cc4 do_check() { cd build From 3023aeacc58e5752726a3101d29690da855e5a04 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:07 +0200 Subject: [PATCH 1088/2369] breeze: update to 5.24.4. --- srcpkgs/breeze/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template index 0317ba5620d..64bc70e3be0 100644 --- a/srcpkgs/breeze/template +++ b/srcpkgs/breeze/template @@ -1,6 +1,6 @@ # Template file for 'breeze' pkgname=breeze -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/breeze" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=4b8f92e55c72ed59b7bdfe4be6044fcb0a0816fb6f1ea2bdd9884b58b9a92940 +checksum=e369ee21e6aab1d5e3ae222ecd84bdb59f3d29ce3b61965b498bbfe84c949805 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From c17624511596f0d6c619e2661b435be9cb86c5c2 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:08 +0200 Subject: [PATCH 1089/2369] qqc2-desktop-style: update to 5.93.0. --- srcpkgs/qqc2-desktop-style/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template index 5af0197811c..ee40061fe5d 100644 --- a/srcpkgs/qqc2-desktop-style/template +++ b/srcpkgs/qqc2-desktop-style/template @@ -1,6 +1,6 @@ # Template file for 'qqc2-desktop-style' pkgname=qqc2-desktop-style -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/qqc2-desktop-style" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=97530813b9a80505b5484175a55be49cc020244fbe3b1bdaeef15845c3c9bdac +checksum=161ec085a529e23532badb7723c78051e7b4c3a3fe11d3c4ab8bab93213ba9a8 qqc2-desktop-style-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From d5bf6b2d5e9211adfc0f2e5a705812e5399d02d8 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:09 +0200 Subject: [PATCH 1090/2369] kactivitymanagerd: update to 5.24.4. --- srcpkgs/kactivitymanagerd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template index 879d45275ce..e8fc45c0000 100644 --- a/srcpkgs/kactivitymanagerd/template +++ b/srcpkgs/kactivitymanagerd/template @@ -1,6 +1,6 @@ # Template file for 'kactivitymanagerd' pkgname=kactivitymanagerd -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake build_helper="qemu" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kactivitymanagerd" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=9cae3e136ee6743474fd96a573b235b6ca8653d4f61f412d9d3ec866861cae63 +checksum=8128371fd75f7dd4ccb2203ad775e6f12db28bbb64047d0fd63eb745d8735529 From 2888c1df9331fd8f0eeb5a6b568ac3b67888a30a Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:09 +0200 Subject: [PATCH 1091/2369] sonnet: update to 5.93.0. --- srcpkgs/sonnet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template index b7d08f3d959..ae917562a6e 100644 --- a/srcpkgs/sonnet/template +++ b/srcpkgs/sonnet/template @@ -1,6 +1,6 @@ # Template file for 'sonnet' pkgname=sonnet -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/sonnet" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=31fc1dda3db582337529922d38b6eac72b1551c4a0d86fb9307363e061d05722 +checksum=3c146ba45edee43bf2e8bc48b116a38e0c28d2294fe61b44dc8254b881210d9c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" sonnet" From ad0ec35dc731458fc6acf2e2c3055de684a0c7df Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:10 +0200 Subject: [PATCH 1092/2369] kde-cli-tools: update to 5.24.4. --- srcpkgs/kde-cli-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template index 847a7213209..0f61ce9efc6 100644 --- a/srcpkgs/kde-cli-tools/template +++ b/srcpkgs/kde-cli-tools/template @@ -1,6 +1,6 @@ # Template file for 'kde-cli-tools' pkgname=kde-cli-tools -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kde-cli-tools" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=fe64da7ce3ad7e7b2d743e06aec0f6666e1909d3ad08867a0173c5c262f7e803 +checksum=ffe4c8d3f4e97c57801360ba32cb70c961ad5796d56d4f0bae10ab2ec68759f0 post_install() { ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin From f5fd13b1961d41d591f7bd21f814591c3758ba84 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:11 +0200 Subject: [PATCH 1093/2369] syndication: update to 5.93.0. --- srcpkgs/syndication/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template index 3a35ebf2c17..bbb41153856 100644 --- a/srcpkgs/syndication/template +++ b/srcpkgs/syndication/template @@ -1,7 +1,7 @@ # Template file for 'syndication' pkgname=syndication reverts="18.08.0_1 18.08.0_2 18.08.1_1" -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz" -checksum=1c9ab9772103c001e56afbe0356ede04f953b07be8d2c2e2f2fff3e7b5bd5d46 +checksum=35f14e36076760170df44785df39f522407f58cfa36faf91564696587d8eda23 syndication-devel_package() { short_desc+=" - development" From b6679855850004d18ea4a8391581a7af9ba7b28b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:11 +0200 Subject: [PATCH 1094/2369] kde-gtk-config5: update to 5.24.4. --- srcpkgs/kde-gtk-config5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template index a68d66dbb12..ca92bc05101 100644 --- a/srcpkgs/kde-gtk-config5/template +++ b/srcpkgs/kde-gtk-config5/template @@ -1,6 +1,6 @@ # Template file for 'kde-gtk-config5' pkgname=kde-gtk-config5 -version=5.24.3 +version=5.24.4 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -15,7 +15,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kde-gtk-config" distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz" -checksum=fb4bcd30c93e15962153e81ca218f03465f02d1d2d011f267bb96946869ba05c +checksum=b17aaad5f96890426a8864ba51f026732007e47fd42c4ce4df3e469b455f570b if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kcoreaddons" From 4ed237ab9470aa835f59dc62428e777f4af8da2f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:12 +0200 Subject: [PATCH 1095/2369] syntax-highlighting: update to 5.93.0. --- srcpkgs/syntax-highlighting/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template index 5ad6ec87783..0f92ee3b944 100644 --- a/srcpkgs/syntax-highlighting/template +++ b/srcpkgs/syntax-highlighting/template @@ -1,6 +1,6 @@ # Template file for 'syntax-highlighting' pkgname=syntax-highlighting -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/syntax-highlighting" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=99347eaf9b2249f875cacd8319c77f2f8e110d0e7834f51f296ed911dcc7e50e +checksum=ebdb51f8922d2bc97457c7df376e6600d5ee9805fdc1ac7f7d6be35a3fec711b if [ "$CROSS_BUILD" ]; then hostmakedepends+=" syntax-highlighting" From 7e70c4eed57e5e6bff20ecbbfbe37ff7124ccf17 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:13 +0200 Subject: [PATCH 1096/2369] kdecoration: update to 5.24.4. --- srcpkgs/kdecoration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template index a358d713d04..511d4d62709 100644 --- a/srcpkgs/kdecoration/template +++ b/srcpkgs/kdecoration/template @@ -1,6 +1,6 @@ # Template file for 'kdecoration' pkgname=kdecoration -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kdecoration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=bbfc3d83f76dc8d2568bbe2f5395af5887eaba79094fcb901930585f8b53f636 +checksum=2c999206c51a6a6c5ecda211773276438f0069a2e1c81d4903ae5712c6f28c15 kdecoration-devel_package() { short_desc+=" - development" From b395423c462471510f6e6735b72c34204fd3e043 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:14 +0200 Subject: [PATCH 1097/2369] threadweaver: update to 5.93.0. --- srcpkgs/threadweaver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template index 9d65ff2b49d..89e6a9a71b9 100644 --- a/srcpkgs/threadweaver/template +++ b/srcpkgs/threadweaver/template @@ -1,6 +1,6 @@ # Template file for 'threadweaver' pkgname=threadweaver -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/threadweaver" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=48b0cf3d969437eaeb0839cbb16a35209336fc6e78c1540920f91bbab8b01101 +checksum=6c0db7d276052ebc4d512b43792ae2127cb5fafb1cfee890b5f20bd05c06f185 threadweaver-devel_package() { short_desc+=" - development" From 428a9d5252181ddd0e1f4949bfcc90c3c73d79e4 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:14 +0200 Subject: [PATCH 1098/2369] kdeplasma-addons5: update to 5.24.4. --- srcpkgs/kdeplasma-addons5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template index 065f0fede44..22c2981a4dd 100644 --- a/srcpkgs/kdeplasma-addons5/template +++ b/srcpkgs/kdeplasma-addons5/template @@ -1,6 +1,6 @@ # Template file for 'kdeplasma-addons5' pkgname=kdeplasma-addons5 -version=5.24.3 +version=5.24.4 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kdeplasma-addons" distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz" -checksum=86fe08a744e31ce22124bca4337633f6a2523fbc87d915d3ffd42e65da66f23c +checksum=d721d32d16f34ef1066bdf2fcb781d5bc1aca7cf5cdf3a71c6fef2dfe668680d if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 86cb5418cb228f8f519235a8dc3384ba3e6e3161 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:15 +0200 Subject: [PATCH 1099/2369] kgamma5: update to 5.24.4. --- srcpkgs/kgamma5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template index 30fa3d8e657..75f1ab3613c 100644 --- a/srcpkgs/kgamma5/template +++ b/srcpkgs/kgamma5/template @@ -1,6 +1,6 @@ # Template file for 'kgamma5' pkgname=kgamma5 -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kgamma5" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=66da3bdfaaddb70c6bbf5739eaa970c8a7f67fd8295872ee201a1445c2df9867 +checksum=73ed9897b2281a8ddd7b47f063d548fa71b683662a63b5648ba590160bcf3f7c From e93c4be22f8fc04c3bb166de76b435e9551e073b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:17 +0200 Subject: [PATCH 1100/2369] khotkeys: update to 5.24.4. --- srcpkgs/khotkeys/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template index 1a59a447a85..38c24c59dde 100644 --- a/srcpkgs/khotkeys/template +++ b/srcpkgs/khotkeys/template @@ -1,6 +1,6 @@ # Template file for 'khotkeys' pkgname=khotkeys -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/plasma/khotkeys" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=17f45fa898147b7bd9e1bd4850aef10d03c25dbfe088ef46803a817f7348afcb +checksum=5aac75b05f0b5a63ea924b02645bbfacfe18fef3d5c23182b482ebc5d17f6d0c if [ "$CROSS_BUILD" ]; then configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" From 7d274c5d4498d6360156ae157c68d31de7e9e298 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:18 +0200 Subject: [PATCH 1101/2369] kinfocenter: update to 5.24.4. --- srcpkgs/kinfocenter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template index eac578309f8..34fe68536c2 100644 --- a/srcpkgs/kinfocenter/template +++ b/srcpkgs/kinfocenter/template @@ -1,6 +1,6 @@ # Template file for 'kinfocenter' pkgname=kinfocenter -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only" homepage="https://invent.kde.org/plasma/kinfocenter" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=d2f5acb7a52434e6b539dc52d23cf09754e313411b32d169f36403ba0801e223 +checksum=dc5b84964de4b68e45300477039c656d622a9546340e997eb8249de6a532b838 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel" From 6d107a4c60b78d70b75b8dfc7dfa35fb4800f2ed Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:20 +0200 Subject: [PATCH 1102/2369] kmenuedit: update to 5.24.4. --- srcpkgs/kmenuedit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template index 02793528e9e..3f4a699195b 100644 --- a/srcpkgs/kmenuedit/template +++ b/srcpkgs/kmenuedit/template @@ -1,6 +1,6 @@ # Template file for 'kmenuedit' pkgname=kmenuedit -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kmenuedit" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=8bc5d0dfef18e4e1f561cd86f2d023b8d5f951ffd7bcc497633e4ad263cb3bfa +checksum=147a7e9a15393375c2b22b5dfb025a87f3356cf756cf3b17615ba989bb443466 From 79637193c449e0abdc336abc6a80f623f80deefb Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:21 +0200 Subject: [PATCH 1103/2369] kscreen: update to 5.24.4. --- srcpkgs/kscreen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template index 00eb087ad0a..c7f235baf15 100644 --- a/srcpkgs/kscreen/template +++ b/srcpkgs/kscreen/template @@ -1,6 +1,6 @@ # Template file for 'kscreen' pkgname=kscreen -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kscreen" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=0e814b3db2c952857bc399e9d3bc349b80ad7367ac755c22dae31004c7684bf2 +checksum=3048edb7e1231b0d7a33b2e10a202e6fce34e34f47079fc87f8177d7aa871b6a if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From ec72d2730d05b3649334a97802b6f5dae7ad8fff Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:22 +0200 Subject: [PATCH 1104/2369] kscreenlocker: update to 5.24.4. --- srcpkgs/kscreenlocker/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template index 29b2b0c4f67..4b50eb78ee5 100644 --- a/srcpkgs/kscreenlocker/template +++ b/srcpkgs/kscreenlocker/template @@ -1,6 +1,6 @@ # Template file for 'kscreenlocker' pkgname=kscreenlocker -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kscreenlocker" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=03157ca122085fd6d8eeabb369c363ef706a773ad509eb5c08722a0e4bf903b6 +checksum=fb226273064422f9f73b6b091e26396349e0cfd53a88398b79fa2acd1540ecf7 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wayland-devel" From 381835c5938dd24a972908208adb4d17e41356d5 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:24 +0200 Subject: [PATCH 1105/2369] ksshaskpass: update to 5.24.4. --- srcpkgs/ksshaskpass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template index 18b7a81583c..4deaf3217e6 100644 --- a/srcpkgs/ksshaskpass/template +++ b/srcpkgs/ksshaskpass/template @@ -1,6 +1,6 @@ # Template file for 'ksshaskpass' pkgname=ksshaskpass -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,5 +12,5 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/ksshaskpass" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=3bbe16721dabd7fbae659be3f21b4a386d8ca0a6d288c94ccd3954ecbd4d7847 +checksum=34c5d4f196d09c4ebe8990d3761bc70059436e272ad46a761e71b5910e0f44dd alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass" From 2c9cad3440b6690740a8657529c5c2e1ab8013d2 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:25 +0200 Subject: [PATCH 1106/2369] ksystemstats: update to 5.24.4. --- srcpkgs/ksystemstats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template index 65541c9fde5..f912db7fea5 100644 --- a/srcpkgs/ksystemstats/template +++ b/srcpkgs/ksystemstats/template @@ -1,6 +1,6 @@ # Template file for 'ksystemstats' pkgname=ksystemstats -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake gettext @@ -12,4 +12,4 @@ maintainer="John " license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only" homepage="https://invent.kde.org/plasma/ksystemstats" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=4c303bd73bafb254ca8bb5dee0de3b7a2ec4123e719827d26268625047bb330e +checksum=8dc735e9133ab01e537d71121b0e76e078f4fffce2d86b4c5d62c85878ee47dd From 52b7ff14f12329105004fe3533f0ed2c7f9801ec Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:27 +0200 Subject: [PATCH 1107/2369] kwallet-pam: update to 5.24.4. --- srcpkgs/kwallet-pam/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template index c32def9d2ba..9e206f9e5cc 100644 --- a/srcpkgs/kwallet-pam/template +++ b/srcpkgs/kwallet-pam/template @@ -1,6 +1,6 @@ # Template file for 'kwallet-pam' pkgname=kwallet-pam -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules" @@ -11,4 +11,4 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kwallet-pam" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=33dd50c4d9258d1e3326980192e2523490754cd1724ff704c7e36984e5cdad7f +checksum=99d4e1acc24e89376f6eb5fad78f6055b4c3a9fff73459845af32841743bdf68 From 4fb57264e722ba5f8f298806f855cd2ae7861008 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:27 +0200 Subject: [PATCH 1108/2369] oxygen-icons5: update to 5.93.0. --- srcpkgs/oxygen-icons5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template index 94d05f08582..62aa2f6abdb 100644 --- a/srcpkgs/oxygen-icons5/template +++ b/srcpkgs/oxygen-icons5/template @@ -1,6 +1,6 @@ # Template file for 'oxygen-icons5' pkgname=oxygen-icons5 -version=5.92.0 +version=5.93.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later, LGPL-3.0-or-later" homepage="https://invent.kde.org/frameworks/oxygen-icons5" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ca88b03fdd961f9f8bfa449e1fe74e3ce66e11937be9a8f6d1569a46f6429ef1 +checksum=734e3f44dc3be665350ac5de7f333ab954d3e3b777765b691603b3647c353005 conflicts="oxygen-icons>=0" oxygen-icons_package() { From 3021df9393795c13fd711aa6e226f288db9f9f1b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:28 +0200 Subject: [PATCH 1109/2369] kwayland-integration: update to 5.24.4. --- srcpkgs/kwayland-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template index 95e908c2228..d4dc57cef6d 100644 --- a/srcpkgs/kwayland-integration/template +++ b/srcpkgs/kwayland-integration/template @@ -1,6 +1,6 @@ # Template file for 'kwayland-integration' pkgname=kwayland-integration -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kwayland-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=9f6f167fd16aebf550ae9bda176237ea80efae4a08826050ccbd2d7a73de05cf +checksum=d2e74baa0e2966b92330b8df7567b0b1cc85a71ea24c3f453da39aed035aceb2 From 543f679a4e6747bfd6e355598f8e678a1efcf3c0 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:29 +0200 Subject: [PATCH 1110/2369] kwayland-server: update to 5.24.4. --- srcpkgs/kwayland-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template index 7bf6ed477fa..19bd5a8345a 100644 --- a/srcpkgs/kwayland-server/template +++ b/srcpkgs/kwayland-server/template @@ -1,6 +1,6 @@ # Template file for 'kwayland-server' pkgname=kwayland-server -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake build_helper="qemu" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/kwayland-server" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=560b20a15b459c5a1e8d0b38e9d53c3a75660bc798fa544e7a9d5c36260e063b +checksum=d1790bd7584dce9a36a432819b170ce72d34d5df79083b1b41dfe3e021b6e988 kwayland-server-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 19ebaa9b79bf4dd280a4f175617a891e24b3d7e8 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:32 +0200 Subject: [PATCH 1111/2369] kwin: update to 5.24.4. --- srcpkgs/kwin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template index 435bcc4eb3a..855d5bcaa84 100644 --- a/srcpkgs/kwin/template +++ b/srcpkgs/kwin/template @@ -1,6 +1,6 @@ # Template file for 'kwin' pkgname=kwin -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake build_helper=qemu @@ -21,7 +21,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kwin" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=d84db7e32a13177a0bd030e6c65907cc37c28efad51ee17c518e402235cbf46b +checksum=e2142321a9b1189665354838a66baeb2189235b705efca2364777bc3a3698ce3 build_options="pipewire" build_options_default="pipewire" From 27d2f0bdd32aa44e76826a1ea4008cf22de17dd5 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:33 +0200 Subject: [PATCH 1112/2369] kwrited: update to 5.24.4. --- srcpkgs/kwrited/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template index 5a556a8be1d..38a32a832c3 100644 --- a/srcpkgs/kwrited/template +++ b/srcpkgs/kwrited/template @@ -1,6 +1,6 @@ # Template file for 'kwrited' pkgname=kwrited -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,4 +11,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kwrited" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=2d768547e131aed99d165b0aee7b080e512a2a5ffab292bff8f71033631cede9 +checksum=62d700b673102f2740ed34e305902260c7035f5c8cc6ef19494a98f3088c0649 From b0daaa686eac4a38a72bfe865c3c4a426e3d5f24 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:34 +0200 Subject: [PATCH 1113/2369] layer-shell-qt: update to 5.24.4. --- srcpkgs/layer-shell-qt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template index 3642d981934..0249259ea03 100644 --- a/srcpkgs/layer-shell-qt/template +++ b/srcpkgs/layer-shell-qt/template @@ -1,6 +1,6 @@ # Template file for 'layer-shell-qt' pkgname=layer-shell-qt -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/layer-shell-qt" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=5de105ece2d7e6ca2d65305186462b0f9240930276adf7d5eedf77ffeaa67d40 +checksum=a0979fdb2f61a6d2c68fe2d93573d5b46597021600d748a379d18cb9af711e0f layer-shell-qt-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 2424d9a7a35c162e727071457f60bdd83190bb36 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:36 +0200 Subject: [PATCH 1114/2369] libkscreen: update to 5.24.4. --- srcpkgs/libkscreen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template index 5b76a89d08d..1b82bcea103 100644 --- a/srcpkgs/libkscreen/template +++ b/srcpkgs/libkscreen/template @@ -1,6 +1,6 @@ # Template file for 'libkscreen' pkgname=libkscreen -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/libkscreen" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=a6874f0f4066e16ea191341d4d7d73deaf304e117ab64306d311c862393de7a0 +checksum=016dec6d912b2a733ebdd26bfe5e31029651bd5b4e476d95a541765a68dd67f7 libkscreen-devel_package() { short_desc+=" - development" From 603583b2bfde9e957a2422e6fc3525e2b819f99d Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:37 +0200 Subject: [PATCH 1115/2369] libksysguard: update to 5.24.4. --- srcpkgs/libksysguard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template index 2fac80ddba4..c5cc1f76430 100644 --- a/srcpkgs/libksysguard/template +++ b/srcpkgs/libksysguard/template @@ -1,6 +1,6 @@ # Template file for 'libksysguard' pkgname=libksysguard -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/libksysguard" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=148651cf33c7400d7a0df507d0bb75a6924e1ae80f5a46eefeaeb44c848ff1a2 +checksum=76da2a7fb7f760c55111db756d91dd3041721baa8a1f8863ad9e0bc0a6a02402 build_options="webengine" From 2c60abb0336b12117e6cd1057ef9dce8bfc8d9b2 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:38 +0200 Subject: [PATCH 1116/2369] milou: update to 5.24.4. --- srcpkgs/milou/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template index 05ef7d33c83..fe5a6384746 100644 --- a/srcpkgs/milou/template +++ b/srcpkgs/milou/template @@ -1,6 +1,6 @@ # Template file for 'milou' pkgname=milou -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LPGL-2.1-or-later" homepage="https://invent.kde.org/plasma/milou" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=31d70b760653e0fe4b9c1b59d7601bb52d307a3d3be3b8f67550a4ea9d22bd1b +checksum=3109ad6c97415d74fccdfd26681360ff0925e58af7a1c72905437eb99faff37c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From fd7e1a26aab2d4d6313615ccaf9c050f9da69467 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:40 +0200 Subject: [PATCH 1117/2369] oxygen: update to 5.24.4. --- srcpkgs/oxygen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template index afd58f630f8..2bfa8498a22 100644 --- a/srcpkgs/oxygen/template +++ b/srcpkgs/oxygen/template @@ -1,6 +1,6 @@ # Template file for 'oxygen' pkgname=oxygen -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/oxygen" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=018dbd3c276707bbcc8515424ae45a0133cd9a2e31ffd7a0bbc25522586e400a +checksum=804d033afab3f16319d92a8e5dacfb2a5797f8661a64029ee9e9b3c0b0f87ab4 From 5eaaaaf097327e224b3f772a2f96fdf68f565949 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:42 +0200 Subject: [PATCH 1118/2369] plasma-browser-integration: update to 5.24.4. --- srcpkgs/plasma-browser-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template index e7e64687c57..ad1a10231be 100644 --- a/srcpkgs/plasma-browser-integration/template +++ b/srcpkgs/plasma-browser-integration/template @@ -1,6 +1,6 @@ # Template file for 'plasma-browser-integration' pkgname=plasma-browser-integration -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF @@ -14,4 +14,4 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/plasma-browser-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=40b07a0065bf24a78997fb210b0550642872ba8c41ba1df6c2cb6785d85851d7 +checksum=677af76b6f7072312d63bd8230af6e6920d7b69942ad69cdf0a29356ce695bc1 From 9e328eb442b865067194e4517f9e5d514867e62b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:44 +0200 Subject: [PATCH 1119/2369] plasma-desktop: update to 5.24.4. --- srcpkgs/plasma-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template index 58edbeb7f5d..6d2b3752e21 100644 --- a/srcpkgs/plasma-desktop/template +++ b/srcpkgs/plasma-desktop/template @@ -1,6 +1,6 @@ # Template file for 'plasma-desktop' pkgname=plasma-desktop -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF @@ -18,6 +18,6 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2" homepage="https://invent.kde.org/plasma/plasma-desktop" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=583e7ecfd2e2b766d645284cf13605851d96e2ad7cf2e657b4665aa3f3fd91d3 +checksum=b0e23046300e49acf93d9181d0c8dda2008a9a843a441af2528a91abc5c7d025 replaces="user-manager>=0" python_version=3 From 4da6c1e308c431162b6bace531b95b7f5c749a4f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:46 +0200 Subject: [PATCH 1120/2369] plasma-disks: update to 5.24.4. --- srcpkgs/plasma-disks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template index 9498075cb52..025d7ab6e17 100644 --- a/srcpkgs/plasma-disks/template +++ b/srcpkgs/plasma-disks/template @@ -1,6 +1,6 @@ # Template file for 'plasma-disks' pkgname=plasma-disks -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/plasma-disks" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=9e71a018eb875dd70d7b30f23937098ae8d6d9eab2306b541f916ddf6b64745a +checksum=cf8a33e81b8d3b6b2d94374eb673adec19639eef8c2df803e1721630c67525d6 From e2785b332a344ad76840477bb26c2d5fd0221f5b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:47 +0200 Subject: [PATCH 1121/2369] plasma-firewall: update to 5.24.4. --- srcpkgs/plasma-firewall/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template index 474ae2d9cf1..be8466cd08c 100644 --- a/srcpkgs/plasma-firewall/template +++ b/srcpkgs/plasma-firewall/template @@ -1,6 +1,6 @@ # Template file for 'plasma-firewall' pkgname=plasma-firewall -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcmutils @@ -11,4 +11,4 @@ maintainer="John " license="GPL-2.0-only OR GPL-3.0-only" homepage="https://invent.kde.org/network/plasma-firewall" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=bff36b7a922a6d0e5e20df539c6995d775f62a1d63c970b55bb430abd580ef64 +checksum=a2bae12766e6536b7cd6d6445368f8249bf79d488d30dc5d57e2aed6442d2f39 From 9ff41c5f729879372bd077989f6a7f3fdd450dba Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:48 +0200 Subject: [PATCH 1122/2369] plasma-integration: update to 5.24.4. --- srcpkgs/plasma-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template index 59c8998026b..b5f6098c11d 100644 --- a/srcpkgs/plasma-integration/template +++ b/srcpkgs/plasma-integration/template @@ -1,6 +1,6 @@ # Template file for 'plasma-integration' pkgname=plasma-integration -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,4 +14,4 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/plasma/plasma-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=7aef8f3b6234b402b978d12e72d9c5eb2b82cbe587afa32f288e2e160b103c0c +checksum=73d4993d2c7aeabbb068e8d28821566d04f2dcb882dd1d92feadc2062b3b4db4 From 2314abfbae864759950de75833f202efdb61018d Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:50 +0200 Subject: [PATCH 1123/2369] plasma-nm: update to 5.24.4. --- srcpkgs/plasma-nm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template index cc71c9f5492..ee283ed3c55 100644 --- a/srcpkgs/plasma-nm/template +++ b/srcpkgs/plasma-nm/template @@ -1,6 +1,6 @@ # Template file for 'plasma-nm' pkgname=plasma-nm -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-nm" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=2cf64e94ed921546bc0be44f50e3490033a353bf3f0ad7a5a513ef5585fc3bfd +checksum=086c28cfdaa6f4de785662ccd8123cd48b2a333fbaa2ca70b2a6d9dc3622ec2f if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 5b8929b33d0df6f9fd38ffa7a67da40c87af03eb Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:51 +0200 Subject: [PATCH 1124/2369] plasma-pa: update to 5.24.4. --- srcpkgs/plasma-pa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template index dd3e8e33c8a..36cffcd23b0 100644 --- a/srcpkgs/plasma-pa/template +++ b/srcpkgs/plasma-pa/template @@ -1,6 +1,6 @@ # Template file for 'plasma-pa' pkgname=plasma-pa -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-pa" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=e18fbe9cf9f2948c2d3567ba0bb71126ffef8d7c4df8084a8fa0fd48c0ca0759 +checksum=ffe5b915e5e1d2e5d4de719502793dd5b91cd9715cc44f82c88fc5ff0556d325 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel" From 535685a0d4148602bc73d783963ed688579bd50b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:53 +0200 Subject: [PATCH 1125/2369] plasma-sdk: update to 5.24.4. --- srcpkgs/plasma-sdk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template index 4d713043e9d..98e9f404e1c 100644 --- a/srcpkgs/plasma-sdk/template +++ b/srcpkgs/plasma-sdk/template @@ -1,6 +1,6 @@ # Template file for 'plasma-sdk' pkgname=plasma-sdk -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-sdk" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=f9bad013598b8d4e8b0be4ceaa5ad5f1a3326911f7b41e754d57d7a5f1f5d63c +checksum=ecf35743a28c350aada480248bbc138b726315e53f36bb39afe5fba0d27d6ffe if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From f2e2080c4ceb4bdaa15fde611e0e750a80c515f0 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:54 +0200 Subject: [PATCH 1126/2369] plasma-systemmonitor: update to 5.24.4. --- srcpkgs/plasma-systemmonitor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template index 4cdb8fc83b4..8a77dfdc149 100644 --- a/srcpkgs/plasma-systemmonitor/template +++ b/srcpkgs/plasma-systemmonitor/template @@ -1,6 +1,6 @@ # Template file for 'plasma-systemmonitor' pkgname=plasma-systemmonitor -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake @@ -12,4 +12,4 @@ maintainer="John " license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only" homepage="https://invent.kde.org/plasma/plasma-systemmonitor" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=904c0cbf56469b4b021559cc898aef57917cbe36526317c5bc7d34f255c0439d +checksum=1ff2853be75349892642a0144cc64a15c5f1bffacb0637e8b5c269055ead9a49 From 21c7e9e8975934b0bd1828bd7159db8a77634b45 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:55 +0200 Subject: [PATCH 1127/2369] plasma-thunderbolt: update to 5.24.4. --- srcpkgs/plasma-thunderbolt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template index 7fbd11daa1a..6dc40e6212f 100644 --- a/srcpkgs/plasma-thunderbolt/template +++ b/srcpkgs/plasma-thunderbolt/template @@ -1,6 +1,6 @@ # Template file for 'plasma-thunderbolt' pkgname=plasma-thunderbolt -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kcmutils @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/plasma-thunderbolt" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=52bec310386158c7f85cd6a8a7db5bedabdb8494f4c6818d8466aa33a6dba5df +checksum=1efecdd4b5e3302b37ae28964cd371d404189f7879a9752f000b6df4745b0ab3 do_check() { : # Requires running dbus and bolt services From f6747276f3051b598abfcdb95af7a99a58f739a8 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:45:57 +0200 Subject: [PATCH 1128/2369] plasma-vault: update to 5.24.4. --- srcpkgs/plasma-vault/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template index 980ab7d44e7..7010aff50a8 100644 --- a/srcpkgs/plasma-vault/template +++ b/srcpkgs/plasma-vault/template @@ -1,6 +1,6 @@ # Template file for 'plasma-vault' pkgname=plasma-vault -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake @@ -14,4 +14,4 @@ maintainer="Giuseppe Fierro " license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/KDE/plasma-vault" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=8d4998fd105073ce8ae6012426c0bd024529e0ae67c3c3ea9178918fcf87be38 +checksum=0169c2b8d48fbfccf132317f62cec342d2f1cbc7352e52a513ca575198f84966 From 5e79b8727be4e0d548e9a8bc086d5b92f13bd083 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:46:09 +0200 Subject: [PATCH 1129/2369] plasma-workspace-wallpapers: update to 5.24.4. --- srcpkgs/plasma-workspace-wallpapers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template index 4d21268470d..f0f8e072fbe 100644 --- a/srcpkgs/plasma-workspace-wallpapers/template +++ b/srcpkgs/plasma-workspace-wallpapers/template @@ -1,6 +1,6 @@ # Template file for 'plasma-workspace-wallpapers' pkgname=plasma-workspace-wallpapers -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -10,4 +10,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=da252edb70b3373c38fb30318a44f52f047d4f31cbbd26c01c30bf2398c43848 +checksum=243cf6bb613d30ccb92e183938dcd3e02c1c7a11624a447c35c56a5eac3def42 From bbafbed095bd7647f81fe7a34365216cdaa97f0b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:46:13 +0200 Subject: [PATCH 1130/2369] plasma-workspace: update to 5.24.4. --- srcpkgs/plasma-workspace/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index a8ae6f591b0..ac82a06c4a9 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -1,6 +1,6 @@ # Template file for 'plasma-workspace' pkgname=plasma-workspace -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF @@ -23,7 +23,7 @@ maintainer="John " license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-workspace" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=104c5c0ebb000f48c749a6bafdde4cbb1b06d188e1a23ef95a2d035cce442ab4 +checksum=5b0e40b090d6bd1fe1f902a60633e4417ce711b34c32bfd2fce5b16bb9b2ec70 build_options="pipewire" build_options_default="pipewire" From 571eeea76975389e93157e5835737823e5f152ac Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:46:14 +0200 Subject: [PATCH 1131/2369] polkit-kde-agent: update to 5.24.4. --- srcpkgs/polkit-kde-agent/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template index 53ebff5a685..84ef537290a 100644 --- a/srcpkgs/polkit-kde-agent/template +++ b/srcpkgs/polkit-kde-agent/template @@ -1,6 +1,6 @@ # Template file for 'polkit-kde-agent' pkgname=polkit-kde-agent -version=5.24.3 +version=5.24.4 revision=1 wrksrc="${pkgname}-1-${version}" build_style=cmake @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://commits.kde.org/polkit-kde-agent" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz" -checksum=788d392c811ee7c8098d294ccc9fff7f7a695977689a66cb4a1cb52d6f4779d5 +checksum=955246c593d0332bfbe386e81aaf7714e9ac8b8e7743c8c2e4f334b28dd685ad From 865066ca7c68f24fe75dfe57d0e19d9b8b731533 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:46:16 +0200 Subject: [PATCH 1132/2369] powerdevil: update to 5.24.4. --- srcpkgs/powerdevil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template index 3eb123d13d5..32ac96524c8 100644 --- a/srcpkgs/powerdevil/template +++ b/srcpkgs/powerdevil/template @@ -1,6 +1,6 @@ # Template file for 'powerdevil' pkgname=powerdevil -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/powerdevil" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=495275be84a96572d2e2a7ee343e1ab98c79e7c8eef402a7f26d86863e25f010 +checksum=ef70c00e36d4ddbaedeb0efeba68523289e6e112b12951460c8d36075de9546a From b972693e4cafadf979c4cd182dc56219712db5dd Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:46:17 +0200 Subject: [PATCH 1133/2369] sddm-kcm: update to 5.24.4. --- srcpkgs/sddm-kcm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template index 95d916cf3e1..e0b11b4e4cd 100644 --- a/srcpkgs/sddm-kcm/template +++ b/srcpkgs/sddm-kcm/template @@ -1,6 +1,6 @@ # Template file for 'sddm-kcm' pkgname=sddm-kcm -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,4 +14,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/sddm-kcm" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=d0d01ceda262734e87f0cfc28138a1b5478651722a703a55ac744c4e676ec696 +checksum=bef347b9e066a756d71263b19552fbbf9b8a1d6d22861060bdfd1ead5ab9d85d From 5849d4f35a07cb5ffa972a9ab805a41801d7518a Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:46:19 +0200 Subject: [PATCH 1134/2369] systemsettings: update to 5.24.4. --- srcpkgs/systemsettings/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template index 57c764dcde4..b18700451dd 100644 --- a/srcpkgs/systemsettings/template +++ b/srcpkgs/systemsettings/template @@ -1,6 +1,6 @@ # Template file for 'systemsettings' pkgname=systemsettings -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,4 +14,4 @@ maintainer="John " license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://invent.kde.org/plasma/systemsettings" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=6200618137f9a1411007a78f9b50eaf78048ce9819428d997a44816d6093d585 +checksum=69921f98956b3559f8c37821b67d32ac8d6aef254888c15df8f86f99903e1533 From b5093dcf5f1b9582bef567f546640fa8ce1c0d3a Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 01:46:20 +0200 Subject: [PATCH 1135/2369] xdg-desktop-portal-kde: update to 5.24.4. --- srcpkgs/xdg-desktop-portal-kde/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template index 23aaba046f6..9f3a47148a1 100644 --- a/srcpkgs/xdg-desktop-portal-kde/template +++ b/srcpkgs/xdg-desktop-portal-kde/template @@ -1,6 +1,6 @@ # Template file for 'xdg-desktop-portal-kde' pkgname=xdg-desktop-portal-kde -version=5.24.3 +version=5.24.4 revision=1 build_style=cmake configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b +checksum=11684916288bb4a452b75004e2d122a4a1264a562f7945af98d466e49c59dc1e From dfbe7fa063ac5df373a5fe57eb11a9a7d599991f Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Wed, 11 Mar 2020 17:05:33 -0300 Subject: [PATCH 1136/2369] New package: uucp-1.07 This package contains the standard UUCP package from the Free Software Foundation, with uucico, uusched, uuxqt, uux, uucp, uustat, uulog, uuname, uuto, uupick and cu. Added files Added install files, man manuals and patches. Fixed whitespace and using vman Removed -R Added suggested changes Added underlining New suggested changes --- srcpkgs/uucp/INSTALL | 7 + srcpkgs/uucp/files/uulog.1 | 53 + srcpkgs/uucp/files/uuname.1 | 33 + srcpkgs/uucp/files/uupick.1 | 34 + srcpkgs/uucp/files/uusched.8 | 20 + srcpkgs/uucp/files/uuto.1 | 21 + srcpkgs/uucp/patches/compiler-warnings.patch | 15 + srcpkgs/uucp/patches/manpage.patch | 189 + srcpkgs/uucp/patches/no-sleep.patch | 65 + .../option-to-not-force-hw-control.patch | 321 + srcpkgs/uucp/patches/spelling.patch | 28 + srcpkgs/uucp/patches/uucp-alt-misc.patch | 111 + srcpkgs/uucp/patches/uucp-org.patch | 8833 +++++++++++++++++ .../patches/wait-for-correct-parent.patch | 19 + .../uucp/patches/zpipe-improved-pipe.patch | 40 + srcpkgs/uucp/template | 39 + 16 files changed, 9828 insertions(+) create mode 100644 srcpkgs/uucp/INSTALL create mode 100644 srcpkgs/uucp/files/uulog.1 create mode 100644 srcpkgs/uucp/files/uuname.1 create mode 100644 srcpkgs/uucp/files/uupick.1 create mode 100644 srcpkgs/uucp/files/uusched.8 create mode 100644 srcpkgs/uucp/files/uuto.1 create mode 100644 srcpkgs/uucp/patches/compiler-warnings.patch create mode 100644 srcpkgs/uucp/patches/manpage.patch create mode 100644 srcpkgs/uucp/patches/no-sleep.patch create mode 100644 srcpkgs/uucp/patches/option-to-not-force-hw-control.patch create mode 100644 srcpkgs/uucp/patches/spelling.patch create mode 100644 srcpkgs/uucp/patches/uucp-alt-misc.patch create mode 100644 srcpkgs/uucp/patches/uucp-org.patch create mode 100644 srcpkgs/uucp/patches/wait-for-correct-parent.patch create mode 100644 srcpkgs/uucp/patches/zpipe-improved-pipe.patch create mode 100644 srcpkgs/uucp/template diff --git a/srcpkgs/uucp/INSTALL b/srcpkgs/uucp/INSTALL new file mode 100644 index 00000000000..b82c17321a2 --- /dev/null +++ b/srcpkgs/uucp/INSTALL @@ -0,0 +1,7 @@ +case ${ACTION} in +post) + # fix permissions and owners + chown _uucp:_uucp usr/bin/uucico usr/bin/uuxqt usr/bin/uux usr/bin/uucp usr/bin/uustat usr/bin/uuname usr/bin/cu + chmod 4555 usr/bin/uucico usr/bin/uuxqt usr/bin/uux usr/bin/uucp usr/bin/uustat usr/bin/uuname usr/bin/cu + ;; +esac diff --git a/srcpkgs/uucp/files/uulog.1 b/srcpkgs/uucp/files/uulog.1 new file mode 100644 index 00000000000..001c9bb6993 --- /dev/null +++ b/srcpkgs/uucp/files/uulog.1 @@ -0,0 +1,53 @@ +.\" This is under the same license as uulog itself +.TH UULOG 1 +.SH NAME +uulog \- Display the UUCP log file. +.SH SYNOPSIS +.B uulog +[\fI\-n number\fR] [\fI\-sf system\fR] [\fI\-u user\fR] [\fI\-DSF\fR] +[\fI\-I file\fR] [\fI\-X debug\fR] +.SH DESCRIPTION +.I Uulog +is a program that displays the log file for the Taylor UUCP service. +.SH OPTIONS +.TP +\fB-n\fR, \fB--lines\fR \fInumber\fR +Show the given number of lines from the end of the log. +.TP +\fB-s\fR, \fB--system\fR \fIsystem\fR +Print entries for the named system. +.TP +\fB-f\fR \fIsystem\fR, \fB--follow\fR=\fIsystem\fR +Follow entries for the named system. +.TP +\fB-u\fR, \fB--user\fR \fIuser\fR +Print entries for the named user. +.TP +\fB-F\fR, \fB--follow\fR +Follow entries for any system. +.TP +\fB-S\fR, \fB--statslog\fR +Show the statistics file. +.TP +\fB-D\fR, \fB--debuglog\fR +Show the debugging file. +.TP +\fB-X\fR, \fB--debug\fR \fIdebug\fR +Set the debugging level. +.TP +\fB-I\fR, \fB--config\fR \fIfile\fR +Set the configuration file to use. +.TP +\fB-v\fR, \fB--version\fR +Print the software version and exit. +.TP +\fB--help\fR +Print a help screen and exit. +.SH BUGS +According to comments in the source, this is a pretty bad implementation +of uulog. It only takes a single \-s and/or \-u switch. +.SH "SEE ALSO" +.BR uucp(1) +.SH AUTHOR +This manual page is a quick write-up for Debian done by Kevin Kreamer +, by making a manpage out of \fBuulog\fR \fI--help\fR. diff --git a/srcpkgs/uucp/files/uuname.1 b/srcpkgs/uucp/files/uuname.1 new file mode 100644 index 00000000000..3a23e9407f5 --- /dev/null +++ b/srcpkgs/uucp/files/uuname.1 @@ -0,0 +1,33 @@ +.\" This is under the same license as uuname itself +.TH UUNAME 1 +.SH NAME +uuname \- List the names of the known remote UUCP sites. +.SH SYNOPSIS +.B uuname +[\fI\-a\fR] [\fI\-l\fR] [\fI\-I file\fR] +.SH DESCRIPTION +.I Uuname +is a program that lists the names of the known remote UUCP sites. +.SH OPTIONS +.TP +\fB-a\fR, \fB--aliases\fR +Display aliases. +.TP +\fB-l\fR, \fB--local\fR +Print the local name. +.TP +\fB-I\fR, \fB--config\fR \fIfile\fR +Set the configuration file to use. +.TP +\fB-v\fR, \fB--version\fR +Print the software version and exit. +.TP +\fB--help\fR +Print a help screen and exit. +.SH BUGS +None apparent. +.SH "SEE ALSO" +.BR uucp(1) +.SH AUTHOR +This manual page is a quick write-up for Debian done by Kevin Kreamer +, by making a manpage out of \fBuuname\fR \fI--help\fR. diff --git a/srcpkgs/uucp/files/uupick.1 b/srcpkgs/uucp/files/uupick.1 new file mode 100644 index 00000000000..d2b9377d08f --- /dev/null +++ b/srcpkgs/uucp/files/uupick.1 @@ -0,0 +1,34 @@ +.\" This is under the same license as uupick itself +.TH UUPICK 1 +.SH NAME +uupick \- Get files stored in the public directory by uucp \-t. +.SH SYNOPSIS +.B uupick +[\fI\-s system\fR] [\fI\-x debug\fR] [\fI\-I file\fR] +.SH DESCRIPTION +.I Uupick +is a program that gets the files stored in the public directory +by uucp \-t. +.SH OPTIONS +.TP +\fB-s\fR, \fB--system\fR \fIsystem\fR +Only consider files from named system. +.TP +\fB-x\fR, \fB--debug\fR \fIdebug\fR +Set the debugging level. +.TP +\fB-I\fR, \fB--config\fR \fIfile\fR +Set the configuration file to use. +.TP +\fB-v\fR, \fB--version\fR +Print the software version and exit. +.TP +\fB--help\fR +Print a help screen and exit. +.SH BUGS +None apparent. +.SH "SEE ALSO" +.BR uucp(1) +.SH AUTHOR +This manual page is a quick write-up for Debian done by Kevin Kreamer +, by making a manpage out of \fBuupick\fR \fI--help\fR. diff --git a/srcpkgs/uucp/files/uusched.8 b/srcpkgs/uucp/files/uusched.8 new file mode 100644 index 00000000000..17a00d68ee2 --- /dev/null +++ b/srcpkgs/uucp/files/uusched.8 @@ -0,0 +1,20 @@ +.\" This is under the same license as uusched itself +.TH UUSCHED 8 +.SH NAME +uusched \- Call all systems which have work in a random order. +.SH SYNOPSIS +.B uusched +.SH DESCRIPTION +.I Uusched +is a program that calls all systems which have work in a random order. +.SH OPTIONS +Since this a simply a shell script which execs uucico(8), see that manpage +for further options. +.SH BUGS +None apparent. +.SH "SEE ALSO" +.BR uucico(8), +.BR sh(1) +.SH AUTHOR +This manual page is a quick write-up for Debian done by Kevin Kreamer +. diff --git a/srcpkgs/uucp/files/uuto.1 b/srcpkgs/uucp/files/uuto.1 new file mode 100644 index 00000000000..1d35efff7c4 --- /dev/null +++ b/srcpkgs/uucp/files/uuto.1 @@ -0,0 +1,21 @@ +.\" This is under the same license as uuto itself +.TH UUTO 1 +.SH NAME +uuto \- Send files to a user on another system. +.SH SYNOPSIS +.B uuto +\fIsystem!user\fR +.SH DESCRIPTION +.I Uuto +is a program that sends files to a user on another system. +.SH OPTIONS +Since this a simply a shell script that execs uucp(1), see that manpage +for further options. +.SH BUGS +None apparent. +.SH "SEE ALSO" +.BR uucp(1), +.BR sh(1) +.SH AUTHOR +This manual page is a quick write-up for Debian done by Kevin Kreamer +. diff --git a/srcpkgs/uucp/patches/compiler-warnings.patch b/srcpkgs/uucp/patches/compiler-warnings.patch new file mode 100644 index 00000000000..5e9dc93d04f --- /dev/null +++ b/srcpkgs/uucp/patches/compiler-warnings.patch @@ -0,0 +1,15 @@ +Description: remove compiler warnings that nowadays result in errors +Author: Thorsten Alteholz +Index: uucp/uuconv.c +=================================================================== +--- uucp.orig/uuconv.c 2013-04-26 16:06:16.000000000 +0200 ++++ uucp/uuconv.c 2013-05-08 10:49:06.000000000 +0200 +@@ -676,7 +676,7 @@ + { + if ((*pz)[0] != '-' && pz != pzarg) + fprintf (e, " "); +- fprintf (e, *pz); ++ fprintf (e, "%s", *pz); + } + } + diff --git a/srcpkgs/uucp/patches/manpage.patch b/srcpkgs/uucp/patches/manpage.patch new file mode 100644 index 00000000000..573deb3f2c7 --- /dev/null +++ b/srcpkgs/uucp/patches/manpage.patch @@ -0,0 +1,189 @@ +Description: lintian detects some issues with these manpages +Author: Thorsten Alteholz +Index: uucp-1.07/contrib/uurate.man +=================================================================== +--- uucp-1.07.orig/contrib/uurate.man 2019-01-12 19:51:27.939352539 +0100 ++++ uucp-1.07/contrib/uurate.man 2019-01-12 19:51:27.927352540 +0100 +@@ -1,4 +1,4 @@ +-''' $Id: uurate.man,v 1.4 1993/09/28 17:38:31 kdburg Rel $ ++.\" ''' $Id: uurate.man,v 1.4 1993/09/28 17:38:31 kdburg Rel $ + .TH uurate 1 + .SH NAME + uurate \- Report Taylor UUCP statistics +Index: uucp-1.07/uucp.1 +=================================================================== +--- uucp-1.07.orig/uucp.1 2019-01-12 19:51:27.939352539 +0100 ++++ uucp-1.07/uucp.1 2019-01-12 19:52:26.547350782 +0100 +@@ -1,4 +1,4 @@ +-''' $Id: uucp.1,v 1.12 2002/03/05 22:13:33 ian Rel $ ++.\"''' $Id: uucp.1,v 1.12 2002/03/05 22:13:33 ian Rel $ + .TH uucp 1 "Taylor UUCP 1.07" + .SH NAME + uucp \- Unix to Unix copy +@@ -67,10 +67,10 @@ + .I uucico + (8) daemon, the copy will fail. The files must be readable by the + .I uucico +-(8) daemon, and by the invoking user. ++(8) daemon, and by the invoking user. This is the default. + .TP 5 + .B \-C, \-\-copy +-Copy local source files to the spool directory. This is the default. ++Copy local source files to the spool directory. + .TP 5 + .B \-d, \-\-directories + Create all necessary directories when doing the copy. This is the +Index: uucp-1.07/uustat.1 +=================================================================== +--- uucp-1.07.orig/uustat.1 2019-01-12 19:51:27.939352539 +0100 ++++ uucp-1.07/uustat.1 2019-01-12 19:51:27.927352540 +0100 +@@ -1,4 +1,4 @@ +-''' $Id: uustat.1,v 1.14 2002/03/05 22:15:10 ian Rel $ ++.\" ''' $Id: uustat.1,v 1.14 2002/03/05 22:15:10 ian Rel $ + .TH uustat 1 "Taylor UUCP 1.07" + .SH NAME + uustat \- UUCP status inquiry and control +@@ -404,7 +404,7 @@ + .SH EXAMPLES + .br + .nf +-uustat --all ++uustat \-\-all + .fi + Display status of all jobs. A sample output line is as follows: + .br +@@ -441,7 +441,7 @@ + + .br + .nf +-uustat --executions ++uustat \-\-executions + .fi + Display status of queued up execution requests. A sample output line + is as follows: +@@ -472,7 +472,7 @@ + + .br + .nf +-uustat --list ++uustat \-\-list + .fi + Display status for all systems with queued up commands. A sample + output line is as follows: +@@ -489,7 +489,7 @@ + + .br + .nf +-uustat --status ++uustat \-\-status + .fi + Display conversation status for all remote systems. A sample output + line is as follows: +@@ -509,7 +509,7 @@ + + .br + .nf +-uustat --ps ++uustat \-\-ps + .fi + Display the status of all processes holding UUCP locks. The output + format is system dependent, as +@@ -521,7 +521,7 @@ + .br + .in +0.5i + .nf +-uustat --command rmail --older-than 168 --kill-all --no-list --mail --notify --comment "Queued for over 1 week" ++uustat \-\-command rmail \-\-older\-than 168 \-\-kill\-all \-\-no\-list \-\-mail \-\-notify \-\-comment "Queued for over 1 week" + .fi + .in -0.5i + This will kill all +Index: uucp-1.07/cu.1 +=================================================================== +--- uucp-1.07.orig/cu.1 2019-01-12 19:51:27.939352539 +0100 ++++ uucp-1.07/cu.1 2019-01-12 19:58:34.000000000 +0100 +@@ -1,4 +1,4 @@ +-''' $Id: cu.1,v 1.10 2002/03/05 22:13:33 ian Rel $ ++.\" ''' $Id: cu.1,v 1.10 2002/03/05 22:13:33 ian Rel $ + .TH cu 1 "Taylor UUCP 1.07" + .SH NAME + cu \- Call up another system +Index: uucp-1.07/uucico.8 +=================================================================== +--- uucp-1.07.orig/uucico.8 2019-01-12 19:51:27.939352539 +0100 ++++ uucp-1.07/uucico.8 2019-01-12 19:51:27.927352540 +0100 +@@ -1,4 +1,4 @@ +-''' $Id: uucico.8,v 1.20 2002/03/05 22:20:48 ian Rel $ ++.\" ''' $Id: uucico.8,v 1.20 2002/03/05 22:20:48 ian Rel $ + .TH uucico 8 "Taylor UUCP 1.07" + .SH NAME + uucico \- UUCP file transfer daemon +@@ -56,7 +56,7 @@ + .I uucico + will normally refuse to retry the + call until a certain (configurable) amount of time +-has passed. This may be overriden by the ++has passed. This may be overridden by the + .B -f, + .B --force, + or +@@ -175,11 +175,11 @@ + .B \-\-system, + or + .B \-S +-is specifed, or to all systems which have work when just ++is specified, or to all systems which have work when just + .B \-r1 + or + .B \-\-master +-is specifed), begin an endless loop as with ++is specified), begin an endless loop as with + .B \-\-loop. + .TP 5 + .B \-q, \-\-nouuxqt +Index: uucp-1.07/uux.1 +=================================================================== +--- uucp-1.07.orig/uux.1 2019-01-12 19:51:27.939352539 +0100 ++++ uucp-1.07/uux.1 2019-01-12 19:51:27.931352540 +0100 +@@ -1,4 +1,4 @@ +-''' $Id: uux.1,v 1.15 2002/03/05 22:20:48 ian Rel $ ++.\" ''' $Id: uux.1,v 1.15 2002/03/05 22:20:48 ian Rel $ + .TH uux 1 "Taylor UUCP 1.07" + .SH NAME + uux \- Remote command execution over UUCP +@@ -202,7 +202,7 @@ + .SH EXAMPLES + .br + .nf +-uux -z - sys1!rmail user1 ++uux \-z \- sys1!rmail user1 + .fi + Execute the command ``rmail user1'' on the system sys1, giving it as + standard input whatever is given to +@@ -213,7 +213,7 @@ + + .br + .nf +-uux 'diff -c sys1!~user1/file1 sys2!~user2/file2 >!file.diff' ++uux 'diff \-c sys1!~user1/file1 sys2!~user2/file2 >!file.diff' + .fi + Fetch the two named files from system sys1 and system sys2 and execute + .I diff +Index: uucp-1.07/uuxqt.8 +=================================================================== +--- uucp-1.07.orig/uuxqt.8 2019-01-12 19:51:27.939352539 +0100 ++++ uucp-1.07/uuxqt.8 2019-01-12 19:51:27.931352540 +0100 +@@ -1,4 +1,4 @@ +-''' $Id: uuxqt.8,v 1.10 2002/03/05 22:20:48 ian Rel $ ++.\" ''' $Id: uuxqt.8,v 1.10 2002/03/05 22:20:48 ian Rel $ + .TH uuxqt 8 "Taylor UUCP 1.07" + .SH NAME + uuxqt \- UUCP execution daemon +@@ -41,7 +41,7 @@ + .br + .in +0.5i + .nf +-uuxqt --command rmail ++uuxqt \-\-command rmail + .fi + .in -0.5i + .TP 5 diff --git a/srcpkgs/uucp/patches/no-sleep.patch b/srcpkgs/uucp/patches/no-sleep.patch new file mode 100644 index 00000000000..b8b43350770 --- /dev/null +++ b/srcpkgs/uucp/patches/no-sleep.patch @@ -0,0 +1,65 @@ +Description: avoid sleeps +Author: Frank Heckenbach +Index: uucp-1.07/prott.c +=================================================================== +--- uucp-1.07.orig/prott.c 2017-09-27 12:24:15.963165757 +0200 ++++ uucp-1.07/prott.c 2017-09-27 12:24:15.959165687 +0200 +@@ -88,7 +88,7 @@ + zTbuf[0] = 0; + zTbuf[1] = 0; + fTfile = FALSE; +- usysdep_sleep (2); ++ // usysdep_sleep (2); -- why? protocol t is meant to be used over an error-free connection + return TRUE; + } + +Index: uucp-1.07/unix/pipe.c +=================================================================== +--- uucp-1.07.orig/unix/pipe.c 2017-09-27 12:24:15.963165757 +0200 ++++ uucp-1.07/unix/pipe.c 2017-09-27 12:24:15.959165687 +0200 +@@ -165,10 +165,43 @@ + if (qsysdep->ipid >= 0) + { + if (kill (qsysdep->ipid, SIGHUP) == 0) +- usysdep_sleep (2); ++ { ++ #if defined (HAVE_USLEEP) && defined (HAVE_WAITPID) ++ /* Avoid wasting 4 seconds (including the SIGPIPE case below). ++ Quick and dirty work-around to avoid depending on SIGCHLD: ++ Just sleep up to 20 times 0.1s as long as the child exists. */ ++ int i, status; ++ for (i = 20; i > 0; i--) ++ { ++ if (waitpid (qsysdep->ipid, &status, WNOHANG) == qsysdep->ipid) ++ { ++ qsysdep->ipid = -1; ++ return fret; ++ } ++ usleep (100000); ++ } ++ #else ++ usysdep_sleep (2); ++ #endif ++ } + #ifdef SIGPIPE + if (kill (qsysdep->ipid, SIGPIPE) == 0) +- usysdep_sleep (2); ++ { ++ #if HAVE_USLEEP ++ int i, status; ++ for (i = 20; i > 0; i--) ++ { ++ if (waitpid (qsysdep->ipid, &status, WNOHANG) == qsysdep->ipid) ++ { ++ qsysdep->ipid = -1; ++ return fret; ++ } ++ usleep (100000); ++ } ++ #else ++ usysdep_sleep (2); ++ #endif ++ } + #endif + if (kill (qsysdep->ipid, SIGKILL) < 0 && errno == EPERM) + { diff --git a/srcpkgs/uucp/patches/option-to-not-force-hw-control.patch b/srcpkgs/uucp/patches/option-to-not-force-hw-control.patch new file mode 100644 index 00000000000..3a7e4ea91fa --- /dev/null +++ b/srcpkgs/uucp/patches/option-to-not-force-hw-control.patch @@ -0,0 +1,321 @@ +Description: avoid forcing hw control +Author: Michal Suchanek +Index: uucp-1.07/conn.h +=================================================================== +--- uucp-1.07.orig/conn.h 2013-12-04 11:20:23.722208868 +0100 ++++ uucp-1.07/conn.h 2013-12-04 11:20:26.022181350 +0100 +@@ -117,7 +117,7 @@ + boolean (*pfunlock) P((struct sconnection *qconn)); + /* Open the connection. */ + boolean (*pfopen) P((struct sconnection *qconn, long ibaud, +- boolean fwait, boolean fuser)); ++ boolean fwait, boolean fuser, boolean nortscts)); + /* Close the connection. */ + boolean (*pfclose) P((struct sconnection *qconn, + pointer puuconf, +@@ -198,7 +198,7 @@ + than the effective permissions. */ + extern boolean fconn_open P((struct sconnection *qconn, long ibaud, + long ihighbaud, boolean fwait, +- boolean fuser)); ++ boolean fuser, boolean nortscts)); + + /* Close a connection. The fsuccess argument is TRUE if the + conversation completed normally, FALSE if it is being aborted. */ +Index: uucp-1.07/cu.c +=================================================================== +--- uucp-1.07.orig/cu.c 2013-12-04 11:20:23.722208868 +0100 ++++ uucp-1.07/cu.c 2013-12-04 11:27:03.353425764 +0100 +@@ -223,6 +223,7 @@ + { "baud", required_argument, NULL, 's' }, + { "mapcr", no_argument, NULL, 't' }, + { "nostop", no_argument, NULL, 3 }, ++ { "nortscts", no_argument, NULL, 'f' }, + { "system", required_argument, NULL, 'z' }, + { "config", required_argument, NULL, 'I' }, + { "debug", required_argument, NULL, 'x' }, +@@ -258,6 +259,8 @@ + enum txonxoffsetting txonxoff = XONXOFF_ON; + /* -I: configuration file name. */ + const char *zconfig = NULL; ++ /* -f: no hardware flow control */ ++ boolean nortscts = FALSE; + int iopt; + pointer puuconf; + int iuuconf; +@@ -295,7 +298,7 @@ + } + } + +- while ((iopt = getopt_long (argc, argv, "a:c:deE:hnI:l:op:s:tvx:z:", ++ while ((iopt = getopt_long (argc, argv, "a:c:deE:fhnI:l:op:s:tvx:z:", + asCulongopts, (int *) NULL)) != EOF) + { + switch (iopt) +@@ -322,6 +325,11 @@ + zCuvar_escape = optarg; + break; + ++ case 'f': ++ /* No hardware flow control. */ ++ nortscts = TRUE; ++ break; ++ + case 'h': + /* Local echo. */ + fCulocalecho = TRUE; +@@ -682,7 +690,7 @@ + } + + /* Here we have locked a connection to use. */ +- if (! fconn_open (&sconn, iusebaud, ihighbaud, FALSE, sinfo.fdirect)) ++ if (! fconn_open (&sconn, iusebaud, ihighbaud, FALSE, sinfo.fdirect, nortscts)) + ucuabort (); + + fCuclose_conn = TRUE; +Index: uucp-1.07/conn.c +=================================================================== +--- uucp-1.07.orig/conn.c 2013-12-04 11:20:23.722208868 +0100 ++++ uucp-1.07/conn.c 2013-12-04 11:20:26.026181299 +0100 +@@ -114,12 +114,13 @@ + /* Open a connection. */ + + boolean +-fconn_open (qconn, ibaud, ihighbaud, fwait, fuser) ++fconn_open (qconn, ibaud, ihighbaud, fwait, fuser, nortscts) + struct sconnection *qconn; + long ibaud; + long ihighbaud; + boolean fwait; + boolean fuser; ++ boolean nortscts; + { + boolean fret; + +@@ -177,7 +178,7 @@ + else + ulog_device (qconn->qport->uuconf_zname); + +- fret = (*qconn->qcmds->pfopen) (qconn, ibaud, fwait, fuser); ++ fret = (*qconn->qcmds->pfopen) (qconn, ibaud, fwait, fuser, nortscts); + + if (! fret) + ulog_device ((const char *) NULL); +Index: uucp-1.07/uucico.c +=================================================================== +--- uucp-1.07.orig/uucico.c 2013-12-04 11:20:23.722208868 +0100 ++++ uucp-1.07/uucico.c 2013-12-04 11:20:26.026181299 +0100 +@@ -695,7 +695,7 @@ + + if (fret) + { +- if (! fconn_open (&sconn, (long) 0, (long) 0, TRUE, FALSE)) ++ if (! fconn_open (&sconn, (long) 0, (long) 0, TRUE, FALSE, FALSE)) + fret = FALSE; + qConn = &sconn; + } +@@ -714,7 +714,7 @@ + (struct uuconf_dialer *) NULL, + TRUE) + || ! fconn_open (&sconn, (long) 0, (long) 0, TRUE, +- FALSE)) ++ FALSE, FALSE)) + break; + } + fret = FALSE; +@@ -1176,7 +1176,7 @@ + } + + if (! fconn_open (&sconn, qsys->uuconf_ibaud, qsys->uuconf_ihighbaud, +- FALSE, FALSE)) ++ FALSE, FALSE, FALSE)) + { + terr = STATUS_PORT_FAILED; + fret = FALSE; +Index: uucp-1.07/unix/pipe.c +=================================================================== +--- uucp-1.07.orig/unix/pipe.c 2013-12-04 11:20:23.722208868 +0100 ++++ uucp-1.07/unix/pipe.c 2013-12-04 11:20:26.026181299 +0100 +@@ -49,7 +49,7 @@ + + static void uspipe_free P((struct sconnection *qconn)); + static boolean fspipe_open P((struct sconnection *qconn, long ibaud, +- boolean fwait, boolean fuser)); ++ boolean fwait, boolean fuser, boolean nortscts)); + static boolean fspipe_close P((struct sconnection *qconn, + pointer puuconf, + struct uuconf_dialer *qdialer, +@@ -115,11 +115,12 @@ + + /*ARGSUSED*/ + static boolean +-fspipe_open (qconn, ibaud, fwait, fuser) ++fspipe_open (qconn, ibaud, fwait, fuser, nortscts) + struct sconnection *qconn ATTRIBUTE_UNUSED; + long ibaud ATTRIBUTE_UNUSED; + boolean fwait; + boolean fuser ATTRIBUTE_UNUSED; ++ boolean nortscts ATTRIBUTE_UNUSED; + { + /* We don't do incoming waits on pipes. */ + if (fwait) +Index: uucp-1.07/unix/serial.c +=================================================================== +--- uucp-1.07.orig/unix/serial.c 2013-12-04 11:20:23.722208868 +0100 ++++ uucp-1.07/unix/serial.c 2013-12-04 11:20:26.026181299 +0100 +@@ -246,11 +246,11 @@ + boolean fwait, boolean fuser, + enum tclocal_setting tlocal)); + static boolean fsstdin_open P((struct sconnection *qconn, long ibaud, +- boolean fwait, boolean fuser)); ++ boolean fwait, boolean fuser, boolean nortscts)); + static boolean fsmodem_open P((struct sconnection *qconn, long ibaud, +- boolean fwait, boolean fuser)); ++ boolean fwait, boolean fuser, boolean nortscts)); + static boolean fsdirect_open P((struct sconnection *qconn, long ibaud, +- boolean fwait, boolean fuser)); ++ boolean fwait, boolean fuser, boolean nortscts)); + static boolean fsblock P((struct ssysdep_conn *q, boolean fblock)); + static boolean fsserial_close P((struct ssysdep_conn *q)); + static boolean fsstdin_close P((struct sconnection *qconn, +@@ -1308,11 +1308,12 @@ + call to fsblock. */ + + static boolean +-fsstdin_open (qconn, ibaud, fwait, fuser) ++fsstdin_open (qconn, ibaud, fwait, fuser, nortscts) + struct sconnection *qconn; + long ibaud; + boolean fwait; + boolean fuser; ++ boolean nortscts; + { + struct ssysdep_conn *q; + +@@ -1323,6 +1324,9 @@ + q->o = q->ord; + if (! fsserial_open (qconn, ibaud, fwait, fuser, IGNORE_CLOCAL)) + return FALSE; ++ if (nortscts ++ && ! fsserial_hardflow (qconn, FALSE)) ++ return FALSE; + q->iwr_flags = fcntl (q->owr, F_GETFL, 0); + if (q->iwr_flags < 0) + { +@@ -1335,11 +1339,12 @@ + /* Open a modem port. */ + + static boolean +-fsmodem_open (qconn, ibaud, fwait, fuser) ++fsmodem_open (qconn, ibaud, fwait, fuser, nortscts) + struct sconnection *qconn; + long ibaud; + boolean fwait; + boolean fuser; ++ boolean nortscts; + { + struct uuconf_modem_port *qm; + +@@ -1356,7 +1361,10 @@ + out, because some modems don't assert the necessary signals until + they see carrier. Instead, we turn on hardware flow control in + fsmodem_carrier. */ +- if (fwait ++ if (nortscts ++ && ! fsserial_hardflow (qconn, FALSE)) ++ return FALSE; ++ else if (fwait + && ! fsserial_hardflow (qconn, qm->uuconf_fhardflow)) + return FALSE; + +@@ -1366,11 +1374,12 @@ + /* Open a direct port. */ + + static boolean +-fsdirect_open (qconn, ibaud, fwait, fuser) ++fsdirect_open (qconn, ibaud, fwait, fuser, nortscts) + struct sconnection *qconn; + long ibaud; + boolean fwait; + boolean fuser; ++ boolean nortscts; + { + struct uuconf_direct_port *qd; + +@@ -1383,7 +1392,7 @@ + + /* Always turn on hardware flow control for a direct port when it is + opened. There is no other sensible time to turn it on. */ +- return fsserial_hardflow (qconn, qd->uuconf_fhardflow); ++ return fsserial_hardflow (qconn, qd->uuconf_fhardflow && ! nortscts); + } + + /* Change the blocking status of the port. We keep track of the +Index: uucp-1.07/unix/tcp.c +=================================================================== +--- uucp-1.07.orig/unix/tcp.c 2013-12-04 11:20:23.722208868 +0100 ++++ uucp-1.07/unix/tcp.c 2013-12-04 11:20:26.026181299 +0100 +@@ -78,7 +78,7 @@ + #endif + static boolean ftcp_set_flags P((struct ssysdep_conn *qsysdep)); + static boolean ftcp_open P((struct sconnection *qconn, long ibaud, +- boolean fwait, boolean fuser)); ++ boolean fwait, boolean fuser, boolean nortscts)); + static boolean ftcp_close P((struct sconnection *qconn, + pointer puuconf, + struct uuconf_dialer *qdialer, +@@ -208,11 +208,12 @@ + system. */ + + static boolean +-ftcp_open (qconn, ibaud, fwait, fuser) ++ftcp_open (qconn, ibaud, fwait, fuser, nortscts) + struct sconnection *qconn; + long ibaud ATTRIBUTE_UNUSED; + boolean fwait; + boolean fuser ATTRIBUTE_UNUSED; ++ boolean nortscts ATTRIBUTE_UNUSED; + { + struct ssysdep_conn *qsysdep; + const char *zport; +Index: uucp-1.07/unix/tli.c +=================================================================== +--- uucp-1.07.orig/unix/tli.c 2013-12-04 11:20:23.722208868 +0100 ++++ uucp-1.07/unix/tli.c 2013-12-04 11:20:26.026181299 +0100 +@@ -106,7 +106,7 @@ + static void utli_free P((struct sconnection *qconn)); + static boolean ftli_push P((struct sconnection *qconn)); + static boolean ftli_open P((struct sconnection *qconn, long ibaud, +- boolean fwait, boolean fuser)); ++ boolean fwait, boolean fuser, boolean nortscts)); + static boolean ftli_close P((struct sconnection *qconn, + pointer puuconf, + struct uuconf_dialer *qdialer, +@@ -238,11 +238,12 @@ + system. */ + + static boolean +-ftli_open (qconn, ibaud, fwait, fuser) ++ftli_open (qconn, ibaud, fwait, fuser, nortscts) + struct sconnection *qconn; + long ibaud; + boolean fwait; + boolean fuser ATTRIBUTE_UNUSED; ++ boolean nortscts ATTRIBUTE_UNUSED; + { + struct ssysdep_conn *qsysdep; + const char *zdevice; +Index: uucp-1.07/cu.1 +=================================================================== +--- uucp-1.07.orig/cu.1 2013-12-04 11:20:23.722208868 +0100 ++++ uucp-1.07/cu.1 2013-12-04 11:20:26.026181299 +0100 +@@ -231,6 +231,9 @@ + .B \-\-nostop + Turn off XON/XOFF handling (it is on by default). + .TP 5 ++.B \-f, \-\-nortscts ++Do not use hardware flow control. ++.TP 5 + .B \-E char, \-\-escape char + Set the escape character. Initially + .B ~ diff --git a/srcpkgs/uucp/patches/spelling.patch b/srcpkgs/uucp/patches/spelling.patch new file mode 100644 index 00000000000..b96223fcd23 --- /dev/null +++ b/srcpkgs/uucp/patches/spelling.patch @@ -0,0 +1,28 @@ +Author: Thorsten Alteholz +Description: correct spelling error in binary +Index: uucp-1.07/cu.c +=================================================================== +--- uucp-1.07.orig/cu.c 2019-01-12 19:50:00.447355162 +0100 ++++ uucp-1.07/cu.c 2019-01-12 19:50:00.435355162 +0100 +@@ -1756,7 +1756,7 @@ + zfrom = zbufcpy (argv[1]); + else + { +- zfrom = zsysdep_terminal_line ("Remote file to retreive: "); ++ zfrom = zsysdep_terminal_line ("Remote file to retrieve: "); + if (zfrom == NULL) + ucuabort (); + zfrom[strcspn (zfrom, " \t\n")] = '\0'; +Index: uucp-1.07/uuxqt.c +=================================================================== +--- uucp-1.07.orig/uuxqt.c 2003-05-29 08:08:48.000000000 +0200 ++++ uucp-1.07/uuxqt.c 2019-01-12 19:50:32.907354189 +0100 +@@ -1517,7 +1517,7 @@ + az[i++] = zQcmd; + az[i++] = "\n"; + +- (void) fsysdep_mail (zmail, "Execution succeded", i, az); ++ (void) fsysdep_mail (zmail, "Execution succeeded", i, az); + } + + /* Now we may have to uucp the output to some other machine. */ diff --git a/srcpkgs/uucp/patches/uucp-alt-misc.patch b/srcpkgs/uucp/patches/uucp-alt-misc.patch new file mode 100644 index 00000000000..841b2e21283 --- /dev/null +++ b/srcpkgs/uucp/patches/uucp-alt-misc.patch @@ -0,0 +1,111 @@ +--- uucp-1.07.orig/policy.h 2003-05-29 03:08:45.000000000 -0300 ++++ uucp-1.07.orig/policy.h 2020-03-09 03:48:58.317291375 -0300 +@@ -240,8 +240,8 @@ + the sendmail choice below. Otherwise, select one of the other + choices as appropriate. */ + #if 1 +-#define MAIL_PROGRAM "/usr/lib/sendmail -t" +-/* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */ ++/* #define MAIL_PROGRAM "/usr/lib/sendmail -t" */ ++#define MAIL_PROGRAM "/usr/sbin/sendmail -t" + #define MAIL_PROGRAM_TO_BODY 1 + #define MAIL_PROGRAM_SUBJECT_BODY 1 + #endif +@@ -302,7 +302,7 @@ + /* #define LOCKDIR "/usr/spool/locks" */ + /* #define LOCKDIR "/usr/spool/uucp/LCK" */ + /* #define LOCKDIR "/var/spool/lock" */ +-/* #define LOCKDIR "/var/lock" */ ++#define LOCKDIR "/var/lock/serial" + + /* You must also specify the format of the lock files by setting + exactly one of the following macros to 1. Check an existing lock +@@ -466,8 +466,8 @@ + When looking something up (a system, a port, etc.) the new style + configuration files will be read first, followed by the V2 + configuration files, followed by the HDB configuration files. */ +-#define HAVE_V2_CONFIG 0 +-#define HAVE_HDB_CONFIG 0 ++#define HAVE_V2_CONFIG 1 ++#define HAVE_HDB_CONFIG 1 + + /* Exactly one of the following macros must be set to 1. The exact + format of the spool directories is explained in unix/spool.c. +@@ -572,16 +572,16 @@ + /* The name of the default spool directory. If HAVE_TAYLOR_CONFIG is + set to 1, this may be overridden by the ``spool'' command in the + configuration file. */ +-#define SPOOLDIR "/usr/spool/uucp" +-/* #define SPOOLDIR "/var/spool/uucp" */ ++/* #define SPOOLDIR "/usr/spool/uucp" */ ++#define SPOOLDIR "/var/spool/uucp" + + /* The name of the default public directory. If HAVE_TAYLOR_CONFIG is + set to 1, this may be overridden by the ``pubdir'' command in the + configuration file. Also, a particular system may be given a + specific public directory by using the ``pubdir'' command in the + system file. */ +-#define PUBDIR "/usr/spool/uucppublic" +-/* #define PUBDIR "/var/spool/uucppublic" */ ++/* #define PUBDIR "/usr/spool/uucppublic" */ ++#define PUBDIR "/var/spool/uucppublic" + + /* The default command path. This is a space separated list of + directories. Remote command executions requested by uux are looked +@@ -644,24 +644,23 @@ + /* The default log file when using HAVE_TAYLOR_LOGGING. When using + HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile'' + command in the configuration file. */ +-#define LOGFILE "/usr/spool/uucp/Log" ++/* #define LOGFILE "/usr/spool/uucp/Log" */ + /* #define LOGFILE "/var/spool/uucp/Log" */ +-/* #define LOGFILE "/var/log/uucp/Log" */ ++#define LOGFILE "/var/log/uucp/Log" + + /* The default statistics file when using HAVE_TAYLOR_LOGGING. When + using HAVE_TAYLOR_CONFIG, this may be overridden by the + ``statfile'' command in the configuration file. */ +-#define STATFILE "/usr/spool/uucp/Stats" ++/* #define STATFILE "/usr/spool/uucp/Stats" */ + /* #define STATFILE "/var/spool/uucp/Stats" */ +-/* #define STATFILE "/var/log/uucp/Stats" */ ++#define STATFILE "/var/log/uucp/Stats" + + /* The default debugging file when using HAVE_TAYLOR_LOGGING. When + using HAVE_TAYLOR_CONFIG, this may be overridden by the + ``debugfile'' command in the configuration file. */ +-#define DEBUGFILE "/usr/spool/uucp/Debug" ++/* #define DEBUGFILE "/usr/spool/uucp/Debug" */ + /* #define DEBUGFILE "/var/spool/uucp/Debug" */ +-/* #define DEBUGFILE "/var/log/uucp/Debug" */ +- ++#define DEBUGFILE "/var/log/uucp/Debug" + #endif /* HAVE_TAYLOR_LOGGING */ + + #if HAVE_V2_LOGGING +@@ -669,17 +668,23 @@ + /* The default log file when using HAVE_V2_LOGGING. When using + HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile'' + command in the configuration file. */ +-#define LOGFILE "/usr/spool/uucp/LOGFILE" ++ /* #define LOGFILE "/usr/spool/uucp/Log" */ ++ /* #define LOGFILE "/var/spool/uucp/Log" */ ++#define LOGFILE "/var/log/uucp/Log" + + /* The default statistics file when using HAVE_V2_LOGGING. When using + HAVE_TAYLOR_CONFIG, this may be overridden by the ``statfile'' + command in the configuration file. */ +-#define STATFILE "/usr/spool/uucp/SYSLOG" ++ /* #define STATFILE "/usr/spool/uucp/Stats" */ ++ /* #define STATFILE "/var/spool/uucp/Stats" */ ++#define STATFILE "/var/log/uucp/Stats" + + /* The default debugging file when using HAVE_V2_LOGGING. When using + HAVE_TAYLOR_CONFIG, this may be overridden by the ``debugfile'' + command in the configuration file. */ +-#define DEBUGFILE "/usr/spool/uucp/DEBUG" ++ /* #define DEBUGFILE "/usr/spool/uucp/Debug" */ ++ /* #define DEBUGFILE "/var/spool/uucp/Debug" */ ++#define DEBUGFILE "/var/log/uucp/Debug" + + #endif /* HAVE_V2_LOGGING */ diff --git a/srcpkgs/uucp/patches/uucp-org.patch b/srcpkgs/uucp/patches/uucp-org.patch new file mode 100644 index 00000000000..d6294342cd7 --- /dev/null +++ b/srcpkgs/uucp/patches/uucp-org.patch @@ -0,0 +1,8833 @@ +Description: Changes from previous version + This patch contains all changes from previous versions. +Author: Thorsten Alteholz +--- uucp-1.07.orig/uucico.c ++++ uucp-1.07/uucico.c +@@ -125,6 +125,9 @@ struct spass + struct sconnection *qconn; + }; + ++/* min. grade set on commandline */ ++static char cmdlgrade = '\0'; ++ + /* Local functions. */ + + static void uusage P((void)); +@@ -175,6 +178,7 @@ static const struct option asLongopts[] + { "nodetach", no_argument, NULL, 'D' }, + { "loop", no_argument, NULL, 'e' }, + { "force", no_argument, NULL, 'f'}, ++ { "grade", required_argument, NULL, 'g'}, + { "stdin", required_argument, NULL, 'i' }, + { "prompt", no_argument, NULL, 'l' }, + { "port", required_argument, NULL, 'p' }, +@@ -249,9 +253,9 @@ main (argc, argv) + ++zProgram; + + #if COHERENT_C_OPTION +- zopts = "c:CDefi:I:lp:qr:s:S:u:x:X:vwz"; ++ zopts = "c:CDefg:i:I:lp:qr:s:S:u:x:X:vwz"; + #else +- zopts = "cCDefi:I:lp:qr:s:S:u:x:X:vwz"; ++ zopts = "cCDefg:i:I:lp:qr:s:S:u:x:X:vwz"; + #endif + + while ((iopt = getopt_long (argc, argv, zopts, +@@ -292,6 +296,14 @@ main (argc, argv) + failed call. */ + fforce = TRUE; + break; ++ ++ case 'g': ++ /* Force a grade */ ++ if (isalpha(optarg[0])) ++ cmdlgrade = optarg[0]; ++ else ++ fprintf (stderr, "%s: invalid grade \n", zProgram); ++ break; + + case 'i': + /* Type of port to use for standard input. Only TLI is +@@ -796,6 +808,7 @@ uhelp () + printf ("Usage: %s [options]\n", zProgram); + printf (" -s,-S,--system system: Call system (-S implies -f)\n"); + printf (" -f,--force: Force call despite system status\n"); ++ printf (" -g,--grade: limit outgoing call to a given grade\n"); + printf (" -r state: 1 for master, 0 for slave (default)\n"); + printf (" --master: Act as master\n"); + printf (" --slave: Act as slave (default)\n"); +@@ -1369,12 +1382,18 @@ fdo_call (qdaemon, qstat, qdialer, pfcal + boolean fret; + + /* Determine the grade we should request of the other system. A +- '\0' means that no restrictions have been made. */ +- if (! ftimespan_match (qsys->uuconf_qcalltimegrade, &ival, +- (int *) NULL)) +- bgrade = '\0'; ++ '\0' means that no restrictions have been made. ++ If a grade is set on the command line, the calltimegrade-value ++ is overwritten. */ ++ ++ if (cmdlgrade != '\0') ++ bgrade = cmdlgrade; + else +- bgrade = (char) ival; ++ if (! ftimespan_match (qsys->uuconf_qcalltimegrade, &ival, ++ (int *) NULL)) ++ bgrade = '\0'; ++ else ++ bgrade = (char) ival; + + /* Determine the name we will call ourselves. */ + if (qsys->uuconf_zlocalname != NULL) +--- uucp-1.07.orig/uucp.info-2 ++++ uucp-1.07/uucp.info-2 +@@ -1,4 +1,6 @@ +-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi. ++This is uucp.info, produced by makeinfo version 4.11 from uucp.texi. ++ ++INFO-DIR-SECTION Networking tools + + START-INFO-DIR-ENTRY + * UUCP: (uucp). Transfer mail and news across phone lines. +@@ -25,1247 +27,1119 @@ versions, except that the section entitl + a translation approved by the author instead of in the original English. + +  +-File: uucp.info, Node: Invoking cu, Next: Invoking uucico, Prev: Invoking uupick, Up: Invoking the UUCP Programs +- +-Invoking cu +-=========== +- +-* Menu: +- +-* cu Description:: Description of cu +-* cu Commands:: Commands Supported by cu +-* cu Variables:: Variables Supported by cu +-* cu Options:: Options Supported by cu +- +- +-File: uucp.info, Node: cu Description, Next: cu Commands, Prev: Invoking cu, Up: Invoking cu +- +-cu Description +--------------- +- +- cu [options] [system | phone | "dir"] +- +- The `cu' program is used to call up another system and act as a dial +-in terminal. It can also do simple file transfers with no error +-checking. +- +- The `cu' program takes a single non-option argument. +- +- If the argument is the string `dir' cu will make a direct connection +-to the port. This may only be used by users with write access to the +-port, as it permits reprogramming the modem. +- +- Otherwise, if the argument begins with a digit, it is taken to be a +-phone number to call. +- +- Otherwise, it is taken to be the name of a system to call. +- +- The `-z' or `--system' options may be used to name a system +-beginning with a digit, and the `-c' or `--phone' options may be used +-to name a phone number that does not begin with a digit. +- +- The `cu' program locates a port to use in the UUCP configuration +-files. If a simple system name is given, it will select a port +-appropriate for that system. The `-p', `--port', `-l', `--line', `-s', +-and `--speed' options may be used to control the port selection. +- +- When a connection is made to the remote system, `cu' forks into two +-processes. One reads from the port and writes to the terminal, while +-the other reads from the terminal and writes to the port. +- +- +-File: uucp.info, Node: cu Commands, Next: cu Variables, Prev: cu Description, Up: Invoking cu +- +-cu Commands +------------ +- +- The `cu' program provides several commands that may be used during +-the conversation. The commands all begin with an escape character, +-which by default is `~' (tilde). The escape character is only +-recognized at the beginning of a line. To send an escape character to +-the remote system at the start of a line, it must be entered twice. All +-commands are either a single character or a word beginning with `%' +-(percent sign). +- +- The `cu' program recognizes the following commands. +- +-`~.' +- Terminate the conversation. +- +-`~! command' +- Run command in a shell. If command is empty, starts up a shell. +- +-`~$ command' +- Run command, sending the standard output to the remote system. +- +-`~| command' +- Run command, taking the standard input from the remote system. +- +-`~+ command' +- Run command, taking the standard input from the remote system and +- sending the standard output to the remote system. +- +-`~#, ~%break' +- Send a break signal, if possible. +- +-`~c directory, ~%cd directory' +- Change the local directory. +- +-`~> file' +- Send a file to the remote system. This just dumps the file over +- the communication line. It is assumed that the remote system is +- expecting it. +- +-`~<' +- Receive a file from the remote system. This prompts for the local +- file name and for the remote command to execute to begin the file +- transfer. It continues accepting data until the contents of the +- `eofread' variable are seen. +- +-`~p from to' +-`~%put from to' +- Send a file to a remote Unix system. This runs the appropriate +- commands on the remote system. +- +-`~t from to' +-`~%take from to' +- Retrieve a file from a remote Unix system. This runs the +- appropriate commands on the remote system. +- +-`~s variable value' +- Set a `cu' variable to the given value. If value is not given, the +- variable is set to `true'. +- +-`~! variable' +- Set a `cu' variable to `false'. +- +-`~z' +- Suspend the cu session. This is only supported on some systems. +- On systems for which `^Z' may be used to suspend a job, `~^Z' will +- also suspend the session. +- +-`~%nostop' +- Turn off XON/XOFF handling. +- +-`~%stop' +- Turn on XON/XOFF handling. +- +-`~v' +- List all the variables and their values. +- +-`~?' +- List all commands. +- +- +-File: uucp.info, Node: cu Variables, Next: cu Options, Prev: cu Commands, Up: Invoking cu +- +-cu Variables +------------- +- +- The `cu' program also supports several variables. They may be +-listed with the `~v' command, and set with the `~s' or `~!' commands. +- +-`escape' +- The escape character. The default is `~' (tilde). +- +-`delay' +- If this variable is true, `cu' will delay for a second, after +- recognizing the escape character, before printing the name of the +- local system. The default is true. +- +-`eol' +- The list of characters which are considered to finish a line. The +- escape character is only recognized after one of these is seen. +- The default is `carriage return', `^U', `^C', `^O', `^D', `^S', +- `^Q', `^R'. +- +-`binary' +- Whether to transfer binary data when sending a file. If this is +- false, then newlines in the file being sent are converted to +- carriage returns. The default is false. +- +-`binary-prefix' +- A string used before sending a binary character in a file +- transfer, if the `binary' variable is true. The default is `^V'. +- +-`echo-check' +- Whether to check file transfers by examining what the remote system +- echoes back. This probably doesn't work very well. The default is +- false. +- +-`echonl' +- The character to look for after sending each line in a file. The +- default is carriage return. +- +-`timeout' +- The timeout to use, in seconds, when looking for a character, +- either when doing echo checking or when looking for the `echonl' +- character. The default is 30. +- +-`kill' +- The character to use delete a line if the echo check fails. The +- default is `^U'. +- +-`resend' +- The number of times to resend a line if the echo check continues to +- fail. The default is 10. +- +-`eofwrite' +- The string to write after sending a file with the `~>' command. +- The default is `^D'. +- +-`eofread' +- The string to look for when receiving a file with the ` ~<' +- command. The default is `$', which is intended to be a typical +- shell prompt. +- +-`verbose' +- Whether to print accumulated information during a file transfer. +- The default is true. +- +- +-File: uucp.info, Node: cu Options, Prev: cu Variables, Up: Invoking cu +- +-cu Options +----------- +- +- The following options may be given to `cu'. +- +-`-e' +-`--parity=even' +- Use even parity. +- +-`-o' +-`--parity=odd' +- Use odd parity. +- +-`--parity=none' +- Use no parity. No parity is also used if both `-e' and `-o' are +- given. +- +-`-h' +-`--halfduplex' +- Echo characters locally (half-duplex mode). +- +-`--nostop' +- Turn off XON/XOFF handling (it is on by default). +- +-`-E char' +-`--escape char' +- Set the escape character. Initially `~' (tilde). To eliminate the +- escape character, use `-E '''. +- +-`-z system' +-`--system system' +- The system to call. +- +-`-c phone-number' +-`--phone phone-number' +- The phone number to call. +- +-`-p port' +-`-a port' +-`--port port' +- Name the port to use. +- +-`-l line' +-`--line line' +- Name the line to use by giving a device name. This may be used to +- dial out on ports that are not listed in the UUCP configuration +- files. Write access to the device is required. +- +-`-s speed' +-`-#' +-`--speed speed' +- The speed (baud rate) to use. Here, `-#' means an actual number; +- e.g., `-9600'. +- +-`-n' +-`--prompt' +- Prompt for the phone number to use. +- +-`-d' +- Enter debugging mode. Equivalent to `--debug all'. +- +-`-x type' +-`--debug type' +-`-I file' +-`--config file' +-`-v' +-`--version' +-`--help' +- *Note Standard Options::. +- +- +-File: uucp.info, Node: Invoking uucico, Next: Invoking uuxqt, Prev: Invoking cu, Up: Invoking the UUCP Programs +- +-Invoking uucico +-=============== +- +-* Menu: +- +-* uucico Description:: Description of uucico +-* uucico Options:: Options Supported by uucico +- +- +-File: uucp.info, Node: uucico Description, Next: uucico Options, Prev: Invoking uucico, Up: Invoking uucico +- +-uucico Description +------------------- +- +- uucico [options] +- +- The `uucico' daemon processes file transfer requests queued by +-`uucp' and `uux'. It is started when `uucp' or `uux' is run (unless +-they are given the `-r' or `--nouucico' options). It is also typically +-started periodically using entries in the `crontab' table(s). +- +- When `uucico' is invoked with `-r1', `--master', `-s', `--system', +-or `-S', the daemon will place a call to a remote system, running in +-master mode. Otherwise the daemon will start in slave mode, accepting +-a call from a remote system. Typically a special login name will be +-set up for UUCP which automatically invokes `uucico' when a remote +-system calls in and logs in under that name. +- +- When `uucico' terminates, it invokes the `uuxqt' daemon, unless the +-`-q' or `--nouuxqt' options were given; `uuxqt' executes any work +-orders created by `uux' on a remote system, and any work orders created +-locally which have received remote files for which they were waiting. +- +- If a call fails, `uucico' will normally refuse to retry the call +-until a certain (configurable) amount of time has passed. This may be +-overriden by the `-f', `--force', or `-S' options. +- +- The `-l', `--prompt', `-e', or `--loop' options may be used to force +-`uucico' to produce its own prompts of `login: ' and `Password:'. When +-another `uucico' daemon calls in, it will see these prompts and log in +-as usual. The login name and password will normally be checked against +-a separate list kept specially for `uucico', rather than the +-`/etc/passwd' file (*note Configuration File Names::). It is possible, +-on some systems, to configure `uucico' to use `/etc/passwd'. The `-l' +-or `--prompt' options will prompt once and then exit; in this mode the +-UUCP administrator, or the superuser, may use the `-u' or `--login' +-option to force a login name, in which case `uucico' will not prompt +-for one. The `-e' or `--loop' options will prompt again after the +-first session is over; in this mode `uucico' will permanently control a +-port. +- +- If `uucico' receives a `SIGQUIT', `SIGTERM' or `SIGPIPE' signal, it +-will cleanly abort any current conversation with a remote system and +-exit. If it receives a `SIGHUP' signal it will abort any current +-conversation, but will continue to place calls to (if invoked with +-`-r1' or `--master') and accept calls from (if invoked with `-e' or +-`--loop') other systems. If it receives a `SIGINT' signal it will +-finish the current conversation, but will not place or accept any more +-calls. +- +- +-File: uucp.info, Node: uucico Options, Prev: uucico Description, Up: Invoking uucico +- +-uucico Options +--------------- +- +- The following options may be given to `uucico'. +- +-`-r1' +-`--master' +- Start in master mode: call out to a remote system. Implied by +- `-s', `--system', or `-S'. If no system is specified, +- sequentially call every system for which work is waiting to be +- done. +- +-`-r0' +-`--slave' +- Start in slave mode. This is the default. +- +-`-s system' +-`--system system' +- Call the specified system. +- +-`-S system' +- Call the specified system, ignoring any required wait. This is +- equivalent to `-s system -f'. +- +-`-f' +-`--force' +- Ignore any required wait for any systems to be called. +- +-`-l' +-`--prompt' +- Prompt for login name and password using `login: ' and +- `Password:'. This allows `uucico' to be easily run from `inetd'. +- The login name and password are checked against the UUCP password +- file, which need not be `/etc/passwd'. The `--login' option may +- be used to force a login name, in which cause `uucico' will only +- prompt for a password. +- +-`-p port' +-`--port port' +- Specify a port to call out on or to listen to. +- +-`-e' +-`--loop' +- Enter an endless loop of login/password prompts and slave mode +- daemon execution. The program will not stop by itself; you must +- use `kill' to shut it down. +- +-`-w' +-`--wait' +- After calling out (to a particular system when `-s', `--system', +- or `-S' is specifed, or to all systems which have work when just +- `-r1' or `--master' is specifed), begin an endless loop as with +- `--loop'. +- +-`-q' +-`--nouuxqt' +- Do not start the `uuxqt' daemon when finished. +- +-`-c' +-`--quiet' +- If no calls are permitted at this time, then don't make the call, +- but also do not put an error message in the log file and do not +- update the system status (as reported by `uustat'). This can be +- convenient for automated polling scripts, which may want to simply +- attempt to call every system rather than worry about which +- particular systems may be called at the moment. This option also +- suppresses the log message indicating that there is no work to be +- done. +- +-`-C' +-`--ifwork' +- Only call the system named by `-s', `--system', or `-S' if there +- is work for that system. +- +-`-D' +-`--nodetach' +- Do not detach from the controlling terminal. Normally `uucico' +- detaches from the terminal before each call out to another system +- and before invoking `uuxqt'. This option prevents this. +- +-`-u name' +-`--login name' +- Set the login name to use instead of that of the invoking user. +- This option may only be used by the UUCP administrator or the +- superuser. If used with `--prompt', this will cause `uucico' to +- prompt only for the password, not the login name. +- +-`-z' +-`--try-next' +- If a call fails after the remote system is reached, try the next +- alternate rather than simply exiting. +- +-`-i type' +-`--stdin type' +- Set the type of port to use when using standard input. The only +- supported port type is TLI, and this is only available on machines +- which support the TLI networking interface. Specifying `-i TLI' +- causes `uucico' to use TLI calls to perform I/O. +- +-`-X type' +- Same as the standard option `-x type'. Provided for historical +- compatibility. +- +-`-x type' +-`--debug type' +-`-I file' +-`--config file' +-`-v' +-`--version' +-`--help' +- *Note Standard Options::. +- +- +-File: uucp.info, Node: Invoking uuxqt, Next: Invoking uuchk, Prev: Invoking uucico, Up: Invoking the UUCP Programs +- +-Invoking uuxqt +-============== +- +- uuxqt [-c command] [-s system] [--command command] [--system system] +- +- The `uuxqt' daemon executes commands requested by `uux' from either +-the local system or from remote systems. It is started automatically +-by the `uucico' daemon (unless `uucico' is given the `-q' or +-`--nouuxqt' options). +- +- There is normally no need to run `uuxqt', since it will be invoked +-by `uucico'. However, `uuxqt' can be invoked directly to provide +-greater control over the processing of the work queue. +- +- Multiple invocations of `uuxqt' may be run at once, as controlled by +-the `max-uuxqts' configuration command; see *Note Miscellaneous +-(config)::. +- +- The following options may be given to `uuxqt'. +- +-`-c command' +-`--command command' +- Only execute requests for the specified command. For example, +- `uuxqt --command rmail'. +- +-`-s system' +-`--system system' +- Only execute requests originating from the specified system. +- +-`-x type' +-`--debug type' +-`-I file' +-`--config' +-`-v' +-`--version' +-`--help' +- *Note Standard Options::. +- +- +-File: uucp.info, Node: Invoking uuchk, Next: Invoking uuconv, Prev: Invoking uuxqt, Up: Invoking the UUCP Programs +- +-Invoking uuchk +-============== +- +- uuchk [-s system] [--system system] +- +- The `uuchk' program displays information read from the UUCP +-configuration files. It should be used to ensure that UUCP has been +-configured correctly. +- +- The `-s' or `--system' options may be used to display the +-configuration for just the specified system, rather than for all +-systems. The `uuchk' program also supports the standard UUCP program +-options; see *Note Standard Options::. +- +- +-File: uucp.info, Node: Invoking uuconv, Next: Invoking uusched, Prev: Invoking uuchk, Up: Invoking the UUCP Programs +- +-Invoking uuconv +-=============== +- +- uuconv -i type -o type [-p program] [--program program] +- uuconv --input type --output type [-p program] [--program program] +- +- The `uuconv' program converts UUCP configuration files from one +-format to another. The type of configuration file to read is specified +-using the `-i' or `--input' options. The type of configuration file to +-write is specified using the `-o' or `--output' options. +- +- The supported configuration file types are `taylor', `v2', and +-`hdb'. For a description of the `taylor' configuration files, see +-*Note Configuration Files::. The other types of configuration files +-are used by traditional UUCP packages, and are not described in this +-manual. +- +- An input configuration of type `v2' or `hdb' is read from a compiled +-in directory (specified by `oldconfigdir' in `Makefile'). An input +-configuration of type `taylor' is read from a compiled in directory by +-default, but may be overridden with the standard `-I' or `--config' +-options (*note Standard Options::). +- +- The output configuration is written to files in the directory in +-which `uuconv' is run. +- +- Some information in the input files may not be representable in the +-desired output format, in which case `uuconv' will silently discard it. +-The output of `uuconv' should be carefully checked before it is used. +-The `uuchk' program may be used for this purpose; see *Note Invoking +-uuchk::. +- +- The `-p' or `--program' option may be used to convert specific `cu' +-configuration information, rather than the default of only converting +-the `uucp' configuration information; see *Note config File::. +- +- The `uuchk' program also supports the standard UUCP program options; +-see *Note Standard Options::. ++File: uucp.info, Node: j Protocol, Next: x Protocol, Prev: i Protocol, Up: Protocols + +- +-File: uucp.info, Node: Invoking uusched, Prev: Invoking uuconv, Up: Invoking the UUCP Programs ++6.12 UUCP `j' Protocol ++====================== + +-Invoking uusched +-================ ++The `j' protocol is a variant of the `i' protocol. It was also written ++by Ian Lance Taylor, and first appeared in Taylor UUCP version 1.04. + +- The `uusched' program is actually just a shell script which invokes +-the `uucico' daemon. It is provided for backward compatibility. It +-causes `uucico' to call all systems for which there is work. Any +-option which may be given to `uucico' may also be given to `uusched'. +-*Note Invoking uucico::. ++ The `j' protocol is a version of the `i' protocol designed for ++communication links which intercept a few characters, such as XON or ++XOFF. It is not efficient to use it on a link which intercepts many ++characters, such as a seven bit link. The `j' protocol performs no ++error correction or detection; that is presumed to be the responsibility ++of the `i' protocol. ++ ++ When the `j' protocol starts up, each system sends a printable ASCII ++string indicating which characters it wants to avoid using. The string ++begins with the ASCII character `^' (octal 136) and ends with the ASCII ++character `~' (octal 176). After sending this string, each system ++looks for the corresponding string from the remote system. The strings ++are composed of escape sequences: `\ooo', where `o' is an octal digit. ++For example, sending the string `^\021\023~' means that the ASCII XON ++and XOFF characters should be avoided. The union of the characters ++described in both strings (the string which is sent and the string ++which is received) is the set of characters which must be avoided in ++this conversation. Avoiding a printable ASCII character (octal 040 to ++octal 176, inclusive) is not permitted. ++ ++ After the exchange of characters to avoid, the normal `i' protocol ++start up is done, and the rest of the conversation uses the normal `i' ++protocol. However, each `i' protocol packet is wrapped to become a `j' ++protocol packet. ++ ++ Each `j' protocol packet consists of a seven byte header, followed ++by data bytes, followed by index bytes, followed by a one byte trailer. ++The packet header looks like this: ++ ++`^' ++ Every packet begins with the ASCII character `^', octal 136. ++ ++HIGH ++LOW ++ These two characters give the total number of bytes in the packet. ++ Both HIGH and LOW are printable ASCII characters. The length of ++ the packet is `(HIGH - 040) * 0100 + (LOW - 040)', where `040 <= ++ HIGH < 0177' and `040 <= LOW < 0140'. This permits a length of ++ 6079 bytes, but there is a further restriction on packet size ++ described below. ++ ++`=' ++ The ASCII character `=', octal 075. ++ ++DATA-HIGH ++DATA-LOW ++ These two characters give the total number of data bytes in the ++ packet. The encoding is as described for HIGH and LOW. The number ++ of data bytes is the size of the `i' protocol packet wrapped inside ++ this `j' protocol packet. ++ ++`@' ++ The ASCII character `@', octal 100. ++ ++ The header is followed by the number of data bytes given in ++DATA-HIGH and DATA-LOW. These data bytes are the `i' protocol packet ++which is being wrapped in the `j' protocol packet. However, each ++character in the `i' protocol packet which the `j' protocol must avoid ++is transformed into a printable ASCII character (recall that avoiding a ++printable ASCII character is not permitted). Two index bytes are used ++for each character which must be transformed. ++ ++ The index bytes immediately follow the data bytes. The index bytes ++are created in pairs. Each pair of index bytes encodes the location of ++a character in the `i' protocol packet which was transformed to become ++a printable ASCII character. Each pair of index bytes also encodes the ++precise transformation which was performed. ++ ++ When the sender finds a character which must be avoided, it will ++transform it using one or two operations. If the character is 0200 or ++greater, it will subtract 0200. If the resulting character is less than ++020, or is equal to 0177, it will xor by 020. The result is a printable ++ASCII character. ++ ++ The zero based byte index of the character within the `i' protocol ++packet is determined. This index is turned into a two byte printable ++ASCII index, INDEX-HIGH and INDEX-LOW, such that the index is ++`(INDEX-HIGH - 040) * 040 + (INDEX-LOW - 040)'. INDEX-LOW is ++restricted such that `040 <= INDEX-LOW < 0100'. INDEX-HIGH is not ++permitted to be 0176, so `040 <= INDEX-HIGH < 0176'. INDEX-LOW is then ++modified to encode the transformation: ++ ++ * If the character transformation only had to subtract 0200, then ++ INDEX-LOW is used as is. ++ ++ * If the character transformation only had to xor by 020, then 040 ++ is added to INDEX-LOW. ++ ++ * If both operations had to be performed, then 0100 is added to ++ INDEX-LOW. However, if the value of INDEX-LOW was initially 077, ++ then adding 0100 would result in 0177, which is not a printable ++ ASCII character. For that special case, INDEX-HIGH is set to ++ 0176, and INDEX-LOW is set to the original value of INDEX-HIGH. ++ ++ The receiver decodes the index bytes as follows (this is the reverse ++of the operations performed by the sender, presented here for additional ++clarity): ++ ++ * The first byte in the index is INDEX-HIGH, and the second is ++ INDEX-LOW. ++ ++ * If `040 <= INDEX-HIGH < 0176', the index refers to the data byte ++ at position `(INDEX-HIGH - 040) * 040 + INDEX-LOW % 040'. ++ ++ * If `040 <= INDEX-LOW < 0100', then 0200 must be added to indexed ++ byte. ++ ++ * If `0100 <= INDEX-LOW < 0140', then 020 must be xor'ed to the ++ indexed byte. ++ ++ * If `0140 <= INDEX-LOW < 0177', then 0200 must be added to the ++ indexed byte, and 020 must be xor'ed to the indexed byte. ++ ++ * If `INDEX-HIGH == 0176', the index refers to the data byte at ++ position `(INDEX-LOW - 040) * 040 + 037'. 0200 must be added to ++ the indexed byte, and 020 must be xor'ed to the indexed byte. ++ ++ This means the largest `i' protocol packet which may be wrapped ++inside a `j' protocol packet is `(0175 - 040) * 040 + (077 - 040) == ++3007' bytes. ++ ++ The final character in a `j' protocol packet, following the index ++bytes, is the ASCII character `~' (octal 176). ++ ++ The motivation behind using an indexing scheme, rather than escape ++characters, is to avoid data movement. The sender may simply add a ++header and a trailer to the `i' protocol packet. Once the receiver has ++loaded the `j' protocol packet, it may scan the index bytes, ++transforming the data bytes, and then pass the data bytes directly on to ++the `i' protocol routine. ++ ++ ++File: uucp.info, Node: x Protocol, Next: y Protocol, Prev: j Protocol, Up: Protocols ++ ++6.13 UUCP `x' Protocol ++====================== ++ ++The `x' protocol is used in Europe (and probably elsewhere) with ++machines that contain an builtin X.25 card and can send eight bit data ++transparently across X.25 circuits, without interference from the X.28 ++or X.29 layers. The protocol sends packets of 512 bytes, and relies on ++a write of zero bytes being read as zero bytes without stopping ++communication. It first appeared in the original System V UUCP ++implementation. ++ ++ ++File: uucp.info, Node: y Protocol, Next: d Protocol, Prev: x Protocol, Up: Protocols ++ ++6.14 UUCP `y' Protocol ++====================== ++ ++The `y' protocol was developed by Jorge Cwik for use in FX UUCICO, a PC ++uucico program. It is designed for communication lines which handle ++error correction and flow control. It requires an eight bit clean ++connection. It performs error detection, but not error correction: ++when an error is detected, the line is dropped. It is a streaming ++protocol, like the `f' protocol; there are no packet acknowledgements, ++so the protocol is efficient over a half-duplex communication line such ++as PEP. ++ ++ Every packet contains a six byte header: ++ ++sequence low byte ++sequence high byte ++ A two byte sequence number, in little endian order. The first ++ sequence number is 0. Since the first packet is always a sync ++ packet (described below) the sequence number of the first data ++ packet is always 1. Each system counts sequence numbers ++ independently. ++ ++length low byte ++length high byte ++ A two byte data length, in little endian order. If the high bit ++ of the sixteen bit field is clear, this is the number of data ++ bytes which follow the six byte header. If the high bit is set, ++ there is no data, and the length field is a type of control packet. ++ ++checksum low byte ++checksum high byte ++ A two byte checksum, in little endian order. The checksum is ++ computed over the data bytes. The checksum algorithm is described ++ below. If there are no data bytes, the checksum is sent as 0. ++ ++ When the protocol starts up, each side must send a sync packet. ++This is a packet with a normal six byte header followed by data. The ++sequence number of the sync packet should be 0. Currently at least ++four bytes of data must be sent with the sync packet. Additional bytes ++should be ignored. They are defined as follows: ++ ++version ++ The version number of the protocol. Currently this must be 1. ++ Larger numbers should be ignored; it is the responsibility of the ++ newer version to accommodate the older one. ++ ++packet size ++ The maximum data length to use divided by 256. This is sent as a ++ single byte. The maximum data length permitted is 32768, which ++ would be sent as 128. Customarily both systems will use the same ++ maximum data length, the lower of the two requested. ++ ++flags low byte ++flags high byte ++ Two bytes of flags. None are currently defined. These bytes ++ should be sent as 0, and ignored by the receiver. ++ ++ A length field with the high bit set is a control packet. The ++following control packet types are defined: ++ ++0xfffe `YPKT_ACK' ++ Acknowledges correct receipt of a file. ++ ++0xfffd `YPKT_ERR' ++ Indicates an incorrect checksum. ++ ++0xfffc `YPKT_BAD' ++ Indicates a bad sequence number, an invalid length, or some other ++ error. ++ ++ If a control packet other than `YPKT_ACK' is received, the ++connection is dropped. If a checksum error is detected for a received ++packet, a `YPKT_ERR' control packet is sent, and the connection is ++dropped. If a packet is received out of sequence, a `YPKT_BAD' control ++packet is sent, and the connection is dropped. ++ ++ The checksum is initialized to 0xffff. For each data byte in a ++packet it is modified as follows (where B is the byte before it has been ++transformed as described above): ++ ++ /* Rotate the checksum left. */ ++ if ((ichk & 0x8000) == 0) ++ ichk <<= 1; ++ else ++ { ++ ichk <<= 1; ++ ++ichk; ++ } ++ ++ /* Add the next byte into the checksum. */ ++ ichk += B; ++ ++ This is the same algorithm as that used by the `f' protocol. ++ ++ A command is sent as a sequence of data packets followed by a null ++byte. In the normal case, a command will fit into a single packet. ++The packet should be exactly the length of the command plus a null ++byte. If the command is too long, more packets are sent as required. ++ ++ A file is sent as a sequence of data packets, ending with a zero ++length packet. The data packets may be of any length greater than zero ++and less than or equal to the maximum permitted packet size specified ++in the initial sync packet. ++ ++ After the zero length packet ending a file transfer has been ++received, the receiving system sends a `YPKT_ACK' control packet. The ++sending system waits for the `YPKT_ACK' control packet before ++continuing; this wait should be done with a large timeout, since there ++may be a considerable amount of data buffered on the communication path. ++ ++ ++File: uucp.info, Node: d Protocol, Next: h Protocol, Prev: y Protocol, Up: Protocols ++ ++6.15 UUCP `d' Protocol ++====================== ++ ++The `d' protocol is apparently used for DataKit muxhost (not RS-232) ++connections. No file size is sent. When a file has been completely ++transferred, a write of zero bytes is done; this must be read as zero ++bytes on the other end. ++ ++ ++File: uucp.info, Node: h Protocol, Next: v Protocol, Prev: d Protocol, Up: Protocols ++ ++6.16 UUCP `h' Protocol ++====================== ++ ++The `h' protocol is apparently used in some places with HST modems. It ++does no error checking, and is not that different from the `t' ++protocol. I don't know the details. ++ ++ ++File: uucp.info, Node: v Protocol, Prev: h Protocol, Up: Protocols ++ ++6.17 UUCP `v' Protocol ++====================== ++ ++The `v' protocol is used by UUPC/extended, a PC UUCP program. It is ++simply a version of the `g' protocol which supports packets of any ++size, and also supports sending packets of different sizes during the ++same conversation. There are many `g' protocol implementations which ++support both, but there are also many which do not. Using `v' ensures ++that everything is supported. + +  +-File: uucp.info, Node: Installing Taylor UUCP, Next: Using Taylor UUCP, Prev: Invoking the UUCP Programs, Up: Top ++File: uucp.info, Node: Hacking, Next: Acknowledgements, Prev: Protocols, Up: Top + +-Installing Taylor UUCP +-********************** ++7 Hacking Taylor UUCP ++********************* + +- These are the installation instructions for the Taylor UUCP package. ++This chapter provides the briefest of guides to the Taylor UUCP source ++code itself. + + * Menu: + +-* Compilation:: Compiling Taylor UUCP +-* Testing the Compilation:: Testing the Compilation +-* Installing the Binaries:: Installing the Binaries +-* Configuration:: Configuring Taylor UUCP +-* Testing the Installation:: Testing the Installation ++* System Dependence:: System Dependence ++* Naming Conventions:: Naming Conventions ++* Patches:: Patches + +  +-File: uucp.info, Node: Compilation, Next: Testing the Compilation, Prev: Installing Taylor UUCP, Up: Installing Taylor UUCP ++File: uucp.info, Node: System Dependence, Next: Naming Conventions, Prev: Hacking, Up: Hacking + +-Compiling Taylor UUCP ++7.1 System Dependence + ===================== + +- If you have a source code distribution, you must first compile it for +-your system. Free versions of Unix, such as Linux, NetBSD, or FreeBSD, +-often come with pre-compiled binary distributions of UUCP. If you are +-using a binary distribution, you may skip to the configuration section +-(*note Configuration::). +- +- Follow these steps to compile the source code. +- +- 1. Take a look at the top of `Makefile.in' and set the appropriate +- values for your system. These control where the programs are +- installed and which user on the system owns them (normally they +- will be owned by a special user `uucp' rather than a real person; +- they should probably not be owned by `root'). +- +- 2. Run the shell script `configure'. This script was generated using +- the `autoconf' program written by David MacKenzie of the Free +- Software Foundation. It takes a while to run. It will generate +- the file `config.h' based on `config.h.in', and, for each source +- code directory, will generate `Makefile' based on `Makefile.in'. +- +- You can pass certain arguments to `configure' in the environment. +- Because `configure' will compile little test programs to see what +- is available on your system, you must tell it how to run your +- compiler. It recognizes the following environment variables: +- +- `CC' +- The C compiler. If this is not set, then if `configure' can +- find `gcc' it will use it, otherwise it will use `cc'. +- +- `CFLAGS' +- Flags to pass to the C compiler when compiling the actual +- code. If this is not set, `configure' will use `-g'. +- +- `LDFLAGS' +- Flags to pass to the C compiler when only linking, not +- compiling. If this is not set, `configure' will use the +- empty string. +- +- `LIBS' +- Libraries to pass to the C compiler. If this is not set, +- `configure' will use the empty string. +- +- `INSTALL' +- The program to run to install UUCP in the binary directory. +- If this is not set, then if `configure' finds the BSD +- `install' program, it will set this to `install -c'; +- otherwise, it will use `cp'. +- +- Suppose, for example, you want to set the environment variable `CC' +- to `rcc'. If you are using `sh', `bash', or `ksh', invoke +- `configure' as `CC=rcc configure'. If you are using `csh', do +- `setenv CC rcc; sh configure'. +- +- On some systems you will want to use `LIBS=-lmalloc'. On Xenix +- derived versions of Unix do not use `LIBS=-lx' because this will +- bring in the wrong versions of certain routines; if you want to use +- `-lx' you must specify `LIBS=-lc -lx'. +- +- You can also pass other arguments to `configure' on the command +- line. Use `configure --help' for a complete list. Of particular +- interest: +- `--prefix=DIRNAME' +- The directory under which all files are installed. Default +- `/usr/local'. +- +- `--with-newconfigdir=DIRNAME' +- The directory in which to find new style configuration files. +- Default `PREFIX/conf/uucp'. +- +- `--with-oldconfigdir=DIRNAME' +- The directory in which to find old style configuration files. +- Default `/usr/lib/uucp'. +- +- If `configure' fails for some reason, or if you have a very weird +- system, you may have to configure the package by hand. To do +- this, copy the file `config.h.in' to `config.h' and edit it for +- your system. Then for each source directory (the top directory, +- and the subdirectories `lib', `unix', and `uuconf') copy +- `Makefile.in' to `Makefile', find the words within `@' characters, +- and set them correctly for your system. +- +- 3. Igor V. Semenyuk provided this (lightly edited) note about ISC +- Unix 3.0. The `configure' script will default to passing `-posix' +- to `gcc'. However, using `-posix' changes the environment to +- POSIX, and on ISC 3.0, at least, the default for `POSIX_NO_TRUNC' +- is 1. This can lead to a problem when `uuxqt' executes `rmail'. +- `IDA sendmail' has dbm configuration files named +- `mailertable.{dir,pag}'. Notice these names are 15 characters +- long. When `uuxqt' compiled with the `-posix' executes `rmail', +- which in turn executes `sendmail', the later is run under the +- POSIX environment too. This leads to `sendmail' bombing out with +- `'error opening 'M' database: name too long' (mailertable.dir)'. +- It's rather obscure behaviour, and it took me a day to find out +- the cause. I don't use the `-posix' switch; instead, I run `gcc' +- with `-D_POSIX_SOURCE', and add `-lcposix' to `LIBS'. +- +- 4. On some versions of BSDI there is a bug in the shell which causes +- the default value for `CFLAGS' to be set incorrectly. If `echo +- ${CFLAGS--g}' echoes `g' rather than `-g', then you must set +- `CFLAGS' in the environment before running configure. There is a +- patch available from BSDI for this bug. (Reported by David Vrona). +- +- 5. On AIX 3.2.5, and possibly other versions, `cc -E' does not work, +- reporting `Option NOROCONST is not valid'. Test this before +- running configure by doing something like `touch /tmp/foo.c; cc -E +- /tmp/foo.c'. This may give a warning about the file being empty, +- but it should not give the `Option NOROCONST' warning. The +- workaround is to remove the `,noroconst' entry from the `options' +- clause in the `cc' stanza in `/etc/xlc.cfg'. (Reported by Chris +- Lewis). +- +- 6. You should verify that `configure' worked correctly by checking +- `config.h' and the instances of `Makefile'. +- +- 7. Edit `policy.h' for your local system. The comments explain the +- various choices. The default values are intended to be +- reasonable, so you may not have to make any changes. +- +- You must decide what type of configuration files to use; for more +- information on the choices, see *Note Configuration::. +- +- You must also decide what sort of spool directory you want to use. +- If this is a new installation, I recommend `SPOOLDIR_TAYLOR'; +- otherwise, select the spool directory corresponding to your +- existing UUCP package. +- +- 8. Type `make' to compile everything. +- +- The `tstuu.c' file is not particularly portable; if you can't +- figure out how to compile it you can safely ignore it, as it is +- only used for testing. To use STREAMS pseudo-terminals, tstuu.c +- must be compiled with `-DHAVE_STREAMS_PTYS'; this is not +- determined by the configure script. +- +- If you have any other problems there is probably a bug in the +- `configure' script. +- +- 9. Please report any problems you have. That is the only way they +- will get fixed for other people. Supply a patch if you can (*note +- Patches::), or just ask for help. +- +- +- +-File: uucp.info, Node: Testing the Compilation, Next: Installing the Binaries, Prev: Compilation, Up: Installing Taylor UUCP +- +-Testing the Compilation +-======================= +- +- If your system supports pseudo-terminals, and you compiled the code +-to support the new style of configuration files (`HAVE_TAYLOR_CONFIG' +-was set to 1 in `policy.h'), you should be able to use the `tstuu' +-program to test the `uucico' daemon. If your system supports STREAMS +-based pseudo-terminals, you must compile tstuu.c with +-`-DHAVE_STREAMS_PTYS'. (The STREAMS based code was contributed by Marc +-Boucher). +- +- To run `tstuu', just type `tstuu' with no arguments. You must run +-it in the compilation directory, since it runs `./uucp', `./uux' and +-`./uucico'. The `tstuu' program will run a lengthy series of tests (it +-takes over ten minutes on a slow VAX). You will need a fair amount of +-space available in `/usr/tmp'. You will probably want to put it in the +-background. Do not use `^Z', because the program traps on `SIGCHLD' +-and winds up dying. The `tstuu' program will create a directory +-`/usr/tmp/tstuu' and fill it with configuration files, and create spool +-directories `/usr/tmp/tstuu/spool1' and `/usr/tmp/tstuu/spool2'. +- +- If your system does not support the `FIONREAD' call, the `tstuu' +-program will run very slowly. This may or may not get fixed in a later +-version. +- +- The `tstuu' program will finish with an execute file named +-`X.SOMETHING' and a data file named `D.SOMETHING' in the directory +-`/usr/tmp/tstuu/spool1' (or, more likely, in subdirectories, depending +-on the choice of `SPOOLDIR' in `policy.h'). Two log files will be +-created in the directory `/usr/tmp/tstuu'. They will be named `Log1' +-and `Log2', or, if you have selected `HAVE_HDB_LOGGING' in `policy.h', +-`Log1/uucico/test2' and `Log2/uucico/test1'. There should be no errors +-in the log files. +- +- You can test `uuxqt' with `./uuxqt -I /usr/tmp/tstuu/Config1'. This +-should leave a command file `C.SOMETHING' and a data file `D.SOMETHING' +-in `/usr/tmp/tstuu/spool1' or in subdirectories. Again, there should +-be no errors in the log file. +- +- Assuming you compiled the code with debugging enabled, the `-x' +-switch can be used to set debugging modes; see the `debug' command for +-details (*note Debugging Levels::). Use `-x all' to turn on all +-debugging and generate far more output than you will ever want to see. +-The `uucico' daemons will put debugging output in the files `Debug1' +-and `Debug2' in the directory `/usr/tmp/tstuu'. After that, you're +-pretty much on your own. +- +- On some systems you can also use `tstuu' to test `uucico' against +-the system `uucico', by using the `-u' switch. For this to work, +-change the definitions of `ZUUCICO_CMD' and `UUCICO_EXECL' at the top +-of `tstuu.c' to something appropriate for your system. The definitions +-in `tstuu.c' are what I used for Ultrix 4.0, on which +-`/usr/lib/uucp/uucico' is particularly obstinate about being run as a +-child; I was only able to run it by creating a login name with no +-password whose shell was `/usr/lib/uucp/uucico'. Calling login in this +-way will leave fake entries in `wtmp' and `utmp'; if you compile +-`tstout.c' (in the `contrib' directory) as a setuid `root' program, +-`tstuu' will run it to clear those entries out. On most systems, such +-hackery should not be necessary, although on SCO I had to su to `root' +-(`uucp' might also have worked) before I could run +-`/usr/lib/uucp/uucico'. +- +- You can test `uucp' and `uux' (give them the `-r' switch to keep +-them from starting `uucico') to make sure they create the right sorts +-of files. Unfortunately, if you don't know what the right sorts of +-files are, I'm not going to tell you here. +- +- If you can not run `tstuu', or if it fails inexplicably, don't worry +-about it too much. On some systems `tstuu' will fail because of +-problems using pseudo terminals, which will not matter in normal use. +-The real test of the package is talking to another system. +- +- +-File: uucp.info, Node: Installing the Binaries, Next: Configuration, Prev: Testing the Compilation, Up: Installing Taylor UUCP ++The code is carefully segregated into a system independent portion and a ++system dependent portion. The system dependent code is in the `unix' ++subdirectory, and also in the file `sysh.unx' (also known as ++`sysdep.h'). + +-Installing the Binaries +-======================= ++ With the right configuration parameters, the system independent code ++calls only ANSI C functions. Some of the less common ANSI C functions ++are also provided in the `lib' directory. The replacement function ++`strtol' in `lib/strtol.c' assumes that the characters `A' to `F' and ++`a' to `f' appear in strictly sequential order. The function ++`igradecmp' in `uuconf/grdcmp.c' assumes that the upper and lower case ++letters appear in order. Both assumptions are true for ASCII and ++EBCDIC, but neither is guaranteed by ANSI C. Disregarding these ++caveats, I believe that the system independent portion of the code is ++strictly conforming. + +- You can install the executable files by becoming `root' and typing +-`make install'. Or you can look at what `make install' does and do it +-by hand. It tries to preserve your old programs, if any, but it only +-does this the first time Taylor UUCP is installed (so that if you +-install several versions of Taylor UUCP, you can still go back to your +-original UUCP programs). You can retrieve the original programs by +-typing `make uninstall'. +- +- Note that by default the programs are compiled with debugging +-information, and they are not stripped when they are installed. You may +-want to strip the installed programs to save disk space. For more +-information, see your system documentation for the `strip' program. ++ That's not too exciting, since all the work is done in the system ++dependent code. I think that this code can conform to POSIX 1003.1, ++given the right compilation parameters. I'm a bit less certain about ++this, though. + +- Of course, simply installing the executable files is not enough. You +-must also arrange for them to be used correctly. ++ The code has been used on a 16 bit segmented system with no function ++prototypes, so I'm fairly certain that all casts to long and pointers ++are done when necessary. + +  +-File: uucp.info, Node: Configuration, Next: Testing the Installation, Prev: Installing the Binaries, Up: Installing Taylor UUCP +- +-Configuring Taylor UUCP +-======================= ++File: uucp.info, Node: Naming Conventions, Next: Patches, Prev: System Dependence, Up: Hacking + +- You will have to decide what types of configuration files you want to +-use. This package supports a new sort of configuration file; see *Note +-Configuration Files::. It also supports V2 configuration files +-(`L.sys', `L-devices', etc.) and HDB configuration files (`Systems', +-`Devices', etc.). No documentation is provided for V2 or HDB +-configuration files. All types of configuration files can be used at +-once, if you are so inclined. Currently using just V2 configuration +-files is not really possible, because there is no way to specify a +-dialer (there are no built in dialers, and the program does not know +-how to read `acucap' or `modemcap'); however, V2 configuration files +-can be used with a new style dial file (*note dial File::), or with a +-HDB `Dialers' file. +- +- Use of HDB configuration files has two known bugs. A blank line in +-the middle of an entry in the `Permissions' file will not be ignored as +-it should be. Dialer programs, as found in some versions of HDB, are +-not recognized directly. If you must use a dialer program, rather than +-an entry in `Devices', you must use the `chat-program' command in a new +-style dial file; see *Note dial File::. You will have to invoke the +-dialer program via a shell script or another program, since an exit +-code of 0 is required to recognize success; the `dialHDB' program in +-the `contrib' directory may be used for this purpose. +- +- The `uuconv' (*note Invoking uuconv::) program can be used to +-convert from V2 or HDB configuration files to the new style (it can also +-do the reverse translation, if you are so inclined). It will not do all +-of the work, and the results should be carefully checked, but it can be +-quite useful. +- +- If you are installing a new system, you will, of course, have to +-write the configuration files; see *Note Configuration Files:: for +-details on how to do this. ++7.2 Naming Conventions ++====================== + +- After writing the configuration files, use the `uuchk' program to +-verify that they are what you expect; see *Note Invoking uuchk::. +- +- +-File: uucp.info, Node: Testing the Installation, Prev: Configuration, Up: Installing Taylor UUCP ++I use a modified Hungarian naming convention for my variables and ++functions. As with all naming conventions, the code is rather opaque if ++you are not familiar with it, but becomes clear and easy to use with ++time. + +-Testing the Installation +-======================== +- +- After you have written the configuration files, and verified them +-with the `uuchk' program (*note Invoking uuchk::), you must check that +-UUCP can correctly contact another system. +- +- Tell `uucico' to dial out to the system by using the `-s' system +-switch (e.g., `uucico -s uunet'). The log file should tell you what +-happens. The exact location of the log file depends upon the settings +-in `policy.h' when you compiled the program, and on the use of the +-`logfile' command in the `config' file. Typical locations are +-`/usr/spool/uucp/Log' or a subdirectory under `/usr/spool/uucp/.Log'. +- +- If you compiled the code with debugging enabled, you can use +-debugging mode to get a great deal of information about what sort of +-data is flowing back and forth; the various possibilities are described +-with the `debug' command (*note Debugging Levels::). When initially +-setting up a connection `-x chat' is probably the most useful (e.g., +-`uucico -s uunet -x chat'); you may also want to use `-x +-handshake,incoming,outgoing'. You can use `-x' multiple times on one +-command line, or you can give it comma separated arguments as in the +-last example. Use `-x all' to turn on all possible debugging +-information. +- +- The debugging information is written to a file, normally +-`/usr/spool/uucp/Debug', although the default can be changed in +-`policy.h', and the `config' file can override the default with the +-`debugfile' command. The debugging file may contain passwords and some +-file contents as they are transmitted over the line, so the debugging +-file is only readable by the `uucp' user. +- +- You can use the `-f' switch to force `uucico' to call out even if +-the last call failed recently; using `-S' when naming a system has the +-same effect. Otherwise the status file (in the `.Status' subdirectory +-of the main spool directory, normally `/usr/spool/uucp') (*note Status +-Directory::) will prevent too many attempts from occurring in rapid +-succession. +- +- On older System V based systems which do not have the `setreuid' +-system call, problems may arise if ordinary users can start an execution +-of `uuxqt', perhaps indirectly via `uucp' or `uux'. UUCP jobs may wind +-up executing with a real user ID of the user who invoked `uuxqt', which +-can cause problems if the UUCP job checks the real user ID for security +-purposes. On such systems, it is safest to put `run-uuxqt never' +-(*note Miscellaneous (config)::) in the `config' file, so that `uucico' +-never starts `uuxqt', and invoke `uuxqt' directly from a `crontab' file. +- +- Please let me know about any problems you have and how you got around +-them. If you do report a problem, please include the version number of +-the package you are using, the operating system you are running it on, +-and a sample of the debugging file showing the problem (debugging +-information is usually what is needed, not just the log file). General +-questions such as "why doesn't `uucico' dial out" are impossible to +-answer without much more information. +- +- +-File: uucp.info, Node: Using Taylor UUCP, Next: Configuration Files, Prev: Installing Taylor UUCP, Up: Top ++ The first character indicates the type of the variable (or function ++return value). Sometimes additional characters are used. I use the ++following type prefixes: + +-Using Taylor UUCP +-***************** ++`a' ++ array; the next character is the type of an element + +-* Menu: ++`b' ++ byte or character + +-* Calling Other Systems:: Calling Other Systems +-* Accepting Calls:: Accepting Calls +-* Mail and News:: Using UUCP for Mail and News +-* The Spool Directory Layout:: The Spool Directory Layout +-* Spool Directory Cleaning:: Cleaning the UUCP Spool Directory ++`c' ++ count of something + +- +-File: uucp.info, Node: Calling Other Systems, Next: Accepting Calls, Prev: Using Taylor UUCP, Up: Using Taylor UUCP ++`e' ++ stdio FILE * + +-Calling Other Systems +-===================== ++`f' ++ boolean + +- By default `uucp' and `uux' will automatically start up `uucico' to +-call another system whenever work is queued up. However, the call may +-fail, or you may have put in time restrictions which prevent the call +-at that time (perhaps because telephone rates are high) (*note When to +-Call::). Also, a remote system may have work queued up for your +-system, but may not be calling you for some reason (perhaps you have +-agreed that your system should always place the call). To make sure +-that work gets transferred between the systems withing a reasonable +-time period, you should arrange to periodically invoke `uucico'. +- +- These periodic invocations are normally triggered by entries in the +-`crontab' file. The exact format of `crontab' files, and how new +-entries are added, varies from system to system; check your local +-documentation (try `man cron'). +- +- To attempt to call all systems with outstanding work, use the command +-`uucico -r1'. To attempt to call a particular system, use the command +-`uucico -s SYSTEM'. To attempt to call a particular system, but only +-if there is work for it, use the command `uucico -C -s SYSTEM'. (*note +-Invoking uucico::). +- +- A common case is to want to try to call a system at a certain time, +-with periodic retries if the call fails. A simple way to do this is to +-create an empty UUCP command file, known as a "poll file". If a poll +-file exists for a system, then `uucico -r1' will place a call to it. +-If the call succeeds, the poll file will be deleted. +- +- A poll file can be easily created using the `uux' command, by +-requesting the execution of an empty command. To create a poll file for +-SYSTEM, just do something like this: +- uux -r SYSTEM! +- The `-r' tells `uux' to not start up `uucico' immediately. Of +-course, if you do want `uucico' to start up right away, omit the `-r'; +-if the call fails, the poll file will be left around to cause a later +-call. +- +- For example, I use the following crontab entries locally: +- +- 45 * * * * /bin/echo /usr/lib/uucp/uucico -r1 | /bin/su uucpa +- 40 4,10,15 * * * /usr/bin/uux -r uunet! +- +- Every hour, at 45 minutes past, this will check if there is any work +-to be done, and, if there is, will call the appropriate system. Also, +-at 4:40am, 10:40am, and 3:40pm, this will create a poll file file for +-`uunet', forcing the next run of `uucico' to call `uunet'. ++`i' ++ generic integer + +- +-File: uucp.info, Node: Accepting Calls, Next: Mail and News, Prev: Calling Other Systems, Up: Using Taylor UUCP ++`l' ++ double + +-Accepting Calls +-=============== ++`o' ++ file descriptor (as returned by open, creat, etc.) + +- To accept calls from another system, you must arrange matters such +-that when that system calls in, it automatically invokes `uucico' on +-your system. +- +- The most common arrangement is to create a special user name and +-password for incoming UUCP calls. This user name typically uses the +-same user ID as the regular `uucp' user (Unix permits several user +-names to share the same user ID). The shell for this user name should +-be set to `uucico'. +- +- Here is a sample `/etc/passwd' line to accept calls from a remote +-system named airs: +- Uairs:PASSWORD:4:8:airs UUCP:/usr/spool/uucp:/usr/lib/uucp/uucico +- The details may vary on your system. You must use reasonable user +-and group ID's. You must use the correct file name for `uucico'. The +-PASSWORD must appear in the UUCP configuration files on the remote +-system, but will otherwise never be seen or typed by a human. +- +- Note that `uucico' appears as the login shell, and that it will be +-run with no arguments. This means that it will start in slave mode and +-accept an incoming connection. *Note Invoking uucico::. +- +- On some systems, creating an empty file named `.hushlogin' in the +-home directory will skip the printing of various bits of information +-when the remote `uucico' logs in, speeding up the UUCP connection +-process. +- +- For the greatest security, each system which calls in should use a +-different user name, each with a different password, and the +-`called-login' command should be used in the `sys' file to ensure that +-the correct login name is used. *Note Accepting a Call::, and see +-*Note Security::. +- +- If you never need to dial out from your system, but only accept +-incoming calls, you can arrange for `uucico' to handle logins itself, +-completely controlling the port, by using the `--endless' option. +-*Note Invoking uucico::. ++`p' ++ generic pointer + +- +-File: uucp.info, Node: Mail and News, Next: The Spool Directory Layout, Prev: Accepting Calls, Up: Using Taylor UUCP ++`q' ++ pointer to structure + +-Using UUCP for Mail and News. +-============================= ++`s' ++ structure + +- Taylor UUCP does not include a mail package. All Unix systems come +-with some sort of mail delivery agent, typically `sendmail' or `MMDF'. +-Source code is available for some alternative mail delivery agents, +-such as `IDA sendmail' and `smail'. +- +- Taylor UUCP also does not include a news package. The two major Unix +-news packages are `C-news' and `INN'. Both are available in source +-code form. +- +- Configuring and using mail delivery agents is a notoriously complex +-topic, and I will not be discussing it here. Configuring news systems +-is usually simpler, but I will not be discussing that either. I will +-merely describe the interactions between the mail and news systems and +-UUCP. ++`u' ++ void (function return values only) + +- A mail or news system interacts with UUCP in two ways: sending and +-receiving. ++`z' ++ character string + +-* Menu: ++ A generic pointer (`p') is sometimes a `void *', sometimes a ++function pointer in which case the prefix is pf, and sometimes a pointer ++to another type, in which case the next character is the type to which ++it points (pf is overloaded). + +-* Sending mail or news:: Sending mail or news via UUCP +-* Receiving mail or news:: Receiving mail or news via UUCP ++ An array of strings (`char *[]') would be named `az' (array of ++string). If this array were passed to a function, the function ++parameter would be named `paz' (pointer to array of string). + +- +-File: uucp.info, Node: Sending mail or news, Next: Receiving mail or news, Prev: Mail and News, Up: Mail and News ++ Note that the variable name prefixes do not necessarily indicate the ++type of the variable. For example, a variable prefixed with `i' may be ++int, long or short. Similarly, a variable prefixed with `b' may be a ++char or an int; for example, the return value of `getchar' would be ++caught in an int variable prefixed with `b'. + +-Sending mail or news via UUCP +------------------------------ ++ For a non-local variable (extern or file static), the first character ++after the type prefix is capitalized. + +- When mail is to be sent from your machine to another machine via +-UUCP, the mail delivery agent will invoke `uux'. It will generally run +-a command such as `uux - SYSTEM!rmail ADDRESS', where SYSTEM is the +-remote system to which the mail is being sent. It may pass other +-options to `uux', such as `-r' or `-g' (*note Invoking uux::). +- +- The news system also invokes `uux' in order to transfer articles to +-another system. The only difference is that news will use `uux' to +-invoke `rnews' on the remote system, rather than `rmail'. +- +- You should arrange for your mail and news systems to invoke the +-Taylor UUCP version of `uux'. If you only have Taylor UUCP, or if you +-simply replace any existing version of `uux' with the Taylor UUCP +-version, this will probably happen automatically. However, if you have +-two UUCP packages installed on your system, you will probably have to +-modify the mail and news configuration files in some way. +- +- Actually, if both the system UUCP and Taylor UUCP are using the same +-spool directory format, the system `uux' will probably work fine with +-the Taylor `uucico' (the reverse is not the case: the Taylor `uux' +-requires the Taylor `uucico'). However, data transfer will be somewhat +-more efficient if the Taylor `uux' is used. ++ Most static variables and functions use another letter after the type ++prefix to indicate which module they come from. This is to help ++distinguish different names in the debugger. For example, all static ++functions in `protg.c', the `g' protocol source code, use a module ++prefix of `g'. This isn't too useful, as a number of modules use a ++module prefix of `s'. + +  +-File: uucp.info, Node: Receiving mail or news, Prev: Sending mail or news, Up: Mail and News ++File: uucp.info, Node: Patches, Prev: Naming Conventions, Up: Hacking + +-Receiving mail or news via UUCP +-------------------------------- ++7.3 Patches ++=========== + +- To receive mail, all that is necessary is for UUCP to invoke +-`rmail'. Any mail delivery agent will provide an appropriate version +-of `rmail'; you must simply make sure that it is in the command path +-used by UUCP (it almost certainly already is). The default command +-path is set in `policy.h', and it may be overridden for a particular +-system by the `command-path' command (*note Miscellaneous (sys)::). +- +- Similarly, for news UUCP must be able to invoke `rnews'. Any news +-system will provide a version of `rnews', and you must ensure that is +-in a directory on the path that UUCP will search. ++I am always grateful for any patches sent in. Much of the flexibility ++and portability of the code is due to other people. Please do not ++hesitate to send me any changes you have found necessary or useful. ++ ++ When sending a patch, please send the output of the Unix `diff' ++program invoked with the `-c' option (if you have the GNU version of ++`diff', use the `-p' option). Always invoke `diff' with the original ++file first and the modified file second. ++ ++ If your `diff' does not support `-c' (or you don't have `diff'), ++send a complete copy of the modified file (if you have just changed a ++single function, you can just send the new version of the function). ++In particular, please do not send `diff' output without the `-c' ++option, as it is useless. ++ ++ If you have made a number of changes, it is very convenient for me if ++you send each change as a separate mail message. Sometimes I will think ++that one change is useful but another one is not. If they are in ++different messages it is much easier for me to apply one but not the ++other. ++ ++ I rarely apply the patches directly. Instead I work my way through ++the hunks and apply each one separately. This ensures that the naming ++remains consistent, and that I understand all the code. ++ ++ If you can not follow all these rules, then don't. But if you do, it ++makes it more likely that I will incorporate your changes. I am not ++paid for my UUCP work, and my available time is unfortunately very ++restricted. The package is important to me, and I do what I can, but I ++can not do all that I would like, much less all that everybody else ++would like. ++ ++ Finally, please do not be offended if I do not reply to messages for ++some time, even a few weeks. I am often behind on my mail, and if I ++think your message deserves a considered reply I will often put it aside ++until I have time to deal with it. ++ ++ ++File: uucp.info, Node: Acknowledgements, Next: Index (concepts), Prev: Hacking, Up: Top ++ ++8 Acknowledgements ++****************** ++ ++This is a list of people who gave help or suggestions while I was ++working on the Taylor UUCP project. Appearance on this list does not ++constitute endorsement of the program, particularly since some of the ++comments were criticisms. I've probably left some people off, and I ++apologize for any oversight; it does not mean your contribution was ++unappreciated. ++ ++ First of all, I would like to thank the people at Infinity ++Development Systems (formerly AIRS, which lives on in the domain name) ++for permitting me to use their computers and `uunet' access. I would ++also like to thank Richard Stallman for founding the Free ++Software Foundation, and John Gilmore for writing the ++initial version of gnuucp (based on uuslave) which was a direct ++inspiration for this somewhat larger project. Chip Salzenberg ++ has contributed many patches. Franc,ois Pinard ++ tirelessly tested the code and suggested many ++improvements. He also put together the initial version of this manual. ++Doug Evans contributed the zmodem protocol. Marc Boucher ++ contributed the code supporting the pipe port type. ++Jorge Cwik contributed the `y' protocol code. ++Finally, Verbus M. Counts and Centel Federal ++Systems, Inc., deserve special thanks, since they actually paid me ++money to port this code to System III. ++ ++ In alphabetical order: ++ ++ Meno Abels ++ "Earle F. Ake - SAIC" ++ (Michael Almond) ++ (Christopher J. Ambler) ++ Brian W. Antoine ++ (John Antypas) ++ (James Van Artsdalen) ++ (Jim Avera) ++ (Niels Baggesen) ++ (Scott Ballantyne) ++ Zacharias Beckman ++ (Mike Bernson) ++ (Roberto Biancardi) ++ (Scott Blachowicz) ++ (Andrey G Blochintsev) ++ (Spider Boardman) ++ Gregory Bond ++ Marc Boucher ++ Ard van Breemen ++ (Dean Brooks) ++ (Jim Brownfield) ++ (Dave Buck) ++ (Gordon Burditt) ++ (Donald Burr) ++ (Michael I Bushnell) ++ Brian Campbell ++ Andrew A. Chernov ++ (Jonathan Clark) ++ (Frank Conrad) ++ Ed Carp ++ (Mark Clements) ++ (Verbus M. Counts) ++ (John Cowan) ++ Bob Cunningham ++ (Jorge Cwik) ++ (Klaus Dahlenburg) ++ Damon ++ (Bill Davidson) ++ (Hubert Delahaye) ++ (Mark Delany) ++ Allen Delaney ++ Gerriet M. Denkmann ++ (Bob Denny) ++ Drew Derbyshire ++ (Steven S. Dick) ++ (Gert Doering) ++ (Uwe Doering) ++ Hans-Dieter Doll ++ (Dean Edmonds) ++ Mark W. Eichin ++ ++ Andrew Evans ++ (Doug Evans) ++ Marc Evans ++ Dan Everhart ++ (Larry Fahnoe) ++ Matthew Farwell ++ (Bill Fenner) ++ (Jose A. Fernandez) ++ "David J. Fiander" ++ Thomas Fischer ++ Mister Flash ++ (Ju"rgen Fluk) ++ (Erik Forsberg) ++ (Andy Fyfe) ++ Lele Gaifax ++ ++ (James Gardiner [hunter]) ++ Terry Gardner ++ (David Gilbert) ++ (Oleg Girko) ++ (Jim Gottlieb) ++ Benoit Grange ++ (Eric Lee Green) ++ (Daniel R. Guilderson) ++ (Gregory Gulik) ++ Richard H. Gumpertz ++ Scott Guthridge ++ Michael Haberler ++ Daniel Hagerty ++ (John Harkin) ++ (Guy Harris) ++ (Stephen Harris) ++ Tom Ivar Helbekkmo ++ Petri Helenius ++ (B. Gabriel Helou) ++ Bob Hemedinger ++ Andrew Herbert ++ (Kenneth Herron) ++ Peter Honeyman ++ (John Hood) ++ Mark Horsburgh ++ John Hughes ++ Mike Ipatow ++ Bill Irwin ++ (Chiaki Ishikawa) ++ (Andreas Israel) ++ (Tim Iverson) ++ (Bob Izenberg) ++ (D.J.James) ++ Rob Janssen ++ (Eric S Johansson) ++ Kevin Johnson ++ (Robert Joop) ++ Alan Judge ++ (Christof Junge) ++ Romain Kang ++ (Ronald S. Karr) ++ Brendan Kehoe ++ (John Kennedy) ++ (Jac Kersing) ++ (Olaf Kirch) ++ Gabor Kiss ++ (Gero Kuhlmann) ++ (Rob Kurver) ++ "C.A. Lademann" ++ (Kent Landfield) ++ Tin Le ++ (Gregory LeBaron) ++ (Karl Lehenbauer) ++ (Alexander Lehmann) ++ (Merlyn LeRoy) ++ (Chris Lewis) ++ (Don Lewis) ++ (Jay Vassos-Libove) ++ (Bruce Lilly) ++ Godfrey van der Linden ++ Ted Lindgreen ++ (Andrew Loewenstern) ++ "Arne Ludwig" ++ Matthew Lyle ++ (David J. MacKenzie) ++ John R MacMillan ++ (Jens-Uwe Mager) ++ Giles D Malet ++ (Mark E. Mallett) ++ (Jose A. Manas) ++ (Peter Mandrella) ++ (Alex Martelli) ++ W Christopher Martin ++ Yanek Martinson ++ (Thomas Mechtersheimer) ++ (Jean Mehat) ++ (Udo Meyer) ++ (Leslie Mikesell) ++ (Trever Miller) ++ (Mitch Mitchell) ++ Emmanuel Mogenet ++ (Rupert Mohr) ++ Jason Molenda ++ (Ian Moran) ++ (John Paul Morrison) ++ (Brian J. Murrell) ++ (Dirk Musstopf) ++ (Lyndon Nerenberg) ++ (Rolf Nerstheimer) ++ (Thomas Neumann) ++ ++ Richard E. Nickle ++ (Stephan Niemz) ++ (Raymond Nijssen) ++ (Michael Nolan) ++ david nugent ++ Jim O'Connor ++ (Kevin O'Gorman) ++ Petri Ojala ++ (Brian 'Doc' O'Neill) ++ ++ Peter Palfrader ++ (Mike Park) ++ Tim Peiffer ++ (Don Phillips) ++ "Mark Pizzolato 415-369-9366" ++ John Plate ++ (Dave Platt) ++ (Mark Powell) ++ Mark Powell ++ (Tim Pozar) ++ (Joey Pruett) ++ Paul Pryor ++ (Jeff Putsch) ++ (Andreas Raab) ++ Vadim Radionov ++ Jarmo Raiha ++ James Revell ++ Scott Reynolds ++ (Michael Richardson) ++ Kenji Rikitake ++ (Arnold Robbins) ++ (Steve M. Robbins) ++ Ollivier Robert ++ Serge Robyns ++ Lawrence E. Rosenman ++ Jeff Ross ++ Aleksey P. Rudnev ++ "Heiko W.Rupp" ++ (Wolfgang S. Rupprecht) ++ (Tom Rushworth) ++ Peter Rye ++ (Joseph E. Sacco) ++ (Rich Salz) ++ Curt Sampson ++ (Mike Sangrey) ++ Nickolay Saukh ++ Ignatios Souvatzis ++ (Heiko Schlittermann) ++ Eric Schnoebelen ++ (Russell Schulz) ++ ++ Igor V. Semenyuk ++ Christopher Sawtell ++ (Bernd Schuler) ++ (Christian Seyb) ++ Marcus Shang ++ (M. J. Shannon Jr.) ++ (Michael Shields) ++ (Peter da Silva) ++ (Vince Skahan) ++ (Patrick Smith) ++ (Monty Solomon) ++ (Bill Sommerfeld) ++ Julian Stacey ++ (Gjoen Stein) ++ Harlan Stenn ++ Ralf Stephan ++ (Johannes Stille) ++ (Hannu Strang) ++ (Ralf E. Stranzenbach) ++ (S. Sullivan) ++ Shigeya Suzuki ++ (Karl Swartz) ++ ++ Oleg Tabarovsky ++ (Takatoshi Ikeda) ++ John Theus ++ (Bob Thrush) ++ ppKarsten Thygesen ++ Graham Toal ++ (Richard Todd) ++ Michael Ju. Tokarev ++ Martin Tomes ++ Len Tower ++ Mark Towfiq ++ (Marc Unangst) ++ Matthias Urlichs ++ Tomi Vainio ++ (Adri Verhoef) ++ Andrew Vignaux ++ (Andreas Vogel) ++ Dima Volodin ++ (Jos Vos) ++ (Johan Vromans) ++ David Vrona ++ (Marcel Waldvogel) ++ (Stephen J. Walick) ++ (Syd Weinstein) ++ (Gerben Wierda) ++ (Joe Wells) ++ (T. William Wells) ++ Peter Wemm ++ (Greg A. Woods) ++ (John Woods) ++ Michael Yu.Yaroslavtsev ++ Alexei K. Yushin ++ (Jon Zeeff) ++ Matthias Zepf ++ Eric Ziegast + +  +-File: uucp.info, Node: The Spool Directory Layout, Next: Spool Directory Cleaning, Prev: Mail and News, Up: Using Taylor UUCP +- +-The Spool Directory Layout +-========================== ++File: uucp.info, Node: Index (concepts), Next: Index (configuration file), Prev: Acknowledgements, Up: Top + +- In general, the layout of the spool directory may be safely ignored. +-However, it is documented here for the curious. This description only +-covers the `SPOOLDIR_TAYLOR' layout. The ways in which the other spool +-directory layouts differ are described in the source file +-`unix/spool.c'. +- +- Directories and files are only created when they are needed, so a +-typical system will not have all of the entries described here. ++Concept Index ++************* + ++[index] + * Menu: + +-* System Spool Directories:: System Spool Directories +-* Status Directory:: Status Spool Directory +-* Execution Subdirectories:: Execution Spool Subdirectories +-* Other Spool Subdirectories:: Other Spool Subdirectories +-* Spool Lock Files:: Spool Directory Lock Files ++* .Corrupt: Execution Subdirectories. ++ (line 21) ++* .Failed: Execution Subdirectories. ++ (line 26) ++* .Preserve: Other Spool Subdirectories. ++ (line 30) ++* .Received: Other Spool Subdirectories. ++ (line 38) ++* .Sequence: Other Spool Subdirectories. ++ (line 7) ++* .Status: Status Directory. (line 7) ++* .Temp: Other Spool Subdirectories. ++ (line 14) ++* .Xqtdir: Execution Subdirectories. ++ (line 7) ++* /usr/spool/uucp: Miscellaneous (config). ++ (line 14) ++* /usr/spool/uucppublic: Miscellaneous (config). ++ (line 20) ++* accepting calls: Accepting Calls. (line 6) ++* anonymous UUCP: config File Examples. (line 41) ++* call configuration file: Configuration File Names. ++ (line 47) ++* call in login name: Configuration File Names. ++ (line 64) ++* call in password: Configuration File Names. ++ (line 64) ++* call out file: Configuration File Names. ++ (line 47) ++* call out login name: Configuration File Names. ++ (line 47) ++* call out password: Configuration File Names. ++ (line 47) ++* calling in: Accepting Calls. (line 6) ++* calling out: Calling Other Systems. ++ (line 6) ++* changing spool directory: config File Examples. (line 26) ++* chat scripts: Chat Scripts. (line 6) ++* cleaning the spool directory: Spool Directory Cleaning. ++ (line 6) ++* config file: config File. (line 6) ++* config file examples: config File Examples. (line 6) ++* configuration file (call): Configuration File Names. ++ (line 47) ++* configuration file (config): config File. (line 6) ++* configuration file (dial): dial File. (line 6) ++* configuration file (dialcode): Configuration File Names. ++ (line 30) ++* configuration file (passwd): Configuration File Names. ++ (line 64) ++* configuration file (port): port File. (line 6) ++* configuration file (sys): sys File. (line 6) ++* d protocol: d Protocol. (line 6) ++* debugging file: Log File Names. (line 19) ++* dial file: dial File. (line 6) ++* dialcode configuration file: Configuration File Names. ++ (line 30) ++* dialcode file: Configuration File Names. ++ (line 30) ++* dialer configuration file: dial File. (line 6) ++* e protocol: e Protocol. (line 6) ++* E UUCP protocol command: The E Command. (line 6) ++* execution file format: Execution File Format. ++ (line 6) ++* f protocol: f Protocol. (line 6) ++* final handshake: The Final Handshake. (line 6) ++* G protocol: Big G Protocol. (line 6) ++* g protocol: g Protocol. (line 6) ++* gateway: Gateway Example. (line 6) ++* grades: When to Call. (line 25) ++* grades implementation: UUCP Grades. (line 6) ++* h protocol: h Protocol. (line 6) ++* H UUCP protocol command: The H Command. (line 6) ++* i protocol: i Protocol. (line 6) ++* initial handshake: The Initial Handshake. ++ (line 6) ++* j protocol: j Protocol. (line 6) ++* L.XXX: Spool Lock Files. (line 43) ++* LCK..SYS: Spool Lock Files. (line 16) ++* LCK.XQT.NN: Spool Lock Files. (line 28) ++* leaf site: Leaf Example. (line 6) ++* lock directory: Miscellaneous (config). ++ (line 27) ++* lock files: UUCP Lock Files. (line 6) ++* lock files in spool directory: Spool Lock Files. (line 6) ++* log file: Log File Names. (line 7) ++* LXQ.CMD: Spool Lock Files. (line 36) ++* mail: Mail and News. (line 6) ++* main configuration file: config File. (line 6) ++* news: Mail and News. (line 6) ++* parity in login names: Miscellaneous (config). ++ (line 43) ++* passwd configuration file: Configuration File Names. ++ (line 64) ++* passwd file: Configuration File Names. ++ (line 64) ++* port configuration file: port File. (line 6) ++* port file: port File. (line 6) ++* protocol d: d Protocol. (line 6) ++* protocol e: e Protocol. (line 6) ++* protocol f: f Protocol. (line 6) ++* protocol G: Big G Protocol. (line 6) ++* protocol g: g Protocol. (line 6) ++* protocol h: h Protocol. (line 6) ++* protocol i: i Protocol. (line 6) ++* protocol j: j Protocol. (line 6) ++* protocol t: t Protocol. (line 6) ++* protocol v: v Protocol. (line 6) ++* protocol x: x Protocol. (line 6) ++* protocol y: y Protocol. (line 6) ++* protocol, UUCP: UUCP Protocol. (line 6) ++* public directory: Miscellaneous (config). ++ (line 20) ++* R UUCP protocol command: The R Command. (line 6) ++* S UUCP protocol command: The S Command. (line 6) ++* spool directory: The Spool Directory Layout. ++ (line 6) ++* spool directory, changing: config File Examples. (line 26) ++* spool directory, cleaning: Spool Directory Cleaning. ++ (line 6) ++* spool directory, setting: Miscellaneous (config). ++ (line 14) ++* statistics file: Log File Names. (line 14) ++* status files: Status Directory. (line 7) ++* sys file: sys File. (line 6) ++* sys file example (gateway): Gateway Example. (line 6) ++* sys file example (leaf): Leaf Example. (line 6) ++* system configuration file: sys File. (line 6) ++* system lock files: Spool Lock Files. (line 16) ++* system name: Miscellaneous (config). ++ (line 9) ++* system spool directories: System Spool Directories. ++ (line 6) ++* t protocol: t Protocol. (line 6) ++* time strings: Time Strings. (line 6) ++* unknown systems: Miscellaneous (config). ++ (line 36) ++* UUCP protocol: UUCP Protocol. (line 6) ++* UUCP protocol E command: The E Command. (line 6) ++* UUCP protocol H command: The H Command. (line 6) ++* UUCP protocol R command: The R Command. (line 6) ++* UUCP protocol S command: The S Command. (line 6) ++* UUCP protocol X command: The X Command. (line 6) ++* UUCP system name: Miscellaneous (config). ++ (line 9) ++* uucppublic: Miscellaneous (config). ++ (line 20) ++* v protocol: v Protocol. (line 6) ++* x protocol: x Protocol. (line 6) ++* X UUCP protocol command: The X Command. (line 6) ++* X.* file format: Execution File Format. ++ (line 6) ++* y protocol: y Protocol. (line 6) + +  +-File: uucp.info, Node: System Spool Directories, Next: Status Directory, Prev: The Spool Directory Layout, Up: The Spool Directory Layout +- +-System Spool Directories +------------------------- ++File: uucp.info, Node: Index (configuration file), Prev: Index (concepts), Up: Top + +-`SYSTEM' +- There is a subdirectory of the main spool directory for each remote +- system. +- +-`SYSTEM/C.' +- This directory stores files describing file transfer commands to +- be sent to the SYSTEM. Each file name starts with `C.G', where G +- is the job grade. Each file contains one or more commands. For +- details of the commands, see *Note UUCP Protocol Commands::. +- +-`SYSTEM/D.' +- This directory stores data files. Files with names like +- `D.GSSSS', where G is the grade and SSSS is a sequence number, are +- waiting to be transferred to the SYSTEM, as directed by the files +- in the `SYSTEM/C.' directory. Files with other names, typically +- `D.SYSTEMGSSSS', have been received from SYSTEM and are waiting to +- be processed by an execution file in the `SYSTEM/X.' directory. +- +-`SYSTEM/D.X' +- This directory stores data files which will become execution files +- on the remote system. In current practice, this directory rarely +- exists, because most simple executions, including typical uses of +- `rmail' and `rnews', send an `E' command rather than an execution +- file (*note The E Command::). +- +-`SYSTEM/X.' +- This directory stores execution files which have been received from +- SYSTEM. This directory normally exists, even though the +- corresponding `D.X' directory does not, because `uucico' will +- create an execution file on the fly when it receives an `E' +- command. +- +-`SYSTEM/SEQF' +- This file holds the sequence number of the last job sent to +- SYSTEM. The sequence number is used to ensure that file names are +- unique in the remote system spool directory. The file is four +- bytes long. Sequence numbers are composed of digits and the upper +- case letters. ++Configuration File Index ++************************ + +- +-File: uucp.info, Node: Status Directory, Next: Execution Subdirectories, Prev: System Spool Directories, Up: The Spool Directory Layout +- +-Status Directory +----------------- ++[index] ++* Menu: + +-`.Status' +- This directory holds status files for each remote system. The +- name of the status file is the name of the system which it +- describes. Each status file describes the last conversation with +- the system. Running `uustat --status' basically just formats and +- prints the contents of the status files (*note uustat Examples::). +- +- Each status file has a single text line with six fields. +- +- code +- A code indicating the status of the last conversation. The +- following values are defined, though not all are actually +- used. +- `0' +- Conversation completed normally. +- +- `1' +- `uucico' was unable to open the port. +- +- `2' +- The last call to the system failed while dailing. +- +- `3' +- The last call to the system failed while logging in. +- +- `4' +- The last call to the system failed during the initial +- UUCP protocol handshake (*note The Initial Handshake::). +- +- `5' +- The last call to the system failed after the initial +- handshake. +- +- `6' +- `uucico' is currently talking to the system. +- +- `7' +- The last call to the system failed because it was the +- wrong time to call (this is not used if calling the +- system is never permitted). +- +- retries +- The number of retries since the last successful call. +- +- time of last call +- The time of the last call, in seconds since the epoch (as +- returned by the `time' system call). +- +- wait +- If the last call failed, this is the number of seconds since +- the last call before `uucico' may attempt another call. This +- is set based on the retry time; see *Note When to Call::. +- The `-f' or `-S' options to `uucico' direct it to ignore this +- wait time; see *Note Invoking uucico::. +- +- description +- A text description of the status, corresponding to the code +- in the first field. This may contain spaces. ++* abort: dial File. (line 137) ++* abort-chat: dial File. (line 123) ++* abort-chat-fail: dial File. (line 127) ++* abort-chat-program: dial File. (line 131) ++* abort-chat-seven-bit: dial File. (line 129) ++* abort-chat-timeout: dial File. (line 125) ++* address: Placing the Call. (line 46) ++* alias: Naming the System. (line 24) ++* alternate: Naming the System. (line 11) ++* baud in port file: port File. (line 86) ++* baud in sys file: Placing the Call. (line 9) ++* baud-range: port File. (line 94) ++* call-local-size: File Transfer Control. ++ (line 33) ++* call-login: Logging In. (line 67) ++* call-password: Logging In. (line 75) ++* call-remote-size: File Transfer Control. ++ (line 48) ++* call-timegrade: When to Call. (line 70) ++* call-transfer: File Transfer Control. ++ (line 19) ++* callback: Accepting a Call. (line 34) ++* called-chat: Accepting a Call. (line 39) ++* called-chat-fail: Accepting a Call. (line 43) ++* called-chat-program: Accepting a Call. (line 47) ++* called-chat-seven-bit: Accepting a Call. (line 45) ++* called-chat-timeout: Accepting a Call. (line 41) ++* called-local-size: File Transfer Control. ++ (line 55) ++* called-login: Accepting a Call. (line 7) ++* called-remote-size: File Transfer Control. ++ (line 62) ++* called-timegrade: When to Call. (line 89) ++* called-transfer: File Transfer Control. ++ (line 24) ++* callfile: Configuration File Names. ++ (line 47) ++* carrier in dial file: dial File. (line 85) ++* carrier in port file: port File. (line 107) ++* carrier-wait: dial File. (line 92) ++* chat: Chat Scripts. (line 21) ++* chat in dial file: dial File. (line 20) ++* chat in sys file: Logging In. (line 7) ++* chat-fail: Chat Scripts. (line 144) ++* chat-fail in dial file: dial File. (line 24) ++* chat-fail in sys file: Logging In. (line 11) ++* chat-program: Chat Scripts. (line 172) ++* chat-program in dial file: dial File. (line 28) ++* chat-program in sys file: Logging In. (line 15) ++* chat-seven-bit: Chat Scripts. (line 163) ++* chat-seven-bit in dial file: dial File. (line 26) ++* chat-seven-bit in sys file: Logging In. (line 13) ++* chat-timeout: Chat Scripts. (line 138) ++* chat-timeout in dial file: dial File. (line 22) ++* chat-timeout in sys file: Logging In. (line 9) ++* command: port File. (line 235) ++* command-path: Miscellaneous (sys). (line 13) ++* commands: Miscellaneous (sys). (line 19) ++* complete: dial File. (line 118) ++* complete-chat: dial File. (line 104) ++* complete-chat-fail: dial File. (line 108) ++* complete-chat-program: dial File. (line 112) ++* complete-chat-seven-bit: dial File. (line 110) ++* complete-chat-timeout: dial File. (line 106) ++* debug in config file: Debugging Levels. (line 7) ++* debug in sys file: Miscellaneous (sys). (line 45) ++* debugfile: Log File Names. (line 19) ++* default-alternates: Naming the System. (line 19) ++* device: port File. (line 78) ++* dial-device: port File. (line 124) ++* dialcodefile: Configuration File Names. ++ (line 30) ++* dialer in dial file: dial File. (line 17) ++* dialer in port file: port File. (line 129) ++* dialer-sequence: port File. (line 144) ++* dialfile: Configuration File Names. ++ (line 23) ++* dialtone: dial File. (line 74) ++* dtr-toggle: dial File. (line 97) ++* forward: File Transfer Control. ++ (line 127) ++* forward-from: File Transfer Control. ++ (line 118) ++* forward-to: File Transfer Control. ++ (line 109) ++* free-space: Miscellaneous (sys). (line 25) ++* half-duplex in dial file: dial File. (line 160) ++* half-duplex in port file: port File. (line 73) ++* hardflow: port File. (line 118) ++* hdb-files: Miscellaneous (config). ++ (line 115) ++* hostname: Miscellaneous (config). ++ (line 8) ++* local-receive: File Transfer Control. ++ (line 98) ++* local-send: File Transfer Control. ++ (line 69) ++* lockdir: Miscellaneous (config). ++ (line 27) ++* lockname: port File. (line 183) ++* logfile: Log File Names. (line 7) ++* max-file-time: File Transfer Control. ++ (line 132) ++* max-remote-debug: Miscellaneous (sys). (line 55) ++* max-retries: When to Call. (line 58) ++* max-uuxqts: Miscellaneous (config). ++ (line 61) ++* myname: Naming the System. (line 30) ++* nodename: Miscellaneous (config). ++ (line 7) ++* passwdfile: Configuration File Names. ++ (line 64) ++* pause: dial File. (line 80) ++* phone: Placing the Call. (line 45) ++* port in port file: port File. (line 23) ++* port in sys file: Placing the Call. (line 24) ++* portfile: Configuration File Names. ++ (line 15) ++* protocol in port file: port File. (line 51) ++* protocol in sys file: Protocol Selection. (line 7) ++* protocol-parameter in dial file: dial File. (line 142) ++* protocol-parameter in port file: port File. (line 57) ++* protocol-parameter in sys file: Protocol Selection. (line 90) ++* pubdir in config file: Miscellaneous (config). ++ (line 20) ++* pubdir in sys file: Miscellaneous (sys). (line 37) ++* push: port File. (line 208) ++* receive-request: File Transfer Control. ++ (line 11) ++* reliable in dial file: dial File. (line 155) ++* reliable in port file: port File. (line 67) ++* remote-receive: File Transfer Control. ++ (line 102) ++* remote-send: File Transfer Control. ++ (line 93) ++* request: File Transfer Control. ++ (line 15) ++* run-uuxqt: Miscellaneous (config). ++ (line 72) ++* send-request: File Transfer Control. ++ (line 7) ++* sequence: Miscellaneous (sys). (line 7) ++* server-address: port File. (line 215) ++* service: port File. (line 193) ++* seven-bit in dial file: dial File. (line 148) ++* seven-bit in port file: port File. (line 61) ++* speed in port file: port File. (line 84) ++* speed in sys file: Placing the Call. (line 7) ++* speed-range: port File. (line 92) ++* spool: Miscellaneous (config). ++ (line 14) ++* statfile: Log File Names. (line 14) ++* stream: port File. (line 211) ++* strip-login: Miscellaneous (config). ++ (line 43) ++* strip-proto: Miscellaneous (config). ++ (line 53) ++* sysfile: Configuration File Names. ++ (line 7) ++* system: Naming the System. (line 7) ++* time: When to Call. (line 7) ++* timegrade: When to Call. (line 25) ++* timetable: Miscellaneous (config). ++ (line 91) ++* transfer: File Transfer Control. ++ (line 29) ++* type: port File. (line 26) ++* unknown: Miscellaneous (config). ++ (line 36) ++* uuname: Miscellaneous (config). ++ (line 9) ++* v2-files: Miscellaneous (config). ++ (line 109) ++* version: port File. (line 200) + +- system name +- The name of the remote system. + +--- uucp-1.07.orig/uucp.texi ++++ uucp-1.07/uucp.texi +@@ -5,6 +5,8 @@ + @setchapternewpage odd + @c %**end of header + ++@dircategory Networking tools ++ + @iftex + @finalout + @end iftex +--- uucp-1.07.orig/uucp.info ++++ uucp-1.07/uucp.info +@@ -1,4 +1,6 @@ +-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi. ++This is uucp.info, produced by makeinfo version 4.11 from uucp.texi. ++ ++INFO-DIR-SECTION Networking tools + + START-INFO-DIR-ENTRY + * UUCP: (uucp). Transfer mail and news across phone lines. +@@ -26,132 +28,126 @@ a translation approved by the author ins + +  + Indirect: +-uucp.info-1: 1096 +-uucp.info-2: 50839 +-uucp.info-3: 100147 +-uucp.info-4: 149117 +-uucp.info-5: 197494 +-uucp.info-6: 241473 +-uucp.info-7: 285750 +-uucp.info-8: 333507 ++uucp.info-1: 1132 ++uucp.info-2: 295451 +  + Tag Table: + (Indirect) +-Node: Top1096 +-Node: Copying8521 +-Node: Introduction10769 +-Node: Invoking the UUCP Programs19718 +-Node: Standard Options20638 +-Node: Invoking uucp22051 +-Node: uucp Description22320 +-Node: uucp Options24342 +-Node: Invoking uux26952 +-Node: uux Description27270 +-Node: uux Options30313 +-Node: uux Examples33052 +-Node: Invoking uustat33967 +-Node: uustat Description34302 +-Node: uustat Options36064 +-Node: uustat Examples42643 +-Node: Invoking uuname45411 +-Node: Invoking uulog46370 +-Node: Invoking uuto48579 +-Node: Invoking uupick49533 +-Node: Invoking cu50839 +-Node: cu Description51215 +-Node: cu Commands52601 +-Node: cu Variables54985 +-Node: cu Options57140 +-Node: Invoking uucico58510 +-Node: uucico Description58786 +-Node: uucico Options61428 +-Node: Invoking uuxqt64880 +-Node: Invoking uuchk66058 +-Node: Invoking uuconv66644 +-Node: Invoking uusched68492 +-Node: Installing Taylor UUCP68930 +-Node: Compilation69460 +-Node: Testing the Compilation76413 +-Node: Installing the Binaries80373 +-Node: Configuration81395 +-Node: Testing the Installation83569 +-Node: Using Taylor UUCP86701 +-Node: Calling Other Systems87150 +-Node: Accepting Calls89674 +-Node: Mail and News91636 +-Node: Sending mail or news92729 +-Node: Receiving mail or news94178 +-Node: The Spool Directory Layout94942 +-Node: System Spool Directories95857 +-Node: Status Directory97807 +-Node: Execution Subdirectories100147 +-Node: Other Spool Subdirectories101426 +-Node: Spool Lock Files104404 +-Node: Spool Directory Cleaning106953 +-Node: Configuration Files108145 +-Node: Configuration Overview109728 +-Node: Configuration File Format111880 +-Node: Configuration Examples113553 +-Node: config File Examples114122 +-Node: Leaf Example118001 +-Node: Gateway Example120687 +-Node: Time Strings125052 +-Node: Chat Scripts126868 +-Node: config File136057 +-Node: Miscellaneous (config)137121 +-Node: Configuration File Names142943 +-Node: Log File Names147880 +-Node: Debugging Levels149117 +-Node: sys File151983 +-Node: Defaults and Alternates152863 +-Node: Naming the System155955 +-Node: Calling Out157796 +-Node: When to Call158153 +-Node: Placing the Call163763 +-Node: Logging In167285 +-Node: Accepting a Call170896 +-Node: Protocol Selection173708 +-Node: File Transfer Control187452 +-Node: Miscellaneous (sys)193744 +-Node: Default sys File Values196872 +-Node: port File197494 +-Node: dial File209257 +-Node: UUCP Over TCP215278 +-Node: TCP Client215782 +-Node: TCP Server217554 +-Node: Security219008 +-Node: Protocols224051 +-Node: UUCP Protocol Sources225671 +-Node: UUCP Grades227919 +-Node: UUCP Lock Files232212 +-Node: Execution File Format235609 +-Node: UUCP Protocol240973 +-Node: The Initial Handshake241473 +-Node: UUCP Protocol Commands249866 +-Node: The S Command251888 +-Node: The R Command258938 +-Node: The X Command263032 +-Node: The E Command264950 +-Node: The H Command268063 +-Node: The Final Handshake268896 +-Node: g Protocol269558 +-Node: f Protocol279982 +-Node: t Protocol283060 +-Node: e Protocol284114 +-Node: Big G Protocol284902 +-Node: i Protocol285750 +-Node: j Protocol294764 +-Node: x Protocol301031 +-Node: y Protocol301587 +-Node: d Protocol306138 +-Node: h Protocol306503 +-Node: v Protocol306807 +-Node: Hacking307298 +-Node: System Dependence307666 +-Node: Naming Conventions309054 +-Node: Patches311229 +-Node: Acknowledgements313179 +-Node: Index (concepts)326563 +-Node: Index (configuration file)333507 ++Node: Top1132 ++Node: Copying8554 ++Node: Introduction10799 ++Node: Invoking the UUCP Programs19753 ++Node: Standard Options20674 ++Node: Invoking uucp22092 ++Node: uucp Description22369 ++Node: uucp Options24403 ++Node: Invoking uux27022 ++Node: uux Description27348 ++Node: uux Options30403 ++Node: uux Examples33151 ++Node: Invoking uustat34075 ++Node: uustat Description34418 ++Node: uustat Options36192 ++Node: uustat Examples42780 ++Node: Invoking uuname45557 ++Node: Invoking uulog46524 ++Node: Invoking uuto48741 ++Node: Invoking uupick49703 ++Node: Invoking cu51017 ++Node: cu Description51401 ++Node: cu Commands52799 ++Node: cu Variables55192 ++Node: cu Options57356 ++Node: Invoking uucico58735 ++Node: uucico Description59021 ++Node: uucico Options61677 ++Node: Invoking uuxqt65140 ++Node: Invoking uuchk66328 ++Node: Invoking uuconv66924 ++Node: Invoking uusched68782 ++Node: Installing Taylor UUCP69228 ++Node: Compilation69759 ++Node: Testing the Compilation76717 ++Node: Installing the Binaries80681 ++Node: Configuration81708 ++Node: Testing the Installation83887 ++Node: Using Taylor UUCP87024 ++Node: Calling Other Systems87477 ++Node: Accepting Calls90006 ++Node: Mail and News91973 ++Node: Sending mail or news93071 ++Node: Receiving mail or news94529 ++Node: The Spool Directory Layout95301 ++Node: System Spool Directories96221 ++Node: Status Directory98183 ++Node: Execution Subdirectories100535 ++Node: Other Spool Subdirectories101826 ++Node: Spool Lock Files104816 ++Node: Spool Directory Cleaning107374 ++Node: Configuration Files108571 ++Node: Configuration Overview110155 ++Node: Configuration File Format112312 ++Node: Configuration Examples113990 ++Node: config File Examples114564 ++Node: Leaf Example118452 ++Node: Gateway Example121113 ++Node: Time Strings125352 ++Node: Chat Scripts127174 ++Node: config File136369 ++Node: Miscellaneous (config)137438 ++Node: Configuration File Names143273 ++Node: Log File Names148223 ++Node: Debugging Levels149473 ++Node: sys File152352 ++Node: Defaults and Alternates153237 ++Node: Naming the System156338 ++Node: Calling Out158192 ++Node: When to Call158558 ++Node: Placing the Call164185 ++Node: Logging In167724 ++Node: Accepting a Call171352 ++Node: Protocol Selection174177 ++Node: File Transfer Control187934 ++Node: Miscellaneous (sys)194239 ++Node: Default sys File Values197380 ++Node: port File198011 ++Node: dial File209779 ++Node: UUCP Over TCP215806 ++Node: TCP Client216317 ++Node: TCP Server218099 ++Node: Security219564 ++Node: Protocols224614 ++Node: UUCP Protocol Sources226235 ++Node: UUCP Grades228488 ++Node: UUCP Lock Files232786 ++Node: Execution File Format236188 ++Node: UUCP Protocol241557 ++Node: The Initial Handshake242062 ++Node: UUCP Protocol Commands250464 ++Node: The S Command252495 ++Node: The R Command259558 ++Node: The X Command263668 ++Node: The E Command265602 ++Node: The H Command268731 ++Node: The Final Handshake269580 ++Node: g Protocol270251 ++Node: f Protocol280645 ++Node: t Protocol283723 ++Node: e Protocol284782 ++Node: Big G Protocol285575 ++Node: i Protocol286430 ++Node: j Protocol295451 ++Node: x Protocol301725 ++Node: y Protocol302288 ++Node: d Protocol306841 ++Node: h Protocol307213 ++Node: v Protocol307525 ++Node: Hacking308023 ++Node: System Dependence308392 ++Node: Naming Conventions309785 ++Node: Patches311965 ++Node: Acknowledgements313920 ++Node: Index (concepts)327305 ++Node: Index (configuration file)338389 +  + End Tag Table +--- uucp-1.07.orig/proty.c ++++ uucp-1.07/proty.c +@@ -606,12 +606,7 @@ fywait_for_packet (qdaemon, pfexit) + #endif + #endif + +-#ifdef I386_ASM +-#define ROTATE(i) \ +- asm ("rolw $1,%0" : "=g" (i) : "g" (i)) +-#else + #define ROTATE(i) i += i + ((i & 0x8000) >> 15) +-#endif + + static unsigned short + iychecksum (z, c) +--- uucp-1.07.orig/uucp.info-1 ++++ uucp-1.07/uucp.info-1 +@@ -1,4 +1,6 @@ +-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi. ++This is uucp.info, produced by makeinfo version 4.11 from uucp.texi. ++ ++INFO-DIR-SECTION Networking tools + + START-INFO-DIR-ENTRY + * UUCP: (uucp). Transfer mail and news across phone lines. +@@ -30,7 +32,7 @@ File: uucp.info, Node: Top, Next: Copy + Taylor UUCP 1.07 + **************** + +- This is the documentation for the Taylor UUCP package, version 1.07. ++This is the documentation for the Taylor UUCP package, version 1.07. + The programs were written by Ian Lance Taylor. The author can be + reached at . + +@@ -41,7 +43,7 @@ is answered by the majordomo program. T + message `subscribe ADDRESS' where ADDRESS is your e-mail address. To + send a message to the list, send it to . There is + an archive of all messages sent to the mailing list at +-. ++`http://lists.cirr.com'. + + * Menu: + +@@ -230,7 +232,7 @@ File: uucp.info, Node: Copying, Next: + Taylor UUCP Copying Conditions + ****************************** + +- This package is covered by the GNU Public License. See the file ++This package is covered by the GNU Public License. See the file + `COPYING' for details. If you would like to do something with this + package that you feel is reasonable, but you feel is prohibited by the + license, contact me to see if we can work it out. +@@ -274,12 +276,12 @@ Public Licenses that accompany them. +  + File: uucp.info, Node: Introduction, Next: Invoking the UUCP Programs, Prev: Copying, Up: Top + +-Introduction to Taylor UUCP +-*************************** ++1 Introduction to Taylor UUCP ++***************************** + +- General introductions to UUCP are available, and perhaps one day I +-will write one. In the meantime, here is a very brief one that +-concentrates on the programs provided by Taylor UUCP. ++General introductions to UUCP are available, and perhaps one day I will ++write one. In the meantime, here is a very brief one that concentrates ++on the programs provided by Taylor UUCP. + + Taylor UUCP is a complete UUCP package. It is covered by the GNU + Public License, which means that the source code is always available. +@@ -293,7 +295,7 @@ are based on earlier UUCP packages. + file name. For example, to copy the file `notes.txt' to the system + `airs', you would say `uucp notes.txt airs!~/notes.txt'. In this + example `~' is used to name the UUCP public directory on `airs'. +- For more details, see *Note uucp: Invoking uucp. ++ For more details, see *note uucp: Invoking uucp. + + `uux' + The `uux' program is used to request the execution of a program on +@@ -303,7 +305,8 @@ are based on earlier UUCP packages. + on `airs', passing it standard input, you would say `uux - + airs!rnews'. The `-' means to read standard input and set things + up such that when `rnews' runs on `airs' it will receive the same +- standard input. For more details, see *Note uux: Invoking uux. ++ standard input. For more details, see *note uux: Invoking uux. ++ + + Neither `uucp' nor `uux' actually do any work immediately. Instead, + they queue up requests for later processing. They then start a daemon +@@ -323,19 +326,19 @@ that if anything goes wrong it might be + connection status of all the remote systems your system knows + about. The system administrator can use `uustat' to automatically + discard old jobs while sending mail to the user who requested +- them. For more details, see *Note uustat: Invoking uustat. ++ them. For more details, see *note uustat: Invoking uustat. + + `uuname' + The `uuname' program by default lists all the remote systems your + system knows about. You can also use it to get the name of your + local system. It is mostly useful for shell scripts. For more +- details, see *Note uuname: Invoking uuname. ++ details, see *note uuname: Invoking uuname. + + `uulog' + The `uulog' program can be used to display entries in the UUCP log + file. It can select the entries for a particular system or a + particular user. You can use it to see what has happened to your +- queued jobs in the past. For more details, see *Note uulog: ++ queued jobs in the past. For more details, see *note uulog: + Invoking uulog. + + `uuto' +@@ -345,14 +348,15 @@ that if anything goes wrong it might be + transfer a file, or the contents of a directory, to a remote + system, and notify a particular user on the remote system when it + arrives. The remote user can then retrieve the file(s) with +- `uupick'. For more details, see *Note uuto: Invoking uuto, and +- see *Note uupick: Invoking uupick. ++ `uupick'. For more details, see *note uuto: Invoking uuto, and ++ see *note uupick: Invoking uupick. + + `cu' + The `cu' program can be used to call up another system and + communicate with it as though you were directly connected. It can + also do simple file transfers, though it does not provide any +- error checking. For more details, *Note cu: Invoking cu. ++ error checking. For more details, *note cu: Invoking cu. ++ + + These eight programs just described, `uucp', `uux', `uuto', + `uupick', `uustat', `uuname', `uulog', and `cu' are the user programs +@@ -376,16 +380,17 @@ normally run automatically rather than b + requests in the queue and goes on to the next system to call. It + is also possible to force `uucico' to call a remote system even if + there is no work to be done for it, so that it can pick up any +- work that may be queued up remotely. For more details, see *Note ++ work that may be queued up remotely. For more details, see *note + uucico: Invoking uucico. + + `uuxqt' + The `uuxqt' daemon processes execution requests made by the `uux' + program on remote systems. It also processes requests made on the + local system which require files from a remote system. It is +- normally started by `uucico'. For more details, see *Note uuxqt: ++ normally started by `uucico'. For more details, see *note uuxqt: + Invoking uuxqt. + ++ + Suppose you, on the system `bantam', want to copy a file to the + system `airs'. You would run the `uucp' command locally, with a + command like `uucp notes.txt airs!~/notes.txt'. This would queue up a +@@ -421,7 +426,7 @@ installing and configuring UUCP. + The `uuchk' program reads the UUCP configuration files and + displays a rather lengthy description of what it finds. This is + useful when configuring UUCP to make certain that the UUCP package +- will do what you expect it to do. For more details, see *Note ++ will do what you expect it to do. For more details, see *note + uuchk: Invoking uuchk. + + `uuconv' +@@ -430,13 +435,13 @@ installing and configuring UUCP. + administrators converting from an older UUCP package. Taylor UUCP + is able to read and use old configuration file formats, but some + new features can not be selected using the old formats. For more +- details, see *Note uuconv: Invoking uuconv. ++ details, see *note uuconv: Invoking uuconv. + + `uusched' + The `uusched' script is provided for compatibility with older UUCP + releases. It starts `uucico' to call, one at a time, all the + systems for which work has been queued. For more details, see +- *Note uusched: Invoking uusched. ++ *note uusched: Invoking uusched. + + `tstuu' + The `tstuu' program is a test harness for the UUCP package; it can +@@ -444,15 +449,16 @@ installing and configuring UUCP. + correctly. However, it uses pseudo-terminals, which means that it + is less portable than the rest of the package. If it works, it + can be useful when initially installing Taylor UUCP. For more +- details, see *Note tstuu: Testing the Compilation. ++ details, see *note tstuu: Testing the Compilation. ++ + +  + File: uucp.info, Node: Invoking the UUCP Programs, Next: Installing Taylor UUCP, Prev: Introduction, Up: Top + +-Invoking the UUCP Programs +-************************** ++2 Invoking the UUCP Programs ++**************************** + +- This chapter describes how to run the UUCP programs. ++This chapter describes how to run the UUCP programs. + + * Menu: + +@@ -474,10 +480,10 @@ Invoking the UUCP Programs +  + File: uucp.info, Node: Standard Options, Next: Invoking uucp, Prev: Invoking the UUCP Programs, Up: Invoking the UUCP Programs + +-Standard Options +-================ ++2.1 Standard Options ++==================== + +- All of the UUCP programs support a few standard options. ++All of the UUCP programs support a few standard options. + + `-x type' + `--debug type' +@@ -514,8 +520,8 @@ Standard Options +  + File: uucp.info, Node: Invoking uucp, Next: Invoking uux, Prev: Standard Options, Up: Invoking the UUCP Programs + +-Invoking uucp +-============= ++2.2 Invoking uucp ++================= + + * Menu: + +@@ -525,8 +531,8 @@ Invoking uucp +  + File: uucp.info, Node: uucp Description, Next: uucp Options, Prev: Invoking uucp, Up: Invoking uucp + +-uucp Description +----------------- ++2.2.1 uucp Description ++---------------------- + + uucp [options] `source-file' `destination-file' + uucp [options] `source-file'... `destination-directory' +@@ -570,10 +576,10 @@ resulting file is owned by the uucp user +  + File: uucp.info, Node: uucp Options, Prev: uucp Description, Up: Invoking uucp + +-uucp Options +------------- ++2.2.2 uucp Options ++------------------ + +- The following options may be given to `uucp'. ++The following options may be given to `uucp'. + + `-c' + `--nocopy' +@@ -643,7 +649,7 @@ uucp Options + + `-t' + `--uuto' +- This option is used by the `uuto' shell script; see *Note Invoking ++ This option is used by the `uuto' shell script; see *note Invoking + uuto::. It causes `uucp' to interpret the final argument as + `system!user'. The file(s) are sent to `~/receive/USER/LOCAL' on + the remote system, where USER is from the final argument and LOCAL +@@ -662,8 +668,8 @@ uucp Options +  + File: uucp.info, Node: Invoking uux, Next: Invoking uustat, Prev: Invoking uucp, Up: Invoking the UUCP Programs + +-Invoking uux +-============ ++2.3 Invoking uux ++================ + + * Menu: + +@@ -674,8 +680,8 @@ Invoking uux +  + File: uucp.info, Node: uux Description, Next: uux Options, Prev: Invoking uux, Up: Invoking uux + +-uux Description +---------------- ++2.3.1 uux Description ++--------------------- + + uux [options] command + +@@ -730,7 +736,7 @@ on a remote system. + `uux'. Many permit only the execution of `rmail' and `rnews'. + + A request to execute an empty command (e.g., `uux sys!') will create +-a poll file for the specified system; see *Note Calling Other Systems:: ++a poll file for the specified system; see *note Calling Other Systems:: + for an example of why this might be useful. + + The exit status of `uux' is one of the codes found in the header +@@ -740,10 +746,10 @@ file `sysexits.h'. In particular, `EX_O +  + File: uucp.info, Node: uux Options, Next: uux Examples, Prev: uux Description, Up: Invoking uux + +-uux Options +------------ ++2.3.2 uux Options ++----------------- + +- The following options may be given to `uux'. ++The following options may be given to `uux'. + + `-' + `-p' +@@ -822,10 +828,10 @@ uux Options +  + File: uucp.info, Node: uux Examples, Prev: uux Options, Up: Invoking uux + +-uux Examples +------------- ++2.3.3 uux Examples ++------------------ + +- Here are some examples of using `uux'. ++Here are some examples of using `uux'. + + uux -z - sys1!rmail user1 + This will execute the command `rmail user1' on the system `sys1', +@@ -846,8 +852,8 @@ writable by the `uuxqt' daemon for this +  + File: uucp.info, Node: Invoking uustat, Next: Invoking uuname, Prev: Invoking uux, Up: Invoking the UUCP Programs + +-Invoking uustat +-=============== ++2.4 Invoking uustat ++=================== + + * Menu: + +@@ -858,8 +864,8 @@ Invoking uustat +  + File: uucp.info, Node: uustat Description, Next: uustat Options, Prev: Invoking uustat, Up: Invoking uustat + +-uustat Description +------------------- ++2.4.1 uustat Description ++------------------------ + + uustat -a + uustat --all +@@ -899,10 +905,10 @@ group of jobs, such as all jobs more tha +  + File: uucp.info, Node: uustat Options, Next: uustat Examples, Prev: uustat Description, Up: Invoking uustat + +-uustat Options +--------------- ++2.4.2 uustat Options ++-------------------- + +- The following options may be given to `uustat'. ++The following options may be given to `uustat'. + + `-a' + `--all' +@@ -1077,11 +1083,11 @@ uustat Options +  + File: uucp.info, Node: uustat Examples, Prev: uustat Options, Up: Invoking uustat + +-uustat Examples +---------------- ++2.4.3 uustat Examples ++--------------------- + + uustat --all +- Display status of all jobs. A sample output line is as follows: ++Display status of all jobs. A sample output line is as follows: + bugsA027h bugs ian 04-01 13:50 Executing rmail ian@airs.com (sending 12 bytes) + The format is + jobid system user queue-date command (size) +@@ -1138,8 +1144,8 @@ will be error messages. +  + File: uucp.info, Node: Invoking uuname, Next: Invoking uulog, Prev: Invoking uustat, Up: Invoking the UUCP Programs + +-Invoking uuname +-=============== ++2.5 Invoking uuname ++=================== + + uuname [-a] [--aliases] + uuname -l +@@ -1178,8 +1184,8 @@ local system. +  + File: uucp.info, Node: Invoking uulog, Next: Invoking uuto, Prev: Invoking uuname, Up: Invoking the UUCP Programs + +-Invoking uulog +-============== ++2.6 Invoking uulog ++================== + + uulog [-#] [-n lines] [-sf system] [-u user] [-DSF] [--lines lines] + [--system system] [--user user] [--debuglog] [--statslog] +@@ -1251,8 +1257,8 @@ If the UUCP programs have been compiled +  + File: uucp.info, Node: Invoking uuto, Next: Invoking uupick, Prev: Invoking uulog, Up: Invoking the UUCP Programs + +-Invoking uuto +-============= ++2.7 Invoking uuto ++================= + + uuto files... system!user + +@@ -1274,8 +1280,8 @@ Invoking uucp::. +  + File: uucp.info, Node: Invoking uupick, Next: Invoking cu, Prev: Invoking uuto, Up: Invoking the UUCP Programs + +-Invoking uupick +-=============== ++2.8 Invoking uupick ++=================== + + uupick [-s system] [--system system] + +@@ -1313,6 +1319,5702 @@ action to take. One of the following co + + The `-s' or `--system' option may be used to restrict `uupick' to + only present files transferred from a particular system. The `uupick' +-program also supports the standard UUCP program options; see *Note ++program also supports the standard UUCP program options; see *note + Standard Options::. + ++ ++File: uucp.info, Node: Invoking cu, Next: Invoking uucico, Prev: Invoking uupick, Up: Invoking the UUCP Programs ++ ++2.9 Invoking cu ++=============== ++ ++* Menu: ++ ++* cu Description:: Description of cu ++* cu Commands:: Commands Supported by cu ++* cu Variables:: Variables Supported by cu ++* cu Options:: Options Supported by cu ++ ++ ++File: uucp.info, Node: cu Description, Next: cu Commands, Prev: Invoking cu, Up: Invoking cu ++ ++2.9.1 cu Description ++-------------------- ++ ++ cu [options] [system | phone | "dir"] ++ ++ The `cu' program is used to call up another system and act as a dial ++in terminal. It can also do simple file transfers with no error ++checking. ++ ++ The `cu' program takes a single non-option argument. ++ ++ If the argument is the string `dir' cu will make a direct connection ++to the port. This may only be used by users with write access to the ++port, as it permits reprogramming the modem. ++ ++ Otherwise, if the argument begins with a digit, it is taken to be a ++phone number to call. ++ ++ Otherwise, it is taken to be the name of a system to call. ++ ++ The `-z' or `--system' options may be used to name a system ++beginning with a digit, and the `-c' or `--phone' options may be used ++to name a phone number that does not begin with a digit. ++ ++ The `cu' program locates a port to use in the UUCP configuration ++files. If a simple system name is given, it will select a port ++appropriate for that system. The `-p', `--port', `-l', `--line', `-s', ++and `--speed' options may be used to control the port selection. ++ ++ When a connection is made to the remote system, `cu' forks into two ++processes. One reads from the port and writes to the terminal, while ++the other reads from the terminal and writes to the port. ++ ++ ++File: uucp.info, Node: cu Commands, Next: cu Variables, Prev: cu Description, Up: Invoking cu ++ ++2.9.2 cu Commands ++----------------- ++ ++The `cu' program provides several commands that may be used during the ++conversation. The commands all begin with an escape character, which ++by default is `~' (tilde). The escape character is only recognized at ++the beginning of a line. To send an escape character to the remote ++system at the start of a line, it must be entered twice. All commands ++are either a single character or a word beginning with `%' (percent ++sign). ++ ++ The `cu' program recognizes the following commands. ++ ++`~.' ++ Terminate the conversation. ++ ++`~! command' ++ Run command in a shell. If command is empty, starts up a shell. ++ ++`~$ command' ++ Run command, sending the standard output to the remote system. ++ ++`~| command' ++ Run command, taking the standard input from the remote system. ++ ++`~+ command' ++ Run command, taking the standard input from the remote system and ++ sending the standard output to the remote system. ++ ++`~#, ~%break' ++ Send a break signal, if possible. ++ ++`~c directory, ~%cd directory' ++ Change the local directory. ++ ++`~> file' ++ Send a file to the remote system. This just dumps the file over ++ the communication line. It is assumed that the remote system is ++ expecting it. ++ ++`~<' ++ Receive a file from the remote system. This prompts for the local ++ file name and for the remote command to execute to begin the file ++ transfer. It continues accepting data until the contents of the ++ `eofread' variable are seen. ++ ++`~p from to' ++`~%put from to' ++ Send a file to a remote Unix system. This runs the appropriate ++ commands on the remote system. ++ ++`~t from to' ++`~%take from to' ++ Retrieve a file from a remote Unix system. This runs the ++ appropriate commands on the remote system. ++ ++`~s variable value' ++ Set a `cu' variable to the given value. If value is not given, the ++ variable is set to `true'. ++ ++`~! variable' ++ Set a `cu' variable to `false'. ++ ++`~z' ++ Suspend the cu session. This is only supported on some systems. ++ On systems for which `^Z' may be used to suspend a job, `~^Z' will ++ also suspend the session. ++ ++`~%nostop' ++ Turn off XON/XOFF handling. ++ ++`~%stop' ++ Turn on XON/XOFF handling. ++ ++`~v' ++ List all the variables and their values. ++ ++`~?' ++ List all commands. ++ ++ ++File: uucp.info, Node: cu Variables, Next: cu Options, Prev: cu Commands, Up: Invoking cu ++ ++2.9.3 cu Variables ++------------------ ++ ++The `cu' program also supports several variables. They may be listed ++with the `~v' command, and set with the `~s' or `~!' commands. ++ ++`escape' ++ The escape character. The default is `~' (tilde). ++ ++`delay' ++ If this variable is true, `cu' will delay for a second, after ++ recognizing the escape character, before printing the name of the ++ local system. The default is true. ++ ++`eol' ++ The list of characters which are considered to finish a line. The ++ escape character is only recognized after one of these is seen. ++ The default is `carriage return', `^U', `^C', `^O', `^D', `^S', ++ `^Q', `^R'. ++ ++`binary' ++ Whether to transfer binary data when sending a file. If this is ++ false, then newlines in the file being sent are converted to ++ carriage returns. The default is false. ++ ++`binary-prefix' ++ A string used before sending a binary character in a file ++ transfer, if the `binary' variable is true. The default is `^V'. ++ ++`echo-check' ++ Whether to check file transfers by examining what the remote system ++ echoes back. This probably doesn't work very well. The default is ++ false. ++ ++`echonl' ++ The character to look for after sending each line in a file. The ++ default is carriage return. ++ ++`timeout' ++ The timeout to use, in seconds, when looking for a character, ++ either when doing echo checking or when looking for the `echonl' ++ character. The default is 30. ++ ++`kill' ++ The character to use delete a line if the echo check fails. The ++ default is `^U'. ++ ++`resend' ++ The number of times to resend a line if the echo check continues to ++ fail. The default is 10. ++ ++`eofwrite' ++ The string to write after sending a file with the `~>' command. ++ The default is `^D'. ++ ++`eofread' ++ The string to look for when receiving a file with the ` ~<' ++ command. The default is `$', which is intended to be a typical ++ shell prompt. ++ ++`verbose' ++ Whether to print accumulated information during a file transfer. ++ The default is true. ++ ++ ++File: uucp.info, Node: cu Options, Prev: cu Variables, Up: Invoking cu ++ ++2.9.4 cu Options ++---------------- ++ ++The following options may be given to `cu'. ++ ++`-e' ++`--parity=even' ++ Use even parity. ++ ++`-o' ++`--parity=odd' ++ Use odd parity. ++ ++`--parity=none' ++ Use no parity. No parity is also used if both `-e' and `-o' are ++ given. ++ ++`-h' ++`--halfduplex' ++ Echo characters locally (half-duplex mode). ++ ++`--nostop' ++ Turn off XON/XOFF handling (it is on by default). ++ ++`-E char' ++`--escape char' ++ Set the escape character. Initially `~' (tilde). To eliminate the ++ escape character, use `-E '''. ++ ++`-z system' ++`--system system' ++ The system to call. ++ ++`-c phone-number' ++`--phone phone-number' ++ The phone number to call. ++ ++`-p port' ++`-a port' ++`--port port' ++ Name the port to use. ++ ++`-l line' ++`--line line' ++ Name the line to use by giving a device name. This may be used to ++ dial out on ports that are not listed in the UUCP configuration ++ files. Write access to the device is required. ++ ++`-s speed' ++`-#' ++`--speed speed' ++ The speed (baud rate) to use. Here, `-#' means an actual number; ++ e.g., `-9600'. ++ ++`-n' ++`--prompt' ++ Prompt for the phone number to use. ++ ++`-d' ++ Enter debugging mode. Equivalent to `--debug all'. ++ ++`-x type' ++`--debug type' ++`-I file' ++`--config file' ++`-v' ++`--version' ++`--help' ++ *Note Standard Options::. ++ ++ ++File: uucp.info, Node: Invoking uucico, Next: Invoking uuxqt, Prev: Invoking cu, Up: Invoking the UUCP Programs ++ ++2.10 Invoking uucico ++==================== ++ ++* Menu: ++ ++* uucico Description:: Description of uucico ++* uucico Options:: Options Supported by uucico ++ ++ ++File: uucp.info, Node: uucico Description, Next: uucico Options, Prev: Invoking uucico, Up: Invoking uucico ++ ++2.10.1 uucico Description ++------------------------- ++ ++ uucico [options] ++ ++ The `uucico' daemon processes file transfer requests queued by ++`uucp' and `uux'. It is started when `uucp' or `uux' is run (unless ++they are given the `-r' or `--nouucico' options). It is also typically ++started periodically using entries in the `crontab' table(s). ++ ++ When `uucico' is invoked with `-r1', `--master', `-s', `--system', ++or `-S', the daemon will place a call to a remote system, running in ++master mode. Otherwise the daemon will start in slave mode, accepting ++a call from a remote system. Typically a special login name will be ++set up for UUCP which automatically invokes `uucico' when a remote ++system calls in and logs in under that name. ++ ++ When `uucico' terminates, it invokes the `uuxqt' daemon, unless the ++`-q' or `--nouuxqt' options were given; `uuxqt' executes any work ++orders created by `uux' on a remote system, and any work orders created ++locally which have received remote files for which they were waiting. ++ ++ If a call fails, `uucico' will normally refuse to retry the call ++until a certain (configurable) amount of time has passed. This may be ++overriden by the `-f', `--force', or `-S' options. ++ ++ The `-l', `--prompt', `-e', or `--loop' options may be used to force ++`uucico' to produce its own prompts of `login: ' and `Password:'. When ++another `uucico' daemon calls in, it will see these prompts and log in ++as usual. The login name and password will normally be checked against ++a separate list kept specially for `uucico', rather than the ++`/etc/passwd' file (*note Configuration File Names::). It is possible, ++on some systems, to configure `uucico' to use `/etc/passwd'. The `-l' ++or `--prompt' options will prompt once and then exit; in this mode the ++UUCP administrator, or the superuser, may use the `-u' or `--login' ++option to force a login name, in which case `uucico' will not prompt ++for one. The `-e' or `--loop' options will prompt again after the ++first session is over; in this mode `uucico' will permanently control a ++port. ++ ++ If `uucico' receives a `SIGQUIT', `SIGTERM' or `SIGPIPE' signal, it ++will cleanly abort any current conversation with a remote system and ++exit. If it receives a `SIGHUP' signal it will abort any current ++conversation, but will continue to place calls to (if invoked with ++`-r1' or `--master') and accept calls from (if invoked with `-e' or ++`--loop') other systems. If it receives a `SIGINT' signal it will ++finish the current conversation, but will not place or accept any more ++calls. ++ ++ ++File: uucp.info, Node: uucico Options, Prev: uucico Description, Up: Invoking uucico ++ ++2.10.2 uucico Options ++--------------------- ++ ++The following options may be given to `uucico'. ++ ++`-r1' ++`--master' ++ Start in master mode: call out to a remote system. Implied by ++ `-s', `--system', or `-S'. If no system is specified, ++ sequentially call every system for which work is waiting to be ++ done. ++ ++`-r0' ++`--slave' ++ Start in slave mode. This is the default. ++ ++`-s system' ++`--system system' ++ Call the specified system. ++ ++`-S system' ++ Call the specified system, ignoring any required wait. This is ++ equivalent to `-s system -f'. ++ ++`-f' ++`--force' ++ Ignore any required wait for any systems to be called. ++ ++`-l' ++`--prompt' ++ Prompt for login name and password using `login: ' and ++ `Password:'. This allows `uucico' to be easily run from `inetd'. ++ The login name and password are checked against the UUCP password ++ file, which need not be `/etc/passwd'. The `--login' option may ++ be used to force a login name, in which cause `uucico' will only ++ prompt for a password. ++ ++`-p port' ++`--port port' ++ Specify a port to call out on or to listen to. ++ ++`-e' ++`--loop' ++ Enter an endless loop of login/password prompts and slave mode ++ daemon execution. The program will not stop by itself; you must ++ use `kill' to shut it down. ++ ++`-w' ++`--wait' ++ After calling out (to a particular system when `-s', `--system', ++ or `-S' is specifed, or to all systems which have work when just ++ `-r1' or `--master' is specifed), begin an endless loop as with ++ `--loop'. ++ ++`-q' ++`--nouuxqt' ++ Do not start the `uuxqt' daemon when finished. ++ ++`-c' ++`--quiet' ++ If no calls are permitted at this time, then don't make the call, ++ but also do not put an error message in the log file and do not ++ update the system status (as reported by `uustat'). This can be ++ convenient for automated polling scripts, which may want to simply ++ attempt to call every system rather than worry about which ++ particular systems may be called at the moment. This option also ++ suppresses the log message indicating that there is no work to be ++ done. ++ ++`-C' ++`--ifwork' ++ Only call the system named by `-s', `--system', or `-S' if there ++ is work for that system. ++ ++`-D' ++`--nodetach' ++ Do not detach from the controlling terminal. Normally `uucico' ++ detaches from the terminal before each call out to another system ++ and before invoking `uuxqt'. This option prevents this. ++ ++`-u name' ++`--login name' ++ Set the login name to use instead of that of the invoking user. ++ This option may only be used by the UUCP administrator or the ++ superuser. If used with `--prompt', this will cause `uucico' to ++ prompt only for the password, not the login name. ++ ++`-z' ++`--try-next' ++ If a call fails after the remote system is reached, try the next ++ alternate rather than simply exiting. ++ ++`-i type' ++`--stdin type' ++ Set the type of port to use when using standard input. The only ++ supported port type is TLI, and this is only available on machines ++ which support the TLI networking interface. Specifying `-i TLI' ++ causes `uucico' to use TLI calls to perform I/O. ++ ++`-X type' ++ Same as the standard option `-x type'. Provided for historical ++ compatibility. ++ ++`-x type' ++`--debug type' ++`-I file' ++`--config file' ++`-v' ++`--version' ++`--help' ++ *Note Standard Options::. ++ ++ ++File: uucp.info, Node: Invoking uuxqt, Next: Invoking uuchk, Prev: Invoking uucico, Up: Invoking the UUCP Programs ++ ++2.11 Invoking uuxqt ++=================== ++ ++ uuxqt [-c command] [-s system] [--command command] [--system system] ++ ++ The `uuxqt' daemon executes commands requested by `uux' from either ++the local system or from remote systems. It is started automatically ++by the `uucico' daemon (unless `uucico' is given the `-q' or ++`--nouuxqt' options). ++ ++ There is normally no need to run `uuxqt', since it will be invoked ++by `uucico'. However, `uuxqt' can be invoked directly to provide ++greater control over the processing of the work queue. ++ ++ Multiple invocations of `uuxqt' may be run at once, as controlled by ++the `max-uuxqts' configuration command; see *note Miscellaneous ++(config)::. ++ ++ The following options may be given to `uuxqt'. ++ ++`-c command' ++`--command command' ++ Only execute requests for the specified command. For example, ++ `uuxqt --command rmail'. ++ ++`-s system' ++`--system system' ++ Only execute requests originating from the specified system. ++ ++`-x type' ++`--debug type' ++`-I file' ++`--config' ++`-v' ++`--version' ++`--help' ++ *Note Standard Options::. ++ ++ ++File: uucp.info, Node: Invoking uuchk, Next: Invoking uuconv, Prev: Invoking uuxqt, Up: Invoking the UUCP Programs ++ ++2.12 Invoking uuchk ++=================== ++ ++ uuchk [-s system] [--system system] ++ ++ The `uuchk' program displays information read from the UUCP ++configuration files. It should be used to ensure that UUCP has been ++configured correctly. ++ ++ The `-s' or `--system' options may be used to display the ++configuration for just the specified system, rather than for all ++systems. The `uuchk' program also supports the standard UUCP program ++options; see *note Standard Options::. ++ ++ ++File: uucp.info, Node: Invoking uuconv, Next: Invoking uusched, Prev: Invoking uuchk, Up: Invoking the UUCP Programs ++ ++2.13 Invoking uuconv ++==================== ++ ++ uuconv -i type -o type [-p program] [--program program] ++ uuconv --input type --output type [-p program] [--program program] ++ ++ The `uuconv' program converts UUCP configuration files from one ++format to another. The type of configuration file to read is specified ++using the `-i' or `--input' options. The type of configuration file to ++write is specified using the `-o' or `--output' options. ++ ++ The supported configuration file types are `taylor', `v2', and ++`hdb'. For a description of the `taylor' configuration files, see ++*note Configuration Files::. The other types of configuration files ++are used by traditional UUCP packages, and are not described in this ++manual. ++ ++ An input configuration of type `v2' or `hdb' is read from a compiled ++in directory (specified by `oldconfigdir' in `Makefile'). An input ++configuration of type `taylor' is read from a compiled in directory by ++default, but may be overridden with the standard `-I' or `--config' ++options (*note Standard Options::). ++ ++ The output configuration is written to files in the directory in ++which `uuconv' is run. ++ ++ Some information in the input files may not be representable in the ++desired output format, in which case `uuconv' will silently discard it. ++The output of `uuconv' should be carefully checked before it is used. ++The `uuchk' program may be used for this purpose; see *note Invoking ++uuchk::. ++ ++ The `-p' or `--program' option may be used to convert specific `cu' ++configuration information, rather than the default of only converting ++the `uucp' configuration information; see *note config File::. ++ ++ The `uuchk' program also supports the standard UUCP program options; ++see *note Standard Options::. ++ ++ ++File: uucp.info, Node: Invoking uusched, Prev: Invoking uuconv, Up: Invoking the UUCP Programs ++ ++2.14 Invoking uusched ++===================== ++ ++The `uusched' program is actually just a shell script which invokes the ++`uucico' daemon. It is provided for backward compatibility. It causes ++`uucico' to call all systems for which there is work. Any option which ++may be given to `uucico' may also be given to `uusched'. *Note ++Invoking uucico::. ++ ++ ++File: uucp.info, Node: Installing Taylor UUCP, Next: Using Taylor UUCP, Prev: Invoking the UUCP Programs, Up: Top ++ ++3 Installing Taylor UUCP ++************************ ++ ++These are the installation instructions for the Taylor UUCP package. ++ ++* Menu: ++ ++* Compilation:: Compiling Taylor UUCP ++* Testing the Compilation:: Testing the Compilation ++* Installing the Binaries:: Installing the Binaries ++* Configuration:: Configuring Taylor UUCP ++* Testing the Installation:: Testing the Installation ++ ++ ++File: uucp.info, Node: Compilation, Next: Testing the Compilation, Prev: Installing Taylor UUCP, Up: Installing Taylor UUCP ++ ++3.1 Compiling Taylor UUCP ++========================= ++ ++If you have a source code distribution, you must first compile it for ++your system. Free versions of Unix, such as Linux, NetBSD, or FreeBSD, ++often come with pre-compiled binary distributions of UUCP. If you are ++using a binary distribution, you may skip to the configuration section ++(*note Configuration::). ++ ++ Follow these steps to compile the source code. ++ ++ 1. Take a look at the top of `Makefile.in' and set the appropriate ++ values for your system. These control where the programs are ++ installed and which user on the system owns them (normally they ++ will be owned by a special user `uucp' rather than a real person; ++ they should probably not be owned by `root'). ++ ++ 2. Run the shell script `configure'. This script was generated using ++ the `autoconf' program written by David MacKenzie of the Free ++ Software Foundation. It takes a while to run. It will generate ++ the file `config.h' based on `config.h.in', and, for each source ++ code directory, will generate `Makefile' based on `Makefile.in'. ++ ++ You can pass certain arguments to `configure' in the environment. ++ Because `configure' will compile little test programs to see what ++ is available on your system, you must tell it how to run your ++ compiler. It recognizes the following environment variables: ++ ++ `CC' ++ The C compiler. If this is not set, then if `configure' can ++ find `gcc' it will use it, otherwise it will use `cc'. ++ ++ `CFLAGS' ++ Flags to pass to the C compiler when compiling the actual ++ code. If this is not set, `configure' will use `-g'. ++ ++ `LDFLAGS' ++ Flags to pass to the C compiler when only linking, not ++ compiling. If this is not set, `configure' will use the ++ empty string. ++ ++ `LIBS' ++ Libraries to pass to the C compiler. If this is not set, ++ `configure' will use the empty string. ++ ++ `INSTALL' ++ The program to run to install UUCP in the binary directory. ++ If this is not set, then if `configure' finds the BSD ++ `install' program, it will set this to `install -c'; ++ otherwise, it will use `cp'. ++ ++ Suppose, for example, you want to set the environment variable `CC' ++ to `rcc'. If you are using `sh', `bash', or `ksh', invoke ++ `configure' as `CC=rcc configure'. If you are using `csh', do ++ `setenv CC rcc; sh configure'. ++ ++ On some systems you will want to use `LIBS=-lmalloc'. On Xenix ++ derived versions of Unix do not use `LIBS=-lx' because this will ++ bring in the wrong versions of certain routines; if you want to use ++ `-lx' you must specify `LIBS=-lc -lx'. ++ ++ You can also pass other arguments to `configure' on the command ++ line. Use `configure --help' for a complete list. Of particular ++ interest: ++ `--prefix=DIRNAME' ++ The directory under which all files are installed. Default ++ `/usr/local'. ++ ++ `--with-newconfigdir=DIRNAME' ++ The directory in which to find new style configuration files. ++ Default `PREFIX/conf/uucp'. ++ ++ `--with-oldconfigdir=DIRNAME' ++ The directory in which to find old style configuration files. ++ Default `/usr/lib/uucp'. ++ ++ If `configure' fails for some reason, or if you have a very weird ++ system, you may have to configure the package by hand. To do ++ this, copy the file `config.h.in' to `config.h' and edit it for ++ your system. Then for each source directory (the top directory, ++ and the subdirectories `lib', `unix', and `uuconf') copy ++ `Makefile.in' to `Makefile', find the words within `@' characters, ++ and set them correctly for your system. ++ ++ 3. Igor V. Semenyuk provided this (lightly edited) note about ISC ++ Unix 3.0. The `configure' script will default to passing `-posix' ++ to `gcc'. However, using `-posix' changes the environment to ++ POSIX, and on ISC 3.0, at least, the default for `POSIX_NO_TRUNC' ++ is 1. This can lead to a problem when `uuxqt' executes `rmail'. ++ `IDA sendmail' has dbm configuration files named ++ `mailertable.{dir,pag}'. Notice these names are 15 characters ++ long. When `uuxqt' compiled with the `-posix' executes `rmail', ++ which in turn executes `sendmail', the later is run under the ++ POSIX environment too. This leads to `sendmail' bombing out with ++ `'error opening 'M' database: name too long' (mailertable.dir)'. ++ It's rather obscure behaviour, and it took me a day to find out ++ the cause. I don't use the `-posix' switch; instead, I run `gcc' ++ with `-D_POSIX_SOURCE', and add `-lcposix' to `LIBS'. ++ ++ 4. On some versions of BSDI there is a bug in the shell which causes ++ the default value for `CFLAGS' to be set incorrectly. If `echo ++ ${CFLAGS--g}' echoes `g' rather than `-g', then you must set ++ `CFLAGS' in the environment before running configure. There is a ++ patch available from BSDI for this bug. (Reported by David Vrona). ++ ++ 5. On AIX 3.2.5, and possibly other versions, `cc -E' does not work, ++ reporting `Option NOROCONST is not valid'. Test this before ++ running configure by doing something like `touch /tmp/foo.c; cc -E ++ /tmp/foo.c'. This may give a warning about the file being empty, ++ but it should not give the `Option NOROCONST' warning. The ++ workaround is to remove the `,noroconst' entry from the `options' ++ clause in the `cc' stanza in `/etc/xlc.cfg'. (Reported by Chris ++ Lewis). ++ ++ 6. You should verify that `configure' worked correctly by checking ++ `config.h' and the instances of `Makefile'. ++ ++ 7. Edit `policy.h' for your local system. The comments explain the ++ various choices. The default values are intended to be ++ reasonable, so you may not have to make any changes. ++ ++ You must decide what type of configuration files to use; for more ++ information on the choices, see *note Configuration::. ++ ++ You must also decide what sort of spool directory you want to use. ++ If this is a new installation, I recommend `SPOOLDIR_TAYLOR'; ++ otherwise, select the spool directory corresponding to your ++ existing UUCP package. ++ ++ 8. Type `make' to compile everything. ++ ++ The `tstuu.c' file is not particularly portable; if you can't ++ figure out how to compile it you can safely ignore it, as it is ++ only used for testing. To use STREAMS pseudo-terminals, tstuu.c ++ must be compiled with `-DHAVE_STREAMS_PTYS'; this is not ++ determined by the configure script. ++ ++ If you have any other problems there is probably a bug in the ++ `configure' script. ++ ++ 9. Please report any problems you have. That is the only way they ++ will get fixed for other people. Supply a patch if you can (*note ++ Patches::), or just ask for help. ++ ++ ++ ++File: uucp.info, Node: Testing the Compilation, Next: Installing the Binaries, Prev: Compilation, Up: Installing Taylor UUCP ++ ++3.2 Testing the Compilation ++=========================== ++ ++If your system supports pseudo-terminals, and you compiled the code to ++support the new style of configuration files (`HAVE_TAYLOR_CONFIG' was ++set to 1 in `policy.h'), you should be able to use the `tstuu' program ++to test the `uucico' daemon. If your system supports STREAMS based ++pseudo-terminals, you must compile tstuu.c with `-DHAVE_STREAMS_PTYS'. ++(The STREAMS based code was contributed by Marc Boucher). ++ ++ To run `tstuu', just type `tstuu' with no arguments. You must run ++it in the compilation directory, since it runs `./uucp', `./uux' and ++`./uucico'. The `tstuu' program will run a lengthy series of tests (it ++takes over ten minutes on a slow VAX). You will need a fair amount of ++space available in `/usr/tmp'. You will probably want to put it in the ++background. Do not use `^Z', because the program traps on `SIGCHLD' ++and winds up dying. The `tstuu' program will create a directory ++`/usr/tmp/tstuu' and fill it with configuration files, and create spool ++directories `/usr/tmp/tstuu/spool1' and `/usr/tmp/tstuu/spool2'. ++ ++ If your system does not support the `FIONREAD' call, the `tstuu' ++program will run very slowly. This may or may not get fixed in a later ++version. ++ ++ The `tstuu' program will finish with an execute file named ++`X.SOMETHING' and a data file named `D.SOMETHING' in the directory ++`/usr/tmp/tstuu/spool1' (or, more likely, in subdirectories, depending ++on the choice of `SPOOLDIR' in `policy.h'). Two log files will be ++created in the directory `/usr/tmp/tstuu'. They will be named `Log1' ++and `Log2', or, if you have selected `HAVE_HDB_LOGGING' in `policy.h', ++`Log1/uucico/test2' and `Log2/uucico/test1'. There should be no errors ++in the log files. ++ ++ You can test `uuxqt' with `./uuxqt -I /usr/tmp/tstuu/Config1'. This ++should leave a command file `C.SOMETHING' and a data file `D.SOMETHING' ++in `/usr/tmp/tstuu/spool1' or in subdirectories. Again, there should ++be no errors in the log file. ++ ++ Assuming you compiled the code with debugging enabled, the `-x' ++switch can be used to set debugging modes; see the `debug' command for ++details (*note Debugging Levels::). Use `-x all' to turn on all ++debugging and generate far more output than you will ever want to see. ++The `uucico' daemons will put debugging output in the files `Debug1' ++and `Debug2' in the directory `/usr/tmp/tstuu'. After that, you're ++pretty much on your own. ++ ++ On some systems you can also use `tstuu' to test `uucico' against ++the system `uucico', by using the `-u' switch. For this to work, ++change the definitions of `ZUUCICO_CMD' and `UUCICO_EXECL' at the top ++of `tstuu.c' to something appropriate for your system. The definitions ++in `tstuu.c' are what I used for Ultrix 4.0, on which ++`/usr/lib/uucp/uucico' is particularly obstinate about being run as a ++child; I was only able to run it by creating a login name with no ++password whose shell was `/usr/lib/uucp/uucico'. Calling login in this ++way will leave fake entries in `wtmp' and `utmp'; if you compile ++`tstout.c' (in the `contrib' directory) as a setuid `root' program, ++`tstuu' will run it to clear those entries out. On most systems, such ++hackery should not be necessary, although on SCO I had to su to `root' ++(`uucp' might also have worked) before I could run ++`/usr/lib/uucp/uucico'. ++ ++ You can test `uucp' and `uux' (give them the `-r' switch to keep ++them from starting `uucico') to make sure they create the right sorts ++of files. Unfortunately, if you don't know what the right sorts of ++files are, I'm not going to tell you here. ++ ++ If you can not run `tstuu', or if it fails inexplicably, don't worry ++about it too much. On some systems `tstuu' will fail because of ++problems using pseudo terminals, which will not matter in normal use. ++The real test of the package is talking to another system. ++ ++ ++File: uucp.info, Node: Installing the Binaries, Next: Configuration, Prev: Testing the Compilation, Up: Installing Taylor UUCP ++ ++3.3 Installing the Binaries ++=========================== ++ ++You can install the executable files by becoming `root' and typing ++`make install'. Or you can look at what `make install' does and do it ++by hand. It tries to preserve your old programs, if any, but it only ++does this the first time Taylor UUCP is installed (so that if you ++install several versions of Taylor UUCP, you can still go back to your ++original UUCP programs). You can retrieve the original programs by ++typing `make uninstall'. ++ ++ Note that by default the programs are compiled with debugging ++information, and they are not stripped when they are installed. You may ++want to strip the installed programs to save disk space. For more ++information, see your system documentation for the `strip' program. ++ ++ Of course, simply installing the executable files is not enough. You ++must also arrange for them to be used correctly. ++ ++ ++File: uucp.info, Node: Configuration, Next: Testing the Installation, Prev: Installing the Binaries, Up: Installing Taylor UUCP ++ ++3.4 Configuring Taylor UUCP ++=========================== ++ ++You will have to decide what types of configuration files you want to ++use. This package supports a new sort of configuration file; see *note ++Configuration Files::. It also supports V2 configuration files ++(`L.sys', `L-devices', etc.) and HDB configuration files (`Systems', ++`Devices', etc.). No documentation is provided for V2 or HDB ++configuration files. All types of configuration files can be used at ++once, if you are so inclined. Currently using just V2 configuration ++files is not really possible, because there is no way to specify a ++dialer (there are no built in dialers, and the program does not know ++how to read `acucap' or `modemcap'); however, V2 configuration files ++can be used with a new style dial file (*note dial File::), or with a ++HDB `Dialers' file. ++ ++ Use of HDB configuration files has two known bugs. A blank line in ++the middle of an entry in the `Permissions' file will not be ignored as ++it should be. Dialer programs, as found in some versions of HDB, are ++not recognized directly. If you must use a dialer program, rather than ++an entry in `Devices', you must use the `chat-program' command in a new ++style dial file; see *note dial File::. You will have to invoke the ++dialer program via a shell script or another program, since an exit ++code of 0 is required to recognize success; the `dialHDB' program in ++the `contrib' directory may be used for this purpose. ++ ++ The `uuconv' (*note Invoking uuconv::) program can be used to ++convert from V2 or HDB configuration files to the new style (it can also ++do the reverse translation, if you are so inclined). It will not do all ++of the work, and the results should be carefully checked, but it can be ++quite useful. ++ ++ If you are installing a new system, you will, of course, have to ++write the configuration files; see *note Configuration Files:: for ++details on how to do this. ++ ++ After writing the configuration files, use the `uuchk' program to ++verify that they are what you expect; see *note Invoking uuchk::. ++ ++ ++File: uucp.info, Node: Testing the Installation, Prev: Configuration, Up: Installing Taylor UUCP ++ ++3.5 Testing the Installation ++============================ ++ ++After you have written the configuration files, and verified them with ++the `uuchk' program (*note Invoking uuchk::), you must check that UUCP ++can correctly contact another system. ++ ++ Tell `uucico' to dial out to the system by using the `-s' system ++switch (e.g., `uucico -s uunet'). The log file should tell you what ++happens. The exact location of the log file depends upon the settings ++in `policy.h' when you compiled the program, and on the use of the ++`logfile' command in the `config' file. Typical locations are ++`/usr/spool/uucp/Log' or a subdirectory under `/usr/spool/uucp/.Log'. ++ ++ If you compiled the code with debugging enabled, you can use ++debugging mode to get a great deal of information about what sort of ++data is flowing back and forth; the various possibilities are described ++with the `debug' command (*note Debugging Levels::). When initially ++setting up a connection `-x chat' is probably the most useful (e.g., ++`uucico -s uunet -x chat'); you may also want to use `-x ++handshake,incoming,outgoing'. You can use `-x' multiple times on one ++command line, or you can give it comma separated arguments as in the ++last example. Use `-x all' to turn on all possible debugging ++information. ++ ++ The debugging information is written to a file, normally ++`/usr/spool/uucp/Debug', although the default can be changed in ++`policy.h', and the `config' file can override the default with the ++`debugfile' command. The debugging file may contain passwords and some ++file contents as they are transmitted over the line, so the debugging ++file is only readable by the `uucp' user. ++ ++ You can use the `-f' switch to force `uucico' to call out even if ++the last call failed recently; using `-S' when naming a system has the ++same effect. Otherwise the status file (in the `.Status' subdirectory ++of the main spool directory, normally `/usr/spool/uucp') (*note Status ++Directory::) will prevent too many attempts from occurring in rapid ++succession. ++ ++ On older System V based systems which do not have the `setreuid' ++system call, problems may arise if ordinary users can start an execution ++of `uuxqt', perhaps indirectly via `uucp' or `uux'. UUCP jobs may wind ++up executing with a real user ID of the user who invoked `uuxqt', which ++can cause problems if the UUCP job checks the real user ID for security ++purposes. On such systems, it is safest to put `run-uuxqt never' ++(*note Miscellaneous (config)::) in the `config' file, so that `uucico' ++never starts `uuxqt', and invoke `uuxqt' directly from a `crontab' file. ++ ++ Please let me know about any problems you have and how you got around ++them. If you do report a problem, please include the version number of ++the package you are using, the operating system you are running it on, ++and a sample of the debugging file showing the problem (debugging ++information is usually what is needed, not just the log file). General ++questions such as "why doesn't `uucico' dial out" are impossible to ++answer without much more information. ++ ++ ++File: uucp.info, Node: Using Taylor UUCP, Next: Configuration Files, Prev: Installing Taylor UUCP, Up: Top ++ ++4 Using Taylor UUCP ++******************* ++ ++* Menu: ++ ++* Calling Other Systems:: Calling Other Systems ++* Accepting Calls:: Accepting Calls ++* Mail and News:: Using UUCP for Mail and News ++* The Spool Directory Layout:: The Spool Directory Layout ++* Spool Directory Cleaning:: Cleaning the UUCP Spool Directory ++ ++ ++File: uucp.info, Node: Calling Other Systems, Next: Accepting Calls, Prev: Using Taylor UUCP, Up: Using Taylor UUCP ++ ++4.1 Calling Other Systems ++========================= ++ ++By default `uucp' and `uux' will automatically start up `uucico' to ++call another system whenever work is queued up. However, the call may ++fail, or you may have put in time restrictions which prevent the call ++at that time (perhaps because telephone rates are high) (*note When to ++Call::). Also, a remote system may have work queued up for your ++system, but may not be calling you for some reason (perhaps you have ++agreed that your system should always place the call). To make sure ++that work gets transferred between the systems withing a reasonable ++time period, you should arrange to periodically invoke `uucico'. ++ ++ These periodic invocations are normally triggered by entries in the ++`crontab' file. The exact format of `crontab' files, and how new ++entries are added, varies from system to system; check your local ++documentation (try `man cron'). ++ ++ To attempt to call all systems with outstanding work, use the command ++`uucico -r1'. To attempt to call a particular system, use the command ++`uucico -s SYSTEM'. To attempt to call a particular system, but only ++if there is work for it, use the command `uucico -C -s SYSTEM'. (*note ++Invoking uucico::). ++ ++ A common case is to want to try to call a system at a certain time, ++with periodic retries if the call fails. A simple way to do this is to ++create an empty UUCP command file, known as a "poll file". If a poll ++file exists for a system, then `uucico -r1' will place a call to it. ++If the call succeeds, the poll file will be deleted. ++ ++ A poll file can be easily created using the `uux' command, by ++requesting the execution of an empty command. To create a poll file for ++SYSTEM, just do something like this: ++ uux -r SYSTEM! ++ The `-r' tells `uux' to not start up `uucico' immediately. Of ++course, if you do want `uucico' to start up right away, omit the `-r'; ++if the call fails, the poll file will be left around to cause a later ++call. ++ ++ For example, I use the following crontab entries locally: ++ ++ 45 * * * * /bin/echo /usr/lib/uucp/uucico -r1 | /bin/su uucpa ++ 40 4,10,15 * * * /usr/bin/uux -r uunet! ++ ++ Every hour, at 45 minutes past, this will check if there is any work ++to be done, and, if there is, will call the appropriate system. Also, ++at 4:40am, 10:40am, and 3:40pm, this will create a poll file file for ++`uunet', forcing the next run of `uucico' to call `uunet'. ++ ++ ++File: uucp.info, Node: Accepting Calls, Next: Mail and News, Prev: Calling Other Systems, Up: Using Taylor UUCP ++ ++4.2 Accepting Calls ++=================== ++ ++To accept calls from another system, you must arrange matters such that ++when that system calls in, it automatically invokes `uucico' on your ++system. ++ ++ The most common arrangement is to create a special user name and ++password for incoming UUCP calls. This user name typically uses the ++same user ID as the regular `uucp' user (Unix permits several user ++names to share the same user ID). The shell for this user name should ++be set to `uucico'. ++ ++ Here is a sample `/etc/passwd' line to accept calls from a remote ++system named airs: ++ Uairs:PASSWORD:4:8:airs UUCP:/usr/spool/uucp:/usr/lib/uucp/uucico ++ The details may vary on your system. You must use reasonable user ++and group ID's. You must use the correct file name for `uucico'. The ++PASSWORD must appear in the UUCP configuration files on the remote ++system, but will otherwise never be seen or typed by a human. ++ ++ Note that `uucico' appears as the login shell, and that it will be ++run with no arguments. This means that it will start in slave mode and ++accept an incoming connection. *Note Invoking uucico::. ++ ++ On some systems, creating an empty file named `.hushlogin' in the ++home directory will skip the printing of various bits of information ++when the remote `uucico' logs in, speeding up the UUCP connection ++process. ++ ++ For the greatest security, each system which calls in should use a ++different user name, each with a different password, and the ++`called-login' command should be used in the `sys' file to ensure that ++the correct login name is used. *Note Accepting a Call::, and see ++*note Security::. ++ ++ If you never need to dial out from your system, but only accept ++incoming calls, you can arrange for `uucico' to handle logins itself, ++completely controlling the port, by using the `--endless' option. ++*Note Invoking uucico::. ++ ++ ++File: uucp.info, Node: Mail and News, Next: The Spool Directory Layout, Prev: Accepting Calls, Up: Using Taylor UUCP ++ ++4.3 Using UUCP for Mail and News. ++================================= ++ ++Taylor UUCP does not include a mail package. All Unix systems come with ++some sort of mail delivery agent, typically `sendmail' or `MMDF'. ++Source code is available for some alternative mail delivery agents, ++such as `IDA sendmail' and `smail'. ++ ++ Taylor UUCP also does not include a news package. The two major Unix ++news packages are `C-news' and `INN'. Both are available in source ++code form. ++ ++ Configuring and using mail delivery agents is a notoriously complex ++topic, and I will not be discussing it here. Configuring news systems ++is usually simpler, but I will not be discussing that either. I will ++merely describe the interactions between the mail and news systems and ++UUCP. ++ ++ A mail or news system interacts with UUCP in two ways: sending and ++receiving. ++ ++* Menu: ++ ++* Sending mail or news:: Sending mail or news via UUCP ++* Receiving mail or news:: Receiving mail or news via UUCP ++ ++ ++File: uucp.info, Node: Sending mail or news, Next: Receiving mail or news, Prev: Mail and News, Up: Mail and News ++ ++4.3.1 Sending mail or news via UUCP ++----------------------------------- ++ ++When mail is to be sent from your machine to another machine via UUCP, ++the mail delivery agent will invoke `uux'. It will generally run a ++command such as `uux - SYSTEM!rmail ADDRESS', where SYSTEM is the ++remote system to which the mail is being sent. It may pass other ++options to `uux', such as `-r' or `-g' (*note Invoking uux::). ++ ++ The news system also invokes `uux' in order to transfer articles to ++another system. The only difference is that news will use `uux' to ++invoke `rnews' on the remote system, rather than `rmail'. ++ ++ You should arrange for your mail and news systems to invoke the ++Taylor UUCP version of `uux'. If you only have Taylor UUCP, or if you ++simply replace any existing version of `uux' with the Taylor UUCP ++version, this will probably happen automatically. However, if you have ++two UUCP packages installed on your system, you will probably have to ++modify the mail and news configuration files in some way. ++ ++ Actually, if both the system UUCP and Taylor UUCP are using the same ++spool directory format, the system `uux' will probably work fine with ++the Taylor `uucico' (the reverse is not the case: the Taylor `uux' ++requires the Taylor `uucico'). However, data transfer will be somewhat ++more efficient if the Taylor `uux' is used. ++ ++ ++File: uucp.info, Node: Receiving mail or news, Prev: Sending mail or news, Up: Mail and News ++ ++4.3.2 Receiving mail or news via UUCP ++------------------------------------- ++ ++To receive mail, all that is necessary is for UUCP to invoke `rmail'. ++Any mail delivery agent will provide an appropriate version of `rmail'; ++you must simply make sure that it is in the command path used by UUCP ++(it almost certainly already is). The default command path is set in ++`policy.h', and it may be overridden for a particular system by the ++`command-path' command (*note Miscellaneous (sys)::). ++ ++ Similarly, for news UUCP must be able to invoke `rnews'. Any news ++system will provide a version of `rnews', and you must ensure that is ++in a directory on the path that UUCP will search. ++ ++ ++File: uucp.info, Node: The Spool Directory Layout, Next: Spool Directory Cleaning, Prev: Mail and News, Up: Using Taylor UUCP ++ ++4.4 The Spool Directory Layout ++============================== ++ ++In general, the layout of the spool directory may be safely ignored. ++However, it is documented here for the curious. This description only ++covers the `SPOOLDIR_TAYLOR' layout. The ways in which the other spool ++directory layouts differ are described in the source file ++`unix/spool.c'. ++ ++ Directories and files are only created when they are needed, so a ++typical system will not have all of the entries described here. ++ ++* Menu: ++ ++* System Spool Directories:: System Spool Directories ++* Status Directory:: Status Spool Directory ++* Execution Subdirectories:: Execution Spool Subdirectories ++* Other Spool Subdirectories:: Other Spool Subdirectories ++* Spool Lock Files:: Spool Directory Lock Files ++ ++ ++File: uucp.info, Node: System Spool Directories, Next: Status Directory, Prev: The Spool Directory Layout, Up: The Spool Directory Layout ++ ++4.4.1 System Spool Directories ++------------------------------ ++ ++`SYSTEM' ++ There is a subdirectory of the main spool directory for each remote ++ system. ++ ++`SYSTEM/C.' ++ This directory stores files describing file transfer commands to ++ be sent to the SYSTEM. Each file name starts with `C.G', where G ++ is the job grade. Each file contains one or more commands. For ++ details of the commands, see *note UUCP Protocol Commands::. ++ ++`SYSTEM/D.' ++ This directory stores data files. Files with names like ++ `D.GSSSS', where G is the grade and SSSS is a sequence number, are ++ waiting to be transferred to the SYSTEM, as directed by the files ++ in the `SYSTEM/C.' directory. Files with other names, typically ++ `D.SYSTEMGSSSS', have been received from SYSTEM and are waiting to ++ be processed by an execution file in the `SYSTEM/X.' directory. ++ ++`SYSTEM/D.X' ++ This directory stores data files which will become execution files ++ on the remote system. In current practice, this directory rarely ++ exists, because most simple executions, including typical uses of ++ `rmail' and `rnews', send an `E' command rather than an execution ++ file (*note The E Command::). ++ ++`SYSTEM/X.' ++ This directory stores execution files which have been received from ++ SYSTEM. This directory normally exists, even though the ++ corresponding `D.X' directory does not, because `uucico' will ++ create an execution file on the fly when it receives an `E' ++ command. ++ ++`SYSTEM/SEQF' ++ This file holds the sequence number of the last job sent to ++ SYSTEM. The sequence number is used to ensure that file names are ++ unique in the remote system spool directory. The file is four ++ bytes long. Sequence numbers are composed of digits and the upper ++ case letters. ++ ++ ++File: uucp.info, Node: Status Directory, Next: Execution Subdirectories, Prev: System Spool Directories, Up: The Spool Directory Layout ++ ++4.4.2 Status Directory ++---------------------- ++ ++`.Status' ++ This directory holds status files for each remote system. The ++ name of the status file is the name of the system which it ++ describes. Each status file describes the last conversation with ++ the system. Running `uustat --status' basically just formats and ++ prints the contents of the status files (*note uustat Examples::). ++ ++ Each status file has a single text line with six fields. ++ ++ code ++ A code indicating the status of the last conversation. The ++ following values are defined, though not all are actually ++ used. ++ `0' ++ Conversation completed normally. ++ ++ `1' ++ `uucico' was unable to open the port. ++ ++ `2' ++ The last call to the system failed while dailing. ++ ++ `3' ++ The last call to the system failed while logging in. ++ ++ `4' ++ The last call to the system failed during the initial ++ UUCP protocol handshake (*note The Initial Handshake::). ++ ++ `5' ++ The last call to the system failed after the initial ++ handshake. ++ ++ `6' ++ `uucico' is currently talking to the system. ++ ++ `7' ++ The last call to the system failed because it was the ++ wrong time to call (this is not used if calling the ++ system is never permitted). ++ ++ retries ++ The number of retries since the last successful call. ++ ++ time of last call ++ The time of the last call, in seconds since the epoch (as ++ returned by the `time' system call). ++ ++ wait ++ If the last call failed, this is the number of seconds since ++ the last call before `uucico' may attempt another call. This ++ is set based on the retry time; see *note When to Call::. ++ The `-f' or `-S' options to `uucico' direct it to ignore this ++ wait time; see *note Invoking uucico::. ++ ++ description ++ A text description of the status, corresponding to the code ++ in the first field. This may contain spaces. ++ ++ system name ++ The name of the remote system. ++ ++ ++File: uucp.info, Node: Execution Subdirectories, Next: Other Spool Subdirectories, Prev: Status Directory, Up: The Spool Directory Layout ++ ++4.4.3 Execution Subdirectories ++------------------------------ ++ ++`.Xqtdir' ++ When `uuxqt' executes a job requested by `uux', it first changes ++ the working directory to the `.Xqtdir' subdirectory. This permits ++ the job to create any sort of temporary file without worrying ++ about overwriting other files in the spool directory. Any files ++ left in the `.Xqtdir' subdirectory are removed after each ++ execution is complete. ++ ++`.XqtdirNNNN' ++ When several instances of `uuxqt' are executing simultaneously, ++ each one executes jobs in a separate directory. The first uses ++ `.Xqtdir', the second uses `.Xqtdir0001', the third uses ++ `.Xqtdir0002', and so forth. ++ ++`.Corrupt' ++ If `uuxqt' encounters an execution file which it is unable to ++ parse, it saves it in the `.Corrupt' directory, and sends mail ++ about it to the UUCP administrator. ++ ++`.Failed' ++ If `uuxqt' executes a job, and the job fails, and there is enough ++ disk space to hold the command file and all the data files, then ++ `uuxqt' saves the files in the `.Failed' directory, and sends mail ++ about it to the UUCP administrator. ++ ++ ++File: uucp.info, Node: Other Spool Subdirectories, Next: Spool Lock Files, Prev: Execution Subdirectories, Up: The Spool Directory Layout ++ ++4.4.4 Other Spool Subdirectories ++-------------------------------- ++ ++`.Sequence' ++ This directory holds conversation sequence number files. These ++ are used if the `sequence' command is used for a system (*note ++ Miscellaneous (sys)::). The sequence number for the system SYSTEM ++ is stored in the file `.Sequence/SYSTEM'. It is simply stored as ++ a printable number. ++ ++`.Temp' ++ This directory holds data files as they are being received from a ++ remote system, before they are moved to their final destination. ++ For file send requests which use a valid temporary file name in ++ the TEMP field of the `S' or `E' command (*note The S Command::), ++ `uucico' receives the file into `.Temp/SYSTEM/TEMP', where SYSTEM ++ is the name of the remote system, and TEMP is the temporary file ++ name. If a conversation fails during a file transfer, these files ++ are used to automatically restart the file transfer from the point ++ of failure. ++ ++ If the `S' or `E' command does not include a temporary file name, ++ automatic restart is not possible. In this case, the files are ++ received into a randomly named file in the `.Temp' directory ++ itself. ++ ++`.Preserve' ++ This directory holds data files which could not be transferred to a ++ remote system for some reason (for example, the data file might be ++ large, and exceed size restrictions imposed by the remote system). ++ When a locally requested file transfer fails, `uucico' will store ++ the data file in the `.Preserve' directory, and send mail to the ++ requestor describing the failure and naming the saved file. ++ ++`.Received' ++ This directory records which files have been received. If a ++ conversation fails just after `uucico' acknowledges receipt of a ++ file, it is possible for the acknowledgement to be lost. If this ++ happens, the remote system will resend the file. If the file were ++ an execution request, and `uucico' did not keep track of which ++ files it had already received, this could lead to the execution ++ being performed twice. ++ ++ To avoid this problem, when a conversation fails, `uucico' records ++ each file that has been received, but for which the remote system ++ may not have received the acknowledgement. It records this ++ information by creating an empty file with the name ++ `.Received/SYSTEM/TEMP', where SYSTEM is the name of the remote ++ system, and TEMP is the TEMP field of the `S' or `E' command from ++ the remote system (*note The S Command::). Then, if the remote ++ system offers the file again in the next conversation, `uucico' ++ refuses the send request and deletes the record in the `.Received' ++ directory. This approach only works for file sends which use a ++ temporary file name, but this is true of all execution requests. ++ ++ ++File: uucp.info, Node: Spool Lock Files, Prev: Other Spool Subdirectories, Up: The Spool Directory Layout ++ ++4.4.5 Lock Files in the Spool Directory ++--------------------------------------- ++ ++Lock files for devices and systems are stored in the lock directory, ++which may or may not be the same as the spool directory. The lock ++directory is set at compilation time by `LOCKDIR' in `policy.h', which ++may be overridden by the `lockdir' command in the `config' file (*note ++Miscellaneous (config)::). ++ ++ For a description of the names used for device lock files, and the ++format of the contents of a lock file, see *note UUCP Lock Files::. ++ ++`LCK..SYS' ++ A lock file for a system, where SYS is the system name. As noted ++ above, these lock files are kept in the lock directory, which may ++ not be the spool directory. These lock files are created by ++ `uucico' while talking to a remote system, and are used to prevent ++ multiple simultaneous conversations with a system. ++ ++ On systems which limit file names to 14 characters, only the first ++ eight characters of the system name are used in the lock file ++ name. This requires that the names of each directly connected ++ remote system be unique in the first eight characters. ++ ++`LCK.XQT.NN' ++ When `uuxqt' starts up, it uses lock files to determine how many ++ other `uuxqt' daemons are currently running. It first tries to ++ lock `LCK.XQT.0', then `LCK.XQT.1', and so forth. This is used to ++ implement the `max-uuxqts' command (*note Miscellaneous ++ (config)::). It is also used to parcel out the `.Xqtdir' ++ subdirectories (*note Execution Subdirectories::). ++ ++`LXQ.CMD' ++ When `uuxqt' is invoked with the `-c' or `--command' option (*note ++ Invoking uuxqt::), it creates a lock file named after the command ++ it is executing. For example, `uuxqt -c rmail' will create the ++ lock file `LXQ.rmail'. This prevents other `uuxqt' daemons from ++ executing jobs of the specified type. ++ ++`SYSTEM/X./L.XXX' ++ While `uuxqt' is executing a particular job, it creates a lock file ++ with the same name as the `X.' file describing the job, but ++ replacing the initial `X' with `L'. This ensures that if multiple ++ `uuxqt' daemons are running, they do not simultaneously execute ++ the same job. ++ ++`LCK..SEQ' ++ This lock file is used to control access to the sequence files for ++ each system (*note System Spool Directories::). It is only used ++ on systems which do not support POSIX file locking using the ++ `fcntl' system call. ++ ++ ++File: uucp.info, Node: Spool Directory Cleaning, Prev: The Spool Directory Layout, Up: Using Taylor UUCP ++ ++4.5 Cleaning the Spool Directory ++================================ ++ ++The spool directory may need to be cleaned up periodically. Under some ++circumstances, files may accumulate in various subdirectories, such as ++`.Preserve' (*note Other Spool Subdirectories::) or `.Corrupt' (*note ++Execution Subdirectories::). ++ ++ Also, if a remote system stops calling in, you may want to arrange ++for any queued up mail to be returned to the sender. This can be done ++using the `uustat' command (*note Invoking uustat::). ++ ++ The `contrib' directory includes a simple `uuclean' script which may ++be used as an example of a clean up script. It can be run daily out of ++`crontab'. ++ ++ You should periodically trim the UUCP log files, as they will ++otherwise grow without limit. The names of the log files are set in ++`policy.h', and may be overridden in the configuration file (*note ++config File::). By default they are are `/usr/spool/uucp/Log' and ++`/usr/spool/uucp/Stats'. You may find the `savelog' program in the ++`contrib' directory to be of use. There is a manual page for it in ++`contrib' as well. ++ ++ ++File: uucp.info, Node: Configuration Files, Next: Protocols, Prev: Using Taylor UUCP, Up: Top ++ ++5 Taylor UUCP Configuration Files ++********************************* ++ ++This chapter describes the configuration files accepted by the Taylor ++UUCP package if compiled with `HAVE_TAYLOR_CONFIG' set to 1 in ++`policy.h'. ++ ++ The configuration files are normally found in the directory ++NEWCONFIGDIR, which is defined by the `configure' option ++`--with-newconfigdir'; by default NEWCONFIGDIR is ++`/usr/local/conf/uucp'. However, the main configuration file, ++`config', is the only one which must be in that directory, since it may ++specify a different location for any or all of the other files. You ++may run any of the UUCP programs with a different main configuration ++file by using the `-I' or `--config' option; this can be useful when ++testing a new configuration. When you use the `-I' option the programs ++will revoke any setuid privileges. ++ ++* Menu: ++ ++* Configuration Overview:: Configuration File Overview ++* Configuration File Format:: Configuration File Format ++* Configuration Examples:: Examples of Configuration Files ++* Time Strings:: How to Write Time Strings ++* Chat Scripts:: How to Write Chat Scripts ++* config File:: The Main Configuration File ++* sys File:: The System Configuration File ++* port File:: The Port Configuration Files ++* dial File:: The Dialer Configuration Files ++* UUCP Over TCP:: UUCP Over TCP ++* Security:: Security Issues ++ ++ ++File: uucp.info, Node: Configuration Overview, Next: Configuration File Format, Prev: Configuration Files, Up: Configuration Files ++ ++5.1 Configuration File Overview ++=============================== ++ ++UUCP uses several different types of configuration files, each ++describing a different kind of information. The commands permitted in ++each file are described in detail below. This section is a brief ++description of some of the different types of files. ++ ++ The `config' file is the main configuration file. It describes ++general information not associated with a particular remote system, such ++as the location of various log files. There are reasonable defaults for ++everything that may be specified in the `config' file, so you may not ++actually need one on your system. ++ ++ There may be only one `config' file, but there may be one or more of ++each other type of file. The default is one file for each type, but ++more may be listed in the `config' file. ++ ++ The `sys' files are used to describe remote systems. Each remote ++system to which you connect must be listed in a `sys' file. A `sys' ++file will include information for a system, such as the speed (baud ++rate) to use, or when to place calls. ++ ++ For each system you wish to call, you must describe one or more ++ports; these ports may be defined directly in the `sys' file, or they ++may be defined in a `port' file. ++ ++ The `port' files are used to describe ports. A port is a particular ++hardware connection on your computer. You would normally define as ++many ports as there are modems attached to your computer. A TCP ++connection is also described using a port. ++ ++ The `dial' files are used to describe dialers. Dialer is ++essentially another word for modem. The `dial' file describes the ++commands UUCP should use to dial out on a particular type of modem. You ++would normally define as many dialers as there are types of modems ++attached to your computer. For example, if you have three Telebit ++modems used for UUCP, you would probably define three ports and one ++dialer. ++ ++ There are other types of configuration files, but these are the ++important ones. The other types are described below. ++ ++ ++File: uucp.info, Node: Configuration File Format, Next: Configuration Examples, Prev: Configuration Overview, Up: Configuration Files ++ ++5.2 Configuration File Format ++============================= ++ ++All the configuration files follow a simple line-oriented `KEYWORD ++VALUE' format. Empty lines are ignored, as are leading spaces; unlike ++HDB, lines with leading spaces are read. The first word on each line ++is a keyword. The rest of the line is interpreted according to the ++keyword. Most keywords are followed by numbers, boolean values or ++simple strings with no embedded spaces. ++ ++ The `#' character is used for comments. Everything from a `#' to ++the end of the line is ignored unless the `#' is preceded by a `\' ++(backslash); if the `#' is preceeded by a `\', the `\' is removed but ++the `#' remains in the line. This can be useful for a phone number ++containing a `#'. To enter the sequence `\#', use `\\#'. ++ ++ The backslash character may be used to continue lines. If the last ++character in a line is a backslash, the backslash is removed and the ++line is continued by the next line. The second line is attached to the ++first with no intervening characters; if you want any whitespace between ++the end of the first line and the start of the second line, you must ++insert it yourself. ++ ++ However, the backslash is not a general quoting character. For ++example, you cannot use it to get an embedded space in a string ++argument. ++ ++ Everything after the keyword must be on the same line. A BOOLEAN ++may be specified as `y', `Y', `t', or `T' for true and `n', `N', `f', ++or `F' for false; any trailing characters are ignored, so `true', ++`false', etc., are also acceptable. ++ ++ ++File: uucp.info, Node: Configuration Examples, Next: Time Strings, Prev: Configuration File Format, Up: Configuration Files ++ ++5.3 Examples of Configuration Files ++=================================== ++ ++This section provides few typical examples of configuration files. ++There are also sample configuration files in the `sample' subdirectory ++of the distribution. ++ ++* Menu: ++ ++* config File Examples:: Examples of the Main Configuration File ++* Leaf Example:: Call a Single Remote Site ++* Gateway Example:: The Gateway for Several Local Systems ++ ++ ++File: uucp.info, Node: config File Examples, Next: Leaf Example, Prev: Configuration Examples, Up: Configuration Examples ++ ++5.3.1 config File Examples ++-------------------------- ++ ++To start with, here are some examples of uses of the main configuration ++file, `config'. For a complete description of the commands that are ++permitted in `config', see *note config File::. ++ ++ In many cases you will not need to create a `config' file at all. ++The most common reason to create one is to give your machine a special ++UUCP name. Other reasons might be to change the UUCP spool directory, ++or to permit any remote system to call in. ++ ++ If you have an internal network of machines, then it is likely that ++the internal name of your UUCP machine is not the name you want to use ++when calling other systems. For example, here at `airs.com' our ++mail/news gateway machine is named `elmer.airs.com' (it is one of ++several machines all named `LOCALNAME.airs.com'). If we did not ++provide a `config' file, then our UUCP name would be `elmer'; however, ++we actually want it to be `airs'. Therefore, we use the following line ++in `config': ++ ++ nodename airs ++ ++ The UUCP spool directory name is set in `policy.h' when the code is ++compiled. You might at some point decide that it is appropriate to move ++the spool directory, perhaps to put it on a different disk partition. ++You would use the following commands in `config' to change to ++directories on the partition `/uucp': ++ ++ spool /uucp/spool ++ pubdir /uucp/uucppublic ++ logfile /uucp/spool/Log ++ debugfile /uucp/spool/Debug ++ ++ You would then move the contents of the current spool directory to ++`/uucp/spool'. If you do this, make sure that no UUCP processes are ++running while you change `config' and move the spool directory. ++ ++ Suppose you wanted to permit any system to call in to your system and ++request files. This is generally known as "anonymous UUCP", since the ++systems which call in are effectively anonymous. By default, unknown ++systems are not permitted to call in. To permit this you must use the ++`unknown' command in `config'. The `unknown' command is followed by ++any command that may appear in the system file; for full details, see ++*note sys File::. ++ ++ I will show two possible anonymous UUCP configurations. The first ++will let any system call in and download files, but will not permit ++them to upload files to your system. ++ ++ # No files may be transferred to this system ++ unknown receive-request no ++ # The public directory is /usr/spool/anonymous ++ unknown pubdir /usr/spool/anonymous ++ # Only files in the public directory may be sent (the default anyhow) ++ unknown remote-send ~ ++ ++Setting the public directory is convenient for the systems which call ++in. It permits to request a file by prefixing it with `~/'. For ++example, assuming your system is known as `server', then to retrieve ++the file `/usr/spool/anonymous/INDEX' a user on a remote site could ++just enter `uucp server!~/INDEX ~'; this would transfer `INDEX' from ++`server''s public directory to the user's local public directory. Note ++that when using `csh' or `bash' the `!' and the second `~' must be ++quoted. ++ ++ The next example will permit remote systems to upload files to a ++special directory named `/usr/spool/anonymous/upload'. Permitting a ++remote system to upload files permits it to send work requests as well; ++this example is careful to prohibit commands from unknown systems. ++ ++ # No commands may be executed (the list of permitted commands is empty) ++ unknown commands ++ # The public directory is /usr/spool/anonymous ++ unknown pubdir /usr/spool/anonymous ++ # Only files in the public directory may be sent; users may not download ++ # files from the upload directory ++ unknown remote-send ~ !~/upload ++ # May only upload files into /usr/spool/anonymous/upload ++ unknown remote-receive ~/upload ++ ++ ++File: uucp.info, Node: Leaf Example, Next: Gateway Example, Prev: config File Examples, Up: Configuration Examples ++ ++5.3.2 Leaf Example ++------------------ ++ ++A relatively common simple case is a "leaf site", a system which only ++calls or is called by a single remote site. Here is a typical `sys' ++file that might be used in such a case. For full details on what ++commands can appear in the `sys' file, see *note sys File::. ++ ++ This is the `sys' file that is used at `airs.com'. We use a single ++modem to dial out to `uunet'. This example shows how you can specify ++the port and dialer information directly in the `sys' file for simple ++cases. It also shows the use of the following: ++ ++`call-login' ++ Using `call-login' and `call-password' allows the default login ++ chat script to be used. In this case, the login name is specified ++ in the call-out login file (*note Configuration File Names::). ++ ++`call-timegrade' ++ `uunet' is requested to not send us news during the daytime. ++ ++`chat-fail' ++ If the modem returns `BUSY' or `NO CARRIER' the call is ++ immediately aborted. ++ ++`protocol-parameter' ++ Since `uunet' tends to be slow, the default timeout has been ++ increased. ++ ++ ++ This `sys' file relies on certain defaults. It will allow `uunet' ++to queue up `rmail' and `rnews' commands. It will allow users to ++request files from `uunet' into the UUCP public directory. It will ++also allow `uunet' to request files from the UUCP public directory; in ++fact `uunet' never requests files, but for additional security we could ++add the line `request false'. ++ ++ # The following information is for uunet ++ system uunet ++ ++ # The login name and password are kept in the callout password file ++ call-login * ++ call-password * ++ ++ # We can send anything at any time. ++ time any ++ ++ # During the day we only accept grade `Z' or above; at other times ++ # (not mentioned here) we accept all grades. uunet queues up news ++ # at grade `d', which is lower than `Z'. ++ call-timegrade Z Wk0755-2305,Su1655-2305 ++ ++ # The phone number. ++ phone 7389449 ++ ++ # uunet tends to be slow, so we increase the timeout ++ chat-timeout 120 ++ ++ # We are using a preconfigured Telebit 2500. ++ port type modem ++ port device /dev/ttyd0 ++ port speed 19200 ++ port carrier true ++ port dialer chat "" ATZ\r\d\c OK ATDT\D CONNECT ++ port dialer chat-fail BUSY ++ port dialer chat-fail NO\sCARRIER ++ port dialer complete \d\d+++\d\dATH\r\c ++ port dialer abort \d\d+++\d\dATH\r\c ++ ++ # Increase the timeout and the number of retries. ++ protocol-parameter g timeout 20 ++ protocol-parameter g retries 10 ++ ++ ++File: uucp.info, Node: Gateway Example, Prev: Leaf Example, Up: Configuration Examples ++ ++5.3.3 Gateway Example ++--------------------- ++ ++Many organizations have several local machines which are connected by ++UUCP, and a single machine which connects to the outside world. This ++single machine is often referred to as a "gateway" machine. ++ ++ For this example I will assume a fairly simple case. It should still ++provide a good general example. There are three machines, `elmer', ++`comton' and `bugs'. `elmer' is the gateway machine for which I will ++show the configuration file. `elmer' calls out to `uupsi'. As an ++additional complication, `uupsi' knows `elmer' as `airs'; this will ++show how a machine can have one name on an internal network but a ++different name to the external world. `elmer' has two modems. It also ++has an TCP connection to `uupsi', but since that is supposed to be ++reserved for interactive work (it is, perhaps, only a 9600 baud SLIP ++line) it will only use it if the modems are not available. ++ ++ A network this small would normally use a single `sys' file. ++However, for pedagogical purposes I will show two separate `sys' files, ++one for the local systems and one for `uupsi'. This is done with the ++`sysfile' command in the `config' file. Here is the `config' file. ++ ++ # This is config ++ # The local sys file ++ sysfile /usr/local/lib/uucp/sys.local ++ # The remote sys file ++ sysfile /usr/local/lib/uucp/sys.remote ++ ++ Using the defaults feature of the `sys' file can greatly simplify ++the listing of local systems. Here is `sys.local'. Note that this ++assumes that the local systems are trusted; they are permited to request ++any world readable file and to write files into any world writable ++directory. ++ ++ # This is sys.local ++ # Get the login name and password to use from the call-out file ++ call-login * ++ call-password * ++ ++ # The systems must use a particular login ++ called-login Ulocal ++ ++ # Permit sending any world readable file ++ local-send / ++ remote-send / ++ ++ # Permit receiving into any world writable directory ++ local-receive / ++ remote-receive / ++ ++ # Call at any time ++ time any ++ ++ # Use port1, then port2 ++ port port1 ++ ++ alternate ++ ++ port port2 ++ ++ # Now define the systems themselves. Because of all the defaults we ++ # used, there is very little to specify for the systems themselves. ++ ++ system comton ++ phone 5551212 ++ ++ system bugs ++ phone 5552424 ++ ++ The `sys.remote' file describes the `uupsi' connection. The ++`myname' command is used to change the UUCP name to `airs' when talking ++to `uupsi'. ++ ++ # This is sys.remote ++ # Define uupsi ++ system uupsi ++ ++ # The login name and password are in the call-out file ++ call-login * ++ call-password * ++ ++ # We can call out at any time ++ time any ++ ++ # uupsi uses a special login name ++ called-login Uuupsi ++ ++ # uuspi thinks of us as `airs' ++ myname airs ++ ++ # The phone number ++ phone 5554848 ++ ++ # We use port2 first, then port1, then TCP ++ ++ port port2 ++ ++ alternate ++ ++ port port1 ++ ++ alternate ++ ++ # We don't bother to make a special entry in the port file for TCP, we ++ # just describe the entire port right here. We use a special chat ++ # script over TCP because the usual one confuses some TCP servers. ++ port type TCP ++ address uu.psi.com ++ chat ogin: \L word: \P ++ ++ The ports are defined in the file `port' (*note port File::). For ++this example they are both connected to the same type of 2400 baud ++Hayes-compatible modem. ++ ++ # This is port ++ ++ port port1 ++ type modem ++ device /dev/ttyd0 ++ dialer hayes ++ speed 2400 ++ ++ port port2 ++ type modem ++ device /dev/ttyd1 ++ dialer hayes ++ speed 2400 ++ ++ Dialers are described in the `dial' file (*note dial File::). ++ ++ # This is dial ++ ++ dialer hayes ++ ++ # The chat script used to dial the phone. \D is the phone number. ++ chat "" ATZ\r\d\c OK ATDT\D CONNECT ++ ++ # If we get BUSY or NO CARRIER we abort the dial immediately ++ chat-fail BUSY ++ chat-fail NO\sCARRIER ++ ++ # When the call is over we make sure we hangup the modem. ++ complete \d\d+++\d\dATH\r\c ++ abort \d\d+++\d\dATH\r\c ++ ++ ++File: uucp.info, Node: Time Strings, Next: Chat Scripts, Prev: Configuration Examples, Up: Configuration Files ++ ++5.4 Time Strings ++================ ++ ++Several commands use time strings to specify a range of times. This ++section describes how to write time strings. ++ ++ A time string may be a list of simple time strings separated with a ++vertical bar `|' or a comma `,'. ++ ++ Each simple time string must begin with `Su', `Mo', `Tu', `We', ++`Th', `Fr', or `Sa', or `Wk' for any weekday, or `Any' for any day. ++ ++ Following the day may be a range of hours separated with a hyphen ++using 24 hour time. The range of hours may cross 0; for example ++`2300-0700' means any time except 7 AM to 11 PM. If no time is given, ++calls may be made at any time on the specified day(s). ++ ++ The time string may also be the single word `Never', which does not ++match any time. The time string may also be a single word with a name ++defined in a previous `timetable' command (*note Miscellaneous ++(config)::). ++ ++ Here are a few sample time strings with an explanation of what they ++mean. ++ ++`Wk2305-0855,Sa,Su2305-1655' ++ This means weekdays before 8:55 AM or after 11:05 PM, any time ++ Saturday, or Sunday before 4:55 PM or after 11:05 PM. These are ++ approximately the times during which night rates apply to phone ++ calls in the U.S.A. Note that this time string uses, for example, ++ `2305' rather than `2300'; this will ensure a cheap rate phone ++ call even if the computer clock is running up to five minutes ++ ahead of the real time. ++ ++`Wk0905-2255,Su1705-2255' ++ This means weekdays from 9:05 AM to 10:55 PM, or Sunday from 5:05 ++ PM to 10:55 PM. This is approximately the opposite of the ++ previous example. ++ ++`Any' ++ This means any day. Since no time is specified, it means any time ++ on any day. ++ ++ ++ ++File: uucp.info, Node: Chat Scripts, Next: config File, Prev: Time Strings, Up: Configuration Files ++ ++5.5 Chat Scripts ++================ ++ ++Chat scripts are used in several different places, such as dialing out ++on modems or logging in to remote systems. Chat scripts are made up of ++pairs of strings. The program waits until it sees the first string, ++known as the "expect" string, and then sends out the second string, the ++"send" string. ++ ++ Each chat script is defined using a set of commands. These commands ++always end in a string beginning with `chat', but may start with ++different strings. For example, in the `sys' file there is one set of ++commands beginning with `chat' and another set beginning with ++`called-chat'. The prefixes are only used to disambiguate different ++types of chat scripts, and this section ignores the prefixes when ++describing the commands. ++ ++`chat STRINGS' ++ Specify a chat script. The arguments to the `chat' command are ++ pairs of strings separated by whitespace. The first string of ++ each pair is an expect string, the second is a send string. The ++ program will wait for the expect string to appear; when it does, ++ the program will send the send string. If the expect string does ++ not appear within a certain number of seconds (as set by the ++ `chat-timeout' command), the chat script fails and, typically, the ++ call is aborted. If the final expect string is seen (and the ++ optional final send string has been sent), the chat script is ++ successful. ++ ++ An expect string may contain additional subsend and subexpect ++ strings, separated by hyphens. If the expect string is not seen, ++ the subsend string is sent and the chat script continues by ++ waiting for the subexpect string. This means that a hyphen may ++ not appear in an expect string; on an ASCII system, use `\055' ++ instead. ++ ++ An expect string may simply be `""', meaning to skip the expect ++ phase. Otherwise, the following escape characters may appear in ++ expect strings: ++ ++ `\b' ++ a backspace character ++ ++ `\n' ++ a newline or line feed character ++ ++ `\N' ++ a null character (for HDB compatibility) ++ ++ `\r' ++ a carriage return character ++ ++ `\s' ++ a space character ++ ++ `\t' ++ a tab character ++ ++ `\\' ++ a backslash character ++ ++ `\DDD' ++ character DDD, where DDD are up to three octal digits ++ ++ `\xDDD' ++ character DDD, where DDD are hexadecimal digits. ++ ++ As in C, there may be up to three octal digits following a ++ backslash, but the hexadecimal escape sequence continues as far as ++ possible. To follow a hexadecimal escape sequence with a hex ++ digit, interpose a send string of `""'. ++ ++ A chat script expect string may also specify a timeout. This is ++ done by using the escape sequence `\WSECONDS'. This escape ++ sequence may only appear at the very end of the expect string. It ++ temporarily overrides the timeout set by `chat-timeout' (described ++ below) only for the expect string to which it is attached. ++ ++ A send string may simply be `""' to skip the send phase. ++ Otherwise, all of the escape characters legal for expect strings ++ may be used, and the following escape characters are also ++ permitted: ++ ++ `EOT' ++ send an end of transmission character (`^D') ++ ++ `BREAK' ++ send a break character (may not work on all systems) ++ ++ `\c' ++ suppress trailing carriage return at end of send string ++ ++ `\d' ++ delay sending for 1 or 2 seconds ++ ++ `\e' ++ disable echo checking ++ ++ `\E' ++ enable echo checking ++ ++ `\K' ++ same as `BREAK' ++ ++ `\p' ++ pause sending for a fraction of a second ++ ++ `\M' ++ do not require carrier signal ++ ++ `\m' ++ require carrier signal (fail if not present) ++ ++ Some specific types of chat scripts also define additional escape ++ sequences that may appear in the send string. For example, the ++ login chat script defines `\L' and `\P' to send the login name and ++ password, respectively. ++ ++ A carriage return will be sent at the end of each send string, ++ unless the `\c' escape sequence appears in the string. Note that ++ some UUCP packages use `\b' for break, but here it means backspace. ++ ++ Echo checking means that after writing each character the program ++ will wait until the character is echoed. Echo checking must be ++ turned on separately for each send string for which it is desired; ++ it will be turned on for characters following `\E' and turned off ++ for characters following `\e'. ++ ++ When used with a port which does not support the carrier signal, ++ as set by the `carrier' command in the port file, `\M' and `\m' ++ are ignored. Similarly, when used in a dialer chat script with a ++ dialer which does not support the carrier signal, as set by the ++ `carrier' command in the dial file, `\M' and `\m' are ignored. ++ ++`chat-timeout NUMBER' ++ The number of seconds to wait for an expect string in the chat ++ script, before timing out and sending the next subsend, or failing ++ the chat script entirely. The default value is 10 for a login ++ chat or 60 for any other type of chat. ++ ++`chat-fail STRING' ++ If the STRING is seen at any time during a chat script, the chat ++ script is aborted. The string may not contain any whitespace ++ characters: escape sequences must be used for them. Multiple ++ `chat-fail' commands may appear in a single chat script. The ++ default is to have none. ++ ++ This permits a chat script to be quickly aborted if an error ++ string is seen. For example, a script used to dial out on a modem ++ might use the command `chat-fail BUSY' to stop the chat script ++ immediately if the string `BUSY' was seen. ++ ++ The `chat-fail' strings are considered in the order they are ++ listed, so if one string is a suffix of another the longer one ++ should be listed first. This affects the error message which will ++ be logged. Of course, if one string is contained within another, ++ but is not a suffix, the smaller string will always be found ++ before the larger string could match. ++ ++`chat-seven-bit BOOLEAN' ++ If the argument is true, all incoming characters are stripped to ++ seven bits when being compared to the expect string. Otherwise ++ all eight bits are used in the comparison. The default is true, ++ because some Unix systems generate parity bits during the login ++ prompt which must be ignored while running a chat script. This ++ has no effect on any `chat-program', which must ignore parity by ++ itself if necessary. ++ ++`chat-program STRINGS' ++ Specify a program to run before executing the chat script. This ++ program could run its own version of a chat script, or it could do ++ whatever it wants. If both `chat-program' and `chat' are ++ specified, the program is executed first followed by the chat ++ script. ++ ++ The first argument to the `chat-program' command is the program ++ name to run. The remaining arguments are passed to the program. ++ The following escape sequences are recognized in the arguments: ++ ++ `\Y' ++ port device name ++ ++ `\S' ++ port speed ++ ++ `\\' ++ backslash ++ ++ Some specific uses of `chat-program' define additional escape ++ sequences. ++ ++ Arguments other than escape sequences are passed exactly as they ++ appear in the configuration file, except that sequences of ++ whitespace are compressed to a single space character (this ++ exception may be removed in the future). ++ ++ If the `chat-program' command is not used, no program is run. ++ ++ On Unix, the standard input and standard output of the program ++ will be attached to the port in use. Anything the program writes ++ to standard error will be written to the UUCP log file. No other ++ file descriptors will be open. If the program does not exit with ++ a status of 0, it will be assumed to have failed. This means that ++ the dialing programs used by some versions of HDB may not be used ++ directly, but you may be able to run them via the `dialHDB' ++ program in the `contrib' directory. ++ ++ The program will be run as the `uucp' user, and the environment ++ will be that of the process that started `uucico', so care must be ++ taken to maintain security. ++ ++ No search path is used to find the program; a full file name must ++ be given. If the program is an executable shell script, it will ++ be passed to `/bin/sh' even on systems which are unable to execute ++ shell scripts. ++ ++ ++ Here is a simple example of a chat script that might be used to ++reset a Hayes compatible modem. ++ ++ chat "" ATZ OK-ATZ-OK ++ ++ The first expect string is `""', so it is ignored. The chat script ++then sends `ATZ'. If the modem responds with `OK', the chat script ++finishes. If 60 seconds (the default timeout) pass before seeing `OK', ++the chat script sends another `ATZ'. If it then sees `OK', the chat ++script succeeds. Otherwise, the chat script fails. ++ ++ For a more complex chat script example, see *note Logging In::. ++ ++ ++File: uucp.info, Node: config File, Next: sys File, Prev: Chat Scripts, Up: Configuration Files ++ ++5.6 The Main Configuration File ++=============================== ++ ++The main configuration file is named `config'. ++ ++ Since all the values that may be specified in the main configuration ++file also have defaults, there need not be a main configuration file at ++all. ++ ++ Each command in `config' may have a program prefix, which is a ++separate word appearing at the beginning of the line. The currently ++supported prefixes are `uucp' and `cu'. Any command prefixed by `uucp' ++will not be read by the `cu' program. Any command prefixed by `cu' ++will only be read by the `cu' program. For example, to use a list of ++systems known only to `cu', list them in a separate file `FILE' and put ++`cu sysfile `FILE'' in `config'. ++ ++* Menu: ++ ++* Miscellaneous (config):: Miscellaneous config File Commands ++* Configuration File Names:: Using Different Configuration Files ++* Log File Names:: Using Different Log Files ++* Debugging Levels:: Debugging Levels ++ ++ ++File: uucp.info, Node: Miscellaneous (config), Next: Configuration File Names, Prev: config File, Up: config File ++ ++5.6.1 Miscellaneous config File Commands ++---------------------------------------- ++ ++`nodename STRING' ++`hostname STRING' ++`uuname STRING' ++ These keywords are equivalent. They specify the UUCP name of the ++ local host. If there is no configuration file, an appropriate ++ system function will be used to get the host name, if possible. ++ ++`spool STRING' ++ Specify the spool directory. The default is from `policy.h'. This ++ is where UUCP files are queued. Status files and various sorts of ++ temporary files are also stored in this directory and ++ subdirectories of it. ++ ++`pubdir STRING' ++ Specify the public directory. The default is from `policy.h'. ++ When a file is named using a leading `~/', it is taken from or to ++ the public directory. Each system may use a separate public ++ directory by using the `pubdir' command in the system ++ configuration file; see *note Miscellaneous (sys)::. ++ ++`lockdir STRING' ++ Specify the directory to place lock files in. The default is from ++ `policy.h'; see the information in that file. Normally the lock ++ directory should be set correctly in `policy.h', and not changed ++ here. However, changing the lock directory is sometimes useful for ++ testing purposes. This only affects lock files for devices and ++ systems; it does not affect certain internal lock files which are ++ stored in the spool directory (*note Spool Lock Files::). ++ ++`unknown STRING ...' ++ The STRING and subsequent arguments are treated as though they ++ appeared in the system file (*note sys File::). They are used to ++ apply to any unknown systems that may call in, probably to set ++ file transfer permissions and the like. If the `unknown' command ++ is not used, unknown systems are not permitted to call in. ++ ++`strip-login BOOLEAN' ++ If the argument is true, then, when `uucico' is doing its own ++ login prompting with the `-e', `-l', or `-w' switches, it will ++ strip the parity bit when it reads the login name and password. ++ Otherwise all eight bits will be used when checking the strings ++ against the UUCP password file. The default is true, since some ++ other UUCP packages send parity bits with the login name and ++ password, and few systems use eight bit characters in the password ++ file. ++ ++`strip-proto BOOLEAN' ++ If the argument is true, then `uucico' will strip the parity bit ++ from incoming UUCP protocol commands. Otherwise all eight bits ++ will be used. This only applies to commands which are not ++ encapsulated in a link layer protocol. The default is true, which ++ should always be correct unless your UUCP system names use eight ++ bit characters. ++ ++`max-uuxqts NUMBER' ++ Specify the maximum number of `uuxqt' processes which may run at ++ the same time. Having several `uuxqt' processes running at once ++ can significantly slow down a system, but, since `uuxqt' is ++ automatically started by `uucico', it can happen quite easily. The ++ default for `max-uuxqts' is 0, which means that there is no limit. ++ If HDB configuration files are being read and the code was compiled ++ without `HAVE_TAYLOR_CONFIG', then, if the file `Maxuuxqts' in the ++ configuration directory contains a readable number, it will be used ++ as the value for `max-uuxqts'. ++ ++`run-uuxqt STRING or NUMBER' ++ Specify when `uuxqt' should be run by `uucico'. This may be a ++ positive number, in which case `uucico' will start a `uuxqt' ++ process whenever it receives the given number of execution files ++ from the remote system, and, if necessary, at the end of the call. ++ The argument may also be one of the strings `once', `percall', or ++ `never'. The string `once' means that `uucico' will start `uuxqt' ++ once at the end of execution. The string `percall' means that ++ `uucico' will start `uuxqt' once per call that it makes (this is ++ only different from `once' when `uucico' is invoked in a way that ++ causes it to make multiple calls, such as when the `-r1' option is ++ used without the `-s' option). The string `never' means that ++ `uucico' will never start `uuxqt', in which case `uuxqt' should be ++ periodically run via some other mechanism. The default depends ++ upon which type of configuration files are being used; if ++ `HAVE_TAYLOR_CONFIG' is used the default is `once', otherwise if ++ `HAVE_HDB_CONFIG' is used the default is `percall', and otherwise, ++ for `HAVE_V2_CONFIG', the default is `10'. ++ ++`timetable STRING STRING' ++ The `timetable' defines a timetable that may be used in ++ subsequently appearing time strings; see *note Time Strings::. ++ The first string names the timetable entry; the second is a time ++ string. ++ ++ The following `timetable' commands are predefined. The NonPeak ++ timetable is included for compatibility. It originally described ++ the offpeak hours of Tymnet and Telenet, but both have since ++ changed their schedules. ++ ++ timetable Evening Wk1705-0755,Sa,Su ++ timetable Night Wk2305-0755,Sa,Su2305-1655 ++ timetable NonPeak Wk1805-0655,Sa,Su ++ ++ If this command does not appear, then, obviously, no additional ++ timetables will be defined. ++ ++`v2-files BOOLEAN' ++ If the code was compiled to be able to read V2 configuration ++ files, a false argument to this command will prevent them from ++ being read. This can be useful while testing. The default is ++ true. ++ ++`hdb-files BOOLEAN' ++ If the code was compiled to be able to read HDB configuration ++ files, a false argument to this command will prevent them from ++ being read. This can be useful while testing. The default is ++ true. ++ ++ ++ ++File: uucp.info, Node: Configuration File Names, Next: Log File Names, Prev: Miscellaneous (config), Up: config File ++ ++5.6.2 Configuration File Names ++------------------------------ ++ ++`sysfile STRINGS' ++ Specify the system file(s). The default is the file `sys' in the ++ directory NEWCONFIGDIR. These files hold information about other ++ systems with which this system communicates; see *note sys File::. ++ Multiple system files may be given on the line, and the `sysfile' ++ command may be repeated; each system file has its own set of ++ defaults. ++ ++`portfile STRINGS' ++ Specify the port file(s). The default is the file `port' in the ++ directory NEWCONFIGDIR. These files describe ports which are used ++ to call other systems and accept calls from other systems; see ++ *note port File::. No port files need be named at all. Multiple ++ port files may be given on the line, and the `portfile' command ++ may be repeated. ++ ++`dialfile STRINGS' ++ Specify the dial file(s). The default is the file `dial' in the ++ directory NEWCONFIGDIR. These files describe dialing devices ++ (modems); see *note dial File::. No dial files need be named at ++ all. Multiple dial files may be given on the line, and the ++ `dialfile' command may be repeated. ++ ++`dialcodefile STRINGS' ++ Specify the dialcode file(s). The default is the file `dialcode' ++ in the directory NEWCONFIGDIR. These files specify dialcodes that ++ may be used when sending phone numbers to a modem. This permits ++ using the same set of phone numbers in different area-codes or ++ with different phone systems, by using dialcodes to specify the ++ calling sequence. When a phone number goes through dialcode ++ translation, the leading alphabetic characters are stripped off. ++ The dialcode files are read line by line, just like any other ++ configuration file, and when a line is found whose first word is ++ the same as the leading characters from the phone number, the ++ second word on the line (which would normally consist of numbers) ++ replaces the dialcode in the phone number. No dialcode file need ++ be used. Multiple dialcode files may be specified on the line, ++ and the `dialcodefile' command may be repeated; all the dialcode ++ files will be read in turn until a dialcode is located. ++ ++`callfile STRINGS' ++ Specify the call out login name and password file(s). The default ++ is the file `call' in the directory NEWCONFIGDIR. If the call out ++ login name or password for a system are given as `*' (*note ++ Logging In::), these files are read to get the real login name or ++ password. Each line in the file(s) has three words: the system ++ name, the login name, and the password. The login name and ++ password may contain escape sequences like those in a chat script ++ expect string (*note Chat Scripts::). This file is only used when ++ placing calls to remote systems; the password file described under ++ `passwdfile' below is used for incoming calls. The intention of ++ the call out file is to permit the system file to be publically ++ readable; the call out files must obviously be kept secure. These ++ files need not be used. Multiple call out files may be specified ++ on the line, and the `callfile' command may be repeated; all the ++ files will be read in turn until the system is found. ++ ++`passwdfile STRINGS' ++ Specify the password file(s) to use for login names when `uucico' ++ is doing its own login prompting, which it does when given the ++ `-e', `-l' or `-w' switches. The default is the file `passwd' in ++ the directory NEWCONFIGDIR. Each line in the file(s) has two ++ words: the login name and the password (e.g., `Ufoo foopas'). ++ They may contain escape sequences like those in a chat script ++ expect string (*note Chat Scripts::). The login name is accepted ++ before the system name is known, so these are independent of which ++ system is calling in; a particular login may be required for a ++ system by using the `called-login' command in the system file ++ (*note Accepting a Call::). These password files are optional, ++ although one must exist if `uucico' is to present its own login ++ prompts. ++ ++ As a special exception, a colon may be used to separate the login ++ name from the password, and a colon may be used to terminate the ++ password. This means that the login name and password may not ++ contain a colon. This feature, in conjunction with the ++ `HAVE_ENCRYPTED_PASSWORDS' macro in `policy.h', permits using a ++ standard Unix `/etc/passwd' as a UUCP password file, providing the ++ same set of login names and passwords for both `getty' and ++ `uucico'. ++ ++ Multiple password files may be specified on the line, and the ++ `passwdfile' command may be repeated; all the files will be read in ++ turn until the login name is found. ++ ++ ++ ++File: uucp.info, Node: Log File Names, Next: Debugging Levels, Prev: Configuration File Names, Up: config File ++ ++5.6.3 Log File Names ++-------------------- ++ ++`logfile STRING' ++ Name the log file. The default is from `policy.h'. Logging ++ information is written to this file. If `HAVE_HDB_LOGGING' is ++ defined in `policy.h', then by default a separate log file is used ++ for each system; using this command to name a log file will cause ++ all the systems to use it. ++ ++`statfile STRING' ++ Name the statistics file. The default is from `policy.h'. ++ Statistical information about file transfers is written to this ++ file. ++ ++`debugfile STRING' ++ Name the file to which all debugging information is written. The ++ default is from `policy.h'. This command is only effective if the ++ code has been compiled to include debugging (this is controlled by ++ the `DEBUG' macro in `policy.h'). If debugging is on, messages ++ written to the log file are also written to the debugging file to ++ make it easier to keep the order of actions straight. The ++ debugging file is different from the log file because information ++ such as passwords can appear in it, so it must be not be ++ publically readable. ++ ++ ++ ++File: uucp.info, Node: Debugging Levels, Prev: Log File Names, Up: config File ++ ++5.6.4 Debugging Levels ++---------------------- ++ ++`debug STRING ...' ++ Set the debugging level. This command is only effective if the ++ code has been compiled to include debugging. The default is to ++ have no debugging. The arguments are strings which name the types ++ of debugging to be turned on. The following types of debugging ++ are defined: ++ ++ `abnormal' ++ Output debugging messages for abnormal situations, such as ++ recoverable errors. ++ ++ `chat' ++ Output debugging messages for chat scripts. ++ ++ `handshake' ++ Output debugging messages for the initial handshake. ++ ++ `uucp-proto' ++ Output debugging messages for the UUCP session protocol. ++ ++ `proto' ++ Output debugging messages for the individual link protocols. ++ ++ `port' ++ Output debugging messages for actions on the communication ++ port. ++ ++ `config' ++ Output debugging messages while reading the configuration ++ files. ++ ++ `spooldir' ++ Output debugging messages for actions in the spool directory. ++ ++ `execute' ++ Output debugging messages whenever another program is ++ executed. ++ ++ `incoming' ++ List all incoming data in the debugging file. ++ ++ `outgoing' ++ List all outgoing data in the debugging file. ++ ++ `all' ++ All of the above. ++ ++ The debugging level may also be specified as a number. A 1 will ++ set `chat' debugging, a 2 will set both `chat' and `handshake' ++ debugging, and so on down the possibilities. Currently an 11 will ++ turn on all possible debugging, since there are 11 types of ++ debugging messages listed above; more debugging types may be added ++ in the future. The `debug' command may be used several times in ++ the configuration file; every debugging type named will be turned ++ on. When running any of the programs, the `-x' switch (actually, ++ for `uulog' it's the `-X' switch) may be used to turn on ++ debugging. The argument to the `-x' switch is one of the strings ++ listed above, or a number as described above, or a comma separated ++ list of strings (e.g., `-x chat,handshake'). The `-x' switch may ++ also appear several times on the command line, in which case all ++ named debugging types will be turned on. The `-x' debugging is in ++ addition to any debugging specified by the `debug' command; there ++ is no way to cancel debugging information. The debugging level ++ may also be set specifically for calls to or from a specific ++ system with the `debug' command in the system file (*note ++ Miscellaneous (sys)::). ++ ++ The debugging messages are somewhat idiosyncratic; it may be ++ necessary to refer to the source code for additional information ++ in some cases. ++ ++ ++ ++File: uucp.info, Node: sys File, Next: port File, Prev: config File, Up: Configuration Files ++ ++5.7 The System Configuration File ++================================= ++ ++By default there is a single system configuration, named `sys' in the ++directory NEWCONFIGDIR. This may be overridden by the `sysfile' ++command in the main configuration file; see *note Configuration File ++Names::. ++ ++ These files describe all remote systems known to the UUCP package. ++ ++* Menu: ++ ++* Defaults and Alternates:: Using Defaults and Alternates ++* Naming the System:: Naming the System ++* Calling Out:: Calling Out ++* Accepting a Call:: Accepting a Call ++* Protocol Selection:: Protocol Selection ++* File Transfer Control:: File Transfer Control ++* Miscellaneous (sys):: Miscellaneous sys File Commands ++* Default sys File Values:: Default Values ++ ++ ++File: uucp.info, Node: Defaults and Alternates, Next: Naming the System, Prev: sys File, Up: sys File ++ ++5.7.1 Defaults and Alternates ++----------------------------- ++ ++The first set of commands in the file, up to the first `system' ++command, specify defaults to be used for all systems in that file. Each ++`sys' file uses a different set of defaults. ++ ++ Subsequently, each set of commands from `system' up to the next ++`system' command describe a particular system. Default values may be ++overridden for specific systems. ++ ++ Each system may then have a series of alternate choices to use when ++calling out or calling in. The first set of commands for a particular ++system, up to the first `alternate' command, provide the first choice. ++Subsequently, each set of commands from `alternate' up to the next ++`alternate' command describe an alternate choice for calling out or ++calling in. ++ ++ When a system is called, the commands before the first `alternate' ++are used to select a phone number, port, and so forth; if the call fails ++for some reason, the commands between the first `alternate' and the ++second are used, and so forth. Well, not quite. Actually, each ++succeeding alternate will only be used if it is different in some ++relevant way (different phone number, different chat script, etc.). If ++you want to force the same alternate to be used again (to retry a phone ++call more than once, for example), enter the phone number (or any other ++relevant field) again to make it appear different. ++ ++ The alternates can also be used to give different permissions to an ++incoming call based on the login name. This will only be done if the ++first set of commands, before the first `alternate' command, uses the ++`called-login' command. The list of alternates will be searched, and ++the first alternate with a matching `called-login' command will be ++used. If no alternates match, the call will be rejected. ++ ++ The `alternate' command may also be used in the file-wide defaults ++(the set of commands before the first `system' command). This might be ++used to specify a list of ports which are available for all systems ++(for an example of this, see *note Gateway Example::) or to specify ++permissions based on the login name used by the remote system when it ++calls in. The first alternate for each system will default to the ++first alternate for the file-wide defaults (as modified by the commands ++used before the first `alternate' command for this system), the second ++alternate for each system to the second alternate for the file-wide ++defaults (as modified the same way), and so forth. If a system ++specifies more alternates than the file-wide defaults, the trailing ++ones will default to the last file-wide default alternate. If a system ++specifies fewer alternates than the file-wide defaults, the trailing ++file-wide default alternates will be used unmodified. The ++`default-alternates' command may be used to modify this behaviour. ++ ++ This can all get rather confusing, although it's easier to use than ++to describe concisely; the `uuchk' program may be used to ensure that ++you are getting what you want. ++ ++ ++File: uucp.info, Node: Naming the System, Next: Calling Out, Prev: Defaults and Alternates, Up: sys File ++ ++5.7.2 Naming the System ++----------------------- ++ ++`system STRING' ++ Specify the remote system name. Subsequent commands up to the next ++ `system' command refer to this system. ++ ++`alternate [STRING]' ++ Start an alternate set of commands (*note Defaults and ++ Alternates::). An optional argument may be used to name the ++ alternate. This name will be recorded in the log file if the ++ alternate is used to call the system. There is no way to name the ++ first alternate (the commands before the first `alternate' ++ command). ++ ++`default-alternates BOOLEAN' ++ If the argument is false, any remaining default alternates (from ++ the defaults specified at the top of the current system file) will ++ not be used. The default is true. ++ ++`alias STRING' ++ Specify an alias for the current system. The alias may be used by ++ local `uucp' and `uux' commands, as well as by the remote system ++ (which can be convenient if a remote system changes its name). ++ The default is to have no aliases. ++ ++`myname STRING' ++ Specifies a different system name to use when calling the remote ++ system. Also, if `called-login' is used and is not `ANY', then, ++ when a system logs in with that login name, STRING is used as the ++ local system name. Because the local system name must be ++ determined before the remote system has identified itself, using ++ `myname' and `called-login' together for any system will set the ++ local name for that login; this means that each locally used ++ system name must have a unique login name associated with it. ++ This allows a system to have different names for an external and ++ an internal network. The default is to not use a special local ++ name. ++ ++ ++ ++File: uucp.info, Node: Calling Out, Next: Accepting a Call, Prev: Naming the System, Up: sys File ++ ++5.7.3 Calling Out ++----------------- ++ ++This section describes commands used when placing a call to another ++system. ++ ++* Menu: ++ ++* When to Call:: When to Call ++* Placing the Call:: Placing the Call ++* Logging In:: Logging In ++ ++ ++File: uucp.info, Node: When to Call, Next: Placing the Call, Prev: Calling Out, Up: Calling Out ++ ++5.7.3.1 When to Call ++.................... ++ ++`time STRING [NUMBER]' ++ Specify when the system may be called. The first argument is a ++ time string; see *note Time Strings::. The optional second ++ argument specifies a retry time in minutes. If a call made during ++ a time that matches the time string fails, no more calls are ++ permitted until the retry time has passed. By default an ++ exponentially increasing retry time is used: after each failure ++ the next retry period is longer. A retry time specified in the ++ `time' command is always a fixed amount of time. ++ ++ The `time' command may appear multiple times in a single alternate, ++ in which case if any time string matches the system may be called. ++ When the `time' command is used for a particular system, any `time' ++ or `timegrade' commands that appeared in the system defaults are ++ ignored. ++ ++ The default time string is `Never'. ++ ++`timegrade CHARACTER STRING [NUMBER]' ++ The CHARACTER specifies a grade. It must be a single letter or ++ digit. The STRING is a time string (*note Time Strings::). All ++ jobs of grade CHARACTER or higher (where `0' > `9' > `A' > `Z' > ++ `a' > `z') may be run at the specified time. An ordinary `time' ++ command is equivalent to using `timegrade' with a grade of `z', ++ permitting all jobs. If there are no jobs of a sufficiently high ++ grade according to the time string, the system will not be called. ++ Giving the `-s' switch to `uucico' to force it to call a system ++ causes it to assume there is a job of grade `0' waiting to be run. ++ ++ The optional third argument specifies a retry time in minutes. ++ See the `time' command, above, for more details. ++ ++ Note that the `timegrade' command serves two purposes: 1) if there ++ is no job of sufficiently high grade the system will not be ++ called, and 2) if the system is called anyway (because the `-s' ++ switch was given to `uucico') only jobs of sufficiently high grade ++ will be transferred. However, if the other system calls in, the ++ `timegrade' commands are ignored, and jobs of any grade may be ++ transferred (but see `call-timegrade' and `called-timegrade', ++ below). Also, the `timegrade' command will not prevent the other ++ system from transferring any job it chooses, regardless of who ++ placed the call. ++ ++ The `timegrade' command may appear multiple times without using ++ `alternate'. When the `timegrade' command is used for a ++ particular system, any `time' or `timegrade' commands that ++ appeared in the system defaults are ignored. ++ ++ If this command does not appear, there are no restrictions on what ++ grade of work may be done at what time. ++ ++`max-retries NUMBER' ++ Gives the maximum number of times this system may be retried. If ++ this many calls to the system fail, it will be called at most once ++ a day whatever the retry time is. The default is 26. ++ ++`success-wait NUMBER' ++ A retry time, in seconds, which applies after a successful call. ++ This can be used to put a limit on how frequently the system is ++ called. For example, an argument of 1800 means that the system ++ will not be called more than once every half hour. The default is ++ 0, which means that there is no limit. ++ ++`call-timegrade CHARACTER STRING' ++ The CHARACTER is a single character `A' to `Z', `a' to `z', or `0' ++ to `9' and specifies a grade. The STRING is a time string (*note ++ Time Strings::). If a call is placed to the other system during a ++ time which matches the time string, the remote system will be ++ requested to only run jobs of grade CHARACTER or higher. ++ Unfortunately, there is no way to guarantee that the other system ++ will obey the request (this UUCP package will, but there are ++ others which will not); moreover, job grades are historically ++ somewhat arbitrary, so specifying a grade will only be meaningful ++ if the other system cooperates in assigning grades. This grade ++ restriction only applies when the other system is called, not when ++ the other system calls in. ++ ++ The `call-timegrade' command may appear multiple times without ++ using `alternate'. If this command does not appear, or if none of ++ the time strings match, the remote system will be allowed to send ++ whatever grades of work it chooses. ++ ++`called-timegrade CHARACTER STRING' ++ The CHARACTER is a single character `A' to `Z', `a' to `z', or `0' ++ to `9' and specifies a grade. The STRING is a time string (*note ++ Time Strings::). If a call is received from the other system ++ during a time which matches the time string, only jobs of grade ++ CHARACTER or higher will be sent to the remote system. This ++ allows the job grade to be set for incoming calls, overriding any ++ request made by the remote uucico. As noted above, job grades are ++ historically somewhat arbitrary, so specifying a grade will only be ++ meaningful if the other system cooperates in assigning grades. ++ This grade restriction only applies to jobs on the local system; ++ it does not affect the jobs transferred by the remote system. ++ This grade restriction only applies when the other system calls ++ in, not when the other system is called. ++ ++ The `called-timegrade' command may appear multiple times. If this ++ command does not appear, or if none of the time strings match, any ++ grade may be sent to the remote system upon receiving a call. ++ ++ ++ ++File: uucp.info, Node: Placing the Call, Next: Logging In, Prev: When to Call, Up: Calling Out ++ ++5.7.3.2 Placing the Call ++........................ ++ ++`speed NUMBER' ++ ++`baud NUMBER' ++ Specify the speed (the term "baud" is technically incorrect, but ++ widely understood) at which to call the system. This will try all ++ available ports with that speed until an unlocked port is found. ++ The ports are defined in the port file. If both `speed' and ++ `port' commands appear, both are used when selecting a port. To ++ allow calls at more than one speed, the `alternate' command must be ++ used (*note Defaults and Alternates::). If this command does not ++ appear, there is no default; the speed may be specified in the port ++ file, but if it is not then the natural speed of the port will be ++ used (whatever that means on the system). Specifying an explicit ++ speed of 0 will request the natural speed of the port (whatever ++ the system sets it to), overriding any default speed from the ++ defaults at the top of the file. ++ ++`port STRING' ++ Name a particular port or type of port to use when calling the ++ system. The information for this port is obtained from the port ++ file. If this command does not appear, there is no default; a ++ port must somehow be specified in order to call out (it may be ++ specified implicitly using the `speed' command or explicitly using ++ the next version of `port'). There may be many ports with the ++ same name; each will be tried in turn until an unlocked one is ++ found which matches the desired speed. ++ ++`port STRING ...' ++ If more than one string follows the `port' command, the strings are ++ treated as a command that might appear in the port file (*note ++ port File::). If a port is named (by using a single string ++ following `port') these commands are ignored; their purpose is to ++ permit defining the port completely in the system file rather than ++ always requiring entries in two different files. In order to call ++ out, a port must be specified using some version of the `port' ++ command, or by using the `speed' command to select ports from the ++ port file. ++ ++`phone STRING' ++`address STRING' ++ Give a phone number to call (when using a modem port) or a remote ++ host to contact (when using a TCP or TLI port). The commands ++ `phone' and `address' are equivalent; the duplication is intended ++ to provide a mnemonic choice depending on the type of port in use. ++ ++ When used with a modem port, an `=' character in the phone number ++ means to wait for a secondary dial tone (although only some modems ++ support this); a `-' character means to pause while dialing for 1 ++ second (again, only some modems support this). If the system has ++ more than one phone number, each one must appear in a different ++ alternate. The `phone' command must appear in order to call out ++ on a modem; there is no default. ++ ++ When used with a TCP port, the string names the host to contact. ++ It may be a domain name or a numeric Internet address. If no ++ address is specified, the system name is used. ++ ++ When used with a TLI port, the string is treated as though it were ++ an expect string in a chat script, allowing the use of escape ++ characters (*note Chat Scripts::). The `dialer-sequence' command ++ in the port file may override this address (*note port File::). ++ ++ When used with a port that not a modem or TCP or TLI, this command ++ is ignored. ++ ++ ++ ++File: uucp.info, Node: Logging In, Prev: Placing the Call, Up: Calling Out ++ ++5.7.3.3 Logging In ++.................. ++ ++`chat STRINGS' ++ ++`chat-timeout NUMBER' ++ ++`chat-fail STRING' ++ ++`chat-seven-bit BOOLEAN' ++ ++`chat-program STRINGS' ++ These commands describe a chat script to use when logging on to a ++ remote system. This login chat script is run after any chat ++ script defined in the `dial' file (*note dial File::). Chat ++ scripts are explained in *note Chat Scripts::. ++ ++ Two additional escape sequences may be used in send strings. ++ ++ `\L' ++ Send the login name, as set by the `call-login' command. ++ ++ `\P' ++ Send the password, as set by the `call-password' command. ++ ++ Three additional escape sequences may be used with the ++ `chat-program' command. These are `\L' and `\P', which become the ++ login name and password, respectively, and `\Z', which becomes the ++ name of the system of being called. ++ ++ The default chat script is: ++ ++ chat "" \r\c ogin:-BREAK-ogin:-BREAK-ogin: \L word: \P ++ ++ This will send a carriage return (the `\c' suppresses the ++ additional trailing carriage return that would otherwise be sent) ++ and waits for the string `ogin:' (which would be the last part of ++ the `login:' prompt supplied by a Unix system). If it doesn't see ++ `ogin:', it sends a break and waits for `ogin:' again. If it ++ still doesn't see `ogin:', it sends another break and waits for ++ `ogin:' again. If it still doesn't see `ogin:', the chat script ++ aborts and hangs up the phone. If it does see `ogin:' at some ++ point, it sends the login name (as specified by the `call-login' ++ command) followed by a carriage return (since all send strings are ++ followed by a carriage return unless `\c' is used) and waits for ++ the string `word:' (which would be the last part of the ++ `Password:' prompt supplied by a Unix system). If it sees ++ `word:', it sends the password and a carriage return, completing ++ the chat script. The program will then enter the handshake phase ++ of the UUCP protocol. ++ ++ This chat script will work for most systems, so you will only be ++ required to use the `call-login' and `call-password' commands. In ++ fact, in the file-wide defaults you could set defaults of ++ `call-login *' and `call-password *'; you would then just have to ++ make an entry for each system in the call-out login file. ++ ++ Some systems seem to flush input after the `login:' prompt, so they ++ may need a version of this chat script with a `\d' before the ++ `\L'. When using UUCP over TCP, some servers will not be handle ++ the initial carriage return sent by this chat script; in this case ++ you may have to specify the simple chat script `ogin: \L word: \P'. ++ ++`call-login STRING' ++ Specify the login name to send with `\L' in the chat script. If ++ the string is `*' (e.g., `call-login *') the login name will be ++ fetched from the call out login name and password file (*note ++ Configuration File Names::). The string may contain escape ++ sequences as though it were an expect string in a chat script ++ (*note Chat Scripts::). There is no default. ++ ++`call-password STRING' ++ Specify the password to send with `\P' in the chat script. If the ++ string is `*' (e.g., `call-password *') the password will be ++ fetched from the call-out login name and password file (*note ++ Configuration File Names::). The string may contain escape ++ sequences as though it were an expect string in a chat script ++ (*note Chat Scripts::). There is no default. ++ ++ ++ ++File: uucp.info, Node: Accepting a Call, Next: Protocol Selection, Prev: Calling Out, Up: sys File ++ ++5.7.4 Accepting a Call ++---------------------- ++ ++`called-login STRINGS' ++ The first STRING specifies the login name that the system must use ++ when calling in. If it is `ANY' (e.g., `called-login ANY') any ++ login name may be used; this is useful to override a file-wide ++ default and to indicate that future alternates may have different ++ login names. Case is significant. The default value is `ANY'. ++ ++ Different alternates (*note Defaults and Alternates::) may use ++ different `called-login' commands, in which case the login name ++ will be used to select which alternate is in effect; this will ++ only work if the first alternate (before the first `alternate' ++ command) uses the `called-login' command. ++ ++ Additional strings may be specified after the login name; they are ++ a list of which systems are permitted to use this login name. If ++ this feature is used, then normally the login name will only be ++ given in a single `called-login' command. Only systems which ++ appear on the list, or which use an explicit `called-login' ++ command, will be permitted to use that login name. If the same ++ login name is used more than once with a list of systems, all the ++ lists are concatenated together. This feature permits you to ++ restrict a login name to a particular set of systems without ++ requiring you to use the `called-login' command for every single ++ system; you can achieve a similar effect by using a different ++ system file for each permitted login name with an appropriate ++ `called-login' command in the file-wide defaults. ++ ++`callback BOOLEAN' ++ If BOOLEAN is true, then when the remote system calls `uucico' ++ will hang up the connection and prepare to call it back. The ++ default is false. ++ ++`called-chat STRINGS' ++ ++`called-chat-timeout NUMBER' ++ ++`called-chat-fail STRING' ++ ++`called-chat-seven-bit BOOLEAN' ++ ++`called-chat-program STRINGS' ++ These commands may be used to define a chat script (*note Chat ++ Scripts::) that is run whenever the local system is called by the ++ system being defined. The chat script defined by the `chat' ++ command (*note Logging In::), on the other hand, is used when the ++ remote system is called. This called chat script might be used to ++ set special modem parameters that are appropriate to a particular ++ system. It is run after protocol negotiation is complete, but ++ before the protocol has been started. For additional escape ++ sequence which may be used besides those defined for all chat ++ scripts, see *note Logging In::. There is no default called chat ++ script. If the called chat script fails, the incoming call will ++ be aborted. ++ ++ ++ ++File: uucp.info, Node: Protocol Selection, Next: File Transfer Control, Prev: Accepting a Call, Up: sys File ++ ++5.7.5 Protocol Selection ++------------------------ ++ ++`protocol STRING' ++ Specifies which protocols to use for the other system, and in which ++ order to use them. This would not normally be used. For example, ++ `protocol tfg'. ++ ++ The default depends on the characteristics of the port and the ++ dialer, as specified by the `seven-bit' and `reliable' commands. ++ If neither the port nor the dialer use either of these commands, ++ the default is to assume an eight-bit reliable connection. The ++ commands `seven-bit true' or `reliable false' might be used in ++ either the port or the dialer to change this. Each protocol has ++ particular requirements that must be met before it will be ++ considered during negotiation with the remote side. ++ ++ The `t' and `e' protocols are intended for use over TCP or some ++ other communication path with end to end reliability, as they do no ++ checking of the data at all. They will only be considered on a ++ TCP port which is both reliable and eight bit. For technical ++ details, see *note t Protocol::, and *note e Protocol::. ++ ++ The `i' protocol is a bidirectional protocol. It requires an ++ eight-bit connection. It will run over a half-duplex link, such as ++ Telebit modems in PEP mode, but for efficient use of such a ++ connection you must use the `half-duplex' command (*note port ++ File::). *Note i Protocol::. ++ ++ The `g' protocol is robust, but requires an eight-bit connection. ++ *Note g Protocol::. ++ ++ The `G' protocol is the System V Release 4 version of the `g' ++ protocol. *Note Big G Protocol::. ++ ++ The `a' protocol is a Zmodem like protocol, contributed by Doug ++ Evans. It requires an eight-bit connection, but unlike the `g' or ++ `i' protocol it will work if certain control characters may not be ++ transmitted. ++ ++ The `j' protocol is a variant of the `i' protocol which can avoid ++ certain control characters. The set of characters it avoids can ++ be set by a parameter. While it technically does not require an ++ eight bit connection (it could be configured to avoid all ++ characters with the high bit set) it would be very inefficient to ++ use it over one. It is useful over a eight-bit connection that ++ will not transmit certain control characters. *Note j Protocol::. ++ ++ The `f' protocol is intended for use with X.25 connections; it ++ checksums each file as a whole, so any error causes the entire ++ file to be retransmitted. It requires a reliable connection, but ++ only uses seven-bit transmissions. It is a streaming protocol, ++ so, while it can be used on a serial port, the port must be ++ completely reliable and flow controlled; many aren't. *Note f ++ Protocol::. ++ ++ The `v' protocol is the `g' protocol as used by the DOS program ++ UUPC/Extended. It is provided only so that UUPC/Extended users ++ can use it; there is no particular reason to select it. *Note v ++ Protocol::. ++ ++ The `y' protocol is an efficient streaming protocol. It does error ++ checking, but when it detects an error it immediately aborts the ++ connection. This requires a reliable, flow controlled, eight-bit ++ connection. In practice, it is only useful on a connection that is ++ nearly always error-free. Unlike the `t' and `e' protocols, the ++ connection need not be entirely error-free, so the `y' protocol ++ can be used on a serial port. *Note y Protocol::. ++ ++ The protocols will be considered in the order shown above. This ++ means that if neither the `seven-bit' nor the `reliable' command ++ are used, the `t' protocol will be used over a TCP connection and ++ the `i' protocol will be used over any other type of connection ++ (subject, of course, to what is supported by the remote system; it ++ may be assumed that all systems support the `g' protocol). ++ ++ Note that currently specifying both `seven-bit true' and `reliable ++ false' will not match any protocol. If this occurs through a ++ combination of port and dialer specifications, you will have to ++ use the `protocol' command for the system or no protocol will be ++ selected at all (the only reasonable choice would be `protocol f'). ++ ++ A protocol list may also be specified for a port (*note port ++ File::), but, if there is a list for the system, the list for the ++ port is ignored. ++ ++`protocol-parameter CHARACTER STRING ...' ++ CHARACTER is a single character specifying a protocol. The ++ remaining strings are a command specific to that protocol which ++ will be executed if that protocol is used. A typical command is ++ something like `window 7'. The particular commands are protocol ++ specific. ++ ++ The `i' protocol supports the following commands, all of which take ++ numeric arguments: ++ ++ `window' ++ The window size to request the remote system to use. This ++ must be between 1 and 16 inclusive. The default is 16. ++ ++ `packet-size' ++ The packet size to request the remote system to use. This ++ must be between 1 and 4095 inclusive. The default is 1024. ++ ++ `remote-packet-size' ++ If this is between 1 and 4095 inclusive, the packet size ++ requested by the remote system is ignored, and this is used ++ instead. The default is 0, which means that the remote ++ system's request is honored. ++ ++ `sync-timeout' ++ The length of time, in seconds, to wait for a SYNC packet ++ from the remote system. SYNC packets are exchanged when the ++ protocol is started. The default is 10. ++ ++ `sync-retries' ++ The number of times to retry sending a SYNC packet before ++ giving up. The default is 6. ++ ++ `timeout' ++ The length of time, in seconds, to wait for an incoming ++ packet before sending a negative acknowledgement. The ++ default is 10. ++ ++ `retries' ++ The number of times to retry sending a packet or a negative ++ acknowledgement before giving up and closing the connection. ++ The default is 6. ++ ++ `errors' ++ The maximum number of errors to permit before closing the ++ connection. The default is 100. ++ ++ `error-decay' ++ The rate at which to ignore errors. Each time this many ++ packets are received, the error count is decreased by one, so ++ that a long connection with an occasional error will not ++ exceed the limit set by `errors'. The default is 10. ++ ++ `ack-frequency' ++ The number of packets to receive before sending an ++ acknowledgement. The default is half the requested window ++ size, which should provide good performance in most cases. ++ ++ The `g', `G' and `v' protocols support the following commands, all ++ of which take numeric arguments, except `short-packets' which ++ takes a boolean argument: ++ ++ `window' ++ The window size to request the remote system to use. This ++ must be between 1 and 7 inclusive. The default is 7. ++ ++ `packet-size' ++ The packet size to request the remote system to use. This ++ must be a power of 2 between 32 and 4096 inclusive. The ++ default is 64 for the `g' and `G' protocols and 1024 for the ++ `v' protocol. Many older UUCP packages do not support packet ++ sizes larger than 64, and many others do not support packet ++ sizes larger than 128. Some UUCP packages will even dump ++ core if a larger packet size is requested. The packet size ++ is not a negotiation, and it may be different in each ++ direction. If you request a packet size larger than the ++ remote system supports, you will not be able to send any ++ files. ++ ++ `startup-retries' ++ The number of times to retry the initialization sequence. ++ The default is 8. ++ ++ `init-retries' ++ The number of times to retry one phase of the initialization ++ sequence (there are three phases). The default is 4. ++ ++ `init-timeout' ++ The timeout in seconds for one phase of the initialization ++ sequence. The default is 10. ++ ++ `retries' ++ The number of times to retry sending either a data packet or ++ a request for the next packet. The default is 6. ++ ++ `timeout' ++ The timeout in seconds when waiting for either a data packet ++ or an acknowledgement. The default is 10. ++ ++ `garbage' ++ The number of unrecognized bytes to permit before dropping the ++ connection. This must be larger than the packet size. The ++ default is 10000. ++ ++ `errors' ++ The number of errors (malformed packets, out of order ++ packets, bad checksums, or packets rejected by the remote ++ system) to permit before dropping the connection. The ++ default is 100. ++ ++ `error-decay' ++ The rate at which to ignore errors. Each time this many ++ packets are received, the error count is decreased by one, so ++ that a long connection with an occasional error will not ++ exceed the limit set by `errors'. The default is 10. ++ ++ `remote-window' ++ If this is between 1 and 7 inclusive, the window size ++ requested by the remote system is ignored and this is used ++ instead. This can be useful when dealing with some poor UUCP ++ packages. The default is 0, which means that the remote ++ system's request is honored. ++ ++ `remote-packet-size' ++ If this is between 32 and 4096 inclusive the packet size ++ requested by the remote system is ignored and this is used ++ instead. There is probably no good reason to use this. The ++ default is 0, which means that the remote system's request is ++ honored. ++ ++ `short-packets' ++ If this is true, then the code will optimize by sending ++ shorter packets when there is less data to send. This ++ confuses some UUCP packages, such as System V Release 4 (when ++ using the `G' protocol) and Waffle; when connecting to such a ++ package, this parameter must be set to false. The default is ++ true for the `g' and `v' protocols and false for the `G' ++ protocol. ++ ++ The `a' protocol is a Zmodem like protocol contributed by Doug ++ Evans. It supports the following commands, all of which take ++ numeric arguments except for `escape-control', which takes a ++ boolean argument: ++ ++ `timeout' ++ Number of seconds to wait for a packet to arrive. The ++ default is 10. ++ ++ `retries' ++ The number of times to retry sending a packet. The default ++ is 10. ++ ++ `startup-retries' ++ The number of times to retry sending the initialization ++ packet. The default is 4. ++ ++ `garbage' ++ The number of garbage characters to accept before closing the ++ connection. The default is 2400. ++ ++ `send-window' ++ The number of characters that may be sent before waiting for ++ an acknowledgement. The default is 1024. ++ ++ `escape-control' ++ Whether to escape control characters. If this is true, the ++ protocol may be used over a connection which does not ++ transmit certain control characters, such as `XON' or `XOFF'. ++ The connection must still transmit eight bit characters other ++ than control characters. The default is false. ++ ++ The `j' protocol can be used over an eight bit connection that will ++ not transmit certain control characters. It accepts the same ++ protocol parameters that the `i' protocol accepts, as well as one ++ more: ++ ++ `avoid' ++ A list of characters to avoid. This is a string which is ++ interpreted as an escape sequence (*note Chat Scripts::). ++ The protocol does not have a way to avoid printable ASCII ++ characters (byte values from 32 to 126, inclusive); only ++ ASCII control characters and eight-bit characters may be ++ avoided. The default value is `\021\023'; these are the ++ characters `XON' and `XOFF', which many connections use for ++ flow control. If the package is configured to use ++ `HAVE_BSD_TTY', then on some versions of Unix you may have to ++ avoid `\377' as well, due to the way some implementations of ++ the BSD terminal driver handle signals. ++ ++ The `f' protocol is intended for use with error-correcting modems ++ only; it checksums each file as a whole, so any error causes the ++ entire file to be retransmitted. It supports the following ++ commands, both of which take numeric arguments: ++ ++ `timeout' ++ The timeout in seconds before giving up. The default is 120. ++ ++ `retries' ++ How many times to retry sending a file. The default is 2. ++ ++ The `t' and `e' protocols are intended for use over TCP or some ++ other communication path with end to end reliability, as they do no ++ checking of the data at all. They both support a single command, ++ which takes a numeric argument: ++ ++ `timeout' ++ The timeout in seconds before giving up. The default is 120. ++ ++ The `y' protocol is a streaming protocol contributed by Jorge Cwik. ++ It supports the following commands, both of which take numeric ++ arguments: ++ ++ `timeout' ++ The timeout in seconds when waiting for a packet. The ++ default is 60. ++ ++ `packet-size' ++ The packet size to use. The default is 1024. ++ ++ The protocol parameters are reset to their default values after ++ each call. ++ ++ ++ ++File: uucp.info, Node: File Transfer Control, Next: Miscellaneous (sys), Prev: Protocol Selection, Up: sys File ++ ++5.7.6 File Transfer Control ++--------------------------- ++ ++`send-request BOOLEAN' ++ The BOOLEAN determines whether the remote system is permitted to ++ request files from the local system. The default is yes. ++ ++`receive-request BOOLEAN' ++ The BOOLEAN determines whether the remote system is permitted to ++ send files to the local system. The default is yes. ++ ++`request BOOLEAN' ++ A shorthand command, equivalent to specifying both `send-request ++ BOOLEAN' and `receive-request BOOLEAN'. ++ ++`call-transfer BOOLEAN' ++ The BOOLEAN is checked when the local system places the call. It ++ determines whether the local system may do file transfers queued ++ up for the remote system. The default is yes. ++ ++`called-transfer BOOLEAN' ++ The BOOLEAN is checked when the remote system calls in. It ++ determines whether the local system may do file transfers queued ++ up for the remote system. The default is yes. ++ ++`transfer BOOLEAN' ++ A shorthand command, equivalent to specifying both `call-transfer ++ BOOLEAN' and `called-transfer BOOLEAN'. ++ ++`call-local-size NUMBER STRING' ++ The STRING is a time string (*note Time Strings::). The NUMBER is ++ the size in bytes of the largest file that should be transferred ++ at a time matching the time string, if the local system placed the ++ call and the request was made by the local system. This command ++ may appear multiple times in a single alternate. If this command ++ does not appear, or if none of the time strings match, there are ++ no size restrictions. ++ ++ With all the size control commands, the size of a file from the ++ remote system (as opposed to a file from the local system) will ++ only be checked if the other system is running this package: other ++ UUCP packages will not understand a maximum size request, nor will ++ they provide the size of remote files. ++ ++`call-remote-size NUMBER STRING' ++ Specify the size in bytes of the largest file that should be ++ transferred at a given time by remote request, when the local ++ system placed the call. This command may appear multiple times in ++ a single alternate. If this command does not appear, there are no ++ size restrictions. ++ ++`called-local-size NUMBER STRING' ++ Specify the size in bytes of the largest file that should be ++ transferred at a given time by local request, when the remote ++ system placed the call. This command may appear multiple times in ++ a single alternate. If this command does not appear, there are no ++ size restrictions. ++ ++`called-remote-size NUMBER STRING' ++ Specify the size in bytes of the largest file that should be ++ transferred at a given time by remote request, when the remote ++ system placed the call. This command may appear multiple times in ++ a single alternate. If this command does not appear, there are no ++ size restrictions. ++ ++`local-send STRINGS' ++ Specifies that files in the directories named by the STRINGS may ++ be sent to the remote system when requested locally (using `uucp' ++ or `uux'). The directories in the list should be separated by ++ whitespace. A `~' may be used for the public directory. On a ++ Unix system, this is typically `/usr/spool/uucppublic'; the public ++ directory may be set with the `pubdir' command. Here is an ++ example of `local-send': ++ ++ local-send ~ /usr/spool/ftp/pub ++ ++ Listing a directory allows all files within the directory and all ++ subdirectories to be sent. Directories may be excluded by ++ preceding them with an exclamation point. For example: ++ ++ local-send /usr/ftp !/usr/ftp/private ~ ++ ++ means that all files in `/usr/ftp' or the public directory may be ++ sent, except those files in `/usr/ftp/private'. The list of ++ directories is read from left to right, and the last directory to ++ apply takes effect; this means that directories should be listed ++ from top down. The default is the root directory (i.e., any file ++ at all may be sent by local request). ++ ++`remote-send STRINGS' ++ Specifies that files in the named directories may be sent to the ++ remote system when requested by the remote system. The default is ++ `~'. ++ ++`local-receive STRINGS' ++ Specifies that files may be received into the named directories ++ when requested by a local user. The default is `~'. ++ ++`remote-receive STRINGS' ++ Specifies that files may be received into the named directories ++ when requested by the remote system. The default is `~'. On ++ Unix, the remote system may only request that files be received ++ into directories that are writeable by the world, regardless of ++ how this is set. ++ ++`forward-to STRINGS' ++ Specifies a list of systems to which files may be forwarded. The ++ remote system may forward files through the local system on to any ++ of the systems in this list. The string `ANY' may be used to ++ permit forwarding to any system. The default is to not permit ++ forwarding to other systems. Note that if the remote system is ++ permitted to execute the `uucp' command, it effectively has the ++ ability to forward to any system. ++ ++`forward-from STRINGS' ++ Specifies a list of systems from which files may be forwarded. The ++ remote system may request files via the local system from any of ++ the systems in this list. The string `ANY' may be used to permit ++ forwarding to any system. The default is to not permit forwarding ++ from other systems. Note that if a remote system is permitted to ++ execute the `uucp' command, it effectively has the ability to ++ request files from any system. ++ ++`forward STRINGS' ++ Equivalent to specifying both `forward-to STRINGS' and ++ `forward-from STRINGS'. This would normally be used rather than ++ either of the more specific commands. ++ ++`max-file-time NUMBER' ++ The maximum amount of time which will be sent sending any one file ++ if there are other files to send. This will only be effective ++ when using a protocol which permits interrupting one file send to ++ send another file. This is true of the `i' and `j' protocols. ++ The default is to have no maximum. ++ ++ ++ ++File: uucp.info, Node: Miscellaneous (sys), Next: Default sys File Values, Prev: File Transfer Control, Up: sys File ++ ++5.7.7 Miscellaneous sys File Commands ++------------------------------------- ++ ++`sequence BOOLEAN' ++ If BOOLEAN is true, then conversation sequencing is automatically ++ used for the remote system, so that if somebody manages to spoof ++ as the remote system, it will be detected the next time the remote ++ system actually calls. This is false by default. ++ ++`command-path STRINGS' ++ Specifies the path (a list of whitespace separated directories) to ++ be searched to locate commands to execute. This is only used for ++ commands requested by `uux', not for chat programs. The default ++ is from `policy.h'. ++ ++`commands STRINGS' ++ The list of commands which the remote system is permitted to ++ execute locally. For example: `commands rnews rmail'. If the ++ value is `ALL' (case significant), all commands may be executed. ++ The default is `rnews rmail'. ++ ++`free-space NUMBER' ++ Specify the minimum amount of file system space (in bytes) to ++ leave free after receiving a file. If the incoming file will not ++ fit, it will be rejected. This initial rejection will only work ++ when talking to another instance of this package, since older UUCP ++ packages do not provide the file size of incoming files. Also, ++ while a file is being received, `uucico' will periodically check ++ the amount of free space. If it drops below the amount given by ++ the `free-space' command, the file transfer will be aborted. The ++ default amount of space to leave free is from `policy.h'. This ++ file space checking may not work on all systems. ++ ++`pubdir STRING' ++ Specifies the public directory that is used when `~' is specifed in ++ a file transfer or a list of directories. This essentially ++ overrides the public directory specified in the main configuration ++ file for this system only. The default is the public directory ++ specified in the main configuration file (which defaults to a ++ value from `policy.h'). ++ ++`debug STRING ...' ++ Set additional debugging for calls to or from the system. This ++ may be used to debug a connection with a specific system. It is ++ particularly useful when debugging incoming calls, since debugging ++ information will be generated whenever the call comes in. See the ++ `debug' command in the main configuration file (*note Debugging ++ Levels::) for more details. The debugging information specified ++ here is in addition to that specified in the main configuration ++ file or on the command line. ++ ++`max-remote-debug STRING ...' ++ When the system calls in, it may request that the debugging level ++ be set to a certain value. The `max-remote-debug' command may be ++ used to put a limit on the debugging level which the system may ++ request, to avoid filling up the disk with debugging information. ++ Only the debugging types named in the `max-remote-debug' command ++ may be turned on by the remote system. To prohibit any debugging, ++ use `max-remote-debug none'. ++ ++ ++ ++File: uucp.info, Node: Default sys File Values, Prev: Miscellaneous (sys), Up: sys File ++ ++5.7.8 Default sys File Values ++----------------------------- ++ ++The following are used as default values for all systems; they can be ++considered as appearing before the start of the file. ++ ++ time Never ++ chat "" \r\c ogin:-BREAK-ogin:-BREAK-ogin: \L word: \P ++ chat-timeout 10 ++ callback n ++ sequence n ++ request y ++ transfer y ++ local-send / ++ remote-send ~ ++ local-receive ~ ++ remove-receive ~ ++ command-path [ from `policy.h' ] ++ commands rnews rmail ++ max-remote-debug abnormal,chat,handshake ++ ++ ++File: uucp.info, Node: port File, Next: dial File, Prev: sys File, Up: Configuration Files ++ ++5.8 The Port Configuration File ++=============================== ++ ++The port files may be used to name and describe ports. By default there ++is a single port file, named `port' in the directory NEWCONFIGDIR. ++This may be overridden by the `portfile' command in the main ++configuration file; see *note Configuration File Names::. ++ ++ Any commands in a port file before the first `port' command specify ++defaults for all ports in the file; however, since the `type' command ++must appear before all other commands for a port, the defaults are only ++useful if all ports in the file are of the same type (this restriction ++may be lifted in a later version). All commands after a `port' command ++up to the next `port' command then describe that port. There are ++different types of ports; each type supports its own set of commands. ++Each command indicates which types of ports support it. There may be ++many ports with the same name; if a system requests a port by name then ++each port with that name will be tried until an unlocked one is found. ++ ++`port STRING' ++ Introduces and names a port. ++ ++`type STRING' ++ Define the type of port. The default is `modem'. If this command ++ appears, it must immediately follow the `port' command. The type ++ defines what commands are subsequently allowed. Currently the ++ types are: ++ ++ `modem' ++ For a modem hookup. ++ ++ `stdin' ++ For a connection through standard input and standard output, ++ as when `uucico' is run as a login shell. ++ ++ `direct' ++ For a direct connection to another system. ++ ++ `tcp' ++ For a connection using TCP. ++ ++ `tli' ++ For a connection using TLI. ++ ++ `pipe' ++ For a connection through a pipe running another program. ++ ++`protocol STRING' ++ Specify a list of protocols to use for this port. This is just ++ like the corresponding command for a system (*note Protocol ++ Selection::). A protocol list for a system takes precedence over ++ a list for a port. ++ ++`protocol-parameter CHARACTER STRINGS [ any type ]' ++ The same command as the `protocol-parameter' command used for ++ systems (*note Protocol Selection::). This one takes precedence. ++ ++`seven-bit BOOLEAN [ any type ]' ++ This is only used during protocol negotiation; if the argument is ++ true, it forces the selection of a protocol which works across a ++ seven-bit link. It does not prevent eight bit characters from ++ being transmitted. The default is false. ++ ++`reliable BOOLEAN [ any type ]' ++ This is only used during protocol negotiation; if the argument is ++ false, it forces the selection of a protocol which works across an ++ unreliable communication link. The default is true. It would be ++ more common to specify this for a dialer rather than a port. ++ ++`half-duplex BOOLEAN [ any type ]' ++ If the argument is true, it means that the port only supports ++ half-duplex connections. This only affects bidirectional ++ protocols, and causes them to not do bidirectional transfers. ++ ++`device STRING [ modem, direct and tli only ]' ++ Names the device associated with this port. If the device is not ++ named, the port name is taken as the device. Device names are ++ system dependent. On Unix, a modem or direct connection might be ++ something like `/dev/ttyd0'; a TLI port might be `/dev/inet/tcp'. ++ ++`speed NUMBER [modem and direct only ]' ++ ++`baud NUMBER [ modem and direct only ]' ++ The speed this port runs at. If a system specifies a speed but no ++ port name, then all ports which match the speed will be tried in ++ order. If the speed is not specified here and is not specified by ++ the system, the natural speed of the port will be used by default. ++ ++`speed-range NUMBER NUMBER [ modem only ]' ++ ++`baud-range NUMBER NUMBER [ modem only ]' ++ Specify a range of speeds this port can run at. The first number ++ is the minimum speed, the second number is the maximum speed. ++ These numbers will be used when matching a system which specifies ++ a desired speed. The simple `speed' (or `baud') command is still ++ used to determine the speed to run at if the system does not ++ specify a speed. For example, the command `speed-range 300 19200' ++ means that the port will match any system which uses a speed from ++ 300 to 19200 baud (and will use the speed specified by the ++ system); this could be combined with `speed 2400', which means ++ that when this port is used with a system that does not specify a ++ speed, the port will be used at 2400 baud. ++ ++`carrier BOOLEAN [ modem and direct only ]' ++ The argument indicates whether the port supports carrier. ++ ++ If a modem port does not support carrier, the carrier detect ++ signal will never be required on this port, regardless of what the ++ modem chat script indicates. The default for a modem port is true. ++ ++ If a direct port supports carrier, the port will be set to expect ++ carrier whenever it is used. The default for a direct port is ++ false. ++ ++`hardflow BOOLEAN [ modem and direct only ]' ++ The argument indicates whether the port supports hardware flow ++ control. If it does not, hardware flow control will not be turned ++ on for this port. The default is true. Hardware flow control is ++ only supported on some systems. ++ ++`dial-device STRING [ modem only ]' ++ Dialing instructions should be output to the named device, rather ++ than to the normal port device. The default is to output to the ++ normal port device. ++ ++`dialer STRING [ modem only ]' ++ Name a dialer to use. The information is looked up in the dial ++ file. There is no default. Some sort of dialer information must ++ be specified to call out on a modem. ++ ++`dialer STRING ... [ modem only ]' ++ If more than one string follows the `dialer' command, the strings ++ are treated as a command that might appear in the dial file (*note ++ dial File::). If a dialer is named (by using the first form of ++ this command, described just above), these commands are ignored. ++ They may be used to specify dialer information directly in simple ++ situations without needing to go to a separate file. There is no ++ default. Some sort of dialer information must be specified to ++ call out on a modem. ++ ++`dialer-sequence STRINGS [ modem or tcp or tli only ]' ++ Name a sequence of dialers and tokens (phone numbers) to use. The ++ first argument names a dialer, and the second argument names a ++ token. The third argument names another dialer, and so on. If ++ there are an odd number of arguments, the phone number specified ++ with a `phone' command in the system file is used as the final ++ token. The token is what is used for `\D' or `\T' in the dialer ++ chat script. If the token in this string is `\D', the system ++ phone number will be used; if it is `\T', the system phone number ++ will be used after undergoing dialcodes translation. A missing ++ final token is taken as `\D'. ++ ++ This command currently does not work if `dial-device' is specified; ++ to handle this correctly will require a more systematic notion of ++ chat scripts. Moreover, the `complete' and `abort' chat scripts, ++ the protocol parameters, and the `carrier' and `dtr-toggle' ++ commands are ignored for all but the first dialer. ++ ++ This command basically lets you specify a sequence of chat scripts ++ to use. For example, the first dialer might get you to a local ++ network and the second dialer might describe how to select a ++ machine from the local network. This lets you break your dialing ++ sequence into simple modules, and may make it easier to share ++ dialer entries between machines. ++ ++ This command is to only way to use a chat script with a TCP port. ++ This can be useful when using a modem which is accessed via TCP. ++ ++ When this command is used with a TLI port, then if the first ++ dialer is `TLI' or `TLIS' the first token is used as the address to ++ connect to. If the first dialer is something else, or if there is ++ no token, the address given by the `address' command is used ++ (*note Placing the Call::). Escape sequences in the address are ++ expanded as they are for chat script expect strings (*note Chat ++ Scripts::). The different between `TLI' and `TLIS' is that the ++ latter implies the command `stream true'. These contortions are ++ all for HDB compatibility. Any subsequent dialers are treated as ++ they are for a TCP port. ++ ++`lockname STRING [ modem and direct only ]' ++ Give the name to use when locking this port. On Unix, this is the ++ name of the file that will be created in the lock directory. It ++ is used as is, so on Unix it should generally start with `LCK..'. ++ For example, if a single port were named both `/dev/ttycu0' and ++ `/dev/tty0' (perhaps with different characteristics keyed on the ++ minor device number), then the command `lockname LCK..ttycu0' could ++ be used to force the latter to use the same lock file name as the ++ former. ++ ++`service STRING [ tcp only ]' ++ Name the TCP port number to use. This may be a number. If not, ++ it will be looked up in `/etc/services'. If this is not ++ specified, the string `uucp' is looked up in `/etc/services'. If ++ it is not found, port number 540 (the standard UUCP-over-TCP port ++ number) will be used. ++ ++`version STRING [ tcp only ]' ++ Specify the IP version number to use. The default is `0', which ++ permits any version. The other possible choices are `4', which ++ requires `IPv4', or `6', which requires `IPv6'. Normally it is ++ not necessary to use this command, but in some cases, as `IPv6' is ++ rolled out across the Internet, it may be necessary to require ++ UUCP to use a particular type of connection. ++ ++`push STRINGS [ tli only ]' ++ Give a list of modules to push on to the TLI stream. ++ ++`stream BOOLEAN [ tli only ]' ++ If this is true, and the `push' command was not used, the `tirdwr' ++ module is pushed on to the TLI stream. ++ ++`server-address STRING [ tli only ]' ++ Give the address to use when running as a TLI server. Escape ++ sequences in the address are expanded as they are for chat script ++ expect strings (*note Chat Scripts::). ++ ++ The string is passed directly to the TLI `t_bind' function. The ++ value needed may depend upon your particular TLI implementation. ++ Check the manual pages, and, if necessary, try writing some sample ++ programs. ++ ++ For AT&T 3B2 System V Release 3 using the Wollongong TCP/IP stack, ++ which is probably typical, the format of TLI string is `SSPPIIII', ++ where `SS' is the service number (for TCP, this is 2), `PP' is the ++ TCP port number, and `IIII' is the Internet address. For example, ++ to accept a connection from on port 540 from any interface, use ++ `server-address \x00\x02\x02\x1c\x00\x00\x00\x00'. To only accept ++ connections from a particular interface, replace the last four ++ digits with the network address of the interface. (Thanks to Paul ++ Pryor for the information in this paragraph). ++ ++`command STRINGS [ pipe only ]' ++ Give the command, with arguments, to run when using a pipe port ++ type. When a port of this type is used, the command is executed ++ and `uucico' communicates with it over a pipe. This permits ++ `uucico' or `cu' to communicate with another system which can only ++ be reached through some unusual means. A sample use might be ++ `command /bin/rlogin -E -8 -l LOGIN SYSTEM'. The command is run ++ with the full privileges of UUCP; it is responsible for ++ maintaining security. ++ ++ ++ ++File: uucp.info, Node: dial File, Next: UUCP Over TCP, Prev: port File, Up: Configuration Files ++ ++5.9 The Dialer Configuration File ++================================= ++ ++The dialer configuration files define dialers. By default there is a ++single dialer file, named `dial' in the directory NEWCONFIGDIR. This ++may be overridden by the `dialfile' command in the main configuration ++file; see *note Configuration File Names::. ++ ++ Any commands in the file before the first `dialer' command specify ++defaults for all the dialers in the file. All commands after a ++`dialer' command up to the next `dialer' command are associated with ++the named dialer. ++ ++`dialer STRING' ++ Introduces and names a dialer. ++ ++`chat STRINGS' ++ ++`chat-timeout NUMBER' ++ ++`chat-fail STRING' ++ ++`chat-seven-bit BOOLEAN' ++ ++`chat-program STRINGS' ++ Specify a chat script to be used to dial the phone. This chat ++ script is used before the login chat script in the `sys' file, if ++ any (*note Logging In::). For full details on chat scripts, see ++ *note Chat Scripts::. ++ ++ The `uucico' daemon will sleep for one second between attempts to ++ dial out on a modem. If your modem requires a longer wait period, ++ you must start your chat script with delays (`\d' in a send ++ string). ++ ++ The chat script will be read from and sent to the port specified ++ by the `dial-device' command for the port, if there is one. ++ ++ The following escape addition escape sequences may appear in send ++ strings: ++ ++ `\D' ++ send phone number without dialcode translation ++ ++ `\T' ++ send phone number with dialcode translation ++ ++ See the description of the dialcodes file (*note Configuration ++ File Names::) for a description of dialcode translation. ++ ++ If both the port and the dialer support carrier, as set by the ++ `carrier' command in the port file and the `carrier' command in ++ the dialer file, then every chat script implicitly begins with ++ `\M' and ends with `\m'. ++ ++ There is no default chat script for dialers. ++ ++ The following additional escape sequences may be used in ++ `chat-program': ++ ++ `\D' ++ phone number without dialcode translation ++ ++ `\T' ++ phone number with dialcode translation ++ ++ If the program changes the port in any way (e.g., sets parity) the ++ changes will be preserved during protocol negotiation, but once the ++ protocol is selected it will change the port settings. ++ ++`dialtone STRING' ++ A string to output when dialing the phone number which causes the ++ modem to wait for a secondary dial tone. This is used to ++ translate the `=' character in a phone number. The default is a ++ comma. ++ ++`pause STRING' ++ A string to output when dialing the phone number which causes the ++ modem to wait for 1 second. This is used to translate the `-' ++ character in a phone number. The default is a comma. ++ ++`carrier BOOLEAN' ++ An argument of true means that the dialer supports the modem ++ carrier signal. After the phone number is dialed, `uucico' will ++ require that carrier be on. One some systems, it will be able to ++ wait for it. If the argument is false, carrier will not be ++ required. The default is true. ++ ++`carrier-wait NUMBER' ++ If the port is supposed to wait for carrier, this may be used to ++ indicate how many seconds to wait. The default is 60 seconds. ++ Only some systems support waiting for carrier. ++ ++`dtr-toggle BOOLEAN BOOLEAN' ++ If the first argument is true, then DTR is toggled before using ++ the modem. This is only supported on some systems and some ports. ++ The second BOOLEAN need not be present; if it is, and it is true, ++ the program will sleep for 1 second after toggling DTR. The ++ default is to not toggle DTR. ++ ++`complete-chat STRINGS' ++ ++`complete-chat-timeout NUMBER' ++ ++`complete-chat-fail STRING' ++ ++`complete-chat-seven-bit BOOLEAN' ++ ++`complete-chat-program STRINGS' ++ These commands define a chat script (*note Chat Scripts::) which ++ is run when a call is finished normally. This allows the modem to ++ be reset. There is no default. No additional escape sequences ++ may be used. ++ ++`complete STRING' ++ This is a simple use of `complete-chat'. It is equivalent to ++ `complete-chat "" STRING'; this has the effect of sending STRING ++ to the modem when a call finishes normally. ++ ++`abort-chat STRINGS' ++ ++`abort-chat-timeout NUMBER' ++ ++`abort-chat-fail STRING' ++ ++`abort-chat-seven-bit BOOLEAN' ++ ++`abort-chat-program STRINGS' ++ These commands define a chat script (*note Chat Scripts::) to be ++ run when a call is aborted. They may be used to interrupt and ++ reset the modem. There is no default. No additional escape ++ sequences may be used. ++ ++`abort STRING' ++ This is a simple use of `abort-chat'. It is equivalent to ++ `abort-chat "" STRING'; this has the effect of sending STRING to ++ the modem when a call is aborted. ++ ++`protocol-parameter CHARACTER STRINGS' ++ Set protocol parameters, just like the `protocol-parameter' command ++ in the system configuration file or the port configuration file; ++ see *note Protocol Selection::. These parameters take precedence, ++ then those for the port, then those for the system. ++ ++`seven-bit BOOLEAN' ++ This is only used during protocol negotiation; if it is true, it ++ forces selection of a protocol which works across a seven-bit ++ link. It does not prevent eight bit characters from being ++ transmitted. The default is false. It would be more common to ++ specify this for a port than for a dialer. ++ ++`reliable BOOLEAN' ++ This is only used during protocol negotiation; if it is false, it ++ forces selection of a protocol which works across an unreliable ++ communication link. The default is true. ++ ++`half-duplex BOOLEAN [ any type ]' ++ If the argument is true, it means that the dialer only supports ++ half-duplex connections. This only affects bidirectional ++ protocols, and causes them to not do bidirectional transfers. ++ ++ ++ ++File: uucp.info, Node: UUCP Over TCP, Next: Security, Prev: dial File, Up: Configuration Files ++ ++5.10 UUCP Over TCP ++================== ++ ++If your system has a Berkeley style socket library, or a System V style ++TLI interface library, you can compile the code to permit making ++connections over TCP. Specifying that a system should be reached via ++TCP is easy, but nonobvious. ++ ++* Menu: ++ ++* TCP Client:: Connecting to Another System Over TCP ++* TCP Server:: Running a TCP Server ++ ++ ++File: uucp.info, Node: TCP Client, Next: TCP Server, Prev: UUCP Over TCP, Up: UUCP Over TCP ++ ++5.10.1 Connecting to Another System Over TCP ++-------------------------------------------- ++ ++If you are using the new style configuration files (*note Configuration ++Files::), add the line `port type tcp' to the entry in the `sys' file. ++By default UUCP will get the port number by looking up `uucp' in ++`/etc/services'; if the `uucp' service is not defined, port 540 will be ++used. You can set the port number to use with the command `port ++service XXX', where XXX can be either a number or a name to look up in ++`/etc/services'. You can specify the address of the remote host with ++`address A.B.C'; if you don't give an address, the remote system name ++will be used. You should give an explicit chat script for the system ++when you use TCP; the default chat script begins with a carriage ++return, which will not work with some UUCP TCP servers. ++ ++ If you are using V2 configuration files, add a line like this to ++`L.sys': ++ SYS Any TCP uucp HOST.DOMAIN chat-script ++ This will make an entry for system SYS, to be called at any time, ++over TCP, using port number `uucp' (as found in `/etc/services'; this ++may be specified as a number), using remote host `HOST.DOMAIN', with ++some chat script. ++ ++ If you are using HDB configuration files, add a line like this to ++Systems: ++ SYS Any TCP - HOST.DOMAIN chat-script ++ and a line like this to `Devices': ++ TCP uucp - - ++ You only need one line in `Devices' regardless of how many systems ++you contact over TCP. This will make an entry for system SYS, to be ++called at any time, over TCP, using port number `uucp' (as found in ++`/etc/services'; this may be specified as a number), using remote host ++`HOST.DOMAIN', with some chat script. ++ ++ ++File: uucp.info, Node: TCP Server, Prev: TCP Client, Up: UUCP Over TCP ++ ++5.10.2 Running a TCP Server ++--------------------------- ++ ++The `uucico' daemon may be run as a TCP server. To use the default ++port number, which is a reserved port, `uucico' must be invoked by the ++superuser (or it must be set user ID to the superuser, but I don't ++recommend doing that). ++ ++ You must define a port, either using the port file (*note port ++File::), if you are using the new configuration method, or with an ++entry in `Devices' if you are using HDB; there is no way to define a ++port using V2. If you are using HDB the port must be named `TCP'; a ++line as shown above will suffice. You can then start `uucico' as ++`uucico -p TCP' (after the `-p', name the port; in HDB it must be ++`TCP'). This will wait for incoming connections, and fork off a child ++for each one. Each connection will be prompted with `login:' and ++`Password:'; the results will be checked against the UUCP (not the ++system) password file (*note Configuration File Names::). ++ ++ Another way to run a UUCP TCP server is to use the BSD `uucpd' ++program. ++ ++ Yet another way to run a UUCP TCP server is to use `inetd'. Arrange ++for `inetd' to start up `uucico' with the `-l' switch. This will cause ++`uucico' to prompt with `login:' and `Password:' and check the results ++against the UUCP (not the system) password file (you may want to also ++use the `-D' switch to avoid a fork, which in this case is unnecessary). ++ ++ ++File: uucp.info, Node: Security, Prev: UUCP Over TCP, Up: Configuration Files ++ ++5.11 Security ++============= ++ ++This discussion of UUCP security applies only to Unix. It is a bit ++cursory; suggestions for improvement are solicited. ++ ++ UUCP is traditionally not very secure. Taylor UUCP addresses some ++security issues, but is still far from being a secure system. ++ ++ If security is very important to you, then you should not permit any ++external access to your computer, including UUCP. Any opening to the ++outside world is a potential security risk. ++ ++ When local users use UUCP to transfer files, Taylor UUCP can do ++little to secure them from each other. You can allow somewhat increased ++security by putting the owner of the UUCP programs (normally `uucp') ++into a separate group; the use of this is explained in the following ++paragraphs, which refer to this separate group as `uucp-group'. ++ ++ When the `uucp' program is invoked to copy a file to a remote ++system, it will, by default, copy the file into the UUCP spool ++directory. When the `uux' program is used, the `-C' switch must be ++used to copy the file into the UUCP spool directory. In any case, once ++the file has been copied into the spool directory, other local users ++will not be able to access it. ++ ++ When a file is requested from a remote system, UUCP will only permit ++it to be placed in a directory which is writable by the requesting user. ++The directory must also be writable by UUCP. A local user can create a ++directory with a group of `uucp-group' and set the mode to permit group ++write access. This will allow the file be requested without permitting ++it to be viewed by any other user. ++ ++ There is no provision for security for `uucp' requests (as opposed ++to `uux' requests) made by a user on a remote system. A file sent over ++by a remote request may only be placed in a directory which is world ++writable, and the file will be world readable and writable. This will ++permit any local user to destroy or replace the contents of the file. ++A file requested by a remote system must be world readable, and the ++directory it is in must be world readable. Any local user will be able ++to examine, although not necessarily modify, the file before it is sent. ++ ++ There are some security holes and race conditions that apply to the ++above discussion which I will not elaborate on. They are not hidden ++from anybody who reads the source code, but they are somewhat technical ++and difficult (though scarcely impossible) to exploit. Suffice it to ++say that even under the best of conditions UUCP is not completely ++secure. ++ ++ For many sites, security from remote sites is a more important ++consideration. Fortunately, Taylor UUCP does provide some support in ++this area. ++ ++ The greatest security is provided by always dialing out to the other ++site. This prevents anybody from pretending to be the other site. Of ++course, only one side of the connection can do this. ++ ++ If remote dialins must be permitted, then it is best if the dialin ++line is used only for UUCP. If this is the case, then you should ++create a call-in password file (*note Configuration File Names::) and ++let `uucico' do its own login prompting. For example, to let remote ++sites log in on a port named `entry' in the port file (*note port ++File::), you might invoke `uucico -e -p entry'. This would cause ++`uucico' to enter an endless loop of login prompts and daemon ++executions. The advantage of this approach is that even if remote users ++break into the system by guessing or learning the password, they will ++only be able to do whatever `uucico' permits them to do. They will not ++be able to start a shell on your system. ++ ++ If remote users can dial in and log on to your system, then you have ++a security hazard more serious than that posed by UUCP. But then, you ++probably knew that already. ++ ++ Once your system has connected with the remote UUCP, there is a fair ++amount of control you can exercise. You can use the `remote-send' and ++`remote-receive' commands to control the directories the remote UUCP ++can access. You can use the `request' command to prevent the remote ++UUCP from making any requests of your system at all; however, if you do ++this it will not even be able to send you mail or news. If you do ++permit remote requests, you should be careful to restrict what commands ++may be executed at the remote system's request. The default is `rmail' ++and `rnews', which will suffice for most systems. ++ ++ If different remote systems call in and they must be granted ++different privileges (perhaps some systems are within the same ++organization and some are not) then the `called-login' command should ++be used for each system to require that they use different login names. ++Otherwise, it would be simple for a remote system to use the `myname' ++command and pretend to be a different system. The `sequence' command ++can be used to detect when one system pretended to be another, but, ++since the sequence numbers must be reset manually after a failed ++handshake, this can sometimes be more trouble than it's worth. ++ ++ ++File: uucp.info, Node: Protocols, Next: Hacking, Prev: Configuration Files, Up: Top ++ ++6 UUCP Protocol Internals ++************************* ++ ++This chapter describes how the various UUCP protocols work, and ++discusses some other internal UUCP issues. ++ ++ This chapter is quite technical. You do not need to understand it, ++or even read it, in order to use Taylor UUCP. It is intended for people ++who are interested in how the UUCP code works. ++ ++ The information in this chapter is posted monthly to the Usenet ++newsgroups `comp.mail.uucp', `news.answers', and `comp.answers'. The ++posting is available from any `news.answers' archive site, such as ++`rtfm.mit.edu'. If you plan to use this information to write a UUCP ++program, please make sure you get the most recent version of the ++posting, in case there have been any corrections. ++ ++* Menu: ++ ++* UUCP Protocol Sources:: Sources for UUCP Protocol Information ++* UUCP Grades:: UUCP Grades ++* UUCP Lock Files:: UUCP Lock Files ++* Execution File Format:: Execution File Format ++* UUCP Protocol:: UUCP Protocol ++* g Protocol:: g protocol ++* f Protocol:: f protocol ++* t Protocol:: t protocol ++* e Protocol:: e protocol ++* Big G Protocol:: G protocol ++* i Protocol:: i protocol ++* j Protocol:: j protocol ++* x Protocol:: x protocol ++* y Protocol:: y protocol ++* d Protocol:: d protocol ++* h Protocol:: h protocol ++* v Protocol:: v protocol ++ ++ ++File: uucp.info, Node: UUCP Protocol Sources, Next: UUCP Grades, Prev: Protocols, Up: Protocols ++ ++6.1 UUCP Protocol Sources ++========================= ++ ++ "Unix-to-Unix Copy Program," said PDP-1. "You will never find a ++ more wretched hive of bugs and flamers. We must be cautious." ++ --DECWars ++ ++I took a lot of the information from Jamie E. Hanrahan's paper in the ++Fall 1990 DECUS Symposium, and from `Managing UUCP and Usenet' by Tim ++O'Reilly and Grace Todino (with contributions by several other people). ++The latter includes most of the former, and is published by ++ O'Reilly & Associates, Inc. ++ 103 Morris Street, Suite A ++ Sebastopol, CA 95472 ++ It is currently in its tenth edition. The ISBN number is ++`0-937175-93-5'. ++ ++ Some information is originally due to a Usenet article by Chuck ++Wegrzyn. The information on execution files comes partially from Peter ++Honeyman. The information on the `g' protocol comes partially from a ++paper by G.L. Chesson of Bell Laboratories, partially from Jamie E. ++Hanrahan's paper, and partially from source code by John Gilmore. The ++information on the `f' protocol comes from the source code by Piet ++Berteema. The information on the `t' protocol comes from the source ++code by Rick Adams. The information on the `e' protocol comes from a ++Usenet article by Matthias Urlichs. The information on the `d' ++protocol comes from Jonathan Clark, who also supplied information about ++QFT. The UUPlus information comes straight from Christopher J. Ambler, ++of UUPlus Development; it applies to version 1.52 and up of the ++shareware version of UUPlus Utilities, called FSUUCP 1.52, but referred ++to in this article as UUPlus. ++ ++ Although there are few books about UUCP, there are many about ++networks and protocols in general. I recommend two non-technical books ++which describe the sorts of things that are available on the network: ++`The Whole Internet', by Ed Krol, and `Zen and the Art of the ++Internet', by Brendan P. Kehoe. Good technical discussions of ++networking issues can be found in `Internetworking with TCP/IP', by ++Douglas E. Comer and David L. Stevens and in `Design and Validation of ++Computer Protocols' by Gerard J. Holzmann. ++ ++ ++File: uucp.info, Node: UUCP Grades, Next: UUCP Lock Files, Prev: UUCP Protocol Sources, Up: Protocols ++ ++6.2 UUCP Grades ++=============== ++ ++Modern UUCP packages support a priority grade for each command. The ++grades generally range from `A' (the highest) to `Z' followed by `a' to ++`z'. Some UUCP packages (including Taylor UUCP) also support `0' to ++`9' before `A'. Some UUCP packages may permit any ASCII character as a ++grade. ++ ++ On Unix, these grades are encoded in the name of the command file ++created by `uucp' or `uux'. A command file name generally has the form ++`C.nnnngssss' where `nnnn' is the remote system name for which the ++command is queued, `g' is a single character grade, and `ssss' is a ++four character sequence number. For example, a command file created ++for the system `airs' at grade `Z' might be named `C.airsZ2551'. ++ ++ The remote system name will be truncated to seven characters, to ++ensure that the command file name will fit in the 14 character file ++name limit of the traditional Unix file system. UUCP packages which ++have no other means of distinguishing which command files are intended ++for which systems thus require all systems they connect to to have ++names that are unique in the first seven characters. Some UUCP ++packages use a variant of this format which truncates the system name ++to six characters. HDB and Taylor UUCP use a different spool directory ++format, which allows up to fourteen characters to be used for each ++system name. ++ ++ The sequence number in the command file name may be a decimal ++integer, or it may be a hexadecimal integer, or it may contain any ++alphanumeric character. Different UUCP packages are different. Taylor ++UUCP uses any alphanumeric character. ++ ++ UUPlus Utilities (as FSUUCP, a shareware DOS based UUCP and news ++package) uses up to 8 characters for file names in the spool (this is a ++DOS file system limitation; actually, with the extension, 11 characters ++are available, but FSUUCP reserves that for future use). FSUUCP ++defaults mail to grade `D', and news to grade `N', except that when the ++grade of incoming mail can be determined, that grade is preserved if ++the mail is forwarded to another system. The default grades may be ++changed by editing the `LIB/MAILRC' file for mail, or the `UUPLUS.CFG' ++file for news. ++ ++ UUPC/extended for DOS, OS/2 and Windows NT handles mail at grade ++`C', news at grade `d', and file transfers at grade `n'. The ++UUPC/extended `UUCP' and `RMAIL' commands accept grades to override the ++default, the others do not. ++ ++ I do not know how command grades are handled in other non-Unix UUCP ++packages. ++ ++ Modern UUCP packages allow you to restrict file transfer by grade ++depending on the time of day. Typically this is done with a line in ++the `Systems' (or `L.sys') file like this: ++ airs Any/Z,Any2305-0855 ... ++ This allows grades `Z' and above to be transferred at any time. ++Lower grades may only be transferred at night. I believe that this ++grade restriction applies to local commands as well as to remote ++commands, but I am not sure. It may only apply if the UUCP package ++places the call, not if it is called by the remote system. ++ ++ Taylor UUCP can use the `timegrade' and `call-timegrade' commands to ++achieve the same effect. *Note When to Call::. It supports the above ++format when reading `Systems' or `L.sys'. ++ ++ UUPC/extended provides the `symmetricgrades' option to announce the ++current grade in effect when calling the remote system. ++ ++ UUPlus allows specification of the highest grade accepted on a ++per-call basis with the `-g' option in `UUCICO'. ++ ++ This sort of grade restriction is most useful if you know what grades ++are being used at the remote site. The default grades used depend on ++the UUCP package. Generally `uucp' and `uux' have different defaults. ++A particular grade can be specified with the `-g' option to `uucp' or ++`uux'. For example, to request execution of `rnews' on `airs' with ++grade `d', you might use something like ++ uux -gd - airs!rnews < article ++ ++ Uunet queues up mail at grade `C', but increases the grade based on ++the size. News is queued at grade `d', and file transfers at grade ++`n'. The example above would allow mail (below some large size) to be ++received at any time, but would only permit news to be transferred at ++night. ++ ++ ++File: uucp.info, Node: UUCP Lock Files, Next: Execution File Format, Prev: UUCP Grades, Up: Protocols ++ ++6.3 UUCP Lock Files ++=================== ++ ++This discussion applies only to Unix. I have no idea how UUCP locks ++ports on other systems. ++ ++ UUCP creates files to lock serial ports and systems. On most, if not ++all, systems, these same lock files are also used by `cu' to coordinate ++access to serial ports. On some systems `getty' also uses these lock ++files, often under the name `uugetty'. ++ ++ The lock file normally contains the process ID of the locking ++process. This makes it easy to determine whether a lock is still ++valid. The algorithm is to create a temporary file and then link it to ++the name that must be locked. If the link fails because a file with ++that name already exists, the existing file is read to get the process ++ID. If the process still exists, the lock attempt fails. Otherwise ++the lock file is deleted and the locking algorithm is retried. ++ ++ Older UUCP packages put the lock files in the main UUCP spool ++directory, `/usr/spool/uucp'. HDB UUCP generally puts the lock files ++in a directory of their own, usually `/usr/spool/locks' or `/etc/locks'. ++ ++ The original UUCP lock file format encodes the process ID as a four ++byte binary number. The order of the bytes is host-dependent. HDB UUCP ++stores the process ID as a ten byte ASCII decimal number, with a ++trailing newline. For example, if process 1570 holds a lock file, it ++would contain the eleven characters space, space, space, space, space, ++space, one, five, seven, zero, newline. Some versions of UUCP add a ++second line indicating which program created the lock (`uucp', `cu', or ++`getty/uugetty'). I have also seen a third type of UUCP lock file ++which does not contain the process ID at all. ++ ++ The name of the lock file is traditionally `LCK..' followed by the ++base name of the device. For example, to lock `/dev/ttyd0' the file ++`LCK..ttyd0' would be created. On SCO Unix, the last letter of the ++lock file name is always forced to lower case even if the device name ++ends with an upper case letter. ++ ++ System V Release 4 UUCP names the lock file using the major and minor ++device numbers rather than the device name. The file is named ++`LK.XXX.YYY.ZZZ', where XXX, YYY and ZZZ are all three digit decimal ++numbers. XXX is the major device number of the device holding the ++directory holding the device file (e.g., `/dev'). YYY is the major ++device number of the device file itself. ZZZ is the minor device ++number of the device file itself. If `s' holds the result of passing ++the device to the stat system call (e.g., `stat ("/dev/ttyd0", &s)'), ++the following line of C code will print out the corresponding lock file ++name: ++ printf ("LK.%03d.%03d.%03d", major (s.st_dev), ++ major (s.st_rdev), minor (s.st_rdev)); ++ The advantage of this system is that even if there are several links ++to the same device, they will all use the same lock file name. ++ ++ When two or more instances of `uuxqt' are executing, some sort of ++locking is needed to ensure that a single execution job is only started ++once. I don't know how most UUCP packages deal with this. Taylor UUCP ++uses a lock file for each execution job. The name of the lock file is ++the same as the name of the `X.*' file, except that the initial `X' is ++changed to an `L'. The lock file holds the process ID as described ++above. ++ ++ ++File: uucp.info, Node: Execution File Format, Next: UUCP Protocol, Prev: UUCP Lock Files, Up: Protocols ++ ++6.4 Execution File Format ++========================= ++ ++UUCP `X.*' files control program execution. They are created by `uux'. ++They are transferred between systems just like any other file. The ++`uuxqt' daemon reads them to figure out how to execute the job ++requested by `uux'. ++ ++ An `X.*' file is simply a text file. The first character of each ++line is a command, and the remainder of the line supplies arguments. ++The following commands are defined: ++ ++`C command' ++ This gives the command to execute, including the program and all ++ arguments. For example, `rmail ian@airs.com'. ++ ++`U user system' ++ This names the user who requested the command, and the system from ++ which the request came. ++ ++`I standard-input' ++ This names the file from which standard input is taken. If no ++ standard input file is given, the standard input will probably be ++ attached to `/dev/null'. If the standard input file is not from ++ the system on which the execution is to occur, it will also appear ++ in an `F' command. ++ ++`O standard-output [system]' ++ This names the standard output file. The optional second argument ++ names the system to which the file should be sent. If there is no ++ second argument, the file should be created on the executing ++ system. ++ ++`F required-file [filename-to-use]' ++ The `F' command can appear multiple times. Each `F' command names ++ a file which must exist before the execution can proceed. This ++ will usually be a file which is transferred from the system on ++ which `uux' was executed, but it can also be a file from the local ++ system or some other system. If the file is not from the local ++ system, then the command will usually name a file in the spool ++ directory. If the optional second argument appears, then the file ++ should be copied to the execution directory under that name. This ++ is necessary for any file other than the standard input file. If ++ the standard input file is not from the local system, it will ++ appear in both an `F' command and an `I' command. ++ ++`R requestor-address' ++ This is the address to which mail about the job should be sent. ++ It is relative to the system named in the `U' command. If the `R' ++ command does not appear, then mail is sent to the user named in the ++ `U' command. ++ ++`Z' ++ This command takes no arguments. It means that a mail message ++ should be sent if the command failed. This is the default ++ behaviour for most modern UUCP packages, and for them the `Z' ++ command does not actually do anything. ++ ++`N' ++ This command takes no arguments. It means that no mail message ++ should be sent, even if the command failed. ++ ++`n' ++ This command takes no arguments. It means that a mail message ++ should be sent if the command succeeded. Normally a message is ++ sent only if the command failed. ++ ++`B' ++ This command takes no arguments. It means that the standard input ++ should be returned with any error message. This can be useful in ++ cases where the input would otherwise be lost. ++ ++`e' ++ This command takes no arguments. It means that the command should ++ be processed with `/bin/sh'. For some packages this is the default ++ anyhow. Most packages will refuse to execute complex commands or ++ commands containing wildcards, because of the security holes this ++ opens. ++ ++`E' ++ This command takes no arguments. It means that the command should ++ be processed with the `execve' system call. For some packages ++ this is the default anyhow. ++ ++`M status-file' ++ This command means that instead of mailing a message, the message ++ should be copied to the named file on the system named by the `U' ++ command. ++ ++`Q' ++ This command takes no arguments. It means that the string ++ arguments to all the other commands are backslash quoted. Any ++ backslash in one of the strings should be followed by either a ++ backslash or three octal digits. The backslash quoting is ++ interpreted as in a C string. If the `Q' command does not appear, ++ backslashes in the strings are not treated specially. The `Q' ++ command was introduced in Taylor UUCP version 1.07. ++ ++`# comment' ++ This command is ignored, as is any other unrecognized command. ++ ++ Here is an example. Given the following command executed on system ++test1 ++ uux - test2!cat - test2!~ian/bar !qux '>~/gorp' ++ (this is only an example, as most UUCP systems will not permit the ++cat command to be executed) Taylor UUCP will produce something like the ++following `X.' file: ++ U ian test1 ++ F D.test1N003r qux ++ O /usr/spool/uucppublic/gorp test1 ++ F D.test1N003s ++ I D.test1N003s ++ C cat - ~ian/bar qux ++ The standard input will be read into a file and then transferred to ++the file `D.test1N003s' on system `test2'. The file `qux' will be ++transferred to `D.test1N003r' on system `test2'. When the command is ++executed, the latter file will be copied to the execution directory ++under the name `qux'. Note that since the file `~ian/bar' is already ++on the execution system, no action need be taken for it. The standard ++output will be collected in a file, then copied to the file ++`/usr/spool/uucppublic/gorp' on the system `test1'. ++ ++ ++File: uucp.info, Node: UUCP Protocol, Next: g Protocol, Prev: Execution File Format, Up: Protocols ++ ++6.5 UUCP Protocol ++================= ++ ++The UUCP protocol is a conversation between two UUCP packages. A UUCP ++conversation consists of three parts: an initial handshake, a series of ++file transfer requests, and a final handshake. ++ ++* Menu: ++ ++* The Initial Handshake:: The Initial Handshake ++* UUCP Protocol Commands:: UUCP Protocol Commands ++* The Final Handshake:: The Final Handshake ++ ++ ++File: uucp.info, Node: The Initial Handshake, Next: UUCP Protocol Commands, Prev: UUCP Protocol, Up: UUCP Protocol ++ ++6.5.1 The Initial Handshake ++--------------------------- ++ ++Before the initial handshake, the caller will usually have logged in the ++called machine and somehow started the UUCP package there. On Unix this ++is normally done by setting the shell of the login name used to ++`/usr/lib/uucp/uucico'. ++ ++ All messages in the initial handshake begin with a `^P' (a byte with ++the octal value `\020') and end with a null byte (`\000'). A few ++systems end these messages with a line feed character (`\012') instead ++of a null byte; the examples below assume a null byte is being used. ++ ++ Some options below are supported by QFT, which stands for Queued File ++Transfer, and is (or was) an internal Bell Labs version of UUCP. ++ ++ Taylor UUCP size negotiation was introduced by Taylor UUCP, and is ++also supported by DOS based UUPlus and Amiga based wUUCP and UUCP-1.17. ++ ++ The initial handshake goes as follows. It is begun by the called ++machine. ++ ++called: `\020Shere=hostname\000' ++ The hostname is the UUCP name of the called machine. Older UUCP ++ packages do not output it, and simply send `\020Shere\000'. ++ ++caller: `\020Shostname options\000' ++ The hostname is the UUCP name of the calling machine. The ++ following options may appear (or there may be none): ++ ++ `-QSEQ' ++ Report sequence number for this conversation. The sequence ++ number is stored at both sites, and incremented after each ++ call. If there is a sequence number mismatch, something has ++ gone wrong (somebody may have broken security by pretending ++ to be one of the machines) and the call is denied. If the ++ sequence number changes on one of the machines, perhaps ++ because of an attempted breakin or because a disk backup was ++ restored, the sequence numbers on the two machines must be ++ reconciled manually. ++ ++ `-xLEVEL' ++ Requests the called system to set its debugging level to the ++ specified value. This is not supported by all systems. ++ ++ `-pGRADE' ++ `-vgrade=GRADE' ++ Requests the called system to only transfer files of the ++ specified grade or higher. This is not supported by all ++ systems. Some systems support `-p', some support `-vgrade='. ++ UUPlus allows either `-p' or `-v' to be specified on a ++ per-system basis in the `SYSTEMS' file (`gradechar' option). ++ ++ `-R' ++ Indicates that the calling UUCP understands how to restart ++ failed file transmissions. Supported only by System V ++ Release 4 UUCP, QFT, and Taylor UUCP. ++ ++ `-ULIMIT' ++ Reports the ulimit value of the calling UUCP. The limit is ++ specified as a base 16 number in C notation (e.g., ++ `-U0x1000000'). This number is the number of 512 byte blocks ++ in the largest file which the calling UUCP can create. The ++ called UUCP may not transfer a file larger than this. ++ Supported only by System V Release 4 UUCP, QFT and UUPlus. ++ UUPlus reports the lesser of the available disk space on the ++ spool directory drive and the ulimit variable in ++ `UUPLUS.CFG'. Taylor UUCP understands this option, but does ++ not generate it. ++ ++ `-N[NUMBER]' ++ Indicates that the calling UUCP understands the Taylor UUCP ++ size negotiation extension. Not supported by traditional ++ UUCP packages. Supported by UUPlus. The optional number is ++ a bitmask of features supported by the calling UUCP, and is ++ described below. ++ ++called: `\020ROK\000' ++ There are actually several possible responses. ++ `ROK' ++ The calling UUCP is acceptable, and the handshake proceeds to ++ the protocol negotiation. Some options may also appear; see ++ below. ++ ++ `ROKN[NUMBER]' ++ The calling UUCP is acceptable, it specified `-N', and the ++ called UUCP also understands the Taylor UUCP size limiting ++ extensions. The optional number is a bitmask of features ++ supported by the called UUCP, and is described below. ++ ++ `RLCK' ++ The called UUCP already has a lock for the calling UUCP, ++ which normally indicates the two machines are already ++ communicating. ++ ++ `RCB' ++ The called UUCP will call back. This may be used to avoid ++ impostors (but only one machine out of each pair should call ++ back, or no conversation will ever begin). ++ ++ `RBADSEQ' ++ The call sequence number is wrong (see the `-Q' discussion ++ above). ++ ++ `RLOGIN' ++ The calling UUCP is using the wrong login name. ++ ++ `RYou are unknown to me' ++ The calling UUCP is not known to the called UUCP, and the ++ called UUCP does not permit connections from unknown systems. ++ Some versions of UUCP just drop the line rather than sending ++ this message. ++ ++ If the response is `ROK', the following options are supported by ++ System V Release 4 UUCP and QFT. ++ `-R' ++ The called UUCP knows how to restart failed file ++ transmissions. ++ ++ `-ULIMIT' ++ Reports the ulimit value of the called UUCP. The limit is ++ specified as a base 16 number in C notation. This number is ++ the number of 512 byte blocks in the largest file which the ++ called UUCP can create. The calling UUCP may not send a file ++ larger than this. Also supported by UUPlus. Taylor UUCP ++ understands this option, but does not generate it. ++ ++ `-xLEVEL' ++ I'm not sure just what this means. It may request the ++ calling UUCP to set its debugging level to the specified ++ value. ++ ++ If the response is not `ROK' (or `ROKN') both sides hang up the ++ phone, abandoning the call. ++ ++called: `\020Pprotocols\000' ++ Note that the called UUCP outputs two strings in a row. The ++ protocols string is a list of UUCP protocols supported by the ++ caller. Each UUCP protocol has a single character name. These ++ protocols are discussed in more detail later in this document. ++ For example, the called UUCP might send `\020Pgf\000'. ++ ++caller: `\020Uprotocol\000' ++ The calling UUCP selects which protocol to use out of the protocols ++ offered by the called UUCP. If there are no mutually supported ++ protocols, the calling UUCP sends `\020UN\000' and both sides hang ++ up the phone. Otherwise the calling UUCP sends something like ++ `\020Ug\000'. ++ ++ Most UUCP packages will consider each locally supported protocol in ++turn and select the first one supported by the called UUCP. With some ++versions of HDB UUCP, this can be modified by giving a list of protocols ++after the device name in the `Devices' file or the `Systems' file. For ++example, to select the `e' protocol in `Systems', ++ airs Any ACU,e ... ++ or in Devices, ++ ACU,e ttyXX ... ++ Taylor UUCP provides the `protocol' command which may be used either ++for a system (*note Protocol Selection::) or a port (*note port File::). ++UUPlus allows specification of the protocol string on a per-system basis ++in the `SYSTEMS' file. ++ ++ The optional number following a `-N' sent by the calling system, or ++an `ROKN' sent by the called system, is a bitmask of features supported ++by the UUCP package. The optional number was introduced in Taylor UUCP ++version 1.04. The number is sent as an octal number with a leading ++zero. The following bits are currently defined. A missing number ++should be taken as `011'. ++ ++`01' ++ UUCP supports size negotiation. ++ ++`02' ++ UUCP supports file restart. ++ ++`04' ++ UUCP supports the `E' command. ++ ++`010' ++ UUCP requires the file size in the `S' and `R' commands to be in ++ base 10. This bit is used by default if no number appears, but ++ should not be explicitly sent. ++ ++`020' ++ UUCP expects a dummy string between the notify field and the size ++ field in an `S' command. This is true of SVR4 UUCP. This bit ++ should not be used. ++ ++`040' ++ UUCP supports the `q' option in the `S', `R', `X', and `E' ++ commands. ++ ++ After the protocol has been selected and the initial handshake has ++been completed, both sides turn on the selected protocol. For some ++protocols (notably `g') a further handshake is done at this point. ++ ++ ++File: uucp.info, Node: UUCP Protocol Commands, Next: The Final Handshake, Prev: The Initial Handshake, Up: UUCP Protocol ++ ++6.5.2 UUCP Protocol Commands ++---------------------------- ++ ++Each protocol supports a method for sending a command to the remote ++system. This method is used to transmit a series of commands between ++the two UUCP packages. At all times, one package is the master and the ++other is the slave. Initially, the calling UUCP is the master. ++ ++ If a protocol error occurs during the exchange of commands, both ++sides move immediately to the final handshake. ++ ++ The master will send one of five commands: `S', `R', `X', `E', or ++`H'. ++ ++ Any file name referred to below is either an absolute file name ++beginning with `/', a public directory file name beginning with `~/', a ++file name relative to a user's home directory beginning with `~USER/', ++or a spool directory file name. File names in the spool directory are ++not absolute, but instead are converted to file names within the spool ++directory by UUCP. They always begin with `C.' (for a command file ++created by `uucp' or `uux'), `D.' (for a data file created by `uucp', ++`uux' or by an execution, or received from another system for an ++execution), or `X.' (for an execution file created by `uux' or received ++from another system). ++ ++ All the commands other than the `H' command support options. The ++`q' option indicates that the command argument strings are backslash ++quoted. If the `q' option appears, then any backslash in one of the ++arguments should be followed by either a backslash or three octal ++digits. The backslash quoting is interpreted as in a C string. If the ++`q' option does not appear, backslashes in the strings are not treated ++specially. The `q' option was introduced in Taylor UUCP version 1.07. ++ ++* Menu: ++ ++* The S Command:: The S Command ++* The R Command:: The R Command ++* The X Command:: The X Command ++* The E Command:: The E Command ++* The H Command:: The H Command ++ ++ ++File: uucp.info, Node: The S Command, Next: The R Command, Prev: UUCP Protocol Commands, Up: UUCP Protocol Commands ++ ++6.5.2.1 The S Command ++..................... ++ ++master: `S FROM TO USER -OPTIONS TEMP MODE NOTIFY SIZE' ++ The `S' and the `-' are literal characters. This is a request by ++ the master to send a file to the slave. ++ ++ FROM ++ The name of the file to send. If the `C' option does not ++ appear in OPTIONS, the master will actually open and send ++ this file. Otherwise the file has been copied to the spool ++ directory, where it is named TEMP. The slave ignores this ++ field unless TO is a directory, in which case the basename of ++ FROM will be used as the file name. If FROM is a spool ++ directory filename, it must be a data file created for or by ++ an execution, and must begin with `D.'. ++ ++ TO ++ The name to give the file on the slave. If this field names ++ a directory the file is placed within that directory with the ++ basename of FROM. A name ending in `/' is taken to be a ++ directory even if one does not already exist with that name. ++ If TO begins with `X.', an execution file will be created on ++ the slave. Otherwise, if TO begins with `D.' it names a data ++ file to be used by some execution file. Otherwise, TO should ++ not be in the spool directory. ++ ++ USER ++ The name of the user who requested the transfer. ++ ++ OPTIONS ++ A list of options to control the transfer. The following ++ options are defined (all options are single characters): ++ `C' ++ The file has been copied to the spool directory (the ++ master should use TEMP rather than FROM). ++ ++ `c' ++ The file has not been copied to the spool directory ++ (this is the default). ++ ++ `d' ++ The slave should create directories as necessary (this ++ is the default). ++ ++ `f' ++ The slave should not create directories if necessary, ++ but should fail the transfer instead. ++ ++ `m' ++ The master should send mail to USER when the transfer is ++ complete. ++ ++ `n' ++ The slave should send mail to NOTIFY when the transfer is ++ complete. ++ ++ `q' ++ Backslash quoting is applied to the FROM, TO, USER, and ++ NOTIFY arguments. *Note UUCP Protocol Commands::. This ++ option was introduced in Taylor UUCP version 1.07. ++ ++ TEMP ++ If the `C' option appears in OPTIONS, this names the file to ++ be sent. Otherwise if FROM is in the spool directory, TEMP ++ is the same as FROM. Otherwise TEMP may be a dummy string, ++ such as `D.0'. After the transfer has been succesfully ++ completed, the master will delete the file TEMP. ++ ++ MODE ++ This is an octal number giving the mode of the file on the ++ master. If the file is not in the spool directory, the slave ++ will always create it with mode 0666, except that if (MODE & ++ 0111) is not zero (the file is executable), the slave will ++ create the file with mode 0777. If the file is in the spool ++ directory, some UUCP packages will use the algorithm above ++ and some will always create the file with mode 0600. This ++ field is ignored by UUPlus, since it is meaningless on DOS; ++ UUPlus uses 0666 for outgoing files. ++ ++ NOTIFY ++ This field may not be present, and in any case is only ++ meaningful if the `n' option appears in OPTIONS. If the `n' ++ option appears, then, when the transfer is successfully ++ completed, the slave will send mail to NOTIFY, which must be ++ a legal mailing address on the slave. If a SIZE field will ++ appear but the `n' option does not appear, NOTIFY will always ++ be present, typically as the string `dummy' or simply a pair ++ of double quotes. ++ ++ SIZE ++ This field is only present when doing Taylor UUCP or SVR4 ++ UUCP size negotiation. It is the size of the file in bytes. ++ Taylor UUCP version 1.03 sends the size as a decimal integer, ++ while versions 1.04 and up, and all other UUCP packages that ++ support size negotiation, send the size in base 16 with a ++ leading 0x. ++ ++ The slave then responds with an `S' command response. ++ ++ `SY START' ++ The slave is willing to accept the file, and file transfer ++ begins. The START field will only be present when using file ++ restart. It specifies the byte offset into the file at which ++ to start sending. If this is a new file, START will be 0x0. ++ ++ `SN2' ++ The slave denies permission to transfer the file. This can ++ mean that the destination directory may not be accessed, or ++ that no requests are permitted. It implies that the file ++ transfer will never succeed. ++ ++ `SN4' ++ The slave is unable to create the necessary temporary file. ++ This implies that the file transfer might succeed later. ++ ++ `SN6' ++ This is only used by Taylor UUCP size negotiation. It means ++ that the slave considers the file too large to transfer at ++ the moment, but it may be possible to transfer it at some ++ other time. ++ ++ `SN7' ++ This is only used by Taylor UUCP size negotiation. It means ++ that the slave considers the file too large to ever transfer. ++ ++ `SN8' ++ This is only used by Taylor UUCP. It means that the file was ++ already received in a previous conversation. This can happen ++ if the receive acknowledgement was lost after it was sent by ++ the receiver but before it was received by the sender. ++ ++ `SN9' ++ This is only used by Taylor UUCP (versions 1.05 and up) and ++ UUPlus (versions 2.0 and up). It means that the remote ++ system was unable to open another channel (see the discussion ++ of the `i' protocol for more information about channels). ++ This implies that the file transfer might succeed later. ++ ++ `SN10' ++ This is reportedly used by SVR4 UUCP to mean that the file ++ size is too large. ++ ++ If the slave responds with `SY', a file transfer begins. When the ++ file transfer is complete, the slave sends a `C' command response. ++ ++ `CY' ++ The file transfer was successful. ++ ++ `CYM' ++ The file transfer was successful, and the slave wishes to ++ become the master; the master should send an `H' command, ++ described below. ++ ++ `CN5' ++ The temporary file could not be moved into the final ++ location. This implies that the file transfer will never ++ succeed. ++ ++After the `C' command response has been received (in the `SY' case) or ++immediately (in an `SN' case) the master will send another command. ++ ++ ++File: uucp.info, Node: The R Command, Next: The X Command, Prev: The S Command, Up: UUCP Protocol Commands ++ ++6.5.2.2 The R Command ++..................... ++ ++master: `R FROM TO USER -OPTIONS SIZE' ++ The `R' and the `-' are literal characters. This is a request by ++ the master to receive a file from the slave. I do not know how ++ SVR4 UUCP or QFT implement file transfer restart in this case. ++ ++ FROM ++ This is the name of the file on the slave which the master ++ wishes to receive. It must not be in the spool directory, ++ and it may not contain any wildcards. ++ ++ TO ++ This is the name of the file to create on the master. I do ++ not believe that it can be a directory. It may only be in ++ the spool directory if this file is being requested to ++ support an execution either on the master or on some system ++ other than the slave. ++ ++ USER ++ The name of the user who requested the transfer. ++ ++ OPTIONS ++ A list of options to control the transfer. The following ++ options are defined (all options are single characters): ++ `d' ++ The master should create directories as necessary (this ++ is the default). ++ ++ `f' ++ The master should not create directories if necessary, ++ but should fail the transfer instead. ++ ++ `m' ++ The master should send mail to USER when the transfer is ++ complete. ++ ++ `q' ++ Backslash quoting is applied to the FROM, TO, and USER ++ arguments. *Note UUCP Protocol Commands::. This option ++ was introduced in Taylor UUCP version 1.07. ++ ++ SIZE ++ This only appears if Taylor UUCP size negotiation is being ++ used. It specifies the largest file which the master is ++ prepared to accept (when using SVR4 UUCP or QFT, this was ++ specified in the `-U' option during the initial handshake). ++ ++ The slave then responds with an `R' command response. UUPlus does ++ not support `R' requests, and always responds with `RN2'. ++ ++ `RY MODE [SIZE]' ++ The slave is willing to send the file, and file transfer ++ begins. The MODE argument is the octal mode of the file on ++ the slave. The master treats this just as the slave does the ++ MODE argument in the send command, q.v. I am told that SVR4 ++ UUCP sends a trailing SIZE argument. For some versions of ++ BSD UUCP, the MODE argument may have a trailing `M' character ++ (e.g., `RY 0666M'). This means that the slave wishes to ++ become the master. ++ ++ `RN2' ++ The slave is not willing to send the file, either because it ++ is not permitted or because the file does not exist. This ++ implies that the file request will never succeed. ++ ++ `RN6' ++ This is only used by Taylor UUCP size negotiation. It means ++ that the file is too large to send, either because of the ++ size limit specifies by the master or because the slave ++ considers it too large. The file transfer might succeed ++ later, or it might not (this may be cleared up in a later ++ release of Taylor UUCP). ++ ++ `RN9' ++ This is only used by Taylor UUCP (versions 1.05 and up) and ++ FSUUCP (versions 1.5 and up). It means that the remote ++ system was unable to open another channel (see the discussion ++ of the `i' protocol for more information about channels). ++ This implies that the file transfer might succeed later. ++ ++ If the slave responds with `RY', a file transfer begins. When the ++ file transfer is complete, the master sends a `C' command. The ++ slave pretty much ignores this, although it may log it. ++ ++ `CY' ++ The file transfer was successful. ++ ++ `CN5' ++ The temporary file could not be moved into the final location. ++ ++ After the `C' command response has been sent (in the `RY' case) or ++ immediately (in an `RN' case) the master will send another command. ++ ++ ++File: uucp.info, Node: The X Command, Next: The E Command, Prev: The R Command, Up: UUCP Protocol Commands ++ ++6.5.2.3 The X Command ++..................... ++ ++master: `X FROM TO USER -OPTIONS' ++ The `X' and the `-' are literal characters. This is a request by ++ the master to, in essence, execute uucp on the slave. The slave ++ should execute `uucp FROM TO'. ++ ++ FROM ++ This is the name of the file or files on the slave which the ++ master wishes to transfer. Any wildcards are expanded on the ++ slave. If the master is requesting that the files be ++ transferred to itself, the request would normally contain ++ wildcard characters, since otherwise an `R' command would ++ suffice. The master can also use this command to request ++ that the slave transfer files to a third system. ++ ++ TO ++ This is the name of the file or directory to which the files ++ should be transferred. This will normally use a UUCP name. ++ For example, if the master wishes to receive the files ++ itself, it would use `master!path'. ++ ++ USER ++ The name of the user who requested the transfer. ++ ++ OPTIONS ++ A list of options to control the transfer. As far as I know, ++ only one option is defined: ++ `q' ++ Backslash quoting is applied to the FROM, TO, and USER ++ arguments. *Note UUCP Protocol Commands::. This option ++ was introduced in Taylor UUCP version 1.07. ++ ++ The slave then responds with an `X' command response. FSUUCP does ++ not support `X' requests, and always responds with `XN'. ++ ++ `XY' ++ The request was accepted, and the appropriate file transfer ++ commands have been queued up for later processing. ++ ++ `XN' ++ The request was denied. No particular reason is given. ++ ++ In either case, the master will then send another command. ++ ++ ++File: uucp.info, Node: The E Command, Next: The H Command, Prev: The X Command, Up: UUCP Protocol Commands ++ ++6.5.2.4 The E Command ++..................... ++ ++master: `E FROM TO USER -OPTIONS TEMP MODE NOTIFY SIZE COMMAND' ++ The `E' command is only supported by Taylor UUCP 1.04 and up. It ++ is used to make an execution request without requiring a separate ++ `X.*' file. *Note Execution File Format::. It is only used when ++ the command to be executed requires a single input file which is ++ passed to it as standard input. ++ ++ All the fields have the same meaning as they do for an `S' command, ++ except for OPTIONS and COMMAND. ++ ++ OPTIONS ++ A list of options to control the transfer. The following ++ options are defined (all options are single characters): ++ `C' ++ The file has been copied to the spool directory (the ++ master should use TEMP rather than FROM). ++ ++ `c' ++ The file has not been copied to the spool directory ++ (this is the default). ++ ++ `N' ++ No mail message should be sent, even if the command ++ fails. This is the equivalent of the `N' command in an ++ `X.*' file. ++ ++ `Z' ++ A mail message should be sent if the command fails (this ++ is generally the default in any case). This is the ++ equivalent of the `Z' command in an `X.*' file. ++ ++ `R' ++ Mail messages about the execution should be sent to the ++ address in the NOTIFY field. This is the equivalent of ++ the `R' command in an `X.*' file. ++ ++ `e' ++ The execution should be done with `/bin/sh'. This is the ++ equivalent of the `e' command in an `X.*' file. ++ ++ `q' ++ Backslash quoting is applied to the FROM, TO, USER, and ++ NOTIFY arguments. *Note UUCP Protocol Commands::. This ++ option was introduced in Taylor UUCP version 1.07. Note ++ that the COMMAND argument is not backslash quoted--that ++ argument is defined as the remainder of the line, and so ++ is already permitted to contain any character. ++ ++ COMMAND ++ The command which should be executed. This is the equivalent ++ of the `C' command in an `X.*' file. ++ ++ The slave then responds with an `E' command response. These are ++ the same as the `S' command responses, but the initial character is ++ `E' rather than `S'. ++ ++ If the slave responds with `EY', the file transfer begins. When ++ the file transfer is complete, the slave sends a `C' command ++ response, just as for the `S' command. After a successful file ++ transfer, the slave is responsible for arranging for the command ++ to be executed. The transferred file is passed as standard input, ++ as though it were named in the `I' and `F' commands of an `X.*' ++ file. ++ ++ After the `C' command response has been received (in the `EY' ++ case) or immediately (in an `EN' case) the master will send another ++ command. ++ ++ ++File: uucp.info, Node: The H Command, Prev: The E Command, Up: UUCP Protocol Commands ++ ++6.5.2.5 The H Command ++..................... ++ ++master: `H' ++ This is used by the master to hang up the connection. The slave ++ will respond with an `H' command response. ++ ++ `HY' ++ The slave agrees to hang up the connection. In this case the ++ master sends another `HY' command. In some UUCP packages the ++ slave will then send a third `HY' command. At this point the ++ protocol is shut down, and the final handshake is begun. ++ ++ `HN' ++ The slave does not agree to hang up. In this case the master ++ and the slave exchange roles. The next command will be sent ++ by the former slave, which is the new master. The roles may ++ be reversed several times during a single connection. ++ ++ ++File: uucp.info, Node: The Final Handshake, Prev: UUCP Protocol Commands, Up: UUCP Protocol ++ ++6.5.3 The Final Handshake ++------------------------- ++ ++After the protocol has been shut down, the final handshake is performed. ++This handshake has no real purpose, and some UUCP packages simply drop ++the connection rather than do it (in fact, some will drop the connection ++immediately after both sides agree to hangup, without even closing down ++the protocol). ++ ++caller: `\020OOOOOO\000' ++ ++called: `\020OOOOOOO\000' ++ ++ That is, the calling UUCP sends six `O' characters and the called ++UUCP replies with seven `O' characters. Some UUCP packages always send ++six `O' characters. ++ ++ ++File: uucp.info, Node: g Protocol, Next: f Protocol, Prev: UUCP Protocol, Up: Protocols ++ ++6.6 UUCP `g' Protocol ++===================== ++ ++The `g' protocol is a packet based flow controlled error correcting ++protocol that requires an eight bit clear connection. It is the ++original UUCP protocol, and is supported by all UUCP implementations. ++Many implementations of it are only able to support small window and ++packet sizes, specifically a window size of 3 and a packet size of 64 ++bytes, but the protocol itself can support up to a window size of 7 and ++a packet size of 4096 bytes. Complaints about the inefficiency of the ++`g' protocol generally refer to specific implementations, rather than ++to the correctly implemented protocol. ++ ++ The `g' protocol was originally designed for general packet drivers, ++and thus contains some features that are not used by UUCP, including an ++alternate data channel and the ability to renegotiate packet and window ++sizes during the communication session. ++ ++ The `g' protocol is spoofed by many Telebit modems. When spoofing ++is in effect, each Telebit modem uses the `g' protocol to communicate ++with the attached computer, but the data between the modems is sent ++using a Telebit proprietary error correcting protocol. This allows for ++very high throughput over the Telebit connection, which, because it is ++half-duplex, would not normally be able to handle the `g' protocol very ++well at all. When a Telebit is spoofing the `g' protocol, it forces ++the packet size to be 64 bytes and the window size to be 3. ++ ++ This discussion of the `g' protocol explains how it works, but does ++not discuss useful error handling techniques. Some discussion of this ++can be found in Jamie E. Hanrahan's paper, cited above (*note UUCP ++Protocol Sources::). ++ ++ All `g' protocol communication is done with packets. Each packet ++begins with a six byte header. Control packets consist only of the ++header. Data packets contain additional data. ++ ++ The header is as follows: ++ ++`\020' ++ Every packet begins with a `^P'. ++ ++K (1 <= K <= 9) ++ The K value is always 9 for a control packet. For a data packet, ++ the K value indicates how much data follows the six byte header. ++ The amount of data is 2 ** (K + 4), where ** indicates ++ exponentiation. Thus a K value of 1 means 32 data bytes and a K ++ value of 8 means 4096 data bytes. The K value for a data packet ++ must be between 1 and 8 inclusive. ++ ++checksum low byte ++checksum high byte ++ The checksum value is described below. ++ ++control byte ++ The control byte indicates the type of packet, and is described ++ below. ++ ++xor byte ++ This byte is the xor of K, the checksum low byte, the checksum ++ high byte and the control byte (i.e., the second, third, fourth and ++ fifth header bytes). It is used to ensure that the header data is ++ valid. ++ ++ The control byte in the header is composed of three bit fields, ++referred to here as TT (two bits), XXX (three bits) and YYY (three ++bits). The control is TTXXXYYY, or `(TT << 6) + (XXX << 3) + YYY'. ++ ++ The TT field takes on the following values: ++ ++`0' ++ This is a control packet. In this case the K byte in the header ++ must be 9. The XXX field indicates the type of control packet; ++ these types are described below. ++ ++`1' ++ This is an alternate data channel packet. This is not used by ++ UUCP. ++ ++`2' ++ This is a data packet, and the entire contents of the attached data ++ field (whose length is given by the K byte in the header) are ++ valid. The XXX and YYY fields are described below. ++ ++`3' ++ This is a short data packet. Let the length of the data field (as ++ given by the K byte in the header) be L. Let the first byte in ++ the data field be B1. If B1 is less than 128 (if the most ++ significant bit of B1 is 0), then there are `L - B1' valid bytes ++ of data in the data field, beginning with the second byte. If `B1 ++ >= 128', let B2 be the second byte in the data field. Then there ++ are `L - ((B1 & 0x7f) + (B2 << 7))' valid bytes of data in the ++ data field, beginning with the third byte. In all cases L bytes ++ of data are sent (and all data bytes participate in the checksum ++ calculation) but some of the trailing bytes may be dropped by the ++ receiver. The XXX and YYY fields are described below. ++ ++ In a data packet (short or not) the XXX field gives the sequence ++number of the packet. Thus sequence numbers can range from 0 to 7, ++inclusive. The YYY field gives the sequence number of the last ++correctly received packet. ++ ++ Each communication direction uses a window which indicates how many ++unacknowledged packets may be transmitted before waiting for an ++acknowledgement. The window may range from 1 to 7, and may be different ++in each direction. For example, if the window is 3 and the last packet ++acknowledged was packet number 6, packet numbers 7, 0 and 1 may be sent ++but the sender must wait for an acknowledgement before sending packet ++number 2. This acknowledgement could come as the YYY field of a data ++packet, or as the YYY field of a `RJ' or `RR' control packet (described ++below). ++ ++ Each packet must be transmitted in order (the sender may not skip ++sequence numbers). Each packet must be acknowledged, and each packet ++must be acknowledged in order. ++ ++ In a control packet, the XXX field takes on the following values: ++ ++1 `CLOSE' ++ The connection should be closed immediately. This is typically ++ sent when one side has seen too many errors and wants to give up. ++ It is also sent when shutting down the protocol. If an unexpected ++ `CLOSE' packet is received, a `CLOSE' packet should be sent in ++ reply and the `g' protocol should halt, causing UUCP to enter the ++ final handshake. ++ ++2 `RJ' or `NAK' ++ The last packet was not received correctly. The YYY field ++ contains the sequence number of the last correctly received packet. ++ ++3 `SRJ' ++ Selective reject. The YYY field contains the sequence number of a ++ packet that was not received correctly, and should be ++ retransmitted. This is not used by UUCP, and most implementations ++ will not recognize it. ++ ++4 `RR' or `ACK' ++ Packet acknowledgement. The YYY field contains the sequence ++ number of the last correctly received packet. ++ ++5 `INITC' ++ Third initialization packet. The YYY field contains the maximum ++ window size to use. ++ ++6 `INITB' ++ Second initialization packet. The YYY field contains the packet ++ size to use. It requests a size of 2 ** (YYY + 5). Note that ++ this is not the same coding used for the K byte in the packet ++ header (it is 1 less). Most UUCP implementations that request a ++ packet size larger than 64 bytes can handle any packet size up to ++ that specified. ++ ++7 `INITA' ++ First initialization packet. The YYY field contains the maximum ++ window size to use. ++ ++ To compute the checksum, call the control byte (the fifth byte in the ++header) C. ++ ++ The checksum of a control packet is simply `0xaaaa - C'. ++ ++ The checksum of a data packet is `0xaaaa - (CHECK ^ C)', where `^' ++denotes exclusive or, and CHECK is the result of the following routine ++as run on the contents of the data field (every byte in the data field ++participates in the checksum, even for a short data packet). Below is ++the routine used by an early version of Taylor UUCP; it is a slightly ++modified version of a routine which John Gilmore patched from G.L. ++Chesson's original paper. The `z' argument points to the data and the ++`c' argument indicates how much data there is. ++ ++ int ++ igchecksum (z, c) ++ register const char *z; ++ register int c; ++ { ++ register unsigned int ichk1, ichk2; ++ ++ ichk1 = 0xffff; ++ ichk2 = 0; ++ ++ do ++ { ++ register unsigned int b; ++ ++ /* Rotate ichk1 left. */ ++ if ((ichk1 & 0x8000) == 0) ++ ichk1 <<= 1; ++ else ++ { ++ ichk1 <<= 1; ++ ++ichk1; ++ } ++ ++ /* Add the next character to ichk1. */ ++ b = *z++ & 0xff; ++ ichk1 += b; ++ ++ /* Add ichk1 xor the character position in the buffer counting from ++ the back to ichk2. */ ++ ichk2 += ichk1 ^ c; ++ ++ /* If the character was zero, or adding it to ichk1 caused an ++ overflow, xor ichk2 to ichk1. */ ++ if (b == 0 || (ichk1 & 0xffff) < b) ++ ichk1 ^= ichk2; ++ } ++ while (--c > 0); ++ ++ return ichk1 & 0xffff; ++ } ++ ++ When the `g' protocol is started, the calling UUCP sends an `INITA' ++control packet with the window size it wishes the called UUCP to use. ++The called UUCP responds with an `INITA' packet with the window size it ++wishes the calling UUCP to use. Pairs of `INITB' and `INITC' packets ++are then similarly exchanged. When these exchanges are completed, the ++protocol is considered to have been started. ++ ++ Note that the window and packet sizes are not a negotiation. Each ++system announces the window and packet size which the other system ++should use. It is possible that different window and packet sizes will ++be used in each direction. The protocol works this way on the theory ++that each system knows how much data it can accept without getting ++overrun. Therefore, each system tells the other how much data to send ++before waiting for an acknowledgement. ++ ++ When a UUCP package transmits a command, it sends one or more data ++packets. All the data packets will normally be complete, although some ++UUCP packages may send the last one as a short packet. The command ++string is sent with a trailing null byte, to let the receiving package ++know when the command is finished. Some UUCP packages require the last ++byte of the last packet sent to be null, even if the command ends ++earlier in the packet. Some packages may require all the trailing bytes ++in the last packet to be null, but I have not confirmed this. ++ ++ When a UUCP package sends a file, it will send a sequence of data ++packets. The end of the file is signalled by a short data packet ++containing zero valid bytes (it will normally be preceeded by a short ++data packet containing the last few bytes in the file). ++ ++ Note that the sequence numbers cover the entire communication ++session, including both command and file data. ++ ++ When the protocol is shut down, each UUCP package sends a `CLOSE' ++control packet. ++ ++ ++File: uucp.info, Node: f Protocol, Next: t Protocol, Prev: g Protocol, Up: Protocols ++ ++6.7 UUCP `f' Protocol ++===================== ++ ++The `f' protocol is a seven bit protocol which checksums an entire file ++at a time. It only uses the characters between `\040' and `\176' ++(ASCII `space' and `~') inclusive, as well as the carriage return ++character. It can be very efficient for transferring text only data, ++but it is very inefficient at transferring eight bit data (such as ++compressed news). It is not flow controlled, and the checksum is ++fairly insecure over large files, so using it over a serial connection ++requires handshaking (XON/XOFF can be used) and error correcting ++modems. Some people think it should not be used even under those ++circumstances. ++ ++ I believe that the `f' protocol originated in BSD versions of UUCP. ++It was originally intended for transmission over X.25 PAD links. ++ ++ The `f' protocol has no startup or finish protocol. However, both ++sides typically sleep for a couple of seconds before starting up, ++because they switch the terminal into XON/XOFF mode and want to allow ++the changes to settle before beginning transmission. ++ ++ When a UUCP package transmits a command, it simply sends a string ++terminated by a carriage return. ++ ++ When a UUCP package transmits a file, each byte B of the file is ++translated according to the following table: ++ ++ 0 <= B <= 037: 0172, B + 0100 (0100 to 0137) ++ 040 <= B <= 0171: B ( 040 to 0171) ++ 0172 <= B <= 0177: 0173, B - 0100 ( 072 to 077) ++ 0200 <= B <= 0237: 0174, B - 0100 (0100 to 0137) ++ 0240 <= B <= 0371: 0175, B - 0200 ( 040 to 0171) ++ 0372 <= B <= 0377: 0176, B - 0300 ( 072 to 077) ++ ++ That is, a byte between `\040' and `\171' inclusive is transmitted ++as is, and all other bytes are prefixed and modified as shown. ++ ++ When all the file data is sent, a seven byte sequence is sent: two ++bytes of `\176' followed by four ASCII bytes of the checksum as printed ++in base 16 followed by a carriage return. For example, if the checksum ++was 0x1234, this would be sent: `\176\1761234\r'. ++ ++ The checksum is initialized to 0xffff. For each byte that is sent ++it is modified as follows (where B is the byte before it has been ++transformed as described above): ++ ++ /* Rotate the checksum left. */ ++ if ((ichk & 0x8000) == 0) ++ ichk <<= 1; ++ else ++ { ++ ichk <<= 1; ++ ++ichk; ++ } ++ ++ /* Add the next byte into the checksum. */ ++ ichk += B; ++ ++ When the receiving UUCP sees the checksum, it compares it against its ++own calculated checksum and replies with a single character followed by ++a carriage return. ++ ++`G' ++ The file was received correctly. ++ ++`R' ++ The checksum did not match, and the file should be resent from the ++ beginning. ++ ++`Q' ++ The checksum did not match, but too many retries have occurred and ++ the communication session should be abandoned. ++ ++ The sending UUCP checks the returned character and acts accordingly. ++ ++ ++File: uucp.info, Node: t Protocol, Next: e Protocol, Prev: f Protocol, Up: Protocols ++ ++6.8 UUCP `t' Protocol ++===================== ++ ++The `t' protocol is intended for use on links which provide reliable ++end-to-end connections, such as TCP. It does no error checking or flow ++control, and requires an eight bit clear channel. ++ ++ I believe the `t' protocol originated in BSD versions of UUCP. ++ ++ When a UUCP package transmits a command, it first gets the length of ++the command string, C. It then sends `((C / 512) + 1) * 512' bytes ++(the smallest multiple of 512 which can hold C bytes plus a null byte) ++consisting of the command string itself followed by trailing null bytes. ++ ++ When a UUCP package sends a file, it sends it in blocks. Each block ++contains at most 1024 bytes of data. Each block consists of four bytes ++containing the amount of data in binary (most significant byte first, ++the same format as used by the Unix function `htonl') followed by that ++amount of data. The end of the file is signalled by a block containing ++zero bytes of data. ++ ++ ++File: uucp.info, Node: e Protocol, Next: Big G Protocol, Prev: t Protocol, Up: Protocols ++ ++6.9 UUCP `e' Protocol ++===================== ++ ++The `e' protocol is similar to the `t' protocol. It does no flow ++control or error checking and is intended for use over networks ++providing reliable end-to-end connections, such as TCP. ++ ++ The `e' protocol originated in versions of HDB UUCP. ++ ++ When a UUCP package transmits a command, it simply sends the command ++as an ASCII string terminated by a null byte. ++ ++ When a UUCP package transmits a file, it sends the complete size of ++the file as an ASCII decimal number. The ASCII string is padded out to ++20 bytes with null bytes (i.e. if the file is 1000 bytes long, it sends ++`1000\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0'). It then sends the entire file. ++ ++ ++File: uucp.info, Node: Big G Protocol, Next: i Protocol, Prev: e Protocol, Up: Protocols ++ ++6.10 UUCP `G' Protocol ++====================== ++ ++The `G' protocol is used by SVR4 UUCP. It is identical to the `g' ++protocol, except that it is possible to modify the window and packet ++sizes. The SVR4 implementation of the `g' protocol reportedly is fixed ++at a packet size of 64 and a window size of 7. Supposedly SVR4 chose ++to implement a new protocol using a new letter to avoid any potential ++incompatibilities when using different packet or window sizes. ++ ++ Most implementations of the `g' protocol that accept packets larger ++than 64 bytes will also accept packets smaller than whatever they ++requested in the `INITB' packet. The SVR4 `G' implementation is an ++exception; it will only accept packets of precisely the size it ++requests in the INITB packet. ++ ++ ++File: uucp.info, Node: i Protocol, Next: j Protocol, Prev: Big G Protocol, Up: Protocols ++ ++6.11 UUCP `i' Protocol ++====================== ++ ++The `i' protocol was written by Ian Lance Taylor (who also wrote this ++manual). It was first used by Taylor UUCP version 1.04. ++ ++ It is a sliding window packet protocol, like the `g' protocol, but ++it supports bidirectional transfers (i.e., file transfers in both ++directions simultaneously). It requires an eight bit clear connection. ++Several ideas for the protocol were taken from the paper `A ++High-Throughput Message Transport System' by P. Lauder. I don't know ++where the paper was published, but the author's e-mail address is ++. The `i' protocol does not adopt his main idea, ++which is to dispense with windows entirely. This is because some links ++still do require flow control and, more importantly, because using ++windows sets a limit to the amount of data which the protocol must be ++able to resend upon request. To reduce the costs of window ++acknowledgements, the protocol uses a large window and only requires an ++ack at the halfway point. ++ ++ Each packet starts with a six byte header, optionally followed by ++data bytes with a four byte checksum. There are currently five defined ++packet types (`DATA', `SYNC', `ACK', `NAK', `SPOS', `CLOSE') which are ++described below. Although any packet type may include data, any data ++provided with an `ACK', `NAK' or `CLOSE' packet is ignored. ++ ++ Every `DATA', `SPOS' and `CLOSE' packet has a sequence number. The ++sequence numbers are independent for each side. The first packet sent ++by each side is always number 1. Each packet is numbered one greater ++than the previous packet, modulo 32. ++ ++ Every packet has a local channel number and a remote channel number. ++For all packets at least one channel number is zero. When a UUCP ++command is sent to the remote system, it is assigned a non-zero local ++channel number. All packets associated with that UUCP command sent by ++the local system are given the selected local channel number. All ++associated packets sent by the remote system are given the selected ++number as the remote channel number. This permits each UUCP command to ++be uniquely identified by the channel number on the originating system, ++and therefore each UUCP package can associate all file data and UUCP ++command responses with the appropriate command. This is a requirement ++for bidirectional UUCP transfers. ++ ++ The protocol maintains a single global file position, which starts ++at 0. For each incoming packet, any associated data is considered to ++occur at the current file position, and the file position is ++incremented by the amount of data contained. The exception is a packet ++of type `SPOS', which is used to change the file position. The reason ++for keeping track of the file position is described below. ++ ++ The header is as follows: ++ ++`\007' ++ Every packet begins with `^G'. ++ ++`(PACKET << 3) + LOCCHAN' ++ The five bit packet number combined with the three bit local ++ channel number. `DATA', `SPOS' and `CLOSE' packets use the packet ++ sequence number for the PACKET field. `NAK' packet types use the ++ PACKET field for the sequence number to be resent. `ACK' and ++ `SYNC' do not use the PACKET field, and generally leave it set to ++ 0. Packets which are not associated with a UUCP command from the ++ local system use a local channel number of 0. ++ ++`(ACK << 3) + REMCHAN' ++ The five bit packet acknowledgement combined with the three bit ++ remote channel number. The packet acknowledgement is the number ++ of the last packet successfully received; it is used by all packet ++ types. Packets which are not sent in response to a UUCP command ++ from the remote system use a remote channel number of 0. ++ ++`(TYPE << 5) + (CALLER << 4) + LEN1' ++ The three bit packet type combined with the one bit packet ++ direction combined with the upper four bits of the data length. ++ The packet direction bit is always 1 for packets sent by the ++ calling UUCP, and 0 for packets sent by the called UUCP. This ++ prevents confusion caused by echoed packets. ++ ++LEN2 ++ The lower eight bits of the data length. The twelve bits of data ++ length permit packets ranging in size from 0 to 4095 bytes. ++ ++CHECK ++ The exclusive or of the second through fifth bytes of the header. ++ This provides an additional check that the header is valid. ++ ++ If the data length is non-zero, the packet is immediately followed by ++the specified number of data bytes. The data bytes are followed by a ++four byte CRC 32 checksum, with the most significant byte first. The ++CRC is calculated over the contents of the data field. ++ ++ The defined packet types are as follows: ++ ++0 `DATA' ++ This is a plain data packet. ++ ++1 `SYNC' ++ `SYNC' packets are exchanged when the protocol is initialized, and ++ are described further below. `SYNC' packets do not carry sequence ++ numbers (that is, the PACKET field is ignored). ++ ++2 `ACK' ++ This is an acknowledgement packet. Since `DATA' packets also carry ++ packet acknowledgements, `ACK' packets are only used when one side ++ has no data to send. `ACK' packets do not carry sequence numbers. ++ ++3 `NAK' ++ This is a negative acknowledgement. This is sent when a packet is ++ received incorrectly, and means that the packet number appearing ++ in the PACKET field must be resent. `NAK' packets do not carry ++ sequence numbers (the PACKET field is already used). ++ ++4 `SPOS' ++ This packet changes the file position. The packet contains four ++ bytes of data holding the file position, most significant byte ++ first. The next packet received will be considered to be at the ++ named file position. ++ ++5 `CLOSE' ++ When the protocol is shut down, each side sends a `CLOSE' packet. ++ This packet does have a sequence number, which could be used to ++ ensure that all packets were correctly received (this is not ++ needed by UUCP, however, which uses the higher level `H' command ++ with an `HY' response). ++ ++ When the protocol starts up, both systems send a `SYNC' packet. The ++`SYNC' packet includes at least three bytes of data. The first two ++bytes are the maximum packet size the remote system should send, most ++significant byte first. The third byte is the window size the remote ++system should use. The remote system may send packets of any size up ++to the maximum. If there is a fourth byte, it is the number of ++channels the remote system may use (this must be between 1 and 7, ++inclusive). Additional data bytes may be defined in the future. ++ ++ The window size is the number of packets that may be sent before a ++packet is acknowledged. There is no requirement that every packet be ++acknowledged; any acknowledgement is considered to acknowledge all ++packets through the number given. In the current implementation, if one ++side has no data to send, it sends an `ACK' when half the window is ++received. ++ ++ Note that the `NAK' packet corresponds to the unused `g' protocol ++`SRJ' packet type, rather than to the `RJ' packet type. When a `NAK' ++is received, only the named packet should be resent, not any subsequent ++packets. ++ ++ Note that if both sides have data to send, but a packet is lost, it ++is perfectly reasonable for one side to continue sending packets, all of ++which will acknowledge the last packet correctly received, while the ++system whose packet was lost will be unable to send a new packet because ++the send window will be full. In this circumstance, neither side will ++time out and one side of the communication will be effectively shut down ++for a while. Therefore, any system with outstanding unacknowledged ++packets should arrange to time out and resend a packet even if data is ++being received. ++ ++ Commands are sent as a sequence of data packets with a non-zero local ++channel number. The last data packet for a command includes a trailing ++null byte (normally a command will fit in a single data packet). Files ++are sent as a sequence of data packets ending with one of length zero. ++ ++ The channel numbers permit a more efficient implementation of the ++UUCP file send command. Rather than send the command and then wait for ++the `SY' response before sending the file, the file data is sent ++beginning immediately after the `S' command is sent. If an `SN' ++response is received, the file send is aborted, and a final data packet ++of length zero is sent to indicate that the channel number may be ++reused. If an `SY' reponse with a file position indicator is received, ++the file send adjusts to the file position; this is why the protocol ++maintains a global file position. ++ ++ Note that the use of channel numbers means that each UUCP system may ++send commands and file data simultaneously. Moreover, each UUCP system ++may send multiple files at the same time, using the channel number to ++disambiguate the data. Sending a file before receiving an ++acknowledgement for the previous file helps to eliminate the round trip ++delays inherent in other UUCP protocols. ++ +--- uucp-1.07.orig/unix/pipe.c ++++ uucp-1.07/unix/pipe.c +@@ -199,6 +199,7 @@ fspipe_dial (qconn, puuconf, qsys, zphon + struct ssysdep_conn *q; + int aidescs[3]; + const char **pzprog; ++ char **p; + + q = (struct ssysdep_conn *) qconn->psysdep; + +@@ -211,6 +212,11 @@ fspipe_dial (qconn, puuconf, qsys, zphon + ulog (LOG_ERROR, "No command for pipe connection"); + return FALSE; + } ++ ++ /* Look for a string \H and replaced it by the address given for this system */ ++ for (p=pzprog; *p; p++) ++ if (!strcmp(*p, "\\H")) ++ *p = zphone; + + aidescs[0] = SPAWN_WRITE_PIPE; + aidescs[1] = SPAWN_READ_PIPE; +--- uucp-1.07.orig/contrib/uurate.c ++++ uucp-1.07/contrib/uurate.c +@@ -216,7 +216,7 @@ struct Protocol_Summary + struct Host_entry + { + struct Host_entry *next; +- char Hostname[32]; ++ char Hostname[MAXHOSTNAMELEN]; + struct Execution_Command *cmds; /* Local Activities */ + struct Phone_Call call[2]; /* In & Out Activities */ + struct Protocol_Summary *proto; +--- uucp-1.07.orig/contrib/Makefile.uurt ++++ uucp-1.07/contrib/Makefile.uurt +@@ -17,9 +17,9 @@ MAN=$(prefix)/man/man1 + newconfigdir = $(prefix)/conf/uucp + + # Flags to use when compiling uurate +-CC=gcc -O2 +-CFLAGS=-I.. -Wall +-LDFLAGS=-s -lm ++CC=gcc ++CFLAGS+=-I.. ++LDFLAGS=-lm + + SHELL=/bin/sh + PROGS=uurate + diff --git a/srcpkgs/uucp/patches/wait-for-correct-parent.patch b/srcpkgs/uucp/patches/wait-for-correct-parent.patch new file mode 100644 index 00000000000..50bbcd9ed8a --- /dev/null +++ b/srcpkgs/uucp/patches/wait-for-correct-parent.patch @@ -0,0 +1,19 @@ +Description: wait for correct parent to die +Author: Jörg Sommer +Index: uucp-1.07/unix/detach.c +=================================================================== +--- uucp-1.07.orig/unix/detach.c 2019-03-02 16:36:11.238947732 +0100 ++++ uucp-1.07/unix/detach.c 2019-03-02 16:37:21.850946777 +0100 +@@ -98,10 +98,8 @@ + if (ipid != 0) + _exit (EXIT_SUCCESS); + +- /* We'll always wind up as a child of process number 1, right? +- Right? We have to wait for our parent to die before +- reenabling SIGHUP. */ +- while (getppid () != 1) ++ /* We have to wait for our parent to die before reenabling SIGHUP. */ ++ while (getppid () == igrp) + sleep (1); + + ipid = getpid (); diff --git a/srcpkgs/uucp/patches/zpipe-improved-pipe.patch b/srcpkgs/uucp/patches/zpipe-improved-pipe.patch new file mode 100644 index 00000000000..fef1c42a2c5 --- /dev/null +++ b/srcpkgs/uucp/patches/zpipe-improved-pipe.patch @@ -0,0 +1,40 @@ +Author: Rafael Diniz +Description: + remove ATTRIBUTE_UNUSED of the parameter uucp-org.patch uses + add the possibility to send the system name to be called in pipe command + (use \Z as place holder for the system name) +Index: uucp-1.07/unix/pipe.c +=================================================================== +--- uucp-1.07.orig/unix/pipe.c 2019-08-17 23:06:47.774519770 +0200 ++++ uucp-1.07/unix/pipe.c 2019-08-17 23:06:47.742519770 +0200 +@@ -225,8 +225,8 @@ + fspipe_dial (qconn, puuconf, qsys, zphone, qdialer, ptdialer) + struct sconnection *qconn; + pointer puuconf; +- const struct uuconf_system *qsys ATTRIBUTE_UNUSED; +- const char *zphone ATTRIBUTE_UNUSED; ++ const struct uuconf_system *qsys; ++ const char *zphone; + struct uuconf_dialer *qdialer; + enum tdialerfound *ptdialer; + { +@@ -246,12 +246,17 @@ + ulog (LOG_ERROR, "No command for pipe connection"); + return FALSE; + } +- +- /* Look for a string \H and replaced it by the address given for this system */ ++ ++ /* Look for a string \H and replace it by the address given for this system */ + for (p=pzprog; *p; p++) + if (!strcmp(*p, "\\H")) + *p = zphone; + ++ /* Look for a string \Z and replace by the system name to be called */ ++ for (p=pzprog; *p; p++) ++ if (!strcmp(*p, "\\Z")) ++ *p = qsys->uuconf_zname; ++ + aidescs[0] = SPAWN_WRITE_PIPE; + aidescs[1] = SPAWN_READ_PIPE; + aidescs[2] = SPAWN_NULL; diff --git a/srcpkgs/uucp/template b/srcpkgs/uucp/template new file mode 100644 index 00000000000..2b2b6f758fa --- /dev/null +++ b/srcpkgs/uucp/template @@ -0,0 +1,39 @@ +# Template file for 'uucp' +pkgname=uucp +version=1.07 +revision=1 +build_style=gnu-configure +conf_files="/etc/uucp/config /etc/uucp/sys1 /etc/uucp/port" +makedepends="wget" +short_desc="Taylor UUCP is a free implementation of UUCP" +maintainer="MarcoAPC " +license="GPL-2.0-or-later" +homepage="https://www.gnu.org/software/uucp/uucp.html" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" +checksum=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c +patch_args="-Np1" + +system_accounts="_uucp" +_uucp_homedir="/var/spool/uucp" + +make_dirs=" + /var/spool/uucp 0750 uucp uucp + /var/spool/uucppublic 0750 uucp uucp" + +pre_configure() { + sed -i 's|${CC-cc} -E|${CC-cc} -E|g' configure +} +do_install() { + make DESTDIR=${DESTDIR} install + vmkdir etc/uucp/ + vinstall sample/config 0644 etc/uucp/ + vinstall sample/sys1 0644 etc/uucp/ + vinstall sample/port 0644 etc/uucp/ + sed -i 's|\$\*|"$@"|' ${DESTDIR}/usr/bin/{uuto,uusched} + chmod u+w ${DESTDIR}/usr/bin/* + vman ${FILESDIR}/uulog.1 + vman ${FILESDIR}/uuname.1 + vman ${FILESDIR}/uupick.1 + vman ${FILESDIR}/uuto.1 + vman ${FILESDIR}/uusched.8 +} From 8467a5b9fe848345a671c23c4adddd988e8efa5f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 12:28:43 +0200 Subject: [PATCH 1137/2369] krita: update to 5.0.5. --- srcpkgs/krita/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index b05abcbaf97..68e67ccb815 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,6 +1,6 @@ # Template file for 'krita' pkgname=krita -version=5.0.2 +version=5.0.5 revision=1 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" @@ -22,7 +22,7 @@ maintainer="John " license="GPL-3.0-only" homepage="https://krita.org/" distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz" -checksum=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf +checksum=162fff4596484e688655d4636373b1a77bcea39824c655b477afc1463aaf2dae python_version=3 replaces="calligra-krita>=0" make_check=no From 4e6c59a73ce3ac5cbf7a26954ef6bd2ba9b29615 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 12:30:15 +0200 Subject: [PATCH 1138/2369] pioneer: update to 20220203. --- srcpkgs/pioneer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template index a598006e74c..9614ba1f1ad 100644 --- a/srcpkgs/pioneer/template +++ b/srcpkgs/pioneer/template @@ -1,6 +1,6 @@ # Template file for 'pioneer' pkgname=pioneer -version=20210723 +version=20220203 revision=1 build_style=cmake make_build_target="all build-data" @@ -15,7 +15,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://pioneerspacesim.net" distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz" -checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d +checksum=415b55bab7f011f7244348428e13006fa67a926b9be71f2c4ad24e92cfeb051c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" pioneer-modelcompiler" From ba151e25723d887bfc760ca2838e9c29c488eeb7 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Mon, 18 Apr 2022 12:09:41 -0500 Subject: [PATCH 1139/2369] google-chrome: update to 100.0.4896.127 --- 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 5f9e67c864f..b20753366d9 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,6 +1,6 @@ # Template file for 'google-chrome' pkgname=google-chrome -version=100.0.4896.75 +version=100.0.4896.127 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=856934272783e5a48fa63e30eb896040f5b46d6f394c1b3aa2e461cbf89b395b +checksum=d012bc3e5e000bffbd83cf20c48add187c52b065cc37408862c42d127aa4a656 do_extract() { mkdir -p ${DESTDIR} From 4dfe5db948cc5145f0a23552e71180d29da8d73d Mon Sep 17 00:00:00 2001 From: John Date: Mon, 18 Apr 2022 19:40:56 +0200 Subject: [PATCH 1140/2369] krita: remove patch --- ...5beaa1fdba03d38f887b93a15a58fc0830c7.patch | 50 ------------------- 1 file changed, 50 deletions(-) delete mode 100644 srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch diff --git a/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch b/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch deleted file mode 100644 index 6c9c71d4fca..00000000000 --- a/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001 -From: Sharaf Zaman -Date: Wed, 27 Oct 2021 22:19:07 +0000 -Subject: [PATCH] Fix build on linux clang targets - -In CheckAtomic.cmake we include is_lock_free because these routines -don't seem to be included in the compiler's "simple atomics". This -triggers a failure in clang toolchain, forcing it to link libatomic. - -Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free - -CCBUG:444247 -CCBUG:444547 ---- - cmake/modules/CheckAtomic.cmake | 1 + - libs/image/CMakeLists.txt | 6 ++---- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake -index b061e2d65b..df6b70504c 100644 ---- a/cmake/modules/CheckAtomic.cmake -+++ b/cmake/modules/CheckAtomic.cmake -@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname) - std::atomic x (0); - int main() { - uint64_t i = x.load(std::memory_order_relaxed); -+ x.is_lock_free(); - return 0; - } - " ${varname}) -diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt -index e883c7f1c8..43c945fad3 100644 ---- a/libs/image/CMakeLists.txt -+++ b/libs/image/CMakeLists.txt -@@ -372,10 +372,8 @@ target_link_libraries(kritaimage - - target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY}) - --if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB) -- if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB) -- target_link_libraries(kritaimage PUBLIC atomic) -- endif() -+if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) -+ target_link_libraries(kritaimage PUBLIC atomic) - endif() - - if(OpenEXR_FOUND) --- -GitLab - From 4f08492ff7a880b54fba6dad92dce80bbb3bb058 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Sat, 9 Apr 2022 10:10:18 -0400 Subject: [PATCH 1141/2369] python3-trimesh: update to 3.10.8. --- srcpkgs/python3-trimesh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template index e51b6eb62f9..0a162818e7c 100644 --- a/srcpkgs/python3-trimesh/template +++ b/srcpkgs/python3-trimesh/template @@ -1,6 +1,6 @@ # Template file for 'python3-trimesh' pkgname=python3-trimesh -version=3.10.7 +version=3.10.8 revision=1 wrksrc="trimesh-${version}" build_style=python3-module @@ -16,7 +16,7 @@ maintainer="Karl Nilsson " license="MIT" homepage="https://trimsh.org/" distfiles="https://github.com/mikedh/trimesh/archive/${version}.tar.gz" -checksum=e98fd2dff632729fc6fb963653b91d9f4a5a6a9a1f79493dd885e3e4d1f9c4da +checksum=465d30b17e1f62c467283422eb932b70ff4807f9346f3012195ac94675c837f3 post_install() { vlicense LICENSE.md From f81ebd2e6cd3ec224ec5e802612ce9d06e3bb30a Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated Date: Mon, 18 Apr 2022 16:07:28 +0200 Subject: [PATCH 1142/2369] celluloid: update to 0.23. --- srcpkgs/celluloid/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/celluloid/template b/srcpkgs/celluloid/template index c9f0461fb42..73991156204 100644 --- a/srcpkgs/celluloid/template +++ b/srcpkgs/celluloid/template @@ -1,6 +1,6 @@ # Template file for 'celluloid' pkgname=celluloid -version=0.22 +version=0.23 revision=1 build_style=meson hostmakedepends="gettext glib-devel pkg-config" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://celluloid-player.github.io/" distfiles="https://github.com/${pkgname}-player/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz" -checksum=5fded5b7bbf15ef110548bcc980ceec981f5f1a70df77ad3f10e3ca4a449e5a1 +checksum=b22d1963d03f0215bce07c2de8e77892c322f500ae5c0fd6e2e84d2e13f04374 gnome-mpv_package() { depends="${sourcepkg}>=${version}_${revision}" From a27f5372d84ad32b53223e53b8a3b491d0bd426c Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Mon, 18 Apr 2022 12:21:09 +0700 Subject: [PATCH 1143/2369] mdBook: update to 0.4.18 --- srcpkgs/mdBook/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template index d2aa033512f..d4b97f2a5d0 100644 --- a/srcpkgs/mdBook/template +++ b/srcpkgs/mdBook/template @@ -1,6 +1,6 @@ # Template file for 'mdBook' pkgname=mdBook -version=0.4.17 +version=0.4.18 revision=1 build_style=cargo short_desc="Create book from markdown files. Like Gitbook but implemented in Rust" @@ -9,7 +9,7 @@ license="MPL-2.0" homepage="https://github.com/rust-lang/mdBook" changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md" distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz" -checksum=9523d0bed63ce35eec5a8259eb963651cd7e37ec5644ef551134068a2fb72f89 +checksum=ce357327f4443189fde307103f8008f43410ca8b738c5c61401ada9a54b8b5b5 post_install() { vlicense LICENSE From ca836c9c173231c7b7e71863818eba6306156a5e Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated Date: Mon, 18 Apr 2022 15:41:44 +0200 Subject: [PATCH 1144/2369] jpegoptim: update to 1.4.7. --- srcpkgs/jpegoptim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jpegoptim/template b/srcpkgs/jpegoptim/template index d11aa4be4f7..13dbf5ffaed 100644 --- a/srcpkgs/jpegoptim/template +++ b/srcpkgs/jpegoptim/template @@ -1,6 +1,6 @@ # Template file for 'jpegoptim' pkgname=jpegoptim -version=1.4.6 +version=1.4.7 revision=1 wrksrc="${pkgname}-RELEASE.${version}" build_style=gnu-configure @@ -10,4 +10,4 @@ maintainer="archaeme " license="GPL-2.0-or-later" homepage="https://github.com/tjko/jpegoptim" distfiles="https://github.com/tjko/jpegoptim/archive/RELEASE.${version}.tar.gz" -checksum=c44dcfac0a113c3bec13d0fc60faf57a0f9a31f88473ccad33ecdf210b4c0c52 +checksum=9d2a13b7c531d122f360209422645206931c74ada76497c4aeb953610f0d70c1 From 5952d85b7b5aa91f906fc23fd6f8cb85425a36f0 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 17 Apr 2022 20:25:38 +0200 Subject: [PATCH 1145/2369] xh: update to 0.16.0 --- srcpkgs/xh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xh/template b/srcpkgs/xh/template index eddc9c12510..e40a27df688 100644 --- a/srcpkgs/xh/template +++ b/srcpkgs/xh/template @@ -1,6 +1,6 @@ # Template file for 'xh' pkgname=xh -version=0.14.1 +version=0.16.0 revision=1 # depends on ring archs="x86_64* i686* armv[67]* aarch64*" @@ -13,7 +13,7 @@ license="MIT" homepage="https://github.com/ducaale/xh" changelog="https://raw.githubusercontent.com/ducaale/xh/master/CHANGELOG.md" distfiles="https://github.com/ducaale/xh/archive/v${version}.tar.gz" -checksum=ca89e8a9a230ff16cc0bba5bd7ebdceb986eac84638e15b4928d737b9ec12776 +checksum=d6ec84977da567dd36a4c59d624dc1e2b1c77a21e2b0a10e463216120be8112d post_install() { ln -sf ${pkgname} ${DESTDIR}/usr/bin/${pkgname}s From 63e67a1f82188aea698337d634a407f26a7cb122 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 17 Apr 2022 19:34:19 +0200 Subject: [PATCH 1146/2369] sfeed: update to 1.4. --- srcpkgs/sfeed/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template index 46b4d83e558..fd5f0fe156d 100644 --- a/srcpkgs/sfeed/template +++ b/srcpkgs/sfeed/template @@ -1,6 +1,6 @@ # Template file for 'sfeed' pkgname=sfeed -version=1.3 +version=1.4 revision=1 build_style=gnu-makefile make_install_args="MANPREFIX=/usr/share/man" @@ -11,7 +11,7 @@ maintainer="notthewave " license="ISC" homepage="https://git.codemadness.org/sfeed" distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz" -checksum=49d32e98a47a80a2a6cbd5d816938057d4ca3910e0a6a814b2c2a6520fbda9ba +checksum=3c90f4bef1becdf583cc0ae201e694459edcd024e1d76bfeed3f417ecc163498 post_install() { vlicense LICENSE From 5be5db490ea3d79a3dd07e928f15a622058c8db2 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 17 Apr 2022 19:10:10 +0200 Subject: [PATCH 1147/2369] xfce4-panel: update to 4.16.4. --- srcpkgs/xfce4-panel/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template index 210113d3d67..ce83d56a6c7 100644 --- a/srcpkgs/xfce4-panel/template +++ b/srcpkgs/xfce4-panel/template @@ -1,7 +1,7 @@ # Template file for 'xfce4-panel' pkgname=xfce4-panel -version=4.16.3 -revision=2 +version=4.16.4 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--with-locales-dir=/usr/share/locale @@ -12,9 +12,9 @@ makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel short_desc="Next generation panel for the XFCE desktop environment" maintainer="Orphaned " license="GPL-2.0-or-later" -homepage="https://xfce.org/" +homepage="https://docs.xfce.org/xfce/xfce4-panel/start" distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" -checksum=5934eaed8a76da52c29b734ccd79600255420333dd6ebd8fd9f066379af1e092 +checksum=1faf51a81a655244dba4c6ac9dd33e3ab0d78a9ee096c218b38fed6642c9cd84 # Package build options build_options="gir" From a647987210107b57291b8870be6f79d3477e8625 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Apr 2022 18:09:35 +0200 Subject: [PATCH 1148/2369] gnome-settings-daemon: remove pulseaudio dependency --- srcpkgs/gnome-settings-daemon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index 9f8c9857eec..c8be36b2a45 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,7 +1,7 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon version=41.0 -revision=1 +revision=2 build_style=meson configure_args="-Dsystemd=false" hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt @@ -11,7 +11,7 @@ makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-dev libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel polkit-devel pulseaudio-devel startup-notification-devel upower-devel xf86-input-wacom-devel libXfixes-devel" -depends="hicolor-icon-theme pulseaudio" +depends="hicolor-icon-theme" checkdepends="elogind libnotify python3-dbusmock python3-gobject python3-pycodestyle which hwids eudev" short_desc="GNOME settings daemon" From 27bc7b01af70c70569642deabe6323ff7708b1ca Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Apr 2022 18:09:35 +0200 Subject: [PATCH 1149/2369] mkchromecast: remove pulseaudio dependency --- srcpkgs/mkchromecast/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mkchromecast/template b/srcpkgs/mkchromecast/template index 161210796b9..306abdb6613 100644 --- a/srcpkgs/mkchromecast/template +++ b/srcpkgs/mkchromecast/template @@ -1,11 +1,11 @@ # Template file for 'mkchromecast' pkgname=mkchromecast version=0.3.8.1 -revision=4 +revision=5 pycompile_dirs="/usr/share/mkchromecast/mkchromecast" depends="python3-Flask python3-netifaces python3-setuptools python3-requests python3-mutagen python3-psutil python3-PyQt5 python3-SoCo python3-chromecast - python3-gobject pulseaudio python3-youtube-dl ffmpeg" + python3-gobject python3-youtube-dl ffmpeg" short_desc="Cast Linux Audio/Video to Google cast and Sonos devices" maintainer="Orphaned " license="MIT" From 87bcefb9dfc14bc5cf8e6244105750627dea5c53 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Apr 2022 18:09:35 +0200 Subject: [PATCH 1150/2369] pasystray: remove pulseaudio dependency --- srcpkgs/pasystray/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/pasystray/template b/srcpkgs/pasystray/template index a25bcc5af5b..fc553ddc05f 100644 --- a/srcpkgs/pasystray/template +++ b/srcpkgs/pasystray/template @@ -1,12 +1,11 @@ # Template file for 'pasystray' pkgname=pasystray version=0.7.1 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure hostmakedepends="pkg-config intltool automake" makedepends="gtk+3-devel pulseaudio-devel libnotify-devel" -depends="pulseaudio" short_desc="PulseAudio System Tray" maintainer="Steve Prybylski " license="LGPL-2.1-or-later" From 3ba57fc934ca348cdedd097aa95d1dcf67af380a Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 17 Apr 2022 15:55:01 -0700 Subject: [PATCH 1151/2369] kitinerary: temporarily ignore test failure This test was fixed upstream, so this should be able to be removed after the next update --- .../temporarily-disable-broken-test.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch diff --git a/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch b/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch new file mode 100644 index 00000000000..4e7bb1ce88b --- /dev/null +++ b/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch @@ -0,0 +1,16 @@ +Temporarily disable the calendarhandler test. +This test has been fixed upstream, so this should be able to be + removed in the next release. + +diff -Naur a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt +--- a/autotests/CMakeLists.txt 2022-04-18 11:34:57.356111303 -0700 ++++ b/autotests/CMakeLists.txt 2022-04-18 11:33:56.175938220 -0700 +@@ -35,7 +35,7 @@ + ecm_add_test(postprocessortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary) + ecm_add_test(extractorvalidatortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary) + if (TARGET KF5::CalendarCore) +- ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary) ++ #ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary) + ecm_add_test(extractortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary KPim::PkPass) + endif() + ecm_add_test(documentutiltest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary) From 83dc506a9374e6976277ba98deab2e62ab98abeb Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Mon, 18 Apr 2022 15:22:04 +0700 Subject: [PATCH 1152/2369] signond: update to 8.61 --- srcpkgs/signond/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/signond/template b/srcpkgs/signond/template index 9a2f0cff8c2..6a3bb44122a 100644 --- a/srcpkgs/signond/template +++ b/srcpkgs/signond/template @@ -1,7 +1,7 @@ # Template file for 'signond' pkgname=signond -version=8.60 -revision=3 +version=8.61 +revision=1 wrksrc="signond-VERSION_${version}" build_style=qmake configure_args="LIBDIR=/usr/lib" @@ -13,7 +13,7 @@ maintainer="John Rowley " license="LGPL-2.1-only" homepage="https://gitlab.com/accounts-sso/signond" distfiles="${homepage}/-/archive/VERSION_${version}/signond-VERSION_${version}.tar.gz" -checksum=0da2a080e4b01f44855d1a519f828007a5c756ee93827db9098a1b4b880f28fe +checksum=3dd57c25e1bf1583b2cb857f96831e38e73d40264ff66ca43e63bb7233f76828 pre_configure() { if [ "$CROSS_BUILD" ]; then From 33babef5a98f9beff6b58c75a828dcb9af3fe29e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 15 Apr 2022 18:17:16 +0200 Subject: [PATCH 1153/2369] aisleriot: update to 3.22.22. --- srcpkgs/aisleriot/patches/guile-2.2.patch | 36 ----------------------- srcpkgs/aisleriot/template | 4 +-- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/aisleriot/patches/guile-2.2.patch diff --git a/srcpkgs/aisleriot/patches/guile-2.2.patch b/srcpkgs/aisleriot/patches/guile-2.2.patch deleted file mode 100644 index eb2ce5610b4..00000000000 --- a/srcpkgs/aisleriot/patches/guile-2.2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5e9b538db5304ccfed6c0d048a94d8c47dd27e31 Mon Sep 17 00:00:00 2001 -From: Jeremy Bicha -Date: Thu, 17 Feb 2022 23:51:15 +0100 -Subject: [PATCH] games: Only use -Ono-letrectify with guile 3.0 - -This fixes a build failure on guile 2.2 where this flag is unknown. - -Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/925 ---- - games/meson.build | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/games/meson.build b/games/meson.build -index e552beab..56819b4d 100644 ---- a/games/meson.build -+++ b/games/meson.build -@@ -122,9 +122,13 @@ guile_warnings = [ - '-W1', - ] - --guile_flags = [ -- '-Ono-letrectify', --] -+guile_flags = [] -+ -+if guile_version.version_compare('>= 3.0') -+ guile_flags += [ -+ '-Ono-letrectify', -+ ] -+endif - - # FIXME: this should use files('...') (allowed as per docs), - # but that crashes meson, see https://gitlab.gnome.org/chpe/meson/issues/2 --- -GitLab - diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template index d4d178b13c9..11ad75cf3ad 100644 --- a/srcpkgs/aisleriot/template +++ b/srcpkgs/aisleriot/template @@ -1,6 +1,6 @@ # Template file for 'aisleriot' pkgname=aisleriot -version=3.22.21 +version=3.22.22 revision=1 build_style=meson # build requires assertions to be turned on -> n_debug=false @@ -15,5 +15,5 @@ maintainer="Érico Nogueira " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Aisleriot" distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=fd7e7b58e1480dcc9d41b1ae8c9fcb1dd0e6c66eef0a5c1090784dddca9dd655 +checksum=0666b7b35037f796334cda104be5bda65977053f3cab0a3928624da7f236f8ae replaces="aisleriot-data>=0" From f96f3880de089e9d3eb355cfe92ccb93d5971571 Mon Sep 17 00:00:00 2001 From: Matthias von Faber Date: Fri, 15 Apr 2022 15:27:17 +0200 Subject: [PATCH 1154/2369] qtractor: update to 0.9.26 --- srcpkgs/qtractor/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template index b9df4028f2a..9ccd9cb666b 100644 --- a/srcpkgs/qtractor/template +++ b/srcpkgs/qtractor/template @@ -1,8 +1,8 @@ # Template file for 'qtractor' pkgname=qtractor -version=0.9.24 +version=0.9.26 revision=1 -_vst3sdk_tag=3.7.3_build_20 +_vst3sdk_tag=3.7.4_build_25 wrksrc="qtractor-qtractor_${version//./_}" create_wrksrc=yes build_wrksrc="qtractor-qtractor_${version//./_}" @@ -24,11 +24,11 @@ distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.ta https://github.com/steinbergmedia/vst3_base/archive/v$_vst3sdk_tag.tar.gz>vst3_base-v${_vst3sdk_tag}.tar.gz https://github.com/steinbergmedia/vst3_pluginterfaces/archive/v$_vst3sdk_tag.tar.gz>vst3_pluginterfaces-v${_vst3sdk_tag}.tar.gz https://github.com/steinbergmedia/vst3_public_sdk/archive/v$_vst3sdk_tag.tar.gz>vst3_public_sdk-v${_vst3sdk_tag}.tar.gz" -checksum="724b80587f844cfc7c58c22d69d6ff1cd30c7752c2116e55837f468edb6bf4d1 - 815e51e84e6ed900f6103f00e847bee175c2dc95b16a73ae60719daa0e24ad95 - d69d28a6a932d3c946749c9aeb6220b028d7af7ab10f83e4e732e760347fe796 - 313f3e8c8f080d514763b3e88964a0820851d81f1159219628e1ed188fdb7303 - 63cd7e3bf0be8ec9b3934ebdc145e13af84004c988071ecbed1aa5c8f8277d80" +checksum="bf1f89a805166e99ca4b9bfc66f8bb1d71a258bf611b1e9e90613cd46799e6a4 + 24f79a670d8f3c7aac34e1340f2d12763beabc9229d61b6f806d850675c8c5f6 + ee333bd17ad533135481c163d85c99fe4d3cdb3e49214eb5adb17ffb1897a423 + 59326a77b5df73ec6a35925a4005874ee3e29a2dbd6e6b88905d03b90fc9c3a5 + 3b321b7f2289c7204bceae1f6640d74b6cf35b474f98da7a50ed36c24e019831" post_extract() { cd $wrksrc From 65e90579f1969266f5ec52e0fcdb93e477b6bd6e Mon Sep 17 00:00:00 2001 From: Matthias von Faber Date: Fri, 15 Apr 2022 12:21:27 +0200 Subject: [PATCH 1155/2369] mkvtoolnix: update to 67.0.0 --- srcpkgs/mkvtoolnix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index 98317332f36..7f84979ecc3 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,6 +1,6 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix -version=66.0.0 +version=67.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=73a3f6c39b3580f28233f93555d282d07d5f51a8bbeb8b0bee09b820de80692c +checksum=db68be91ee8a0b688d924cc00d3bac9349306d54c29ce44a555728c1abb7d3ec if [ "$CROSS_BUILD" ]; then configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr" From 15400e9c6d8f513f37cd2d5ca01f0cde7a6414c6 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 18 Mar 2022 17:42:40 +0200 Subject: [PATCH 1156/2369] yaru: update to 22.04.4. --- srcpkgs/yaru/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yaru/template b/srcpkgs/yaru/template index c2bf7e2503a..94264394ad6 100644 --- a/srcpkgs/yaru/template +++ b/srcpkgs/yaru/template @@ -1,6 +1,6 @@ # Template file for 'yaru' pkgname=yaru -version=22.04.1 +version=22.04.4 revision=1 build_style=meson configure_args="-Dxfwm4=true" @@ -11,4 +11,4 @@ maintainer="mobinmob " license="GPL-3.0-or-later, CC-BY-SA-4.0" homepage="https://github.com/ubuntu/yaru" distfiles="https://github.com/ubuntu/yaru/archive/$version.tar.gz" -checksum=fbd4c19c16817eec74845d9723ebffb90f1897e0d085384f31f4b4d6c32a91ee +checksum=e8b85d3b1965b4611b4280b4d53b8deafdac754f795a8aad43c22ddb3308025e From 1820a9bd693537d37b2ba6b43d10090fc4c3fafd Mon Sep 17 00:00:00 2001 From: Barbaross Date: Mon, 18 Apr 2022 09:54:39 -0400 Subject: [PATCH 1157/2369] vit: update to 2.2.0 --- srcpkgs/vit/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vit/template b/srcpkgs/vit/template index 173648d69b9..9eb3596b5d3 100644 --- a/srcpkgs/vit/template +++ b/srcpkgs/vit/template @@ -1,17 +1,17 @@ # Template file for 'vit' pkgname=vit -version=2.1.0 +version=2.2.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" -depends="task python3-pytz python3-urwid python3-tzlocal python3-tasklib" +depends="task python3-urwid python3-tasklib" checkdepends="python3-pytest $depends" short_desc="Visual Interactive Taskwarrior full-screen terminal interface" maintainer="Cullen Ross " license="MIT" homepage="https://github.com/vit-project/vit" distfiles="${PYPI_SITE}/v/vit/vit-${version}.tar.gz" -checksum=fd34f0b827953dfdecdc39f8416d41c50c24576c33a512a047a71c1263eb3e0f +checksum=e866c8739822b9e73152ab30c9a009c3aef947533c06f7a5cb244d15c4ea296f do_check() { TERM=linux python3 -m pytest From ff4148ff545017147e79f9f72b03fad5aa8b87ec Mon Sep 17 00:00:00 2001 From: clyhtsuriva Date: Fri, 15 Apr 2022 07:54:08 +0200 Subject: [PATCH 1158/2369] pyradio: update to 0.8.9.16 --- srcpkgs/pyradio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template index 1c267068235..042fd3d257e 100644 --- a/srcpkgs/pyradio/template +++ b/srcpkgs/pyradio/template @@ -1,6 +1,6 @@ # Template file for 'pyradio' pkgname=pyradio -version=0.8.9.14 +version=0.8.9.16 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ license="MIT" homepage="http://www.coderholic.com/pyradio/" changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog" distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz" -checksum=76e06934926a1acfd7bba3735d8e0b387d7985dd38a398376877b6fd7da71940 +checksum=2ccd644ea93a0538162fa673863d68e5934edd82350b2dacfffc33b2396f8aeb make_check=no # pytest reports "no tests ran" post_install() { From 74e37b17de20c8243ae731bcdfec68f516ef5013 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 17 Apr 2022 21:56:07 +0200 Subject: [PATCH 1159/2369] stress-ng: update to 0.14.00. --- srcpkgs/stress-ng/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template index d13629b279b..986b096bf1c 100644 --- a/srcpkgs/stress-ng/template +++ b/srcpkgs/stress-ng/template @@ -1,6 +1,6 @@ # Template file for 'stress-ng' pkgname=stress-ng -version=0.13.12 +version=0.14.00 revision=1 build_style=gnu-makefile make_use_env=1 @@ -9,4 +9,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/ColinIanKing/stress-ng/" distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz" -checksum=16540d9cfa80d6a274fc0238d7251675ee38df6d5be805d14a67ce9efcb59ce9 +checksum=d0cc53073e0c2499e15044fbd5a0df0176521575ea13fba01f67834b9e07d19d From ea42d842d4bb90e0764a8afe73ecf1ded1776be4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 18 Apr 2022 14:14:36 +0200 Subject: [PATCH 1160/2369] babashka: update to 0.8.1. --- srcpkgs/babashka/template | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template index 5a2292af27b..a8fbeff23b0 100644 --- a/srcpkgs/babashka/template +++ b/srcpkgs/babashka/template @@ -1,6 +1,6 @@ # Template file for 'babashka' pkgname=babashka -version=0.7.8 +version=0.8.1 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=4eb8e99e18942ba9c3b7ec3c4707d8237f970035 -_babashka_curl_commit=3d3d117ea0f8a143a06e3cace92e4e8b6a5782df +_sci_commit=2af989d0eb80741b026fd2355442033b05a3b181 +_babashka_curl_commit=8a27e6060a739c7580cc89ba2bfddf48881e7178 _babashka_nrepl_commit=d3fce67198b042707f01d841c032f841cc57ab7f _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712 -_process_commit=5db9560eab698f9773537acb0167f38d6fd0d322 -_pods_commit=538fc6f4147badf3a457b3eb8f9f95dd3bc947b1 -_deps_clj_commit=6636890388cdf779708806a93110b165577cd226 -_fs_commit=2bf527f797d69b3f14247940958e0d7b509f3ce2 +_process_commit=1eebafc696e9bac7538c296d5a7c1fde977ad523 +_pods_commit=e075b13bfe3666a73f82c12817bdf5f1d6c692e3 +_deps_clj_commit=c948c2f5c1e240c0e0ea4201877695f729ee309e +_fs_commit=dc73460e63ff10c701c353227f2689b3d7c33a43 _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="23a08adcc9237be9f24c1781cb646514434dbcb651aac00c3eedca763ca25086 - 0766f0a8be23e94efefbfc16c5987f1dab4520da3294f1bccef402f97898c490 - 45abdaa5e4effd3bcfea777d02844d4634f1f80a592843eca9ec7d3544b7e16d +checksum="e7084426aa86f79684e66b1ee112da26f2b9e05b259d7d19acbb1a7c8d380338 + 0d8c40688df17c3441a1a6c1005dc11538ed841fc74fa12396d6057fdf88a5e2 + d8e57bc67f237a5cfea90a6c38f9e303c1591250624087e348600af72e8910fa b56a06bf113bcd85084d48f595541447014308860d9c45efcde5b02e859c934c 9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b - b6671246a1f0742bd4ae4d1f7b0afe4101d6c8907060455e0473c2ef966e370c - 7fea6762ecbb31d454e0b5c194d12e1e6d4ec301972aa33daf617b571e097678 - fee3f84f935d141cf7343d7bab19c3eef56fdb2f3dac4a950db71c9b083e0d17 - e5b92a25221b735941861968a5570a4169da1aee7f2a7545975afe930cb8574f + 09ea197a0381a1f5be268da5c1470646bef01eef85add16541e32e0bb2da5d1f + 4aca4c1e15576309f33352bbed9dd9e7f0af5eca9f725dd8593ae1cb32cae8c3 + af8a90dba22d980e536a901b833ccf38816c8944b72b32c10d3134869eced4e2 + af930f686933ef74b0d857abb0f763d6fe0d5b0452a4c13e5b10207288feae86 bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709" nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio" From bf45d19b7cb57fe883b93fd6f2d7163d5ba7e44b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 18 Apr 2022 14:15:48 +0200 Subject: [PATCH 1161/2369] jet: update to 0.1.1. --- srcpkgs/jet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jet/template b/srcpkgs/jet/template index 58b20981758..0a0bb5113cf 100644 --- a/srcpkgs/jet/template +++ b/srcpkgs/jet/template @@ -1,6 +1,6 @@ # Template file for 'jet' pkgname=jet -version=0.1.0 +version=0.1.1 revision=1 hostmakedepends="mandrel leiningen" makedepends="zlib-devel" @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="EPL-1.0" homepage="https://github.com/borkdude/jet" distfiles="https://github.com/borkdude/jet/archive/refs/tags/v${version}.tar.gz" -checksum=faed01c3d31631332fa60fd6f1bb39ae4a2f6cfc396a8747d5cfce4f1053a99c +checksum=2085cd757607eebfdcc6107f507e362b88952f5cd7139127ba9c47708bbd91c4 nocross="mandrel" do_build() { From 063825747bcdef6c1a5d4a7dbd5d789f9cb01d41 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 18 Apr 2022 14:17:16 +0200 Subject: [PATCH 1162/2369] bmake: update to 20220414. --- srcpkgs/bmake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template index 5eac7a6f158..58cf7097920 100644 --- a/srcpkgs/bmake/template +++ b/srcpkgs/bmake/template @@ -1,6 +1,6 @@ # Template file for 'bmake' pkgname=bmake -version=20220330 +version=20220414 revision=1 create_wrksrc=yes short_desc="Portable version of the NetBSD make build tool" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://www.crufty.net/help/sjg/bmake.html" distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz" -checksum=4b46d95b6ae4b3311ba805ff7d5a19b9e37ac0e86880e296e2111f565b545092 +checksum=10ee07a7be26b22ce6a3bbc386e2916ca8e51b0ed2d256c271a7135e3c94f2a7 python_version=3 do_configure() { From 424d1ea54669ff5b4782a021ab70733daee25741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 22 Sep 2020 23:20:57 +0200 Subject: [PATCH 1163/2369] yaboot: fix build w/ gcc10 and host i686/x86_64 The -fcommon is required for gcc10 to build yaboot. Adding --build=$XBPS_TRIPLET seems to be a good idea in any case according to the autoconf manual, see the document at: https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Hosts-and-Cross_002dCompilation.html Still gives an error for me trying to build for ppc-musl using any x86 host environment, be it glibc or musl libc. More patches required or something else may be wrong? --- srcpkgs/yaboot/patches/0003-build-system.patch | 6 ++++-- srcpkgs/yaboot/template | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yaboot/patches/0003-build-system.patch b/srcpkgs/yaboot/patches/0003-build-system.patch index 8fdf419f187..6dcd018b34c 100644 --- a/srcpkgs/yaboot/patches/0003-build-system.patch +++ b/srcpkgs/yaboot/patches/0003-build-system.patch @@ -22,7 +22,7 @@ Also do not strip the binaries upon install, xbps-src will take care of that. # command used to get root (needed for tarball creation) GETROOT = fakeroot -@@ -32,14 +32,17 @@ LD := $(CROSS)ld +@@ -32,14 +32,18 @@ LD := $(CROSS)ld AS := $(CROSS)as OBJCOPY := $(CROSS)objcopy @@ -39,10 +39,11 @@ Also do not strip the binaries upon install, xbps-src will take care of that. YBCFLAGS += -DKERNELADDR=$(KERNELADDR) -YBCFLAGS += -Werror -fdiagnostics-show-option +YBCFLAGS += -fgnu89-inline -fno-builtin-malloc -fno-stack-protector -no-pie ++YBCFLAGS += -fcommon YBCFLAGS += -I ./include YBCFLAGS += -fno-strict-aliasing -@@ -69,12 +72,12 @@ LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux +@@ -69,12 +72,13 @@ LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux # Libraries # @@ -54,6 +55,7 @@ Also do not strip the binaries upon install, xbps-src will take care of that. UCFLAGS = -Os $(CFLAGS) -Wall -I/usr/include -UCFLAGS += -Werror -fdiagnostics-show-option +UCFLAGS += -fdiagnostics-show-option ++UCFLAGS += -fcommon # For compiling build-tools that run on the host. # diff --git a/srcpkgs/yaboot/template b/srcpkgs/yaboot/template index 8d2adf264b7..a61158c899f 100644 --- a/srcpkgs/yaboot/template +++ b/srcpkgs/yaboot/template @@ -58,6 +58,7 @@ _build_e2fsprogs() { if [ -n "$_need_cross" -o -n "$CROSS_BUILD" ]; then # using a crosscompiler, set up configure/compiler for that _args+=" --host=${_need_cross:-$XBPS_CROSS_TRIPLET}" + _args+=" --build=$XBPS_TRIPLET" _ecc="${_need_cross:-$XBPS_CROSS_TRIPLET}-gcc" _ear="${_need_cross:-$XBPS_CROSS_TRIPLET}-ar" fi From 5c7eb352a18674fee7d2ee90187c70d44600bd44 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 19 Apr 2022 13:17:39 +0200 Subject: [PATCH 1164/2369] xpdf: update to 4.04. --- srcpkgs/xpdf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xpdf/template b/srcpkgs/xpdf/template index 3c66f615f11..854150d56eb 100644 --- a/srcpkgs/xpdf/template +++ b/srcpkgs/xpdf/template @@ -1,6 +1,6 @@ # Template file for 'xpdf' pkgname=xpdf -version=4.03 +version=4.04 revision=1 build_style=cmake configure_args="-DSYSTEM_XPDFRC=/etc/xpdfrc" @@ -13,10 +13,10 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="http://www.xpdfreader.com/" distfiles="https://dl.xpdfreader.com/xpdf-${version}.tar.gz" -checksum=0fe4274374c330feaadcebb7bd7700cb91203e153b26aa95952f02bf130be846 +checksum=63ce23fcbf76048f524c40be479ac3840d7a2cbadb6d1e0646ea77926656bade post_extract() { - sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc + vsed -i -e 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc } post_install() { From 49311fef6efdd9d53370c5805a73ff2e589a3722 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 19 Apr 2022 13:18:24 +0200 Subject: [PATCH 1165/2369] spectre-meltdown-checker: update to 0.45. --- srcpkgs/spectre-meltdown-checker/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/spectre-meltdown-checker/template b/srcpkgs/spectre-meltdown-checker/template index 23e3f2c00bd..b3a5163801c 100644 --- a/srcpkgs/spectre-meltdown-checker/template +++ b/srcpkgs/spectre-meltdown-checker/template @@ -1,6 +1,6 @@ # Template file for 'spectre-meltdown-checker' pkgname=spectre-meltdown-checker -version=0.44 +version=0.45 revision=1 short_desc="Spectre & Meltdown vulnerability/mitigation checker for Linux" depends="binutils" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="https://github.com/speed47/spectre-meltdown-checker" distfiles="https://github.com/speed47/spectre-meltdown-checker/archive/v${version}.tar.gz" -checksum=96765d765275476c36a146da123fa7e9eb310a84e84ae71b179c9ace3b6ab0c8 +checksum=32db6b73b9a3b08c165cac39446c856a07ac3d17c6b556ce08a9e99dd5600ea7 do_install() { vbin spectre-meltdown-checker.sh spectre-meltdown-checker From 35b6abfca4810934e35a50437824f077d7c3056d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 19 Apr 2022 13:19:28 +0200 Subject: [PATCH 1166/2369] makedumpfile: update to 1.7.1. --- srcpkgs/makedumpfile/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/makedumpfile/template b/srcpkgs/makedumpfile/template index ba00074bc4e..e91ab999560 100644 --- a/srcpkgs/makedumpfile/template +++ b/srcpkgs/makedumpfile/template @@ -1,6 +1,6 @@ # Template file for 'makedumpfile' pkgname=makedumpfile -version=1.7.0 +version=1.7.1 revision=1 makedepends="elfutils-devel zlib-devel bzip2-devel liblzma-devel lzo-devel" depends="perl" @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/makedumpfile/makedumpfile" distfiles="${homepage}/archive/refs/tags/${version}.tar.gz" -checksum=8985f8df249087ea68c6051dec6dac3ef0703fe2aa87d0266f3951f93aa8da5e +checksum=cb04b1bd0e750d0d0ac1b43b759b326d4a3797b0af08e0c269d1b155893fb664 post_extract() { sed -i '/#define PAGESIZE/i#undef PAGESIZE' makedumpfile.h From 3ac5560cdcd6d9da1c0c879b2b8f4d9cf84aeba2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 19 Apr 2022 13:19:56 +0200 Subject: [PATCH 1167/2369] mcelog: update to 181. --- srcpkgs/mcelog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template index 9707998bd78..90429083870 100644 --- a/srcpkgs/mcelog/template +++ b/srcpkgs/mcelog/template @@ -1,6 +1,6 @@ # Template file for 'mcelog' pkgname=mcelog -version=180 +version=181 revision=1 archs="i686* x86_64*" hostmakedepends="python3" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="http://www.mcelog.org/" distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz" -checksum=e9c82b565da06673c2630f9e6bc668634ad7d2c7f13c70db1900cce110ae62dc +checksum=924e84e235231fd2b5e6ad527e87fd8977113cf170d8bd4ebac5d4781ff7b172 do_build() { make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs} From 1bfc1affdb39fa6ada6e9dfa74812def1e4fb03d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 18 Apr 2022 19:50:48 +0200 Subject: [PATCH 1168/2369] linux5.4: update to 5.4.189. --- 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 ac636bc1d2f..770cb9be83a 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.188 +version=5.4.189 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=9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc +checksum=8485d536531833cd2dbca0a7f267daff69ede5c9831cb693acc8318447e568c6 python_version=3 nodebug=yes # -dbg package is generated below manually From 0d4711905379c7c563ac9fb4bd6ef837c203170c Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 18 Apr 2022 19:54:03 +0200 Subject: [PATCH 1169/2369] linux4.19: update to 4.19.238. --- 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 cb61654da41..d6916078343 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.237 +version=4.19.238 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=bafff35102cc486ec2bf94c6d908be8e24017b2e4a1873f52f24c855eb220cd8 +checksum=83b74545c5d380384e09955c26e786bf9ee81a44bcf9347f2ca2ad3d31b46b7a python_version=3 nodebug=yes # -dbg package is generated below manually From f52c403a3ba5aeb46f2b1a4eec7d3bb94f362b6f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 16 Apr 2022 14:02:47 +0200 Subject: [PATCH 1170/2369] texlive2022-bin: install infraonly by default, tweak INSTALL.msg. --- srcpkgs/texlive2022-bin/INSTALL.msg | 18 +++++------------- srcpkgs/texlive2022-bin/template | 11 +++++++---- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/srcpkgs/texlive2022-bin/INSTALL.msg b/srcpkgs/texlive2022-bin/INSTALL.msg index 05a58d965c7..1ccb0429afc 100644 --- a/srcpkgs/texlive2022-bin/INSTALL.msg +++ b/srcpkgs/texlive2022-bin/INSTALL.msg @@ -1,11 +1,4 @@ -- TeXLive is free software see the files: - - /usr/share/licenses/texlive2022-bin/LICENSE.TL - /usr/share/licenses/texlive2022-bin/LICENSE.CTAN - -===================================================================== - - To update you TeXLive installation use only the program + To update your TeX Live installation use only the program /opt/texlive/2022/bin//tlmgr @@ -13,13 +6,12 @@ - x86_64-linux ==> x86_64 architecture - i386-linux ==> i386 architecture - see: - + for details see: http://www.tug.org/texlive/doc/tlmgr.html#EXAMPLES - - for the details and the documentation in - WARNING: To avoid messing up your TeXLive installation, DON'T use + WARNING: To avoid messing up your TeX Live installation, DON'T use the installation scripts in /opt/texlive-installer. + This package only installs TeX Live infrastructure now, not TeX Live itself. + For a basic installation (previous default), run "tlmgr install scheme-basic". For a full installation, run "tlmgr install scheme-full". diff --git a/srcpkgs/texlive2022-bin/template b/srcpkgs/texlive2022-bin/template index 902d4dc245d..679a1e4e4bd 100644 --- a/srcpkgs/texlive2022-bin/template +++ b/srcpkgs/texlive2022-bin/template @@ -1,7 +1,7 @@ # Template file for 'texlive2022-bin' pkgname=texlive2022-bin version=2022 -revision=1 +revision=2 archs="x86_64* i686 aarch64 arm*" create_wrksrc=yes depends="cairo pixman graphite gd poppler libsigsegv @@ -15,8 +15,9 @@ distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>$ checksum=e67edec49df6b7c4a987a7d5a9b31bcf41258220f9ac841c7a836080cd334fb5 # Package build options -build_options="basic small medium full" -build_options_default="small" +build_options="infraonly basic small medium full" +build_options_default="infraonly" +desc_option_infraonly="Install TeXLive infrastructure only" desc_option_basic="Install TeXLive using scheme-basic" desc_option_small="Install TeXLive using scheme-small" desc_option_medium="Install TeXLive using scheme-medium" @@ -31,7 +32,9 @@ do_install() { vmkdir opt/texlive${version}-installer vcopy "install-tl-*/*" /opt/texlive${version}-installer vinstall ${FILESDIR}/void.profile 644 opt/texlive${version}-installer - if [ "$build_option_basic" ]; then + if [ "$build_option_infraonly" ]; then + echo "selected_scheme scheme-infraonly" + elif [ "$build_option_basic" ]; then echo "selected_scheme scheme-basic" elif [ "$build_option_small" ]; then echo "selected_scheme scheme-small" From 2b514fb833ad5dfe354d3d6b03d36de15a0eb1fb Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 18 Apr 2022 14:38:58 -0400 Subject: [PATCH 1171/2369] openjdk17: update to 17.0.3+5. --- srcpkgs/openjdk17/template | 43 +++++++++++++++----------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index 19fa38707f0..7e368f9b687 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -1,15 +1,14 @@ # Template file for 'openjdk17' -_java_ver=17 -_java_min_ver=0 -_java_sec_ver=3 -_jdk_update=1 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk17 -version="${_base_version}+${_jdk_update}" +version=17.0.3+5 revision=1 -wrksrc="jdk${_java_ver}u-jdk-${_base_version}-${_jdk_update}" +_gtest_ver=1.8.1 +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +create_wrksrc=yes +build_wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --enable-unlimited-crypto @@ -19,8 +18,9 @@ configure_args="--disable-warnings-as-errors --with-libpng=system --with-lcms=system --with-jtreg=no - --with-gtest=${XBPS_BUILDDIR}/googletest-release-1.8.1 + --with-gtest=../googletest-release-${_gtest_ver} --with-debug-level=release + --with-native-debug-symbols=internal --with-jobs=${XBPS_ORIG_MAKEJOBS} --with-version-pre= --with-version-build=${_jdk_update} @@ -38,15 +38,16 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel" depends="${pkgname}-jre-${version}_${revision}" -provides="java-environment-${version}_1" short_desc="OpenJDK Java Development Kit (version ${_java_ver})" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz - https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz" -checksum="0fac6d90091fc16678a14349e578f6c1cf29738d55508f9f723fbb69469f6867 + https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz" +checksum="a557f4d2972bbbbcdc12fa7e167ad60b4ee1461a9bc7ad259a003172c34e6331 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c" +provides="java-environment-${version}_1" +patch_args="-Np1 --directory=$build_wrksrc" # Build is still parallel, but don't use -jN. disable_parallel_build=yes @@ -79,10 +80,6 @@ else configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk17" fi -if [ -n "$XBPS_DEBUG_PKGS" ]; then - configure_args+=" --with-native-debug-symbols=internal" -fi - alternatives=" java:/usr/bin/java:/${_jdk_home}/bin/java java:/usr/bin/jfr:/${_jdk_home}/bin/jfr @@ -120,9 +117,9 @@ alternatives=" " post_extract() { - chmod +x configure + chmod +x $build_wrksrc/configure if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - rm -r src/jdk.hotspot.agent + rm -r $build_wrksrc/src/jdk.hotspot.agent fi } @@ -171,11 +168,6 @@ post_install() { rm -rf ./ca } -do_clean() { - # clean up gtest - rm -rf ${XBPS_BUILDDIR}/googletest-release-* -} - subpackages="openjdk17-src openjdk17-jre openjdk17-doc" openjdk17-jre_package() { @@ -213,11 +205,10 @@ openjdk17-doc_package() { noshlibprovides=yes short_desc+=" - documentation" pkg_install() { - cd ${wrksrc} if [ "$build_option_docs" ]; then local _docdir=usr/share/doc/openjdk$_java_ver vmkdir $_docdir - cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir + cp -a $wrksrc/$build_wrksrc/build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir fi vmove $_jdk_home/man/man1 } From 5e01310db47778a17bd812f9ff1a3e3865fbd2fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Tue, 19 Apr 2022 16:58:10 +0200 Subject: [PATCH 1172/2369] postfix: update to 3.7.1. --- srcpkgs/postfix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template index 38a7e61f217..466de1f1910 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -1,6 +1,6 @@ # Template file for 'postfix' pkgname=postfix -version=3.7.0 +version=3.7.1 revision=1 hostmakedepends="perl m4" makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="IPL-1.0, EPL-2.0" homepage="https://www.postfix.org/" distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz" -checksum=645c6a74959703f8dff5b696b2df2e8bc0c91ac530127a21c998e3defbb9528c +checksum=25c3e7ec09955af873407af3070fd259da8477b80e2f4663c5fdc00a2cc947ee system_accounts="postfix" postfix_homedir="/var/spool/postfix" From f0588f76c45d40e94497a526d0f41c8a53948a28 Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated Date: Mon, 18 Apr 2022 16:04:34 +0200 Subject: [PATCH 1173/2369] font-unifont-bdf: update to 14.0.03. --- srcpkgs/font-unifont-bdf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template index ce94f9be9c3..675429a16aa 100644 --- a/srcpkgs/font-unifont-bdf/template +++ b/srcpkgs/font-unifont-bdf/template @@ -1,6 +1,6 @@ # Template file for 'font-unifont-bdf' pkgname=font-unifont-bdf -version=14.0.01 +version=14.0.03 revision=1 create_wrksrc=yes depends="font-util" @@ -9,7 +9,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://unifoundry.com/unifont/index.html" distfiles="http://unifoundry.com/pub/unifont/unifont-${version}/font-builds/unifont-${version}.bdf.gz" -checksum=391d194f6307fcd0915daafd360509a734e26f3e4013e63d47deb2530d59e66e +checksum=6323f50b1b0b50224988e5f7aec2bd26bd78563bbb7e05c417dc5b7b4a06acb5 font_dirs=/usr/share/fonts/misc do_install() { From 54e366d6ec6fc9b54391d5f7dac5b4d63c585e40 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sun, 17 Apr 2022 16:31:52 +0300 Subject: [PATCH 1174/2369] skype: update to 8.83.0.408. --- srcpkgs/skype/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index 7760c535079..5305633214e 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.82.0.403 +version=8.83.0.408 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=df903a805c3db301d8846e5fcfe2ec5acbea720c49f3031edb50d416f5a52a24 +checksum=f6dc153980f74b3b75241b2c4d0c1c866391963778af5d96fa0aa28b24a693c2 repository="nonfree" nostrip="yes" From 8a9d0fa04ca7411ad91c77e42f3a6b1e1474c553 Mon Sep 17 00:00:00 2001 From: Tiago Carvalho Date: Wed, 13 Apr 2022 18:28:10 +0100 Subject: [PATCH 1175/2369] thunderbird-i18n: update to 91.8.0. --- srcpkgs/thunderbird-i18n/template | 110 +++++++++++++++--------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index f95f0e304a8..0a299d66d96 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,6 +1,6 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=91.5.0 +version=91.8.0 revision=1 build_style=meta short_desc="Thunderbird language packs" @@ -95,57 +95,57 @@ _pkgtmpl() { } } -checksum="153b74896853e462e9ae9cf9098f0b6f34116559975861e6c9f04e8010c0842a - fd018fcbeceace184dc1f4b1e1623511eb0a8ecc1ae1b956ffa170842fefcc73 - 550f2310775beb5ce913b6bfa593fa04776c1927c87cf8079eaaf10f6d8b0537 - 99c61014976faafeb2e813ad74b1678e2128ddc0a76bfcbba7cf6c602c11a223 - 7aeb9c9c9aaaacb2a84a5491aff9588c8b426ea08e0a43d2c63c091b47cfc5d0 - a30026739c7e130ad1d9196c19da72eea6c16c7571f6073aea4c0f80f10d8f3c - 7941933c4c80d4f1109db2a3f584518c6995aa8746b0f4ab4a6f70706becb0de - 1840fbf5e814853fdd976e20bb4a432c210321bdf8cdc5b5c26a593afea41d94 - d04205f28a0ffed85aa1b11de42d46063db482392a71e0ad8f5074b142c6deb8 - 1dc362d91c8699a81ec4070af6422f97bd275ef01acda4dd41634c1af6415609 - 9207a8c1a98ca2fa51efb54f12a79d9cae0e03faf5941bfc6cd66b0f02bddd40 - fac6239a5e043b75ff595fa670b23f0520e93bd3c8e4aabce0340db72dab1909 - 4642127f3e521d130d246acbe8df7f2f8b2b461cd357839773bc0f73b76ddf82 - adce6a6c77997f9e9fe08a20012ce8ed88116963599c348763d36a0c196af1a1 - 6608e4c2bb3c396cb35794d5b90eec5c3403b319e3d220088331b7b3fb5f45e6 - d6cbd9e7089f05928202cb95340d94322714036cdf2bd50777e09300d60b35e2 - 965b43d20a9abaabe8f7d07dd5bf2c522d73754e52dc9eb4e917568e14f03ef4 - 17a78d93de483a0097504683b29752449ea1cdd0578313428b39c9d6959b4fc2 - 75238449104d85368cfbefb2d06fe92113f4ba719fbfa1d4da5fe46a3be63d0f - f8765c44569a1eead7f96c30cae8e34557597c03ae0778859135e637370f6769 - 1675ad25f3d7372fe8e004f1a5df4eeb4d11042574d67546d99c696f76bb416b - 17d1c9c752a31c0d123de4fa84b5c0a06bdadb7ecfb3fedab4cad22289ac2cba - eaeedd14c00ffb253b6d6ccf66f131940a44e190c77e232ded88a13b6b7e3b59 - 5ab29c16330c3951236839af54081d282cf0de17f18e1421b7e6d812cafefff4 - d6a9ab1ca1a3f9613a00f1f6296568d3da6ce850a7e797ce377e9516c8b78837 - 38bba476644a2f0ccc636ac176e501b85f3ef8c912c7ff9b9cc4ebac74d83cdd - 4338ff7ef6adfaf0308616128bf00d190372b8818d421527dc5742d8f3ed4918 - 38d88509c005ad62601a368a284b745570e33a9724da1a1ff41e6feaaa4273fc - 031b23573ec355d23ebe18615a86216ab30a95e04525ace23f7f4d7ba8245c41 - cc95bfa23f1468ca5a670dea7d67b579d18166332fc17942c4733ce249a882ce - b21a892bd65dbd12e6f047079bfa8e6175c58167e7c8defc3ee285eefd738d41 - 494796c4657fa6283400b9cd9ff54bed947068222f9e94d0131033d953d37176 - 44e135062450c53044b412447b6d0a722fc5a99658ed7ec3c741dbbe91ecd736 - ea62afd388cc7c30c0a1a2e161e1154742e535b1177c718ca0620de7e296fe61 - 67d954bd71dc1a21d28bd410a0c633c4c3d93bcb53095d349c470a270c242d39 - 6a63ff0bbf96411935ba101baa7286315e70ccbc0bbc1e8f5ede822c901a23b2 - 18d6578ffebd4867b01918f7a154a317b054d5fd55418f61657cac05a995ee1a - 22bdf3404e59627ab73ee64394efb0275741b7b9c1d31d134d5612242e1858e6 - 9eb94a5b380f084625e605f20a388a9b75455c07e49bc73ab4bc94e2d52baee8 - 60ed67eb52c673b168b42f385ac05e4f0cec906002f46dd0dabbf807777c3302 - 6711681f44fd41ee493c7ccd618d98ecce24354073d72ca59ca60df1a3b53f2b - f0fe96cec503d05033651489aa6251f8279fa0f0323818df9f17fce56cdeebb6 - b012c406274bb8a4131546cf363d4828a7e55f1e6221559d5313137de886bf7f - bce8e92d31183afb48fba2b78339d9404cf87b67a9d2f13db09672fc8539dacf - 6a3c56c782219a0f3951d90700f3c63cc69266f8d4546f19281194cc3101588b - a8bfaa012718716c45727f207fadfebdf1dc06a66628d284bc60d8d37087caa6 - cfecad5b1cf8c233ad01af7489959d5d680028851fb676356ace00cb737b7eae - 8a0aea8d91a3978378166219f5aaebe7aca91b199fcfe3227752ed3f443d3612 - 6ff82ddcf1974b8bc7a44789e1d4238e92a8d5cea2c14daf1a4f57f6ae98c983 - 9483d7dca9c450483c9be9c21ff77e191f62e41120fdc186fe766bfedec805af - 14eccd3edf9c4be0ece562c4bda88bb0512d846c79e5480478569493268a6a6f - 3be16dd793abe690471bdfc633c41bad85172603aeb78145ca5290332ece9ff6 - f886871be3055d85d9bfdff63b5d24209af97a04d8504f5afb631ef0a1372088 - abd7ff3fae4d2d3459bff96bdde26cc62f045edbaf9eba8b457ade3c17f7a57e" +checksum="e338b3f00ce13b8b98213d9fb53dbdeaef8082517a2cda06a62c59d8f4021e1e + 0c6339b23d2de88b0cea5473289c05820d44fd89999037285ed19b6394e5d221 + 4f8254201247e6d8e01924715d101e4bce8f53d3799f129a0003b528cd994839 + f7c99eb62ab9ade49d2022edca802b4ebbdf53a753c378315cccf9bf2126bff3 + 13191acb9cec0bdd45527e09e1f28205fad9e4b67682018f9f0aa6d096b40a7d + 08e7f631467b5b1aca8d35c38936c854c3b8bbba975d1b30b5d43637e1b1cc3d + 8b40a658dd14af8b268bef3ae656524165c9e432f2df882c21a083b477379a76 + 68247d9f9e33f803446ba4c114d5db8173dc46aa93bf06c828a2d154c69e4ce6 + da155c974f591a6f7b29f42ddb82ed94fee8db34b0b7c67a18d747c38138fb7b + 3cf905249aeb0676d8a6206746c1d0ee03fba579bd39d9ec8e9cdc8a23ba6232 + 2afa46cf5301607dc1b18933bd3877842ffcb86563bb8ddf859114aa74bacf1c + d437fd884c900cdce7c22bfdf445819ebe8f27d6d2b32392e6ab4291188403b5 + 458ff1cd1a3a3357d6592f04fadc5bb6c06a1a8ae4e095de599c0a4b4f3f4c39 + 5a3cc430c53f3a2e7258be9c4dc90002e74b1df4fedd57d748034facdf09462f + aa41718568841dd4b2487023d7c68b88a7d4cce6634c2c8b2af5a5024e910491 + 8e08fca9f5b4284cd78cd80f54f2005cfaa9db9b2df596aabff3cf85fed3b032 + 00647c73c5d834c2daa7b1c04c152ba70e530f8917a88b48b876634e6735a08d + 3b367c2aeb5c0b7e7158570cba56473f36f0e4e2105528f6cff6424a8bb1b188 + 602f80592d721c0d1157845c9cf83547b4497842cfd37ae5466190d5f89fc2ca + 310a50fbd029f0bbb5d7b3b80b9f0882ddf03667caa2c93a1f2c878c32bd1404 + cf75c1a2992d11b2ea5f4160d34f793fd00d7eae2c3604fe35a96303bdd5b6d0 + 39255ccf6c1661287fab017e95a3c1eb74619d408bdce09dd359fd58f2303ca4 + 41e9b2df204081b13ff2adb391f0414b2b0ba4bf83bf2118a30c21265b19983e + f6be5a2cf4006b31459a887e14f69e61505e3577ece674e81356ae53b025b4ab + 22575da8459ceb57e1dd3e02c9a5e7219b894767438d810b94dfd6c4e97bb3ae + 27487ba8f1115f1aff0245629fdc1b785391d5af98521e58937677f173eb0f45 + 666bd43ccbdb37f097477273aa8ca11b9716c024f8c162bb81a1b07006044bc0 + 1907c178beac70dafdab55acbc87e56a9913142ffaa85be6cbe541361d53d24c + 20e7464b43f12dcdcb3892a6e9c7d7c46a2385a82953c388599cbeeabc362786 + 6a7e2ee51d92aa5db52816de0dbf103ce2abf40a34411498fb7b2380dc87101d + 2d2be878ba6d5afcb6823f58a6939ebe895290a925b13234ed2c63d013ad5165 + d329c730c338b7d9e4a3fc07fae4537dd0be0b86317db42b1270daaeb7025f98 + 51ead8dd506cc5aaf4dfb58be942b3061869c9c26bfec9b29930d0a627c32aa9 + ba4191dca0ec8a9eb70cc3d9d0a20d50fa87a5c0be3190db0ef5867532ef8318 + 4e849ddec5f68004315b93dc8e382774101a815e9bf476f10c8e804a9657aa2e + 04b06a1a5842962116ef0eae6dfa263197e04b5a560ce7386f786322b5199364 + 8f81e86174d6126e0e0551b1431713f09ca66e3dc546cd5a7838d17c2cddf52e + 1ca4983cf2de4a0ac8debdfba0c0e3844cd5020199f4ab054864dda7ae2170da + f625cda77e82c13e358d33df96d613ea8145a170b54ce399bfe960e0b88ef146 + 93b79805973de19cd0beaea81add9a0f40e3746b88648c6c7e90a0fbba857777 + 368b268f6b08b5e1d0f1ffeeb662ab4460bc3b60d6c3ced54a6efff44e6bec2e + 8de648e97c00fc1988ae5788944c3821304c49f49a669797e3bdc4c3637ff336 + 1489f343e79064d24549556f7d7164ea0e9e0e65256290f8287a00fdd256bd04 + 0f004c54f4fce861b709d6f0d394c6ebb01a16aedc29e6599f56c7d043e18936 + 8f7a814d8a47efa9fe1509b0ea450697e2e6007beb5b78e2937b3f2b133402b3 + 7db9b294668932d2e59309c452ab74d0d737eb6c8220f6fa5aafd7be66ea42dd + b9c81d14520928957f95e40faa80a8ed63e76758652fb3a73458a848d9703ac7 + 1129915d753dc68c4d4e23e6d4dea5de7c911f7d3204448b231f8755d7447c70 + 76badde28f93f4d8e05c163a357223bf1a85e9301cf6221b222553f637e33532 + c50d5aa28e33dee903a31b1ea73c01575d7d784cc86dfec0f853dc51e31bef40 + 6b897ca847c9d497895d2dc2164582836407902c2784219617ce14b80b140739 + 4cd25edb40fd1309d1121cb582001d580605eb12ec414fe4125d580b809927c9 + 2b822f814877d3b20ced442e466ff78cc0e2effa971b5e7b16ddd6bb9500c7c3 + b2962ead550ab841c4981a70a0f80f1baeb2d10165dc7536d069598643f3d4d5" From 7252807bfa2367deb11f2d299c54d5188f1711fb Mon Sep 17 00:00:00 2001 From: Tiago Carvalho Date: Wed, 13 Apr 2022 18:28:13 +0100 Subject: [PATCH 1176/2369] thunderbird: update to 91.8.0. --- srcpkgs/thunderbird/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 6ce073f6f0f..bf03d0a2eb6 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=91.5.0 +version=91.8.0 revision=1 build_helper="rust" short_desc="Standalone Mail/News reader" @@ -11,7 +11,7 @@ maintainer="Érico Nogueira " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.thunderbird.net/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=b89a8e1b57d5be828a7346e817120d7c763a258a2397a23393b7ceb3ce810ab2 +checksum=4a93d1773e17aa110341428165581f0176c347d55dd7f6cbed789ca8369da6fa lib32disabled=yes From b4eac76aff55cda5326e108b49a855fd11a944fa Mon Sep 17 00:00:00 2001 From: Tung Anh Vu Date: Tue, 15 Mar 2022 20:50:59 +0100 Subject: [PATCH 1177/2369] texlive: Pull latexmk into a subpackage --- srcpkgs/texlive-latexmk | 1 + srcpkgs/texlive/template | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/texlive-latexmk diff --git a/srcpkgs/texlive-latexmk b/srcpkgs/texlive-latexmk new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-latexmk @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template index cf3fa5c8044..b8bb1919fde 100644 --- a/srcpkgs/texlive/template +++ b/srcpkgs/texlive/template @@ -1,7 +1,7 @@ # Template file for 'texlive' pkgname=texlive version=20210325 -revision=2 +revision=3 wrksrc="texlive-${version}-source" build_wrksrc="build" build_style=gnu-configure @@ -71,7 +71,7 @@ makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel libXaw-devel" -depends="dialog ghostscript perl-Tk texlive-core xbps-triggers" +depends="dialog ghostscript perl-Tk texlive-core texlive-latexmk xbps-triggers" short_desc="TeX Live" maintainer="fosslinux " license="GPL-2.0-or-later" @@ -393,3 +393,12 @@ texlive-PythonTeX_package() { vmove usr/share/texmf-dist/scripts/pythontex } } + +texlive-latexmk_package() { + depends="perl" + short_desc+=" - script for compiling the correct number of times" + pkg_install() { + vmove usr/bin/latexmk + vmove usr/share/texmf-dist/scripts/latexmk + } +} From 8f4ee4855b1f4a70abc7d54113f1a3d91ff1f716 Mon Sep 17 00:00:00 2001 From: shtayerc Date: Tue, 19 Apr 2022 20:14:14 +0200 Subject: [PATCH 1178/2369] stockfish: update to 15 --- srcpkgs/stockfish/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template index ab86e2e00d8..4a0284fce9a 100644 --- a/srcpkgs/stockfish/template +++ b/srcpkgs/stockfish/template @@ -1,8 +1,8 @@ # Template file for 'stockfish' pkgname=stockfish -version=14.1 +version=15 revision=1 -_net_file=nn-13406b1dcbe0.nnue +_net_file=nn-6877cd24400e.nnue wrksrc="Stockfish-sf_${version}" build_wrksrc=src build_style=gnu-makefile @@ -10,13 +10,13 @@ make_build_target=build make_use_env=yes hostmakedepends="tar" short_desc="Free UCI chess engine derived from Glaurung" -maintainer="cipr3s " +maintainer="shtayerc " license="GPL-3.0-or-later" homepage="http://stockfishchess.org/" distfiles="https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz https://tests.stockfishchess.org/api/nn/${_net_file}" -checksum="11d71018af47ba047175f846be72d8d9878df698e9b5d708ab158cf530633600 - 13406b1dcbe0a36dfc5e07da51d8db38b7a45d7da43078ec25a7624c2b83236f" +checksum="0553fe53ea57ce6641048049d1a17d4807db67eecd3531a3749401362a27c983 + 6877cd24400e01b19ff12ae3068ae242152802bdd330e66f7b6703865251d6e3" skip_extraction="${_net_file}" LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152" From 18021642c04cc75da1131b1e86af37dd71dfc61f Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Thu, 7 Apr 2022 23:08:41 +0200 Subject: [PATCH 1179/2369] dbeaver: update to 22.0.3. --- srcpkgs/dbeaver/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index 74a67e77e4f..a1e7ca0c300 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -1,7 +1,7 @@ # Template file for 'dbeaver' pkgname=dbeaver -version=22.0.1 -revision=2 +version=22.0.3 +revision=1 # the build downloads binaries linked to glibc archs="x86_64 aarch64" hostmakedepends="apache-maven" @@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum " license="Apache-2.0" homepage="https://dbeaver.io" distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz" -checksum=2258f77b6e68fc0784dd7d92fc1297695b57e6ca22e3d454f21f328bf61e2bf0 +checksum=5af628ec7cd4c0e63fd074dd92d5668788136321cc273f778f20ff8c7907323a nopie=true if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then From eef8356dd39d821db4939b70f411540136a4c4c8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 19 Apr 2022 08:18:10 -0400 Subject: [PATCH 1180/2369] maturin: update to 0.12.12. --- srcpkgs/maturin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index a6c1cbdd3d7..64140c2f5fe 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -1,6 +1,6 @@ # Template file for 'maturin' pkgname=maturin -version=0.12.11 +version=0.12.12 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="4d39f15fae9c01f2f23a544fc26b20c68693ec03f820b30ca5f505647c452be1 +checksum="0da8b649dc91278363d6a07fee26ea53b8f2d9cd06139034dea3a5506baf12a0 30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e" # Tests use unstable features and fail to build make_check=no From f3ac870c4b6444d0aa0b8705f683cf27f0e541a3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 19 Apr 2022 08:19:36 -0400 Subject: [PATCH 1181/2369] python3-imageio: update to 2.17.0. --- srcpkgs/python3-imageio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template index b129927d534..a5167cbc45e 100644 --- a/srcpkgs/python3-imageio/template +++ b/srcpkgs/python3-imageio/template @@ -1,6 +1,6 @@ # Template file for 'python3-imageio' pkgname=python3-imageio -version=2.16.1 +version=2.17.0 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford " license="BSD-2-Clause" homepage="https://github.com/imageio/imageio" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=97f6d150d3a4b2424810fd3042ab794af45365f168031aee6f0be21c00e90d2f +checksum=34173213c7e90096743bf077d888dd1c0300e8ebfad8184ee24a968cc860af5c post_install() { vlicense LICENSE From 69f1d05f698199dd579b6b874200a58cda11ab79 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 19 Apr 2022 08:27:26 -0400 Subject: [PATCH 1182/2369] python3-hypothesis: update to 6.43.0. --- srcpkgs/python3-hypothesis/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template index d214e0ec6b6..fd24d4f5249 100644 --- a/srcpkgs/python3-hypothesis/template +++ b/srcpkgs/python3-hypothesis/template @@ -1,6 +1,6 @@ # Template file for 'python3-hypothesis' pkgname=python3-hypothesis -version=6.41.0 +version=6.43.0 revision=1 wrksrc="hypothesis-hypothesis-python-${version}" build_wrksrc=hypothesis-python @@ -15,7 +15,7 @@ license="MPL-2.0" homepage="https://hypothesis.works/" changelog="https://hypothesis.readthedocs.io/en/latest/changes.html" distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz" -checksum=0fa002e65956bedead5149d2ffa5875cbcb5ca1a3f95301fcf2ad5a241829d91 +checksum=57e04ecd3fb433604a17dbcf535947734f98bcced562a71c67513d98919d1d3b do_check() { # Manually run the tests that tox considers part of the "full" suite, From 89f66cb458dfcb4cf8ccffb505ec6fc07c9b59de Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 19 Apr 2022 08:35:18 -0400 Subject: [PATCH 1183/2369] python3-typing_extensions: update to 4.2.0. --- srcpkgs/python3-typing_extensions/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-typing_extensions/template b/srcpkgs/python3-typing_extensions/template index a9917a17742..413acfdb1c3 100644 --- a/srcpkgs/python3-typing_extensions/template +++ b/srcpkgs/python3-typing_extensions/template @@ -1,14 +1,14 @@ # Template file for 'python3-typing_extensions' pkgname=python3-typing_extensions -version=3.10.0.2 +version=4.2.0 revision=1 wrksrc="${pkgname#python3-}-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools" +build_style=python3-pep517 +hostmakedepends="python3-flit_core" depends="python3" short_desc="Backported and Experimental Type Hints for Python 3.5+" maintainer="Denis Revin " license="Python-2.0" homepage="https://github.com/python/typing" distfiles="${PYPI_SITE}/t/typing_extensions/typing_extensions-${version}.tar.gz" -checksum=49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e +checksum=f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376 From 49c75c8065e27023aa8bcb1cf3ee52bae1b0115f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 19 Apr 2022 08:37:24 -0400 Subject: [PATCH 1184/2369] python3-pytools: update to 2022.1.4. --- srcpkgs/python3-pytools/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template index 1cbf56dc08d..6a57301a4d6 100644 --- a/srcpkgs/python3-pytools/template +++ b/srcpkgs/python3-pytools/template @@ -1,18 +1,18 @@ # Template file for 'python3-pytools' pkgname=python3-pytools -version=2022.1.2 +version=2022.1.4 revision=1 wrksrc=${pkgname#*-}-${version} build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-decorator python3-appdirs python3-six python3-numpy" -checkdepends="python3-pytest python3-mpi4py $depends" +depends="python3-platformdirs python3-numpy python3-typing_extensions" +checkdepends="python3-pytest $depends" short_desc="Python utilities from Andreas Kloeckner" maintainer="Andrew J. Hesford " license="X11" homepage="https://pypi.org/project/pytools" distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz" -checksum=5e824101880a246354756365880a65bb416f6a8cab6513b68fcbb48fba090fcb +checksum=ae25f7c9b196fcd0d15e53bfe05236fe7bc5efd923810fbaeeee1a4bc4b6764a post_install() { vlicense LICENSE From 3dc42a219ad910bc498d499c6f995e3549f886c7 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 19 Apr 2022 08:40:20 -0400 Subject: [PATCH 1185/2369] python3-pyopencl: update to 2022.1.3. --- srcpkgs/python3-pyopencl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template index 7f3c35a88e9..ccd4812bcfe 100644 --- a/srcpkgs/python3-pyopencl/template +++ b/srcpkgs/python3-pyopencl/template @@ -1,18 +1,18 @@ # Template file for 'python3-pyopencl' pkgname=python3-pyopencl -version=2022.1 +version=2022.1.3 revision=1 wrksrc=${pkgname#*-}-${version} build_style=python3-module hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy" makedepends="opencl2-headers ocl-icd-devel python3-pybind11" -depends="python3-pytools" +depends="python3-numpy python3-pytools python3-platformdirs" short_desc="OpenCL bindings for Python 3" maintainer="Andrew J. Hesford " license="X11, Apache-2.0, BSD-3-Clause" homepage="https://mathema.tician.de/software/pyopencl" distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz" -checksum=24c6d9a0a1ff7609f3d7365ebd8778616a5433c426566c2c8e35ffab00ef22c4 +checksum=18386938b54855696460b4b19a210300f241a28eb3255748be5f279aef664d6d # Tests require a working OpenCL platform make_check=no From 9edc758f257ce400f15cd5eaf002b23508b85b95 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 19 Apr 2022 08:40:33 -0400 Subject: [PATCH 1186/2369] python3-tifffile: update to 2022.4.8. --- 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 65b0d119ade..b8fb29af178 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.3.25 +version=2022.4.8 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=620c68f3eeb2b1923e1b3a8bf8a8b7f79498bcd9cd34051ad567c44f0a404353 +checksum=f4dafa604c949ebedc60a0fd41be0048399fea72b529efcff6330a29590ee5f6 # Tests require unpackaged fsspec make_check=no From 5a242e760c05b4675b7f70b7d50ca788dbc20dc2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 19 Apr 2022 08:40:46 -0400 Subject: [PATCH 1187/2369] python3-websockets: update to 10.3. --- srcpkgs/python3-websockets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-websockets/template b/srcpkgs/python3-websockets/template index 08f829cf4b3..7c02b7ec8ed 100644 --- a/srcpkgs/python3-websockets/template +++ b/srcpkgs/python3-websockets/template @@ -1,6 +1,6 @@ # Template file for 'python3-websockets' pkgname=python3-websockets -version=10.2 +version=10.3 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -13,7 +13,7 @@ license="BSD-3-Clause" homepage="https://websockets.readthedocs.io/en/stable/" changelog="https://websockets.readthedocs.io/en/stable/project/changelog.html" distfiles="${PYPI_SITE}/w/websockets/websockets-${version}.tar.gz" -checksum=8351c3c86b08156337b0e4ece0e3c5ec3e01fcd14e8950996832a23c99416098 +checksum=fc06cc8073c8e87072138ba1e431300e2d408f054b27047d047b549455066ff4 # Package ships no tests make_check=no From cf76365e25b0da714372367e07487787094e718d Mon Sep 17 00:00:00 2001 From: Piraty Date: Tue, 19 Apr 2022 22:49:40 +0200 Subject: [PATCH 1188/2369] keepassxc: update to 2.7.1. upstream * switched from libsodium to botan * switched from quazip to minizip * relies on vendored (patched) ykcore [1] [1]: quote droidmonkey from IRC (keepassxc developer) > KeePassXC bundles the ykcore code due to lack of support from Yubico and > stratification of version across various operating system distros. > Additionally, KeePassXC has modified the API of ykcore to make it more > functional when using non-YubiKey keys (ie, OnlyKey) Closes: https://github.com/void-linux/void-packages/pull/36662 --- ...001-Link-ykcore-against-pthread-7807.patch | 33 +++++++++++++++++++ srcpkgs/keepassxc/template | 24 ++++++++------ 2 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch diff --git a/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch b/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch new file mode 100644 index 00000000000..cad44dae05d --- /dev/null +++ b/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch @@ -0,0 +1,33 @@ +From 7edeceec0376513002813efb7bf723fbcbe6752d Mon Sep 17 00:00:00 2001 +From: Piraty +Date: Fri, 15 Apr 2022 08:27:04 +0000 +Subject: [PATCH] Link ykcore against pthread (#7807) + +--- + src/thirdparty/ykcore/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/thirdparty/ykcore/CMakeLists.txt b/src/thirdparty/ykcore/CMakeLists.txt +index 47191ea7..103349f2 100644 +--- a/src/thirdparty/ykcore/CMakeLists.txt ++++ b/src/thirdparty/ykcore/CMakeLists.txt +@@ -27,13 +27,15 @@ if(WIN32) + elseif(UNIX AND NOT APPLE) + target_sources(ykcore PRIVATE ykcore_libusb-1.0.c) + ++ find_package(Threads REQUIRED) ++ + find_library(LIBUSB_LIBRARY NAMES usb-1.0) + find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb-1.0" "libusb") + if(NOT LIBUSB_LIBRARY OR NOT LIBUSB_INCLUDE_DIR) + message(FATAL_ERROR "libusb-1.0 dev package required, but not found") + endif() + +- target_link_libraries(ykcore PRIVATE ${LIBUSB_LIBRARY}) ++ target_link_libraries(ykcore PRIVATE Threads::Threads ${LIBUSB_LIBRARY}) + target_include_directories(ykcore PRIVATE ${LIBUSB_INCLUDE_DIR}) + target_compile_definitions(ykcore PRIVATE _GNU_SOURCE) + elseif(APPLE) +-- +2.35.1 + diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template index f3543633d6d..a4839235260 100644 --- a/srcpkgs/keepassxc/template +++ b/srcpkgs/keepassxc/template @@ -1,6 +1,6 @@ # Template file for 'keepassxc' pkgname=keepassxc -version=2.6.6 +version=2.7.1 revision=1 build_style=cmake configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON @@ -8,16 +8,17 @@ configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON -DWITH_XC_BROWSER=$(vopt_if browser ON OFF) -DWITH_XC_FDOSECRETS=$(vopt_if fdosecrets ON OFF) -DWITH_XC_KEESHARE=$(vopt_if keeshare ON OFF) - -DWITH_XC_KEESHARE_SECURE=$(vopt_if keeshare ON OFF) -DWITH_XC_NETWORKING=$(vopt_if network ON OFF) -DWITH_XC_SSHAGENT=$(vopt_if sshagent ON OFF) -DWITH_XC_YUBIKEY=$(vopt_if yubikey ON OFF)" -hostmakedepends="qt5-qmake qt5-host-tools ruby-asciidoctor" -makedepends="qt5-tools-devel qt5-svg-devel libgcrypt-devel libargon2-devel - qrencode-devel readline-devel libsodium-devel - $(vopt_if autotype 'qt5-x11extras-devel libXtst-devel libXi-devel') - $(vopt_if keeshare quazip-devel) - $(vopt_if yubikey 'libykpers-devel libyubikey-devel')" +hostmakedepends="qt5-devel ruby-asciidoctor" +makedepends="qt5-tools-devel qt5-svg-devel botan-devel libargon2-devel + qrencode-devel readline-devel pcsclite-devel + qt5-x11extras-devel + $(vopt_if autotype 'libXtst-devel libXi-devel') + $(vopt_if keeshare minizip-devel) + $(vopt_if yubikey 'libusb-devel')" +checkdepends="xvfb-run" short_desc="KeePassXC is a cross-platform port of “Keepass Password Safe”" maintainer="Piraty " license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only, @@ -25,9 +26,8 @@ license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only, homepage="https://keepassxc.org/" changelog="https://raw.githubusercontent.com/keepassxreboot/keepassxc/${version}/CHANGELOG.md" distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz" -checksum=3603b11ac39b289c47fac77fa150e05fd64b393d8cfdf5732dc3ef106650a4e2 +checksum=6001ba626c35c316dbda6de35736f012a2264f95139fcb4a094b8eb49b15d3e7 -# https://github.com/keepassxreboot/keepassxc/blob/a775031fe9471310e50232d1861d4991e2803aff/CMakeLists.txt#L46 build_options="autotype browser fdosecrets keeshare network sshagent yubikey" desc_option_autotype="Include auto-type" desc_option_browser="Include browser integration with keepassxc-browser-plugin" @@ -43,3 +43,7 @@ post_install() { vlicense LICENSE.BSD vlicense LICENSE.MIT } + +do_check() { + xvfb-run ninja -C build test || : #XXX: TestCli::testClip() fails +} From 0455168c3983b113d0190b4bfbb160b5b4926a99 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 9 Apr 2022 19:23:50 +0200 Subject: [PATCH 1189/2369] gstreamer1: update to 1.20.1 --- srcpkgs/gstreamer1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template index cc540feaf0b..ababbeeb987 100644 --- a/srcpkgs/gstreamer1/template +++ b/srcpkgs/gstreamer1/template @@ -1,7 +1,7 @@ # Template file for 'gstreamer1' pkgname=gstreamer1 -version=1.18.5 -revision=2 +version=1.20.1 +revision=1 wrksrc="gstreamer-${version}" build_style=meson build_helper="gir" @@ -17,7 +17,7 @@ maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz" -checksum=55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a +checksum=de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031 pre_check() { # gst_gstdatetime is known to fail according to LFS From 07edaec1143cd81b352c62a16a048ce5012144bd Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 9 Apr 2022 19:24:18 +0200 Subject: [PATCH 1190/2369] gst-plugins-base1: update to 1.20.1 --- srcpkgs/gst-plugins-base1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index fc954cc96cf..6ab6210e660 100644 --- a/srcpkgs/gst-plugins-base1/template +++ b/srcpkgs/gst-plugins-base1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-base1' pkgname=gst-plugins-base1 -version=1.18.5 +version=1.20.1 revision=1 wrksrc="${pkgname/1/}-${version}" build_style=meson @@ -22,7 +22,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 +checksum=96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204 build_options="cdparanoia gir sndio" build_options_default="cdparanoia gir" From f85f5cf93c278a906d757092442440ded2d56733 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 9 Apr 2022 19:28:16 +0200 Subject: [PATCH 1191/2369] gst-plugins-base1: update to 1.20.1 --- srcpkgs/gst-plugins-good1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index 974cdbc22c4..0ce7d1bce5c 100644 --- a/srcpkgs/gst-plugins-good1/template +++ b/srcpkgs/gst-plugins-good1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-good1' pkgname=gst-plugins-good1 -version=1.18.5 +version=1.20.1 revision=1 wrksrc="${pkgname/1/}-${version}" build_style=meson @@ -23,7 +23,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b +checksum=3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa build_options="gtk3" build_options_default="gtk3" From 927eae3e046b30cc56c35f0d3787a3f5f2714680 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 9 Apr 2022 19:49:44 +0200 Subject: [PATCH 1192/2369] gst-plugins-ugly1: update to 1.20.1 --- srcpkgs/gst-plugins-ugly1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index 8f3e16d98f8..ad8c128ef72 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-ugly1' pkgname=gst-plugins-ugly1 -version=1.18.5 +version=1.20.1 revision=1 wrksrc="${pkgname/1/}-${version}" build_style=meson @@ -16,4 +16,4 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9 +checksum=42035145e29983308d2828207bb4ef933ed0407bb587fb3a569738c6a57fdb19 From f8d9f2a321deaf412847770c671f9f27b72abcd9 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 9 Apr 2022 19:51:56 +0200 Subject: [PATCH 1193/2369] gst-plugins-bad1: update to 1.20.1 --- srcpkgs/gst-plugins-bad1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 451f73cb9f5..f7d20313321 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 -version=1.18.5 +version=1.20.1 revision=1 wrksrc="${pkgname/1/}-${version}" build_helper="gir" @@ -9,7 +9,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled - -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled + -Dmplex=disabled -Dmusepack=disabled -Dopenexr=disabled -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled -Dsrt=disabled -Dteletext=disabled -Dvoaacenc=disabled -Dvoamrwbenc=disabled -Dwildmidi=disabled -Dwpe=disabled -Ddirectfb=disabled @@ -36,7 +36,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e +checksum=09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848 build_options="gir gme" build_options_default="gir" From 0c4ff23411a6b97bf31aa84e537262e410258b08 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 9 Apr 2022 19:54:36 +0200 Subject: [PATCH 1194/2369] gst-libav: update to 1.20.1 --- srcpkgs/gst-libav/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index dc77de85702..333636d0657 100644 --- a/srcpkgs/gst-libav/template +++ b/srcpkgs/gst-libav/template @@ -1,6 +1,6 @@ # Template file for 'gst-libav' pkgname=gst-libav -version=1.18.5 +version=1.20.1 revision=1 wrksrc="${pkgname}-${version}" build_style=meson @@ -12,7 +12,7 @@ maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548 +checksum=91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7 case "$XBPS_TARGET_MACHINE" in *-musl) # Required by musl for M_SQRT1_2 From 7b433de8d0fa6393b1415b969b27750e0846907c Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 9 Apr 2022 19:56:44 +0200 Subject: [PATCH 1195/2369] gst-omx: update to 1.20.1 --- srcpkgs/gst-omx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template index 5e78c4c6854..d657aff289a 100644 --- a/srcpkgs/gst-omx/template +++ b/srcpkgs/gst-omx/template @@ -1,6 +1,6 @@ # Template file for 'gst-omx' pkgname=gst-omx -version=1.18.5 +version=1.20.1 revision=1 build_style=meson configure_args="-Dexamples=disabled -Dtarget=generic" @@ -11,4 +11,4 @@ maintainer="Orphaned " license="LGPL-2.1-only" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42 +checksum=86b52e30ebd0f59fcb5cf81a163211975f73ef32e5a6782562804646316bcd7c From cdb3c85efdbbf2589974369736a4f4d35dc8ae87 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 9 Apr 2022 19:59:29 +0200 Subject: [PATCH 1196/2369] gst1-python3: update to 1.20.1 --- srcpkgs/gst1-python3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template index 5f2fe61a696..4f6ead44409 100644 --- a/srcpkgs/gst1-python3/template +++ b/srcpkgs/gst1-python3/template @@ -1,6 +1,6 @@ # Template file for 'gst1-python3' pkgname=gst1-python3 -version=1.18.5 +version=1.20.1 revision=1 wrksrc="gst-python-${version}" build_style=meson @@ -12,4 +12,4 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz" -checksum=533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52 +checksum=ba6cd59faa3db3981d8c6982351c239d823c0b8e80b1acf58d2997b050289422 From 48c2980503b98f0604f2b18329498725ccf00f86 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 9 Apr 2022 20:05:05 +0200 Subject: [PATCH 1197/2369] gstreamer-vaapi: update to 1.20.1 --- srcpkgs/gstreamer-vaapi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template index 90a3a0a7579..1a934c852d1 100644 --- a/srcpkgs/gstreamer-vaapi/template +++ b/srcpkgs/gstreamer-vaapi/template @@ -1,6 +1,6 @@ # Template file for 'gstreamer-vaapi' pkgname=gstreamer-vaapi -version=1.18.5 +version=1.20.1 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog" distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" -checksum=4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b +checksum=87fbf6c537af9079c99a9aefe951da119e16e5bcc9cc8614f5035f062bf21137 pre_check() { # Seems to need certain hardware to pass From e9ee501d74f18b51b5aa1633fd40ef32d38d6071 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 9 Apr 2022 20:09:30 +0200 Subject: [PATCH 1198/2369] gst1-editing-services: update to 1.20.1 --- srcpkgs/gst1-editing-services/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template index 1613a7ababf..ad2318c059a 100644 --- a/srcpkgs/gst1-editing-services/template +++ b/srcpkgs/gst1-editing-services/template @@ -1,6 +1,6 @@ # Template file for 'gst1-editing-services' pkgname=gst1-editing-services -version=1.18.5 +version=1.20.1 revision=1 wrksrc="${pkgname/gst1/gst}-${version}" build_style=meson @@ -13,7 +13,7 @@ maintainer="Toyam Cox " license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gst}-${version}.tar.xz" -checksum=8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5 +checksum=6ace1b21b58e0110b7dadd469f79b77e2f47d6207604231492531ae9fd4148df do_check() { : # Tests fail in older versions as well From 1ed2977f4ef7bc1fb0fb7ecc4aacf8fecab74b3f Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 19 Apr 2022 23:48:56 +0200 Subject: [PATCH 1199/2369] mkvtoolnix: broken on 32-bit ppc --- srcpkgs/mkvtoolnix/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index 7f84979ecc3..52d67b0a6c8 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -23,6 +23,11 @@ if [ "$CROSS_BUILD" ]; then configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr" fi +case "$XBPS_TARGET_MACHINE" in + ppc64*) ;; + ppc*) broken="assembler shits itself";; +esac + pre_configure() { ./autogen.sh } From 6f77f87d45a7a30f9858317df639b98dd9f41083 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 30 Mar 2022 21:10:51 -0400 Subject: [PATCH 1200/2369] cgminer: remove package Upstream is archived and hasn't had a commit or release since 2018 --- srcpkgs/cgminer/files/cgminer/run | 2 -- srcpkgs/cgminer/template | 41 ------------------------------- srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 srcpkgs/cgminer/files/cgminer/run delete mode 100644 srcpkgs/cgminer/template diff --git a/srcpkgs/cgminer/files/cgminer/run b/srcpkgs/cgminer/files/cgminer/run deleted file mode 100644 index b9f9b29ae3d..00000000000 --- a/srcpkgs/cgminer/files/cgminer/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec cgminer -T --config /etc/cgminer.conf --syslog diff --git a/srcpkgs/cgminer/template b/srcpkgs/cgminer/template deleted file mode 100644 index c8add74d08f..00000000000 --- a/srcpkgs/cgminer/template +++ /dev/null @@ -1,41 +0,0 @@ -# Template file for 'cgminer' -pkgname=cgminer -version=4.11.1 -revision=1 -build_style=gnu-configure -configure_args=" - --enable-avalon --enable-avalon2 --enable-bflsc --enable-bitfury \ - --enable-cointerra --enable-drillbit --enable-hashfast --enable-hashratio \ - --enable-icarus --enable-klondike --with-system-libusb" -hostmakedepends="pkg-config automake libtool yasm" -makedepends="libcurl-devel libusb-devel jansson-devel eudev-libudev-devel ncurses-devel" -conf_files="/etc/cgminer.conf" -short_desc="Multi-threaded multi-pool CPU and GPU miner for bitcoin" -maintainer="Orphaned " -license="GPL-3.0-or-later" -homepage="https://github.com/ckolivas/cgminer" -distfiles="http://ck.kolivas.org/apps/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=a8f3e244343eda8c3410e6d27188ee941de25c54bd76412e5b4d17de9f30ac18 - -CFLAGS="-fcommon" - -pre_configure() { - # We have latest jansson and libusb - just use them - sed -e 's|^AC_CONFIG_SUBDIRS.*compat/jansson.*||' \ - -e 's|JANSSON_LIBS=\".*\"|JANSSON_LIBS=-ljansson|' \ - -e 's|compat/Makefile||' \ - -i configure.ac - - sed -e 's|^JANSSON_CPPFLAGS= .*||' \ - -e "s|^USBUTILS_CPPFLAGS = .*|USBUTILS_CPPFLAGS = -I${XBPS_CROSS_BASE}/usr/include/libusb-1.0|" \ - -e 's|^SUBDIRS.*|SUBDIRS = lib ccan|' \ - -i Makefile.am - - rm -r compat - autoreconf -fi -} -post_install() { - vsv cgminer - vconf example.conf cgminer.conf - sed -i 's#/usr/local/bin#/usr/bin#g' ${DESTDIR}/etc/cgminer.conf -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 6859fe29da9..0923c53cfc0 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -35,6 +35,7 @@ replaces=" california<=0.4.0_4 capstone-python<=4.0.2_3 captain-ballard<=1.0.0_2 + cgminer<=4.11.1_1 clamz<=0.5_4 couchdb<=1.7.1_2 cracklib-python<=2.9.7_1 From 3a0a93c6403bcd783c4ce62f74790b9e5b3495f9 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Thu, 14 Apr 2022 19:09:44 -0400 Subject: [PATCH 1201/2369] python3-svg.path: update to 6.0. --- srcpkgs/python3-svg.path/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-svg.path/template b/srcpkgs/python3-svg.path/template index 0d92697a0a9..a98cae8cfe7 100644 --- a/srcpkgs/python3-svg.path/template +++ b/srcpkgs/python3-svg.path/template @@ -1,11 +1,9 @@ # Template file for 'python3-svg.path' pkgname=python3-svg.path -version=5.1 +version=6.0 revision=1 wrksrc="svg.path-${version}" build_style=python3-module -# disable failing test -make_check_args="-k not(ImageTest)" hostmakedepends="python3-setuptools" depends="python3" checkdepends="python3-pytest-cov python3-Pillow" @@ -14,7 +12,7 @@ maintainer="Karl Nilsson " license="MIT" homepage="https://github.com/regebro/svg.path" distfiles="https://github.com/regebro/svg.path/archive/${version}.tar.gz" -checksum=2ea5351a5886f8c55ae8fddb2f7182dca3d5760c03abade9cb256b91e4bb9bb4 +checksum=3c460dfb366c3cb70f26eb7e22c092144e24f4f62028632289fa703f8dc25630 post_install() { vlicense LICENSE.txt From c136d102114519f0dbbff3f9026b404c83c87aaa Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 19 Apr 2022 18:56:06 -0500 Subject: [PATCH 1202/2369] Amass: update to 3.19.2. --- srcpkgs/Amass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template index 9293dab01c9..7106a5c312f 100644 --- a/srcpkgs/Amass/template +++ b/srcpkgs/Amass/template @@ -1,6 +1,6 @@ # Template file for 'Amass' pkgname=Amass -version=3.19.1 +version=3.19.2 revision=1 build_style=go go_import_path="github.com/OWASP/Amass/v3/..." @@ -9,4 +9,4 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://www.owasp.org/index.php/OWASP_Amass_Project" distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz" -checksum=259dbef81ca63ceb85113c0f741c9212bacbac653bca2cd3e8022b256d08d426 +checksum=ef2b5303b3e92debe68ea72c03c4f60320c34f0281f50b5f7108750c7e1a7491 From e032cad75c65a492348e8695127dce3464538916 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 19 Apr 2022 19:12:59 -0500 Subject: [PATCH 1203/2369] stellarium: update to 0.22.1. --- srcpkgs/stellarium/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template index c2a87b2847a..657b3a6e97b 100644 --- a/srcpkgs/stellarium/template +++ b/srcpkgs/stellarium/template @@ -1,6 +1,6 @@ # Template file for 'stellarium' pkgname=stellarium -version=0.22.0 +version=0.22.1 revision=1 build_style=cmake hostmakedepends="perl qt5-qmake qt5-host-tools" @@ -12,5 +12,5 @@ maintainer="Andrew Benson " license="GPL-2.0-or-later" homepage="https://stellarium.org/" distfiles="https://github.com/Stellarium/stellarium/releases/download/v${version}/stellarium-${version}.tar.gz" -checksum=0b4dc23cf9054b5e76cd9bc5ad68e172eb221999e90af37e93667d04fe78c885 +checksum=61a595ecc345dcc7517359573d0dc772e67ecaf6d52fefab142a77c92cf3fa24 replaces="stellarium-data>=0" From 92112067459cff216876eb7329623afc15211ae7 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Tue, 19 Apr 2022 23:31:19 -0500 Subject: [PATCH 1204/2369] iperf3: update to 3.11. --- srcpkgs/iperf3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iperf3/template b/srcpkgs/iperf3/template index 81ba349c49b..d71d870ac7c 100644 --- a/srcpkgs/iperf3/template +++ b/srcpkgs/iperf3/template @@ -1,6 +1,6 @@ # Template file for 'iperf3' pkgname=iperf3 -version=3.10.1 +version=3.11 revision=1 wrksrc="iperf-${version}" build_style=gnu-configure @@ -11,7 +11,7 @@ license="BSD-3-Clause" homepage="http://software.es.net/iperf/" changelog="https://raw.githubusercontent.com/esnet/iperf/master/RELNOTES.md" distfiles="https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz" -checksum=03bc9760cc54a245191d46bfc8edaf8a4750f0e87abca6764486972044d6715a +checksum=de8cb409fad61a0574f4cb07eb19ce1159707403ac2dc01b5d175e91240b7e5f post_install() { vlicense LICENSE From cefff2587d6553d1221c802c5c8df88be79e86d6 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 12 Apr 2022 11:04:22 -0400 Subject: [PATCH 1205/2369] python3-signedjson: update to 1.1.4. --- .../patches/importlib_metadata.patch | 39 ------------------- srcpkgs/python3-signedjson/template | 4 +- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/python3-signedjson/patches/importlib_metadata.patch diff --git a/srcpkgs/python3-signedjson/patches/importlib_metadata.patch b/srcpkgs/python3-signedjson/patches/importlib_metadata.patch deleted file mode 100644 index d7553958cc1..00000000000 --- a/srcpkgs/python3-signedjson/patches/importlib_metadata.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c40c83f844fee3c1c7b0c5d1508f87052334b4e5 Mon Sep 17 00:00:00 2001 -From: MeggyCal -Date: Tue, 21 Apr 2020 18:55:37 +0200 -Subject: [PATCH] Do not require importlib_metadata on python 3.8. (#9) - ---- - setup.py | 2 +- - signedjson/__init__.py | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 9c09760..c1cc299 100755 ---- a/setup.py -+++ b/setup.py -@@ -41,7 +41,7 @@ def read_file(path_segments): - "pynacl>=0.3.0", - "typing_extensions>=3.5", - 'typing>=3.5;python_version<"3.5"', -- "importlib_metadata", -+ 'importlib_metadata;python_version<"3.8"', - ], - long_description=read_file(("README.rst",)), - keywords="json", -diff --git a/signedjson/__init__.py b/signedjson/__init__.py -index 6641e64..62faa5e 100644 ---- a/signedjson/__init__.py -+++ b/signedjson/__init__.py -@@ -12,7 +12,10 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --from importlib_metadata import version, PackageNotFoundError -+try: -+ from importlib.metadata import version, PackageNotFoundError -+except ImportError: # pragma: nocover -+ from importlib_metadata import version, PackageNotFoundError - - try: - __version__ = version(__name__) diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template index bf9a8ddc125..8acbaa32ab1 100644 --- a/srcpkgs/python3-signedjson/template +++ b/srcpkgs/python3-signedjson/template @@ -1,6 +1,6 @@ # Template file for 'python3-signedjson' pkgname=python3-signedjson -version=1.1.1 +version=1.1.4 revision=1 wrksrc="signedjson-${version}" build_style=python3-module @@ -13,4 +13,4 @@ maintainer="Joel Beckmeyer " license="Apache-2.0" homepage="https://github.com/matrix-org/python-signedjson" distfiles="${PYPI_SITE}/s/signedjson/signedjson-${version}.tar.gz" -checksum=350586e7570ba208f7729dcda09d43f554ead0207a15e3e3695533ef3f720009 +checksum=cd91c56af53f169ef032c62e9c4a3292dc158866933318d0592e3462db3d6492 From 6ded78382211f2f74772c89e2d81ff915b25570d Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 12 Apr 2022 11:02:53 -0400 Subject: [PATCH 1206/2369] synapse: update to 1.57.0. --- srcpkgs/synapse/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index 984ad56e0a8..22ad0184767 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,6 +1,6 @@ # Template file for 'synapse' pkgname=synapse -version=1.56.0 +version=1.57.0 revision=1 build_style=python3-module make_check_target=tests @@ -21,7 +21,7 @@ license="Apache-2.0" homepage="https://github.com/matrix-org/synapse" changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md" distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz" -checksum=7afda1fefa2af42966fdffa1f3ab6643674a738ad722e76bf94b873b8845c373 +checksum=d574f6f599f00d139045e04d017a201397b21248b560b69c5cdfccccd920cc0a system_accounts="synapse" synapse_homedir="/var/lib/synapse" From 0e97bcf38dce7ea87a5203d8e97f4d5d6e3227f1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 20 Apr 2022 14:10:55 +0200 Subject: [PATCH 1207/2369] xauth: update to 1.1.2. --- srcpkgs/xauth/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xauth/template b/srcpkgs/xauth/template index 8cf9d80c606..b663ef7b1ed 100644 --- a/srcpkgs/xauth/template +++ b/srcpkgs/xauth/template @@ -1,6 +1,6 @@ # Template file for 'xauth' pkgname=xauth -version=1.1.1 +version=1.1.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -9,8 +9,8 @@ short_desc="X authentication utility" maintainer="Leah Neukirchen " license="MIT" homepage="http://xorg.freedesktop.org/" -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92 +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" +checksum=78ba6afd19536ced1dddb3276cba6e9555a211b468a06f95f6a97c62ff8ee200 post_install() { vlicense COPYING From 4c740976c007a46eae370042f4647a7113249786 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 20 Apr 2022 17:16:56 +0200 Subject: [PATCH 1208/2369] elixir: update to 1.13.4. --- srcpkgs/elixir/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template index 5a8b5d7c1e9..8f721e3a333 100644 --- a/srcpkgs/elixir/template +++ b/srcpkgs/elixir/template @@ -1,6 +1,6 @@ # Template file for 'elixir' pkgname=elixir -version=1.13.3 +version=1.13.4 revision=1 build_style=gnu-makefile make_check_target="test" @@ -13,7 +13,7 @@ license="Apache-2.0" homepage="http://elixir-lang.org/" changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md" distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz" -checksum=652779f7199f5524e2df1747de0e373d8b9f1d1206df25b2e551cd0ad33f8440 +checksum=95daf2dd3052e6ca7d4d849457eaaba09de52d65ca38d6933c65bc1cdf6b8579 do_check() { ERL_EPMD_PORT=5369 make ${make_check_target} From 831d44daade499fd019d458f194ac2ef4eee771a Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 20 Apr 2022 10:36:14 -0500 Subject: [PATCH 1209/2369] jadx: update to 1.3.5. --- srcpkgs/jadx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template index 71467e34044..dba5153c996 100644 --- a/srcpkgs/jadx/template +++ b/srcpkgs/jadx/template @@ -1,6 +1,6 @@ # Template file for 'jadx' pkgname=jadx -version=1.3.4 +version=1.3.5 revision=1 hostmakedepends="openjdk8 gradle" short_desc="Decompiler for Dalvik bytecode" @@ -8,7 +8,7 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://github.com/skylot/jadx" distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz" -checksum=9f7f05c647a287fe4a572d85f14715559513e864d27f6bf6b19852529da8efdc +checksum=ed556c32b87f6f6cc1ef6ea35bc6881da1a6ad538bb81f9dad1c16969435ea24 do_build() { gradle copyArtifacts From 55dc2172db4ac00059b0830fb1c498e34748de43 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 20 Apr 2022 10:44:59 -0500 Subject: [PATCH 1210/2369] python3-easygui: update to 0.98.3. --- srcpkgs/python3-easygui/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-easygui/template b/srcpkgs/python3-easygui/template index 3a35dad07d7..87188a537d5 100644 --- a/srcpkgs/python3-easygui/template +++ b/srcpkgs/python3-easygui/template @@ -1,17 +1,19 @@ # Template file for 'python3-easygui' pkgname=python3-easygui -version=0.98.1 -revision=5 +version=0.98.3 +revision=1 wrksrc="easygui-${version}" build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-tkinter" +checkdepends="$depends" short_desc="Simple, very easy GUI programming in Python" maintainer="Andrew Benson " license="BSD-3-Clause" homepage="https://github.com/robertlugg/easygui" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=b46d1f06b85a2de2b15129906d21bb42bc66a6e800315fed57e634cf151fc083 +distfiles="${PYPI_SITE}/e/easygui/easygui-${version}.tar.gz" +checksum=d653ff79ee1f42f63b5a090f2f98ce02335d86ad8963b3ce2661805cafe99a04 +make_check=no # Requires X connection post_install() { sed -n '29,74p' easygui/easygui.py > LICENSE From 0b32c7d108aa981031109d3e60b0db43852121da Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Sun, 13 Feb 2022 12:36:33 +0200 Subject: [PATCH 1211/2369] shadow: increase maximum group name length to 32 (from 16). This is already the case for usernames, so why not groups? --- srcpkgs/shadow/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template index f01181a49bd..c59d92bfeb5 100644 --- a/srcpkgs/shadow/template +++ b/srcpkgs/shadow/template @@ -1,12 +1,13 @@ # Template file for 'shadow' pkgname=shadow version=4.8.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--bindir=/usr/bin --sbindir=/usr/bin --enable-shared --disable-static --with-libpam --without-selinux --with-acl --with-attr --without-su - --disable-nls --enable-subordinate-ids --disable-account-tools-setuid" + --disable-nls --enable-subordinate-ids --disable-account-tools-setuid + --with-group-name-max-length=32" hostmakedepends="libtool" makedepends="acl-devel pam-devel" depends="pam" From 2403c25d5f2bb8f78f758b7b98d7bb4704b25938 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 19 Apr 2022 10:48:20 +0200 Subject: [PATCH 1212/2369] platformio: update to 5.2.5. Closes: #36762 [via git-merge-pr] --- srcpkgs/platformio/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/platformio/template b/srcpkgs/platformio/template index 4aec9f82cc5..9dbceafd89f 100644 --- a/srcpkgs/platformio/template +++ b/srcpkgs/platformio/template @@ -1,7 +1,7 @@ # Template file for 'platformio' pkgname=platformio -version=5.1.1 -revision=2 +version=5.2.5 +revision=1 wrksrc="platformio-core-${version}" build_style=python3-module # According to https://github.com/platformio/platformio-core/blob/9c20ab81cb68f1ffb7a8cac22ce95c4c797643ec/Makefile#L13 @@ -11,14 +11,14 @@ depends="python3-bottle python3-click python3-colorama python3-marshmallow python3-pyelftools python3-pyserial python3-requests python3-semanticversion python3-setuptools python3-tabulate" checkdepends="python3-pytest python3-jsondiff python3-wheel python3-pip - python3-Twisted python3-certifi git $depends" + python3-Twisted python3-certifi git python3-zeroconf $depends" short_desc="Ecosystem for embedded development" maintainer="bra1nwave " license="Apache-2.0" homepage="https://github.com/platformio/platformio-core" changelog="https://raw.githubusercontent.com/platformio/platformio-core/develop/HISTORY.rst" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=f312c4cb535dc52c96b754cb54df3fee8001ab960894c7f2f9edd0e50d416aed +checksum=26cc5b61d113250519257c156ae693ab8f6aea891283b28f1c4c67ffc81fb574 post_install() { vinstall scripts/99-platformio-udev.rules 644 usr/lib/udev/rules.d From a31e7d0c9cf780b4cb3964162263e1578fb521b4 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 21 Apr 2022 00:59:24 +0200 Subject: [PATCH 1213/2369] qt5: rebuild against gstreamer-1.20.1 --- srcpkgs/qt5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 3a6841ed69b..f6c03777d99 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -3,7 +3,7 @@ pkgname=qt5 version=5.15.3+20220222 # commit fcca82ca40a5d8a02a4ddd90846d070f2c58cfad # base repo: https://invent.kde.org/qt/qt/qt5 -revision=1 +revision=2 build_style=meta hostmakedepends="cmake clang flex perl glib-devel pkg-config python re2c ruby which" From df02d2ab000501601c32c590427312ed85af77b3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 10 Apr 2022 15:00:08 +0200 Subject: [PATCH 1214/2369] pipewire: update to 0.3.50. --- srcpkgs/pipewire/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 5ed1ee1d3bd..6427e0b66e7 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,6 +1,6 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.3.48 +version=0.3.50 revision=1 _pms_version=0.4.1 build_style=meson @@ -32,7 +32,7 @@ homepage="https://pipewire.org/" changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz" -checksum="0d218be86b3d2b548c06259c47ad8d110ee1c09f071e17c4393eeef5c880fa6f +checksum="a4bd81e9046f0bd19ecc18402b44199c6c4c54305670e43111c7fbdfe4d17bdf 119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975" make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire" system_accounts="_pipewire" From ded75b883f29f3f45a35f462e3255df285325719 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 16 Apr 2022 16:34:02 +0200 Subject: [PATCH 1215/2369] Carla: update to 2.4.3. --- srcpkgs/Carla/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index 83b8224861a..6d25e6bb048 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -1,6 +1,6 @@ # Template file for 'Carla' pkgname=Carla -version=2.4.2 +version=2.4.3 revision=1 archs="x86_64* i686* aarch64* arm*" build_style=gnu-makefile @@ -14,9 +14,9 @@ depends="python3 python3-PyQt5 python3-PyQt5-svg pyliblo which" short_desc="Audio plugin host" maintainer="Orphaned " license="GPL-2.0-or-later" -homepage="https://kxstudio.linuxaudio.org/Applications:Carla" +homepage="https://kx.studio/Applications:Carla" distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz" -checksum=376884965e685242953cab757818dde262209c651bd563a04eade0678c6b9f39 +checksum=0092926e5167f3a5eb592f0055e5491803354ae42947e706db0dc548d9e786d3 python_version=3 case $XBPS_TARGET_MACHINE in @@ -29,15 +29,14 @@ if [ "$CROSS_BUILD" ]; then hostmakedepends+=" Carla-devel" fi -pre_build() { - vsed -e '1,1i#include ' \ - -i source/modules/water/text/CharacterFunctions.h - +post_patch() { if [ "$CROSS_BUILD" ]; then vsed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \ source/plugin/Makefile fi +} +pre_build() { make ${make_build_args} features } From e03e5424a8746a58afdd983b4d3f2e9bd3e53c0a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 21 Apr 2022 11:38:26 +0200 Subject: [PATCH 1216/2369] python3-fasteners: add python3 to dependencies --- srcpkgs/python3-fasteners/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/python3-fasteners/template b/srcpkgs/python3-fasteners/template index d1d2c75ca2e..0e5b8bed2c2 100644 --- a/srcpkgs/python3-fasteners/template +++ b/srcpkgs/python3-fasteners/template @@ -1,10 +1,11 @@ # Template file for 'python3-fasteners' pkgname=python3-fasteners version=0.17.3 -revision=1 +revision=2 wrksrc="fasteners-${version}" build_style=python3-pep517 hostmakedepends="python3 python3-wheel" +depends="python3" short_desc="Python3 package that provides useful locks" maintainer="Leah Neukirchen " license="Apache-2.0" From c0759c359e4a308bbdeb2b0b35b3d834144cd191 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 21 Apr 2022 11:38:26 +0200 Subject: [PATCH 1217/2369] python3-listparser: add python3 to dependencies --- srcpkgs/python3-listparser/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/python3-listparser/template b/srcpkgs/python3-listparser/template index dfe7ba10083..55bcd24119a 100644 --- a/srcpkgs/python3-listparser/template +++ b/srcpkgs/python3-listparser/template @@ -1,10 +1,11 @@ # Template file for 'python3-listparser' pkgname=python3-listparser version=0.18 -revision=1 +revision=2 wrksrc="listparser-$version" build_style=python3-module hostmakedepends="python3-setuptools" +depends="python3" short_desc="Parse subscription lists in Python" maintainer="Michal Vasilek " license="LGPL-3.0-or-later" From 426ffef8be32062be92569f4499da1090cbc7c69 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 21 Apr 2022 11:39:03 +0200 Subject: [PATCH 1218/2369] python3-pylast: fix dependencies --- srcpkgs/python3-pylast/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template index 63b2e0104e6..76e57a27f4c 100644 --- a/srcpkgs/python3-pylast/template +++ b/srcpkgs/python3-pylast/template @@ -1,14 +1,15 @@ # Template file for 'python3-pylast' pkgname=python3-pylast version=4.1.0 -revision=3 +revision=4 wrksrc="pylast-${version}" build_style=python3-module hostmakedepends="python3-setuptools_scm" -depends="python3" +depends="python3-setuptools" short_desc="Python3 interface to last.fm and libre.fm" maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/pylast/pylast" distfiles="${PYPI_SITE}/p/pylast/pylast-${version}.tar.gz" checksum=ad084aec1bf7e307bc42d7cc1a003851f5bee1ad24fb697a9fdc300bbfe63932 +make_check=no # The 'pylast' distribution was not found and is required by the application From 69ea90ca3eb6a86dcb2f43bf672bcb62bec950ad Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 21 Apr 2022 11:39:04 +0200 Subject: [PATCH 1219/2369] python3-soupsieve: fix dependencies --- srcpkgs/python3-soupsieve/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template index 14449f20c47..83862532f65 100644 --- a/srcpkgs/python3-soupsieve/template +++ b/srcpkgs/python3-soupsieve/template @@ -1,12 +1,12 @@ # Template file for 'python3-soupsieve' pkgname=python3-soupsieve version=1.9.5 -revision=6 +revision=7 wrksrc="soupsieve-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3" -checkdepends="python3-pytest python3-lxml python3-html5lib python3-BeautifulSoup4" +depends="python3-BeautifulSoup4" +checkdepends="python3-pytest python3-lxml python3-html5lib $depends" short_desc="CSS4 selector implementation for Python3 Beautiful Soup" maintainer="Aluísio Augusto Silva Gonçalves " license="MIT" From 6d676b3e18f2a5d2894700dbe6d92e84de060a2f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 21 Apr 2022 11:39:04 +0200 Subject: [PATCH 1220/2369] python3-readability-lxml: fix dependencies --- srcpkgs/python3-readability-lxml/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-readability-lxml/template b/srcpkgs/python3-readability-lxml/template index 798cc9c5f4c..dfb4b0fb6b2 100644 --- a/srcpkgs/python3-readability-lxml/template +++ b/srcpkgs/python3-readability-lxml/template @@ -1,14 +1,15 @@ # Template file for 'python3-readability-lxml' pkgname=python3-readability-lxml version=0.8.1 -revision=4 +revision=5 wrksrc="readability-lxml-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-lxml" +depends="python3-lxml python3-chardet python3-cssselect" short_desc="Fast html to text parser" maintainer="Benjamín Albiñana " license="Apache-2.0" homepage="https://github.com/buriy/python-readability" distfiles="${PYPI_SITE}/r/readability-lxml/readability-lxml-${version}.tar.gz" checksum=e51fea56b5909aaf886d307d48e79e096293255afa567b7d08bca94d25b1a4e1 +make_check=no # needs unpackaged timeout_decorator From 91fd35d2b4c6b7ede87a0e997acf5102aac61f10 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 19:05:43 -0400 Subject: [PATCH 1221/2369] New package: openjdk17-jmods-17.0.3+5 --- srcpkgs/openjdk17-jmods | 1 + srcpkgs/openjdk17/template | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/openjdk17-jmods diff --git a/srcpkgs/openjdk17-jmods b/srcpkgs/openjdk17-jmods new file mode 120000 index 00000000000..99ab1cb1b0d --- /dev/null +++ b/srcpkgs/openjdk17-jmods @@ -0,0 +1 @@ +openjdk17 \ No newline at end of file diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index 7e368f9b687..9dba58b0d0d 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -168,7 +168,7 @@ post_install() { rm -rf ./ca } -subpackages="openjdk17-src openjdk17-jre openjdk17-doc" +subpackages="openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods" openjdk17-jre_package() { shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" @@ -223,3 +223,11 @@ openjdk17-src_package() { vmove "$_jdk_home/lib/src.zip" } } + +openjdk17-jmods_package() { + short_desc+=" - JMODs" + depends="${pkgname}-${version}_${revision}" + pkg_install() { + vmove $_jdk_home/jmods + } +} From 8af2ed2fc41a4a65f8ce08fa5a06cc2f120310b8 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 19:06:37 -0400 Subject: [PATCH 1222/2369] openjdk17: update to 17.0.3+7. also disable for armv5 and 6, the arch is not supported --- srcpkgs/openjdk17/template | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index 9dba58b0d0d..2554e49c54e 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -1,6 +1,6 @@ # Template file for 'openjdk17' pkgname=openjdk17 -version=17.0.3+5 +version=17.0.3+7 revision=1 _gtest_ver=1.8.1 _java_ver="${version%%.*}" @@ -44,7 +44,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz" -checksum="a557f4d2972bbbbcdc12fa7e167ad60b4ee1461a9bc7ad259a003172c34e6331 +checksum="22575340d080a396442658356583d9c7dc0c44cefa52842fbfcf23eef23c39a0 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c" provides="java-environment-${version}_1" patch_args="-Np1 --directory=$build_wrksrc" @@ -53,10 +53,11 @@ patch_args="-Np1 --directory=$build_wrksrc" disable_parallel_build=yes build_options="docs" -# no hotspot JIT for ppc32 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; + # no hotspot JIT for ppc32 ppc*) _use_zero=yes ;; + armv[56]*) broken="Unsupported architecture" ;; esac if [ -n "$_use_zero" ]; then @@ -81,11 +82,6 @@ else fi alternatives=" - java:/usr/bin/java:/${_jdk_home}/bin/java - java:/usr/bin/jfr:/${_jdk_home}/bin/jfr - java:/usr/bin/keytool:/${_jdk_home}/bin/keytool - java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry - jdk:/usr/bin/jar:/${_jdk_home}/bin/jar jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner jdk:/usr/bin/java:/${_jdk_home}/bin/java From 2f2375f3f369f974c4c667c6b611d79d79e066ad Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 21:05:38 -0400 Subject: [PATCH 1223/2369] openjdk9-bootstrap: disable on armv[56] --- srcpkgs/openjdk9-bootstrap/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template index 48cc14fb712..c82f0761166 100644 --- a/srcpkgs/openjdk9-bootstrap/template +++ b/srcpkgs/openjdk9-bootstrap/template @@ -50,10 +50,11 @@ checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986 9cba7f03ebeda4d3cfaffb015f9bf967fcca2c3c113604836073556df6a7b9aa c939de46f903ecb283c02155e1415cee98ab66803e17eae0403c399c1a475647" -# no hotspot JIT for arm32 and ppc32 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; - arm*|ppc*) _use_zero=yes ;; + # no hotspot JIT for arm32 and ppc32 + armv7*|ppc*) _use_zero=yes ;; + armv[56]*) broken="Unsupported architecture" ;; esac if [ -n "$_use_zero" ]; then From 56af9ccf5a899674def4948078d743a0fcf78cea Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 21:05:40 -0400 Subject: [PATCH 1224/2369] openjdk10-bootstrap: disable on armv[56] --- srcpkgs/openjdk10-bootstrap/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template index 3d99cd14af9..1c673dc748d 100644 --- a/srcpkgs/openjdk10-bootstrap/template +++ b/srcpkgs/openjdk10-bootstrap/template @@ -35,10 +35,11 @@ distfiles="http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-${_repo_ver checksum="374f7ae35f0a7439a40bd2c765d1f410607c75c6c1e788f1a344a42e59431f51" lib32disabled=yes -# no hotspot JIT for arm32 and ppc32 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; - arm*|ppc*) _use_zero=yes ;; + # no hotspot JIT for arm32 and ppc32 + armv7*|ppc*) _use_zero=yes ;; + armv[56]*) broken="Unsupported architecture" ;; esac if [ -n "$_use_zero" ]; then From cd8954b98ac9028dac7a0ef8be5aed7af088eefa Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 21:05:41 -0400 Subject: [PATCH 1225/2369] openjdk12-bootstrap: disable on armv[56] --- srcpkgs/openjdk12-bootstrap/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template index 2b5d421a52f..1f20483ecbd 100644 --- a/srcpkgs/openjdk12-bootstrap/template +++ b/srcpkgs/openjdk12-bootstrap/template @@ -47,10 +47,11 @@ nocross=yes # Build is still parallel, but don't use -jN. disable_parallel_build=yes -# no hotspot JIT for ppc32 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; + # no hotspot JIT for ppc32 ppc*) _use_zero=yes ;; + armv[56]*) broken="Unsupported architecture" ;; esac if [ -n "$_use_zero" ]; then From 5b83caa09ecabb20bdcee1254f073174160c8cc8 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 21:05:41 -0400 Subject: [PATCH 1226/2369] openjdk13-bootstrap: disable on armv[56] --- srcpkgs/openjdk13-bootstrap/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template index 4a61e102381..6a6b3340ffc 100644 --- a/srcpkgs/openjdk13-bootstrap/template +++ b/srcpkgs/openjdk13-bootstrap/template @@ -47,10 +47,11 @@ nocross=yes # Build is still parallel, but don't use -jN. disable_parallel_build=yes -# no hotspot JIT for ppc32 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; + # no hotspot JIT for ppc32 ppc*) _use_zero=yes ;; + armv[56]*) broken="Unsupported architecture" ;; esac if [ -n "$_use_zero" ]; then From 56079f78ce8cc3475a670c51d322c7558be4be8a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 21:05:42 -0400 Subject: [PATCH 1227/2369] openjdk14-bootstrap: disable on armv[56] --- srcpkgs/openjdk14-bootstrap/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template index 768b9463319..341818dc5cf 100644 --- a/srcpkgs/openjdk14-bootstrap/template +++ b/srcpkgs/openjdk14-bootstrap/template @@ -46,10 +46,11 @@ nocross=yes # Build is still parallel, but don't use -jN. disable_parallel_build=yes -# no hotspot JIT for ppc32 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; + # no hotspot JIT for ppc32 ppc*) _use_zero=yes ;; + armv[56]*) broken="Unsupported architecture" ;; esac if [ -n "$_use_zero" ]; then From 14fb0b9ab591f7b5025cbe4a092d4312ceada067 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 21:05:43 -0400 Subject: [PATCH 1228/2369] openjdk15-bootstrap: disable on armv[56] --- srcpkgs/openjdk15-bootstrap/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template index 7608f4dd265..1430f205d1b 100644 --- a/srcpkgs/openjdk15-bootstrap/template +++ b/srcpkgs/openjdk15-bootstrap/template @@ -49,10 +49,11 @@ nocross=yes # Build is still parallel, but don't use -jN. disable_parallel_build=yes -# no hotspot JIT for ppc32 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; + # no hotspot JIT for ppc32 ppc*) _use_zero=yes ;; + armv[56]*) broken="Unsupported architecture" ;; esac if [ -n "$_use_zero" ]; then From 39376c4c17608b02d51011e707b34c7c985efa66 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 21:05:43 -0400 Subject: [PATCH 1229/2369] openjdk16-bootstrap: disable on armv[56] --- srcpkgs/openjdk16-bootstrap/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template index 28e70a17fd2..2c8566bb1c3 100644 --- a/srcpkgs/openjdk16-bootstrap/template +++ b/srcpkgs/openjdk16-bootstrap/template @@ -49,10 +49,11 @@ nocross=yes # Build is still parallel, but don't use -jN. disable_parallel_build=yes -# no hotspot JIT for ppc32 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; + # no hotspot JIT for ppc32 ppc*) _use_zero=yes ;; + armv[56]*) broken="Unsupported architecture" ;; esac if [ -n "$_use_zero" ]; then From 2e10e481feb61d443040a225fca2cef935d40b03 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 22:12:21 -0400 Subject: [PATCH 1230/2369] openjdk8: update to 8u322b04, enable debug. --- .../openjdk8/patches/006_8197981-pr3548.patch | 32 ---- srcpkgs/openjdk8/patches/010_pr1869.patch | 33 ---- .../patches/999-native-no-sysroot.patch | 10 +- srcpkgs/openjdk8/template | 161 ++++++++---------- 4 files changed, 77 insertions(+), 159 deletions(-) delete mode 100644 srcpkgs/openjdk8/patches/006_8197981-pr3548.patch delete mode 100644 srcpkgs/openjdk8/patches/010_pr1869.patch diff --git a/srcpkgs/openjdk8/patches/006_8197981-pr3548.patch b/srcpkgs/openjdk8/patches/006_8197981-pr3548.patch deleted file mode 100644 index 5f6d9ce9e4b..00000000000 --- a/srcpkgs/openjdk8/patches/006_8197981-pr3548.patch +++ /dev/null @@ -1,32 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1518667645 0 -# Thu Feb 15 04:07:25 2018 +0000 -# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041 -# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e -8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8 -Summary: Fix issue discovered by -Wreturn-type on systems without LP64. -Reviewed-by: aph - -diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp ---- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp -+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp -@@ -457,6 +457,7 @@ - long long unsigned int oldval, - long long unsigned int newval) { - ShouldNotCallThis(); -+ return 0; - } - }; - #endif // !_LP64 -diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp ---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp -+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp -@@ -498,6 +498,7 @@ - long long unsigned int oldval, - long long unsigned int newval) { - ShouldNotCallThis(); -+ return 0; - } - }; - #endif // !_LP64 diff --git a/srcpkgs/openjdk8/patches/010_pr1869.patch b/srcpkgs/openjdk8/patches/010_pr1869.patch deleted file mode 100644 index 26f8c8e14bd..00000000000 --- a/srcpkgs/openjdk8/patches/010_pr1869.patch +++ /dev/null @@ -1,33 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1405461315 -3600 -# Tue Jul 15 22:55:15 2014 +0100 -# Node ID 967ae4d849eb20b4b63c399bc3f376dfc0f9d2cc -# Parent 84854c983fd81cf1a1598f8c069a2db010abc05c -PR1869: Avoid x86 workaround when running Zero rather than a JIT -Contributed-by: Matthias Klose - -diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2019-04-11 03:36:49.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2019-04-19 17:15:35.194017652 +0100 -@@ -5139,7 +5139,7 @@ - - Linux::capture_initial_stack(JavaThread::stack_size_at_create()); - --#if defined(IA32) -+#if defined(IA32) && !defined(ZERO) - workaround_expand_exec_shield_cs_limit(); - #endif - -diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp ---- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2019-04-11 03:36:49.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2019-04-19 17:15:58.329656663 +0100 -@@ -890,7 +890,7 @@ - * updates (JDK-8023956). - */ - void os::workaround_expand_exec_shield_cs_limit() { --#if defined(IA32) -+#if defined(IA32) && !defined(ZERO) - size_t page_size = os::vm_page_size(); - - /* diff --git a/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch b/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch index 52c8194b0bc..aabc19835d5 100644 --- a/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch +++ b/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch @@ -2,11 +2,9 @@ By default, OpenJDK 8 passes sysroot flags to native compiler. This is wrong, as it will then use target include files when calling the native compiler. Newer versions of OpenJDK have seemingly fixed this, 8 has not. -diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk -index d961cf3..9679f97 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk -@@ -383,10 +383,6 @@ define SetupNativeCompilation +@@ -384,10 +384,6 @@ $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION)) endif @@ -17,12 +15,12 @@ index d961cf3..9679f97 100644 # Now call add_native_source for each source file we are going to compile. $$(foreach p,$$($1_SRCS), \ $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ -@@ -432,8 +428,6 @@ define SetupNativeCompilation +@@ -433,8 +429,6 @@ $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE)) endif - $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS) - + # Need to make sure TARGET is first on list $1 := $$($1_TARGET) - ifneq (,$$($1_LIBRARY)) - # Generating a dynamic library. + ifeq ($$($1_STATIC_LIBRARY),) diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template index c10b5216435..9cced29b4be 100644 --- a/srcpkgs/openjdk8/template +++ b/srcpkgs/openjdk8/template @@ -3,13 +3,12 @@ # TODO: make -headless versions # TODO: config files? pkgname=openjdk8 -version=8u272b02 +version=8u322b04 revision=1 -_jdk_update=272 _jdk_update="${version#*u}" _jdk_update="${_jdk_update%b*}" _jdk_build="${version#*b}" -_final_jdk_home="usr/lib/jvm/java-1.8-openjdk" +_jdk_home="usr/lib/jvm/java-1.8-openjdk" # we're using aarch64 port repo to get aarch64 JIT; the repo is # otherwise the same as the normal one, just with aarch64 port added _repo_ver="aarch64-shenandoah-jdk${version/b/-b}" @@ -19,6 +18,8 @@ configure_args=" --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib --with-update-version=${_jdk_update} --with-build-number=b${_jdk_build} + --with-debug-level=release + --with-native-debug-symbols=internal --with-milestone=fcs --enable-unlimited-crypto --with-zlib=system @@ -53,14 +54,14 @@ distfiles=" http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/${_repo_ver}.tar.gz>langtools-${_repo_ver}.tar.gz http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/${_repo_ver}.tar.gz>nashorn-${_repo_ver}.tar.gz" -checksum="bb931ea723a8b6c418ef6a8dc7b33c9a082ce240f607e33d260951bdc52d1294 - 655a3f4875f4ea4d6d7083c65e3bffbd694114af25a7e25bb4276c63f606328d - 2c6bc905ffe04659e89806514f10848e4ff548209c8e4407a5f37a3358a8cb78 - 9543a96eb3f60171cebbf0652190942c0b0a78560fae19c7c7aff7a72e14daa5 - 7a610a834483650660a98828420cd3bb36f17e077cc0eaf30c4d01db97ee0efd - 330f52d045993ca98f6c6376bb67e5c085937553db80fd21503129f9fcdd144d - 04d6b61009f7373c49a5381281cae2d4c06d4c5bc42991b3bccfb8b820b95bba - 48aac240d50cb3fa651b2299b6add1376f31624fd7666b74ba23761bb535fab7" +checksum="1b93adf81488be199243f684398d616c20e68bd3bef990d9eafb3d607ab3d02e + 03a7e0fc8ce0ed938c80c69890812e1dbad423df1718115e28f930908a9b5f9b + 2213194f9b3aef81340710ca63fd00fbabc42a82b6b30d6955640e66293ab497 + 80646bf709598067622227c982efdbd88b3c6e8da0024e6f9a264145d942a99c + 8c8fc97a8c056cc520472d292b85dbe25a7edbfa4545a8c45275b7b378b0fb65 + 2d659ba2c64b19dba192ed1be1e6033efb7445809f8e6966439619a417975a73 + 16cc13cc5234ac1ed3dcebc8c8586a4e31b43cf5c9a4b496fd1f29279fa6b827 + 68357e18386d833a882a9a988bf4535e5ce8dfa90beeeed7a1939aa75c0e991f" build_options="docs" desc_option_docs="Build documentation" @@ -81,75 +82,59 @@ fi provides="java-environment-${version}_1" -if [ -n "$XBPS_DEBUG_PKGS" ]; then - configure_args+=" --with-native-debug-symbols=internal" -fi - if [ ! "$CROSS_BUILD" ]; then hostmakedepends+=" openjdk7-bootstrap" configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-1.7-openjdk" else hostmakedepends+=" openjdk8" - configure_args+=" --with-boot-jdk=/${_final_jdk_home}" + configure_args+=" --with-boot-jdk=/${_jdk_home}" fi # enabling ccache segfaults gcc export CCACHE_DISABLE=1 alternatives=" - java:/usr/bin/java:/${_final_jdk_home}/bin/java - java:/usr/bin/jjs:/${_final_jdk_home}/bin/jjs - java:/usr/bin/keytool:/${_final_jdk_home}/bin/keytool - java:/usr/bin/orbd:/${_final_jdk_home}/bin/orbd - java:/usr/bin/pack200:/${_final_jdk_home}/bin/pack200 - java:/usr/bin/policytool:/${_final_jdk_home}/bin/policytool - java:/usr/bin/rmid:/${_final_jdk_home}/bin/rmid - java:/usr/bin/rmiregistry:/${_final_jdk_home}/bin/rmiregistry - java:/usr/bin/servertool:/${_final_jdk_home}/bin/servertool - java:/usr/bin/tnameserv:/${_final_jdk_home}/bin/tnameserv - java:/usr/bin/unpack200:/${_final_jdk_home}/bin/unpack200 - - jdk:/usr/bin/appletviewer:/${_final_jdk_home}/bin/appletviewer - jdk:/usr/bin/extcheck:/${_final_jdk_home}/bin/extcheck - jdk:/usr/bin/idlj:/${_final_jdk_home}/bin/idlj - jdk:/usr/bin/jar:/${_final_jdk_home}/bin/jar - jdk:/usr/bin/jarsigner:/${_final_jdk_home}/bin/jarsigner - jdk:/usr/bin/java:/${_final_jdk_home}/bin/java - jdk:/usr/bin/java-rmi.cgi:/${_final_jdk_home}/bin/java-rmi.cgi - jdk:/usr/bin/javac:/${_final_jdk_home}/bin/javac - jdk:/usr/bin/javadoc:/${_final_jdk_home}/bin/javadoc - jdk:/usr/bin/javah:/${_final_jdk_home}/bin/javah - jdk:/usr/bin/javap:/${_final_jdk_home}/bin/javap - jdk:/usr/bin/jcmd:/${_final_jdk_home}/bin/jcmd - jdk:/usr/bin/jconsole:/${_final_jdk_home}/bin/jconsole - jdk:/usr/bin/jdb:/${_final_jdk_home}/bin/jdb - jdk:/usr/bin/jdeps:/${_final_jdk_home}/bin/jdeps - jdk:/usr/bin/jhat:/${_final_jdk_home}/bin/jhat - jdk:/usr/bin/jinfo:/${_final_jdk_home}/bin/jinfo - jdk:/usr/bin/jjs:/${_final_jdk_home}/bin/jjs - jdk:/usr/bin/jmap:/${_final_jdk_home}/bin/jmap - jdk:/usr/bin/jps:/${_final_jdk_home}/bin/jps - jdk:/usr/bin/jrunscript:/${_final_jdk_home}/bin/jrunscript - jdk:/usr/bin/jsadebugd:/${_final_jdk_home}/bin/jsadebugd - jdk:/usr/bin/jstack:/${_final_jdk_home}/bin/jstack - jdk:/usr/bin/jstat:/${_final_jdk_home}/bin/jstat - jdk:/usr/bin/jstatd:/${_final_jdk_home}/bin/jstatd - jdk:/usr/bin/keytool:/${_final_jdk_home}/bin/keytool - jdk:/usr/bin/native2ascii:/${_final_jdk_home}/bin/native2ascii - jdk:/usr/bin/orbd:/${_final_jdk_home}/bin/orbd - jdk:/usr/bin/pack200:/${_final_jdk_home}/bin/pack200 - jdk:/usr/bin/policytool:/${_final_jdk_home}/bin/policytool - jdk:/usr/bin/rmic:/${_final_jdk_home}/bin/rmic - jdk:/usr/bin/rmid:/${_final_jdk_home}/bin/rmid - jdk:/usr/bin/rmiregistry:/${_final_jdk_home}/bin/rmiregistry - jdk:/usr/bin/schemagen:/${_final_jdk_home}/bin/schemagen - jdk:/usr/bin/serialver:/${_final_jdk_home}/bin/serialver - jdk:/usr/bin/servertool:/${_final_jdk_home}/bin/servertool - jdk:/usr/bin/tnameserv:/${_final_jdk_home}/bin/tnameserv - jdk:/usr/bin/unpack200:/${_final_jdk_home}/bin/unpack200 - jdk:/usr/bin/wsgen:/${_final_jdk_home}/bin/wsgen - jdk:/usr/bin/wsimport:/${_final_jdk_home}/bin/wsimport - jdk:/usr/bin/xjc:/${_final_jdk_home}/bin/xjc + jdk:/usr/bin/appletviewer:/${_jdk_home}/bin/appletviewer + jdk:/usr/bin/extcheck:/${_jdk_home}/bin/extcheck + jdk:/usr/bin/idlj:/${_jdk_home}/bin/idlj + jdk:/usr/bin/jar:/${_jdk_home}/bin/jar + jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner + jdk:/usr/bin/java:/${_jdk_home}/bin/java + jdk:/usr/bin/java-rmi.cgi:/${_jdk_home}/bin/java-rmi.cgi + jdk:/usr/bin/javac:/${_jdk_home}/bin/javac + jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc + jdk:/usr/bin/javah:/${_jdk_home}/bin/javah + jdk:/usr/bin/javap:/${_jdk_home}/bin/javap + jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd + jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole + jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb + jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps + jdk:/usr/bin/jhat:/${_jdk_home}/bin/jhat + jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo + jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs + jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap + jdk:/usr/bin/jps:/${_jdk_home}/bin/jps + jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript + jdk:/usr/bin/jsadebugd:/${_jdk_home}/bin/jsadebugd + jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack + jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat + jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd + jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool + jdk:/usr/bin/native2ascii:/${_jdk_home}/bin/native2ascii + jdk:/usr/bin/orbd:/${_jdk_home}/bin/orbd + jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200 + jdk:/usr/bin/policytool:/${_jdk_home}/bin/policytool + jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic + jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid + jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry + jdk:/usr/bin/schemagen:/${_jdk_home}/bin/schemagen + jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver + jdk:/usr/bin/servertool:/${_jdk_home}/bin/servertool + jdk:/usr/bin/tnameserv:/${_jdk_home}/bin/tnameserv + jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200 + jdk:/usr/bin/wsgen:/${_jdk_home}/bin/wsgen + jdk:/usr/bin/wsimport:/${_jdk_home}/bin/wsimport + jdk:/usr/bin/xjc:/${_jdk_home}/bin/xjc " post_extract() { @@ -219,11 +204,11 @@ post_install() { # unify the install prefix mv ${DESTDIR}/usr/lib/jvm/openjdk-1.8.0_${_jdk_update} \ - ${DESTDIR}/${_final_jdk_home} + ${DESTDIR}/${_jdk_home} - vmkdir ${_final_jdk_home}/lib/security - make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/${_final_jdk_home}/bin/keytool" - mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/${_final_jdk_home}/lib/security/ + vmkdir ${_jdk_home}/lib/security + make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/${_jdk_home}/bin/keytool" + mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/${_jdk_home}/lib/security/ chmod -R ugo+rw ./ca rm -Rf ./ca @@ -237,23 +222,23 @@ openjdk8-jre_package() { short_desc+=" - runtime components" provides="java-runtime-${version}_1" alternatives=" - java:/usr/bin/java:/${_final_jdk_home}/jre/bin/java - java:/usr/bin/jjs:/${_final_jdk_home}/jre/bin/jjs - java:/usr/bin/keytool:/${_final_jdk_home}/jre/bin/keytool - java:/usr/bin/orbd:/${_final_jdk_home}/jre/bin/orbd - java:/usr/bin/pack200:/${_final_jdk_home}/jre/bin/pack200 - java:/usr/bin/policytool:/${_final_jdk_home}/jre/bin/policytool - java:/usr/bin/rmid:/${_final_jdk_home}/jre/bin/rmid - java:/usr/bin/rmiregistry:/${_final_jdk_home}/jre/bin/rmiregistry - java:/usr/bin/servertool:/${_final_jdk_home}/jre/bin/servertool - java:/usr/bin/tnameserv:/${_final_jdk_home}/jre/bin/tnameserv - java:/usr/bin/unpack200:/${_final_jdk_home}/jre/bin/unpack200 + java:/usr/bin/java:/${_jdk_home}/jre/bin/java + java:/usr/bin/jjs:/${_jdk_home}/jre/bin/jjs + java:/usr/bin/keytool:/${_jdk_home}/jre/bin/keytool + java:/usr/bin/orbd:/${_jdk_home}/jre/bin/orbd + java:/usr/bin/pack200:/${_jdk_home}/jre/bin/pack200 + java:/usr/bin/policytool:/${_jdk_home}/jre/bin/policytool + java:/usr/bin/rmid:/${_jdk_home}/jre/bin/rmid + java:/usr/bin/rmiregistry:/${_jdk_home}/jre/bin/rmiregistry + java:/usr/bin/servertool:/${_jdk_home}/jre/bin/servertool + java:/usr/bin/tnameserv:/${_jdk_home}/jre/bin/tnameserv + java:/usr/bin/unpack200:/${_jdk_home}/jre/bin/unpack200 " pkg_install() { - vmove ${_final_jdk_home}/jre + vmove ${_jdk_home}/jre vmkdir etc/profile.d cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk8.sh < Date: Thu, 21 Apr 2022 12:15:20 +0200 Subject: [PATCH 1231/2369] python3-pwntools: update to 4.8.0. --- srcpkgs/python3-pwntools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template index e57c1bed300..f61ad95fa81 100644 --- a/srcpkgs/python3-pwntools/template +++ b/srcpkgs/python3-pwntools/template @@ -1,6 +1,6 @@ # Template file for 'python3-pwntools' pkgname=python3-pwntools -version=4.7.0 +version=4.8.0 revision=1 wrksrc="pwntools-${version}" build_style=python3-module @@ -17,7 +17,7 @@ maintainer="Leah Neukirchen " license="MIT, BSD-2-Clause" homepage="https://github.com/Gallopsled/pwntools" distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz" -checksum=74388e28675e7a1929f763df5a1cec6a3d589641049b6cf476bb1c56ec50a88e +checksum=42052e2d883710e4e1da041e91675a6d719fb4e5ef2dd245cb2853da11269290 post_install() { rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md From 6812d036690e6277dd411130503aea9dc24dc22f Mon Sep 17 00:00:00 2001 From: q66 Date: Thu, 21 Apr 2022 14:20:52 +0200 Subject: [PATCH 1232/2369] gst-plugins-base1: ensure wayland winsys is built This is a regression from previous state. --- srcpkgs/gst-plugins-base1/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index 6ab6210e660..fcb7c07b06a 100644 --- a/srcpkgs/gst-plugins-base1/template +++ b/srcpkgs/gst-plugins-base1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-base1' pkgname=gst-plugins-base1 version=1.20.1 -revision=1 +revision=2 wrksrc="${pkgname/1/}-${version}" build_style=meson build_helper="gir" @@ -9,12 +9,13 @@ configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled -Dcdparanoia=$(vopt_if cdparanoia enabled disabled) -Dintrospection=$(vopt_if gir enabled disabled) -Dsndio=$(vopt_if sndio enabled disabled)" -hostmakedepends="gettext pkg-config glib-devel orc" +hostmakedepends="gettext pkg-config glib-devel orc wayland-devel" makedepends="gstreamer1-devel glib-devel libxml2-devel pango-devel cairo-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel libvisual-devel libgudev-devel libtheora-devel libvorbis-devel libSM-devel orc-devel $(vopt_if cdparanoia libcdparanoia-devel) - opus-devel MesaLib-devel $(vopt_if sndio sndio-devel) graphene-devel" + opus-devel MesaLib-devel $(vopt_if sndio sndio-devel) graphene-devel + wayland-devel wayland-protocols" depends="orc>=0.4.18 gstreamer1>=${version}" checkdepends="mesa-dri" short_desc="GStreamer Base Plug-ins (v1.x)" From db33375d1b3a52761a5ff4459bf559a51eeb640e Mon Sep 17 00:00:00 2001 From: q66 Date: Thu, 21 Apr 2022 14:25:20 +0200 Subject: [PATCH 1233/2369] gst-plugins-good1: rebuild against fixed gst-plugins-base1 --- srcpkgs/gst-plugins-good1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index 0ce7d1bce5c..aba03519e45 100644 --- a/srcpkgs/gst-plugins-good1/template +++ b/srcpkgs/gst-plugins-good1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-good1' pkgname=gst-plugins-good1 version=1.20.1 -revision=1 +revision=2 wrksrc="${pkgname/1/}-${version}" build_style=meson configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled From f0a6396bf18dce57ccfd570202fd288f1cf7cd7a Mon Sep 17 00:00:00 2001 From: q66 Date: Thu, 21 Apr 2022 14:28:46 +0200 Subject: [PATCH 1234/2369] qt5: rebuild again against fixed gstreamer --- srcpkgs/qt5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index f6c03777d99..ee788fad201 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -3,7 +3,7 @@ pkgname=qt5 version=5.15.3+20220222 # commit fcca82ca40a5d8a02a4ddd90846d070f2c58cfad # base repo: https://invent.kde.org/qt/qt/qt5 -revision=2 +revision=3 build_style=meta hostmakedepends="cmake clang flex perl glib-devel pkg-config python re2c ruby which" From 8f6c40ab4fd36071fbd906bf9e9fb801b96b245b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 21 Apr 2022 15:36:44 +0200 Subject: [PATCH 1235/2369] clojure: update to 1.11.1.1105. --- srcpkgs/clojure/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template index 7fdaa6090b6..ac65080ef7a 100644 --- a/srcpkgs/clojure/template +++ b/srcpkgs/clojure/template @@ -1,6 +1,6 @@ # Template file for 'clojure' pkgname=clojure -version=1.10.3.1029 +version=1.11.1.1105 revision=1 wrksrc="clojure-tools" depends="virtual?java-environment rlwrap" @@ -9,7 +9,7 @@ maintainer="Dominic Monroe " license="EPL-1.0" homepage="https://clojure.org/" distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz" -checksum=422986f259608c049fcff7147222c713b5563a9f0c6e74e0a0dae4a076478091 +checksum=991cad02a2ac459dc4222c9f8233e2145458ed8576a254b64c262798cae40567 do_install() { vmkdir /usr/lib/clojure From 3ad374dbe43e26fb1740f5f79eafbbc841d01b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 13 Apr 2022 21:13:37 +0200 Subject: [PATCH 1236/2369] xbps-src: sort and deduplicate packages at update-sys --- common/xbps-src/shutils/bulk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh index 8eb6e920f04..c0228f10ac2 100644 --- a/common/xbps-src/shutils/bulk.sh +++ b/common/xbps-src/shutils/bulk.sh @@ -68,7 +68,7 @@ bulk_build() { # Compare installed pkg versions vs srcpkgs if [[ $sys ]]; then - xbps-checkvers -f '%n' -I -D $XBPS_DISTDIR + bulk_sortdeps $(xbps-checkvers -f '%n' -I -D $XBPS_DISTDIR) return $? fi # compare repo pkg versions vs srcpkgs From 401a9f325f440d3e2552b340adca1337b8ee8f95 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 14:08:15 +0200 Subject: [PATCH 1237/2369] lxqt: update to 1.1.0. --- srcpkgs/lxqt/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lxqt/template b/srcpkgs/lxqt/template index a510106d65d..d30d711e956 100644 --- a/srcpkgs/lxqt/template +++ b/srcpkgs/lxqt/template @@ -1,6 +1,6 @@ # Template file for 'lxqt' pkgname=lxqt -version=1.0.0 +version=1.1.0 revision=1 build_style=meta depends=" @@ -21,15 +21,15 @@ depends=" obconf-qt pcmanfm-qt>=${version} lximage-qt>=${version} - lxmenu-data lxqt-archiver qterminal>=${version} openbox breeze-icons + xdg-desktop-portal-lxqt xdg-utils elogind upower" short_desc="LXQt meta-package for Void Linux" maintainer="Helmut Pozimski " license="BSD-2-Clause" # Suppress xlint warning: vlicense -homepage="https://www.lxqt.org/" +homepage="https://lxqt-project.org" From 0046301743440cc47fdb3abae1243cdb3139b075 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 14:25:28 +0200 Subject: [PATCH 1238/2369] lxqt-build-tools: update to 0.11.0. --- srcpkgs/lxqt-build-tools/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxqt-build-tools/template b/srcpkgs/lxqt-build-tools/template index 8b88c28e20c..179cfee67e7 100644 --- a/srcpkgs/lxqt-build-tools/template +++ b/srcpkgs/lxqt-build-tools/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-build-tools' pkgname=lxqt-build-tools -version=0.10.0 +version=0.11.0 revision=1 build_style=cmake hostmakedepends="qt5-host-tools qt5-qmake pkg-config" @@ -8,9 +8,9 @@ makedepends="qt5-devel" short_desc="LXQt build tools" maintainer="Helmut Pozimski " license="BSD-3-Clause" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-build-tools/releases/download/${version}/lxqt-build-tools-${version}.tar.xz" -checksum=facb86b0bf3bd4fd20306d3ae965a148ed59785eaf7d73169a82a97473d03bea +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-build-tools/archive/${version}.tar.gz" +checksum=95da1309ae0111e3b97f775788465f82548a3de09b0e9d5e0a26e5fe715075b2 post_install() { vlicense BSD-3-Clause LICENSE From 1a601141d476c00f830e9c9916152f1468b3b5a2 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 14:44:10 +0200 Subject: [PATCH 1239/2369] libqtxdg: update to 3.9.0. --- srcpkgs/libqtxdg/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template index a9c665844f3..b8bea143f36 100644 --- a/srcpkgs/libqtxdg/template +++ b/srcpkgs/libqtxdg/template @@ -1,6 +1,6 @@ # Template file for 'libqtxdg' pkgname=libqtxdg -version=3.8.0 +version=3.9.0 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools lxqt-build-tools" @@ -8,9 +8,9 @@ makedepends="qt5-svg-devel" short_desc="Qt implementation of freedesktop.org XDG specifications" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/libqtxdg/releases/download/${version}/libqtxdg-${version}.tar.xz" -checksum=ce824fb2dda47758b44e57e8e4b63437a5bc5bd476cf37dbba61442990d7ccec +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/libqtxdg/archive/${version}.tar.gz" +checksum=4dc7e3e65e6bcd50010647ef781ef5601b08ce024b0b1155e6a68316696c5a58 libqtxdg-devel_package() { short_desc+=" - development files" From 122e56e6519da186ab4b7d5e5091a8c245547f48 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 15:05:52 +0200 Subject: [PATCH 1240/2369] liblxqt: update to 1.1.0. --- srcpkgs/liblxqt/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/liblxqt/template b/srcpkgs/liblxqt/template index c39a0398f96..5e5734ad61c 100644 --- a/srcpkgs/liblxqt/template +++ b/srcpkgs/liblxqt/template @@ -1,6 +1,6 @@ # Template file for 'liblxqt' pkgname=liblxqt -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools @@ -10,9 +10,9 @@ makedepends="kwindowsystem-devel libqtxdg-devel libXScrnSaver-devel short_desc="Core utility library for all LXQt components" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/liblxqt/releases/download/${version}/liblxqt-${version}.tar.xz" -checksum=d62820a94839637aedd6a0ceecc232f85d8ccd2173d4ec655cd92c9cbcbcc98c +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/liblxqt/archive/${version}.tar.gz" +checksum=3b4672cef3906f82444da886557fe0504bf53066e7741c2215592119fbafbb42 liblxqt-devel_package() { short_desc+=" - development files" From 7e38071c6997ef6c32de629ed4955935527646b1 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 15:26:14 +0200 Subject: [PATCH 1241/2369] lxqt-config: update to 1.1.0. --- srcpkgs/lxqt-config/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/lxqt-config/template b/srcpkgs/lxqt-config/template index c38f2486029..8372521a2c3 100644 --- a/srcpkgs/lxqt-config/template +++ b/srcpkgs/lxqt-config/template @@ -1,14 +1,14 @@ # Template file for 'lxqt-config' pkgname=lxqt-config -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake -hostmakedepends="pkgconf lxqt-build-tools qt5-qmake qt5-host-tools perl" +hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl" makedepends="liblxqt-devel libXcursor-devel libkscreen-devel xf86-input-libinput-devel libqtxdg-devel" short_desc="LXQt System Settings" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-config/releases/download/${version}/lxqt-config-${version}.tar.xz" -checksum=64d7dd43e5ec1f98f0ba41e99f4438bb1f881fcbc2b2931f798cc82643c2d8a5 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-config/archive/${version}.tar.gz" +checksum=debe3f51c30e37a8bca37bfdaa0187a68ddd57dad0ecefef169a32c2b042cc58 From c5c8800701e8fa6d43a81c338a31b1886b6c1567 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 15:36:44 +0200 Subject: [PATCH 1242/2369] lxqt-policykit: update to 1.1.0. --- srcpkgs/lxqt-policykit/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxqt-policykit/template b/srcpkgs/lxqt-policykit/template index ef972dba196..ad81878cab8 100644 --- a/srcpkgs/lxqt-policykit/template +++ b/srcpkgs/lxqt-policykit/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-policykit' pkgname=lxqt-policykit -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools polkit-qt5-devel perl" @@ -8,7 +8,7 @@ makedepends="liblxqt-devel polkit-qt5-devel" short_desc="LXQt PolicyKit agent" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-policykit/releases/download/${version}/lxqt-policykit-${version}.tar.xz" -checksum=8e3ae58196c55c28a5a231f44154a83d6697aa5f6b40dffdedb6b9ea776b4d35 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-policykit/archive/${version}.tar.gz" +checksum=4866bb843657206b0bb55cc063474941a6d81db578fe3d5143d3760f438b033d replaces="lxqt-common>=0" From 93f076bb0108085a7634170996425f0c04e4bf32 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 15:48:19 +0200 Subject: [PATCH 1243/2369] lxqt-session: update to 1.1.0. --- srcpkgs/lxqt-session/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/lxqt-session/template b/srcpkgs/lxqt-session/template index 3afe6da177f..3b30d410cc3 100644 --- a/srcpkgs/lxqt-session/template +++ b/srcpkgs/lxqt-session/template @@ -1,16 +1,16 @@ # Template file for 'lxqt-session' pkgname=lxqt-session -version=1.0.1 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools xdg-user-dirs perl" -makedepends="liblxqt-devel xdg-user-dirs procps-ng-devel" +makedepends="kwindowsystem-devel liblxqt-devel procps-ng-devel" depends="xdg-user-dirs" short_desc="LXQt session handler" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-session/releases/download/${version}/lxqt-session-${version}.tar.xz" -checksum=3245457cb4a1e59ec62802308c872173baa300fa0f8e517fe14f45112733a6c1 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-session/archive/${version}.tar.gz" +checksum=6ff41d1c95464fe7b00d3b5493f259323ecad61ae72865cf251ad5db9ae68e4e replaces="lxqt-common>=0" From 3bbd0f96bda40912263512530dcd34f55d2c56ac Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 15:54:04 +0200 Subject: [PATCH 1244/2369] lxqt-about: update to 1.1.0. --- srcpkgs/lxqt-about/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxqt-about/template b/srcpkgs/lxqt-about/template index 4103f1a6038..447c2a945f8 100644 --- a/srcpkgs/lxqt-about/template +++ b/srcpkgs/lxqt-about/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-about' pkgname=lxqt-about -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl" @@ -8,6 +8,6 @@ makedepends="qt5-tools-devel liblxqt-devel" short_desc="LXQt about application" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-about/releases/download/${version}/lxqt-about-${version}.tar.xz" -checksum=1c14f68bf65099fbd46b062ffc6c92656620aa1a9eec5a0fd2d1b11888939203 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-about/archive/${version}.tar.gz" +checksum=d8b5bb348c73e59e000151c5569b46496299155019a3cf9ce7e21a8f641d42b4 From 4ead51865f7f040958b672da4e76124793be9ff0 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 17:21:23 +0200 Subject: [PATCH 1245/2369] lxqt-admin: update to 1.1.0. --- srcpkgs/lxqt-admin/patches/systemd.patch | 9 +++++++++ srcpkgs/lxqt-admin/template | 14 ++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 srcpkgs/lxqt-admin/patches/systemd.patch diff --git a/srcpkgs/lxqt-admin/patches/systemd.patch b/srcpkgs/lxqt-admin/patches/systemd.patch new file mode 100644 index 00000000000..097c7669b1b --- /dev/null +++ b/srcpkgs/lxqt-admin/patches/systemd.patch @@ -0,0 +1,9 @@ +lxqt-admin-time depends on systemd-{timedated,timesyncd} +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,5 +38,4 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD + message(WARNING "${CMAKE_SYSTEM_NAME} is not supported by lxqt-admin-time") + else() + add_subdirectory(lxqt-admin-user) +- add_subdirectory(lxqt-admin-time) + endif() diff --git a/srcpkgs/lxqt-admin/template b/srcpkgs/lxqt-admin/template index 9bf02478a14..cba72e16fbc 100644 --- a/srcpkgs/lxqt-admin/template +++ b/srcpkgs/lxqt-admin/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-admin' pkgname=lxqt-admin -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools polkit-qt5-devel @@ -9,12 +9,6 @@ makedepends="liblxqt-devel" short_desc="LXQt system administration tool" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-admin/releases/download/${version}/lxqt-admin-${version}.tar.xz" -checksum=f6eebb0da1563f14e9e4d39d3ff2622ee1c8ffa5b130ba26321cfe5261c1411e - -post_install() { - # depends on systemd-{timedated,timesyncd} - rm -f ${DESTDIR}/usr/bin/lxqt-admin-time - rm -f ${DESTDIR}/usr/share/applications/lxqt-admin-time.desktop -} +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-admin/archive/${version}.tar.gz" +checksum=cf6c41a63b861caacae5ace8bef4781f502cfb0f559fe56afbffe60d13a74775 From 29cffc5385968535a971a78180d498f26bceb96d Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 17:31:34 +0200 Subject: [PATCH 1246/2369] lxqt-archiver: update to 0.6.0. --- srcpkgs/lxqt-archiver/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxqt-archiver/template b/srcpkgs/lxqt-archiver/template index 5a5dd96932b..076965fb01b 100644 --- a/srcpkgs/lxqt-archiver/template +++ b/srcpkgs/lxqt-archiver/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-archiver' pkgname=lxqt-archiver -version=0.5.0 +version=0.6.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools pkg-config qt5-host-tools qt5-qmake perl" @@ -8,6 +8,6 @@ makedepends="qt5-tools-devel qt5-x11extras-devel libfm-qt-devel json-glib-devel" short_desc="Simple & lightweight desktop-agnostic Qt file archiver" maintainer="Helmut Pozimski " license="GPL-2.0-or-later" -homepage="https://lxqt.org" -distfiles="https://github.com/lxqt/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=8ae5259ec00761b1f178e54b9e99bcf64685a6000a148501c4bbe862b4b08fc7 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/${pkgname}/archive/${version}.tar.gz" +checksum=63029ed0c22dccaa30a7dd7866b6739e7746904cfa97deac836b40da6d56eb8c From d8192e407c4801d7ba6f5b64ef63ee9d0ffdfbd9 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 17:43:05 +0200 Subject: [PATCH 1247/2369] libfm-qt: update to 1.1.0. --- common/shlibs | 2 +- srcpkgs/libfm-qt/template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index ae4bb44c57a..11328b15a9c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1990,7 +1990,7 @@ libsysstat-qt5.so.0 libsysstat-0.3.2_1 libpolkit-qt5-agent-1.so.1 polkit-qt5-0.112.0_1 libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1 -libfm-qt.so.10 libfm-qt-1.0.0_1 +libfm-qt.so.11 libfm-qt-1.1.0_1 libqtermwidget5.so.1 qtermwidget-1.0.0_1 libQt6Core.so.6 qt6-core-6.0.0_1 libQt6OpenGL.so.6 qt6-gui-6.0.0_1 diff --git a/srcpkgs/libfm-qt/template b/srcpkgs/libfm-qt/template index 9b2009242a8..bd7343fac83 100644 --- a/srcpkgs/libfm-qt/template +++ b/srcpkgs/libfm-qt/template @@ -1,6 +1,6 @@ # Template file for 'libfm-qt' pkgname=libfm-qt -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl" @@ -9,9 +9,9 @@ makedepends="qt5-tools-devel qt5-x11extras-devel libexif-devel short_desc="Core library of PCManFM-Qt" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/libfm-qt/releases/download/${version}/libfm-qt-${version}.tar.xz" -checksum=743d9c8fc30d065d7fefc12e72f31085891733184f1320ba3ade890dae54993b +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/libfm-qt/archive/${version}.tar.gz" +checksum=8ba16e0db696bb938f675b6d5394ec96726585e8b6130e6a2718a4ffde073d62 replaces="libfm-qt5>=0" libfm-qt-devel_package() { From 665bf330ba2030293363163607b163e63659b130 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 18:09:10 +0200 Subject: [PATCH 1248/2369] pcmanfm-qt: update to 1.1.0. --- srcpkgs/pcmanfm-qt/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/pcmanfm-qt/template b/srcpkgs/pcmanfm-qt/template index fc09b298717..5a5341a6c5f 100644 --- a/srcpkgs/pcmanfm-qt/template +++ b/srcpkgs/pcmanfm-qt/template @@ -1,15 +1,15 @@ # Template file for 'pcmanfm-qt' pkgname=pcmanfm-qt -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake -hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel perl" +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-qt-devel perl" makedepends="qt5-tools-devel qt5-x11extras-devel libfm-qt-devel" depends="qt5-translations" -short_desc="LXQt pcmanfm Qt frontend" +short_desc="Qt port of PCManFM" maintainer="Helmut Pozimski " license="GPL-2.0-or-later" -homepage="https://www.lxqt.org" -distfiles="https://github.com/lxqt/pcmanfm-qt/releases/download/${version}/pcmanfm-qt-${version}.tar.xz" -checksum=fa45cc0d3e870db3fb56f474e854aa1284576023082b770b3e4a44410f22cce3 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/pcmanfm-qt/archive/${version}.tar.gz" +checksum=28b5ff1fb71d9259ae73962892ce04142a750794aa35c4840ed575da08972b9d replaces="lxqt-common>=0" From 69e74a10feacd5e1c83e1742b6ba5c22d46c436f Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 18:16:28 +0200 Subject: [PATCH 1249/2369] lximage-qt: update to 1.1.0. --- srcpkgs/lximage-qt/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lximage-qt/template b/srcpkgs/lximage-qt/template index b64d2568b9d..503990ab93d 100644 --- a/srcpkgs/lximage-qt/template +++ b/srcpkgs/lximage-qt/template @@ -1,6 +1,6 @@ # Template file for 'lximage-qt' pkgname=lximage-qt -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl" @@ -9,6 +9,6 @@ makedepends="qt5-x11extras-devel qt5-tools-devel qt5-svg-devel libfm-qt-devel short_desc="LXQt image viewer" maintainer="Helmut Pozimski " license="GPL-2.0-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lximage-qt/releases/download/${version}/lximage-qt-${version}.tar.xz" -checksum=04fdff9d0d20dbfeddca2ca8166f7dd14b691badb6ca65909ca8bce75c4a7225 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lximage-qt/archive/${version}.tar.gz" +checksum=cd1eb058af1c927fac9ac4d2d31435cf46572b2f017cbb0d0b099ad6106c8b91 From 402e8521040b529980fc9280de50ecb4f5496dfc Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 18:23:45 +0200 Subject: [PATCH 1250/2369] lxqt-globalkeys: update to 1.1.0. --- srcpkgs/lxqt-globalkeys/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxqt-globalkeys/template b/srcpkgs/lxqt-globalkeys/template index 97537e06f8a..dcffc9ba525 100644 --- a/srcpkgs/lxqt-globalkeys/template +++ b/srcpkgs/lxqt-globalkeys/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-globalkeys' pkgname=lxqt-globalkeys -version=1.0.1 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl" @@ -8,9 +8,9 @@ makedepends="liblxqt-devel" short_desc="LXQt daemon and library for global keyboard shortcuts registration" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-globalkeys/releases/download/${version}/lxqt-globalkeys-${version}.tar.xz" -checksum=b81944cc8d8f20f1eeedb3cd54d4e6ad86a1697d71b4212cf60110af43559a45 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-globalkeys/archive/${version}.tar.gz" +checksum=ce0cbdbfbddef4ea9b2018b61fb6fc03caeea57fc31bc6f4bb54a04619edb2aa replaces="lxqt-common>=0" lxqt-globalkeys-devel_package() { From aa265190494ae3473ea054869a94b77ca570c9b2 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 18:30:32 +0200 Subject: [PATCH 1251/2369] lxqt-notificationd: update to 1.1.0. --- srcpkgs/lxqt-notificationd/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxqt-notificationd/template b/srcpkgs/lxqt-notificationd/template index 0158f56a336..57cd26eed5a 100644 --- a/srcpkgs/lxqt-notificationd/template +++ b/srcpkgs/lxqt-notificationd/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-notificationd' pkgname=lxqt-notificationd -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl" @@ -8,7 +8,7 @@ makedepends="liblxqt-devel" short_desc="LXQt notification daemon" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-notificationd/releases/download/${version}/lxqt-notificationd-${version}.tar.xz" -checksum=94c10fd904995d3eea3b587dd521ed01b839d863ff80205af0af8cab6cb2a660 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-notificationd/archive/${version}.tar.gz" +checksum=6b29f0163541ba734bcb8d21f0f3579bc36c868fa8afee44d8b7e56ea8ca23ee replaces="lxqt-common>=0" From 5770cd98c3d82f1fb3308c52800494b6e615b29a Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 18:31:58 +0200 Subject: [PATCH 1252/2369] lxqt-openssh-askpass: update to 1.1.0. --- srcpkgs/lxqt-openssh-askpass/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxqt-openssh-askpass/template b/srcpkgs/lxqt-openssh-askpass/template index 57fe03004c1..566f1741e32 100644 --- a/srcpkgs/lxqt-openssh-askpass/template +++ b/srcpkgs/lxqt-openssh-askpass/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-openssh-askpass' pkgname=lxqt-openssh-askpass -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl" @@ -9,7 +9,7 @@ depends="openssh" short_desc="LXQt ssh-agent helper" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-openssh-askpass/releases/download/${version}/lxqt-openssh-askpass-${version}.tar.xz" -checksum=9de22a06646cfa50b0ddeef26ac87b510f820501ff8832dc80c7d88a55d878b5 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-openssh-askpass/archive/${version}.tar.gz" +checksum=77578faf1aaf3e273cd8f92b84ad9570d7aacc88b44663c3373517e790c606b6 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/lxqt-openssh-askpass" From 0698a3b6a6f1bf1a716131e76ff68dffc693bf54 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 18:42:14 +0200 Subject: [PATCH 1253/2369] lxqt-panel: update to 1.1.0. --- srcpkgs/lxqt-panel/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/lxqt-panel/template b/srcpkgs/lxqt-panel/template index f486e3e3a25..f5524550a6e 100644 --- a/srcpkgs/lxqt-panel/template +++ b/srcpkgs/lxqt-panel/template @@ -1,16 +1,17 @@ # Template file for 'lxqt-panel' pkgname=lxqt-panel -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl" makedepends="libxkbcommon-devel liblxqt-devel ksolid-devel kguiaddons-devel lxqt-globalkeys-devel alsa-lib-devel pulseaudio-devel libstatgrab-devel - libsensors-devel libXcomposite-devel libsysstat-devel libdbusmenu-qt5-devel - libqtxdg-devel libXdamage-devel" + libsensors-devel libsysstat-devel libdbusmenu-qt5-devel + libqtxdg-devel libxcb-devel libXtst-devel xcb-util-image-devel" +depends="lxmenu-data" short_desc="LXQt desktop panel" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-panel/releases/download/${version}/lxqt-panel-${version}.tar.xz" -checksum=ea63939c557fa639d2ab3fae48341c1a59ae8baae1a79d11f15e4bc0e38468d5 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-panel/archive/${version}.tar.gz" +checksum=f80ccdeb59933d32aab1a425301b9b68458bf0c55567befe1c03263afad20d6d From bdb66b8da7ccda8e1896760e9a82c2013efe4cb0 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 18:47:30 +0200 Subject: [PATCH 1254/2369] lxqt-powermanagement: update to 1.1.0. --- srcpkgs/lxqt-powermanagement/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxqt-powermanagement/template b/srcpkgs/lxqt-powermanagement/template index f7c8b8d85e8..b083469ecbb 100644 --- a/srcpkgs/lxqt-powermanagement/template +++ b/srcpkgs/lxqt-powermanagement/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-powermanagement' pkgname=lxqt-powermanagement -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl" @@ -8,6 +8,6 @@ makedepends="liblxqt-devel ksolid-devel kidletime-devel lxqt-globalkeys-devel" short_desc="LXQt power management module" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-powermanagement/releases/download/${version}/lxqt-powermanagement-${version}.tar.xz" -checksum=c0a444faeed60337c966bfd562e65e936f132f578762c2f01f136038a3f058ee +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-powermanagement/archive/${version}.tar.gz" +checksum=df59e7b93392863874250a49769dcd7ed395f98548428f9ef6a5b1e728d32e86 From bfce6c461aa5b5b972fd2c5c248b0d030dd73a86 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 18:53:50 +0200 Subject: [PATCH 1255/2369] lxqt-qtplugin: update to 1.1.0. --- srcpkgs/lxqt-qtplugin/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/lxqt-qtplugin/template b/srcpkgs/lxqt-qtplugin/template index 8148c7119f1..eaddfdf3d70 100644 --- a/srcpkgs/lxqt-qtplugin/template +++ b/srcpkgs/lxqt-qtplugin/template @@ -1,13 +1,13 @@ # Template file for 'lxqt-qtplugin' pkgname=lxqt-qtplugin -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel" -makedepends="liblxqt-devel libdbusmenu-qt5-devel libfm-qt-devel" +makedepends="liblxqt-devel libdbusmenu-qt5-devel libfm-qt-devel libqtxdg-devel" short_desc="LXQt Qt theme plugin" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-qtplugin/releases/download/${version}/lxqt-qtplugin-${version}.tar.xz" -checksum=8e789430e1f3b6a354f61d496440a59b797f699320bb8c001d8ef7ac8e1db05e +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-qtplugin/archive/${version}.tar.gz" +checksum=20eda3ac9319e793c4b1236413f119058771d34915483bed4a048591a59ae990 From f23a802f14524a890b5fbb08be17f98fb73a1978 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 19:00:22 +0200 Subject: [PATCH 1256/2369] lxqt-runner: update to 1.1.0. --- srcpkgs/lxqt-runner/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxqt-runner/template b/srcpkgs/lxqt-runner/template index e85e2f5a760..e96c3b6950f 100644 --- a/srcpkgs/lxqt-runner/template +++ b/srcpkgs/lxqt-runner/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-runner' pkgname=lxqt-runner -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl" @@ -8,6 +8,6 @@ makedepends="liblxqt-devel lxqt-globalkeys-devel muparser-devel" short_desc="LXQt quick launcher" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-runner/releases/download/${version}/lxqt-runner-${version}.tar.xz" -checksum=24daa86680ef78daf8753b60b3a0c6df391e760b851796a0abeddeed61ae13b9 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-runner/archive/${version}.tar.gz" +checksum=7c253d338019cb162cddcb606429faa016ac148a16bf720e87e28f756698b731 From a78a8dd34f3af337bfd883bdab22067deaf782fb Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 19:04:18 +0200 Subject: [PATCH 1257/2369] lxqt-sudo: update to 1.1.0. --- srcpkgs/lxqt-sudo/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxqt-sudo/template b/srcpkgs/lxqt-sudo/template index 88b8389b196..5ffd63acec3 100644 --- a/srcpkgs/lxqt-sudo/template +++ b/srcpkgs/lxqt-sudo/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-sudo' pkgname=lxqt-sudo -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl" @@ -9,6 +9,6 @@ depends="sudo" short_desc="LXQt GUI frontend for sudo" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-sudo/releases/download/${version}/lxqt-sudo-${version}.tar.xz" -checksum=6072f6914942fff5884388be9c7c5d38d259fed14358c4c2a9103d0cdd0a43f0 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-sudo/archive/${version}.tar.gz" +checksum=c31332d056355ff888175ba10556639f436b314579349ca90e555da849ebe22b From d70da82ff75485c6b4273c5e03738d12fa6ec139 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 19:07:53 +0200 Subject: [PATCH 1258/2369] lxqt-themes: update to 1.1.0. --- srcpkgs/lxqt-themes/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxqt-themes/template b/srcpkgs/lxqt-themes/template index 01038f959c5..a3c9b9c6a67 100644 --- a/srcpkgs/lxqt-themes/template +++ b/srcpkgs/lxqt-themes/template @@ -1,6 +1,6 @@ # Template file for 'lxqt-themes' pkgname=lxqt-themes -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools perl" @@ -8,7 +8,7 @@ depends="hicolor-icon-theme" short_desc="Themes, graphics and icons for LXQt" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/lxqt-themes/releases/download/${version}/lxqt-themes-${version}.tar.xz" -checksum=e3a6c96311bbf471ce0af72953b2f34ecf15461ab5e57a6f5b924de41758562b +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/lxqt-themes/archive/${version}.tar.gz" +checksum=aeb24c1570ae350e4c4ecdea9fb1b67208f641966476bbafd1817a816f665efe replaces="lxqt-common>=0" From 59d776feeed9241ec45307306c01cad1971872eb Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 19:17:29 +0200 Subject: [PATCH 1259/2369] qtermwidget: update to 1.1.0. --- srcpkgs/qtermwidget/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qtermwidget/template b/srcpkgs/qtermwidget/template index 938f7987973..273705963a6 100644 --- a/srcpkgs/qtermwidget/template +++ b/srcpkgs/qtermwidget/template @@ -1,6 +1,6 @@ # Template file for 'qtermwidget' pkgname=qtermwidget -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools" @@ -8,9 +8,9 @@ makedepends="qt5-tools-devel" short_desc="Terminal widget for QTerminal" maintainer="Helmut Pozimski " license="GPL-2.0-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/qtermwidget/releases/download/${version}/qtermwidget-${version}.tar.xz" -checksum=2af0e9f212932cb36bbbf20722eaf4a1d3acf640dfed9b763ca7d388af8b7fd2 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/qtermwidget/archive/${version}.tar.gz" +checksum=b062e5169bee35c3a8c1d0f67b78b43d63f1041d11e3a5a717f6a54a016bd734 qtermwidget-devel_package() { short_desc+=" - development files" From 6b34552d6370a81782f607f4cb1a9f42e9e0a2f4 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 19:30:33 +0200 Subject: [PATCH 1260/2369] qterminal: update to 1.1.0. --- srcpkgs/qterminal/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/qterminal/template b/srcpkgs/qterminal/template index 079c89b00a1..7469a365b36 100644 --- a/srcpkgs/qterminal/template +++ b/srcpkgs/qterminal/template @@ -1,14 +1,13 @@ # Template file for 'qterminal' pkgname=qterminal -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl" makedepends="qtermwidget-devel qt5-tools-devel qt5-x11extras-devel" -depends="desktop-file-utils" short_desc="Lightweight terminal emulator written in Qt" maintainer="Helmut Pozimski " license="GPL-2.0-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/qterminal/releases/download/${version}/qterminal-${version}.tar.xz" -checksum=f169a5279ae5afe386ec3016385c7692b551fea1bae639a8ae438ec90165a643 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/qterminal/archive/${version}.tar.gz" +checksum=5a72a6f3deb5326618183ddae59989316aa78c86163220f26895df677cbc4479 From 37605321209dbbecd8ec770fb569507e21832d62 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 20:08:13 +0200 Subject: [PATCH 1261/2369] pavucontrol-qt: update to 1.1.0. --- srcpkgs/pavucontrol-qt/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/pavucontrol-qt/template b/srcpkgs/pavucontrol-qt/template index 2faef3430dc..0be80a6c17c 100644 --- a/srcpkgs/pavucontrol-qt/template +++ b/srcpkgs/pavucontrol-qt/template @@ -1,13 +1,13 @@ # Template file for 'pavucontrol-qt' pkgname=pavucontrol-qt -version=1.0.0 +version=1.1.0 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl" makedepends="qt5-tools-devel pulseaudio-devel" short_desc="Pulseaudio mixer in Qt" -maintainer="Orphaned " +maintainer="Enrico Belleri " license="GPL-2.0-or-later" -homepage="https://lxqt.org/" -distfiles="https://github.com/lxqt/pavucontrol-qt/releases/download/${version}/pavucontrol-qt-${version}.tar.xz" -checksum=2407aa55a2d3dc0fdc7074b461c02b97fd455514fbbf9f5b711e68fadd45ac69 +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/pavucontrol-qt/archive/${version}.tar.gz" +checksum=8e4017c584c357fbff75d849e3210fa446edc6e53655b6920221891b8e3dc403 From 6606046131edc636651e2971795c3853175a0192 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 20:13:58 +0200 Subject: [PATCH 1262/2369] qps: update to 2.5.0. --- srcpkgs/qps/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qps/template b/srcpkgs/qps/template index 4934c280c4d..264e1eeda9d 100644 --- a/srcpkgs/qps/template +++ b/srcpkgs/qps/template @@ -1,6 +1,6 @@ # Template file for 'qps' pkgname=qps -version=2.4.0 +version=2.5.0 revision=1 build_style=cmake hostmakedepends="lxqt-build-tools perl qt5-qmake qt5-host-tools" @@ -8,6 +8,6 @@ makedepends="liblxqt-devel" short_desc="Qt process manager" maintainer="Helmut Pozimski " license="GPL-2.0-or-later" -homepage="https://github.com/lxqt/qps" -distfiles="https://github.com/lxqt/qps/releases/download/${version}/qps-${version}.tar.xz" -checksum=c2a6c1d5e40e96997cca834f88ca1104aa179bef576a1a8b355b987eaaac69cd +homepage="https://lxqt-project.org" +distfiles="https://github.com/lxqt/qps/archive/${version}.tar.gz" +checksum=c5f3a27b731eccfae59734c4a3048f9d8632827444e35b773c1a112702666b6a From 500864c48349ce5aefec2395d85d52831187c8d5 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 17 Apr 2022 20:40:11 +0200 Subject: [PATCH 1263/2369] New package: xdg-desktop-portal-lxqt-0.2.0 --- srcpkgs/xdg-desktop-portal-lxqt/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/xdg-desktop-portal-lxqt/template diff --git a/srcpkgs/xdg-desktop-portal-lxqt/template b/srcpkgs/xdg-desktop-portal-lxqt/template new file mode 100644 index 00000000000..297e1769a1f --- /dev/null +++ b/srcpkgs/xdg-desktop-portal-lxqt/template @@ -0,0 +1,14 @@ +# Template file for 'xdg-desktop-portal-lxqt' +pkgname=xdg-desktop-portal-lxqt +version=0.2.0 +revision=1 +build_style=cmake +hostmakedepends="qt5-qmake qt5-host-tools" +makedepends="kwindowsystem-devel libfm-qt-devel" +short_desc="Backend implementation for xdg-desktop-portal using Qt/KF5/libfm-qt" +maintainer="Enrico Belleri " +license="LGPL-2.1-or-later" +homepage="https://github.com/lxqt/xdg-desktop-portal-lxqt" +changelog="https://github.com/lxqt/xdg-desktop-portal-lxqt/raw/master/CHANGELOG" +distfiles="https://github.com/lxqt/xdg-desktop-portal-lxqt/archive/${version}.tar.gz" +checksum=9d7ac6fd6980293cb184518642dcc57d842b67105b3d236f893189bd30911ad7 From 1d19b6761b8bee43f5021cd660471c33c0706946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 29 Mar 2022 21:41:02 +0200 Subject: [PATCH 1264/2369] qtcreator: update to 7.0.0. --- .../qtcreator/patches/QTCREATORBUG-26910.diff | 39 ------------------- srcpkgs/qtcreator/template | 31 +++++++-------- 2 files changed, 15 insertions(+), 55 deletions(-) delete mode 100644 srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff diff --git a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff b/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff deleted file mode 100644 index 8c07c72ccf1..00000000000 --- a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff +++ /dev/null @@ -1,39 +0,0 @@ -From b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a Mon Sep 17 00:00:00 2001 -From: Marco Bubke -Date: Mon, 24 Jan 2022 14:38:29 +0100 -Subject: [PATCH] QmlDesigner: Fix 32 bit - -Because std::ptrdiff_t and int are the same under 32 bit the constructor -is changed to a template. The class is private so it is very unlikely -that it leads to errors. - -Task-number: QTCREATORBUG-26910 -Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd -Reviewed-by: -Reviewed-by: Christophe Giboudeaux -Reviewed-by: Eike Ziller -Reviewed-by: Qt CI Bot ---- - -diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h -index 747c3d9..27d2905 100644 ---- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h -+++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h -@@ -67,15 +67,8 @@ - - StorageCacheIndex(const char *) = delete; - -- constexpr explicit StorageCacheIndex(int id) noexcept -- : id{id} -- {} -- -- constexpr explicit StorageCacheIndex(std::size_t id) noexcept -- : id{static_cast(id)} -- {} -- -- constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept -+ template -+ constexpr explicit StorageCacheIndex(IntegerType id) noexcept - : id{static_cast(id)} - {} - diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template index 988491ec649..912c6c00c4c 100644 --- a/srcpkgs/qtcreator/template +++ b/srcpkgs/qtcreator/template @@ -1,14 +1,16 @@ # Template file for 'qtcreator' pkgname=qtcreator -version=6.0.2 +version=7.0.0 revision=1 wrksrc="qt-creator-opensource-src-${version}" -build_style=qmake -make_install_args="INSTALL_ROOT=\${DESTDIR}/usr" +build_style=cmake +configure_args="$(vopt_bool qbs BUILD_QBS)" hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake - qt5-host-tools" + qt5-host-tools qt5-tools" makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel - qt5-quickcontrols qt5-svg-devel clang llvm" + qt5-quickcontrols qt5-svg-devel qt5-plugin-odbc qt5-plugin-sqlite + qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql + clang llvm clang-tools-extra" depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite" short_desc="Cross-platform IDE for Qt developers" maintainer="Piotr Wójcik " @@ -16,24 +18,21 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0" homepage="https://wiki.qt.io/Category:Tools::QtCreator" changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md" distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz" -checksum=3d173c1a02ce55137a23f294e1a840d7648656e97826067eb29d9df653351bfa +checksum=d39a05e48bb961cfab61135a5ee5503fc4d381c74000b910f36bf0cea37736d9 replaces="qtcreator-data>=0" python_version=3 +build_options="qbs" +desc_option_qbs="Build vendored Qbs" + +if [ -z "$XBPS_CROSS_BUILD" ]; then + build_options_default="qbs" +fi + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" libexecinfo-devel" fi -pre_configure() { - if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - vsed -i src/plugins/qmldesigner/qmldesignerplugin.pro \ - src/plugins/clangformat/clangformat.pro \ - -e "/LIBS += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo" - vsed -i src/plugins/debugger/debugger.pro \ - -e "/RESOURCES += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo" - fi -} - post_install() { # Install the license with the annotation for # the Qt Company GPL Exception 1.0 From b425391c1a133ce30a7535f995b3eb7b607cc77d Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Wed, 20 Apr 2022 20:15:38 +0200 Subject: [PATCH 1265/2369] grim: update to 1.4.0. --- srcpkgs/grim/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template index 89af643b6a7..f42ed188f1f 100644 --- a/srcpkgs/grim/template +++ b/srcpkgs/grim/template @@ -1,18 +1,22 @@ # Template file for 'grim' pkgname=grim -version=1.3.2 +version=1.4.0 revision=1 +wrksrc="grim-v${version}" build_style=meson configure_args="-Djpeg=enabled -Dwerror=false" hostmakedepends="pkg-config wayland-devel scdoc" -makedepends="wayland-devel wayland-protocols cairo-devel libjpeg-turbo-devel" +makedepends="wayland-devel wayland-protocols pixman-devel libjpeg-turbo-devel + libpng-devel" short_desc="Grab images from a Wayland compositor" maintainer="Derriick " license="MIT" homepage="https://wayland.emersion.fr/grim/" -distfiles="https://github.com/emersion/grim/archive/v${version}.tar.gz" -checksum=42c2952e98389506156c08e40e0c37afdc2ec5ef4d55a5a4febde6acdac4d1c8 +distfiles="https://git.sr.ht/~emersion/grim/archive/v${version}.tar.gz" +checksum=66729ae654546404f50ed163055310dd23ed52cc5a881d39752c0cd076e3d7aa post_install() { vlicense LICENSE + vcompletion contrib/completions/bash/grim.bash bash + vcompletion contrib/completions/fish/grim.fish fish } From 0ab282429753e81dc637648803d82248bad9d859 Mon Sep 17 00:00:00 2001 From: akierig Date: Thu, 21 Apr 2022 17:43:24 -0500 Subject: [PATCH 1266/2369] Signal-Desktop: update to 5.40.0. --- 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 c02e6864b8a..8bcfe617ab4 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.39.0 +version=5.40.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=0e5f237bd2db6f9e32d58d28c99727bdd069cffb6abf9c68b62c30c8a6ca83d9 +checksum=57bb0ebbf4b3fb9d6dfbaa84166ecf668ce0df8a0afa0f69907680804dd064c4 nostrip_files="signal-desktop" post_extract() { From 3c3661c9e24686e75617b8a67dd932bb12c2ee55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Wed, 20 Apr 2022 12:41:47 +0200 Subject: [PATCH 1267/2369] New package: dasel-1.24.1 --- srcpkgs/dasel/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/dasel/template diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template new file mode 100644 index 00000000000..6d913b08ba6 --- /dev/null +++ b/srcpkgs/dasel/template @@ -0,0 +1,19 @@ +# Template file for 'dasel' +pkgname=dasel +version=1.24.1 +revision=1 +build_style=go +go_import_path=github.com/tomwright/dasel +go_package="${go_import_path}/cmd/dasel" +go_ldflags="-X ${go_import_path}/internal.Version=${version}" +short_desc="Query and modify data structures using selector strings" +maintainer="Daniel Eyßer " +license="MIT" +homepage="https://daseldocs.tomwright.me/" +changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md" +distfiles="https://github.com/TomWright/dasel/archive/v${version}.tar.gz" +checksum=ca1fa030f41abcd3659e76d7413ce14c551f40d41769e7a000a46f4fea6d0b64 + +post_install() { + vlicense LICENSE +} From 8fbdedf73b0d9702c5c0175e6e3d41fb4f8ba45c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 11 Apr 2022 09:26:30 +0200 Subject: [PATCH 1268/2369] python3-tweepy: update to 4.8.0. --- srcpkgs/python3-tweepy/template | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-tweepy/template b/srcpkgs/python3-tweepy/template index d71fa028f64..fc13e91d8d5 100644 --- a/srcpkgs/python3-tweepy/template +++ b/srcpkgs/python3-tweepy/template @@ -1,21 +1,18 @@ # Template file for 'python3-tweepy' pkgname=python3-tweepy -version=3.9.0 -revision=2 +version=4.8.0 +revision=1 wrksrc="tweepy-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-requests-oauthlib python3-six python3-pysocks" +depends="python3-requests-oauthlib python3-pysocks" short_desc="Twitter library for Python3" maintainer="Orphaned " license="MIT" homepage="https://github.com/tweepy/tweepy" distfiles="https://github.com/tweepy/tweepy/archive/v${version}.tar.gz" -checksum=2b7ec06cc5d143396423a5eae16b198e69b93df2bc6044f1365270c805e940b7 - -do_check() { - : # requires packages not provided by Void -} +checksum=6ca49718d9cd0e73080f780062e050dd8ca777201365fb50b935d727f7c1fc18 +make_check=no # requires packages not provided by Void post_install() { vlicense LICENSE From f06a4f8e283d7c1aea43ade06e7bfec607e2369a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 10 Apr 2022 22:31:50 +0200 Subject: [PATCH 1269/2369] gdu: update to 5.13.2. --- srcpkgs/gdu/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template index 9c47a649b80..9ef80a2f5a7 100644 --- a/srcpkgs/gdu/template +++ b/srcpkgs/gdu/template @@ -1,6 +1,6 @@ # Template file for 'gdu' pkgname=gdu -version=5.12.1 +version=5.13.2 revision=1 build_style=go go_import_path="github.com/dundee/gdu/v5/cmd/gdu" @@ -9,7 +9,7 @@ maintainer="Daniel Lewan " license="MIT" homepage="https://github.com/dundee/gdu" distfiles="https://github.com/dundee/gdu/archive/v${version}.tar.gz" -checksum=81471d80aedcf20c84bcee67814d34ab2cf43477b831ffa320b7721d481c64ab +checksum=f4f237f6da470599f6393591282cfd67922a963325859a939ca40ba7e18024a8 post_install() { vman gdu.1 From 567b49b523bff5488953dbb2e5967cdfaa70837f Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 22 Apr 2022 16:41:56 +0200 Subject: [PATCH 1270/2369] zchunk: update to 1.2.2. --- srcpkgs/zchunk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template index e8679bcbabc..c4812272d3c 100644 --- a/srcpkgs/zchunk/template +++ b/srcpkgs/zchunk/template @@ -1,6 +1,6 @@ # Template file for 'zchunk' pkgname=zchunk -version=1.2.1 +version=1.2.2 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=9639942cf36f4f36d3b635d36d5164682249cc0240015569ac948db1584499b5 +checksum=bc36f13b1bcb2ab52d046bfc3ec04a9bd1f89b070b4e8fca52eded235a583526 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone" From 9d9034cae96a55dfa23f7220313e038bf28a8929 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 22 Apr 2022 17:01:48 +0200 Subject: [PATCH 1271/2369] virt-what: update to 1.22. --- srcpkgs/virt-what/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/virt-what/template b/srcpkgs/virt-what/template index 6403a915bec..e6562de073c 100644 --- a/srcpkgs/virt-what/template +++ b/srcpkgs/virt-what/template @@ -1,6 +1,6 @@ # Template file for 'virt-what' pkgname=virt-what -version=1.21 +version=1.22 revision=1 build_style=gnu-configure short_desc="Detect when running in a virtual machine" @@ -8,4 +8,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://people.redhat.com/~rjones/virt-what/" distfiles="https://people.redhat.com/~rjones/${pkgname}/files/${pkgname}-${version}.tar.gz" -checksum=12cb455334aa4cfd53ab78f27e2252e94d1f676dd093f48327ed94d8080d1f7b +checksum=e175df6109e537da1e18006f03d74a2e6dab76b5caf410dedafef188f1ee4561 From efb4bed2e6775eb81a0ba2cf099030d602bc5329 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 22 Apr 2022 17:20:41 +0200 Subject: [PATCH 1272/2369] bmake: update to 20220418. --- srcpkgs/bmake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template index 58cf7097920..babb5d6d393 100644 --- a/srcpkgs/bmake/template +++ b/srcpkgs/bmake/template @@ -1,6 +1,6 @@ # Template file for 'bmake' pkgname=bmake -version=20220414 +version=20220418 revision=1 create_wrksrc=yes short_desc="Portable version of the NetBSD make build tool" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://www.crufty.net/help/sjg/bmake.html" distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz" -checksum=10ee07a7be26b22ce6a3bbc386e2916ca8e51b0ed2d256c271a7135e3c94f2a7 +checksum=6ea7de515cba74f173dc14ee17b1488ae032582028d2e86ea12f70369cc896f5 python_version=3 do_configure() { From 23b560756b91c76c88607a4a63bc68a722e96479 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 22 Apr 2022 18:19:58 +0200 Subject: [PATCH 1273/2369] rsync: update to 3.2.4. --- srcpkgs/rsync/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template index 928aa4824a2..2f79c20f8f6 100644 --- a/srcpkgs/rsync/template +++ b/srcpkgs/rsync/template @@ -1,7 +1,7 @@ # Template file for 'rsync' pkgname=rsync -version=3.2.3 -revision=3 +version=3.2.4 +revision=1 build_style=gnu-configure conf_files="/etc/rsyncd.conf" hostmakedepends="perl" @@ -13,7 +13,7 @@ license="GPL-3.0-only" homepage="https://rsync.samba.org/" changelog="https://download.samba.org/pub/rsync/NEWS" distfiles="https://www.samba.org/ftp/rsync/src/rsync-$version.tar.gz" -checksum=becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e +checksum=6f761838d08052b0b6579cf7f6737d93e47f01f4da04c5d24d3447b7f2a5fad1 # Force enable IPv6 on musl - upstream bug https://bugzilla.samba.org/show_bug.cgi?id=10715 CFLAGS="-DINET6" From 51c96d12f7b7e957c82064f589166995e6ffef45 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Wed, 20 Apr 2022 18:55:18 -0400 Subject: [PATCH 1274/2369] sof-firmware: update to 2.1.1. --- srcpkgs/sof-firmware/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template index 5e6399eca91..5436fb1db1e 100644 --- a/srcpkgs/sof-firmware/template +++ b/srcpkgs/sof-firmware/template @@ -1,6 +1,6 @@ # Template file for 'sof-firmware' pkgname=sof-firmware -version=1.9.2 +version=2.1.1 revision=1 archs="i686* x86_64*" wrksrc="sof-bin-${version}" @@ -11,7 +11,7 @@ maintainer="cinerea0 " license="BSD-3-Clause" homepage="https://thesofproject.github.io/latest/index.html" distfiles="https://github.com/thesofproject/sof-bin/archive/refs/tags/v${version}.tar.gz" -checksum=8eac925c129d195072237dcd28f4bbe80cf63eb00fd8b23bdc0719cd1ee9b395 +checksum=97c51c03bfb0a8cfc0a33d795e051e8f0608a3bfb3e07cd84de6fd7e9511f208 do_install() { vmkdir usr/lib/firmware/intel/sof From c9ad70179b9091809b2e05978f3cfdc2ed03855b Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Wed, 20 Apr 2022 20:35:39 -0400 Subject: [PATCH 1275/2369] pango: update to 1.50.7. --- srcpkgs/pango/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template index 4d410dbc72b..5d49a2f7ed5 100644 --- a/srcpkgs/pango/template +++ b/srcpkgs/pango/template @@ -1,6 +1,6 @@ # Template file for 'pango' pkgname=pango -version=1.50.6 +version=1.50.7 revision=1 build_style=meson build_helper=gir @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://www.pango.org/" changelog="https://gitlab.gnome.org/GNOME/pango/-/raw/main/NEWS" distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a +checksum=0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33 make_check=no # doesn't pass its own tests # Package build options From 9c24989c1fe6b5138a507ff4de488ee8c0af6b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:33 +0200 Subject: [PATCH 1276/2369] filelight: update to 22.04.0. --- srcpkgs/filelight/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template index cdf212f14ef..30e825e0eee 100644 --- a/srcpkgs/filelight/template +++ b/srcpkgs/filelight/template @@ -1,6 +1,6 @@ # Template file for 'filelight' pkgname=filelight -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-only" homepage="https://utils.kde.org/projects/filelight/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight" distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz" -checksum=28fc076caf94217f732b7228e0c77dc40b5d490bcbb3df7866c2e772130578f0 +checksum=434fa7439732905c4655cc376d2c89e86a5fcc5371ee6fda16400917a8e4e587 From 9d9fdae9339afe17c86963d7f020691a5e3f4e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:34 +0200 Subject: [PATCH 1277/2369] kaccounts-integration: update to 22.04.0. --- srcpkgs/kaccounts-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template index 846027947d2..7a8b45b2da0 100644 --- a/srcpkgs/kaccounts-integration/template +++ b/srcpkgs/kaccounts-integration/template @@ -1,6 +1,6 @@ # Template file for 'kaccounts-integration' pkgname=kaccounts-integration -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://cgit.kde.org/kaccounts-integration.git/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration" distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz" -checksum=eb428cd94bf33910546527bad8a56ddaafd2a7fa894c9fcdba6da364e969048f +checksum=3e5197c1c7ddce92dd5bdcdcc05492f3c63c468e3c1e743c6e747114d34d08b8 kaccounts-integration-devel_package() { short_desc+=" - development" From 53f696daaea8e499eb0851aa7dd252116e6fd9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:35 +0200 Subject: [PATCH 1278/2369] kaccounts-providers: update to 22.04.0. --- srcpkgs/kaccounts-providers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template index 00cd5f36950..09f7d22603b 100644 --- a/srcpkgs/kaccounts-providers/template +++ b/srcpkgs/kaccounts-providers/template @@ -1,6 +1,6 @@ # Template file for 'kaccounts-providers' pkgname=kaccounts-providers -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://cgit.kde.org/kaccounts-providers.git/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers" distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz" -checksum=a09eed6a35e5f1909e4f8cdb9016ed0cd1fb33c34f5545f4c1e2a005d4dd9e4d +checksum=297a55bcfa26379e9501b70f17da238a4ae23fd908b3afaa0052853a1cca0e34 build_options="nextcloud" desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)" From b32c50961f9ac89944758d2cd74a409ff2c21b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:36 +0200 Subject: [PATCH 1279/2369] kcachegrind: update to 22.04.0. --- srcpkgs/kcachegrind/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template index 5b96b2e4e87..d46aefe7cb9 100644 --- a/srcpkgs/kcachegrind/template +++ b/srcpkgs/kcachegrind/template @@ -1,6 +1,6 @@ # Template file for 'kcachegrind' pkgname=kcachegrind -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -13,5 +13,5 @@ license="GPL-2.0-only, GFDL-1.2-only" homepage="https://kde.org/applications/development/kcachegrind/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind" distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz" -checksum=ddcf3722211d47c90616528607ebc4573835faa52a57e2e9d6763968b9975ab3 +checksum=aed09ea5dc01ace24c76ed69edef5111c47f53992ba45896365b53cd3fc8890d python_version=2 From 92f56ef4e210c80466877e65b5cfc78bedeb543e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:37 +0200 Subject: [PATCH 1280/2369] kcron: update to 22.04.0. --- srcpkgs/kcron/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template index af6f042ab5e..636aad34dab 100644 --- a/srcpkgs/kcron/template +++ b/srcpkgs/kcron/template @@ -1,6 +1,6 @@ # Template file for 'kcron' pkgname=kcron -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://userbase.kde.org/System_Settings/Task_Scheduler" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron" distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz" -checksum=f556c6afbdf4a060dd52db64d36ebc13fcf7dcdaa6a7013b697e866b6338cc39 +checksum=d8ace47c86633ba677b64c765efe0b6f3de27cb75c17ae2434c498b07f3c0648 From a48bbdacd014eeea6faf7319dbd902f4cfebff2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:38 +0200 Subject: [PATCH 1281/2369] kdialog: update to 22.04.0. --- srcpkgs/kdialog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template index b1975e4203e..64efbaad5e8 100644 --- a/srcpkgs/kdialog/template +++ b/srcpkgs/kdialog/template @@ -1,6 +1,6 @@ # Template file for 'kdialog' pkgname=kdialog -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3 @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://invent.kde.org/utilities/kdialog" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdialog" distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz" -checksum=a370f03edd88913d7cecf2bc9b61e2bd1466418fa1534a8f415a0057186ea111 +checksum=ac47479b576b87e8a82d62f4b685941b6ab54a44a06391c4c0762db159930589 From f53591507cbc533cede89a4b97a060632a3b1050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:39 +0200 Subject: [PATCH 1282/2369] keditbookmarks: update to 22.04.0. --- srcpkgs/keditbookmarks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template index a67fbd7881c..5291ab00f99 100644 --- a/srcpkgs/keditbookmarks/template +++ b/srcpkgs/keditbookmarks/template @@ -1,6 +1,6 @@ # Template file for 'keditbookmarks' pkgname=keditbookmarks -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#keditbookmarks" distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz" -checksum=d356285aaeb12cdadf70c456a43d4e31f94a5f15c9dc01bae0ae4148833ccb71 +checksum=d6daabf60acec49cac1401da1019f965a96e8fd41b967694b2c8fd6723b87327 From 05f6664c0359c9c58a9dd4f881ff285d862962d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:40 +0200 Subject: [PATCH 1283/2369] kfind: update to 22.04.0. --- srcpkgs/kfind/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template index 766f1d9fee4..06de53b604a 100644 --- a/srcpkgs/kfind/template +++ b/srcpkgs/kfind/template @@ -1,6 +1,6 @@ # Template file for 'kfind' pkgname=kfind -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/utilities/kfind/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kfind" distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz" -checksum=a0ff3b4a44b938f7f336d4c2fbc302d8a55612b089ee954b2d98ec5f97ee3eec +checksum=5133cad0be64fb3fc3f9666b01b4cff8141016f31c244ed39a3e21fc298b6935 From 728f0a37e421cce6d0920a923a454d742401d2f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:41 +0200 Subject: [PATCH 1284/2369] kig: update to 22.04.0. --- srcpkgs/kig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template index 33b5ad292ba..3f291745d31 100644 --- a/srcpkgs/kig/template +++ b/srcpkgs/kig/template @@ -1,6 +1,6 @@ # Template file for 'kig' pkgname=kig -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext @@ -12,4 +12,4 @@ license="GPL-2.0-only" homepage="https://www.kde.org/applications/education/kig/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kig" distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz" -checksum=b6a9ec8981c6983df2295ad0a8a53732928a8bb40c6c92305030392d5bf88066 +checksum=6dd9e280e3f0bca4c900f9fd8ef2e138eb8f1b021adf4ffe4e29804adddc7965 From b6560c847f13930b92facc0d75a3358bb826c4d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:42 +0200 Subject: [PATCH 1285/2369] kio-gdrive: update to 22.04.0. --- srcpkgs/kio-gdrive/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template index 5bf3a6225a9..d1e30118047 100644 --- a/srcpkgs/kio-gdrive/template +++ b/srcpkgs/kio-gdrive/template @@ -1,6 +1,6 @@ # Template file for 'kio-gdrive' pkgname=kio-gdrive -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools @@ -14,4 +14,4 @@ license="GPL-2.0-or-later" homepage="https://community.kde.org/KIO_GDrive" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kio-gdrive" distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz" -checksum=07c1c20ed3ec8b96691d85a408997a94a76e0a61a50b056df3e21f6cde61a32e +checksum=9f910baa87f707d1f28c9da5d3f1b104b992f7c7b3ca2ca532cb3646d92c84ec From 8f4d315525a84231333b5028655e58191bbcd8d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:42 +0200 Subject: [PATCH 1286/2369] kmag: update to 22.04.0. --- srcpkgs/kmag/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template index 8dffb97af13..a68adf87381 100644 --- a/srcpkgs/kmag/template +++ b/srcpkgs/kmag/template @@ -1,6 +1,6 @@ # Template file for 'kmag' pkgname=kmag -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/utilities/kmag/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmag" distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz" -checksum=548f9b4c13eda644c0fb182eb78f6326c57f6cb7dc8a185fcb09dd585f31fd18 +checksum=e65aaaa3e480c215384bae721afb36d7e50a7f8ab27aa4013eb46de1f43d97af From 628d956573fe9ed78e8428823ffa2e9c42ec49a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:44 +0200 Subject: [PATCH 1287/2369] kmix: update to 22.04.0. --- srcpkgs/kmix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template index 902b798dc25..e4bf7c548be 100644 --- a/srcpkgs/kmix/template +++ b/srcpkgs/kmix/template @@ -1,6 +1,6 @@ # Template file for 'kmix' pkgname=kmix -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/applications/multimedia/kmix/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmix" distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz" -checksum=13c1336f9e8e7a64f3e89a0558b9f16547a33e37f917bd491dfb061d25ed62fe +checksum=3f41a53cb7033fde10ae92b693a6b84c0da045e570e83136dbc659afa89e5e7a From 54e19e6a56044a93c784a981fea2fd37bba5cc48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:45 +0200 Subject: [PATCH 1288/2369] kolourpaint: update to 22.04.0. --- srcpkgs/kolourpaint/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template index bf7598673a4..5a81652e6b0 100644 --- a/srcpkgs/kolourpaint/template +++ b/srcpkgs/kolourpaint/template @@ -1,6 +1,6 @@ # Template file for 'kolourpaint' pkgname=kolourpaint -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only" homepage="http://www.kolourpaint.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint" distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz" -checksum=d2199ded688d768d8066a262d7a6b706b72a880fab9a394ffe64ae31be447f4d +checksum=aeb2e439f32d9b1d7556e807c0902c870b90691f84764266e3f7fd92af5d9163 post_install() { vlicense COPYING From 73ecb7845a0422fa99d61e154a66e7e36f3da85b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:45 +0200 Subject: [PATCH 1289/2369] kompare: update to 22.04.0. --- srcpkgs/kompare/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template index 4219b5b650a..457830d2011 100644 --- a/srcpkgs/kompare/template +++ b/srcpkgs/kompare/template @@ -1,6 +1,6 @@ # Template file for 'kompare' pkgname=kompare -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only" homepage="https://www.kde.org/applications/development/kompare/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kompare" distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz" -checksum=9008fb78e238dc34233b5eb063bc0b54553dfa70b22d4164b39adef82b57ea24 +checksum=e2e0ee484b2eb098d9315ea26a0b68abce64ae02572baab998a5711f609c018d From 95d4026c3f5cf2a6e2f26b755b4e7f67dad5674b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:46 +0200 Subject: [PATCH 1290/2369] konversation: update to 22.04.0. --- srcpkgs/konversation/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template index 877672e7ec1..5358aed5c72 100644 --- a/srcpkgs/konversation/template +++ b/srcpkgs/konversation/template @@ -1,17 +1,17 @@ # Template file for 'konversation' pkgname=konversation -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons python qt5-host-tools qt5-qmake gettext" makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel - knewstuff-devel qca-qt5-devel" + knewstuff-devel qca-qt5-devel qt5-multimedia-devel" short_desc="User friendly IRC client for KDE" maintainer="Piotr Wójcik " license="GPL-2.0-or-later" homepage="https://konversation.kde.org" changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz" -checksum=00e16ff398e4ff19c8485f5d5078faea018c7b11c25d535d5949fca6eefcbd15 +checksum=f89c3854edd6dabcceff7a3615b532ac34d5b4769be1e125789e41d67e7f9b8a python_version=3 From e9fcc7032adb92a9c0cd9cd42fb7368af8d5c7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:47 +0200 Subject: [PATCH 1291/2369] kpat: update to 22.04.0. --- srcpkgs/kpat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template index 71cda890586..e3d3d8d5ad3 100644 --- a/srcpkgs/kpat/template +++ b/srcpkgs/kpat/template @@ -1,6 +1,6 @@ # Template file for 'kpat' pkgname=kpat -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake configure_args="-DWITH_BH_SOLVER=OFF" @@ -14,4 +14,4 @@ license="GPL-2.0-only" homepage="https://kde.org/applications/games/kpat" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpat" distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz" -checksum=68353dba09757a2696fce36f802a5bca3b7a5492de4d690d15ad04074f21a9c9 +checksum=275e2e4508980dbc53bd598c7abd05a21dd5c50b255e750436639cc75f67a44d From 271db58564c8dad27807189e7b98db4fb2971bd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:48 +0200 Subject: [PATCH 1292/2369] kruler: update to 22.04.0. --- srcpkgs/kruler/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template index 74bc40f901b..8c70ce20727 100644 --- a/srcpkgs/kruler/template +++ b/srcpkgs/kruler/template @@ -1,6 +1,6 @@ # Template file for 'kruler' pkgname=kruler -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/graphics/kruler/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kruler" distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz" -checksum=f95725a73d3bbb4fd59dfeadf6c070ed3d64e36995168300d2a0cb03921aab4a +checksum=f4f189b606813fb2f42e40f7664adafafdcd210e474909b9e93ff30eba18cd45 From b56e1a0d9a4a13958b2bedb821032afd40085290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:49 +0200 Subject: [PATCH 1293/2369] ksystemlog: update to 22.04.0. --- srcpkgs/ksystemlog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template index 72a178b4d0d..53c40ccabd7 100644 --- a/srcpkgs/ksystemlog/template +++ b/srcpkgs/ksystemlog/template @@ -1,6 +1,6 @@ # Template file for 'ksystemlog' pkgname=ksystemlog -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/system/ksystemlog/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksystemlog" distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz" -checksum=a90af7b6116301eea4bd74a61e5e4e2a854c7ab91a103d54d7fcd30e7a066d4a +checksum=25525e28756928ddb014ccec6f352c7378473ad417971608989818484b2847a4 From 750b96cd7b006640f65e3a3ac1379c8a54a79d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:50 +0200 Subject: [PATCH 1294/2369] kteatime: update to 22.04.0. --- srcpkgs/kteatime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template index 5b5a6c75b19..dc8dbc93579 100644 --- a/srcpkgs/kteatime/template +++ b/srcpkgs/kteatime/template @@ -1,6 +1,6 @@ # Template file for 'kteatime' pkgname=kteatime -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/games/kteatime/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime" distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz" -checksum=a4c0994170a877b14b8b66e68021a6ef03e5e427380c135caf99218f54d07744 +checksum=f3098313f7df6de082490c11ae6f840d3f73d2c3be22fb56d4bb0c15baf81df6 From 2720c6c4cd6f2bc8cea8985bae48b7f0a052b069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:51 +0200 Subject: [PATCH 1295/2369] kturtle: update to 22.04.0. --- srcpkgs/kturtle/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template index d9f82442461..f3be8755660 100644 --- a/srcpkgs/kturtle/template +++ b/srcpkgs/kturtle/template @@ -1,6 +1,6 @@ # Template file for 'kturtle' pkgname=kturtle -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/applications/education/kturtle/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kturtle" distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz" -checksum=43bc3de793f0971b75bf11a96e5af7961ccbc29a2a57417325953731f9d40999 +checksum=fd42b1380e7e46d6c1e5bc4cbe538edcf9ed9bfc5abf54141393adc28fe38427 From f74ebc38cc7d91d1d06402eb39887ad2eb7cf1e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:52 +0200 Subject: [PATCH 1296/2369] kwalletmanager: update to 22.04.0. --- srcpkgs/kwalletmanager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template index 18dce3c4063..902061e38dc 100644 --- a/srcpkgs/kwalletmanager/template +++ b/srcpkgs/kwalletmanager/template @@ -1,6 +1,6 @@ # Template file for 'kwalletmanager' pkgname=kwalletmanager -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config @@ -12,4 +12,4 @@ license="GPL-2.0-only" homepage="https://kde.org/applications/system/org.kde.kwalletmanager5" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager" distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz" -checksum=271db1bd744e9d9b183663b8a0239590f81f9997ff67cab51833861f0971b107 +checksum=d33824ae0abc7972fed9d7dad6acea9f67e7274ee5b15c0bb1df72b1a24aec17 From f5b356bb7a547ed6f7176847332e0b53119c5b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:53 +0200 Subject: [PATCH 1297/2369] libkcddb: update to 22.04.0. --- srcpkgs/libkcddb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template index 555cba64b24..fbcc0153671 100644 --- a/srcpkgs/libkcddb/template +++ b/srcpkgs/libkcddb/template @@ -1,6 +1,6 @@ # Template file for 'libkcddb' pkgname=libkcddb -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools @@ -12,7 +12,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only" homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb" changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkcddb" distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz" -checksum=62709f9ccd8463208b905a3b935be1ba80102c451728e9f5c77e83eaf4afc191 +checksum=ddc91cc5112c5a749fccf18bb9a6b169279f6d5658fed3b4d60646d9ccbb0775 libkcddb-devel_package() { depends="libkcddb>=${version}_${revision}" From 5ba04d51cc3356558062401f145401cbc13633ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:54 +0200 Subject: [PATCH 1298/2369] libkdegames: update to 22.04.0. --- srcpkgs/libkdegames/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template index bb7f34a7fb8..7aafa5cf73f 100644 --- a/srcpkgs/libkdegames/template +++ b/srcpkgs/libkdegames/template @@ -1,6 +1,6 @@ # Template file for 'libkdegames' pkgname=libkdegames -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools @@ -12,7 +12,7 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/games" changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkdegames" distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz" -checksum=4b2f3fb2af0866f7aba1ae679b505faeb7577b0ab50bd619ecb642c48ae0b574 +checksum=4dd8d80dbfd2806d420bb6efc2df64a175e8273d9ea34b9c61a0a7daae342e76 libkdegames-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From 053c233784226c507754d3a1b3947b6630d2c8c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:55 +0200 Subject: [PATCH 1299/2369] libkomparediff2: update to 22.04.0. --- srcpkgs/libkomparediff2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template index 7c7f2de89c1..5f3b036be59 100644 --- a/srcpkgs/libkomparediff2/template +++ b/srcpkgs/libkomparediff2/template @@ -1,6 +1,6 @@ # Template file for 'libkomparediff2' pkgname=libkomparediff2 -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake" @@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://www.kde.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkomparediff2" distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz" -checksum=a2815b6c9fc08172b4e39b27c25764baa96de40d6ca298544085fba692a323c9 +checksum=9c9ff478d4e31cc0b0dc980238956d92f683e6ff55dc1c6b67e3212c7e7e0711 libkomparediff2-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 93b032857b4abd2c676e5e90614502daa02b50ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:56 +0200 Subject: [PATCH 1300/2369] marble5: update to 22.04.0. --- srcpkgs/marble5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template index 4bc5bdaa1d2..841cb976ad1 100644 --- a/srcpkgs/marble5/template +++ b/srcpkgs/marble5/template @@ -1,6 +1,6 @@ # Template file for 'marble5' pkgname=marble5 -version=21.12.3 +version=22.04.0 revision=1 wrksrc="marble-${version}" build_style=cmake @@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, GFDL-1.2-only" homepage="https://marble.kde.org" changelog="https://kde.org/announcements/changelogs/gear/${version}/#marble" distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz" -checksum=442925b9024c0d7d470aa1523b0647c8fdce9ce69a0a2c6b29133d43596ad86c +checksum=eb39219936b387dae4743638fe8ac5cf7f5654f4b4aff06a7c7b67e177799962 pre_configure() { vsed -i CMakeLists.txt -e 's/-Wcast-align//' From bed24746a0091e6d459e3737ae146a13f9b6fabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:57 +0200 Subject: [PATCH 1301/2369] signon-kwallet-extension: update to 22.04.0. --- srcpkgs/signon-kwallet-extension/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template index 7cc3e0d5645..4361bac6029 100644 --- a/srcpkgs/signon-kwallet-extension/template +++ b/srcpkgs/signon-kwallet-extension/template @@ -1,6 +1,6 @@ # Template file for 'signon-kwallet-extension' pkgname=signon-kwallet-extension -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake" @@ -11,4 +11,4 @@ license="GPL-2.0-only" homepage="https://cgit.kde.org/signon-kwallet-extension.git/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension" distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz" -checksum=7579e0434114c33eb5fea3f232bbd414658e2715f3f3a3a220a4f5be4079606b +checksum=33d19b1b758a21e568ce508cc168e568e34716f148cd83e214fb8a3f3194d2e8 From 001ab1e88b8f3c0860bfb6bbff2950e84cab8763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:58 +0200 Subject: [PATCH 1302/2369] svgpart: update to 22.04.0. --- srcpkgs/svgpart/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template index 54ceffce29e..a0b9d95a6ce 100644 --- a/srcpkgs/svgpart/template +++ b/srcpkgs/svgpart/template @@ -1,6 +1,6 @@ # Template file for 'svgpart' pkgname=svgpart -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake" @@ -11,4 +11,4 @@ license="GPL-2.0-or-later" homepage="https://cgit.kde.org/svgpart.git" changelog="https://kde.org/announcements/changelogs/gear/${version}/#svgpart" distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz" -checksum=12fd83a8a4fafcc81d3bb0bfd9bc72da84a2fc3edc06e38d3acbfdf483d5e879 +checksum=923bda29e6610fb4dfd2b4f98e14045271c099ab1ed3988d52fefdc0b408df9a From c9abf4fc968307d591eecc42eebba495e55467e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:41:59 +0200 Subject: [PATCH 1303/2369] umbrello: update to 22.04.0. --- srcpkgs/umbrello/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template index 6fc35aa3b33..da275716122 100644 --- a/srcpkgs/umbrello/template +++ b/srcpkgs/umbrello/template @@ -1,6 +1,6 @@ # Template file for 'umbrello' pkgname=umbrello -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake" @@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later" homepage="https://umbrello.kde.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#umbrello" distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz" -checksum=c6c5f6107870b397dcc60932cbdc1767cc2d6a2f5223dc5e0314226b61a124c5 +checksum=f4f681daedbefdeb0e6b0da0fd718c20031491d3b088e0523ff5bbfab3de72d8 python_version=2 pre_configure() { From 8dd7443ecb9627502a164b5bab36205917d0ba14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 22 Apr 2022 21:42:00 +0200 Subject: [PATCH 1304/2369] yakuake: update to 22.04.0. --- srcpkgs/yakuake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template index 44a2f4000eb..dd56e9afefb 100644 --- a/srcpkgs/yakuake/template +++ b/srcpkgs/yakuake/template @@ -1,6 +1,6 @@ # Template file for 'yakuake' pkgname=yakuake -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext" @@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only" homepage="https://kde.org/applications/system/org.kde.yakuake" changelog="https://kde.org/announcements/changelogs/gear/${version}/#yakuake" distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz" -checksum=09667eb9aaaf7d072a0cd78b55b441691726686441b83a04d0c2c9b935cab382 +checksum=b7f96b48fd5baa75dd8fe53c8886f8cb0628f6a77a33232dc5bf06f45f6b2006 From 1b3ee76ea1a9654adc5872e37e8eee528f7afd28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 31 Aug 2021 21:00:01 +0200 Subject: [PATCH 1305/2369] hooks/99-pkglint.sh: make missing shlib entry not a warning --- common/hooks/pre-pkg/99-pkglint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh index ea73c961ec5..325938f5d54 100644 --- a/common/hooks/pre-pkg/99-pkglint.sh +++ b/common/hooks/pre-pkg/99-pkglint.sh @@ -182,7 +182,7 @@ hook() { if [ -z "$found" ]; then _myshlib="${libname}.so" [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}" - msg_warn "${pkgver}: ${_myshlib} not found in common/shlibs!\n" + msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n" fi; } done From 3cf9cbd3f981f893aa24f3e4d80ec791f3033799 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 22 Apr 2022 01:08:59 -0500 Subject: [PATCH 1306/2369] New package: step-certificates-0.19.0. --- srcpkgs/step-certificates/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/step-certificates/template diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template new file mode 100644 index 00000000000..4d616f9450a --- /dev/null +++ b/srcpkgs/step-certificates/template @@ -0,0 +1,22 @@ +# Template file for 'step-certificates' +pkgname=step-certificates +version=0.19.0 +revision=1 +wrksrc=certificates-$version +build_style=go +go_import_path=github.com/smallstep/certificates +go_package="$go_import_path/cmd/step-ca + $go_import_path/cmd/step-awskms-init + $go_import_path/cmd/step-cloudkms-init + $go_import_path/cmd/step-pkcs11-init + $go_import_path/cmd/step-yubikey-init" +go_ldflags="-w -X main.Version=$version" +hostmakedepends="pkg-config" +makedepends="pcsclite-devel" +short_desc="Private CA and ACME server" +maintainer="Michael Aldridge " +license="Apache-2.0" +homepage="https://smallstep.com/certificates/" +changelog="https://raw.githubusercontent.com/smallstep/certificates/master/CHANGELOG.md" +distfiles="https://github.com/smallstep/certificates/archive/refs/tags/v$version.tar.gz" +checksum=edf8aeaabff2cae9fed4e27177d755be522c20a94a3fd7346de1ec42614d1d46 From c712a1df0a503ff0dba7fa4c43aff8e4201a4632 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 22 Apr 2022 01:18:55 -0500 Subject: [PATCH 1307/2369] New package: step-cli-0.19.0. --- srcpkgs/step-cli/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/step-cli/template diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template new file mode 100644 index 00000000000..0fe5dc2dd34 --- /dev/null +++ b/srcpkgs/step-cli/template @@ -0,0 +1,15 @@ +# Template file for 'step-cli' +pkgname=step-cli +version=0.19.0 +revision=1 +wrksrc=cli-$version +build_style=go +go_import_path=github.com/smallstep/cli +go_package=$go_import_path/cmd/step +short_desc="Zero trust swiss army knife" +maintainer="Michael Aldridge " +license="Apache-2.0" +homepage="https://smallstep.com/cli" +changelog="https://raw.githubusercontent.com/smallstep/cli/master/CHANGELOG.md" +distfiles="https://github.com/smallstep/cli/archive/refs/tags/v$version.tar.gz" +checksum=a58e63acbfd65a5df84f85715253aa88b566a13af26e2fa1353ae5766b3687d5 From 523b82c6875e39912eadc19372f25902d2342a5a Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 23 Apr 2022 08:20:02 +0200 Subject: [PATCH 1308/2369] linux5.4: update to 5.4.190. --- 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 770cb9be83a..25d8aeea2d8 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.189 +version=5.4.190 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=8485d536531833cd2dbca0a7f267daff69ede5c9831cb693acc8318447e568c6 +checksum=81d4e707775d55a20bcb30d22c61e91fafba057a5080918338b2f7542873f194 python_version=3 nodebug=yes # -dbg package is generated below manually From 99f949fae80fc09daecf448322e492b4c51d19e1 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 23 Apr 2022 08:22:35 +0200 Subject: [PATCH 1309/2369] linux4.19: update to 4.19.239. --- 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 d6916078343..a44ed5b0cd2 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.238 +version=4.19.239 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=83b74545c5d380384e09955c26e786bf9ee81a44bcf9347f2ca2ad3d31b46b7a +checksum=bf7c5dc26c9a3113e43e4d32f73228788f8f6f005b9ddba379378786bc4c593b python_version=3 nodebug=yes # -dbg package is generated below manually From b1d96a5124b472bb35b5444fd5552f522a8795c2 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 23 Apr 2022 08:25:43 +0200 Subject: [PATCH 1310/2369] kore: update to 4.2.2. --- srcpkgs/kore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template index 52b7dbe718a..cb2063a8adf 100644 --- a/srcpkgs/kore/template +++ b/srcpkgs/kore/template @@ -1,6 +1,6 @@ # Template file for 'kore' pkgname=kore -version=4.2.1 +version=4.2.2 revision=1 # arch specific seccomp stuff archs="x86_64* aarch64* ppc64*" @@ -14,7 +14,7 @@ maintainer="Helmut Pozimski " license="ISC" homepage="https://kore.io" distfiles="https://kore.io/releases/kore-${version}.tar.gz" -checksum=f76b108a4eefa27c89123f5d6a36b493b171e429be7a85d3dd1466ac87e7f15a +checksum=77c12d80bb76fe774b16996e6bac6d4ad950070d0816c3409dc0397dfc62725f disable_parallel_build=yes export TARGET_PLATFORM=${XBPS_TARGET_MACHINE} From eef57d2188bb75d8d36fda344b8a3a3ef6d0a662 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Thu, 21 Apr 2022 15:17:48 +0200 Subject: [PATCH 1311/2369] k3b: update to 22.04.0 --- srcpkgs/k3b/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template index 1994bc5ccec..c2eab8d7964 100644 --- a/srcpkgs/k3b/template +++ b/srcpkgs/k3b/template @@ -1,6 +1,6 @@ # Template file for 'k3b' pkgname=k3b -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext @@ -16,4 +16,4 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/multimedia/org.kde.k3b" changelog="https://kde.org/announcements/changelogs/gear/${version}/#k3b" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=acdbf40e1bccff837c50ba0a9d5e83370c24bc759c51d61385429ac3bf59f845 +checksum=5856d71fd5cf7f14eb646107f76e521869b4ac99df3411257c9f3427267b6504 From 0a0487fc3090b5b96e507f4ee2019293f95dd0b3 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Thu, 21 Apr 2022 16:00:28 +0300 Subject: [PATCH 1312/2369] git: update to 2.36.0. --- srcpkgs/git/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 8b05a0f5802..e45663f9ff9 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,6 +1,6 @@ # Template file for 'git' pkgname=git -version=2.35.3 +version=2.36.0 revision=1 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto" makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel" @@ -14,7 +14,7 @@ license="GPL-2.0-only" homepage="https://git-scm.com/" changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2 +checksum=af5ebfc1658464f5d0d45a2bfd884c935fb607a10cc021d95bc80778861cc1d3 replaces="git-perl>=0" register_shell=/usr/bin/git-shell python_version=3 From b47ea94ec1f428b77f1796c80e34688363935d59 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 22 Apr 2022 19:53:11 -0700 Subject: [PATCH 1313/2369] skopeo: update to 1.7.0 --- srcpkgs/skopeo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template index d8015fbcd92..b3106205abb 100644 --- a/srcpkgs/skopeo/template +++ b/srcpkgs/skopeo/template @@ -1,6 +1,6 @@ # Template file for 'skopeo' pkgname=skopeo -version=1.6.2 +version=1.7.0 revision=1 build_style=go go_import_path="github.com/containers/${pkgname}" @@ -14,7 +14,7 @@ maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/containers/skopeo" distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz" -checksum=48a1b3d18bde9d7af94756d546b0472e90416f05926281f7e533badfb5fcbd7b +checksum=453bdcce16767696ed71046b60ad7b34358b183b50eb5aa708ced0b5ea2927b1 make_dirs="/var/lib/atomic/sigstore 0755 root root" post_build() { From 636b8bf73ad15c09190a0975bee11ace28371b3d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 23 Apr 2022 00:55:42 +0200 Subject: [PATCH 1314/2369] droidcam: update to 1.8.2. --- srcpkgs/droidcam/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template index 1357308432e..1207bdec5ce 100644 --- a/srcpkgs/droidcam/template +++ b/srcpkgs/droidcam/template @@ -1,6 +1,6 @@ # Template file for 'droidcam' pkgname=droidcam -version=1.8.1 +version=1.8.2 revision=1 build_style=gnu-makefile make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg" @@ -13,7 +13,7 @@ maintainer="ibrokemypie " license="GPL-2.0-or-later" homepage="https://www.dev47apps.com/" distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz" -checksum=27724a3b3a94b0e5282628c85f0f9db1492df073cba331bd1e0a07f60290de71 +checksum=9f18c6768572571c59bfe08ac70e24612e08fc3d887c127ff47899252d3dc662 post_patch() { vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -e "s,/local,," -i droidcam.desktop From e68c068c341f5967c569d18007078f427dd8163e Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 23 Apr 2022 09:09:15 +0200 Subject: [PATCH 1315/2369] vlc: update to 3.0.17.4. --- srcpkgs/vlc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 14a00043a65..bdcf4ff726c 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,6 +1,6 @@ # Template file for 'vlc' pkgname=vlc -version=3.0.17.3 +version=3.0.17.4 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="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz" -checksum=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014 +checksum=8c5a62d88a4fb45c1b095cf10befef217dfa87aedcec5184b9e7d590b6dd4133 lib32disabled=yes From b4c2c6076ab36dacfcd91d769ab266645f75b88e Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 23 Apr 2022 09:13:07 +0200 Subject: [PATCH 1316/2369] libkdcraw5: update to 22.04.0. --- srcpkgs/libkdcraw5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template index 8d69a674cdf..f71d7b6c6ac 100644 --- a/srcpkgs/libkdcraw5/template +++ b/srcpkgs/libkdcraw5/template @@ -1,6 +1,6 @@ # Template file for 'libkdcraw5' pkgname=libkdcraw5 -version=21.12.3 +version=22.04.0 revision=1 wrksrc="libkdcraw-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/graphics/" distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz" -checksum=6acfd4ca20417e525c1676c2b77beb26a683b346afa309cd5b9db3e894d2d8df +checksum=f92cee9a87fdef59f12bde784e1ec2b13b2677c82634e303f20ed8055ddb3e79 libkdcraw5-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 0ab057c97fa62782bc9ee5ab2c363778ad198809 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 23 Apr 2022 09:38:44 +0200 Subject: [PATCH 1317/2369] gwenview: update to 22.04.0. --- srcpkgs/gwenview/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template index aa6d3facb99..a9eafcc90cf 100644 --- a/srcpkgs/gwenview/template +++ b/srcpkgs/gwenview/template @@ -1,6 +1,6 @@ # Template file for 'gwenview' pkgname=gwenview -version=21.12.3 +version=22.04.0 revision=1 build_style=cmake build_helper=qemu @@ -16,4 +16,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/graphics/gwenview" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=28d10e121394e4c710c77f2d46e18fc881c57613603ed65bfd892d4e79f67a7d +checksum=73683096898c59388cd566cc8f71d7677fd0b22a2ab42a6d5f82f1232372ab05 From 640b15d4eb87f2550e87a8553ae3f7b54b47a5a8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 23 Apr 2022 08:01:08 +0000 Subject: [PATCH 1318/2369] python3-soupsieve: fix dependency cycle --- srcpkgs/python3-soupsieve/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template index 83862532f65..aa8f81af5a6 100644 --- a/srcpkgs/python3-soupsieve/template +++ b/srcpkgs/python3-soupsieve/template @@ -1,12 +1,13 @@ # Template file for 'python3-soupsieve' pkgname=python3-soupsieve version=1.9.5 -revision=7 +revision=8 wrksrc="soupsieve-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-BeautifulSoup4" -checkdepends="python3-pytest python3-lxml python3-html5lib $depends" +depends="python3" +checkdepends="python3-pytest python3-lxml python3-html5lib + python3-BeautifulSoup4" short_desc="CSS4 selector implementation for Python3 Beautiful Soup" maintainer="Aluísio Augusto Silva Gonçalves " license="MIT" From ec909f8a17a05b1b45da6f63fda3877ddbd11c7a Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 23 Apr 2022 16:34:01 +0200 Subject: [PATCH 1319/2369] wine: update to 7.7. --- srcpkgs/wine/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index beb10898af9..b08032957c4 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=7.6 +version=7.7 revision=1 _pkgver=${version/r/-r} create_wrksrc=yes @@ -13,8 +13,8 @@ license="LGPL-2.1-or-later" homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz" -checksum="eeab772f091328a3fb9db89aacab6be087c3d59c168ef2b41af5ec5010cf0328 - bdd1a095b9c4cddce4663825e2ad331c5bf1ac8b2288b0b380a665d0ca987a23" +checksum="52a4d06ba77080df4a4b022bf9c2cc05cfa1d79bd4bb08c6b88f7c3ae09d1464 + 9a8c18196ea346cdce84bd87693e911ecb505c1324b85bdbf60b115f8c487ab7" build_options="mingw staging xshm" build_options_default="mingw xshm" From 5fcf89df16642a79231176b7373ac2595cedc5d9 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Sat, 23 Apr 2022 15:53:43 +0200 Subject: [PATCH 1320/2369] xfce4-terminal: update to 1.0.2. --- srcpkgs/xfce4-terminal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template index 07c3bfaa46e..418817a0ac3 100644 --- a/srcpkgs/xfce4-terminal/template +++ b/srcpkgs/xfce4-terminal/template @@ -1,6 +1,6 @@ # Template file for 'xfce4-terminal' pkgname=xfce4-terminal -version=1.0.1 +version=1.0.2 revision=1 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale" @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://docs.xfce.org/apps/xfce4-terminal/start" changelog="https://gitlab.xfce.org/apps/xfce4-terminal/-/raw/master/NEWS" distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=1d3690871d3fe97f8be0908ace0443819e513f6366f851682aafe17059e1eba5 +checksum=ac1543167b43322ad2483ffb033a7e74669ecb59f4b63016a3c183d96141d326 From dd8b196a7609e9655695a841ddac15abfddae775 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 23 Apr 2022 23:46:12 +0200 Subject: [PATCH 1321/2369] perl-local-lib: update to 2.000029. --- srcpkgs/perl-local-lib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-local-lib/template b/srcpkgs/perl-local-lib/template index 9990e7e7c0d..3f9ad808f0b 100644 --- a/srcpkgs/perl-local-lib/template +++ b/srcpkgs/perl-local-lib/template @@ -1,6 +1,6 @@ # Template file for 'perl-local-lib' pkgname=perl-local-lib -version=2.000028 +version=2.000029 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Leah Neukirchen " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/local-lib" distfiles="${CPAN_SITE}/lib/HAARG/local-lib-${version}.tar.gz" -checksum=408317d67a59f9f91e23e3000b82de4f529cf9cf0896e228f3a27d6f607bfe3d +checksum=8df87a10c14c8e909c5b47c5701e4b8187d519e5251e87c80709b02bb33efdd7 From 7227397dbcff5654d8017259e5f31305905015d9 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 24 Apr 2022 00:11:41 +0200 Subject: [PATCH 1322/2369] neovim: update to 0.7.0. --- srcpkgs/neovim/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template index 28cbc7e363c..63c9247030f 100644 --- a/srcpkgs/neovim/template +++ b/srcpkgs/neovim/template @@ -1,10 +1,10 @@ # Template file for 'neovim' pkgname=neovim -version=0.6.1 +version=0.7.0 revision=1 build_style=cmake build_helper="qemu" -configure_args="-DCMAKE_BUILD_TYPE=Release" +configure_args="-DCMAKE_BUILD_TYPE=Release -DCOMPILE_LUA=OFF" hostmakedepends="pkg-config gettext gperf LuaJIT lua51-lpeg lua51-mpack" makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel LuaJIT-devel libluv-devel tree-sitter-devel" @@ -14,7 +14,7 @@ maintainer="Steve Prybylski " license="Apache-2.0, custom:Vim" homepage="https://neovim.io" distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz" -checksum=dd882c21a52e5999f656cae3f336b5fc702d52addd4d9b5cd3dc39cfff35e864 +checksum=792a9c55d5d5f4a5148d475847267df309d65fb20f05523f21c1319ea8a6c7df alternatives=" vi:vi:/usr/bin/nvim @@ -30,5 +30,5 @@ pre_configure() { } post_install() { - vlicense LICENSE + vlicense LICENSE.txt } From 2dab58977c05442286e468fccdd972b00a5584d2 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sat, 23 Apr 2022 20:36:57 -0700 Subject: [PATCH 1323/2369] gtksourceview5: update to 5.4.1 --- srcpkgs/gtksourceview5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template index 81be2e5248d..2f056edbeea 100644 --- a/srcpkgs/gtksourceview5/template +++ b/srcpkgs/gtksourceview5/template @@ -1,6 +1,6 @@ # Template file for 'gtksourceview5' pkgname=gtksourceview5 -version=5.4.0 +version=5.4.1 revision=1 wrksrc="gtksourceview-${version}" build_style=meson @@ -19,7 +19,7 @@ homepage="https://wiki.gnome.org/Projects/GtkSourceView" #changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS" changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-4/NEWS" distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz" -checksum=003bc217e670a8ec8aa3aece994b70e70b7d6b8074938adda21718555d84e637 +checksum=eb3584099cfa0adc9a0b1ede08def6320bd099e79e74a2d0aefb4057cd93d68e # Package build options build_options="gir gtk_doc" From 37c45ee0a43b5b1f16b529eb10961272b1c6b425 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Sat, 23 Apr 2022 22:06:09 +0200 Subject: [PATCH 1324/2369] yq-go: update to 4.24.5. --- srcpkgs/yq-go/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template index 9342a11e5de..fa1737d4e91 100644 --- a/srcpkgs/yq-go/template +++ b/srcpkgs/yq-go/template @@ -1,6 +1,6 @@ # Template file for 'yq-go' pkgname=yq-go -version=4.23.1 +version=4.24.5 revision=1 wrksrc="yq-${version}" build_style=go @@ -11,7 +11,7 @@ license="MIT" homepage="https://github.com/mikefarah/yq" changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.txt" distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz" -checksum=f55ffb9c6d7926b06d5862eb6a9e9ea942ec2883286df8e2e3d6f0716cc36eed +checksum=8ffab12d2d527f0ac62823777201f8e5e78c9af5c754914274db2733da98c796 do_check() { go test -v From f1d060db256fa9e1516ceb60ae4b18e38caabaab Mon Sep 17 00:00:00 2001 From: akierig Date: Fri, 22 Apr 2022 15:24:10 -0500 Subject: [PATCH 1325/2369] Signal-Desktop: update to 5.40.1. --- 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 8bcfe617ab4..44818947462 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.40.0 +version=5.40.1 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=57bb0ebbf4b3fb9d6dfbaa84166ecf668ce0df8a0afa0f69907680804dd064c4 +checksum=d80d210554e0296d916f7e25d9a49afc58340ab03ef7a1e7ae21017e80e9de7b nostrip_files="signal-desktop" post_extract() { From fa059d8640d284de33ef82d1af3624b91a9cd3b3 Mon Sep 17 00:00:00 2001 From: Tuxliban Torvalds Date: Wed, 20 Apr 2022 23:41:51 -0500 Subject: [PATCH 1326/2369] intel-ucode: update to 20220419 --- srcpkgs/intel-ucode/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template index 642dee9f7c2..e7e57d0f658 100644 --- a/srcpkgs/intel-ucode/template +++ b/srcpkgs/intel-ucode/template @@ -1,6 +1,6 @@ # Template file for 'intel-ucode' pkgname=intel-ucode -version=20220207 +version=20220419 revision=1 archs="i686* x86_64*" wrksrc="Intel-Linux-Processor-Microcode-Data-Files-microcode-${version}" @@ -9,7 +9,7 @@ maintainer="Andrew J. Hesford " license="custom: Proprietary" homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files" distfiles="${homepage}/archive/microcode-${version}.tar.gz" -checksum=532527bd17f3ea6664452b536699818a3bf896e4ace689a43a73624711b7c921 +checksum=b8838d300e749c1dd55d8865bdd49dee5153beb5e29d4b0e613aee475e0c0881 repository=nonfree do_install() { From 6978356bf26c2fe8ff1d93881c5cf363b08613f1 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sat, 16 Apr 2022 16:17:52 +0530 Subject: [PATCH 1327/2369] New package: libnvme-0.1 --- common/shlibs | 1 + srcpkgs/libnvme-devel | 1 + srcpkgs/libnvme-doc | 1 + srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 +++++++ srcpkgs/libnvme/template | 39 +++++++++++++++++++ srcpkgs/python3-libnvme | 1 + 6 files changed, 56 insertions(+) create mode 120000 srcpkgs/libnvme-devel create mode 120000 srcpkgs/libnvme-doc create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch create mode 100644 srcpkgs/libnvme/template create mode 120000 srcpkgs/python3-libnvme diff --git a/common/shlibs b/common/shlibs index 11328b15a9c..073830fc144 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4148,3 +4148,4 @@ librz_search.so.0.3.4 rizin-0.3.4_1 librz_bin.so.0.3.4 rizin-0.3.4_1 libaravis-0.8.so.0 libaravis-0.8.21_1 libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1 +libnvme.so.1 libnvme-1.0_1 diff --git a/srcpkgs/libnvme-devel b/srcpkgs/libnvme-devel new file mode 120000 index 00000000000..3228da1bc6d --- /dev/null +++ b/srcpkgs/libnvme-devel @@ -0,0 +1 @@ +libnvme \ No newline at end of file diff --git a/srcpkgs/libnvme-doc b/srcpkgs/libnvme-doc new file mode 120000 index 00000000000..3228da1bc6d --- /dev/null +++ b/srcpkgs/libnvme-doc @@ -0,0 +1 @@ +libnvme \ No newline at end of file diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch new file mode 100644 index 00000000000..c25df742e76 --- /dev/null +++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch @@ -0,0 +1,13 @@ +SCOPE_DELIMITER not defined in musl + +--- a/src/nvme/fabrics.c ++++ b/src/nvme/fabrics.c +@@ -325,7 +325,7 @@ + nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src); + + const char *scope = NULL; +- char *p = strchr(tmp, SCOPE_DELIMITER); ++ char *p = strchr(tmp, '%'); + if (p) { + *p = '\0'; + scope = src + (p - tmp) + 1; diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template new file mode 100644 index 00000000000..aafe21aa9aa --- /dev/null +++ b/srcpkgs/libnvme/template @@ -0,0 +1,39 @@ +# Template file for 'libnvme' +pkgname=libnvme +version=1.0 +revision=1 +build_style=meson +configure_args="-Ddocs=man" +hostmakedepends="pkg-config swig" +makedepends="libuuid-devel json-c-devel openssl-devel python3-devel" +short_desc="C Library for NVM Express on Linux" +maintainer="Subhaditya Nath " +license="LGPL-2.1-or-later" +homepage="https://github.com/linux-nvme/libnvme" +distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz" +checksum=387524b1c24a4091a88bfb258c98c054f716da210e77702f0709164740370807 + +libnvme-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + depends+=" json-c-devel libuuid-devel openssl-devel" # otherwise 'pkgconf libnvme' doesn't work + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} + +libnvme-doc_package() { + short_desc+=" - documentation" + pkg_install() { + vmove usr/share + } +} + +python3-libnvme_package() { + short_desc+=" - Python3 bindings" + pkg_install() { + vmove "usr/lib/python*" + } +} diff --git a/srcpkgs/python3-libnvme b/srcpkgs/python3-libnvme new file mode 120000 index 00000000000..3228da1bc6d --- /dev/null +++ b/srcpkgs/python3-libnvme @@ -0,0 +1 @@ +libnvme \ No newline at end of file From 31b39677d53fe569820838f434cb99fe6537bfbf Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sat, 16 Apr 2022 16:55:09 +0530 Subject: [PATCH 1328/2369] nvme-cli: update to 2.0, adopt --- srcpkgs/nvme-cli/patches/dracut-warning.patch | 5 ---- srcpkgs/nvme-cli/template | 28 ++++++++----------- 2 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/nvme-cli/patches/dracut-warning.patch diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch deleted file mode 100644 index ef0b0b4df24..00000000000 --- a/srcpkgs/nvme-cli/patches/dracut-warning.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in 2021-01-24 16:37:06.346511231 +0700 -+++ b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in 2021-01-24 16:38:01.351158511 +0700 -@@ -1 +1 @@ --install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules" -+install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules " diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template index 0da50f2663e..9b142b02de0 100644 --- a/srcpkgs/nvme-cli/template +++ b/srcpkgs/nvme-cli/template @@ -1,28 +1,22 @@ # Template file for 'nvme-cli' pkgname=nvme-cli -version=1.13 -revision=2 -build_style=gnu-makefile -# yeah, it must be 0 to enable -make_build_args="LIBUUID=0" -make_install_args="SBINDIR=/usr/bin UDEVDIR=/usr/lib/udev" -make_install_target="install-spec" -makedepends="libuuid-devel" +version=2.0 +revision=1 +build_style=meson +configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d" +hostmakedepends="pkg-config" +makedepends="libnvme-devel zlib-devel json-c-devel libuuid-devel libhugetlbfs-devel" short_desc="NVMe management command line interface" -maintainer="Peter Froehlich " +maintainer="Subhaditya Nath " license="GPL-2.0-only" homepage="http://nvmexpress.org" distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz" -checksum=03f4875f3e68d326b0280e16df2f027ca6b086cfa148c34e8569df61319b4b85 +checksum=471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c conf_files="/etc/nvme/*.conf" post_install() { - # these files are touch'd by install, remove so they aren't registered - # by the package (which would cause trouble during removal) - rm -f "${DESTDIR}/etc/nvme/hostnqn" - rm -f "${DESTDIR}/etc/nvme/hostid" - rm -rf "${DESTDIR}/etc/udev/rules.d" - rm -f "${DESTDIR}/usr/sbin/nvme" - # no need for systemd files + # remove files that are systemd-only rm -rf "${DESTDIR}/usr/lib/systemd" + rm -rf "${DESTDIR}/usr/lib/udev/rules.d/70-nvmf-autoconnect.rules" # calls systemctl + rm -rf "${DESTDIR}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf" # needs 70-nvmf-autoconnect.rules } From 826e13075940e969f29c78bab79ba58c4ce7f1d5 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 15:05:17 +0200 Subject: [PATCH 1329/2369] parallel: update to 20220422. --- srcpkgs/parallel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template index 030875ae0ff..27a4c2a2b05 100644 --- a/srcpkgs/parallel/template +++ b/srcpkgs/parallel/template @@ -1,6 +1,6 @@ # Template file for 'parallel' pkgname=parallel -version=20220322 +version=20220422 revision=1 build_style=gnu-configure depends="perl" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/parallel/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=df93ccf6a9f529ad2126b7042aef0486603e938c77b405939c41702d38a4e6d8 +checksum=96e4b73fff1302fc141a889ae43ab2e93f6c9e86ac60ef62ced02dbe70b73ca7 pre_configure() { # no html and pdf doc From 0dad33be3600c756c9330762d11b7b3acfc7c36c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 17:35:37 +0200 Subject: [PATCH 1330/2369] public-inbox: update to 1.8.0. --- srcpkgs/public-inbox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/public-inbox/template b/srcpkgs/public-inbox/template index d95bb6f3a0b..d8bd1f5ce72 100644 --- a/srcpkgs/public-inbox/template +++ b/srcpkgs/public-inbox/template @@ -1,6 +1,6 @@ # Template file for 'public-inbox' pkgname=public-inbox -version=1.7.0 +version=1.8.0 revision=1 wrksrc="${pkgname}-${version/pre/-pre}" build_style=perl-module @@ -18,7 +18,7 @@ maintainer="Leah Neukirchen " license="AGPL-3.0-or-later" homepage="https://public-inbox.org/" distfiles="https://public-inbox.org/public-inbox.git/snapshot/${pkgname}-${version}.tar.gz" -checksum=8504a998014556e3e65d9bdceeaeb23f966197cea86abf3738b6059fee36c8c9 +checksum=95a24e38293935e7081967acbf80f7d1c2c67e28d01d591ea39e5e36a34acdec pre_check() { mkdir -p ~/.public-inbox From 8c9bdc28a8ffc8241e69a1e67cc6a70968c91dd1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 21:31:46 +0200 Subject: [PATCH 1331/2369] dune: update to 3.1.1. --- srcpkgs/dune/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template index 30c34cb44c0..bc2898d2cd4 100644 --- a/srcpkgs/dune/template +++ b/srcpkgs/dune/template @@ -1,7 +1,7 @@ # Template file for 'dune' pkgname=dune -version=3.0.3 -revision=2 +version=3.1.1 +revision=1 makedepends="ocaml" depends="ocaml" short_desc="Composable build system for OCaml" @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://dune.build/" distfiles="https://github.com/ocaml/dune/archive/refs/tags/${version}.tar.gz" -checksum=8f5e1570e68f7b2e0a8d1ffea77318e058f125f4cb8ea9a4af9cf9afe4ced893 +checksum=176c7095b2fcb59ca5c8fba880cf32dd3010144e926b99fc01f7a89e973b895d nocross="ocaml" _dune_release_pkgs="dune dune-action-plugin dune-build-info dune-configurator From 031bf1b82ccaf176fbfc24a06d5dc1dbe2384be8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 21:41:50 +0200 Subject: [PATCH 1332/2369] z3: update to 4.8.16. --- srcpkgs/z3/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index dea059c98d0..d322211cbd9 100644 --- a/srcpkgs/z3/template +++ b/srcpkgs/z3/template @@ -1,7 +1,7 @@ # Template file for 'z3' pkgname=z3 -version=4.8.15 -revision=2 +version=4.8.16 +revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=configure configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)" @@ -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=2abe7f5ecb7c8023b712ffba959c55b4515f4978522a6882391de289310795ac +checksum=75f95e09f3f35fef746e571d5ec88a4efba27f1bc8f1a0ef1117167486ec3dc6 build_options="ocaml" desc_option_ocaml="Enable support for OCaml bindings" From 5e5e5a82f132d16f3c1daff0c93f95020362ff7c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 21:47:16 +0200 Subject: [PATCH 1333/2369] python3-pyinfra: update to 2.0.2. --- srcpkgs/python3-pyinfra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template index c4935c5e16b..b5b66a212d1 100644 --- a/srcpkgs/python3-pyinfra/template +++ b/srcpkgs/python3-pyinfra/template @@ -1,6 +1,6 @@ # Template file for 'python3-pyinfra' pkgname=python3-pyinfra -version=1.7.2 +version=2.0.2 revision=1 wrksrc="pyinfra-${version}" build_style=python3-module @@ -14,7 +14,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://pyinfra.com/" distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz" -checksum=c7a2464ab50c5de865f0984e1978a9af37fbeca2260c4bf642db37fd0aed910d +checksum=d5775bbd7060a67184092f6d29d7ee9f08ad76035cad7328e2fd63824c6fa649 post_extract() { vsed -i -e '/configparser/d' setup.py # is in Python 3.8 From efa07a622bb671b6898cdfeb5b4ea875e394b8bb Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 21:48:05 +0200 Subject: [PATCH 1334/2369] python3-pywinrm: update to 0.4.3. --- srcpkgs/python3-pywinrm/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pywinrm/template b/srcpkgs/python3-pywinrm/template index 24c8b63fec0..642166e13b6 100644 --- a/srcpkgs/python3-pywinrm/template +++ b/srcpkgs/python3-pywinrm/template @@ -1,7 +1,7 @@ # Template file for 'python3-pywinrm' pkgname=python3-pywinrm -version=0.4.2 -revision=2 +version=0.4.3 +revision=1 wrksrc="pywinrm-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/diyan/pywinrm" distfiles="https://github.com/diyan/pywinrm/archive/v${version}.tar.gz" -checksum=c2a0d839f524a3cf4548923c29f85f909174405ac4339df45813410aae759b44 +checksum=253d2af9a6f1ec1ae8e21919a174e178b2e0475060956e3add0746584520ae84 post_install() { vlicense LICENSE From dad3d6b471aacfa152df34de32e08346610eed97 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 21:48:43 +0200 Subject: [PATCH 1335/2369] python3-pipenv: update to 2022.4.21. --- srcpkgs/python3-pipenv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template index ea94ef51e08..2c0c939cf5f 100644 --- a/srcpkgs/python3-pipenv/template +++ b/srcpkgs/python3-pipenv/template @@ -1,6 +1,6 @@ # Template file for 'python3-pipenv' pkgname=python3-pipenv -version=2022.4.8 +version=2022.4.21 revision=1 wrksrc="pipenv-${version}" build_style=python3-module @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/pypa/pipenv" changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst" distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz" -checksum=53562bf69d9e5238f99a1e2101c356746b1c0aefa5dceb9b8a84a5a3e201de0d +checksum=3f93229de25a4c3a658249f48407b80f347f076640a9fd50c476a2876212f781 conflicts="python-pipenv>=0" post_extract() { From 2d9c29623689fb3ba89fbd3865758b4d586a3c25 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 23 Apr 2022 15:34:59 +0200 Subject: [PATCH 1336/2369] python3-pwntools: disable tests --- srcpkgs/python3-pwntools/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template index f61ad95fa81..d062f213cf1 100644 --- a/srcpkgs/python3-pwntools/template +++ b/srcpkgs/python3-pwntools/template @@ -18,6 +18,7 @@ license="MIT, BSD-2-Clause" homepage="https://github.com/Gallopsled/pwntools" distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz" checksum=42052e2d883710e4e1da041e91675a6d719fb4e5ef2dd245cb2853da11269290 +#make_check=no # needs unpackaged rpyc post_install() { rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md From 86b4f49fcbb5325b061ae825cb023ac55015934a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 24 Apr 2022 22:33:45 +0200 Subject: [PATCH 1337/2369] libinput: update to 1.20.1. --- srcpkgs/libinput/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template index 38fe908dbb3..1736a1f91f3 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -1,6 +1,6 @@ # Template file for 'libinput' pkgname=libinput -version=1.20.0 +version=1.20.1 revision=1 build_style=meson configure_args="-Dtests=false" @@ -13,7 +13,7 @@ maintainer="Michal Vasilek " license="MIT" homepage="https://www.freedesktop.org/wiki/Software/libinput" distfiles="https://gitlab.freedesktop.org/libinput/libinput/-/archive/${version}/libinput-${version}.tar.gz" -checksum=04d27bce1eb8387e99740e43224b0de7ea65161826d120199bf96230132e5186 +checksum=fbbfe95c5cf20a1790c077b703db86ff0811c04a040b15f2a8579518e8a58064 CFLAGS="-UNDEBUG" From 694ce4d08185387f32e4c80a24cd628c4dce7551 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 24 Apr 2022 22:33:50 +0200 Subject: [PATCH 1338/2369] pp: fix checksum --- srcpkgs/pp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template index c1a59659fb6..4865bcd96d9 100644 --- a/srcpkgs/pp/template +++ b/srcpkgs/pp/template @@ -9,7 +9,7 @@ maintainer="Daniel Lewan " license="ISC" homepage="https://mkws.sh/pp.html" distfiles="https://mkws.sh/pp/pp@${version}.tgz" -checksum=3c85716c05145c85f281478c82f445d9a808faad0497b438a8bfcbfdfd055665 +checksum=3b4726a2d2e78349fd5512ea8d4c4f5e8417d5a81e511f74e7efb5f4e03e978c do_build() { make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" From 92d10c25ed1f1233fd4a795dd3647dbc525fe0e3 Mon Sep 17 00:00:00 2001 From: ThePademelon Date: Sun, 24 Apr 2022 16:22:20 +1000 Subject: [PATCH 1339/2369] blanket: update to 0.6.0. --- srcpkgs/blanket/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template index 57d75b5ba8d..9db5a1d5a3c 100644 --- a/srcpkgs/blanket/template +++ b/srcpkgs/blanket/template @@ -1,14 +1,14 @@ # Template file for 'blanket' pkgname=blanket -version=0.5.0 +version=0.6.0 revision=1 build_style=meson hostmakedepends="pkg-config gettext glib-devel" -depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libhandy1" +depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libadwaita" short_desc="Improve focus and productivity by listening to different sounds" maintainer="Reback00 " license="GPL-3.0-or-later" homepage="https://github.com/rafaelmardojai/blanket" distfiles="https://github.com/rafaelmardojai/blanket/archive/refs/tags/${version}.tar.gz" -checksum=5af1d417d31bafff7c13a48e26bc4daae58a537f312b4ffb6911ae1b8b09a1d1 +checksum=710a3b733da5eb349bf8dc3c37ef0afeb301c8299c22e7fad3c753576f33f7f4 python_version=3 From 8883c7ec2585ecb637131f158002ed853ae6989b Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Sat, 23 Apr 2022 21:47:40 +0200 Subject: [PATCH 1340/2369] volta: update to 1.0.7 --- srcpkgs/volta/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template index 7874993281e..e624659785b 100644 --- a/srcpkgs/volta/template +++ b/srcpkgs/volta/template @@ -1,6 +1,6 @@ # Template file for 'volta' pkgname=volta -version=1.0.6 +version=1.0.7 revision=1 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil. build_style="cargo" @@ -11,7 +11,7 @@ maintainer="Alex Lohr " license="BSD-2-Clause" homepage="https://volta.sh/" distfiles="https://github.com/volta-cli/volta/archive/v${version}.tar.gz" -checksum=0f66edcb2639bee2c1668efd119c2937a77fbbe564c9d63827e8eaf37dbee4b9 +checksum=7e38691c56d77b4d4b466247bc9f10672d4f8f6b98cf53c50fdab6c34526aa91 post_install() { vlicense LICENSE From 78c1d13d889cfa613c24f0eace986c34054a8dd2 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Thu, 21 Apr 2022 17:40:59 +0300 Subject: [PATCH 1341/2369] StyLua: update to 0.13.1. --- srcpkgs/StyLua/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template index b6dc22c3875..90ef1beb0f3 100644 --- a/srcpkgs/StyLua/template +++ b/srcpkgs/StyLua/template @@ -1,6 +1,6 @@ # Template file for 'StyLua' pkgname=StyLua -version=0.13.0 +version=0.13.1 revision=1 build_style=cargo configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if luau '--features luau')" @@ -10,7 +10,7 @@ license="MPL-2.0" homepage="https://github.com/JohnnyMorganz/StyLua" changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/master/CHANGELOG.md" distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz" -checksum=ad74d1f47b0337810459dab9b49694bd5bd6c8c7381a35dcab7866752652988b +checksum=21158028569158ec7c1ad71352f3cb1906a005eb797508aa2b0b4a861162cf72 build_options="lua52 luau" build_options_default="lua52 luau" From 58d211819c2594eecb9909fdb04586be5c9dce7a Mon Sep 17 00:00:00 2001 From: glaulher Date: Thu, 21 Apr 2022 12:34:46 -0300 Subject: [PATCH 1342/2369] thefuck: update to 3.32. --- srcpkgs/thefuck/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template index 267a27d7789..7704ab2a6a6 100644 --- a/srcpkgs/thefuck/template +++ b/srcpkgs/thefuck/template @@ -1,7 +1,7 @@ # Template file for 'thefuck' pkgname=thefuck -version=3.31 -revision=2 +version=3.32 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-colorama python3-decorator python3-psutil python3-pyte @@ -12,12 +12,12 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/nvbn/thefuck" distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz" -checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df +checksum=76cbb014473672d1c384922857f8fbc1f6f7774f74f784149ad88751854ecfdf case "$XBPS_TARGET_MACHINE" in # archs where go is available - the test suite uses it x86_64*|i686*|armv[67]*|aarch64*|ppc64le*) checkdepends+=" go" ;; - *) make_check=no ;; + *) make_check=no ;; # go is not available esac pre_check() { From 4dc0cb57f4eb8195f69cd4a301038d5d28a93ac1 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 15 Apr 2022 18:00:25 +0200 Subject: [PATCH 1343/2369] linux-firmware: update to 20220411. --- srcpkgs/linux-firmware/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index 018f08f9509..dde0c93b3fb 100644 --- a/srcpkgs/linux-firmware/template +++ b/srcpkgs/linux-firmware/template @@ -1,6 +1,6 @@ # Template file for 'linux-firmware' pkgname=linux-firmware -version=20220310 +version=20220411 revision=1 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}" short_desc="Binary firmware blobs for the Linux kernel" @@ -8,7 +8,7 @@ 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=f4c34a7ba8144b52fd7f6dd0b1dea2998f140ab1139372f8fbdb76f4557ff228 +checksum=533ae621b3eacf6a4696dab52a9dbc5727403a175c413b1682ab3f9cfb37872f python_version=3 nostrip=yes From a024cdc5fb8b5c3b92cf4d57b6150ed276c91c98 Mon Sep 17 00:00:00 2001 From: Philipp David Date: Sat, 9 Apr 2022 14:10:43 +0200 Subject: [PATCH 1344/2369] img2pdf: update to 0.4.4. --- srcpkgs/img2pdf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template index a24ea1f1b61..d3b30d5af5d 100644 --- a/srcpkgs/img2pdf/template +++ b/srcpkgs/img2pdf/template @@ -1,6 +1,6 @@ # Template file for 'img2pdf' pkgname=img2pdf -version=0.4.3 +version=0.4.4 revision=1 build_style=python3-module hostmakedepends="python3-pikepdf python3-setuptools" @@ -10,5 +10,5 @@ maintainer="Philipp David " license="GPL-3.0-or-later" homepage="https://gitlab.mister-muffin.de/josch/img2pdf" distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz" -checksum=8e51c5043efa95d751481b516071a006f87c2a4059961a9ac43ec238915de09f +checksum=8ec898a9646523fd3862b154f3f47cd52609c24cc3e2dc1fb5f0168f0cbe793c make_check=no # need to patch out some bitdepth checks From d46daa51c07621e44c8e3e0e4ff9a8f19d3b521f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Sat, 23 Apr 2022 12:39:03 +0200 Subject: [PATCH 1345/2369] dasel: update to 1.24.3. --- srcpkgs/dasel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template index 6d913b08ba6..1f4e0d9fb80 100644 --- a/srcpkgs/dasel/template +++ b/srcpkgs/dasel/template @@ -1,6 +1,6 @@ # Template file for 'dasel' pkgname=dasel -version=1.24.1 +version=1.24.3 revision=1 build_style=go go_import_path=github.com/tomwright/dasel @@ -12,7 +12,7 @@ license="MIT" homepage="https://daseldocs.tomwright.me/" changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md" distfiles="https://github.com/TomWright/dasel/archive/v${version}.tar.gz" -checksum=ca1fa030f41abcd3659e76d7413ce14c551f40d41769e7a000a46f4fea6d0b64 +checksum=86d497e7dcfe63901ef0aeddb31e3989959d60d785a04f98fc6a88b6f497980a post_install() { vlicense LICENSE From 1463ca34d72e3a366e3f794b0daaae5cd9e33e6c Mon Sep 17 00:00:00 2001 From: 0x5c Date: Fri, 22 Apr 2022 17:28:47 -0400 Subject: [PATCH 1346/2369] tailscale: update to 1.24.0. --- srcpkgs/tailscale/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template index 27a3611b729..9b6db1157ae 100644 --- a/srcpkgs/tailscale/template +++ b/srcpkgs/tailscale/template @@ -1,6 +1,6 @@ # Template file for 'tailscale' pkgname=tailscale -version=1.22.2 +version=1.24.0 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=3e7b5b8073a7b94d84ff6677a9f110070b808c8d35c5b7da0c6e6fe639444e58 +checksum=3c8fe851c440d5dbd9dba2f3242924a7d99e7df37b5ae098507a8feb3663c76f post_install() { vlicense LICENSE From 3896588eac7300d1fb0c4af370edd27f8152db93 Mon Sep 17 00:00:00 2001 From: ologantr Date: Fri, 22 Apr 2022 18:27:05 +0200 Subject: [PATCH 1347/2369] ncmpc: update to 0.46. Also, remove unneeded boost-devel dependency and bump to pcre2. --- srcpkgs/ncmpc/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template index a7d76aa3ce9..0c9c46bf840 100644 --- a/srcpkgs/ncmpc/template +++ b/srcpkgs/ncmpc/template @@ -1,18 +1,18 @@ # Template file for 'ncmpc' pkgname=ncmpc -version=0.45 -revision=2 +version=0.46 +revision=1 build_style=meson configure_args="-Dlirc=disabled -Dhtml_manual=false" hostmakedepends="pkg-config python3-Sphinx" -makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel" +makedepends="libmpdclient-devel ncurses-devel pcre2-devel" short_desc="Ncurses-based mpd client" maintainer="Getty Ritter " license="GPL-2.0-or-later" homepage="https://www.musicpd.org/clients/ncmpc/" changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/master/NEWS" distfiles="https://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz" -checksum=17ff446447e002f2ed4342b7324263a830df7d76bcf177dce928f7d3a6f1f785 +checksum=177f77cf09dd4ab914e8438be399cdd5d83c9aa992abc8d9abac006bb092934e post_install() { vmkdir usr/share/examples/ncmpc From 838b3b961e2f8c555049c63059bdadf062488d2f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 23 Apr 2022 21:21:38 +0200 Subject: [PATCH 1348/2369] gst-plugins-base1: fix -devel dependencies --- srcpkgs/gst-plugins-base1/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index fcb7c07b06a..538f4111a74 100644 --- a/srcpkgs/gst-plugins-base1/template +++ b/srcpkgs/gst-plugins-base1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-base1' pkgname=gst-plugins-base1 version=1.20.1 -revision=2 +revision=3 wrksrc="${pkgname/1/}-${version}" build_style=meson build_helper="gir" @@ -53,7 +53,10 @@ do_check() { } gst-plugins-base1-devel_package() { - depends="gstreamer1-devel>=${version} ${sourcepkg}>=${version}_${revision} orc-devel" + depends="gstreamer1-devel>=${version} ${sourcepkg}>=${version}_${revision} + libX11-devel libdrm-devel libgbm-devel libglib-devel libglvnd-devel + libgudev-devel orc-devel wayland-devel zlib-devel" + short_desc+=" - development files" pkg_install() { vmove usr/include From 9e01c22c408bf90a381e5b7adb9fc2356c98796f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 24 Apr 2022 21:54:18 +0200 Subject: [PATCH 1349/2369] btrfs-progs: move .pc file to libbtrfsutil-devel --- srcpkgs/btrfs-progs/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index 971267a5043..5be94b6daaf 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -1,7 +1,7 @@ # Template file for 'btrfs-progs' pkgname=btrfs-progs version=5.14.1 -revision=1 +revision=2 wrksrc="${pkgname}-v${version}" build_style=gnu-configure make_check_target=test @@ -65,6 +65,7 @@ libbtrfsutil-devel_package() { short_desc+=" - libbtrfsutil development files" pkg_install() { vmove usr/include/btrfsutil.h + vmove usr/lib/pkgconfig/libbtrfsutil.pc vmove usr/lib/libbtrfsutil.a vmove usr/lib/libbtrfsutil.so } From 7c0417a24c40a168f9fea7ade1470a575de2f9c6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 25 Apr 2022 14:10:53 +0200 Subject: [PATCH 1350/2369] kubefwd: update to 1.22.2. --- srcpkgs/kubefwd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template index 734b9c732c8..8aa2f1b456d 100644 --- a/srcpkgs/kubefwd/template +++ b/srcpkgs/kubefwd/template @@ -1,6 +1,6 @@ # Template file for 'kubefwd' pkgname=kubefwd -version=1.22.0 +version=1.22.2 revision=1 build_style=go go_import_path="github.com/txn2/kubefwd/cmd/kubefwd" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/txn2/kubefwd" distfiles="https://github.com/txn2/kubefwd/archive/${version}.tar.gz" -checksum=38a36dfe7182b4a9a4515d49c6dbeeceb101397cc5c11fbf720d2570cb0b86ef +checksum=ce7ed2d054a594c9471b1ef777d024186ac427f7d0db8422fda96ede26238f9e post_install() { vlicense NOTICE From 1c13c76f295d965601936f3f66355a6f59890d3e Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Sun, 24 Apr 2022 19:15:20 +1100 Subject: [PATCH 1351/2369] muse: update to 4.1.0. --- srcpkgs/muse/patches/i686.patch | 22 ++++++++++++++++++++++ srcpkgs/muse/template | 7 +++---- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/muse/patches/i686.patch diff --git a/srcpkgs/muse/patches/i686.patch b/srcpkgs/muse/patches/i686.patch new file mode 100644 index 00000000000..e15bce63002 --- /dev/null +++ b/srcpkgs/muse/patches/i686.patch @@ -0,0 +1,22 @@ +From 40afa0ad60e221c7b02fb8febbf9baff42c13cdc Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Mon, 25 Apr 2022 10:19:30 +0200 +Subject: [PATCH] Fix intptr_t was not declared in this scope on i386 + +--- + src/al/dsp.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/al/dsp.cpp b/src/al/dsp.cpp +index 8a4803e4c..3f601dc63 100644 +--- a/src/al/dsp.cpp ++++ b/src/al/dsp.cpp +@@ -21,7 +21,7 @@ + //============================================================================= + + #include +-//#include ++#include + //#include "config.h" + #include "al.h" + #include "dsp.h" diff --git a/srcpkgs/muse/template b/srcpkgs/muse/template index c1289802a6b..bfc011eb103 100644 --- a/srcpkgs/muse/template +++ b/srcpkgs/muse/template @@ -1,8 +1,7 @@ # Template file for 'muse' pkgname=muse -version=4.0.0 -revision=2 -wrksrc="muse-${version}" +version=4.1.0 +revision=1 build_wrksrc=src build_style=cmake build_helper=qmake @@ -19,7 +18,7 @@ maintainer="Evgeny Ermakov " license="GPL-2.0-or-later" homepage="https://muse-sequencer.github.io" distfiles="https://github.com/muse-sequencer/muse/archive/${version/pre/-pre}.tar.gz" -checksum=cdd4c76a19f5be2d72832f6ed0d22218647c58b33f2da45ab2223a4c04bddf96 +checksum=b5462cdebd84326b0ffc0aa0b2c27f5eab55362dcc04e17796de866fcee4f391 python_version=3 build_options="alsa python" From 7dc4bc0a6d45b5ecc922d0b2717fd9fbffbb825d Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Wed, 20 Apr 2022 21:19:00 -0400 Subject: [PATCH 1352/2369] mdcat: update to 0.27.1. --- srcpkgs/mdcat/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template index c07dbd3b391..84a8294986a 100644 --- a/srcpkgs/mdcat/template +++ b/srcpkgs/mdcat/template @@ -1,18 +1,20 @@ # Template file for 'mdcat' pkgname=mdcat -version=0.26.1 +version=0.27.1 revision=1 wrksrc="${pkgname}" build_style=cargo hostmakedepends="pkg-config ruby-asciidoctor" makedepends="openssl-devel" +depends="shared-mime-info" +checkdepends="shared-mime-info" short_desc="Cat for markdown" maintainer="cinerea0 " license="MPL-2.0" homepage="https://codeberg.org/flausch/mdcat/" changelog="https://codeberg.org/flausch/mdcat/raw/branch/main/CHANGELOG.md" distfiles="https://codeberg.org/flausch/mdcat/archive/mdcat-${version}.tar.gz" -checksum=1120c4f3b5b517075b6347dbfe76a2211a91837b4d0242c0b72cdbc19e6886dd +checksum=79961e0a842ee0f68aee3d54b39458352664c67388e56175a9d18d80f357bf14 case "$XBPS_TARGET_MACHINE" in x86_64*|i686*|arm*|aarch64*) ;; From da28f088bd5e54aeca3c23e892f4ee71746c0682 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sun, 10 Apr 2022 12:03:13 +0200 Subject: [PATCH 1353/2369] praat: update to 6.2.12 and enable check --- srcpkgs/praat/template | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template index 142f0d2661a..c40c093208e 100644 --- a/srcpkgs/praat/template +++ b/srcpkgs/praat/template @@ -1,18 +1,19 @@ # Template file for 'praat' pkgname=praat -version=6.2.10 +version=6.2.12 revision=1 create_wrksrc=yes hostmakedepends="pkg-config" makedepends="gtk+3-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if jack jack-devel) $(vopt_if pulseaudio 'alsa-lib-devel pulseaudio-devel')" +checkdepends="cantarell-fonts" short_desc="Speech analysis, synthesis, and manipulation" maintainer="newbluemoon " 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=f6358b2c6a967afe89882720d503c74221b364c563e1e4316a2d73c9f0c22bcd +checksum=b6f1e09ffc8d0c89e3a892d997af0766a49f7d863cdeae857a9b5ea7f95f5650 # 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 @@ -59,6 +60,12 @@ do_install() { vbin praat_nogui } +do_check() { + cd "${pkgname}-${version}/test" + ../../praat --run runAllTests_batch.praat + ../../praat_nogui --run runAllTests_batch.praat +} + praat-nogui_package() { short_desc+=" (nogui)" pkg_install() { From 8be190a159b6b7ca435315a9bac04aad8c4bdea0 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 20 Apr 2022 13:50:04 -0400 Subject: [PATCH 1354/2369] python3-pybcj: update to 0.5.2. --- srcpkgs/python3-pybcj/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template index a0776b79662..c6cef8f80b0 100644 --- a/srcpkgs/python3-pybcj/template +++ b/srcpkgs/python3-pybcj/template @@ -1,6 +1,6 @@ # Template file for 'python3-pybcj' pkgname=python3-pybcj -version=0.5.1 +version=0.5.2 revision=1 wrksrc="pybcj-${version}" build_style=python3-module @@ -13,4 +13,4 @@ maintainer="Joel Beckmeyer " license="LGPL-2.1-or-later" homepage="https://github.com/miurahr/pybcj" distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz" -checksum=376d039200639a52cba47fb04ffda39aad39715d9e988405fee0e5d60080d111 +checksum=050e7bf780b82b0c6ba4368c4a78953a1cf5922cef50e8b251fb8b87f0483ad7 From 0db70862110cd4a1efb948fd365e9ebf982f98fc Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 20 Apr 2022 13:50:30 -0400 Subject: [PATCH 1355/2369] python3-py7zr: update to 0.18.4. --- srcpkgs/python3-py7zr/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template index 0113cb1dec2..e6e8e05ec41 100644 --- a/srcpkgs/python3-py7zr/template +++ b/srcpkgs/python3-py7zr/template @@ -1,6 +1,6 @@ # Template file for 'python3-py7zr' pkgname=python3-py7zr -version=0.18.3 +version=0.18.4 revision=1 wrksrc="py7zr-${version}" build_style=python3-module @@ -16,4 +16,4 @@ license="LGPL-2.1-or-later" homepage="https://github.com/miurahr/py7zr" changelog="https://raw.githubusercontent.com/miurahr/py7zr/master/Changelog.rst" distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz" -checksum=d5bdc81536316f209a3ca4e1ce6e2ef11d8a519d613be47bcdd084bf655f400f +checksum=6986e90ca4ca1f4999d57987a54d891673c9f8befa02c9c6cd8201893a17442c From 1885f9febdcb6bcaab689e25107f328bed54fd2f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:08:31 -0400 Subject: [PATCH 1356/2369] protobuf: update to 3.20.1. --- common/shlibs | 6 +++--- srcpkgs/protobuf/template | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 073830fc144..a437c5742ed 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3100,9 +3100,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1 libm17n-gui.so.0 m17n-lib-1.7.0_1 libm17n-core.so.0 m17n-lib-1.7.0_1 libm17n.so.0 m17n-lib-1.7.0_1 -libprotobuf-lite.so.30 libprotobuf-lite-3.19.4_1 -libprotoc.so.30 libprotoc-3.19.4_1 -libprotobuf.so.30 libprotobuf-3.19.4_1 +libprotobuf-lite.so.31 libprotobuf-lite-3.20.1_1 +libprotoc.so.31 libprotoc-3.20.1_1 +libprotobuf.so.31 libprotobuf-3.20.1_1 libsombok.so.3 sombok-2.4.0_1 libdeviceclient.so.0 pragha-1.3.3_1 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1 diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index 14ffcfb820e..25a15ced097 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -1,6 +1,6 @@ # Template file for 'protobuf' pkgname=protobuf -version=3.19.4 +version=3.20.1 revision=1 wrksrc="protobuf-${version}" build_style=gnu-configure @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://developers.google.com/protocol-buffers/" changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt" distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz" -checksum=3bd7828aa5af4b13b99c191e8b1e884ebfa9ad371b0ce264605d347f135d2568 +checksum=8b28fdd45bab62d15db232ec404248901842e5340299a57765e48abe8a80d930 # Checks rely on googletest make_check=no From 5d6808f0d7bdd1089f4efabadd9832776449dc10 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:12:32 -0400 Subject: [PATCH 1357/2369] python3-protobuf: update to 3.20.1. --- srcpkgs/python3-protobuf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template index 64e2f45c305..7c27f55ec18 100644 --- a/srcpkgs/python3-protobuf/template +++ b/srcpkgs/python3-protobuf/template @@ -1,6 +1,6 @@ # Template file for 'python3-protobuf' pkgname=python3-protobuf -version=3.19.4 +version=3.20.1 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-module @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://developers.google.com/protocol-buffers/" distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz" -checksum=9df0c10adf3e83015ced42a9a7bd64e13d06c4cf45c340d2c63020ea04499d0a +checksum=adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9 build_options="cppext" build_options_default="cppext" From e5fa1a0c357bdafedb988f8637285607aaaa638c Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:41 -0400 Subject: [PATCH 1358/2369] protobuf-c: update to 1.4.0. --- srcpkgs/protobuf-c/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template index 16b4e155b6b..8faaf9f8ea4 100644 --- a/srcpkgs/protobuf-c/template +++ b/srcpkgs/protobuf-c/template @@ -1,17 +1,17 @@ # Template file for 'protobuf-c' pkgname=protobuf-c -version=1.3.3 -revision=10 +version=1.4.0 +revision=1 build_style=gnu-configure configure_args="$(vopt_enable protoc)" -hostmakedepends="pkg-config protobuf" +hostmakedepends="pkg-config protobuf protobuf-devel" makedepends="protobuf-devel boost-devel $(vopt_if protoc libprotoc-devel)" short_desc="C implementation of the Google Protocol Buffers" maintainer="Enno Boland " license="BSD-2-Clause" homepage="https://github.com/protobuf-c/protobuf-c" distfiles="${homepage}/releases/download/v${version}/protobuf-c-${version}.tar.gz" -checksum=22956606ef50c60de1fabc13a78fbc50830a0447d780467d3c519f84ad527e78 +checksum=26d98ee9bf18a6eba0d3f855ddec31dbe857667d269bc0b6017335572f85bbcb build_options="protoc" build_options_default="protoc" From fd8872e2f3e8cf5c409b1bc3c0f911b3756745b2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:39 -0400 Subject: [PATCH 1359/2369] Bear: rebuild for protobuf-3.20.1 --- srcpkgs/Bear/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template index abd76cbcd53..c8c6efebccf 100644 --- a/srcpkgs/Bear/template +++ b/srcpkgs/Bear/template @@ -1,7 +1,7 @@ # Template file for 'Bear' pkgname=Bear version=3.0.18 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config protobuf protobuf-devel grpc" makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel" From e3404da1ebbf18934b3f07cdec8857571e5f5c27 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:39 -0400 Subject: [PATCH 1360/2369] EternalTerminal: rebuild for protobuf-3.20.1 --- srcpkgs/EternalTerminal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template index 659e1e69df8..ae3f21ee709 100644 --- a/srcpkgs/EternalTerminal/template +++ b/srcpkgs/EternalTerminal/template @@ -1,7 +1,7 @@ # Template file for 'EternalTerminal' pkgname=EternalTerminal version=6.0.13 -revision=5 +revision=6 wrksrc="${pkgname}-et-v${version}" build_style=cmake hostmakedepends="protobuf" From d498627c17d12e466fcef574c5f3f9a658dd1966 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:39 -0400 Subject: [PATCH 1361/2369] android-tools: rebuild for protobuf-3.20.1 --- srcpkgs/android-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template index b1b47376caa..51a783085b7 100644 --- a/srcpkgs/android-tools/template +++ b/srcpkgs/android-tools/template @@ -1,7 +1,7 @@ # Template file for 'android-tools' pkgname=android-tools version=31.0.3p1 -revision=2 +revision=3 archs="armv* aarch64* x86_64* i686* ppc64le*" build_style=cmake hostmakedepends="perl go protobuf pkg-config" From 8958e1123e3bc6d95b23fe322c1eb83ec308b301 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:40 -0400 Subject: [PATCH 1362/2369] astroid: rebuild for protobuf-3.20.1 --- srcpkgs/astroid/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template index 1021eb48206..1207eacbacc 100644 --- a/srcpkgs/astroid/template +++ b/srcpkgs/astroid/template @@ -1,7 +1,7 @@ # Template file for 'astroid' pkgname=astroid version=0.16 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config scdoc protobuf gobject-introspection" makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel From d185e70048192cff5016201a59f95942c160868b Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:40 -0400 Subject: [PATCH 1363/2369] bloaty: rebuild for protobuf-3.20.1 --- srcpkgs/bloaty/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bloaty/template b/srcpkgs/bloaty/template index eb432b02e6d..1334dc8715d 100644 --- a/srcpkgs/bloaty/template +++ b/srcpkgs/bloaty/template @@ -1,7 +1,7 @@ # Template file for 'bloaty' pkgname=bloaty version=1.1 -revision=8 +revision=9 build_style=cmake hostmakedepends="pkg-config protobuf" makedepends="capstone-devel protobuf-devel re2-devel zlib-devel" From 94c5cde9c4fe18e5309692f877a075103243c21d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:40 -0400 Subject: [PATCH 1364/2369] clementine: rebuild for protobuf-3.20.1 --- srcpkgs/clementine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index af56ba9852a..9615d5fe8b4 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,7 +1,7 @@ # Template file for 'clementine' pkgname=clementine version=1.4.0rc1 -revision=7 +revision=8 _fullver=$version-343-gb49afcc5b wrksrc=${pkgname}-${_fullver} build_style=cmake From 85e1186c98c2cc7b63c085556dbb481b97a2cae3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:40 -0400 Subject: [PATCH 1365/2369] cura-engine: rebuild for protobuf-3.20.1 --- srcpkgs/cura-engine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template index 5cded6271de..f5c611d2c5f 100644 --- a/srcpkgs/cura-engine/template +++ b/srcpkgs/cura-engine/template @@ -1,7 +1,7 @@ # Template file for 'cura-engine' pkgname=cura-engine version=4.13.1 -revision=1 +revision=2 wrksrc="CuraEngine-${version}" build_style=cmake configure_args="-DCURA_ENGINE_VERSION=${version}" From f06aa7b0ed7254bfa0fa1843fe500acc6e762bca Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:40 -0400 Subject: [PATCH 1366/2369] grpc: rebuild for protobuf-3.20.1 --- srcpkgs/grpc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index 4805cc95632..9b35682fdb1 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -1,7 +1,7 @@ # Template file for 'grpc' pkgname=grpc version=1.39.1 -revision=4 +revision=5 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON From c7e8ee7e26c1e8b7dd18371e582ff94c4e3bb6d2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:40 -0400 Subject: [PATCH 1367/2369] kismet: rebuild for protobuf-3.20.1 --- srcpkgs/kismet/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template index fc851637ef5..eb243e3f27c 100644 --- a/srcpkgs/kismet/template +++ b/srcpkgs/kismet/template @@ -1,7 +1,7 @@ # Template file for 'kismet' pkgname=kismet version=2022.02.R1 -revision=2 +revision=3 _realver="${version//./-}" wrksrc="${pkgname}-${_realver}" build_style=gnu-configure From 290c89dda7e7459eb684e870044c533d8ac0c309 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:40 -0400 Subject: [PATCH 1368/2369] libArcus: rebuild for protobuf-3.20.1 --- srcpkgs/libArcus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template index 21176dfdbcb..30a87aec874 100644 --- a/srcpkgs/libArcus/template +++ b/srcpkgs/libArcus/template @@ -1,7 +1,7 @@ # Template file for 'libArcus' pkgname=libArcus version=4.13.1 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_EXAMPLES=OFF" hostmakedepends="protobuf python3-sip-devel" From c96048965738a58febdeaa10eda916841673b489 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:40 -0400 Subject: [PATCH 1369/2369] libcompizconfig: rebuild for protobuf-3.20.1 --- srcpkgs/libcompizconfig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template index f8c8b185ef7..102a1483e69 100644 --- a/srcpkgs/libcompizconfig/template +++ b/srcpkgs/libcompizconfig/template @@ -1,7 +1,7 @@ # Template file for 'libcompizconfig' pkgname=libcompizconfig version=0.8.18 -revision=8 +revision=9 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake intltool libtool pkg-config protobuf" From 1032c18f0edd07d058aa3d8f3a4cfdf81aaf9c25 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:41 -0400 Subject: [PATCH 1370/2369] libphonenumber: rebuild for protobuf-3.20.1 --- srcpkgs/libphonenumber/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template index 5f1d0169003..a3b2436f07d 100644 --- a/srcpkgs/libphonenumber/template +++ b/srcpkgs/libphonenumber/template @@ -1,7 +1,7 @@ # Template file for 'libphonenumber' pkgname=libphonenumber version=8.12.39 -revision=3 +revision=4 build_wrksrc=cpp build_style=cmake build_helper=qemu From 195aa06dedf1aa8fe3f38ac753de74776eec318a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:41 -0400 Subject: [PATCH 1371/2369] litecoin: rebuild for protobuf-3.20.1 --- srcpkgs/litecoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index ed98488c14b..1e973e9cdc7 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin version=0.18.1 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-openssl" From 01bb0f22c7c44db4be6ea2bde5eb0ba861802e04 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:41 -0400 Subject: [PATCH 1372/2369] mixxx: rebuild for protobuf-3.20.1 --- srcpkgs/mixxx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 9eedd269bc7..712ce645098 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,7 +1,7 @@ # Template file for 'mixxx' pkgname=mixxx version=2.2.4 -revision=11 +revision=12 wrksrc="mixxx-release-${version}" build_style=scons hostmakedepends="pkg-config protobuf" From 3cab3890d1cdc9b6d45a1610cf1ac0d2c4512fa3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:41 -0400 Subject: [PATCH 1373/2369] mosh: rebuild for protobuf-3.20.1 --- srcpkgs/mosh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index 3ff5d593ea6..ddfdb29fd43 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,7 +1,7 @@ # Template file for 'mosh' pkgname=mosh version=1.3.2 -revision=24 +revision=25 build_style=gnu-configure hostmakedepends="pkg-config protobuf" makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel" From c3b5d00fe0c6c51986217fb54a869b1296b8f22c Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:41 -0400 Subject: [PATCH 1374/2369] mozc: rebuild for protobuf-3.20.1 --- srcpkgs/mozc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template index 3b0a01c254d..8a43596a41d 100644 --- a/srcpkgs/mozc/template +++ b/srcpkgs/mozc/template @@ -3,7 +3,7 @@ pkgname=mozc # src/data/version/mozc_version_template.bzl # revision is always 102, template always says 100 ;) version=2.26.4632.102 -revision=2 +revision=3 _commit=06024d8567dd96eea7a1745e82a5d699a56f4ba5 _abseil=20211102.0 create_wrksrc=yes From 422cf04d3001aba306cb020412c62ee9d1531faf Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:41 -0400 Subject: [PATCH 1375/2369] mumble: rebuild for protobuf-3.20.1 --- srcpkgs/mumble/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 9c158c6e8ef..24f30f5e019 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,7 +1,7 @@ # Template file for 'mumble' pkgname=mumble version=1.4.230 -revision=3 +revision=4 wrksrc=mumble-${version}.src build_style=cmake make_cmd=make From 3de1ba62850cc8d0d1e7f76a8a094f8a2f2684a9 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:41 -0400 Subject: [PATCH 1376/2369] nsjail: rebuild for protobuf-3.20.1 --- srcpkgs/nsjail/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index ed03a8949a6..673f1882b97 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,7 +1,7 @@ # Template file for 'nsjail' pkgname=nsjail version=3.0 -revision=7 +revision=8 build_style=gnu-makefile hostmakedepends="bison flex pkg-config protobuf which" makedepends="libnl3-devel protobuf-devel" From 3705c135c3042a46a29829bd95cfceff5eeda09d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:42 -0400 Subject: [PATCH 1377/2369] strawberry: rebuild for protobuf-3.20.1 --- srcpkgs/strawberry/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template index 31e5da77a34..c9eb95bbd85 100644 --- a/srcpkgs/strawberry/template +++ b/srcpkgs/strawberry/template @@ -1,7 +1,7 @@ # Template file for 'strawberry' pkgname=strawberry version=0.9.3 -revision=4 +revision=5 build_style=cmake hostmakedepends="pkg-config protobuf gettext" makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel From 03f5526834741a34e930cb5444c346415a1e24d2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:42 -0400 Subject: [PATCH 1378/2369] sysdig: rebuild for protobuf-3.20.1 --- srcpkgs/sysdig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index e0c59ec0348..b375b8b9549 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -1,7 +1,7 @@ # Template file for 'sysdig' pkgname=sysdig version=0.28.0 -revision=4 +revision=5 build_style=cmake configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF From 4d8e14679716ab0fd4022c131be960c6ca6a1f64 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:42 -0400 Subject: [PATCH 1379/2369] usbguard: rebuild for protobuf-3.20.1 --- srcpkgs/usbguard/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template index e5039446e58..1c2a323c8f4 100644 --- a/srcpkgs/usbguard/template +++ b/srcpkgs/usbguard/template @@ -1,7 +1,7 @@ # Template file for 'usbguard' pkgname=usbguard version=1.0.0 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl" conf_files="/etc/usbguard/*" From 732a49e707c88603b5ad15e5e27068d3671da8b2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 08:18:42 -0400 Subject: [PATCH 1380/2369] vlc: rebuild for protobuf-3.20.1 --- srcpkgs/vlc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index bdcf4ff726c..69d14f330ed 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.17.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread From 454c51cafdb7cded4f90016e034dcee17a38227c Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 25 Apr 2022 23:12:48 -0400 Subject: [PATCH 1381/2369] kubefwd: fix linking on cross --- srcpkgs/kubefwd/template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template index 8aa2f1b456d..e779e7ae9ff 100644 --- a/srcpkgs/kubefwd/template +++ b/srcpkgs/kubefwd/template @@ -12,6 +12,9 @@ homepage="https://github.com/txn2/kubefwd" distfiles="https://github.com/txn2/kubefwd/archive/${version}.tar.gz" checksum=ce7ed2d054a594c9471b1ef777d024186ac427f7d0db8422fda96ede26238f9e +# fix: collect2: fatal error: cannot find 'ld' +export LDFLAGS="-fuse-ld=bfd" + post_install() { vlicense NOTICE } From de8b62e30dc970a27a5c91bfedc98cacda2e820e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 15:02:55 +0200 Subject: [PATCH 1382/2369] libtls: update to 3.5.2. --- common/shlibs | 2 +- srcpkgs/libtls/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index a437c5742ed..58db2bb112f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3539,7 +3539,7 @@ libmanette-0.2.so.0 libmanette-0.2.1_1 libfmt.so.8 fmt-8.0.1_1 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1 libolm.so.3 olm-3.0.0_1 -libtls.so.22 libtls-3.4.1_1 +libtls.so.25 libtls-3.5.2_1 libxmlb.so.2 libxmlb-0.2.1_1 libvoikko.so.1 libvoikko-4.2_1 libfstrcmp.so.0 libfstrcmp-0.7.D001_1 diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template index f8217c020c6..4fa641e0082 100644 --- a/srcpkgs/libtls/template +++ b/srcpkgs/libtls/template @@ -1,6 +1,6 @@ # Template file for 'libtls' pkgname=libtls -version=3.4.3 +version=3.5.2 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=ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d +checksum=56feab8e21c3fa6549f8b7d7511658b8e98518162838a795314732654adf3e5f _lssl_asm_ver="1.2.0" replaces="libtls20>0" From 4cdddb690ec36b4386f5bf2ce6444faa93319575 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 15:01:50 +0200 Subject: [PATCH 1383/2369] catgirl: rebuild for libtls-3.5.2. --- srcpkgs/catgirl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template index d110f03f1fb..9025181a1bb 100644 --- a/srcpkgs/catgirl/template +++ b/srcpkgs/catgirl/template @@ -1,7 +1,7 @@ # Template file for 'catgirl' pkgname=catgirl version=2.1 -revision=1 +revision=2 build_style=gnu-configure make_build_target="all" hostmakedepends="pkg-config" From 6ded86fd07bf27885c46c0def1cab6b5df69f870 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 15:02:03 +0200 Subject: [PATCH 1384/2369] litterbox: rebuild for libtls-3.5.2. --- srcpkgs/litterbox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template index 03f412ee709..433697392dc 100644 --- a/srcpkgs/litterbox/template +++ b/srcpkgs/litterbox/template @@ -1,7 +1,7 @@ # Template file for 'litterbox' pkgname=litterbox version=1.8 -revision=2 +revision=3 build_style=gnu-configure make_build_target="all" hostmakedepends="pkg-config" From b26b457b3c8df28a361be49316f08a103177658b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 15:02:12 +0200 Subject: [PATCH 1385/2369] openntpd: rebuild for libtls-3.5.2. --- srcpkgs/openntpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template index 17565797cec..d910495a7ea 100644 --- a/srcpkgs/openntpd/template +++ b/srcpkgs/openntpd/template @@ -1,7 +1,7 @@ # Template file for 'openntpd' pkgname=openntpd version=6.8p1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-privsep-user=openntpd --with-cacert=/etc/ssl/certs.pem" hostmakedepends="automake libtool" From 76dcaf04142368d211275837bbf5fdf342cbc2cd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 15:02:22 +0200 Subject: [PATCH 1386/2369] pounce: rebuild for libtls-3.5.2. --- srcpkgs/pounce/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template index 3ac74285187..4fec47dc7ba 100644 --- a/srcpkgs/pounce/template +++ b/srcpkgs/pounce/template @@ -1,7 +1,7 @@ # Template file for 'pounce' pkgname=pounce version=3.0 -revision=1 +revision=2 build_style=gnu-configure make_build_target="all" hostmakedepends="pkg-config" From 880f6cc9b60bb2dffc33132d2808fce1836c8960 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Apr 2022 15:02:34 +0200 Subject: [PATCH 1387/2369] sacc: rebuild for libtls-3.5.2. --- srcpkgs/sacc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sacc/template b/srcpkgs/sacc/template index 39e1edb0168..c07aef1a4c3 100644 --- a/srcpkgs/sacc/template +++ b/srcpkgs/sacc/template @@ -1,7 +1,7 @@ # Template file for 'sacc' pkgname=sacc version=1.05 -revision=1 +revision=2 build_style="gnu-makefile" makedepends="ncurses-devel libtls-devel" short_desc="Terminal gopher client" From 2947a27ba1e866f6d09657bb3cdc9b0802e7f576 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 26 Apr 2022 13:41:52 +0200 Subject: [PATCH 1388/2369] crash: update to 8.0.1. --- srcpkgs/crash/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template index 7f158c9ed63..fadb3fcbcb6 100644 --- a/srcpkgs/crash/template +++ b/srcpkgs/crash/template @@ -1,7 +1,7 @@ # Template file for 'crash' pkgname=crash -version=8.0.0 -revision=2 +version=8.0.1 +revision=1 archs="i686 x86_64" # broken on musl build_style=gnu-makefile hostmakedepends="flex tar wget texinfo" @@ -13,8 +13,9 @@ license="GPL-3.0-or-later" homepage="https://crash-utility.github.io/" changelog="https://crash-utility.github.io/crash.changelog.html" distfiles="https://github.com/crash-utility/crash/archive/${version}.tar.gz" -checksum=caab49b7b6d442f60c41360e0ec80cf852dc64e89303b41d704d7661cef43e68 +checksum=233208b1433a49e1d5a063fa88e6fc9772b99fbb7b30ae79a2115d1b8f0dfc52 nocross=yes +disable_parallel_build=yes LDFLAGS=-llzo2 post_extract() { From 946c63f880f0c262ddf5cfd12f521549f1f3da21 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 26 Apr 2022 13:43:53 +0200 Subject: [PATCH 1389/2369] pax-utils: update to 1.3.4. --- srcpkgs/pax-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pax-utils/template b/srcpkgs/pax-utils/template index 757227de499..75d38b714cb 100644 --- a/srcpkgs/pax-utils/template +++ b/srcpkgs/pax-utils/template @@ -1,6 +1,6 @@ # Template file for 'pax-utils' pkgname=pax-utils -version=1.3.3 +version=1.3.4 revision=1 build_style=gnu-configure configure_args="--with-caps" @@ -12,4 +12,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://cgit.gentoo.org/proj/pax-utils.git/" distfiles="https://gentoo.osuosl.org/distfiles/${pkgname}-${version}.tar.xz" -checksum=eeca7fbd98bc66bead4a77000c2025d9f17ea8201b84245882406ce00b9b6b14 +checksum=8baed2f9c5ae8e0cda1b9c75990864101afc64fad0a4616e10f3ff8ef891040b From e2bcb3b9bc8cc1972c4dbb0dfe25c64e93349ec0 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 26 Apr 2022 13:44:41 +0200 Subject: [PATCH 1390/2369] perl-LWP: update to 6.63. --- srcpkgs/perl-LWP/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template index b878123cf00..c3fe1fd7ac9 100644 --- a/srcpkgs/perl-LWP/template +++ b/srcpkgs/perl-LWP/template @@ -1,6 +1,6 @@ # Template file for 'perl-LWP' pkgname=perl-LWP -version=6.62 +version=6.63 revision=1 wrksrc="libwww-perl-${version}" build_style=perl-module @@ -17,4 +17,4 @@ maintainer="Leah Neukirchen " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/libwww-perl" distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz" -checksum=569ac15eb69d54b2a8d932403610690b89c68d6a987eab2f627c0639bae7de18 +checksum=6e6a9479affdf23d7de91b6e2e1b903669af6296840a88c41e86d18067db7f17 From 6b0a998f8f507a05c43dcf4c2dcacce4257d0734 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 26 Apr 2022 13:52:49 +0200 Subject: [PATCH 1391/2369] chez-scheme: update to 9.5.8. --- srcpkgs/chez-scheme/template | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/srcpkgs/chez-scheme/template b/srcpkgs/chez-scheme/template index e2369c47543..3fe0b0a5d0d 100644 --- a/srcpkgs/chez-scheme/template +++ b/srcpkgs/chez-scheme/template @@ -1,9 +1,8 @@ # Template file for 'chez-scheme' pkgname=chez-scheme -version=9.5.6 +version=9.5.8 revision=1 -_nanopass_version=1.9.2 -wrksrc="ChezScheme-${version}" +wrksrc="csv${version}" build_style=gnu-configure hostmakedepends="git libX11-devel liblz4-devel libuuid-devel ncurses-devel zlib-devel" makedepends="${hostmakedepends}" @@ -11,10 +10,8 @@ short_desc="Compiler and run-time system for R6RS Scheme" maintainer="Leah Neukirchen " license="Apache-2.0" homepage="http://scheme.com/" -distfiles="https://github.com/cisco/ChezScheme/archive/v${version}.tar.gz - https://github.com/nanopass/nanopass-framework-scheme/archive/v${_nanopass_version}.tar.gz" -checksum="e23c556493f9a661852ea046f3317500feac5f223ea6ef3aa3b9234567e14c0e - 46d3ab75f425ef93a6ac31f0b0b2f893b9cb3154219832ad52ea044dd36b021c" +distfiles="https://github.com/cisco/ChezScheme/releases/download/v${version}/csv${version}.tar.gz" +checksum=af83e80cbfe1a9a7c868e7c069a40c449fadd5e2a1737fd0f1260fc9d4159906 alternatives=" scheme:scheme:/usr/bin/chez-scheme scheme:scheme.1:/usr/share/man/man1/chez-scheme.1 @@ -34,19 +31,6 @@ case "$XBPS_TARGET_MACHINE" in *) broken="unsupported target platform";; esac -post_extract() { - sed -i '/xlocale\.h/d' c/expeditor.c - - # Create a dummy git repo and hack out submodules. - # Its presence stops 'configure' from downloading its own versions of nanopass etc. - - mkdir .git - sed -i '/git submodule/s/^/: #/' configure - - rmdir nanopass - mv ../nanopass-framework-scheme-${_nanopass_version} nanopass -} - do_configure() { # Configure such that scheme uses the zlib and lz4 system shared libs. # ZLIB and LZ4 is used when building the scheme kernel and use the full path. From 76a170094b070414938e09ba5a3d67c789ca863e Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 26 Apr 2022 18:41:20 +0200 Subject: [PATCH 1392/2369] cppcheck: update to 2.7.5. --- srcpkgs/cppcheck/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template index 13f7e725600..4c3c71be533 100644 --- a/srcpkgs/cppcheck/template +++ b/srcpkgs/cppcheck/template @@ -1,6 +1,6 @@ # Template file for 'cppcheck' pkgname=cppcheck -version=2.7 +version=2.7.5 revision=1 build_style=gnu-makefile make_build_args=" @@ -18,7 +18,7 @@ license="GPL-3.0-or-later" homepage="http://cppcheck.sourceforge.net" changelog="https://sourceforge.net/p/cppcheck/news/" distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz" -checksum=5fd20549bb2fabf9a8026f772779d8cc6a5782c8f17500408529f7747afbc526 +checksum=6c7ac29e57fa8b3ac7be224510200e579d5a90217e2152591ef46ffc947d8f78 post_install() { vman cppcheck.1 From 99900d33653d946c8452f7f087d9839ad4565c7c Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 26 Apr 2022 14:13:40 +0200 Subject: [PATCH 1393/2369] github-cli: update to 2.9.0 --- srcpkgs/github-cli/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template index 28c6acf2aaf..744f8c4ddb1 100644 --- a/srcpkgs/github-cli/template +++ b/srcpkgs/github-cli/template @@ -1,7 +1,7 @@ # Template file for 'github-cli' pkgname=github-cli -version=2.8.0 -revision=2 +version=2.9.0 +revision=1 wrksrc="cli-${version}" build_style=go build_helper=qemu @@ -13,7 +13,7 @@ license="MIT" homepage="https://cli.github.com" changelog="https://github.com/cli/cli/releases" distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz" -checksum=d4aed3f4325bc518cf4af6fc7989ab35b498e42e8f97ba0e6bb07d7e3b14886a +checksum=730b600d33afb67d84af4dca1af80cb1fbff79d302ac4f840fc8e9e4c25fceb7 pre_build() { local _date From 24378c52eac0f69f15bcec3f23f89b9df02e64a8 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 25 Apr 2022 14:28:55 -0400 Subject: [PATCH 1394/2369] .github/workflows/cycle.yml: fix error message related to git 2.35.2+ --- .github/workflows/cycles.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml index e75297ac937..72c8d83b2c8 100644 --- a/.github/workflows/cycles.yml +++ b/.github/workflows/cycles.yml @@ -28,6 +28,7 @@ jobs: common/travis/prepare.sh - name: Find cycles and open issues run: | + git config --global --add safe.directory "$PWD" common/scripts/xbps-cycles.py | tee cycles grep 'Cycle:' cycles | while read -r line; do if gh issue list -R "$GITHUB_REPOSITORY" -S "$line" | grep .; then From fab132bd117ffb56bdaffd5d8f76627acfe1a6b2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 26 Apr 2022 13:50:36 -0400 Subject: [PATCH 1395/2369] common/travis/fetch_upstream.sh: fix checkout dir --- common/travis/fetch_upstream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh index 5c0256fdbe1..049cfd69e54 100755 --- a/common/travis/fetch_upstream.sh +++ b/common/travis/fetch_upstream.sh @@ -9,7 +9,7 @@ elif command -v git >/dev/null 2>&1; then fi # required by git 2.35.2+ -$GIT_CMD config --global --add safe.directory /__w/void-packages/void-packages +$GIT_CMD config --global --add safe.directory "$PWD" /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m' $GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master From 14d0b54a064c0af0a2f9662d46494fe0655a064f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 23 Apr 2022 13:12:36 +0200 Subject: [PATCH 1396/2369] xbps-src: add flag to build broken packages helps to check if build can be fixed --- common/xbps-src/shutils/common.sh | 33 +++++++++++++++++++++------- common/xbps-src/shutils/pkgtarget.sh | 3 +-- xbps-src | 10 ++++++--- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index 36038af980c..a640528f4d6 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -147,6 +147,23 @@ msg_normal() { fi } +report_broken() { + if [ "$show_problems" = "ignore-problems" ]; then + return + fi + if [ -z "$XBPS_IGNORE_BROKENNESS" ]; then + for line in "$@"; do + msg_red "$line" + done + exit 2 + elif [ "$XBPS_IGNORE_BROKENNESS" != reported ]; then + for line in "$@"; do + msg_warn "$line" + done + XBPS_IGNORE_BROKENNESS=reported + fi +} + msg_normal_append() { [ -n "$NOCOLORS" ] || printf "\033[1m" printf "$@" @@ -644,14 +661,14 @@ setup_pkg() { wrksrc="$XBPS_BUILDDIR/$wrksrc" fi - if [ "$cross" -a "$nocross" -a "$show_problems" != "ignore-problems" ]; then - msg_red "$pkgver: cannot be cross compiled, exiting...\n" - msg_red "$pkgver: $nocross\n" - exit 2 - elif [ "$broken" -a "$show_problems" != "ignore-problems" ]; then - msg_red "$pkgver: cannot be built, it's currently broken; see the build log:\n" - msg_red "$pkgver: $broken\n" - exit 2 + if [ "$cross" -a "$nocross" ]; then + report_broken \ + "$pkgver: cannot be cross compiled...\n" \ + "$pkgver: $nocross\n" + elif [ "$broken" ]; then + report_broken \ + "$pkgver: cannot be built, it's currently broken; see the build log:\n" \ + "$pkgver: $broken\n" fi if [ -n "$restricted" -a -z "$XBPS_ALLOW_RESTRICTED" -a "$show_problems" != "ignore-problems" ]; then diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh index 06fbcd844cc..ba8c63bca8a 100644 --- a/common/xbps-src/shutils/pkgtarget.sh +++ b/common/xbps-src/shutils/pkgtarget.sh @@ -34,8 +34,7 @@ check_pkg_arch() { esac done if [ -z "$nonegation" -a -n "$match" ] || [ -n "$nonegation" -a -z "$match" ]; then - msg_red "${pkgname}-${version}_${revision}: this package cannot be built for ${_arch}.\n" - exit 2 + report_broken "${pkgname}-${version}_${revision}: this package cannot be built for ${_arch}.\n" fi fi } diff --git a/xbps-src b/xbps-src index 47023a72353..dfa059927cc 100755 --- a/xbps-src +++ b/xbps-src @@ -150,6 +150,8 @@ Options: $(print_cross_targets) +-b Build packages even if marked as broken, nocross, or excluded with archs. + -c If specified, etc/conf. will be used as the primary config file name; etc/conf will only be attempted if that does not exist. @@ -360,7 +362,7 @@ readonly XBPS_SRC_VERSION="113" export XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch) XBPS_OPTIONS= -XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qsQKr:tV" +XBPS_OPTSTRING="1a:bc:CEfgGhH:iIj:Lm:No:p:qsQKr:tV" # Preprocess arguments in order to allow options before and after XBPS_TARGET. eval set -- $(getopt "$XBPS_OPTSTRING" "$@"); @@ -372,6 +374,7 @@ while getopts "$XBPS_OPTSTRING" opt; do case $opt in 1) XBPS_ARG_BUILD_ONLY_ONE_PKG=yes; XBPS_OPTIONS+=" -1";; a) XBPS_ARG_CROSS_BUILD="$OPTARG"; XBPS_OPTIONS+=" -a $OPTARG";; + b) XBPS_ARG_IGNORE_BROKENNESS=yes; XBPS_OPTIONS+=" -b";; c) XBPS_ARG_CONFIG="$OPTARG"; XBPS_OPTIONS+=" -c $OPTARG";; C) XBPS_ARG_KEEP_ALL=1; XBPS_OPTIONS+=" -C";; E) XBPS_ARG_BINPKG_EXISTS=1; XBPS_OPTIONS+=" -E";; @@ -463,6 +466,7 @@ fi # Set options passed on command line, after configuration files have been read [ -n "$XBPS_ARG_BUILD_ONLY_ONE_PKG" ] && XBPS_BUILD_ONLY_ONE_PKG=yes +[ -n "$XBPS_ARG_IGNORE_BROKENNESS" ] && XBPS_IGNORE_BROKENNESS=1 [ -n "$XBPS_ARG_SKIP_REMOTEREPOS" ] && XBPS_SKIP_REMOTEREPOS=1 [ -n "$XBPS_ARG_BUILD_FORCEMODE" ] && XBPS_BUILD_FORCEMODE=1 [ -n "$XBPS_ARG_INFORMATIVE_RUN" ] && XBPS_INFORMATIVE_RUN=1 @@ -484,7 +488,7 @@ export XBPS_BUILD_ONLY_ONE_PKG XBPS_SKIP_REMOTEREPOS XBPS_BUILD_FORCEMODE \ XBPS_INFORMATIVE_RUN XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \ XBPS_USE_GIT_REVS XBPS_CHECK_PKGS XBPS_DEBUG_PKGS XBPS_SKIP_DEPS \ XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_CROSS_BUILD \ - XBPS_MAKEJOBS XBPS_PRINT_VARIABLES + XBPS_MAKEJOBS XBPS_PRINT_VARIABLES XBPS_IGNORE_BROKENNESS # The masterdir/hostdir variables are forced and readonly in chroot if [ -z "$IN_CHROOT" ]; then @@ -644,7 +648,7 @@ export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \ XBPS_LIBEXECDIR XBPS_DISTDIR XBPS_DISTFILES_MIRROR XBPS_ALLOW_RESTRICTED \ XBPS_USE_GIT_COMMIT_DATE XBPS_PKG_COMPTYPE XBPS_REPO_COMPTYPE \ XBPS_BUILDHELPERDIR XBPS_USE_BUILD_MTIME XBPS_BUILD_ENVIRONMENT \ - XBPS_PRESERVE_PKGS + XBPS_PRESERVE_PKGS XBPS_IGNORE_BROKENNESS for i in REPOSITORY DESTDIR BUILDDIR SRCDISTDIR; do eval val="\$XBPS_$i" From cd824936ce970ebaefe0ed2c22823eac0eb5306a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 26 Apr 2022 15:31:22 -0400 Subject: [PATCH 1397/2369] .github/workflows/cycles.yml: fix git command detection --- .github/workflows/cycles.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml index 72c8d83b2c8..d57976cbeed 100644 --- a/.github/workflows/cycles.yml +++ b/.github/workflows/cycles.yml @@ -28,7 +28,13 @@ jobs: common/travis/prepare.sh - name: Find cycles and open issues run: | - git config --global --add safe.directory "$PWD" + if command -v chroot-git >/dev/null 2>&1; then + GIT_CMD=$(command -v chroot-git) + elif command -v git >/dev/null 2>&1; then + GIT_CMD=$(command -v git) + fi + # required by git 2.35.2+ + $GIT_CMD config --global --add safe.directory "$PWD" common/scripts/xbps-cycles.py | tee cycles grep 'Cycle:' cycles | while read -r line; do if gh issue list -R "$GITHUB_REPOSITORY" -S "$line" | grep .; then From 0e55b707e6d0a8fd412486cbbfa8808b5363ca7b Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 26 Apr 2022 15:36:00 -0500 Subject: [PATCH 1398/2369] ghidra: update to 10.1.3. --- srcpkgs/ghidra/template | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template index fc41784b2bc..0c8a621cae2 100644 --- a/srcpkgs/ghidra/template +++ b/srcpkgs/ghidra/template @@ -1,8 +1,8 @@ # Template file for 'ghidra' pkgname=ghidra -version=10.1.2 +version=10.1.3 revision=1 -_commit=7d843ec229d43c2d1a8178aaa892be90e37e95a2 +_commit=939210dab2570714944ac35a4daef9633fd842b3 archs="x86_64* aarch64*" # Other 64bit archs should be easily patchable, # grep for linux_arm_64 to find all places in need of patching @@ -28,20 +28,20 @@ distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${ver https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2019_x86.fidb https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x64.fidb https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x86.fidb" -checksum="eac2ed632394f542da82a08578873f01e3890e2917f7d16ccb849f8b114a781c +checksum="b1f8d68ba878a100da5205973e05f604f97c0a1f509150303cc47767a21e02e0 7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc 430fb7901bd0fd52a5b90bd0cbd89e9d334077eb72a9b26896f465de1e593a99 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d - f26548a6df6b6963a418d8c83ac216d9e196b180d944a52b8123c457d472b7c9 - 0a8962cf3699d5b8d4b3a79400382462519edc26570a46b2085200e38534f900 - 187248f87fc1deb695bc3051b2d92f9b7482023a356821154db22478eed13088 - 1d05afa070e9c09b83ee15d544c8559ed0d2b53d7eac476f8f5f8849543b3812 - 1784ad6b25571177ff8212871867559998c6b8256bb1dbaeee864b580c1b2d6a - bc9bf30621190e0eb56c4db5ec30ad0401ca7be0311f5a2ce3d894178eafd19c - aab04eefd1142f7b3c3f86c8d766abe361b167b4fe4157c36fad18777b2a6fbd - 0a2282ac3479ffc022e6cdb4e32e057bc10f0394cfb0f8016d7145be0167f5f7 - fe1856c0acad297d9ba4fb6a2df1d32ba34df766d9f1a2a16da0ca2b375e23dd - 46e56bc82ba68ad4e9a3c6a2e4ecd3428e2c390c7de0a379fa0165a58d46e115" + 80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21 + 8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad + c3c16d23517c233d6950d5d43e34cdfa1b15c1ee2e066c8e9a53b4f75a907a87 + 6fc0a61e935a0060ab33bd6406c9ca5f215ac3dff655f83c18f3d144ad389fe5 + 5b0f8b8dee110d8c54fc27ed808ea28c2c675e95f3809e33eb99f03672741833 + 2a81615d588aa80043f7bc3a35db04580c990c90398e77399fcffc66f053e5ac + 80413b57ae20fc1850d15a401d1cec87ac61b1809a1dafc2fa4403bf2029ec94 + 68b96a4e13ee2c157517636aa1c7841f750fbfc0026188f6123af017f3fa3117 + 2466595f6e74d9599e16095cc61c6de769461c935c20a442db1d2dfd2d7bde9b + 5b97f786eaebc785aaa365f17eb7cc9a1dd2b5a15b277a5229157ea76945fdc1" skip_extraction="AXMLPrinter2.jar vs2012_x64.fidb vs2015_x64.fidb vs2017_x64.fidb vs2019_x64.fidb vsOlder_x64.fidb vsOlder_x86.fidb vs2012_x86.fidb vs2015_x86.fidb vs2017_x86.fidb vs2019_x86.fidb" nopie=yes From bea542b07fa32febf9a434ab7ff980810fd5d072 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 26 Apr 2022 15:37:50 -0500 Subject: [PATCH 1399/2369] jc: update to 1.18.7. --- srcpkgs/jc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template index 20a7438da19..992b2ebc206 100644 --- a/srcpkgs/jc/template +++ b/srcpkgs/jc/template @@ -1,7 +1,7 @@ # Template file for 'jc' pkgname=jc -version=1.18.6 -revision=2 +version=1.18.7 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Pygments python3-ruamel.yaml python3-xmltodict" @@ -11,4 +11,4 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/kellyjonbrazil/jc" distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=5347188ed55762a0325d5d8f6a1ff3ec221b4ad548dee085fadc5fe10366af93 +checksum=eece56f592b04ddd19fb1fbac3ac6f0b27d6a731a05fb902813ccf0c0c78510d From 28ba8f10336608d400273ddd478f6fb30e1845a4 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 23:23:17 +0100 Subject: [PATCH 1400/2369] libvpx: rename subpackages to libvpx6-* --- srcpkgs/{libvpx-devel => libvpx6-devel} | 0 srcpkgs/{libvpx-tools => libvpx6-tools} | 0 srcpkgs/libvpx6/template | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) rename srcpkgs/{libvpx-devel => libvpx6-devel} (100%) rename srcpkgs/{libvpx-tools => libvpx6-tools} (100%) diff --git a/srcpkgs/libvpx-devel b/srcpkgs/libvpx6-devel similarity index 100% rename from srcpkgs/libvpx-devel rename to srcpkgs/libvpx6-devel diff --git a/srcpkgs/libvpx-tools b/srcpkgs/libvpx6-tools similarity index 100% rename from srcpkgs/libvpx-tools rename to srcpkgs/libvpx6-tools diff --git a/srcpkgs/libvpx6/template b/srcpkgs/libvpx6/template index 8084243cc21..a0e31b29ab8 100644 --- a/srcpkgs/libvpx6/template +++ b/srcpkgs/libvpx6/template @@ -4,7 +4,7 @@ pkgname=libvpx6 reverts="1.10.0_1" version=1.9.0 -revision=2 +revision=3 wrksrc=libvpx-${version} hostmakedepends="perl yasm" short_desc="VP8 and VP9 video codec" @@ -44,14 +44,14 @@ do_install() { vlicense LICENSE } -libvpx-tools_package() { +libvpx6-tools_package() { short_desc+=" - tools" pkg_install() { vmove usr/bin } } -libvpx-devel_package() { +libvpx6-devel_package() { depends="libvpx6>=${version}_${revision}" short_desc+=" - development files" pkg_install() { From 13a311489c30fc530af007c9a61023c538d9b24f Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 15:30:50 +0100 Subject: [PATCH 1401/2369] New package: libvpx7-1.11.0 --- common/shlibs | 1 + srcpkgs/libvpx-devel | 1 + srcpkgs/libvpx-tools | 1 + srcpkgs/libvpx7/template | 61 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+) create mode 120000 srcpkgs/libvpx-devel create mode 120000 srcpkgs/libvpx-tools create mode 100644 srcpkgs/libvpx7/template diff --git a/common/shlibs b/common/shlibs index 58db2bb112f..6cba857e95a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -819,6 +819,7 @@ libchamplain-0.12.so.0 libchamplain-0.12.5_2 libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2 libvpx.so.5 libvpx5-1.7.0_1 libvpx.so.6 libvpx6-1.8.0_1 +libvpx.so.7 libvpx7-1.11.0_1 libXevie.so.1 libXevie-1.0.2_1 libatspi.so.0 at-spi2-core-1.91.91_1 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1 diff --git a/srcpkgs/libvpx-devel b/srcpkgs/libvpx-devel new file mode 120000 index 00000000000..c7fce52cd7e --- /dev/null +++ b/srcpkgs/libvpx-devel @@ -0,0 +1 @@ +libvpx7 \ No newline at end of file diff --git a/srcpkgs/libvpx-tools b/srcpkgs/libvpx-tools new file mode 120000 index 00000000000..c7fce52cd7e --- /dev/null +++ b/srcpkgs/libvpx-tools @@ -0,0 +1 @@ +libvpx7 \ No newline at end of file diff --git a/srcpkgs/libvpx7/template b/srcpkgs/libvpx7/template new file mode 100644 index 00000000000..3526e2d2853 --- /dev/null +++ b/srcpkgs/libvpx7/template @@ -0,0 +1,61 @@ +# Template file for 'libvpx7' +# updates generally break abi, so if you update this, +# have fun rebuilding everything +pkgname=libvpx7 +version=1.11.0 +revision=1 +wrksrc=libvpx-${version} +hostmakedepends="perl yasm" +short_desc="VP8 and VP9 video codec" +maintainer="q66 " +license="BSD-3-Clause-Clear" +homepage="http://www.webmproject.org" +distfiles="https://github.com/webmproject/libvpx/archive/v${version}.tar.gz" +checksum=965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83 + +do_configure() { + export LD="$CC" + local target args + + case "$XBPS_TARGET_MACHINE" in + x86_64*) target="x86_64-linux-gcc" ;; + i686*) target="x86-linux-gcc" ;; + armv7*) target="armv7-linux-gcc"; args="--disable-neon" ;; + aarch64*) target="arm64-linux-gcc" ;; + *) target="generic-gnu";; + esac + CFLAGS+=" -fPIC" + + ./configure --enable-vp8 --enable-vp9 \ + --enable-experimental \ + --enable-runtime-cpu-detect --enable-shared \ + --enable-postproc --enable-pic --disable-install-docs \ + --disable-install-srcs --as=yasm ${args} --target=${target} +} + +do_build() { + make ${makejobs} +} + +do_install() { + make DIST_DIR=${DESTDIR}/usr install + vlicense LICENSE +} + +libvpx-tools_package() { + short_desc+=" - tools" + pkg_install() { + vmove usr/bin + } +} + +libvpx-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} From 555c5689a87255a679575abacabf014f3efd8566 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 14:50:31 +0100 Subject: [PATCH 1402/2369] telegram-desktop: update to 3.7.3. --- srcpkgs/telegram-desktop/patches/cross.patch | 11 +++++++++++ srcpkgs/telegram-desktop/template | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 srcpkgs/telegram-desktop/patches/cross.patch diff --git a/srcpkgs/telegram-desktop/patches/cross.patch b/srcpkgs/telegram-desktop/patches/cross.patch new file mode 100644 index 00000000000..47fcb4bbb33 --- /dev/null +++ b/srcpkgs/telegram-desktop/patches/cross.patch @@ -0,0 +1,11 @@ +--- a/cmake/external/kwayland/CMakeLists.txt 2022-04-19 14:57:00.000000000 +0200 ++++ - 2022-04-26 18:18:21.919838146 +0200 +@@ -32,6 +32,8 @@ + -DCMAKE_INSTALL_PREFIX= + -DCMAKE_INSTALL_DATADIR=share + -DBUILD_TESTING=OFF ++ -DQT_HOST_PATH=/usr ++ -DQtWaylandScanner_EXECUTABLE=/usr/lib/qt6/libexec/qtwaylandscanner + BUILD_COMMAND ${CMAKE_COMMAND} --build + COMMAND ${CMAKE_COMMAND} --install + STEP_TARGETS build diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index d778d218ef3..0199fe9ddce 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,6 +1,6 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop -version=3.4.8 +version=3.7.3 revision=1 wrksrc="tdesktop-${version}-full" build_style=cmake @@ -11,23 +11,23 @@ configure_args="-DTDESKTOP_API_ID=209235 -DTDESKTOP_LAUNCHER_BASENAME=org.telegram.desktop.desktop -DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true') -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner - -DDESKTOP_APP_QT6=OFF" -hostmakedepends="pkg-config qt5-qmake qt5-host-tools python extra-cmake-modules - wayland-devel qt5-devel qt5-wayland-devel" + -DQT_HOST_PATH=/usr" +hostmakedepends="pkg-config qt6-base-devel python3 extra-cmake-modules + qt6-wayland-devel wayland-devel" makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel - minizip-devel opus-devel xxHash-devel pulseaudio-devel qt5-devel range-v3 - qt5-svg-devel libva-devel rapidjson liblz4-devel liblzma-devel gtk+3-devel - MesaLib-devel libdbusmenu-qt5-devel qt5-wayland-devel libatomic-devel + minizip-devel opus-devel xxHash-devel pulseaudio-devel range-v3 + qt6-svg-devel libva-devel rapidjson liblz4-devel liblzma-devel gtk+3-devel + MesaLib-devel qt6-wayland-devel qt6-qt5compat-devel libatomic-devel xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel) - kwayland-devel glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel" -depends="qt5-imageformats qt5-svg qt5-core>=5.15.2<5.16.0 ttf-opensans" + glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel" +depends="qt6-imageformats ttf-opensans" short_desc="Telegram Desktop messaging app" maintainer="John " license="GPL-3.0-or-later, OpenSSL" homepage="https://desktop.telegram.org/" changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt" distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz" -checksum=6a962a1110bc15c21999832b0151af8125f33a3b6e978461b8f446217c76876e +checksum=9735f30610ff62b01cbdb0b945d32c494cec245961023c9860d9dd5268b9fe1e build_options="spellcheck" build_options_default="spellcheck" From 23f78fa002d67548e83c1e5e5ffb25ee570bc990 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 12 Mar 2022 23:18:52 +0100 Subject: [PATCH 1403/2369] tg_owt: update to 0.0.0.20220413. --- srcpkgs/tg_owt/template | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template index 6afa56d321e..3022048a7e7 100644 --- a/srcpkgs/tg_owt/template +++ b/srcpkgs/tg_owt/template @@ -1,10 +1,9 @@ # Template file for 'tg_owt' pkgname=tg_owt -version=0.0.0.20211207 +version=0.0.0.20220413 revision=1 -_commit=d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589 +_commit=63a934db1ed212ebf8aaaa20f0010dd7b0d7b396 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452 -_libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9 wrksrc="tg_owt-$_commit" build_style=cmake configure_args="-DBUILD_SHARED_LIBS=OFF -DTG_OWT_ARCH_ARMV7_USE_NEON=OFF" @@ -12,19 +11,18 @@ hostmakedepends="pkg-config yasm protobuf" makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel pipewire-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel libevent-devel libXcomposite-devel libXrandr-devel libXdamage-devel - libXrender-devel libglib-devel" + libepoxy-devel libdrm-devel libXrender-devel libglib-devel libgbm-devel + libvpx-devel" depends="$makedepends" short_desc="WebRTC library for Telegram-desktop" maintainer="John " license="GPL-3.0-or-later" homepage="https://github.com/desktop-app/tg_owt" distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz - https://chromium.googlesource.com/webm/libvpx/+archive/${_libvpx_commit}.tar.gz https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz" -checksum="@693bf80128946881c9dd357218c806c7e98f02daec02e076f1d123d3e6afc525 - @ea967f58e720be3a8f8105d48fedb983570679c8ced8ffbad48fb673089c7ed9 +checksum="@677f3dff8619e8e9e38ece55579ad10a5e162145644ec9afa11ac45dcd96904e @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3" -skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz" +skip_extraction="${_libyuv_commit}.tar.gz" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" @@ -36,5 +34,4 @@ fi post_extract() { bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_libyuv_commit}.tar.gz -C ${wrksrc}/src/third_party/libyuv - bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_libvpx_commit}.tar.gz -C ${wrksrc}/src/third_party/libvpx/source/libvpx } From 7a0c60775de78a02eefa238619e7361248f68546 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:30:57 +0200 Subject: [PATCH 1404/2369] qt6-3d: update to 6.3.0. --- srcpkgs/qt6-3d/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template index 06017e74ef5..666f5755953 100644 --- a/srcpkgs/qt6-3d/template +++ b/srcpkgs/qt6-3d/template @@ -1,6 +1,6 @@ # Template file for 'qt6-3d' pkgname=qt6-3d -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qt3d-everywhere-src-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz" -checksum=ce5088048f151be2dd41600aa1132faa6cf8accfaaf4c40e60572384aef396ad +checksum=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1 qt6-3d-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From a72456fe0abad2fb94fd954a6b84c99113413329 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:30:59 +0200 Subject: [PATCH 1405/2369] qt6-base: update to 6.3.0. --- srcpkgs/qt6-base/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index 3f840bf17c0..1f514441a7e 100644 --- a/srcpkgs/qt6-base/template +++ b/srcpkgs/qt6-base/template @@ -1,7 +1,7 @@ # Template file for 'qt6-base' pkgname=qt6-base -version=6.2.2 -revision=2 +version=6.3.0 +revision=1 wrksrc="qtbase-everywhere-src-${version}" build_style=cmake configure_args="-DINSTALL_DATADIR=share/qt6 @@ -29,7 +29,7 @@ maintainer="John " license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz" -checksum=85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a +checksum=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99 python_version=3 if [ "$CROSS_BUILD" ]; then From 00dd180773576b0ef9aaae103b4901dff6742944 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:00 +0200 Subject: [PATCH 1406/2369] qt6-charts: update to 6.3.0. --- srcpkgs/qt6-charts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template index 0da284b2f9b..79cb8a22040 100644 --- a/srcpkgs/qt6-charts/template +++ b/srcpkgs/qt6-charts/template @@ -1,6 +1,6 @@ # Template file for 'qt6-charts' pkgname=qt6-charts -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtcharts-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz" -checksum=8ffe724433af53a09892cce4e13b242cfcb6c67fef68295b0f29374460f16e7a +checksum=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd qt6-charts-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From e43e955855eda1256b345c78fc9a8c5ddf18548c Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:01 +0200 Subject: [PATCH 1407/2369] qt6-declarative: update to 6.3.0. --- srcpkgs/qt6-declarative/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template index fafd1f1505a..e0bd28d9e38 100644 --- a/srcpkgs/qt6-declarative/template +++ b/srcpkgs/qt6-declarative/template @@ -1,6 +1,6 @@ # Template file for 'qt6-declarative' pkgname=qt6-declarative -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtdeclarative-everywhere-src-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz" -checksum=1a04ef0092b31354e0fded0d8391865719cb58f9ca5dc604da2b1f62c742cf28 +checksum=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37 replaces="qt6-quickcontrols2>=0" if [ "$CROSS_BUILD" ]; then From 700e97a89899d06b91d34bfc5ab11b2ba76bb62f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:02 +0200 Subject: [PATCH 1408/2369] qt6-imageformats: update to 6.3.0. --- srcpkgs/qt6-imageformats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template index db47b21186d..eaca95243c4 100644 --- a/srcpkgs/qt6-imageformats/template +++ b/srcpkgs/qt6-imageformats/template @@ -1,6 +1,6 @@ # Template file for 'qt6-imageformats' pkgname=qt6-imageformats -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtimageformats-everywhere-src-${version}" build_style=cmake @@ -12,4 +12,4 @@ maintainer="John " license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtimageformats-everywhere-src-${version}.tar.xz" -checksum=214f6d552391a70d72ff534295ef06c59dba756b6323762967820963a15bd267 +checksum=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef From e032660deeefa7067d6390f286d652d110bb5133 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:03 +0200 Subject: [PATCH 1409/2369] qt6-location: update to 6.3.0. --- srcpkgs/qt6-location/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template index 9a895b81c63..b7397f5f894 100644 --- a/srcpkgs/qt6-location/template +++ b/srcpkgs/qt6-location/template @@ -1,6 +1,6 @@ # Template file for 'qt6-location' pkgname=qt6-location -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtpositioning-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtpositioning-everywhere-src-${version}.tar.xz" -checksum=26231545eae383089510b236e88bbee8a6d338c06c170b674e8f36a57a0ba09a +checksum=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e qt6-location-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" From 0ac40597d0ef818714a70cba60a72da83d8123cc Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:04 +0200 Subject: [PATCH 1410/2369] qt6-lottie: update to 6.3.0. --- srcpkgs/qt6-lottie/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template index 75a2d476e08..1c97cd5f4f3 100644 --- a/srcpkgs/qt6-lottie/template +++ b/srcpkgs/qt6-lottie/template @@ -1,6 +1,6 @@ # Template file for 'qt6-lottie' pkgname=qt6-lottie -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtlottie-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlottie-everywhere-src-${version}.tar.xz" -checksum=9c2ac91b9f5dc860d211ed9f3c1e3965dbb4665ace4af735e96b6328990fd74f +checksum=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From e600495801c81089e20acd5a994ac0c83f1e543e Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:05 +0200 Subject: [PATCH 1411/2369] qt6-networkauth: update to 6.3.0. --- srcpkgs/qt6-networkauth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template index bc7e7fd8b4c..e934beada9b 100644 --- a/srcpkgs/qt6-networkauth/template +++ b/srcpkgs/qt6-networkauth/template @@ -1,6 +1,6 @@ # Template file for 'qt6-networkauth' pkgname=qt6-networkauth -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtnetworkauth-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtnetworkauth-everywhere-src-${version}.tar.xz" -checksum=c8217c740167b9e96c3fabcc92d781864220c553c7a23254c16bd8f09f05e9e1 +checksum=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From 5be3b67cdbdb6c13ec4246a04f7c4dfffe22b01f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:06 +0200 Subject: [PATCH 1412/2369] qt6-qt5compat: update to 6.3.0. --- srcpkgs/qt6-qt5compat/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template index 5900458ab14..641b746c217 100644 --- a/srcpkgs/qt6-qt5compat/template +++ b/srcpkgs/qt6-qt5compat/template @@ -1,7 +1,7 @@ # Template file for 'qt6-qt5compat' pkgname=qt6-qt5compat -version=6.2.2 -revision=2 +version=6.3.0 +revision=1 wrksrc="qt5compat-everywhere-src-${version}" build_style=cmake configure_args="-DQT_HOST_PATH=/usr" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz" -checksum=a5bb33d9df1d99e5afc21b0d0a36b79aa98829e2b1bee03c811ad69b79276bad +checksum=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From 87346691c39f9d8a5c6ade7aa0575b9bed6aae38 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:08 +0200 Subject: [PATCH 1413/2369] qt6-quick3d: update to 6.3.0. --- common/shlibs | 2 ++ srcpkgs/qt6-quick3d/template | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index 6cba857e95a..60b4402c8bd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2037,6 +2037,8 @@ libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1 libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1 +libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1 +libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1 diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template index 2bafca923be..0f7ef336a3f 100644 --- a/srcpkgs/qt6-quick3d/template +++ b/srcpkgs/qt6-quick3d/template @@ -1,6 +1,6 @@ # Template file for 'qt6-quick3d' pkgname=qt6-quick3d -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtquick3d-everywhere-src-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz" -checksum=be7ef8a36e84cb2f05edfd238d98899478eefbd56a5fecc7d570ce5848b5364b +checksum=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then # possibly a qt6-shadertools bug, actually From 9e5dcc7890751867af81d3da52d7d1b852827b6e Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:09 +0200 Subject: [PATCH 1414/2369] qt6-quicktimeline: update to 6.3.0. --- srcpkgs/qt6-quicktimeline/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template index ad3155c453e..15aa7a8e581 100644 --- a/srcpkgs/qt6-quicktimeline/template +++ b/srcpkgs/qt6-quicktimeline/template @@ -1,6 +1,6 @@ # Template file for 'qt6-quicktimeline' pkgname=qt6-quicktimeline -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquicktimeline-everywhere-src-${version/rc/-rc}.tar.xz" -checksum=939d5479b035f674dd669b3e084ec9688eaea62763d2a7ad134630ff20efd479 +checksum=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From 05c9677bf051dd6e8b8c174efb99b2fec79141a6 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:10 +0200 Subject: [PATCH 1415/2369] qt6-scxml: update to 6.3.0. --- srcpkgs/qt6-scxml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template index eaf992803db..112baca0ab8 100644 --- a/srcpkgs/qt6-scxml/template +++ b/srcpkgs/qt6-scxml/template @@ -1,6 +1,6 @@ # Template file for 'qt6-scxml' pkgname=qt6-scxml -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtscxml-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtscxml-everywhere-src-${version}.tar.xz" -checksum=b71d438c5e4106532cf48833116241bc48c0c4effe617770ae80e34bb77e92ed +checksum=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From 9ed60c9c45cabb99319bcf272a4c4cbc61cd297c Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:11 +0200 Subject: [PATCH 1416/2369] qt6-serialport: update to 6.3.0. --- srcpkgs/qt6-serialport/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template index e4763e3f416..0804671ca57 100644 --- a/srcpkgs/qt6-serialport/template +++ b/srcpkgs/qt6-serialport/template @@ -1,6 +1,6 @@ # Template file for 'qt6-serialport' pkgname=qt6-serialport -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtserialport-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtserialport-everywhere-src-${version}.tar.xz" -checksum=5555aae0332df90c7d955381a758a2b918b6e65e2148da8003c1fb2f9cf9640a +checksum=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f qt6-serialport-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" From 81f685deb556da7e26dc5d39e296543c445b93b1 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:12 +0200 Subject: [PATCH 1417/2369] qt6-shadertools: update to 6.3.0. --- srcpkgs/qt6-shadertools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template index 72cfb47e50a..9c1ec210a96 100644 --- a/srcpkgs/qt6-shadertools/template +++ b/srcpkgs/qt6-shadertools/template @@ -1,6 +1,6 @@ # Template file for 'qt6-shadertools' pkgname=qt6-shadertools -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtshadertools-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz" -checksum=f97505e72358c1fa2a2131c3a9a5b3497a2b9ea65b75a5beaf7f46c4b56a89e5 +checksum=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c qt6-shadertools-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" From 3ed5d7f00a96a8080bc15c1b2a47bd0ddd639ebf Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:13 +0200 Subject: [PATCH 1418/2369] qt6-svg: update to 6.3.0. --- srcpkgs/qt6-svg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template index 51ad5f24aea..aa8e6b74510 100644 --- a/srcpkgs/qt6-svg/template +++ b/srcpkgs/qt6-svg/template @@ -1,6 +1,6 @@ # Template file for 'qt6-svg' pkgname=qt6-svg -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtsvg-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz" -checksum=e1bd63932fa16468bc737a38b0060431f67a6073f4101ede188eb47a191abd75 +checksum=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From f09ea4c3d9246d8967d067fd7d118fa0a5e249dd Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:14 +0200 Subject: [PATCH 1419/2369] qt6-tools: update to 6.3.0. --- srcpkgs/qt6-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template index 768fc552fb7..f875dff5c04 100644 --- a/srcpkgs/qt6-tools/template +++ b/srcpkgs/qt6-tools/template @@ -1,6 +1,6 @@ # Template file for 'qt6-tools' pkgname=qt6-tools -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qttools-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz" -checksum=c0542ecb4a0aec21246a1cb5cd9f8f51b368929ce2065a455b13c3b47a94ecd1 +checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From f73ebb68df8dc7f337cbd7a4275238c5b601f8e8 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:15 +0200 Subject: [PATCH 1420/2369] qt6-translations: update to 6.3.0. --- srcpkgs/qt6-translations/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template index ee844d48b01..be0a74ca74e 100644 --- a/srcpkgs/qt6-translations/template +++ b/srcpkgs/qt6-translations/template @@ -1,6 +1,6 @@ # Template file for 'qt6-translations' pkgname=qt6-translations -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qttranslations-everywhere-src-${version}" build_style=cmake @@ -12,4 +12,4 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttranslations-everywhere-src-${version}.tar.xz" -checksum=fc9244224c6e9930035e7efc8b6b541c739aa4cccf46de9779bc3f64d8e94c8f +checksum=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3 From 759417d250fbc49057f6a4f763d344dccde9e69a Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:16 +0200 Subject: [PATCH 1421/2369] qt6-virtualkeyboard: update to 6.3.0. --- srcpkgs/qt6-virtualkeyboard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template index 1fba027d458..67ecef145ea 100644 --- a/srcpkgs/qt6-virtualkeyboard/template +++ b/srcpkgs/qt6-virtualkeyboard/template @@ -1,6 +1,6 @@ # Template file for 'qt6-virtualkeyboard' pkgname=qt6-virtualkeyboard -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtvirtualkeyboard-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtvirtualkeyboard-everywhere-src-${version}.tar.xz" -checksum=9973c1a703e717936858a8e81eeef1372e6830127f9729013f9da3c2870561a5 +checksum=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From 708890c19bb4014ab1910e27037a278929c6d91a Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:17 +0200 Subject: [PATCH 1422/2369] qt6-wayland: update to 6.3.0. --- srcpkgs/qt6-wayland/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template index a13e6e52ff5..b71a273009b 100644 --- a/srcpkgs/qt6-wayland/template +++ b/srcpkgs/qt6-wayland/template @@ -1,6 +1,6 @@ # Template file for 'qt6-wayland' pkgname=qt6-wayland -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtwayland-everywhere-src-${version}" build_style=cmake @@ -15,7 +15,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwayland-everywhere-src-${version}.tar.xz" -checksum=2d3652b3ecb5d8c9493c938b3d379dd700800859bb19033e8024e29d8deb3618 +checksum=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" From b88eb1605c2e06e77648052db9362e0de4c5515d Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Apr 2022 23:31:18 +0200 Subject: [PATCH 1423/2369] qt6-websockets: update to 6.3.0. --- srcpkgs/qt6-websockets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template index a8a471e485f..c2e674aacb3 100644 --- a/srcpkgs/qt6-websockets/template +++ b/srcpkgs/qt6-websockets/template @@ -1,6 +1,6 @@ # Template file for 'qt6-websockets' pkgname=qt6-websockets -version=6.2.2 +version=6.3.0 revision=1 wrksrc="qtwebsockets-everywhere-src-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebsockets-everywhere-src-${version}.tar.xz" -checksum=8847a8bf0da6741b0bb22883c760037488c2d336fccc8cdb0b4e368f034c2076 +checksum=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361 qt6-websockets-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" From f1b72a7e47814b6f362f504d6a8a3aa9d9c68c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Tue, 26 Apr 2022 19:24:22 +0200 Subject: [PATCH 1424/2369] doctl: update to 1.73.1. --- srcpkgs/doctl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template index e42f75c749f..23fbb957a0b 100644 --- a/srcpkgs/doctl/template +++ b/srcpkgs/doctl/template @@ -1,6 +1,6 @@ # Template file for 'doctl' pkgname=doctl -version=1.73.0 +version=1.73.1 revision=1 build_style=go go_import_path="github.com/digitalocean/doctl/cmd/doctl" @@ -14,4 +14,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=cc7a6f91febf4d40f8afca0fe4ddfa7aa9be3572e3a0124fca2865e35b52ef00 +checksum=cada668df915bf4eaa7ef271ab0920002b2bc7f9b6b3cbd8598481646c52d4e8 From cfe44b4b9fdcd1f5af4a9da133e2e0e6c8e8cc93 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 27 Apr 2022 04:23:40 +0200 Subject: [PATCH 1425/2369] nvme-cli: fix build on musl --- srcpkgs/nvme-cli/patches/musl.patch | 18 ++++++++++++++++++ srcpkgs/nvme-cli/template | 8 +++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/nvme-cli/patches/musl.patch diff --git a/srcpkgs/nvme-cli/patches/musl.patch b/srcpkgs/nvme-cli/patches/musl.patch new file mode 100644 index 00000000000..4ebfba11d38 --- /dev/null +++ b/srcpkgs/nvme-cli/patches/musl.patch @@ -0,0 +1,18 @@ +commit ddf3610e8326d014360c9550d54a73f97b40e862 +Author: q66 +Date: Wed Apr 27 04:20:41 2022 +0200 + + fix build on musl + +diff --git a/util/base64.c b/util/base64.c +index e386c11..dad4492 100644 +--- a/util/base64.c ++++ b/util/base64.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + static const char base64_table[65] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template index 9b142b02de0..d4e7bc89240 100644 --- a/srcpkgs/nvme-cli/template +++ b/srcpkgs/nvme-cli/template @@ -5,7 +5,7 @@ revision=1 build_style=meson configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d" hostmakedepends="pkg-config" -makedepends="libnvme-devel zlib-devel json-c-devel libuuid-devel libhugetlbfs-devel" +makedepends="libnvme-devel zlib-devel json-c-devel libuuid-devel" short_desc="NVMe management command line interface" maintainer="Subhaditya Nath " license="GPL-2.0-only" @@ -14,6 +14,12 @@ distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz" checksum=471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c conf_files="/etc/nvme/*.conf" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libhugetlbfs-devel" +else + CFLAGS="-D_GNU_SOURCE" +fi + post_install() { # remove files that are systemd-only rm -rf "${DESTDIR}/usr/lib/systemd" From b6f1e6a8580a7ee6be8c3ce4826161edf31bd9cd Mon Sep 17 00:00:00 2001 From: atweiden Date: Wed, 27 Apr 2022 04:59:12 +0800 Subject: [PATCH 1426/2369] MoarVM: update to 2022.04. --- srcpkgs/MoarVM/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template index 9386751ab79..e48fd6c8af8 100644 --- a/srcpkgs/MoarVM/template +++ b/srcpkgs/MoarVM/template @@ -1,6 +1,6 @@ # Template file for 'MoarVM' pkgname=MoarVM -version=2022.03 +version=2022.04 revision=1 build_style=configure configure_script="perl Configure.pl" @@ -15,6 +15,6 @@ license="Artistic-2.0" homepage="https://moarvm.org" changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog" distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz" -checksum=fb71cd13912464482b99b33f0c06e9fd7c51a151c6e632a9220cf93c5855fdaf +checksum=ae06f50ba5562721a4e5eb6457e2fea2d07eda63e2abaa8c939c9daf70774804 nocross=yes shlib_provides="libmoar.so" From 4469164269e474524cdb731413276508104106c7 Mon Sep 17 00:00:00 2001 From: atweiden Date: Wed, 27 Apr 2022 05:00:16 +0800 Subject: [PATCH 1427/2369] nqp: update to 2022.04. --- srcpkgs/nqp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template index 52ec0153fe0..4d698dd1aa7 100644 --- a/srcpkgs/nqp/template +++ b/srcpkgs/nqp/template @@ -1,6 +1,6 @@ # Template file for 'nqp' pkgname=nqp -version=2022.03 +version=2022.04 revision=1 build_style=configure make_check_target=test @@ -15,5 +15,5 @@ maintainer="Andy Weidenbaum " license="Artistic-2.0" homepage="https://github.com/Raku/nqp" distfiles="https://rakudo.org/dl/nqp/${pkgname}-${version}.tar.gz" -checksum=a95e778970c4d09c091d2aa299c05036208ce4b4b0d3a7af373198c12258b306 +checksum=556d458e25d3c0464af9f04ea3e92bbde10046066b329188a88663943bd4e79c nocross=yes From e88a2db5a71fd99f1e21fa17ff31664910ea0564 Mon Sep 17 00:00:00 2001 From: atweiden Date: Wed, 27 Apr 2022 05:01:19 +0800 Subject: [PATCH 1428/2369] rakudo: update to 2022.04. --- srcpkgs/rakudo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template index 6a0345b5790..67fd64f1ebb 100644 --- a/srcpkgs/rakudo/template +++ b/srcpkgs/rakudo/template @@ -1,6 +1,6 @@ # Template file for 'rakudo' pkgname=rakudo -version=2022.03 +version=2022.04 revision=1 build_style=configure make_check_target=test @@ -32,7 +32,7 @@ license="Artistic-2.0" homepage="https://rakudo.org" changelog="https://github.com/rakudo/rakudo/raw/master/docs/ChangeLog" distfiles="https://rakudo.org/dl/rakudo/${pkgname}-${version}.tar.gz" -checksum=03e215b001a879747618d6fc18eb7f89c0b812f5e543a43ed66c13439ea8a227 +checksum=7e13a8cc927efbe86b8ff7b19155a60a6f6e2b6e2952bd690dcacef2d02a1c74 nocross=yes provides="raku-${version}_${revision}" From 24e4b97e49d10e030311dc594378f6e28b6c93db Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Mon, 25 Apr 2022 14:48:04 +0300 Subject: [PATCH 1429/2369] gawk: update to 5.1.1. --- srcpkgs/gawk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template index b922097b01f..b5f624bebf4 100644 --- a/srcpkgs/gawk/template +++ b/srcpkgs/gawk/template @@ -1,6 +1,6 @@ # Template file for 'gawk' pkgname=gawk -version=5.1.0 +version=5.1.1 revision=1 build_style=gnu-configure configure_args="--with-readline" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://directory.fsf.org/wiki/Gawk" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=cf5fea4ac5665fd5171af4716baab2effc76306a9572988d5ba1078f196382bd +checksum=d87629386e894bbea11a5e00515fc909dc9b7249529dad9e6a3a2c77085f7ea2 lib32disabled=yes provides="awk-0_1" From 4d933ab12bb584d33a4d42a88f4779368cd31d11 Mon Sep 17 00:00:00 2001 From: zlice Date: Fri, 22 Apr 2022 08:43:08 -0400 Subject: [PATCH 1430/2369] hexedit: update to 1.6. --- srcpkgs/hexedit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hexedit/template b/srcpkgs/hexedit/template index a7840b7a3dd..eb73aa150c1 100644 --- a/srcpkgs/hexedit/template +++ b/srcpkgs/hexedit/template @@ -1,6 +1,6 @@ # Template file for 'hexedit' pkgname=hexedit -version=1.5 +version=1.6 revision=1 build_style=gnu-configure hostmakedepends="automake" @@ -10,7 +10,7 @@ maintainer="Jim Westfall " license="GPL-2.0-or-later" homepage="http://rigaux.org" distfiles="https://github.com/pixel/hexedit/archive/${version}.tar.gz" -checksum=27a2349f659e995d7731ad672450f61a2e950330049a6fb59b77490c5e0015ac +checksum=598906131934f88003a6a937fab10542686ce5f661134bc336053e978c4baae3 pre_configure() { ./autogen.sh From 37e10282c3e7af286bea3aabb7ad4445ccd7de77 Mon Sep 17 00:00:00 2001 From: Karel Balej Date: Sat, 23 Apr 2022 18:26:03 +0200 Subject: [PATCH 1431/2369] texlive-bin: export MANPATH --- srcpkgs/texlive-bin/INSTALL.msg | 18 +++++++++--------- srcpkgs/texlive-bin/files/texlive.sh | 4 +++- srcpkgs/texlive-bin/template | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/srcpkgs/texlive-bin/INSTALL.msg b/srcpkgs/texlive-bin/INSTALL.msg index 72c1e0fe9a3..58930b757fd 100644 --- a/srcpkgs/texlive-bin/INSTALL.msg +++ b/srcpkgs/texlive-bin/INSTALL.msg @@ -1,29 +1,29 @@ -- TeXLive is free software see the files: +- TeX Live is free software see the files: /usr/share/licenses/texlive-bin/LICENSE.TL /usr/share/licenses/texlive-bin/LICENSE.CTAN ===================================================================== - This package sets the location of TeXLive binary using the file: - /etc/profile.d/texlive.sh. + This package sets the location of TeX Live binaries and manual + pages using the file: /etc/profile.d/texlive.sh. see http://www.tug.org/texlive/quickinstall.html for details - Check if your PATH is update correctly with: + Check if your PATH and MANPATH are updated correctly with: $ printenv - You may need to reboot to ensure that PATH is update correctly, - for the impatients, if you want you can type + You may need to reboot to ensure that the paths are updated + correctly, for the impatients, if you want you can type $ source /etc/profile - and check the PATH. + and check PATH and MANPATH. ===================================================================== - To update you TeXLive installation use only the program + To update you TeX Live installation use only the program /opt/texlive/${VERSION}/bin//tlmgr. @@ -37,5 +37,5 @@ for the details and the documentation in - WARNING: To avoid messing up your TeXLive installation, DON'T use + WARNING: To avoid messing up your TeX Live installation, DON'T use the installation scripts in /opt/texlive-installer. diff --git a/srcpkgs/texlive-bin/files/texlive.sh b/srcpkgs/texlive-bin/files/texlive.sh index c868d50fe1e..fdf6faf899c 100644 --- a/srcpkgs/texlive-bin/files/texlive.sh +++ b/srcpkgs/texlive-bin/files/texlive.sh @@ -1,2 +1,4 @@ -#location of the TeXLive binaries +# location of the TeXLive binaries export PATH=$PATH:/opt/texlive/@@VERSION@@/bin/@@ARCH@@ +# and manual pages +export MANPATH=$MANPATH:/opt/texlive/@@VERSION@@/texmf-dist/doc/man diff --git a/srcpkgs/texlive-bin/template b/srcpkgs/texlive-bin/template index 26866c5e584..05c3c33e182 100644 --- a/srcpkgs/texlive-bin/template +++ b/srcpkgs/texlive-bin/template @@ -1,7 +1,7 @@ # Template file for 'texlive-bin' pkgname=texlive-bin version=2022 -revision=1 +revision=2 depends="texlive${version}-bin" short_desc="TeX Live Binary distribution through tl-install (newest version)" maintainer="Leah Neukirchen " From 4426d96aaf1d94015a29c686cde92cf495c4cf30 Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated Date: Sat, 23 Apr 2022 10:59:41 +0200 Subject: [PATCH 1432/2369] iw: update to 5.16. --- srcpkgs/iw/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iw/template b/srcpkgs/iw/template index e82a6792b11..8c63c60873c 100644 --- a/srcpkgs/iw/template +++ b/srcpkgs/iw/template @@ -1,6 +1,6 @@ # Template file for 'iw' pkgname=iw -version=5.9 +version=5.16 revision=1 hostmakedepends="pkg-config libnl3-devel" makedepends="libnl3-devel" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="ISC" homepage="http://wireless.kernel.org/en/users/Documentation/iw" distfiles="http://www.kernel.org/pub/software/network/iw/iw-${version}.tar.xz" -checksum=293a07109aeb7e36267cf59e3ce52857e9ffae3a6666eb8ac77894b1839fe1f2 +checksum=4c44e42762f903f9094ba5a598998c800a97a62afd6fd31ec1e0a799e308659c do_build() { make V=1 CC=$CC ${makejobs} From 50b5891f6563862b9d5927c24bac790669e2bd99 Mon Sep 17 00:00:00 2001 From: Tuxliban Torvalds Date: Sat, 23 Apr 2022 02:48:27 -0500 Subject: [PATCH 1433/2369] telegram-tg: update to 0.19.0 --- srcpkgs/telegram-tg/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/telegram-tg/template b/srcpkgs/telegram-tg/template index 16f22a8419c..49ede65ab6c 100644 --- a/srcpkgs/telegram-tg/template +++ b/srcpkgs/telegram-tg/template @@ -1,7 +1,7 @@ # Template file for 'telegram-tg' pkgname=telegram-tg -version=0.17.0 -revision=3 +version=0.19.0 +revision=1 wrksrc=tg-${version} build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,6 +11,6 @@ maintainer="Orphaned " license="Unlicense" homepage="https://github.com/paul-nameless/tg" distfiles="${PYPI_SITE}/t/tg/tg-${version}.tar.gz" -checksum=aab22b1e40a28710b6e3dbe4f3bba67ff02e36d612d8388f9400e4c34feab221 +checksum=2f1ad2fd1af78e10dfe50663cc9b1f31af531fcd27f630f6a1fc1aa2d5b569cb # There are no tests to run make_check=no From ead4819343faa4270e5425ba782911528ea463ee Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Fri, 22 Apr 2022 17:21:50 +0200 Subject: [PATCH 1434/2369] minizip: update to 1.2.12. --- srcpkgs/minizip/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/minizip/template b/srcpkgs/minizip/template index 7f674f50744..f3938368a13 100644 --- a/srcpkgs/minizip/template +++ b/srcpkgs/minizip/template @@ -1,7 +1,7 @@ # Template file for 'minizip' pkgname=minizip -version=1.2.11 -revision=3 +version=1.2.12 +revision=1 wrksrc="zlib-${version}" build_wrksrc="contrib/${pkgname}" build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="ojab " license="Zlib" homepage="http://www.winimage.com/zLibDll/minizip.html" distfiles="http://www.zlib.net/zlib-${version}.tar.gz" -checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 +checksum=91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9 pre_configure() { autoreconf -i @@ -23,7 +23,6 @@ post_install() { rm ${DESTDIR}/usr/include/minizip/crypt.h } - minizip-devel_package() { short_desc+=" - development files" depends="${sourcepkg}-${version}_${revision}" From 48b654e22ea578f6d34d38c368751b628e1da10d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 27 Apr 2022 13:05:36 +0200 Subject: [PATCH 1435/2369] netpbm: update to 10.98.02. --- srcpkgs/netpbm/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index 61728c4c7d2..91c85332c50 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,9 +1,9 @@ # Template file for 'netpbm' pkgname=netpbm # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY -version=10.98.0.0 +version=10.98.02 revision=1 -_githash=772c4792d998deb70f1719c1a2ad82f2defde5f0 +_githash=5991a720c260e171c145d035014609f18cb2eaf3 _githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79 create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" @@ -16,7 +16,7 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm" homepage="http://netpbm.sourceforge.net/" distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="f53f8e57e1dec64edddec971f13a1cdcbc17d07110e4699b3090de7a79e3f75a +checksum="7ed7fdfc8cae0a11f15ace63715296917a4a1f61017c06f3d09ead2d39d83320 30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde" post_extract() { From 5aa71cdce2b7fc71a7e1f9367e8979fb04b8c204 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 27 Apr 2022 15:46:51 +0200 Subject: [PATCH 1436/2369] linux5.10: update to 5.10.113. --- 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 28935f5c70d..e2bf0b9cae3 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.111 +version=5.10.113 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=1831b3d8765592ce91e51441bb179d908f6bcfe8c78d03c2bec8c675c4a0ab1a +checksum=82516a02bb52456f6e8057217dde6e02b78003b1e058117557c2ae9661696dfc python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR. From 0a34e05795982f3d8c87b9cfa9ea27f6ff21b3ae Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 27 Apr 2022 15:50:44 +0200 Subject: [PATCH 1437/2369] linux5.15: update to 5.15.36. --- 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 9b2bc0aed3f..ae0410039d0 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.34 +version=5.15.36 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 - b1a34733513b1080e763532101def34af73b4ca5e4f9b442c3e7d378a1598088" + a40a27adb37c5ac569428c517f3eb51ce1148258db5b8a42aadb79128197d4a0" skip_extraction="patch-${version}.xz" python_version=3 From 140f2baec3dd964a149edbde9e74ca307e04630a Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 27 Apr 2022 11:17:45 -0400 Subject: [PATCH 1438/2369] dendrite: update to 0.8.2. --- srcpkgs/dendrite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template index fffd933f62c..998442981fc 100644 --- a/srcpkgs/dendrite/template +++ b/srcpkgs/dendrite/template @@ -1,6 +1,6 @@ # Template file for 'dendrite' pkgname=dendrite -version=0.8.1 +version=0.8.2 revision=1 build_style=go go_import_path="github.com/matrix-org/dendrite" @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://matrix.org/docs/projects/server/dendrite" changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md" distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz" -checksum=e26d306b008c9a88da31449e51df4c97e991d99b7954ab130f4fcf00371aa503 +checksum=c09c53964434785d9828482a00e3300a7e54692a0052c71f6a245e147b46cd01 system_accounts="_dendrite" _dendrite_homedir="/var/lib/dendrite" From 697b156c5011cc1df31315b9a8ecf4783417f89c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 27 Apr 2022 22:58:39 +0200 Subject: [PATCH 1439/2369] telegram-desktop: "fix cross" for arm*-musl Still needs proper investigation at why this is only breaking on arm*-musl, and in general some cleanup of qt6 cmake cross --- srcpkgs/telegram-desktop/patches/cross.patch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/srcpkgs/telegram-desktop/patches/cross.patch b/srcpkgs/telegram-desktop/patches/cross.patch index 47fcb4bbb33..e1fef852c39 100644 --- a/srcpkgs/telegram-desktop/patches/cross.patch +++ b/srcpkgs/telegram-desktop/patches/cross.patch @@ -9,3 +9,11 @@ BUILD_COMMAND ${CMAKE_COMMAND} --build COMMAND ${CMAKE_COMMAND} --install STEP_TARGETS build +@@ -83,6 +82,7 @@ + -DCMAKE_PREFIX_PATH=${CMAKE_CURRENT_BINARY_DIR} + -DECM_DIR=${extra_cmake_modules_binary_dir}/share/ECM/cmake + -DPlasmaWaylandProtocols_DIR=${plasma_wayland_protocols_binary_dir}/lib/cmake/PlasmaWaylandProtocols ++ -D_qtpaths_executable=/usr/lib/qt6/bin/qtpaths + STEP_TARGETS build + EXCLUDE_FROM_ALL TRUE + BUILD_BYPRODUCTS /lib/libKF5WaylandClient.a From 65d2afcf0af260f9dbeb1380df8ef332df012145 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:15:17 -0400 Subject: [PATCH 1440/2369] openjdk11: clean up template --- srcpkgs/openjdk11/template | 112 ++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index bd38c0c5c01..a7e3ed176e1 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -1,9 +1,9 @@ # Template file for 'openjdk11' pkgname=openjdk11 version=11.0.12+5 -revision=2 +revision=3 _java_ver="${version%%.*}" -_openjdk_version="openjdk-${_java_ver}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" wrksrc="jdk${_java_ver}u-jdk-${version}" build_style=gnu-configure configure_args=" @@ -32,7 +32,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel" depends="fontconfig" -short_desc="OpenJDK Java Development Kit" +short_desc="OpenJDK Java Development Kit (version ${_java_ver})" maintainer="Kyle Nusbaum " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" @@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk" else hostmakedepends+=" openjdk11" - configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11" + configure_args+=" --with-boot-jdk=/${_jdk_home}" fi alternatives=" - java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java - java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs - java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool - java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200 - java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid - java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry - java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200 + java:/usr/bin/java:/${_jdk_home}/bin/java + java:/usr/bin/jjs:/${_jdk_home}/bin/jjs + java:/usr/bin/keytool:/${_jdk_home}/bin/keytool + java:/usr/bin/pack200:/${_jdk_home}/bin/pack200 + java:/usr/bin/rmid:/${_jdk_home}/bin/rmid + java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry + java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200 - jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc - jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar - jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner - jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java - jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac - jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc - jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap - jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd - jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole - jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb - jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan - jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps - jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb - jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage - jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo - jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs - jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink - jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap - jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod - jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps - jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript - jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell - jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack - jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat - jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd - jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool - jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200 - jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic - jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid - jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry - jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver - jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200 + jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc + jdk:/usr/bin/jar:/${_jdk_home}/bin/jar + jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner + jdk:/usr/bin/java:/${_jdk_home}/bin/java + jdk:/usr/bin/javac:/${_jdk_home}/bin/javac + jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc + jdk:/usr/bin/javap:/${_jdk_home}/bin/javap + jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd + jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole + jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb + jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan + jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps + jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb + jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage + jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo + jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs + jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink + jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap + jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod + jdk:/usr/bin/jps:/${_jdk_home}/bin/jps + jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript + jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell + jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack + jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat + jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd + jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool + jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200 + jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic + jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid + jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry + jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver + jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200 " post_extract() { @@ -151,11 +151,11 @@ do_configure() { } do_install() { - vmkdir usr/lib/jvm/openjdk${_java_ver} - vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}" - vmkdir usr/lib/jvm/$_openjdk_version/lib/security - make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool" - mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/ + vmkdir $_jdk_home + vcopy build/*-normal-*-release/images/jdk/* $_jdk_home + vmkdir $_jdk_home/lib/security + make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool + mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/ chmod -R ugo+rw ./ca rm -Rf ./ca vmkdir etc/profile.d @@ -170,14 +170,14 @@ openjdk11-doc_package() { nostrip=yes noverifyrdeps=yes noshlibprovides=yes - short_desc+=" -- documentation" + short_desc+=" - documentation" pkg_install() { cd ${wrksrc} if [ "$build_option_docs" ]; then vmkdir usr/share/doc/openjdk11 - cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11 + cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11 fi - vmove usr/lib/jvm/openjdk11/man/man1 + vmove $_jdk_home/man/man1 } } @@ -185,17 +185,17 @@ openjdk11-src_package() { nostrip=yes noverifyrdeps=yes noshlibprovides=yes - short_desc+=" -- sources" + short_desc+=" - sources" pkg_install() { - vmove "usr/lib/jvm/openjdk11/lib/src.zip" + vmove $_jdk_home/lib/src.zip } } openjdk11-static-libs_package() { notstrip=yes - short_desc+=" -- static libs" + short_desc+=" - static libs" pkg_install() { - vmkdir usr/lib/jvm/openjdk${_java_ver} - vcopy build/*-normal-*-release/images/static-libs/lib "usr/lib/jvm/openjdk${_java_ver}" + vmkdir $_jdk_home + vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home } } From 070626d3448b810187fcd30b6cc864c62c6cdf22 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:25:32 -0400 Subject: [PATCH 1441/2369] New package: openjdk11-jre-11.0.12+5. --- common/shlibs | 12 +++++------ srcpkgs/openjdk11-jre | 1 + srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------ 3 files changed, 44 insertions(+), 13 deletions(-) create mode 120000 srcpkgs/openjdk11-jre diff --git a/common/shlibs b/common/shlibs index 60b4402c8bd..4114151662f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1811,12 +1811,12 @@ libawt_xawt.so openjdk8-jre-8u20_1 libjava.so openjdk8-jre-8u20_1 libjli.so openjdk8-jre-8u20_1 libjvm.so openjdk8-jre-8u20_1 -libjawt.so openjdk11-11.0.5+10_1 -libawt.so openjdk11-11.0.5+10_1 -libawt_xawt.so openjdk11-11.0.5+10_1 -libjava.so openjdk11-11.0.5+10_1 -libjli.so openjdk11-11.0.5+10_1 -libjvm.so openjdk11-11.0.5+10_1 +libjawt.so openjdk11-jre-11.0.5+10_1 +libawt.so openjdk11-jre-11.0.5+10_1 +libawt_xawt.so openjdk11-jre-11.0.5+10_1 +libjava.so openjdk11-jre-11.0.5+10_1 +libjli.so openjdk11-jre-11.0.5+10_1 +libjvm.so openjdk11-jre-11.0.5+10_1 libjawt.so openjdk7-bootstrap-7u221b02_1 libawt.so openjdk7-bootstrap-7u221b02_1 libawt_xawt.so openjdk7-bootstrap-7u221b02_1 diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre new file mode 120000 index 00000000000..8213494c49e --- /dev/null +++ b/srcpkgs/openjdk11-jre @@ -0,0 +1 @@ +openjdk11 \ No newline at end of file diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index a7e3ed176e1..f0b16258cf9 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel" -depends="fontconfig" +depends="${pkgname}-jre-${version}_${revision}" short_desc="OpenJDK Java Development Kit (version ${_java_ver})" maintainer="Kyle Nusbaum " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559 -provides="java-environment-${version}_1 java-runtime-${version}_1" -shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" +provides="java-environment-${version}_1" # Build is still parallel, but don't use -jN. disable_parallel_build=yes @@ -158,14 +157,45 @@ do_install() { mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/ chmod -R ugo+rw ./ca rm -Rf ./ca - vmkdir etc/profile.d - cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh < Date: Wed, 20 Apr 2022 19:53:06 -0400 Subject: [PATCH 1442/2369] New package: openjdk11-jmods-11.0.12+5 fixes #25183 --- srcpkgs/openjdk11-jmods | 1 + srcpkgs/openjdk11/template | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/openjdk11-jmods diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods new file mode 120000 index 00000000000..8213494c49e --- /dev/null +++ b/srcpkgs/openjdk11-jmods @@ -0,0 +1 @@ +openjdk11 \ No newline at end of file diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index f0b16258cf9..ba11f44a43c 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -161,7 +161,7 @@ do_install() { vlicense LICENSE } -subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs" +subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs" openjdk11-jre_package() { shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" @@ -229,3 +229,11 @@ openjdk11-static-libs_package() { vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home } } + +openjdk11-jmods_package() { + short_desc+=" - JMODs" + depends="${pkgname}-${version}_${revision}" + pkg_install() { + vmove $_jdk_home/jmods + } +} From d30f2f34dd29f2e4bbfa828fb7e5ce8dd0b92091 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 21:24:39 -0400 Subject: [PATCH 1443/2369] openjdk11: disable on armv[56]* fixes #29457 --- srcpkgs/openjdk11/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index ba11f44a43c..f164f5de741 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -44,10 +44,11 @@ provides="java-environment-${version}_1" disable_parallel_build=yes build_options="docs" -# no hotspot JIT for ppc32 case "$XBPS_TARGET_MACHINE" in ppc64*) ;; + # no hotspot JIT for ppc32 ppc*) _use_zero=yes ;; + armv[56]*) broken="Unsupported architecture" ;; esac if [ -n "$_use_zero" ]; then From bb09f3ddb50d960d733c8b2ef6c8957812402358 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Apr 2022 20:14:58 -0400 Subject: [PATCH 1444/2369] openjdk11: update to 11.0.12+7, enable debug. --- srcpkgs/openjdk11/template | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index f164f5de741..711376c1082 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -1,7 +1,7 @@ # Template file for 'openjdk11' pkgname=openjdk11 -version=11.0.12+5 -revision=3 +version=11.0.12+7 +revision=1 _java_ver="${version%%.*}" _jdk_home="usr/lib/jvm/openjdk${_java_ver}" wrksrc="jdk${_java_ver}u-jdk-${version}" @@ -16,14 +16,14 @@ configure_args=" --with-libpng=system --with-lcms=system --with-jtreg=no - --with-native-debug-symbols=none + --with-native-debug-symbols=internal --with-version-pre= - --with-version-opt="void-r$revision" + --with-version-opt=void-r$revision --with-version-build=${version#*+} - --with-vendor-name="Void" - --with-vendor-url="https://voidlinux.org/" - --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues" - --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues"" + --with-vendor-name=Void + --with-vendor-url=https://voidlinux.org/ + --with-vendor-bug-url=https://github.com/void-linux/void-packages/issues + --with-vendor-vm-bug-url=https://github.com/void-linux/void-packages/issues" make_build_args="images static-libs-image $(vopt_if docs docs)" make_check_target="test-hotspot-gtest" hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates @@ -37,7 +37,7 @@ maintainer="Kyle Nusbaum " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" -checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559 +checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a provides="java-environment-${version}_1" # Build is still parallel, but don't use -jN. @@ -72,14 +72,6 @@ else fi alternatives=" - java:/usr/bin/java:/${_jdk_home}/bin/java - java:/usr/bin/jjs:/${_jdk_home}/bin/jjs - java:/usr/bin/keytool:/${_jdk_home}/bin/keytool - java:/usr/bin/pack200:/${_jdk_home}/bin/pack200 - java:/usr/bin/rmid:/${_jdk_home}/bin/rmid - java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry - java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200 - jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc jdk:/usr/bin/jar:/${_jdk_home}/bin/jar jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner From b9e6b8a3dd67c04a2daabe2c24973c49070ceede Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 27 Apr 2022 21:57:06 -0400 Subject: [PATCH 1445/2369] sshuttle: update to 1.1.0. --- srcpkgs/sshuttle/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sshuttle/template b/srcpkgs/sshuttle/template index b029f2575cf..078fd6e6821 100644 --- a/srcpkgs/sshuttle/template +++ b/srcpkgs/sshuttle/template @@ -1,7 +1,7 @@ # Template file for 'sshuttle' pkgname=sshuttle -version=1.0.5 -revision=2 +version=1.1.0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools_scm python3-Sphinx" depends="python3-psutil" @@ -12,7 +12,7 @@ license="LGPL-2.1-or-later" homepage="https://github.com/sshuttle/sshuttle" changelog="https://github.com/sshuttle/sshuttle/raw/master/CHANGES.rst" distfiles="${PYPI_SITE}/s/sshuttle/sshuttle-${version}.tar.gz" -checksum=fd8c691aac2cb80933aae7f94d9d9e271a820efc5c48e73408f1a90da426a1bd +checksum=21fb91bdf392b50e78db6b8d75e95b73ac9dafd361e2657e784e674561219315 post_extract() { # BUG: wrong permissions (https://github.com/sshuttle/sshuttle/issues/217) From 9836c283a4706e5d3e84f0024a852d0ee18acd0f Mon Sep 17 00:00:00 2001 From: slotThe Date: Fri, 18 Mar 2022 17:33:46 +0100 Subject: [PATCH 1446/2369] ghc: update to 9.0.2 --- .../ghc/patches/no-atomic-64-on-32bit.patch | 58 ------- srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 159 ++++++++---------- srcpkgs/ghc/template | 4 +- 3 files changed, 72 insertions(+), 149 deletions(-) delete mode 100644 srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch diff --git a/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch b/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch deleted file mode 100644 index 05ca275ea9d..00000000000 --- a/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 5c5aa87d50dc4ea97e76e13f285a7b5dd71fcd88 Mon Sep 17 00:00:00 2001 -From: Ilias Tsitsimpis -Date: Sun, 1 Mar 2020 16:25:13 +0200 -Subject: [PATCH] Do not define hs_atomic{read,write}64() on non-64bit - -Do not define hs_atomicread64() and hs_atomicwrite64() on machines where -WORD_SIZE_IN_BITS is less than 64, just like we do with the rest of the atomic -functions which work on 64-bit values. - -Without this, compilation fails on MIPSel and PowerPC with the following error: - -/usr/bin/ld: /<>/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3_p.a(atomic.p_o): in function `hs_atomicread64': -atomic.c:(.text.hs_atomicread64+0x8): undefined reference to `__sync_add_and_fetch_8' -/usr/bin/ld: /<>/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3_p.a(atomic.p_o): in function `hs_atomicwrite64': -atomic.c:(.text.hs_atomicwrite64+0x38): undefined reference to `__sync_bool_compare_and_swap_8' - -Fixes #17886. ---- - libraries/ghc-prim/cbits/atomic.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libraries/ghc-prim/cbits/atomic.c b/libraries/ghc-prim/cbits/atomic.c -index ac2e608ec2..01037d70ee 100644 ---- a/libraries/ghc-prim/cbits/atomic.c -+++ b/libraries/ghc-prim/cbits/atomic.c -@@ -361,6 +361,7 @@ hs_atomicread32(StgWord x) - #endif - } - -+#if WORD_SIZE_IN_BITS == 64 - extern StgWord64 hs_atomicread64(StgWord x); - StgWord64 - hs_atomicread64(StgWord x) -@@ -371,6 +372,7 @@ hs_atomicread64(StgWord x) - return __sync_add_and_fetch((StgWord64 *) x, 0); - #endif - } -+#endif - - // AtomicWriteByteArrayOp_Int - // Implies a full memory barrier (see compiler/prelude/primops.txt.pp) -@@ -409,6 +411,7 @@ hs_atomicwrite32(StgWord x, StgWord val) - #endif - } - -+#if WORD_SIZE_IN_BITS == 64 - extern void hs_atomicwrite64(StgWord x, StgWord64 val); - void - hs_atomicwrite64(StgWord x, StgWord64 val) -@@ -420,3 +423,5 @@ hs_atomicwrite64(StgWord x, StgWord64 val) - #endif - } - #endif -+ -+#endif --- -GitLab - diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch index 275444e828b..df1a0bfe15b 100644 --- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch +++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch @@ -1,36 +1,24 @@ -From fd191973558cf4aeb0d5ca107357defd6f837c38 Mon Sep 17 00:00:00 2001 -From: Daniel Kolesa -Date: Tue, 5 Jan 2021 04:10:25 +0100 +From 587edc0d9786aff3c7a4728ba941f6a993e59bdc Mon Sep 17 00:00:00 2001 +From: q66 +Date: Thu, 28 Apr 2022 00:48:04 +0200 Subject: [PATCH] fix up runtime for ppc64 BE ELFv2 + ensure it's used --- - aclocal.m4 | 2 +- configure | 2 +- libraries/ghci/GHCi/InfoTable.hsc | 36 ++++++++++++------------------- - rts/Adjustor.c | 12 +++++------ + m4/fptools.m4 | 2 +- rts/AdjustorAsm.S | 2 +- rts/StgCRun.c | 4 ++-- rts/StgCRunAsm.S | 2 +- - 7 files changed, 26 insertions(+), 34 deletions(-) + rts/adjustor/NativeIA64.c | 2 +- + rts/adjustor/NativePowerPC.c | 2 +- + 8 files changed, 22 insertions(+), 30 deletions(-) -diff --git a/aclocal.m4 b/aclocal.m4 -index 41cecf0..ba08bd2 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -199,7 +199,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V - test -z "[$]2" || eval "[$]2=ArchPPC" - ;; - powerpc64) -- test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V1}\"" -+ test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\"" - ;; - powerpc64le) - test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\"" diff --git a/configure b/configure -index 183e661..8aae1bc 100755 +index 8310e6f..eac1124 100755 --- a/configure +++ b/configure -@@ -10296,7 +10296,7 @@ $as_echo "done" >&6; } +@@ -10508,7 +10508,7 @@ printf "%s\n" "no" >&6; } test -z "$2" || eval "$2=ArchPPC" ;; powerpc64) @@ -40,10 +28,10 @@ index 183e661..8aae1bc 100755 powerpc64le) test -z "$2" || eval "$2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\"" diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc -index ec3c18a..0359be7 100644 +index ad4eb4d..e4f1c0c 100644 --- a/libraries/ghci/GHCi/InfoTable.hsc +++ b/libraries/ghci/GHCi/InfoTable.hsc -@@ -228,30 +228,22 @@ mkJumpToAddr a = case platform of +@@ -231,30 +231,22 @@ mkJumpToAddr' platform a = case platform of , fromIntegral w64 , fromIntegral (w64 `shiftR` 32) ] ArchPPC64 -> @@ -85,103 +73,96 @@ index ec3c18a..0359be7 100644 + in Right [ 0x3D800000 .|. hi16 w32, + 0x618C0000 .|. lo16 w32, + 0x7D8903A6, 0x4E800420 ] - + ArchPPC64LE -> -- The ABI requires r12 to point to the function's entry point. -diff --git a/rts/Adjustor.c b/rts/Adjustor.c -index d360cfe..ab7ede7 100644 ---- a/rts/Adjustor.c -+++ b/rts/Adjustor.c -@@ -49,7 +49,7 @@ Haskell side. - - #if defined(i386_HOST_ARCH) - extern void adjustorCode(void); --#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) -+#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)) - // from AdjustorAsm.s - // not declared as a function so that AIX-style - // fundescs can never get in the way. -@@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t" - extern void obscure_ccall_ret_code(void); - #endif - --#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) -+#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)) - #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS)) - - /* !!! !!! WARNING: !!! !!! -@@ -318,7 +318,7 @@ typedef struct AdjustorStub { - } AdjustorStub; - #endif - --#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) -+#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)) - static int totalArgumentSize(char *typeString) - { - int sz = 0; -@@ -351,7 +351,7 @@ void* - createAdjustor(int cconv, StgStablePtr hptr, - StgFunPtr wptr, - char *typeString --#if !defined(powerpc_HOST_ARCH) && !defined(powerpc64_HOST_ARCH) && !defined(x86_64_HOST_ARCH) -+#if !defined(powerpc_HOST_ARCH) && (!defined(powerpc64_HOST_ARCH) || (_CALL_ELF == 2)) && !defined(x86_64_HOST_ARCH) - STG_UNUSED - #endif - ) -@@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr) - return; - } - freeStablePtr(((StgStablePtr*)ptr)[1]); --#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) -+#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)) - if ( ((AdjustorStub*)ptr)->code != (StgFunPtr) &adjustorCode ) { - errorBelch("freeHaskellFunctionPtr: not for me, guv! %p\n", ptr); - return; +diff --git a/m4/fptools.m4 b/m4/fptools.m4 +index 8c6c9b7..eb25c37 100644 +--- a/m4/fptools.m4 ++++ b/m4/fptools.m4 +@@ -201,7 +201,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS], + test -z "[$]2" || eval "[$]2=ArchPPC" + ;; + powerpc64) +- test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V1}\"" ++ test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\"" + ;; + powerpc64le) + test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\"" diff --git a/rts/AdjustorAsm.S b/rts/AdjustorAsm.S index 2795b83..63cfe91 100644 --- a/rts/AdjustorAsm.S +++ b/rts/AdjustorAsm.S @@ -2,7 +2,7 @@ - + /* ******************************** PowerPC ******************************** */ - + -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)) #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS)) /* The following code applies, with some differences, to all powerpc platforms except for powerpc32-linux, diff --git a/rts/StgCRun.c b/rts/StgCRun.c -index 934926e..2ff8662 100644 +index f43227a..927d44a 100644 --- a/rts/StgCRun.c +++ b/rts/StgCRun.c -@@ -726,7 +726,7 @@ StgRunIsImplementedInAssembler(void) +@@ -724,7 +724,7 @@ StgRunIsImplementedInAssembler(void) Everything is in assembler, so we don't have to deal with GCC... -------------------------------------------------------------------------- */ - + -#if defined(powerpc64_HOST_ARCH) +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2) - - static void GNUC3_ATTRIBUTE(used) - StgRunIsImplementedInAssembler(void) -@@ -851,7 +851,7 @@ StgRunIsImplementedInAssembler(void) - + /* 64-bit PowerPC ELF ABI 1.9 + * + * Stack frame organization (see Figure 3-17, ELF ABI 1.9, p 14) +@@ -792,7 +792,7 @@ StgRunIsImplementedInAssembler(void) + #endif - + -#if defined(powerpc64le_HOST_ARCH) +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2)) /* ----------------------------------------------------------------------------- PowerPC 64 little endian architecture - + diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S -index 9274a44..3b4fc33 100644 +index 60f1bf9..c6794d7 100644 --- a/rts/StgCRunAsm.S +++ b/rts/StgCRunAsm.S @@ -5,7 +5,7 @@ * then functions StgRun/StgReturn are implemented in file StgCRun.c */ #if !defined(USE_MINIINTERPRETER) - + -#if defined(powerpc64le_HOST_ARCH) +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2)) # if defined(linux_HOST_OS) - # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304 - .file "StgCRun.c" + /* 64-bit PowerPC ELF V2 ABI Revision 1.4 + * +diff --git a/rts/adjustor/NativeIA64.c b/rts/adjustor/NativeIA64.c +index 9fd1991..816b3ef 100644 +--- a/rts/adjustor/NativeIA64.c ++++ b/rts/adjustor/NativeIA64.c +@@ -39,7 +39,7 @@ void* + createAdjustor(int cconv, StgStablePtr hptr, + StgFunPtr wptr, + char *typeString +-#if !defined(powerpc_HOST_ARCH) && !defined(powerpc64_HOST_ARCH) && !defined(x86_64_HOST_ARCH) ++#if !defined(powerpc_HOST_ARCH) && (!defined(powerpc64_HOST_ARCH) || (_CALL_ELF == 2)) && !defined(x86_64_HOST_ARCH) + STG_UNUSED + #endif + ) +diff --git a/rts/adjustor/NativePowerPC.c b/rts/adjustor/NativePowerPC.c +index 2e5d605..caef5d3 100644 +--- a/rts/adjustor/NativePowerPC.c ++++ b/rts/adjustor/NativePowerPC.c +@@ -29,7 +29,7 @@ __asm__("obscure_ccall_ret_code:\n\t" + extern void obscure_ccall_ret_code(void); + #endif /* defined(linux_HOST_OS) */ + +-#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH) ++#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)) + #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS)) + + /* !!! !!! WARNING: !!! !!! +-- +2.35.1 + diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template index b8b16f67b43..c4bbb3e4e3b 100644 --- a/srcpkgs/ghc/template +++ b/srcpkgs/ghc/template @@ -1,7 +1,7 @@ # Template file for 'ghc' pkgname=ghc # Keep this synchronized with http://www.stackage.org/lts -version=8.10.7 +version=9.0.2 revision=1 wrksrc="ghc-${version%[!0-9]}" build_style=gnu-configure @@ -14,7 +14,7 @@ maintainer="slotThe " license="BSD-3-Clause" homepage="http://www.haskell.org/ghc/" distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz" -checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d +checksum=140e42b96346322d1a39eb17602bcdc76e292028ad4a69286b230bab188a9197 nocross=yes # this is conditionally unset for cross bindist nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections" _bindir="/usr/lib/${pkgname}-${version}/bin" From 12161ae4ffbb3ca7fac6df03280fb54383499081 Mon Sep 17 00:00:00 2001 From: slotThe Date: Sat, 19 Mar 2022 10:48:13 +0100 Subject: [PATCH 1447/2369] cabal-install: update to 3.6.3.0 Technically, this is only upgrading Cabal (the library) to 3.6.3.0, as the installed version of cabal-install is still 3.6.2.0. This is, however, necessary for GHC 9.x support. --- srcpkgs/cabal-install/files/linux-9.0.2.json | 1 + srcpkgs/cabal-install/template | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/cabal-install/files/linux-9.0.2.json diff --git a/srcpkgs/cabal-install/files/linux-9.0.2.json b/srcpkgs/cabal-install/files/linux-9.0.2.json new file mode 100644 index 00000000000..f3cb6b4aeeb --- /dev/null +++ b/srcpkgs/cabal-install/files/linux-9.0.2.json @@ -0,0 +1 @@ +{"builtin":[{"package":"rts","version":"1.0.2"},{"package":"ghc-prim","version":"0.7.0"},{"package":"ghc-bignum","version":"1.1"},{"package":"base","version":"4.15.1.0"},{"package":"array","version":"0.5.4.0"},{"package":"deepseq","version":"1.4.5.0"},{"package":"bytestring","version":"0.10.12.1"},{"package":"containers","version":"0.6.4.1"},{"package":"binary","version":"0.8.8.0"},{"package":"filepath","version":"1.4.2.1"},{"package":"time","version":"1.9.3"},{"package":"unix","version":"2.7.2.2"},{"package":"directory","version":"1.3.6.2"},{"package":"transformers","version":"0.5.6.2"},{"package":"mtl","version":"2.2.2"},{"package":"ghc-boot-th","version":"9.0.2"},{"package":"pretty","version":"1.1.3.6"},{"package":"template-haskell","version":"2.17.0.0"},{"package":"text","version":"1.2.5.0"},{"package":"parsec","version":"3.1.14.0"},{"package":"process","version":"1.6.13.2"},{"package":"stm","version":"2.5.0.0"}],"dependencies":[{"cabal_sha256":null,"flags":["-bundled-binary-generic"],"package":"Cabal","revision":null,"source":"local","src_sha256":null,"version":"3.6.3.0"},{"cabal_sha256":"714a55fd28d3e2533bd5b49e74f604ef8e5d7b06f249c8816f6c54aed431dcf1","flags":["-optimised-mixer"],"package":"splitmix","revision":0,"source":"hackage","src_sha256":"6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa","version":"0.1.0.4"},{"cabal_sha256":"8bee24dc0c985a90ee78d94c61f8aed21c49633686f0f1c14c5078d818ee43a2","flags":[],"package":"random","revision":0,"source":"hackage","src_sha256":"265c768fc5f2ca53cde6a87e706b4448cad474c3deece933c103f24453661457","version":"1.2.1"},{"cabal_sha256":"3a2beeafb220f9de706568a7e4a5b3c762cc4c9f25c94d7ef795b8c2d6a691d7","flags":["+integer-gmp","-random-initial-seed"],"package":"hashable","revision":1,"source":"hackage","src_sha256":"baaad82cd4271b197016bdbe76f22d5c3d3913fe38534cec7d817db9bae19886","version":"1.3.5.0"},{"cabal_sha256":"b83dec34a53520de84c6dd3dc7aae45d22409b46eb471c478b98108215a370f0","flags":["-bench"],"package":"async","revision":1,"source":"hackage","src_sha256":"484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725","version":"2.2.4"},{"cabal_sha256":"037d70bb091c49f68726dde920f6a003b646835a86cdcb5b5ad58ad9af3207d9","flags":[],"package":"Cabal-syntax","revision":0,"source":"hackage","src_sha256":"ca25e5fc601397565fa857f1aa477740fac7f43d659e77c4d9b1485dca239251","version":"3.6.0.0"},{"cabal_sha256":"d8699f46b485f105eea9c7158f3d432ca578e6bbe5d68751184e9899a41d430d","flags":["-old-bytestring","-old-time"],"package":"tar","revision":4,"source":"hackage","src_sha256":"b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de","version":"0.5.1.1"},{"cabal_sha256":"e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568","flags":["-devel"],"package":"network","revision":0,"source":"hackage","src_sha256":"7f7620fef1a1af3d3d6747f510e73223a5c600e7d7fd9ace073d1222bdc63d85","version":"3.1.2.7"},{"cabal_sha256":"a16dd922947a6877defe52c4c38d1ab48ed3f85a826930f5d1a568741d619993","flags":[],"package":"th-compat","revision":0,"source":"hackage","src_sha256":"6b5059caf6714f47da92953badf2f556119877e09708c14e206b3ae98b8681c6","version":"0.1.3"},{"cabal_sha256":"a4765164ed0a2d1668446eb2e03460ce98645fbf083598c690846af79b7de10d","flags":[],"package":"network-uri","revision":0,"source":"hackage","src_sha256":"57856db93608a4d419f681b881c9b8d4448800d5a687587dc37e8a9e0b223584","version":"2.6.4.1"},{"cabal_sha256":"6042643c15a0b43e522a6693f1e322f05000d519543a84149cb80aeffee34f71","flags":["-conduit10","-mtl1","+network-uri","-warn-as-error","-warp-tests"],"package":"HTTP","revision":1,"source":"hackage","src_sha256":"d6091c037871ac3d08d021c906206174567499d5a26a6cb804cf530cd590fe2d","version":"4000.3.16"},{"cabal_sha256":"64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a","flags":[],"package":"base16-bytestring","revision":0,"source":"hackage","src_sha256":"1d5a91143ef0e22157536093ec8e59d226a68220ec89378d5dcaeea86472c784","version":"1.0.2.0"},{"cabal_sha256":"50ec0e229255d4c45cbdd568da011311b8887f304b931564886016f4984334d8","flags":[],"package":"base64-bytestring","revision":0,"source":"hackage","src_sha256":"fbf8ed30edde271eb605352021431d8f1b055f95a56af31fe2eacf6bdfdc49c9","version":"1.2.1.0"},{"cabal_sha256":"188d0b5a0491e8b686b32d9b144c9287760ba333d2509bf3f17e3d846fbc2332","flags":["-exe","+use-cbits"],"package":"cryptohash-sha256","revision":0,"source":"hackage","src_sha256":"73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6","version":"0.11.102.1"},{"cabal_sha256":"ccce771562c49a2b29a52046ca68c62179e97e8fbeacdae32ca84a85445e8f42","flags":["-example"],"package":"echo","revision":0,"source":"hackage","src_sha256":"c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43","version":"0.1.4"},{"cabal_sha256":"4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee","flags":[],"package":"edit-distance","revision":1,"source":"hackage","src_sha256":"3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a","version":"0.2.2.1"},{"cabal_sha256":"24ac7b5f3d9fa3c2f70262b329f2a75f24e7fd829f88c189b388efa1bcd67eb2","flags":["+no-donna","+test-doctests","+test-hlint","+test-properties"],"package":"ed25519","revision":5,"source":"hackage","src_sha256":"d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d","version":"0.0.5.0"},{"cabal_sha256":"c084c043a40632d3cafcac50fb5eeff84d91edb070a54baa94945f1c976f97c0","flags":["+ofd-locking"],"package":"lukko","revision":2,"source":"hackage","src_sha256":"a80efb60cfa3dae18682c01980d76d5f7e413e191cd186992e1bf7388d48ab1f","version":"0.1.1.3"},{"cabal_sha256":"262a93dbf370be59f4ee57f3b1a51b338bc2c309797daa37c14f2262ae61dae4","flags":["-bundled-c-zlib","-non-blocking-ffi","-pkg-config"],"package":"zlib","revision":1,"source":"hackage","src_sha256":"807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88","version":"0.6.2.3"},{"cabal_sha256":"eb34c3e2fa39f9819293045c03e56148a7125573c1de265cdfe5d967f1d71c6e","flags":["+base48","-cabal-syntax","+lukko","-mtl21","-old-directory","+use-network-uri"],"package":"hackage-security","revision":1,"source":"hackage","src_sha256":"bf22cd16dde7d6b7130463f4d7324b64a2964d9ef3f523df97d7cb98544d64a8","version":"0.6.2.1"},{"cabal_sha256":"2561adac8ce373910948066debe090a22b336b129ba5af18c0332524d16e72ce","flags":[],"package":"regex-base","revision":0,"source":"hackage","src_sha256":"7b99408f580f5bb67a1c413e0bc735886608251331ad36322020f2169aea2ef1","version":"0.94.0.2"},{"cabal_sha256":"b6421e5356766b0c0a78b6094ae2e3a6259b42c147b717283c03c1cb09163dca","flags":["-_regex-posix-clib"],"package":"regex-posix","revision":0,"source":"hackage","src_sha256":"c7827c391919227711e1cff0a762b1678fd8739f9c902fc183041ff34f59259c","version":"0.96.0.1"},{"cabal_sha256":"2088eb9368b920f80bbe4e3b03c3b8484090208f5c3b31645bd67a9ef7d26db4","flags":[],"package":"resolv","revision":4,"source":"hackage","src_sha256":"81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671","version":"0.1.2.0"},{"cabal_sha256":null,"flags":["-debug-conflict-sets","-debug-expensive-assertions","-debug-tracetree","+lukko","+native-dns"],"package":"cabal-install","revision":null,"source":"local","src_sha256":null,"version":"3.6.2.0"}]} \ No newline at end of file diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template index d6d71870999..6a4b0ad7fc0 100644 --- a/srcpkgs/cabal-install/template +++ b/srcpkgs/cabal-install/template @@ -1,6 +1,6 @@ # Template file for 'cabal-install' pkgname=cabal-install -version=3.6.2.0 +version=3.6.3.0 revision=1 wrksrc=cabal-Cabal-v${version} hostmakedepends="ghc curl tar which" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://hackage.haskell.org/package/cabal-install" distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz" -checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64 +checksum=dea086acad6d9fe5fe22d838b95b4e988022e8519f38d41609119ea32bfb7466 nopie_files="/usr/bin/cabal" nocross=yes @@ -19,12 +19,13 @@ post_patch() { case "${XBPS_TARGET_MACHINE}" in i686*) # https://github.com/haskell/cabal/issues/7313 - vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;; + vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-9.0.2.json ;; esac } do_build() { - PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json + cp "${FILESDIR}/linux-9.0.2.json" bootstrap/ + PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-9.0.2.json } do_install() { vbin _build/bin/cabal From 685b2a44f684e86bd5aa7cf9a83a0fa4ac1eaf88 Mon Sep 17 00:00:00 2001 From: slotThe Date: Sat, 19 Mar 2022 12:54:36 +0100 Subject: [PATCH 1448/2369] stack: update stackage resolver to lts-19.0 Related: https://github.com/commercialhaskell/stack/pull/5559 --- srcpkgs/stack/patches/ghc9.0.2.patch | 212 +++++++++++++++++++++++++ srcpkgs/stack/patches/persistent.patch | 46 ++++++ srcpkgs/stack/template | 6 +- 3 files changed, 261 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/stack/patches/ghc9.0.2.patch create mode 100644 srcpkgs/stack/patches/persistent.patch diff --git a/srcpkgs/stack/patches/ghc9.0.2.patch b/srcpkgs/stack/patches/ghc9.0.2.patch new file mode 100644 index 00000000000..bdd77de58c6 --- /dev/null +++ b/srcpkgs/stack/patches/ghc9.0.2.patch @@ -0,0 +1,212 @@ +From cb7e56842a25f93142545fad21306a7c1750fbbf Mon Sep 17 00:00:00 2001 +From: Brandon Chinn +Date: Fri, 4 Jun 2021 16:26:22 -0700 +Subject: [PATCH 1/6] Use Cabal 3.4.0.0 + +--- + stack.yaml | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/stack.yaml b/stack.yaml +index 005bd19f4..9472509be 100644 +--- a/stack.yaml ++++ b/stack.yaml +@@ -20,6 +20,9 @@ flags: + ghc-options: + "$locals": -fhide-source-paths + ++extra-deps: ++- Cabal-3.4.0.0 ++ + drop-packages: + # See https://github.com/commercialhaskell/stack/pull/4712 + - cabal-install + +From 11e11ab0edeba033b40a7fc62434be58dea82ce2 Mon Sep 17 00:00:00 2001 +From: Brandon Chinn +Date: Fri, 4 Jun 2021 16:40:56 -0700 +Subject: [PATCH 2/6] Fix Flag => PackageFlag + +--- + src/Stack/BuildPlan.hs | 2 +- + src/Stack/Package.hs | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/Stack/BuildPlan.hs b/src/Stack/BuildPlan.hs +index 36f82236e..c5c80efc6 100644 +--- a/src/Stack/BuildPlan.hs ++++ b/src/Stack/BuildPlan.hs +@@ -224,7 +224,7 @@ selectPackageBuildPlan platform compiler pool gpd = + flagCombinations :: NonEmpty [(FlagName, Bool)] + flagCombinations = mapM getOptions (genPackageFlags gpd) + where +- getOptions :: C.Flag -> NonEmpty (FlagName, Bool) ++ getOptions :: C.PackageFlag -> NonEmpty (FlagName, Bool) + getOptions f + | flagManual f = (fname, flagDefault f) :| [] + | flagDefault f = (fname, True) :| [(fname, False)] +diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs +index 4db50d2a4..d9bca7af5 100644 +--- a/src/Stack/Package.hs ++++ b/src/Stack/Package.hs +@@ -128,7 +128,7 @@ resolvePackage packageConfig gpkg = + (resolvePackageDescription packageConfig gpkg) + + packageFromPackageDescription :: PackageConfig +- -> [D.Flag] ++ -> [PackageFlag] + -> PackageDescriptionPair + -> Package + packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkgNoMod pkg) = +@@ -935,9 +935,9 @@ resolvePackageDescription packageConfig (GenericPackageDescription desc defaultF + -- | Make a map from a list of flag specifications. + -- + -- What is @flagManual@ for? +-flagMap :: [Flag] -> Map FlagName Bool ++flagMap :: [PackageFlag] -> Map FlagName Bool + flagMap = M.fromList . map pair +- where pair :: Flag -> (FlagName, Bool) ++ where pair :: PackageFlag -> (FlagName, Bool) + pair = flagName &&& flagDefault + + data ResolveConditions = ResolveConditions +@@ -986,7 +986,7 @@ resolveConditions rc addDeps (CondNode lib deps cs) = basic <> children + case v of + OS os -> os == rcOS rc + Arch arch -> arch == rcArch rc +- Flag flag -> ++ PackageFlag flag -> + fromMaybe False $ M.lookup flag (rcFlags rc) + -- NOTE: ^^^^^ This should never happen, as all flags + -- which are used must be declared. Defaulting to + +From 8facd731ec3f2bbc15a083750740929167b33bb2 Mon Sep 17 00:00:00 2001 +From: Brandon Chinn +Date: Fri, 4 Jun 2021 16:55:30 -0700 +Subject: [PATCH 3/6] Fix CabalSpecVersion + +--- + src/Stack/Package.hs | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs +index d9bca7af5..fca039140 100644 +--- a/src/Stack/Package.hs ++++ b/src/Stack/Package.hs +@@ -32,6 +32,7 @@ import Data.List (find, isPrefixOf, unzip) + import qualified Data.Map.Strict as M + import qualified Data.Set as S + import qualified Data.Text as T ++import Distribution.CabalSpecVersion (CabalSpecVersion, cabalSpecMinimumLibraryVersion) + import Distribution.Compiler + import Distribution.ModuleName (ModuleName) + import qualified Distribution.ModuleName as Cabal +@@ -190,7 +191,7 @@ packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkg + (library pkg) + , packageBuildType = buildType pkg + , packageSetupDeps = msetupDeps +- , packageCabalSpec = either orLaterVersion id $ specVersionRaw pkg ++ , packageCabalSpec = orLaterVersion $ mkVersion $ cabalSpecMinimumLibraryVersion $ specVersion pkg + } + where + extraLibNames = S.union subLibNames foreignLibNames +@@ -696,7 +697,7 @@ packageDescModulesAndFiles pkg = do + + -- | Resolve globbing of files (e.g. data files) to absolute paths. + resolveGlobFiles +- :: Version -- ^ cabal file version ++ :: CabalSpecVersion -- ^ cabal file version + -> [String] + -> RIO Ctx (Set (Path Abs File)) + resolveGlobFiles cabalFileVersion = + +From 004f14652409b7d0645215d354b2e599eb7f76bc Mon Sep 17 00:00:00 2001 +From: Brandon Chinn +Date: Fri, 4 Jun 2021 16:55:40 -0700 +Subject: [PATCH 4/6] Fix GenericPackageDescription + +--- + src/Stack/Build.hs | 2 +- + src/Stack/Package.hs | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Stack/Build.hs b/src/Stack/Build.hs +index 23b9a9719..856903bed 100644 +--- a/src/Stack/Build.hs ++++ b/src/Stack/Build.hs +@@ -358,7 +358,7 @@ checkComponentsBuildable lps = + checkSubLibraryDependencies :: HasLogFunc env => [ProjectPackage] -> RIO env () + checkSubLibraryDependencies proj = do + forM_ proj $ \p -> do +- C.GenericPackageDescription _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p ++ C.GenericPackageDescription _ _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p + + let dependencies = concatMap getDeps subLibs <> + concatMap getDeps foreignLibs <> +diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs +index fca039140..39aad4d2f 100644 +--- a/src/Stack/Package.hs ++++ b/src/Stack/Package.hs +@@ -863,7 +863,7 @@ data PackageDescriptionPair = PackageDescriptionPair + resolvePackageDescription :: PackageConfig + -> GenericPackageDescription + -> PackageDescriptionPair +-resolvePackageDescription packageConfig (GenericPackageDescription desc defaultFlags mlib subLibs foreignLibs' exes tests benches) = ++resolvePackageDescription packageConfig (GenericPackageDescription desc _ defaultFlags mlib subLibs foreignLibs' exes tests benches) = + PackageDescriptionPair + { pdpOrigBuildable = go False + , pdpModifiedBuildable = go True + +From 820797b566ef981936907f4d19658259d4a635a8 Mon Sep 17 00:00:00 2001 +From: Brandon Chinn +Date: Fri, 4 Jun 2021 17:01:01 -0700 +Subject: [PATCH 5/6] Fix generatePackageVersionMacros + +--- + src/Stack/Build/Execute.hs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs +index 1e381dd21..aedd7fee5 100644 +--- a/src/Stack/Build/Execute.hs ++++ b/src/Stack/Build/Execute.hs +@@ -1214,7 +1214,7 @@ withSingleContext ActionContext {..} ee@ExecuteEnv {..} task@Task {..} allDeps m + let macroDeps = mapMaybe snd matchedDeps + cppMacrosFile = setupDir relFileSetupMacrosH + cppArgs = ["-optP-include", "-optP" ++ toFilePath cppMacrosFile] +- writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros macroDeps))) ++ writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros (packageVersion package) macroDeps))) + return (packageDBArgs ++ depsArgs ++ cppArgs) + + -- This branch is usually taken for builds, and + +From 336ab515e30f03c274f89ebe1cbc6aa1e597c2a4 Mon Sep 17 00:00:00 2001 +From: Brandon Chinn +Date: Fri, 4 Jun 2021 17:04:16 -0700 +Subject: [PATCH 6/6] Fix ModuleReexport + +--- + src/Stack/Script.hs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs +index 6bb67c049..9ebd2173d 100644 +--- a/src/Stack/Script.hs ++++ b/src/Stack/Script.hs +@@ -18,6 +18,7 @@ import Distribution.Compiler (CompilerFlavor (..)) + import Distribution.ModuleName (ModuleName) + import qualified Distribution.PackageDescription as PD + import qualified Distribution.Types.CondTree as C ++import qualified Distribution.Types.ModuleReexport as ModuleReexport + import Distribution.Types.PackageName (mkPackageName) + import Distribution.Types.VersionRange (withinRange) + import Distribution.System (Platform (..)) +@@ -280,7 +281,7 @@ allExposedModules gpd = do + mlibrary = snd . C.simplifyCondTree checkCond <$> PD.condLibrary gpd + pure $ case mlibrary of + Just lib -> PD.exposedModules lib ++ +- map PD.moduleReexportName (PD.reexportedModules lib) ++ map ModuleReexport.moduleReexportName (PD.reexportedModules lib) + Nothing -> mempty + + -- | The Stackage project introduced the concept of hidden packages, diff --git a/srcpkgs/stack/patches/persistent.patch b/srcpkgs/stack/patches/persistent.patch new file mode 100644 index 00000000000..cf462d7b80c --- /dev/null +++ b/srcpkgs/stack/patches/persistent.patch @@ -0,0 +1,46 @@ +commit 188d7ece06ee06ed6ccaf0df0c46285bd43898f4 +Author: q66 +Date: Thu Apr 28 05:02:09 2022 +0200 + + constrain persistent to fix build + +diff --git a/stack.cabal b/stack.cabal +index dba5bf0..e221321 100644 +--- a/stack.cabal ++++ b/stack.cabal +@@ -281,7 +281,7 @@ library + pantry >=0.5.3, + path >=0.7.0, + path-io >=1.6.3, +- persistent >=2.11.0.4, ++ persistent >=2.11.0.4 && <2.14.0.0, + persistent-sqlite >=2.11.1.0, + persistent-template >=2.9.1.0, + pretty >=1.1.3.6, +@@ -407,7 +407,7 @@ executable stack + pantry >=0.5.3, + path >=0.7.0, + path-io >=1.6.3, +- persistent >=2.11.0.4, ++ persistent >=2.11.0.4 && <2.14.0.0, + persistent-sqlite >=2.11.1.0, + persistent-template >=2.9.1.0, + pretty >=1.1.3.6, +@@ -537,7 +537,7 @@ executable stack-integration-test + pantry >=0.5.3, + path >=0.7.0, + path-io >=1.6.3, +- persistent >=2.11.0.4, ++ persistent >=2.11.0.4 && <2.14.0.0, + persistent-sqlite >=2.11.1.0, + persistent-template >=2.9.1.0, + pretty >=1.1.3.6, +@@ -672,7 +672,7 @@ test-suite stack-test + pantry >=0.5.3, + path >=0.7.0, + path-io >=1.6.3, +- persistent >=2.11.0.4, ++ persistent >=2.11.0.4 && <2.14.0.0, + persistent-sqlite >=2.11.1.0, + persistent-template >=2.9.1.0, + pretty >=1.1.3.6, diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template index 9e53b95ca63..15c38039684 100644 --- a/srcpkgs/stack/template +++ b/srcpkgs/stack/template @@ -1,8 +1,8 @@ # Template file for 'stack' pkgname=stack version=2.7.5 -revision=1 -_stackage="lts-18.14" +revision=2 +_stackage="lts-19.0" hostmakedepends="cabal-install pkg-config unzip" makedepends="zlib-devel pcre-devel" depends="git gmp-devel iana-etc" @@ -13,7 +13,7 @@ homepage="https://haskellstack.org" distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}" checksum="9ddd44c2a62e9404194d69e7dc1c94e707910620316b66d6ac0b3201a8f37e80 - 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f" + 6b9983f6448eb825231f65fe955d6d85516f482f0d26fee84183a1a79c6b0646" skip_extraction="cabal.config-${_stackage}" nocross=yes nopie_files="/usr/bin/stack" From 65a90ff681a08d6ecc9b3a75fbc971e0fb336dc2 Mon Sep 17 00:00:00 2001 From: slotThe Date: Sun, 20 Mar 2022 09:17:26 +0100 Subject: [PATCH 1449/2369] cgrep: bump for stackage lts-19.0 --- srcpkgs/cgrep/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template index e57106f3fa2..1c54fe36739 100644 --- a/srcpkgs/cgrep/template +++ b/srcpkgs/cgrep/template @@ -1,9 +1,9 @@ # Template file for 'cgrep' pkgname=cgrep version=6.7.1 -revision=2 +revision=3 build_style=haskell-stack -stackage="lts-18.15" +stackage="lts-19.0" makedepends="pcre-devel pkg-config" short_desc="Context-aware grep for source codes" maintainer="slotThe " From 4367a8a5b184503aec1c63a49170b3285c1378f8 Mon Sep 17 00:00:00 2001 From: slotThe Date: Sun, 20 Mar 2022 09:23:26 +0100 Subject: [PATCH 1450/2369] git-mediate: bump for stackage lts-19.0 --- srcpkgs/git-mediate/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template index 0c9ec10241e..705df7843b8 100644 --- a/srcpkgs/git-mediate/template +++ b/srcpkgs/git-mediate/template @@ -1,9 +1,9 @@ # Template file for 'git-mediate' pkgname=git-mediate version=1.0.8.1 -revision=2 +revision=3 build_style=haskell-stack -stackage="lts-18.14" +stackage="lts-19.0" depends="git" short_desc="Tool to help resolving git conflicts" maintainer="Peter Wang " From aa20cd782d93e36aa56d6226702578adde95822d Mon Sep 17 00:00:00 2001 From: slotThe Date: Sun, 20 Mar 2022 09:51:34 +0100 Subject: [PATCH 1451/2369] hlint: update to 3.3.6 --- srcpkgs/hlint/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template index fd72c1bbea5..0109be25805 100644 --- a/srcpkgs/hlint/template +++ b/srcpkgs/hlint/template @@ -1,16 +1,16 @@ # Template file for 'hlint' pkgname=hlint -version=3.2.7 -revision=2 +version=3.3.6 +revision=1 build_style=haskell-stack -stackage="lts-18.14" +stackage="lts-19.0" makedepends="ncurses-devel" short_desc="Haskell source code suggestions" maintainer="Inokentiy Babushkin " license="BSD-3-Clause" homepage="https://github.com/ndmitchell/hlint" distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz" -checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e +checksum=7d536c03f77a0c259efb2b00b525ef34578ca8a4a95ccb412708e8c7172e2e6a nocross=yes # Can't yet cross compile Haskell nopie_files="/usr/bin/hlint" From d0994a2f0fe8edf729b45ab38a3aea37fc4279ff Mon Sep 17 00:00:00 2001 From: slotThe Date: Sun, 20 Mar 2022 11:38:44 +0100 Subject: [PATCH 1452/2369] pandoc: update to 2.17.1.1 + Fix compilation of `pandoc-crossref` for musl systems. + Remove the `system-lua` flag, as `pkg-config` already implies it [1]. Related: https://github.com/lierdakil/pandoc-crossref/issues/342 [1]: https://github.com/hslua/hslua/blob/main/lua/README.md?plain=1#L39-L40 --- srcpkgs/pandoc/files/pandoc-crossref.cabal | 154 +++++++++++++++++++++ srcpkgs/pandoc/template | 45 +++--- 2 files changed, 174 insertions(+), 25 deletions(-) create mode 100644 srcpkgs/pandoc/files/pandoc-crossref.cabal diff --git a/srcpkgs/pandoc/files/pandoc-crossref.cabal b/srcpkgs/pandoc/files/pandoc-crossref.cabal new file mode 100644 index 00000000000..7aacc47278f --- /dev/null +++ b/srcpkgs/pandoc/files/pandoc-crossref.cabal @@ -0,0 +1,154 @@ +cabal-version: 2.0 + +-- This file has been generated from package.yaml by hpack version 0.34.6. +-- +-- see: https://github.com/sol/hpack +-- +-- hash: 20655cd6263e9fe7e5737ee81b093c8c6f5eae67e260ddd3a821ac6ef5e35e69 + +name: pandoc-crossref +version: 0.3.13.0 +synopsis: Pandoc filter for cross-references +description: pandoc-crossref is a pandoc filter for numbering figures, equations, tables and cross-references to them. +category: Text +homepage: https://github.com/lierdakil/pandoc-crossref#readme +bug-reports: https://github.com/lierdakil/pandoc-crossref/issues +author: Nikolay Yakimov +maintainer: root@livid.pp.ru +license: GPL-2 +license-file: LICENSE +build-type: Simple + +source-repository head + type: git + location: https://github.com/lierdakil/pandoc-crossref + +flag enable_flaky_tests + description: Some tests rely on specific behaviour of pandoc, which may change between minor versions. These are still useful indicators for the developer, but not necessarily indicating there's a problem with the package itself. Enable if you know what you are doing. + manual: True + default: False + +library + exposed-modules: + Text.Pandoc.CrossRef + other-modules: + Text.Pandoc.CrossRef.References + Text.Pandoc.CrossRef.References.Blocks + Text.Pandoc.CrossRef.References.List + Text.Pandoc.CrossRef.References.Refs + Text.Pandoc.CrossRef.References.Types + Text.Pandoc.CrossRef.Util.CodeBlockCaptions + Text.Pandoc.CrossRef.Util.CustomLabels + Text.Pandoc.CrossRef.Util.Meta + Text.Pandoc.CrossRef.Util.ModifyMeta + Text.Pandoc.CrossRef.Util.Options + Text.Pandoc.CrossRef.Util.Settings + Text.Pandoc.CrossRef.Util.Settings.Gen + Text.Pandoc.CrossRef.Util.Settings.Template + Text.Pandoc.CrossRef.Util.Template + Text.Pandoc.CrossRef.Util.Util + hs-source-dirs: + lib + lib-internal + ghc-options: -Wall + build-depends: + base >=4.11 && <5 + , containers >=0.1 && <0.7 + , data-default >=0.4 && <0.8 + , directory >=1 && <1.4 + , filepath >=1.1 && <1.5 + , microlens >=0.4.12.0 && <0.5.0.0 + , microlens-mtl >=0.2.0.1 && <0.3.0.0 + , microlens-th >=0.4.3.10 && <0.5.0.0 + , mtl >=1.1 && <2.3 + , pandoc >=2.10 && <2.18 + , pandoc-types >=1.21 && <1.23 + , roman-numerals ==0.5.* + , syb >=0.4 && <0.8 + , template-haskell >=2.7.0.0 && <3.0.0.0 + , text >=1.2.2 && <1.3 + , utility-ht >=0.0.11 && <0.1.0 + default-language: Haskell2010 + +executable pandoc-crossref + main-is: pandoc-crossref.hs + other-modules: + ManData + hs-source-dirs: + src + ghc-options: -Wall -threaded + build-depends: + base >=4.11 && <5 + , deepseq ==1.4.* + , gitrev >=1.3.1 && <1.4 + , open-browser ==0.2.* + , optparse-applicative >=0.13 && <0.17 + , pandoc >=2.10 && <2.18 + , pandoc-crossref + , pandoc-types >=1.21 && <1.23 + , template-haskell >=2.7.0.0 && <3.0.0.0 + , temporary >=1.2 && <1.4 + , text >=1.2.2 && <1.3 + default-language: Haskell2010 + +test-suite test-integrative + type: exitcode-stdio-1.0 + main-is: test-integrative.hs + hs-source-dirs: + test + ghc-options: -Wall -fno-warn-unused-do-bind -threaded + build-depends: + base >=4.11 && <5 + , directory >=1 && <1.4 + , filepath >=1.1 && <1.5 + , hspec >=2.4.4 && <3 + , pandoc >=2.10 && <2.18 + , pandoc-crossref + , pandoc-types >=1.21 && <1.23 + , text >=1.2.2 && <1.3 + if flag(enable_flaky_tests) + cpp-options: -DFLAKY + default-language: Haskell2010 + +test-suite test-pandoc-crossref + type: exitcode-stdio-1.0 + main-is: test-pandoc-crossref.hs + other-modules: + Native + Paths_pandoc_crossref + autogen-modules: + Paths_pandoc_crossref + hs-source-dirs: + test + ghc-options: -Wall -fno-warn-unused-do-bind -threaded + build-depends: + base >=4.11 && <5 + , containers >=0.1 && <0.7 + , data-default >=0.4 && <0.8 + , hspec >=2.4.4 && <3 + , microlens >=0.4.12.0 && <0.5.0.0 + , mtl >=1.1 && <2.3 + , pandoc >=2.10 && <2.18 + , pandoc-crossref + , pandoc-types >=1.21 && <1.23 + , text >=1.2.2 && <1.3 + if flag(enable_flaky_tests) + cpp-options: -DFLAKY + default-language: Haskell2010 + +benchmark simple + type: exitcode-stdio-1.0 + main-is: bench-simple.hs + other-modules: + Native + hs-source-dirs: + test + ghc-options: -Wall -fno-warn-unused-do-bind -threaded + build-depends: + base >=4.11 && <5 + , criterion >=1.5.9.0 && <1.6 + , pandoc >=2.10 && <2.18 + , pandoc-crossref + , pandoc-types >=1.21 && <1.23 + , text >=1.2.2 && <1.3 + default-language: Haskell2010 diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template index 8628b1d1f3c..9bdf32ef3c5 100644 --- a/srcpkgs/pandoc/template +++ b/srcpkgs/pandoc/template @@ -1,18 +1,18 @@ # Template file for 'pandoc' pkgname=pandoc # Keep in sync with http://www.stackage.org/lts -version=2.14.0.3 -revision=3 -_sidenote_version=0.20.0.0 +version=2.17.1.1 +revision=1 +_sidenote_version=0.22.1.0 _monad_gen_version=0.3.0.1 _crossref_version=0.3.12.2 _roman_numerals_version=0.5.1.5 create_wrksrc=yes build_style=haskell-stack -stackage="lts-18.14" +stackage="lts-19.0" make_build_args=" - --flag pandoc:embed_data_files --flag=hslua:system-lua - --flag=hslua:pkg-config" + --flag pandoc:embed_data_files + --flag=lua:pkg-config" hostmakedepends="pkg-config unzip wget" makedepends="zlib-devel lua53-devel tar" short_desc="Universal converter between markup formats" @@ -21,33 +21,28 @@ license="GPL-2.0-or-later, BSD-3-Clause" homepage="http://johnmacfarlane.net/pandoc/" distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz https://hackage.haskell.org/package/${pkgname}-sidenote-${_sidenote_version}/${pkgname}-sidenote-${_sidenote_version}.tar.gz - https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz" -checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd - 91f8e96d8470722d677d31d4bbf16c2ac6902567d818ed7a2715bad2617a4cdb - be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465" -subpackages="pandoc-sidenote" + https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz + https://hackage.haskell.org/package/${pkgname}-crossref-${_crossref_version}/${pkgname}-crossref-${_crossref_version}.tar.gz + https://hackage.haskell.org/package/roman-numerals-${_roman_numerals_version}/roman-numerals-${_roman_numerals_version}.tar.gz" +checksum="649ec528d1413130c5ce304b826ff473b3696269eea8834d908589e775bd1ad1 + c39dd7343b9cb4dc5b1c91c9e47c3d357874e9e1a30b8d377bbea0b1d50323b2 + be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465 + 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4 + b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81" +subpackages=" + pandoc-sidenote + pandoc-crossref" nocross=yes nopie_files=" /usr/bin/pandoc - /usr/bin/pandoc-sidenote" - -# pandoc-crossref is currently broken on musl. See lierdakil/pandoc-crossref#342 and commercialhaskell/stack#5683 -if [ "$XBPS_TARGET_LIBC" != "musl" ]; then - distfiles+=" - https://hackage.haskell.org/package/${pkgname}-crossref-${_crossref_version}/${pkgname}-crossref-${_crossref_version}.tar.gz - https://hackage.haskell.org/package/roman-numerals-${_roman_numerals_version}/roman-numerals-${_roman_numerals_version}.tar.gz" - checksum+=" - 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4 - b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81" - nopie_files+=" + /usr/bin/pandoc-sidenote /usr/bin/pandoc-crossref" - subpackages+=" - pandoc-crossref" -fi post_extract() { sed -i 's/tasty .*,/tasty,/' pandoc-*/pandoc.cabal sed -i 's/zip-archive .*,/zip-archive,/' pandoc-*/pandoc.cabal + # See https://github.com/lierdakil/pandoc-crossref/issues/342#issuecomment-1073256586 + cp "${FILESDIR}/pandoc-crossref.cabal" pandoc-crossref-${_crossref_version} } post_install() { From 6ea26d3091ed8cad8202b0594131e267f0d550e6 Mon Sep 17 00:00:00 2001 From: slotThe Date: Sun, 20 Mar 2022 12:15:01 +0100 Subject: [PATCH 1453/2369] shellcheck: bump for stackage lts-19.0 --- srcpkgs/shellcheck/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template index 70eee6c2854..903d703488d 100644 --- a/srcpkgs/shellcheck/template +++ b/srcpkgs/shellcheck/template @@ -1,9 +1,9 @@ # Template file for 'shellcheck' pkgname=shellcheck version=0.8.0 -revision=2 +revision=3 build_style=haskell-stack -stackage="lts-18.14" +stackage="lts-19.0" hostmakedepends="pandoc" short_desc="Static analysis tool for shell scripts" maintainer="Diogo Leal " From 74f2629e844329f702890c226b6de17be2f120e4 Mon Sep 17 00:00:00 2001 From: slotThe Date: Sun, 20 Mar 2022 12:52:11 +0100 Subject: [PATCH 1454/2369] hoogle: update to 5.0.18.3 --- srcpkgs/hoogle/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template index 4c3e8018649..dc487cab401 100644 --- a/srcpkgs/hoogle/template +++ b/srcpkgs/hoogle/template @@ -1,16 +1,16 @@ # Template file for 'hoogle' pkgname=hoogle -version=5.0.18.2 -revision=2 +version=5.0.18.3 +revision=1 build_style=haskell-stack -stackage="lts-18.14" +stackage="lts-19.0" makedepends="zlib-devel" short_desc="Haskell API search engine" maintainer="Inokentiy Babushkin " license="BSD-3-Clause" homepage="https://hoogle.haskell.org/" distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz" -checksum=9f8f0afde52fe602100ab7828fad230c2f5e94050dda9fe1e2a9f0a93f7fe617 +checksum=a2765fcbaf99fe67a64ef29fe50e69fb380cce07807cddeb0836c148b1ae472b nopie_files="/usr/bin/hoogle" nocross=yes # Can't yet cross compile Haskell From 4a06e57bcf89a14d07509d661e9aa0d8bb64b328 Mon Sep 17 00:00:00 2001 From: slotThe Date: Sun, 20 Mar 2022 13:33:12 +0100 Subject: [PATCH 1455/2369] xmobar: update to 0.42 Also enable most flags during compilation in order to be less surprising with regards to what features xmobar supports out of the box. --- srcpkgs/xmobar/files/stack.yaml | 2 +- srcpkgs/xmobar/template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml index 47544eb729d..7e095637414 100644 --- a/srcpkgs/xmobar/files/stack.yaml +++ b/srcpkgs/xmobar/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-18.13 +resolver: lts-19.0 packages: - . extra-deps: diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template index b97c9f268d6..6a12a9ed705 100644 --- a/srcpkgs/xmobar/template +++ b/srcpkgs/xmobar/template @@ -1,7 +1,7 @@ # Template file for 'xmobar' pkgname=xmobar -version=0.39 -revision=2 +version=0.42 +revision=1 build_style=haskell-stack hostmakedepends="pkg-config" makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel @@ -15,10 +15,10 @@ maintainer="xaltsc " license="BSD-3-Clause" homepage="https://xmobar.org" distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc +checksum=53f4a06d79c3db32ef1a498ec7b764b17d03ebf9bca3126c6b8259595492769b build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone xpm uvmeter weather nl80211" -build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm" +build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm alsa mpris mpd dbus" nopie_files="/usr/bin/xmobar" nocross=yes vopt_hflag() { From 8d99857b600510e6e7b2c5f294106b236da79137 Mon Sep 17 00:00:00 2001 From: slotThe Date: Sun, 20 Mar 2022 18:09:34 +0100 Subject: [PATCH 1456/2369] hledger: update to 1.25 --- srcpkgs/hledger/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template index fdcab180a6d..32d39207fd8 100644 --- a/srcpkgs/hledger/template +++ b/srcpkgs/hledger/template @@ -1,8 +1,9 @@ # Template file for 'hledger' pkgname=hledger -version=1.23 -revision=2 +version=1.25 +revision=1 build_style=haskell-stack +stackage="lts-19.0" makedepends="zlib-devel ncurses-devel" short_desc="Simple, precise, plain text accounting" maintainer="Inokentiy Babushkin " @@ -10,7 +11,7 @@ license="GPL-3.0-or-later" homepage="https://hledger.org/" changelog="https://hackage.haskell.org/package/hledger-${version}/changelog" distfiles="https://github.com/simonmichael/${pkgname}/archive/${version}.tar.gz" -checksum=7252d78aafbae488b113a6350518a702186cacc4e746cec2b31f8321b4dddcb4 +checksum=4c947c2a7d243d2a56efc1fa02994a118e995df025a412f6d2daeadfd78338ee nopie_files="/usr/bin/hledger" nocross=yes # Can't yet cross compile Haskell From c5b271e7fc50f0b5a09125e4eb0d23581965cbbc Mon Sep 17 00:00:00 2001 From: slotThe Date: Mon, 21 Mar 2022 08:19:29 +0100 Subject: [PATCH 1457/2369] haskell-language-server: update to 1.6.1.0 --- srcpkgs/haskell-language-server/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template index 0182c9b9575..0c7b2187c5c 100644 --- a/srcpkgs/haskell-language-server/template +++ b/srcpkgs/haskell-language-server/template @@ -1,16 +1,16 @@ # Template file for 'haskell-language-server' pkgname=haskell-language-server -version=1.4.0 +version=1.6.1.0 revision=1 build_style="haskell-stack" -make_build_args="--stack-yaml stack-8.10.7.yaml" +make_build_args="--stack-yaml stack-9.0.2.yaml" makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel" short_desc="Integration of ghcide and haskell-ide-engine" maintainer="Wayne Van Son " license="Apache-2.0" homepage="https://github.com/haskell/haskell-language-server" distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz" -checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0 +checksum=e5c336ad2de8d021c882cdac5bbc26bf6427df8d2a5bd244c05cf18296a9bfdc nopie_files=" /usr/bin/haskell-language-server /usr/bin/haskell-language-server-wrapper From 8361206fffcd641f73850d066d636e904b0c091d Mon Sep 17 00:00:00 2001 From: slotThe Date: Mon, 21 Mar 2022 15:48:58 +0100 Subject: [PATCH 1458/2369] git-annex: update to 10.20220222 --- srcpkgs/git-annex/files/stack.yaml | 33 ++++++++++++++++++++++++++++++ srcpkgs/git-annex/template | 5 +++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/git-annex/files/stack.yaml diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml new file mode 100644 index 00000000000..4935307f48c --- /dev/null +++ b/srcpkgs/git-annex/files/stack.yaml @@ -0,0 +1,33 @@ +flags: + git-annex: + production: true + assistant: true + pairing: true + torrentparser: true + webapp: true + magicmime: false + dbus: false + debuglocks: false + benchmark: true + networkbsd: true + gitlfs: true + httpclientrestricted: true +packages: + - '.' +resolver: lts-19.0 +extra-deps: + - IfElse-0.85 + - aws-0.22 + - bloomfilter-2.0.1.0 + - git-lfs-1.2.0 + - http-client-restricted-0.0.4 + - network-multicast-0.3.2 + - sandi-0.5 + - torrent-10000.1.1 + - base16-bytestring-0.1.1.7 + - base64-bytestring-1.0.0.3 + - bencode-0.6.1.1 + - aeson-1.5.6.0@sha256:5003bb6fd260d2e2d5a51dee2bf5c8e8f29e4e0e0288fef805c22dcc80ecab06,6788 + - http-client-0.7.11@sha256:3f59ac8ffe2a3768846cdda040a0d1df2a413960529ba61c839861c948871967,5756 +explicit-setup-deps: + git-annex: true diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template index 1cf2ab14789..7b788bc5861 100644 --- a/srcpkgs/git-annex/template +++ b/srcpkgs/git-annex/template @@ -1,8 +1,9 @@ # Template file for 'git-annex' pkgname=git-annex -version=8.20211028 +version=10.20220222 revision=1 build_style=haskell-stack +stackage="lts-19.0" makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel lsof rsync git ncurses-devel" # depends are utilities required by git-annex @@ -12,7 +13,7 @@ maintainer="Evan Deaubl " license="AGPL-3.0-or-later, MIT, BSD-2-Clause, GPL-3.0-or-later, custom:Expat, custom:MIT-twitter, GPL-2.0-only, custom:icon-license" homepage="http://git-annex.branchable.com" distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d +checksum=1fb9f75a83feb16f7515122135c0f3abe6aa77544d8d778792296cbc053d2c85 nopie_files="/usr/bin/git-annex" nocross=yes From 98f8bde947d38773a52ef57e6f90dfb8e048d86a Mon Sep 17 00:00:00 2001 From: slotThe Date: Wed, 23 Mar 2022 09:14:58 +0100 Subject: [PATCH 1459/2369] darcs: bump for stackage lts-19.0 --- srcpkgs/darcs/files/stack.yaml | 7 ++----- srcpkgs/darcs/template | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml index 5ae0f5313b8..6e459703764 100644 --- a/srcpkgs/darcs/files/stack.yaml +++ b/srcpkgs/darcs/files/stack.yaml @@ -1,7 +1,4 @@ -resolver: lts-18.14 +resolver: lts-19.0 packages: - . -extra-deps: -- graphviz-2999.20.1.0 -- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322 -- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163 +allow-newer: true diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template index f9fcac534d4..15a8f71f902 100644 --- a/srcpkgs/darcs/template +++ b/srcpkgs/darcs/template @@ -1,7 +1,7 @@ # Template file for 'darcs' pkgname=darcs version=2.16.5 -revision=2 +revision=3 build_style=haskell-stack hostmakedepends="unzip" makedepends="zlib-devel libcurl-devel ncurses-devel" From 7a32a52ad0a7f1f68d0505072db68d6878a7d763 Mon Sep 17 00:00:00 2001 From: slotThe Date: Thu, 24 Mar 2022 11:50:45 +0100 Subject: [PATCH 1460/2369] debug-me: update to 1.20220324 --- srcpkgs/debug-me/files/stack.yaml | 8 +++--- srcpkgs/debug-me/patches/ghc8.10.4.patch | 33 ------------------------ srcpkgs/debug-me/template | 7 ++--- 3 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/debug-me/patches/ghc8.10.4.patch diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml index ad8b055bb33..f2b1a79d70c 100644 --- a/srcpkgs/debug-me/files/stack.yaml +++ b/srcpkgs/debug-me/files/stack.yaml @@ -1,8 +1,6 @@ packages: - '.' -resolver: lts-18.14 +resolver: lts-19.0 extra-deps: -- posix-pty-0.2.1.1 -- graphviz-2999.20.1.0 -- sandi-0.5 -- protobuf-0.2.1.3@sha256:d8ed3c73027c6b7e7583c6a94ee1835beee8a755a875b06bbf51bc667d53ab69,3048 + - posix-pty-0.2.1.1 + - sandi-0.5@sha256:b278d072ca717706ea38f9bd646e023f7f2576a778fb43565b434f93638849aa,3010 diff --git a/srcpkgs/debug-me/patches/ghc8.10.4.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch deleted file mode 100644 index bfcff16a443..00000000000 --- a/srcpkgs/debug-me/patches/ghc8.10.4.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/Val.hs 2020-03-31 11:00:33.329814064 +0200 -+++ b/Val.hs 2020-03-31 11:00:24.602711845 +0200 -@@ -42,7 +42,7 @@ - b64 :: B.ByteString -> T.Text - b64 = T.decodeUtf8 . B64.encode - --unb64 :: Monad m => T.Text -> m B.ByteString -+unb64 :: MonadFail m => T.Text -> m B.ByteString - unb64 t = either - (\_ -> fail "bad base64 data") - return ---- a/Server.hs 2020-03-31 12:53:45.860509650 +0200 -+++ b/Server.hs 2020-03-31 12:52:34.873835069 +0200 -@@ -105,7 +105,7 @@ - -- (Workaround for - -- https://github.com/jaspervdj/websockets/issues/140) - setHost "*6" $ -- setPort (serverPort o) $ -+ setPort (CmdLine.serverPort o) $ - defaultSettings - - checkEnv :: ServerOpts -> IO ServerOpts ---- a/debug-me.cabal -+++ b/debug-me.cabal -@@ -64,7 +64,7 @@ - , stm-chans (>= 3.0) - , posix-pty (>= 0.2.1) - , terminal-size (>= 0.3) -- , aeson (>= 0.11 && < 1.5) -+ , aeson (>= 0.11 && < 1.6) - , sandi (>= 0.4) - , text (>= 1.2.2) - , optparse-applicative (>= 0.12) diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template index 86ac0037311..f971f2156c7 100644 --- a/srcpkgs/debug-me/template +++ b/srcpkgs/debug-me/template @@ -1,15 +1,16 @@ # Template file for 'debug-me' pkgname=debug-me -version=1.20200820 -revision=3 +version=1.20220324 +revision=1 build_style=haskell-stack +stackage="lts-19.0" makedepends="zlib-devel" short_desc="Secure remote debugging" maintainer="Dominic Monroe " license="AGPL-3.0-or-later" homepage="https://debug-me.branchable.com/" distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz" -checksum=9497dc9b85a58e5c499ea25fa1bed9f4fd6cdd2f57564f52a0e4152ad4fdc102 +checksum=9fd6256aa34408106ff095e0560850aca3558a774be4ce19de6ab6e81fbfdb9f nocross=yes # Can't yet cross compile Haskell nopie_files="/usr/bin/debug-me" From b6e43cbe8f2d34cc4fc05163ccc51a54c69414c4 Mon Sep 17 00:00:00 2001 From: slotThe Date: Fri, 25 Mar 2022 14:40:52 +0100 Subject: [PATCH 1461/2369] ghc-bin: update to 9.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sigrid Solveig Haflínudóttir --- srcpkgs/ghc-bin/template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template index 3949ee3fa1a..d05dcd821f3 100644 --- a/srcpkgs/ghc-bin/template +++ b/srcpkgs/ghc-bin/template @@ -1,6 +1,6 @@ # Template file for 'ghc-bin' pkgname=ghc-bin -version=8.10.7 +version=9.0.2 revision=1 archs="i686 x86_64* ppc64le* ppc64" wrksrc="ghc-${version%[!0-9]}" @@ -15,29 +15,29 @@ noshlibprovides=yes conflicts="ghc>=0 ghc-doc>=0" case "$XBPS_TARGET_MACHINE" in x86_64) - distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz" - checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23 + distfiles="https://downloads.haskell.org/ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz" + checksum=805f5628ce6cec678ba77ff48c924831ebdf75ec2c66368e8935a618913a150e ;; x86_64-musl) # create with "make binary-dist" distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz" - checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50 + checksum=e21eaddeffcd5de7abe43b1f3982a3bc2c5b5f408d2574857cb2b0368106e12c ;; i686) - distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz" - checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab + distfiles="https://downloads.haskell.org/ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz" + checksum=fdeb9f8928fbe994064778a8e1e85bb1a58a6cd3dd7b724fcc2a1dcfda6cad47 ;; ppc64le) distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz" - checksum=4662c88bc642941d9d463fd4878fc799e081c6fc5b10d2df5fa48e0cadea888c + checksum=7de8114c991f9a2a3b0f5e472da76e3956be6447efec4b1157f14e707049f22d ;; ppc64le-musl) distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux-musl.tar.xz" - checksum=c01b2d9d4c7b05a62f79b24e374413ac524116cbe5fb7c20673d62b8c3eebf10 + checksum=37de8e069712307c9b2039e92f56e540e80ca1390dd27aa247ebe18c40e0c629 ;; ppc64) distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz" - checksum=b8578e602abd4b453845303fb9cfed0b2186f86f60e3aa45869026ea833726c8 + checksum=6eb8684fdbede0cded7e3f7b93574b968f5f66dd2fcd4ec30ac5f0c402af6602 ;; *) broken="No distfiles available for this target" From 1c135efa57cd4fb5bca1287e9a04d8a52bc0f48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?= Date: Thu, 24 Mar 2022 09:27:25 +0100 Subject: [PATCH 1462/2369] ghc, ghc-bin: Add aarch64* support --- srcpkgs/ghc-bin/template | 12 +++++++++++- srcpkgs/ghc/template | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template index d05dcd821f3..996be0fb5f5 100644 --- a/srcpkgs/ghc-bin/template +++ b/srcpkgs/ghc-bin/template @@ -2,7 +2,7 @@ pkgname=ghc-bin version=9.0.2 revision=1 -archs="i686 x86_64* ppc64le* ppc64" +archs="i686 x86_64* ppc64le* ppc64 aarch64*" wrksrc="ghc-${version%[!0-9]}" hostmakedepends="perl libffi libnuma" depends="ncurses perl gcc libffi-devel gmp-devel" @@ -39,6 +39,16 @@ ppc64) distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz" checksum=6eb8684fdbede0cded7e3f7b93574b968f5f66dd2fcd4ec30ac5f0c402af6602 ;; +aarch64) + distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux.tar.xz" + checksum=44a20a896246dce64392b7d0feedd0a28a9d733245a803e95dbe4b4b7e15b4fd + depends+=" llvm" + ;; +aarch64-musl) + distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux-musl.tar.xz" + checksum=de98e2ff33a25cb32a28c738066fecacb736a33cac12688876eec4eb96d88607 + depends+=" llvm" + ;; *) broken="No distfiles available for this target" ;; diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template index c4bbb3e4e3b..d0b1600987b 100644 --- a/srcpkgs/ghc/template +++ b/srcpkgs/ghc/template @@ -54,6 +54,14 @@ elif [ "${XBPS_MACHINE%-*}" != "${XBPS_TARGET_MACHINE%-*}" ]; then configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET}" fi +case "$XBPS_TARGET_MACHINE" in +aarch64*) + # GHC uses LLVM to generate code on aarch64 + hostmakedepends+=" llvm" + depends+=" llvm" + ;; +esac + # Recent safe to use tarball # GHC's bundled tarball is from 2017, buggy on some archs _ffi_rev=4d6d2866ae43e55325e8ee96561221804602cd7a From 78955200f6135f8c8d91de594493971770b41c26 Mon Sep 17 00:00:00 2001 From: slotThe Date: Thu, 24 Mar 2022 14:27:41 +0100 Subject: [PATCH 1463/2369] kmonad: update to 65b501defdd0049563752f8af8c8c57f5a1ae38b The reason for updating to an unreleased version is that the author (and core maintainer) of the project is chronically ill[1] and unable to spend a lot of time on kmonad. At the same time, there is a rather large refactor on the way, without which a new release would not make too much sense[2]. As such, updating to what's essentially HEAD makes sense in this case; it is not any less stable than 0.4.1 (I've personally been running this for months without any problems). As a bonus, we get GHC 9.0.2 compatibility for free and do not need to cherry pick the relevant commits. [1]: https://github.com/kmonad/kmonad#disclaimer [2]: https://github.com/kmonad/kmonad/pull/372 --- srcpkgs/kmonad/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template index c93d2bee4c4..829d96a535e 100644 --- a/srcpkgs/kmonad/template +++ b/srcpkgs/kmonad/template @@ -1,15 +1,15 @@ # Template file for 'kmonad' pkgname=kmonad -version=0.4.1 -revision=3 +version=65b501defdd0049563752f8af8c8c57f5a1ae38b +revision=1 build_style=haskell-stack -stackage=lts-18.14 +stackage=lts-19.0 short_desc="Keyboard remapping utility providing qmk-like functionality" maintainer="slotThe " license="MIT" homepage="https://github.com/david-janssen/kmonad" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=cb66f0c6d4c304c7e3c48cefd0c50ea00b156ffc361e278e1fc5c6070317d927 +checksum=2b0cb0c5d1575bf61b1c442476ad24103028c309d103fedb56214a3bb30f8c0f nopie_files="/usr/bin/kmonad" nocross=yes From e0b50261cf18f74cdeb75f1f018c7ca171778822 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 28 Apr 2022 15:23:36 +0200 Subject: [PATCH 1464/2369] minify: update to 2.11.2. --- srcpkgs/minify/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template index 7131527fa00..9be3e9620c4 100644 --- a/srcpkgs/minify/template +++ b/srcpkgs/minify/template @@ -1,6 +1,6 @@ # Template file for 'minify' pkgname=minify -version=2.11.1 +version=2.11.2 revision=1 build_style=go go_import_path="github.com/tdewolff/minify/v2" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/tdewolff/minify" distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz" -checksum=f238ffcb9ed6ff3c413442e3c5bfe9409809cc3de67db29ebc541d83168a09ea +checksum=de1bcdf33c8bb3fafa2286f71d28c4639dcba044dae1707232eb53ed6980a33a post_install() { vlicense LICENSE From 0df0b27e604123d14d08dcc905e1bb1fcf043d99 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 28 Apr 2022 15:24:56 +0200 Subject: [PATCH 1465/2369] xrootconsole: update to 0.6.5. --- srcpkgs/xrootconsole/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xrootconsole/template b/srcpkgs/xrootconsole/template index 029212328a2..a9ee30ed075 100644 --- a/srcpkgs/xrootconsole/template +++ b/srcpkgs/xrootconsole/template @@ -1,7 +1,7 @@ # Template file for 'xrootconsole' pkgname=xrootconsole reverts=0.6r3_3 -version=0.6.4 +version=0.6.5 revision=1 create_wrksrc=yes build_wrksrc="xrootconsole-${version%.*}" @@ -14,7 +14,7 @@ homepage="https://packages.debian.org/source/sid/xrootconsole" distfiles="${DEBIAN_SITE}/main/x/xrootconsole/xrootconsole_${version%.*}.orig.tar.gz ${DEBIAN_SITE}/main/x/xrootconsole/xrootconsole_${version%.*}-${version##*.}.debian.tar.xz" checksum="8306de6f4d3f39677334ee65214e46729cf2dd89aeff1705df3c499738a4076d - 4d9429c1588d3be7b47eeba6f06371184e71562a439ec9fcacc340776b845f41" + 332e080e61f02290454147f14624a94803e4664a996271cfab124633b48f9bcf" post_extract() { for p in debian/patches/*.patch; do From d038f370cf6729468d2154283e960ed332551f7e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 28 Apr 2022 19:09:02 +0200 Subject: [PATCH 1466/2369] ghc-bin: mark nocross. --- srcpkgs/ghc-bin/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template index 996be0fb5f5..21847afbecb 100644 --- a/srcpkgs/ghc-bin/template +++ b/srcpkgs/ghc-bin/template @@ -10,6 +10,7 @@ short_desc="Glorious Haskell Compiler - precompiled binaries" maintainer="slotThe " license="BSD-3-Clause" homepage="http://www.haskell.org/ghc/" +nocross=yes nostrip=yes noshlibprovides=yes conflicts="ghc>=0 ghc-doc>=0" From 557e2e64ce89db5fee97d43ae09f674678c76611 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 28 Apr 2022 19:11:08 +0200 Subject: [PATCH 1467/2369] cabal-install: fix build. --- srcpkgs/cabal-install/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template index 6a4b0ad7fc0..e50dba1d51b 100644 --- a/srcpkgs/cabal-install/template +++ b/srcpkgs/cabal-install/template @@ -1,7 +1,7 @@ # Template file for 'cabal-install' pkgname=cabal-install version=3.6.3.0 -revision=1 +revision=2 wrksrc=cabal-Cabal-v${version} hostmakedepends="ghc curl tar which" makedepends="gmp-devel libffi-devel zlib-devel python3" @@ -15,6 +15,10 @@ checksum=dea086acad6d9fe5fe22d838b95b4e988022e8519f38d41609119ea32bfb7466 nopie_files="/usr/bin/cabal" nocross=yes +post_extract() { + cp "${FILESDIR}/linux-9.0.2.json" bootstrap/ +} + post_patch() { case "${XBPS_TARGET_MACHINE}" in i686*) @@ -24,7 +28,6 @@ post_patch() { } do_build() { - cp "${FILESDIR}/linux-9.0.2.json" bootstrap/ PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-9.0.2.json } do_install() { From 04cfafa00548baf435d1665fcabe4c52bcf09e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Thu, 28 Apr 2022 17:36:17 +0200 Subject: [PATCH 1468/2369] postfix: update to 3.7.2. --- srcpkgs/postfix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template index 466de1f1910..a9994b1233f 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -1,6 +1,6 @@ # Template file for 'postfix' pkgname=postfix -version=3.7.1 +version=3.7.2 revision=1 hostmakedepends="perl m4" makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="IPL-1.0, EPL-2.0" homepage="https://www.postfix.org/" distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz" -checksum=25c3e7ec09955af873407af3070fd259da8477b80e2f4663c5fdc00a2cc947ee +checksum=3785f76c2924a02873c0be0f0cd124a9166fc1aaf77ea2a06bd4ad795a6ed416 system_accounts="postfix" postfix_homedir="/var/spool/postfix" From 6279a2af3230cddd77d24aaa2ac95c322b97c3a6 Mon Sep 17 00:00:00 2001 From: ologantr Date: Thu, 28 Apr 2022 11:54:19 +0200 Subject: [PATCH 1469/2369] sqlite: update to 3.38.3. --- srcpkgs/sqlite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index e0be1354632..17f75a5f22a 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,6 +1,6 @@ # Template file for 'sqlite' pkgname=sqlite -version=3.38.2 +version=3.38.3 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=e7974aa1430bad690a5e9f79a6ee5c8492ada8269dc675875ad0fb747d7cada4 +checksum=61f2dd93a2e38c33468b7125967c3218bf9f4dd8365def6025e314f905dc942e CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \ From aa2c2db45c304b05f37433ebef4511f38189c25d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 28 Apr 2022 22:44:39 +0200 Subject: [PATCH 1470/2369] curl: update to 7.83.0. --- srcpkgs/curl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 16a1abd0215..74358a24969 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,6 +1,6 @@ # Template file for 'curl' pkgname=curl -version=7.82.0 +version=7.83.0 revision=1 build_style=gnu-configure configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 @@ -24,7 +24,7 @@ license="MIT" homepage="https://curl.haxx.se" changelog="https://curl.haxx.se/changes.html#${version//./_}" distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2" -checksum=46d9a0400a33408fd992770b04a44a7434b3036f2e8089ac28b57573d59d371f +checksum=247c7ec7521c4258e65634e529270d214fe32969971cccb72845e7aa46831f96 build_options="gnutls gssapi ldap rtmp ssh ssl zstd" build_options_default="ssh ssl zstd" vopt_conflict ssl gnutls From 06388ef39b3ccebdeb69c126ef2e2c91b443a401 Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 29 Apr 2022 00:20:49 +0200 Subject: [PATCH 1471/2369] teams-bin: update to 1.5.00.10453. --- srcpkgs/teams-bin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/teams-bin/template b/srcpkgs/teams-bin/template index 43a0d6e8d90..92e7fe8bd41 100644 --- a/srcpkgs/teams-bin/template +++ b/srcpkgs/teams-bin/template @@ -1,6 +1,6 @@ # Template file for 'teams-bin' pkgname=teams-bin -version=1.4.00.26453 +version=1.5.00.10453 revision=1 archs="x86_64" short_desc="Official Microsoft Teams client" @@ -8,7 +8,7 @@ maintainer="Piraty " license="custom:Proprietary" homepage="https://teams.microsoft.com/downloads" distfiles="https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb" -checksum=ee15b57793aa6b79ccda744d5232da670335abd931bae2a020f5043a129ab859 +checksum=7cb570d9ac5231eb6e6a84738e0fb1e0345863c58fe5341b2fb2db7c5e8b15f0 repository=nonfree restricted=yes From 5de6acbbfe17fa062209e4070dce174bcb536a5e Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sun, 24 Apr 2022 15:24:40 -0500 Subject: [PATCH 1472/2369] lazarus: update to 2.2.0. --- srcpkgs/lazarus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lazarus/template b/srcpkgs/lazarus/template index 92c904cceb9..cf12477f758 100644 --- a/srcpkgs/lazarus/template +++ b/srcpkgs/lazarus/template @@ -1,9 +1,9 @@ # Template file for 'lazarus' pkgname=lazarus -version=2.0.10 +version=2.2.0 revision=1 # For adding a revision suffix to version on the source tarball file -_version_revision_suffix="-2" +_version_revision_suffix="-0" archs="x86_64 i686" wrksrc=lazarus hostmakedepends="fpc rsync" @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, MPL-2.0, LGPL-2.0-or-later" homepage="http://www.lazarus.freepascal.org" distfiles="${SOURCEFORGE_SITE}/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${_version_revision_suffix}.tar.gz" -checksum=64d5626468dd24a3332b205f3abd0a581ab7de1b060a2d57e21864066cfd43b7 +checksum=b6b5d516511e3dfb34910d7656db068d4bba80f009692500aebbcae79cb12160 nopie=yes lib32disabled=yes From 3e885d01447a414f5146557579e47d9979baa3d1 Mon Sep 17 00:00:00 2001 From: akierig Date: Thu, 28 Apr 2022 17:29:34 -0500 Subject: [PATCH 1473/2369] Signal-Desktop: update to 5.41.0. --- 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 44818947462..43e11503bd5 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.40.1 +version=5.41.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=d80d210554e0296d916f7e25d9a49afc58340ab03ef7a1e7ae21017e80e9de7b +checksum=55a201912f5a41c1a76d210d3942078e734ac619df7ffb56083149ce4995e949 nostrip_files="signal-desktop" post_extract() { From 727b59653ec3379438b25955d383c6ec59c65d5b Mon Sep 17 00:00:00 2001 From: Philipp David Date: Mon, 18 Apr 2022 13:30:56 +0200 Subject: [PATCH 1474/2369] PolyMC: update to 1.2.1. --- srcpkgs/PolyMC/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template index 3b3b0deb346..91b439b6b52 100644 --- a/srcpkgs/PolyMC/template +++ b/srcpkgs/PolyMC/template @@ -1,9 +1,9 @@ # Template file for 'PolyMC' pkgname=PolyMC -version=1.1.1 +version=1.2.1 revision=1 build_style=cmake -configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_PORTABLE=0 +configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_VERSION_BUILD=${revision}" hostmakedepends="openjdk8 qt5-host-tools qt5-qmake" makedepends="qt5-devel" @@ -13,7 +13,11 @@ maintainer="Philipp David " license="GPL-3.0-only" homepage="https://polymc.org/" distfiles="https://github.com/PolyMC/PolyMC/releases/download/${version}/PolyMC-${version}.tar.gz" -checksum=7ade9abc3a6f61ed27a129c10084c783cc9a3266484a53e29dabcc1cbb0ba5c4 +checksum=cec7b0175bd0dc3ff2a43e822d1218772e0833332026ae681c81ecc5c51bf608 + +if [ -z "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DBUILD_TESTING=0" +fi case "$XBPS_TARGET_MACHINE" in armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";; From 2044064a7ee4b626658ee2ccae9ef29248857f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?= Date: Thu, 28 Apr 2022 18:13:25 +0200 Subject: [PATCH 1475/2369] pipewire: update to 0.3.51 --- srcpkgs/pipewire/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 6427e0b66e7..4cf367d3267 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,6 +1,6 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.3.50 +version=0.3.51 revision=1 _pms_version=0.4.1 build_style=meson @@ -32,7 +32,7 @@ homepage="https://pipewire.org/" changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz" -checksum="a4bd81e9046f0bd19ecc18402b44199c6c4c54305670e43111c7fbdfe4d17bdf +checksum="f18e7a2cd2fcd75482c3df4e736e01435bd20779ddf63da63b0a086d3a9735ac 119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975" make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire" system_accounts="_pipewire" From 76a0dc9b7f127f9b3228dbc37ed687bb69076d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Thu, 28 Apr 2022 17:24:48 +0200 Subject: [PATCH 1476/2369] croc: update to 9.5.4. --- srcpkgs/croc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template index 4ff52c773d4..5a4e8dcb655 100644 --- a/srcpkgs/croc/template +++ b/srcpkgs/croc/template @@ -1,6 +1,6 @@ # Template file for 'croc' pkgname=croc -version=9.5.3 +version=9.5.4 revision=1 build_style=go go_import_path=github.com/schollz/croc/v${version%%.*} @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="MIT" homepage="https://github.com/schollz/croc" distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz" -checksum=7f8ac260c786bc3f1e3c577e6ac3d3e27d0d8cffa90d7a8d21cec85fe6f22abc +checksum=b89b9d1c2e27e5ca710a7c524f70361122b8b0fd374c0be18f1e7337acca7d07 post_install() { vlicense LICENSE From 562233fffdc67cf80a9ccb9442aa9b06926aad4c Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 14:15:34 -0400 Subject: [PATCH 1477/2369] New package: php8.0-8.0.18 --- srcpkgs/php8.0-apache | 1 + srcpkgs/php8.0-cgi | 1 + srcpkgs/php8.0-devel | 1 + srcpkgs/php8.0-embed | 1 + srcpkgs/php8.0-enchant | 1 + srcpkgs/php8.0-ffi | 1 + srcpkgs/php8.0-fpm | 1 + srcpkgs/php8.0-gd | 1 + srcpkgs/php8.0-intl | 1 + srcpkgs/php8.0-ldap | 1 + srcpkgs/php8.0-mysql | 1 + srcpkgs/php8.0-odbc | 1 + srcpkgs/php8.0-pgsql | 1 + srcpkgs/php8.0-phpdbg | 1 + srcpkgs/php8.0-snmp | 1 + srcpkgs/php8.0-sodium | 1 + srcpkgs/php8.0-sqlite | 1 + srcpkgs/php8.0-tidy | 1 + srcpkgs/php8.0-xsl | 1 + srcpkgs/php8.0/files/apache.conf | 13 + srcpkgs/php8.0/files/php-fpm8.0/run | 3 + srcpkgs/php8.0/patches/php-706-crypt.patch | 15 + srcpkgs/php8.0/patches/php-cross-config.patch | 41 +++ srcpkgs/php8.0/patches/php-fpm.patch | 13 + .../patches/php-ltmain-sysroot-support.patch | 39 ++ .../php8.0/patches/php-opcache-cross.patch | 14 + srcpkgs/php8.0/patches/php-pear-cross.patch | 23 ++ srcpkgs/php8.0/patches/php-phar-cross.patch | 29 ++ .../patches/php-phpize-sysroot-support.patch | 28 ++ srcpkgs/php8.0/patches/php.ini.patch | 24 ++ srcpkgs/php8.0/template | 337 ++++++++++++++++++ srcpkgs/php8.0/update | 2 + 32 files changed, 600 insertions(+) create mode 120000 srcpkgs/php8.0-apache create mode 120000 srcpkgs/php8.0-cgi create mode 120000 srcpkgs/php8.0-devel create mode 120000 srcpkgs/php8.0-embed create mode 120000 srcpkgs/php8.0-enchant create mode 120000 srcpkgs/php8.0-ffi create mode 120000 srcpkgs/php8.0-fpm create mode 120000 srcpkgs/php8.0-gd create mode 120000 srcpkgs/php8.0-intl create mode 120000 srcpkgs/php8.0-ldap create mode 120000 srcpkgs/php8.0-mysql create mode 120000 srcpkgs/php8.0-odbc create mode 120000 srcpkgs/php8.0-pgsql create mode 120000 srcpkgs/php8.0-phpdbg create mode 120000 srcpkgs/php8.0-snmp create mode 120000 srcpkgs/php8.0-sodium create mode 120000 srcpkgs/php8.0-sqlite create mode 120000 srcpkgs/php8.0-tidy create mode 120000 srcpkgs/php8.0-xsl create mode 100644 srcpkgs/php8.0/files/apache.conf create mode 100755 srcpkgs/php8.0/files/php-fpm8.0/run create mode 100644 srcpkgs/php8.0/patches/php-706-crypt.patch create mode 100644 srcpkgs/php8.0/patches/php-cross-config.patch create mode 100644 srcpkgs/php8.0/patches/php-fpm.patch create mode 100644 srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch create mode 100644 srcpkgs/php8.0/patches/php-opcache-cross.patch create mode 100644 srcpkgs/php8.0/patches/php-pear-cross.patch create mode 100644 srcpkgs/php8.0/patches/php-phar-cross.patch create mode 100644 srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch create mode 100644 srcpkgs/php8.0/patches/php.ini.patch create mode 100644 srcpkgs/php8.0/template create mode 100644 srcpkgs/php8.0/update diff --git a/srcpkgs/php8.0-apache b/srcpkgs/php8.0-apache new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-apache @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-cgi b/srcpkgs/php8.0-cgi new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-cgi @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-devel b/srcpkgs/php8.0-devel new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-devel @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-embed b/srcpkgs/php8.0-embed new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-embed @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-enchant b/srcpkgs/php8.0-enchant new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-enchant @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-ffi b/srcpkgs/php8.0-ffi new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-ffi @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-fpm b/srcpkgs/php8.0-fpm new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-fpm @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-gd b/srcpkgs/php8.0-gd new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-gd @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-intl b/srcpkgs/php8.0-intl new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-intl @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-ldap b/srcpkgs/php8.0-ldap new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-ldap @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-mysql b/srcpkgs/php8.0-mysql new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-mysql @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-odbc b/srcpkgs/php8.0-odbc new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-odbc @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-pgsql b/srcpkgs/php8.0-pgsql new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-pgsql @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-phpdbg b/srcpkgs/php8.0-phpdbg new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-phpdbg @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-snmp b/srcpkgs/php8.0-snmp new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-snmp @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-sodium b/srcpkgs/php8.0-sodium new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-sodium @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-sqlite b/srcpkgs/php8.0-sqlite new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-sqlite @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-tidy b/srcpkgs/php8.0-tidy new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-tidy @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0-xsl b/srcpkgs/php8.0-xsl new file mode 120000 index 00000000000..104f2d35908 --- /dev/null +++ b/srcpkgs/php8.0-xsl @@ -0,0 +1 @@ +php8.0 \ No newline at end of file diff --git a/srcpkgs/php8.0/files/apache.conf b/srcpkgs/php8.0/files/apache.conf new file mode 100644 index 00000000000..17a0ad5f6fa --- /dev/null +++ b/srcpkgs/php8.0/files/apache.conf @@ -0,0 +1,13 @@ +# Required modules: dir_module, php8.0_module + + + + DirectoryIndex index.php index.html + + SetHandler application/x-httpd-php + + + SetHandler application/x-httpd-php-source + + + diff --git a/srcpkgs/php8.0/files/php-fpm8.0/run b/srcpkgs/php8.0/files/php-fpm8.0/run new file mode 100755 index 00000000000..f1c712335ab --- /dev/null +++ b/srcpkgs/php8.0/files/php-fpm8.0/run @@ -0,0 +1,3 @@ +#!/bin/sh +[ -r conf ] && . ./conf +exec php-fpm8.0 --nodaemonize ${OPTS} diff --git a/srcpkgs/php8.0/patches/php-706-crypt.patch b/srcpkgs/php8.0/patches/php-706-crypt.patch new file mode 100644 index 00000000000..254f1d2187c --- /dev/null +++ b/srcpkgs/php8.0/patches/php-706-crypt.patch @@ -0,0 +1,15 @@ +--- a/ext/standard/crypt.c 2016-04-28 14:13:00.000000000 -0400 ++++ b/ext/standard/crypt.c 2016-04-28 21:45:24.340955313 -0400 +@@ -267,6 +267,12 @@ + } + # elif defined(HAVE_CRYPT) + crypt_res = crypt(password, salt); ++ if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) { ++ return NULL; ++ } else { ++ result = zend_string_init(crypt_res, strlen(crypt_res), 0); ++ return result; ++ } + # else + # error No crypt() implementation + # endif diff --git a/srcpkgs/php8.0/patches/php-cross-config.patch b/srcpkgs/php8.0/patches/php-cross-config.patch new file mode 100644 index 00000000000..24de8c58cbd --- /dev/null +++ b/srcpkgs/php8.0/patches/php-cross-config.patch @@ -0,0 +1,41 @@ +--- a/configure 2020-03-17 11:40:20.000000000 +0100 ++++ b/configure 2020-04-12 19:51:57.216350534 +0200 +@@ -6374,10 +6374,12 @@ IFS="- /. + as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5 + fi + ++ APXS_PREFIX='$(INSTALL_ROOT)'/usr + APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` + if test -z `$APXS -q SYSCONFDIR`; then + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ ++ -S PREFIX='$APXS_PREFIX' \ + -i -n php" + else + APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` +@@ -6385,6 +6387,7 @@ IFS="- /. + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S SYSCONFDIR='$APXS_SYSCONFDIR' \ ++ -S PREFIX='$APXS_PREFIX' \ + -i -a -n php" + fi + +@@ -57170,7 +57173,7 @@ $as_echo_n "checking for pg_config... " + fi + done + +- if test -n "$PG_CONFIG"; then ++ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 + $as_echo "$PG_CONFIG" >&6; } + PGSQL_INCLUDE=`$PG_CONFIG --includedir` +@@ -58821,7 +58824,7 @@ $as_echo_n "checking for pg_config... " + fi + done + +- if test -n "$PG_CONFIG"; then ++ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 + $as_echo "$PG_CONFIG" >&6; } + PGSQL_INCLUDE=`$PG_CONFIG --includedir` diff --git a/srcpkgs/php8.0/patches/php-fpm.patch b/srcpkgs/php8.0/patches/php-fpm.patch new file mode 100644 index 00000000000..5e55e179f8a --- /dev/null +++ b/srcpkgs/php8.0/patches/php-fpm.patch @@ -0,0 +1,13 @@ +--- a/sapi/fpm/Makefile.frag 2017-04-15 23:58:56.965737425 +0200 ++++ b/sapi/fpm/Makefile.frag 2017-04-16 00:00:57.814831649 +0200 +@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH) + else \ + echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \ + $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \ +- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \ +- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \ ++ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \ ++ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \ + fi + + @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" diff --git a/srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch new file mode 100644 index 00000000000..bbe0a514a9e --- /dev/null +++ b/srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch @@ -0,0 +1,39 @@ +--- a/build/ltmain.sh 2021-09-09 15:19:14.822208365 +0200 ++++ b/build/ltmain.sh 2021-09-09 15:47:55.397011151 +0200 +@@ -2375,6 +2375,13 @@ EOF + *) . ./$lib ;; + esac + ++ newdependency_libs= ++ for deplib in $dependency_libs; do ++ deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#") ++ newdependency_libs="$newdependency_libs $deplib" ++ done ++ dependency_libs=${newdependency_libs} ++ + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +@@ -5750,6 +5757,13 @@ fi\ + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + esac ++ ++ newdependency_libs= ++ for deplib in $dependency_libs; do ++ deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#") ++ newdependency_libs="$newdependency_libs $deplib" ++ done ++ + $echo > $output "\ + # $outputname - a libtool library file + # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP +@@ -5767,7 +5781,7 @@ library_names='$library_names' + old_library='$old_library' + + # Libraries that this one depends upon. +-dependency_libs='$dependency_libs' ++dependency_libs='$newdependency_libs' + + # Version information for $libname. + current=$current diff --git a/srcpkgs/php8.0/patches/php-opcache-cross.patch b/srcpkgs/php8.0/patches/php-opcache-cross.patch new file mode 100644 index 00000000000..5d8a8c5ceed --- /dev/null +++ b/srcpkgs/php8.0/patches/php-opcache-cross.patch @@ -0,0 +1,14 @@ +diff --git a/configure b/configure.new +index 1159224b4c..29f763aa05 100755 +--- a/configure ++++ b/configure.new +@@ -51689,7 +51689,8 @@ $as_echo "$have_shm_ipc" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5 + $as_echo_n "checking for mmap() using MAP_ANON shared memory support... " >&6; } + if test "$cross_compiling" = yes; then : +- have_shm_mmap_anon=no ++$as_echo "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h ++ have_shm_mmap_anon=yes + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ diff --git a/srcpkgs/php8.0/patches/php-pear-cross.patch b/srcpkgs/php8.0/patches/php-pear-cross.patch new file mode 100644 index 00000000000..f9191a50a0b --- /dev/null +++ b/srcpkgs/php8.0/patches/php-pear-cross.patch @@ -0,0 +1,23 @@ +--- a/pear/Makefile.frag 2020-03-17 11:40:21.000000000 +0100 ++++ b/pear/Makefile.frag 2020-04-12 22:29:31.846943414 +0200 +@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null` + PEAR_PREFIX = -dp a${program_prefix} + PEAR_SUFFIX = -ds a$(program_suffix) + PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar ++PEAR_PHP ?= $(top_builddir)/sapi/cli/php + + install-pear-installer: $(SAPI_CLI_PATH) +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} ++ @$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} + + install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" +@@ -23,7 +24,7 @@ install-pear: + elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \ + "$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \ + else \ +- $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \ ++ $(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \ + fi \ + fi \ + fi diff --git a/srcpkgs/php8.0/patches/php-phar-cross.patch b/srcpkgs/php8.0/patches/php-phar-cross.patch new file mode 100644 index 00000000000..1e4e627ec65 --- /dev/null +++ b/srcpkgs/php8.0/patches/php-phar-cross.patch @@ -0,0 +1,29 @@ +--- a/ext/phar/Makefile.frag 2020-04-13 12:18:23.998801926 +0200 ++++ b/ext/phar/Makefile.frag 2020-04-13 12:20:58.031795293 +0200 +@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p + + pharcmd: $(builddir)/phar.php $(builddir)/phar.phar + ++PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH) ++PHAR_PHP_MODULES ?= $(top_builddir)/modules + PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 + PHP_PHARCMD_EXECUTABLE = ` \ +- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \ +- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ ++ if test -x "$(PHAR_PHP)"; then \ ++ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \ + if test "x$(PHP_MODULES)" != "x"; then \ +- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \ ++ $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \ + for i in bz2 zlib phar; do \ + if test -f "$(top_builddir)/modules/$$i.la"; then \ + . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ +@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \ + done; \ + fi; \ + else \ +- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ ++ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \ + fi;` + PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` + diff --git a/srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch new file mode 100644 index 00000000000..76cff3f8166 --- /dev/null +++ b/srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch @@ -0,0 +1,28 @@ +--- a/scripts/phpize.m4 2020-03-17 11:40:21.000000000 +0100 ++++ b/scripts/phpize.m4 2020-04-15 12:27:36.400466387 +0200 +@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir], + [lib], + [no]) + ++PHP_ARG_WITH([sysroot],, ++ [AS_HELP_STRING([--with-sysroot=NAME], ++ [System sysroot])], ++ [no], ++ [no]) ++ + PHP_RUNPATH_SWITCH + PHP_SHLIB_SUFFIX_NAMES + +@@ -58,7 +64,11 @@ dnl For BC. + PHP_CONFIG=$PHP_PHP_CONFIG + prefix=`$PHP_CONFIG --prefix 2>/dev/null` + phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null` +-INCLUDES=`$PHP_CONFIG --includes 2>/dev/null` ++if test "x$PHP_SYSROOT" = xno; then : ++ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null` ++else ++ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"` ++fi + EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null` + PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null` + diff --git a/srcpkgs/php8.0/patches/php.ini.patch b/srcpkgs/php8.0/patches/php.ini.patch new file mode 100644 index 00000000000..07e38a04cf4 --- /dev/null +++ b/srcpkgs/php8.0/patches/php.ini.patch @@ -0,0 +1,24 @@ +diff --git php.ini-production php.ini-production +index 794d3e8ddb..c7acf9c883 100644 +--- a/php.ini-production ++++ b/php.ini-production +@@ -729,7 +729,7 @@ default_charset = "UTF-8" + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:/usr/share/pear" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -752,9 +752,7 @@ user_dir = + + ; Directory in which the loadable extensions (modules) reside. + ; http://php.net/extension-dir +-;extension_dir = "./" +-; On windows: +-;extension_dir = "ext" ++extension_dir = "/usr/lib/php8.0/modules/" + + ; Directory where the temporary files should be placed. + ; Defaults to the system default (see sys_get_temp_dir) diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template new file mode 100644 index 00000000000..2ddb350061f --- /dev/null +++ b/srcpkgs/php8.0/template @@ -0,0 +1,337 @@ +# Template file for 'php8.0' +pkgname=php8.0 +version=8.0.18 +revision=1 +_php_version=8.0 +wrksrc="php-${version}" +hostmakedepends="bison pkg-config apache-devel curl" +makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel + gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel + libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel + postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel + libffi-devel oniguruma-devel gd-devel" +short_desc="HTML-embedded scripting language" +maintainer="Joel Beckmeyer " +license="PHP-3.01" +homepage="https://www.php.net" +distfiles="https://www.php.net/distributions/php-${version}.tar.gz" +checksum=cd980f5a2f422362f8c52d314ed25140c6f472877c5442c4f3304205f54e192a + +fetch_cmd="curl -O" + +conf_files="/etc/php${_php_version}/php.ini" + +lib32disabled=yes + +if [ -n "$CROSS_BUILD" ]; then + # phar needs php to build + hostmakedepends+=" php${_php_version}" + CFLAGS+=" -DHAVE_LIBDL + -DHAVE_DLOPEN + -DHAVE_DLSYM + -DHAVE_SHM_IPC + -DHAVE_SHM_MMAP_ANON + -DHAVE_SHM_MMAP_ZERO + -DHAVE_SHM_MMAP_POSIX + -DHAVE_SHM_MMAP_FILE" +fi + +do_build() { + local _phpconfig="--srcdir=.. \ + --config-cache \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc/php${_php_version} \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php${_php_version} \ + --with-config-file-scan-dir=/etc/php${_php_version}/conf.d \ + --disable-rpath \ + --mandir=/usr/share/man \ + --libdir=/usr/lib/php${_php_version} \ + --datarootdir=/usr/share/php${_php_version} \ + --datadir=/usr/share/php${_php_version} \ + --program-suffix=${_php_version} \ + --includedir=/usr/include/php${_php_version} \ + " + + local _phpextensions="--enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-intl=shared \ + --enable-mbstring \ + --enable-opcache \ + --enable-pcntl \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-mysqlnd \ + --enable-gd=shared \ + --with-external-gd \ + --with-ffi=shared \ + --with-bz2=shared,$XBPS_CROSS_BASE/usr/ \ + --with-curl=shared \ + --with-db4=$XBPS_CROSS_BASE/usr \ + --with-enchant=shared,$XBPS_CROSS_BASE/usr \ + --with-gdbm=$XBPS_CROSS_BASE/usr \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-ldap=shared,$XBPS_CROSS_BASE/usr \ + --with-ldap-sasl \ + --with-sodium=shared \ + --with-mhash \ + --with-mysql-sock=/run/mysqld/mysqld.sock \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-external-pcre \ + --without-pear \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \ + --with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \ + --with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \ + --with-pgsql=shared,$XBPS_CROSS_BASE/usr \ + --with-readline=$XBPS_CROSS_BASE/usr \ + --with-snmp=shared,$XBPS_CROSS_BASE/usr \ + --with-sqlite3=shared,$XBPS_CROSS_BASE/usr \ + --with-unixODBC=shared,$XBPS_CROSS_BASE/usr \ + --with-xsl=shared,$XBPS_CROSS_BASE/usr \ + --with-tidy=shared,$XBPS_CROSS_BASE/usr \ + --with-zip=shared \ + --with-zlib \ + ${configure_args} \ + " + if [ -n "$CROSS_BUILD" ]; then + local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php${_php_version}/modules" + fi + + EXTENSION_DIR="/usr/lib/php${_php_version}/modules" + export EXTENSION_DIR + PEAR_INSTALLDIR=/usr/share/pear + export PEAR_INSTALLDIR + EXTRA_LIBS="-ldl" + export EXTRA_LIBS + + # cgi,cli,embed,fcgi,fpm + mkdir -p build + cd build + ln -s ${wrksrc}/configure + ./configure ${_phpconfig} \ + --host=${XBPS_CROSS_TRIPLET} \ + --enable-cgi \ + --enable-fpm \ + --with-fpm-user=http \ + --with-fpm-group=http \ + --enable-embed=shared \ + ${_phpextensions} + make ${makejobs} ${_make_env} + + # apache + # reuse the previous run; this will save us a lot of time + cp -a ${wrksrc}/build ${wrksrc}/build-apache + cd ${wrksrc}/build-apache + ./configure ${_phpconfig} \ + --host=${XBPS_CROSS_TRIPLET} \ + --with-apxs2 \ + ${_phpextensions} + make ${makejobs} ${_make_env} +} + +do_install() { + cd ${wrksrc}/build + local _env="INSTALL_ROOT=${DESTDIR}" + if [ -n "$CROSS_BUILD" ]; then + _env+=" PHAR_PHP=/usr/bin/php${_php_version}" + fi + make ${_env} install-{modules,cli,build,headers,programs,pharcmd} + + # install php.ini + vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini + # remove static modules + rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a" +} + +php8.0-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/php${_php_version}/build" + vmove "usr/bin/php-config${_php_version}" + vmove "usr/bin/phpize${_php_version}" + vmove "usr/share/man/man1/phpize${_php_version}.1" + vmove "usr/share/man/man1/php-config${_php_version}.1" + } +} + +php8.0-phpdbg_package() { + short_desc+=" - interactive debugger" + depends="php${_php_version}-${version}_${revision}" + pkg_install() { + cd ${wrksrc}/build + make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg + } +} + +php8.0-cgi_package() { + short_desc+=' - CGI and FCGI SAPI' + depends="php${_php_version}-${version}_${revision}" + pkg_install() { + cd ${wrksrc}/build + make INSTALL_ROOT=${PKGDESTDIR} install-cgi + } +} + +php8.0-apache_package() { + short_desc+=' - Apache SAPI' + depends="php${_php_version}-${version}_${revision}" + conf_files="/etc/apache/extra/php${_php_version}_module.conf" + pkg_install() { + vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so" + vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf" + } +} + +php8.0-fpm_package() { + short_desc+=' - FastCGI Process Manager' + depends="php${_php_version}-${version}_${revision}" + conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*" + pkg_install() { + cd ${wrksrc}/build + make INSTALL_ROOT=${PKGDESTDIR} install-fpm + vsv "php-fpm${_php_version}" + } +} + +php8.0-embed_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - Embed SAPI' + pkg_install() { + cd ${wrksrc}/build + make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi + mv ${PKGDESTDIR}/usr/lib/libphp.so ${PKGDESTDIR}/usr/lib/libphp${_php_version}.so + } +} + +php8.0-enchant_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - enchant module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/enchant.so" + } +} + +php8.0-gd_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - gd module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/gd.so" + } +} + +php8.0-intl_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - Internationalization module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/intl.so" + } +} + +php8.0-ldap_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - LDAP module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/ldap.so" + } +} + +php8.0-mysql_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - MySQL modules' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/*mysql*.so" + } +} + +php8.0-odbc_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - ODBC modules' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/*odbc.so" + } +} + +php8.0-pgsql_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - PostgreSQL modules' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/*pgsql.so" + } +} + +php8.0-snmp_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - snmp module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/snmp.so" + } +} + +php8.0-sqlite_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - sqlite module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/*sqlite*.so" + } +} + +php8.0-tidy_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - tidy HTML module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/*tidy*.so" + } +} + +php8.0-xsl_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - XSL module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/xsl.so" + } +} + +php8.0-sodium_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - sodium module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/sodium.so" + } +} + +php8.0-ffi_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - FFI module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/ffi.so" + } +} diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update new file mode 100644 index 00000000000..c4d9bc5958c --- /dev/null +++ b/srcpkgs/php8.0/update @@ -0,0 +1,2 @@ +pkgname=php +ignore="8.[1-9].*" From 50140535904ce82714c2619858c09e3b25a0edd1 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 14:32:37 -0400 Subject: [PATCH 1478/2369] New package: php8.0-apcu-5.1.21 --- srcpkgs/php8.0-apcu/INSTALL.msg | 3 +++ srcpkgs/php8.0-apcu/template | 29 +++++++++++++++++++++++++++++ srcpkgs/php8.0-apcu/update | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 srcpkgs/php8.0-apcu/INSTALL.msg create mode 100644 srcpkgs/php8.0-apcu/template create mode 100644 srcpkgs/php8.0-apcu/update diff --git a/srcpkgs/php8.0-apcu/INSTALL.msg b/srcpkgs/php8.0-apcu/INSTALL.msg new file mode 100644 index 00000000000..9da8a70ccc2 --- /dev/null +++ b/srcpkgs/php8.0-apcu/INSTALL.msg @@ -0,0 +1,3 @@ +To enable APCu add the following line to your php.ini: + + extension=apcu.so diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template new file mode 100644 index 00000000000..0409dd840ff --- /dev/null +++ b/srcpkgs/php8.0-apcu/template @@ -0,0 +1,29 @@ +# Template file for 'php8.0-apcu' +pkgname=php8.0-apcu +version=5.1.21 +revision=1 +wrksrc="apcu-${version}" +build_style=gnu-configure +configure_args="--with-php-config=/usr/bin/php-config8.0" +make_check_target=test +hostmakedepends="autoconf php8.0-devel" +makedepends="php8.0-devel pcre2-devel" +depends="php8.0" +short_desc="In-memory key-value store for PHP" +maintainer="Joel Beckmeyer " +license="PHP-3.01" +homepage="https://pecl.php.net/package/APCu" +distfiles="https://pecl.php.net/get/apcu-${version}.tgz" +checksum=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1 + +pre_configure() { + phpize8.0 +} + +pre_install() { + make_install_args="INSTALL_ROOT=$DESTDIR" +} + +post_install() { + rm -r $DESTDIR/usr/include +} diff --git a/srcpkgs/php8.0-apcu/update b/srcpkgs/php8.0-apcu/update new file mode 100644 index 00000000000..ad899519e31 --- /dev/null +++ b/srcpkgs/php8.0-apcu/update @@ -0,0 +1,2 @@ +site="https://pecl.php.net/package/APCu" +pattern="apcu-\K[\d\.]*(?=\.tgz)" From cf4fc15ab00eb870874232854c8958c7a21a0629 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 14:30:18 -0400 Subject: [PATCH 1479/2369] New package: php8.0-ast-1.0.16 --- srcpkgs/php8.0-ast/INSTALL.msg | 2 ++ srcpkgs/php8.0-ast/template | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 srcpkgs/php8.0-ast/INSTALL.msg create mode 100644 srcpkgs/php8.0-ast/template diff --git a/srcpkgs/php8.0-ast/INSTALL.msg b/srcpkgs/php8.0-ast/INSTALL.msg new file mode 100644 index 00000000000..0dd0b5df2d9 --- /dev/null +++ b/srcpkgs/php8.0-ast/INSTALL.msg @@ -0,0 +1,2 @@ +To enable the ast extension please add the following to php.ini: + extension=ast.so diff --git a/srcpkgs/php8.0-ast/template b/srcpkgs/php8.0-ast/template new file mode 100644 index 00000000000..7f7a3bda75d --- /dev/null +++ b/srcpkgs/php8.0-ast/template @@ -0,0 +1,25 @@ +# Template file for 'php8.0-ast' +pkgname=php8.0-ast +version=1.0.16 +revision=1 +wrksrc="ast-${version}" +build_style=gnu-configure +configure_args="--with-php-config=/usr/bin/php-config8.0" +hostmakedepends="php8.0-devel autoconf" +makedepends="php8.0-devel" +depends="php8.0" +short_desc="Exposes the abstract syntax tree generated by PHP" +maintainer="Joel Beckmeyer " +license="BSD-3-Clause" +homepage="https://github.com/nikic/php-ast" +distfiles="https://pecl.php.net/get/ast-${version}.tgz" +checksum=45bda34b780c4661ce77cf65cd8a504fb56526d4b456edcc97d791c86f3879ce + +pre_configure() { + phpize8.0 +} + +do_install() { + make INSTALL_ROOT=${DESTDIR} install + vlicense LICENSE +} From 6d08ac1d9698d3f3d5b16d3f7db89e1b52197d04 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 14:29:14 -0400 Subject: [PATCH 1480/2369] New package: php8.0-igbinary-3.2.7 --- srcpkgs/php8.0-igbinary/template | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/php8.0-igbinary/template diff --git a/srcpkgs/php8.0-igbinary/template b/srcpkgs/php8.0-igbinary/template new file mode 100644 index 00000000000..f74c6f88186 --- /dev/null +++ b/srcpkgs/php8.0-igbinary/template @@ -0,0 +1,25 @@ +# Template file for 'php8.0-igbinary' +pkgname=php8.0-igbinary +version=3.2.7 +revision=1 +wrksrc="igbinary-${version}" +build_style=gnu-configure +configure_args="--with-php-config=/usr/bin/php-config8.0" +hostmakedepends="autoconf php8.0-devel" +makedepends="php8.0-devel" +depends="php8.0" +short_desc="Igbinary is a drop in replacement for the standard php serializer" +maintainer="Joel Beckmeyer " +license="BSD-3-Clause" +homepage="https://github.com/igbinary/igbinary/" +distfiles="https://pecl.php.net/get/igbinary-${version}.tgz" +checksum=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d + +pre_configure() { + phpize8.0 +} + +do_install() { + make INSTALL_ROOT="${DESTDIR}" install + vlicense COPYING +} From 204f72f8977e0ff8dfbbfc87c7a05968312cb31c Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 14:31:34 -0400 Subject: [PATCH 1481/2369] New package: php8.0-imagick-3.7.0 --- srcpkgs/php8.0-imagick/INSTALL.msg | 3 ++ ...le-libmagick-header-file-search-path.patch | 17 +++++++++++ srcpkgs/php8.0-imagick/template | 29 +++++++++++++++++++ srcpkgs/php8.0-imagick/update | 1 + 4 files changed, 50 insertions(+) create mode 100644 srcpkgs/php8.0-imagick/INSTALL.msg create mode 100644 srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch create mode 100644 srcpkgs/php8.0-imagick/template create mode 100644 srcpkgs/php8.0-imagick/update diff --git a/srcpkgs/php8.0-imagick/INSTALL.msg b/srcpkgs/php8.0-imagick/INSTALL.msg new file mode 100644 index 00000000000..00497519fce --- /dev/null +++ b/srcpkgs/php8.0-imagick/INSTALL.msg @@ -0,0 +1,3 @@ +To enable the Imagick extension add the following line to your php.ini: + + extension=imagick.so diff --git a/srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch new file mode 100644 index 00000000000..16b8aaa5737 --- /dev/null +++ b/srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch @@ -0,0 +1,17 @@ +--- a/imagemagick.m4 2021-09-09 10:53:42.287881616 +0200 ++++ b/imagemagick.m4 2021-09-09 11:14:47.662312430 +0200 +@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[ + + AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h]) + ++ elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then ++ ++ IM_INCLUDE_FORMAT="MagickWand/MagickWand.h" ++ IM_HEADER_STYLE="SEVEN" ++ AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header]) ++ ++ AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h]) ++ + elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then + + IM_INCLUDE_FORMAT="MagickWand/MagickWand.h" diff --git a/srcpkgs/php8.0-imagick/template b/srcpkgs/php8.0-imagick/template new file mode 100644 index 00000000000..9b0e0ba248c --- /dev/null +++ b/srcpkgs/php8.0-imagick/template @@ -0,0 +1,29 @@ +# Template file for 'php8.0-imagick' +pkgname=php8.0-imagick +version=3.7.0 +revision=1 +wrksrc="imagick-$version" +build_style=gnu-configure +configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \ + --with-php-config=/usr/bin/php-config8.0" +hostmakedepends="php8.0-devel autoconf pkg-config" +makedepends="php8.0-devel pcre2-devel libmagick-devel" +depends="php8.0" +short_desc="Provides a PHP wrapper to the ImageMagick library" +maintainer="Joel Beckmeyer " +license="PHP-3.01" +homepage="https://pecl.php.net/package/imagick" +distfiles="https://pecl.php.net/get/imagick-$version.tgz" +checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e + +pre_configure() { + phpize8.0 +} + +pre_install() { + make_install_args="INSTALL_ROOT=$DESTDIR" +} + +post_install() { + rm -r $DESTDIR/usr/include +} diff --git a/srcpkgs/php8.0-imagick/update b/srcpkgs/php8.0-imagick/update new file mode 100644 index 00000000000..fb47044a964 --- /dev/null +++ b/srcpkgs/php8.0-imagick/update @@ -0,0 +1 @@ +pattern=')' From 2fce14dbcc551abbc0999e1dbe34cb2b56ce4f19 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 14:45:45 -0400 Subject: [PATCH 1482/2369] New package: composer8.0-2.3.5 --- srcpkgs/composer8.0/files/composer8.0 | 2 ++ srcpkgs/composer8.0/template | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 srcpkgs/composer8.0/files/composer8.0 create mode 100644 srcpkgs/composer8.0/template diff --git a/srcpkgs/composer8.0/files/composer8.0 b/srcpkgs/composer8.0/files/composer8.0 new file mode 100644 index 00000000000..2a3236b4a5f --- /dev/null +++ b/srcpkgs/composer8.0/files/composer8.0 @@ -0,0 +1,2 @@ +#!/bin/sh +php8.0 -f /usr/libexec/composer.phar8.0 "$@" diff --git a/srcpkgs/composer8.0/template b/srcpkgs/composer8.0/template new file mode 100644 index 00000000000..dfc9de6993b --- /dev/null +++ b/srcpkgs/composer8.0/template @@ -0,0 +1,26 @@ +# Template file for 'composer8.0' +pkgname=composer8.0 +version=2.3.5 +revision=1 +build_style=fetch +depends="php8.0" +short_desc="Dependency manager for PHP" +maintainer="Joel Beckmeyer " +license="MIT" +homepage="https://getcomposer.org/" +changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md" +distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar + https://raw.githubusercontent.com/composer/composer/main/LICENSE" +checksum="3b3b5a899c06a46aec280727bdf50aad14334f6bc40436ea76b07b650870d8f4 + 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c" + +do_install() { + vbin ${FILESDIR}/composer8.0 + + vinstall composer.phar 644 usr/libexec composer.phar8.0 + vlicense LICENSE + + vmkdir /etc/php8.0/conf.d + printf 'extension=%s\n' phar iconv openssl zip \ + >${DESTDIR}/etc/php8.0/conf.d/composer.ini +} From ce7ff614d2938d5dcaea4cfb018216dd4eeade41 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 14:20:19 -0400 Subject: [PATCH 1483/2369] New package: xdebug8.0-3.1.4 --- srcpkgs/xdebug8.0/INSTALL.msg | 1 + srcpkgs/xdebug8.0/template | 29 +++++++++++++++++++++++++++++ srcpkgs/xdebug8.0/update | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 srcpkgs/xdebug8.0/INSTALL.msg create mode 100644 srcpkgs/xdebug8.0/template create mode 100644 srcpkgs/xdebug8.0/update diff --git a/srcpkgs/xdebug8.0/INSTALL.msg b/srcpkgs/xdebug8.0/INSTALL.msg new file mode 100644 index 00000000000..04e3343216f --- /dev/null +++ b/srcpkgs/xdebug8.0/INSTALL.msg @@ -0,0 +1 @@ +You should add 'zend_extension="xdebug.so"' to php.ini diff --git a/srcpkgs/xdebug8.0/template b/srcpkgs/xdebug8.0/template new file mode 100644 index 00000000000..159f30cd529 --- /dev/null +++ b/srcpkgs/xdebug8.0/template @@ -0,0 +1,29 @@ +# Template file for 'xdebug8.0' +pkgname=xdebug8.0 +version=3.1.4 +revision=1 +wrksrc="xdebug-${version}" +build_style=gnu-configure +configure_args="--with-php-config=/usr/bin/php-config8.0" +hostmakedepends="autoconf" +makedepends="php8.0-devel" +short_desc="PHP debugging extension" +maintainer="Joel Beckmeyer " +license="PHP-3.0" +homepage="http://xdebug.org" +changelog="https://xdebug.org/updates" +distfiles="http://xdebug.org/files/xdebug-${version}.tgz" +checksum=4195926f9f6c4e802ff749bb2ca85ac50636719a72e5389e372e35ef523505f9 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" php8.0-devel" +fi + +pre_configure() { + phpize8.0 +} + +do_install() { + make INSTALL_ROOT=${DESTDIR} install + vlicense LICENSE +} diff --git a/srcpkgs/xdebug8.0/update b/srcpkgs/xdebug8.0/update new file mode 100644 index 00000000000..280b0bc7e3a --- /dev/null +++ b/srcpkgs/xdebug8.0/update @@ -0,0 +1,2 @@ +site="https://xdebug.org/updates" +pattern='
.*Xdebug \K[\d.]+(?=
)' From 945b302da01997117ccb97525a0c0e42af964196 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 15:13:12 -0400 Subject: [PATCH 1484/2369] New package: php8.1-8.1.5 --- srcpkgs/php8.1-apache | 1 + srcpkgs/php8.1-cgi | 1 + srcpkgs/php8.1-devel | 1 + srcpkgs/php8.1-embed | 1 + srcpkgs/php8.1-enchant | 1 + srcpkgs/php8.1-ffi | 1 + srcpkgs/php8.1-fpm | 1 + srcpkgs/php8.1-gd | 1 + srcpkgs/php8.1-intl | 1 + srcpkgs/php8.1-ldap | 1 + srcpkgs/php8.1-mysql | 1 + srcpkgs/php8.1-odbc | 1 + srcpkgs/php8.1-pgsql | 1 + srcpkgs/php8.1-phpdbg | 1 + srcpkgs/php8.1-snmp | 1 + srcpkgs/php8.1-sodium | 1 + srcpkgs/php8.1-sqlite | 1 + srcpkgs/php8.1-tidy | 1 + srcpkgs/php8.1-xsl | 1 + srcpkgs/php8.1/files/apache.conf | 13 + srcpkgs/php8.1/files/php-fpm8.1/run | 3 + srcpkgs/php8.1/patches/php-706-crypt.patch | 15 + srcpkgs/php8.1/patches/php-cross-config.patch | 22 ++ srcpkgs/php8.1/patches/php-fpm.patch | 13 + .../patches/php-ltmain-sysroot-support.patch | 39 ++ srcpkgs/php8.1/patches/php-pear-cross.patch | 23 ++ srcpkgs/php8.1/patches/php-phar-cross.patch | 29 ++ .../patches/php-phpize-sysroot-support.patch | 28 ++ srcpkgs/php8.1/patches/php.ini.patch | 24 ++ srcpkgs/php8.1/template | 337 ++++++++++++++++++ srcpkgs/php8.1/update | 2 + 31 files changed, 567 insertions(+) create mode 120000 srcpkgs/php8.1-apache create mode 120000 srcpkgs/php8.1-cgi create mode 120000 srcpkgs/php8.1-devel create mode 120000 srcpkgs/php8.1-embed create mode 120000 srcpkgs/php8.1-enchant create mode 120000 srcpkgs/php8.1-ffi create mode 120000 srcpkgs/php8.1-fpm create mode 120000 srcpkgs/php8.1-gd create mode 120000 srcpkgs/php8.1-intl create mode 120000 srcpkgs/php8.1-ldap create mode 120000 srcpkgs/php8.1-mysql create mode 120000 srcpkgs/php8.1-odbc create mode 120000 srcpkgs/php8.1-pgsql create mode 120000 srcpkgs/php8.1-phpdbg create mode 120000 srcpkgs/php8.1-snmp create mode 120000 srcpkgs/php8.1-sodium create mode 120000 srcpkgs/php8.1-sqlite create mode 120000 srcpkgs/php8.1-tidy create mode 120000 srcpkgs/php8.1-xsl create mode 100644 srcpkgs/php8.1/files/apache.conf create mode 100755 srcpkgs/php8.1/files/php-fpm8.1/run create mode 100644 srcpkgs/php8.1/patches/php-706-crypt.patch create mode 100644 srcpkgs/php8.1/patches/php-cross-config.patch create mode 100644 srcpkgs/php8.1/patches/php-fpm.patch create mode 100644 srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch create mode 100644 srcpkgs/php8.1/patches/php-pear-cross.patch create mode 100644 srcpkgs/php8.1/patches/php-phar-cross.patch create mode 100644 srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch create mode 100644 srcpkgs/php8.1/patches/php.ini.patch create mode 100644 srcpkgs/php8.1/template create mode 100644 srcpkgs/php8.1/update diff --git a/srcpkgs/php8.1-apache b/srcpkgs/php8.1-apache new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-apache @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-cgi b/srcpkgs/php8.1-cgi new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-cgi @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-devel b/srcpkgs/php8.1-devel new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-devel @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-embed b/srcpkgs/php8.1-embed new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-embed @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-enchant b/srcpkgs/php8.1-enchant new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-enchant @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-ffi b/srcpkgs/php8.1-ffi new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-ffi @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-fpm b/srcpkgs/php8.1-fpm new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-fpm @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-gd b/srcpkgs/php8.1-gd new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-gd @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-intl b/srcpkgs/php8.1-intl new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-intl @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-ldap b/srcpkgs/php8.1-ldap new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-ldap @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-mysql b/srcpkgs/php8.1-mysql new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-mysql @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-odbc b/srcpkgs/php8.1-odbc new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-odbc @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-pgsql b/srcpkgs/php8.1-pgsql new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-pgsql @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-phpdbg b/srcpkgs/php8.1-phpdbg new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-phpdbg @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-snmp b/srcpkgs/php8.1-snmp new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-snmp @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-sodium b/srcpkgs/php8.1-sodium new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-sodium @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-sqlite b/srcpkgs/php8.1-sqlite new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-sqlite @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-tidy b/srcpkgs/php8.1-tidy new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-tidy @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1-xsl b/srcpkgs/php8.1-xsl new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-xsl @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1/files/apache.conf b/srcpkgs/php8.1/files/apache.conf new file mode 100644 index 00000000000..f321ec12d31 --- /dev/null +++ b/srcpkgs/php8.1/files/apache.conf @@ -0,0 +1,13 @@ +# Required modules: dir_module, php8.1_module + + + + DirectoryIndex index.php index.html + + SetHandler application/x-httpd-php + + + SetHandler application/x-httpd-php-source + + + diff --git a/srcpkgs/php8.1/files/php-fpm8.1/run b/srcpkgs/php8.1/files/php-fpm8.1/run new file mode 100755 index 00000000000..5928ea5103e --- /dev/null +++ b/srcpkgs/php8.1/files/php-fpm8.1/run @@ -0,0 +1,3 @@ +#!/bin/sh +[ -r conf ] && . ./conf +exec php-fpm8.1 --nodaemonize ${OPTS} diff --git a/srcpkgs/php8.1/patches/php-706-crypt.patch b/srcpkgs/php8.1/patches/php-706-crypt.patch new file mode 100644 index 00000000000..254f1d2187c --- /dev/null +++ b/srcpkgs/php8.1/patches/php-706-crypt.patch @@ -0,0 +1,15 @@ +--- a/ext/standard/crypt.c 2016-04-28 14:13:00.000000000 -0400 ++++ b/ext/standard/crypt.c 2016-04-28 21:45:24.340955313 -0400 +@@ -267,6 +267,12 @@ + } + # elif defined(HAVE_CRYPT) + crypt_res = crypt(password, salt); ++ if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) { ++ return NULL; ++ } else { ++ result = zend_string_init(crypt_res, strlen(crypt_res), 0); ++ return result; ++ } + # else + # error No crypt() implementation + # endif diff --git a/srcpkgs/php8.1/patches/php-cross-config.patch b/srcpkgs/php8.1/patches/php-cross-config.patch new file mode 100644 index 00000000000..169c43f1df9 --- /dev/null +++ b/srcpkgs/php8.1/patches/php-cross-config.patch @@ -0,0 +1,22 @@ +diff --git a/configure b/configure +index e4b82d1..1a8678f 100755 +--- a/configure ++++ b/configure +@@ -62424,7 +62424,7 @@ printf %s "checking for pg_config... " >&6; } + fi + done + +- if test -n "$PG_CONFIG"; then ++ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 + printf "%s\n" "$PG_CONFIG" >&6; } + PGSQL_INCLUDE=`$PG_CONFIG --includedir` +@@ -63948,7 +63948,7 @@ printf %s "checking for pg_config... " >&6; } + fi + done + +- if test -n "$PG_CONFIG"; then ++ if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 + printf "%s\n" "$PG_CONFIG" >&6; } + PGSQL_INCLUDE=`$PG_CONFIG --includedir` diff --git a/srcpkgs/php8.1/patches/php-fpm.patch b/srcpkgs/php8.1/patches/php-fpm.patch new file mode 100644 index 00000000000..5e55e179f8a --- /dev/null +++ b/srcpkgs/php8.1/patches/php-fpm.patch @@ -0,0 +1,13 @@ +--- a/sapi/fpm/Makefile.frag 2017-04-15 23:58:56.965737425 +0200 ++++ b/sapi/fpm/Makefile.frag 2017-04-16 00:00:57.814831649 +0200 +@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH) + else \ + echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \ + $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \ +- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \ +- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \ ++ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \ ++ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \ + fi + + @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" diff --git a/srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch new file mode 100644 index 00000000000..bbe0a514a9e --- /dev/null +++ b/srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch @@ -0,0 +1,39 @@ +--- a/build/ltmain.sh 2021-09-09 15:19:14.822208365 +0200 ++++ b/build/ltmain.sh 2021-09-09 15:47:55.397011151 +0200 +@@ -2375,6 +2375,13 @@ EOF + *) . ./$lib ;; + esac + ++ newdependency_libs= ++ for deplib in $dependency_libs; do ++ deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#") ++ newdependency_libs="$newdependency_libs $deplib" ++ done ++ dependency_libs=${newdependency_libs} ++ + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +@@ -5750,6 +5757,13 @@ fi\ + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + esac ++ ++ newdependency_libs= ++ for deplib in $dependency_libs; do ++ deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#") ++ newdependency_libs="$newdependency_libs $deplib" ++ done ++ + $echo > $output "\ + # $outputname - a libtool library file + # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP +@@ -5767,7 +5781,7 @@ library_names='$library_names' + old_library='$old_library' + + # Libraries that this one depends upon. +-dependency_libs='$dependency_libs' ++dependency_libs='$newdependency_libs' + + # Version information for $libname. + current=$current diff --git a/srcpkgs/php8.1/patches/php-pear-cross.patch b/srcpkgs/php8.1/patches/php-pear-cross.patch new file mode 100644 index 00000000000..f9191a50a0b --- /dev/null +++ b/srcpkgs/php8.1/patches/php-pear-cross.patch @@ -0,0 +1,23 @@ +--- a/pear/Makefile.frag 2020-03-17 11:40:21.000000000 +0100 ++++ b/pear/Makefile.frag 2020-04-12 22:29:31.846943414 +0200 +@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null` + PEAR_PREFIX = -dp a${program_prefix} + PEAR_SUFFIX = -ds a$(program_suffix) + PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar ++PEAR_PHP ?= $(top_builddir)/sapi/cli/php + + install-pear-installer: $(SAPI_CLI_PATH) +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} ++ @$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} + + install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" +@@ -23,7 +24,7 @@ install-pear: + elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \ + "$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \ + else \ +- $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \ ++ $(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \ + fi \ + fi \ + fi diff --git a/srcpkgs/php8.1/patches/php-phar-cross.patch b/srcpkgs/php8.1/patches/php-phar-cross.patch new file mode 100644 index 00000000000..1e4e627ec65 --- /dev/null +++ b/srcpkgs/php8.1/patches/php-phar-cross.patch @@ -0,0 +1,29 @@ +--- a/ext/phar/Makefile.frag 2020-04-13 12:18:23.998801926 +0200 ++++ b/ext/phar/Makefile.frag 2020-04-13 12:20:58.031795293 +0200 +@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p + + pharcmd: $(builddir)/phar.php $(builddir)/phar.phar + ++PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH) ++PHAR_PHP_MODULES ?= $(top_builddir)/modules + PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 + PHP_PHARCMD_EXECUTABLE = ` \ +- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \ +- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ ++ if test -x "$(PHAR_PHP)"; then \ ++ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \ + if test "x$(PHP_MODULES)" != "x"; then \ +- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \ ++ $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \ + for i in bz2 zlib phar; do \ + if test -f "$(top_builddir)/modules/$$i.la"; then \ + . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ +@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \ + done; \ + fi; \ + else \ +- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ ++ $(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \ + fi;` + PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` + diff --git a/srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch new file mode 100644 index 00000000000..76cff3f8166 --- /dev/null +++ b/srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch @@ -0,0 +1,28 @@ +--- a/scripts/phpize.m4 2020-03-17 11:40:21.000000000 +0100 ++++ b/scripts/phpize.m4 2020-04-15 12:27:36.400466387 +0200 +@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir], + [lib], + [no]) + ++PHP_ARG_WITH([sysroot],, ++ [AS_HELP_STRING([--with-sysroot=NAME], ++ [System sysroot])], ++ [no], ++ [no]) ++ + PHP_RUNPATH_SWITCH + PHP_SHLIB_SUFFIX_NAMES + +@@ -58,7 +64,11 @@ dnl For BC. + PHP_CONFIG=$PHP_PHP_CONFIG + prefix=`$PHP_CONFIG --prefix 2>/dev/null` + phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null` +-INCLUDES=`$PHP_CONFIG --includes 2>/dev/null` ++if test "x$PHP_SYSROOT" = xno; then : ++ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null` ++else ++ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"` ++fi + EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null` + PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null` + diff --git a/srcpkgs/php8.1/patches/php.ini.patch b/srcpkgs/php8.1/patches/php.ini.patch new file mode 100644 index 00000000000..186898f63fa --- /dev/null +++ b/srcpkgs/php8.1/patches/php.ini.patch @@ -0,0 +1,24 @@ +diff --git a/php.ini-production b/php.ini-production +index b39a960..68f14a6 100644 +--- a/php.ini-production ++++ b/php.ini-production +@@ -737,7 +737,7 @@ default_charset = "UTF-8" + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:/usr/share/pear" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -760,9 +760,7 @@ user_dir = + + ; Directory in which the loadable extensions (modules) reside. + ; https://php.net/extension-dir +-;extension_dir = "./" +-; On windows: +-;extension_dir = "ext" ++extension_dir = "/usr/lib/php8.1/modules/" + + ; Directory where the temporary files should be placed. + ; Defaults to the system default (see sys_get_temp_dir) diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template new file mode 100644 index 00000000000..16da7be3f32 --- /dev/null +++ b/srcpkgs/php8.1/template @@ -0,0 +1,337 @@ +# Template file for 'php8.1' +pkgname=php8.1 +version=8.1.5 +revision=1 +_php_version=8.1 +wrksrc="php-${version}" +hostmakedepends="bison pkg-config apache-devel curl" +makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel + gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel + libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel + postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel + libffi-devel oniguruma-devel gd-devel" +short_desc="HTML-embedded scripting language" +maintainer="Joel Beckmeyer " +license="PHP-3.01" +homepage="https://www.php.net" +distfiles="https://www.php.net/distributions/php-${version}.tar.gz" +checksum=44d637627746082395d5d3d3d6ae7d71e780b82a8d55a0228887158c4316bf11 + +fetch_cmd="curl -O" + +conf_files="/etc/php${_php_version}/php.ini" + +lib32disabled=yes + +if [ -n "$CROSS_BUILD" ]; then + # phar needs php to build + hostmakedepends+=" php${_php_version}" + CFLAGS+=" -DHAVE_LIBDL + -DHAVE_DLOPEN + -DHAVE_DLSYM + -DHAVE_SHM_IPC + -DHAVE_SHM_MMAP_ANON + -DHAVE_SHM_MMAP_ZERO + -DHAVE_SHM_MMAP_POSIX + -DHAVE_SHM_MMAP_FILE" +fi + +do_build() { + local _phpconfig="--srcdir=.. \ + --config-cache \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc/php${_php_version} \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php${_php_version} \ + --with-config-file-scan-dir=/etc/php${_php_version}/conf.d \ + --disable-rpath \ + --mandir=/usr/share/man \ + --libdir=/usr/lib/php${_php_version} \ + --datarootdir=/usr/share/php${_php_version} \ + --datadir=/usr/share/php${_php_version} \ + --program-suffix=${_php_version} \ + --includedir=/usr/include/php${_php_version} \ + " + + local _phpextensions="--enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-intl=shared \ + --enable-mbstring \ + --enable-opcache \ + --enable-pcntl \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-mysqlnd \ + --enable-gd=shared \ + --with-external-gd \ + --with-ffi=shared \ + --with-bz2=shared,$XBPS_CROSS_BASE/usr/ \ + --with-curl=shared \ + --with-db4=$XBPS_CROSS_BASE/usr \ + --with-enchant=shared,$XBPS_CROSS_BASE/usr \ + --with-gdbm=$XBPS_CROSS_BASE/usr \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-ldap=shared,$XBPS_CROSS_BASE/usr \ + --with-ldap-sasl \ + --with-sodium=shared \ + --with-mhash \ + --with-mysql-sock=/run/mysqld/mysqld.sock \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-external-pcre \ + --without-pear \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \ + --with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \ + --with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \ + --with-pgsql=shared,$XBPS_CROSS_BASE/usr \ + --with-readline=$XBPS_CROSS_BASE/usr \ + --with-snmp=shared,$XBPS_CROSS_BASE/usr \ + --with-sqlite3=shared,$XBPS_CROSS_BASE/usr \ + --with-unixODBC=shared,$XBPS_CROSS_BASE/usr \ + --with-xsl=shared,$XBPS_CROSS_BASE/usr \ + --with-tidy=shared,$XBPS_CROSS_BASE/usr \ + --with-zip=shared \ + --with-zlib \ + ${configure_args} \ + " + if [ -n "$CROSS_BUILD" ]; then + local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php${_php_version}/modules" + fi + + EXTENSION_DIR="/usr/lib/php${_php_version}/modules" + export EXTENSION_DIR + PEAR_INSTALLDIR=/usr/share/pear + export PEAR_INSTALLDIR + EXTRA_LIBS="-ldl" + export EXTRA_LIBS + + # cgi,cli,embed,fcgi,fpm + mkdir -p build + cd build + ln -s ${wrksrc}/configure + ./configure ${_phpconfig} \ + --host=${XBPS_CROSS_TRIPLET} \ + --enable-cgi \ + --enable-fpm \ + --with-fpm-user=http \ + --with-fpm-group=http \ + --enable-embed=shared \ + ${_phpextensions} + make ${makejobs} ${_make_env} + + # apache + # reuse the previous run; this will save us a lot of time + cp -a ${wrksrc}/build ${wrksrc}/build-apache + cd ${wrksrc}/build-apache + ./configure ${_phpconfig} \ + --host=${XBPS_CROSS_TRIPLET} \ + --with-apxs2 \ + ${_phpextensions} + make ${makejobs} ${_make_env} +} + +do_install() { + cd ${wrksrc}/build + local _env="INSTALL_ROOT=${DESTDIR}" + if [ -n "$CROSS_BUILD" ]; then + _env+=" PHAR_PHP=/usr/bin/php${_php_version}" + fi + make ${_env} install-{modules,cli,build,headers,programs,pharcmd} + + # install php.ini + vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini + # remove static modules + rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a" +} + +php8.1-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/php${_php_version}/build" + vmove "usr/bin/php-config${_php_version}" + vmove "usr/bin/phpize${_php_version}" + vmove "usr/share/man/man1/phpize${_php_version}.1" + vmove "usr/share/man/man1/php-config${_php_version}.1" + } +} + +php8.1-phpdbg_package() { + short_desc+=" - interactive debugger" + depends="php${_php_version}-${version}_${revision}" + pkg_install() { + cd ${wrksrc}/build + make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg + } +} + +php8.1-cgi_package() { + short_desc+=' - CGI and FCGI SAPI' + depends="php${_php_version}-${version}_${revision}" + pkg_install() { + cd ${wrksrc}/build + make INSTALL_ROOT=${PKGDESTDIR} install-cgi + } +} + +php8.1-apache_package() { + short_desc+=' - Apache SAPI' + depends="php${_php_version}-${version}_${revision}" + conf_files="/etc/apache/extra/php${_php_version}_module.conf" + pkg_install() { + vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so" + vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf" + } +} + +php8.1-fpm_package() { + short_desc+=' - FastCGI Process Manager' + depends="php${_php_version}-${version}_${revision}" + conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*" + pkg_install() { + cd ${wrksrc}/build + make INSTALL_ROOT=${PKGDESTDIR} install-fpm + vsv "php-fpm${_php_version}" + } +} + +php8.1-embed_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - Embed SAPI' + pkg_install() { + cd ${wrksrc}/build + make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi + mv ${PKGDESTDIR}/usr/lib/libphp.so ${PKGDESTDIR}/usr/lib/libphp${_php_version}.so + } +} + +php8.1-enchant_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - enchant module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/enchant.so" + } +} + +php8.1-gd_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - gd module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/gd.so" + } +} + +php8.1-intl_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - Internationalization module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/intl.so" + } +} + +php8.1-ldap_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - LDAP module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/ldap.so" + } +} + +php8.1-mysql_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - MySQL modules' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/*mysql*.so" + } +} + +php8.1-odbc_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - ODBC modules' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/*odbc.so" + } +} + +php8.1-pgsql_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - PostgreSQL modules' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/*pgsql.so" + } +} + +php8.1-snmp_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - snmp module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/snmp.so" + } +} + +php8.1-sqlite_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - sqlite module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/*sqlite*.so" + } +} + +php8.1-tidy_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - tidy HTML module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/*tidy*.so" + } +} + +php8.1-xsl_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - XSL module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/xsl.so" + } +} + +php8.1-sodium_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - sodium module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/sodium.so" + } +} + +php8.1-ffi_package() { + lib32disabled=yes + depends="php${_php_version}-${version}_${revision}" + short_desc+=' - FFI module' + pkg_install() { + vmove "usr/lib/php${_php_version}/modules/ffi.so" + } +} diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update new file mode 100644 index 00000000000..0c2792ec963 --- /dev/null +++ b/srcpkgs/php8.1/update @@ -0,0 +1,2 @@ +pkgname=php +ignore="8.[2-9].*" From b66546ee6025089555fa2fad0e5164fd76e3e218 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 15:29:51 -0400 Subject: [PATCH 1485/2369] New package: php8.1-apcu-5.1.21 --- srcpkgs/php8.1-apcu/INSTALL.msg | 3 +++ srcpkgs/php8.1-apcu/template | 29 +++++++++++++++++++++++++++++ srcpkgs/php8.1-apcu/update | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 srcpkgs/php8.1-apcu/INSTALL.msg create mode 100644 srcpkgs/php8.1-apcu/template create mode 100644 srcpkgs/php8.1-apcu/update diff --git a/srcpkgs/php8.1-apcu/INSTALL.msg b/srcpkgs/php8.1-apcu/INSTALL.msg new file mode 100644 index 00000000000..9da8a70ccc2 --- /dev/null +++ b/srcpkgs/php8.1-apcu/INSTALL.msg @@ -0,0 +1,3 @@ +To enable APCu add the following line to your php.ini: + + extension=apcu.so diff --git a/srcpkgs/php8.1-apcu/template b/srcpkgs/php8.1-apcu/template new file mode 100644 index 00000000000..60d5ca79143 --- /dev/null +++ b/srcpkgs/php8.1-apcu/template @@ -0,0 +1,29 @@ +# Template file for 'php8.1-apcu' +pkgname=php8.1-apcu +version=5.1.21 +revision=1 +wrksrc="apcu-${version}" +build_style=gnu-configure +configure_args="--with-php-config=/usr/bin/php-config8.1" +make_check_target=test +hostmakedepends="autoconf php8.1-devel" +makedepends="php8.1-devel pcre2-devel" +depends="php8.1" +short_desc="In-memory key-value store for PHP" +maintainer="Joel Beckmeyer " +license="PHP-3.01" +homepage="https://pecl.php.net/package/APCu" +distfiles="https://pecl.php.net/get/apcu-${version}.tgz" +checksum=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1 + +pre_configure() { + phpize8.1 +} + +pre_install() { + make_install_args="INSTALL_ROOT=$DESTDIR" +} + +post_install() { + rm -r $DESTDIR/usr/include +} diff --git a/srcpkgs/php8.1-apcu/update b/srcpkgs/php8.1-apcu/update new file mode 100644 index 00000000000..ad899519e31 --- /dev/null +++ b/srcpkgs/php8.1-apcu/update @@ -0,0 +1,2 @@ +site="https://pecl.php.net/package/APCu" +pattern="apcu-\K[\d\.]*(?=\.tgz)" From 198cf44e5be8a56b68b1f0f4df4de98bd64e5be1 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 15:30:37 -0400 Subject: [PATCH 1486/2369] New package: php8.1-ast-1.0.16 --- srcpkgs/php8.1-ast/INSTALL.msg | 2 ++ srcpkgs/php8.1-ast/template | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 srcpkgs/php8.1-ast/INSTALL.msg create mode 100644 srcpkgs/php8.1-ast/template diff --git a/srcpkgs/php8.1-ast/INSTALL.msg b/srcpkgs/php8.1-ast/INSTALL.msg new file mode 100644 index 00000000000..0dd0b5df2d9 --- /dev/null +++ b/srcpkgs/php8.1-ast/INSTALL.msg @@ -0,0 +1,2 @@ +To enable the ast extension please add the following to php.ini: + extension=ast.so diff --git a/srcpkgs/php8.1-ast/template b/srcpkgs/php8.1-ast/template new file mode 100644 index 00000000000..549b8fcc1bc --- /dev/null +++ b/srcpkgs/php8.1-ast/template @@ -0,0 +1,25 @@ +# Template file for 'php8.1-ast' +pkgname=php8.1-ast +version=1.0.16 +revision=1 +wrksrc="ast-${version}" +build_style=gnu-configure +configure_args="--with-php-config=/usr/bin/php-config8.1" +hostmakedepends="php8.1-devel autoconf" +makedepends="php8.1-devel" +depends="php8.1" +short_desc="Exposes the abstract syntax tree generated by PHP" +maintainer="Joel Beckmeyer " +license="BSD-3-Clause" +homepage="https://github.com/nikic/php-ast" +distfiles="https://pecl.php.net/get/ast-${version}.tgz" +checksum=45bda34b780c4661ce77cf65cd8a504fb56526d4b456edcc97d791c86f3879ce + +pre_configure() { + phpize8.1 +} + +do_install() { + make INSTALL_ROOT=${DESTDIR} install + vlicense LICENSE +} From 0138b1ef1e47321d767a504952170c07e7eeb59f Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 15:31:06 -0400 Subject: [PATCH 1487/2369] New package: php8.1-igbinary-3.2.7 --- srcpkgs/php8.1-igbinary/template | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/php8.1-igbinary/template diff --git a/srcpkgs/php8.1-igbinary/template b/srcpkgs/php8.1-igbinary/template new file mode 100644 index 00000000000..14fadb10e25 --- /dev/null +++ b/srcpkgs/php8.1-igbinary/template @@ -0,0 +1,25 @@ +# Template file for 'php8.1-igbinary' +pkgname=php8.1-igbinary +version=3.2.7 +revision=1 +wrksrc="igbinary-${version}" +build_style=gnu-configure +configure_args="--with-php-config=/usr/bin/php-config8.1" +hostmakedepends="autoconf php8.1-devel" +makedepends="php8.1-devel" +depends="php8.1" +short_desc="Igbinary is a drop in replacement for the standard php serializer" +maintainer="Joel Beckmeyer " +license="BSD-3-Clause" +homepage="https://github.com/igbinary/igbinary/" +distfiles="https://pecl.php.net/get/igbinary-${version}.tgz" +checksum=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d + +pre_configure() { + phpize8.1 +} + +do_install() { + make INSTALL_ROOT="${DESTDIR}" install + vlicense COPYING +} From c3b0dfb3ee2de0d349460f270740292598484cb9 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 15:31:33 -0400 Subject: [PATCH 1488/2369] New package: php8.1-imagick-3.7.0 --- srcpkgs/php8.1-imagick/INSTALL.msg | 3 ++ ...le-libmagick-header-file-search-path.patch | 17 +++++++++++ srcpkgs/php8.1-imagick/template | 29 +++++++++++++++++++ srcpkgs/php8.1-imagick/update | 1 + 4 files changed, 50 insertions(+) create mode 100644 srcpkgs/php8.1-imagick/INSTALL.msg create mode 100644 srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch create mode 100644 srcpkgs/php8.1-imagick/template create mode 100644 srcpkgs/php8.1-imagick/update diff --git a/srcpkgs/php8.1-imagick/INSTALL.msg b/srcpkgs/php8.1-imagick/INSTALL.msg new file mode 100644 index 00000000000..00497519fce --- /dev/null +++ b/srcpkgs/php8.1-imagick/INSTALL.msg @@ -0,0 +1,3 @@ +To enable the Imagick extension add the following line to your php.ini: + + extension=imagick.so diff --git a/srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch new file mode 100644 index 00000000000..16b8aaa5737 --- /dev/null +++ b/srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch @@ -0,0 +1,17 @@ +--- a/imagemagick.m4 2021-09-09 10:53:42.287881616 +0200 ++++ b/imagemagick.m4 2021-09-09 11:14:47.662312430 +0200 +@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[ + + AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h]) + ++ elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then ++ ++ IM_INCLUDE_FORMAT="MagickWand/MagickWand.h" ++ IM_HEADER_STYLE="SEVEN" ++ AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header]) ++ ++ AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h]) ++ + elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then + + IM_INCLUDE_FORMAT="MagickWand/MagickWand.h" diff --git a/srcpkgs/php8.1-imagick/template b/srcpkgs/php8.1-imagick/template new file mode 100644 index 00000000000..6cd0c4098d6 --- /dev/null +++ b/srcpkgs/php8.1-imagick/template @@ -0,0 +1,29 @@ +# Template file for 'php8.1-imagick' +pkgname=php8.1-imagick +version=3.7.0 +revision=1 +wrksrc="imagick-$version" +build_style=gnu-configure +configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \ + --with-php-config=/usr/bin/php-config8.1" +hostmakedepends="php8.1-devel autoconf pkg-config" +makedepends="php8.1-devel pcre2-devel libmagick-devel" +depends="php8.1" +short_desc="Provides a PHP wrapper to the ImageMagick library" +maintainer="Joel Beckmeyer " +license="PHP-3.01" +homepage="https://pecl.php.net/package/imagick" +distfiles="https://pecl.php.net/get/imagick-$version.tgz" +checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e + +pre_configure() { + phpize8.1 +} + +pre_install() { + make_install_args="INSTALL_ROOT=$DESTDIR" +} + +post_install() { + rm -r $DESTDIR/usr/include +} diff --git a/srcpkgs/php8.1-imagick/update b/srcpkgs/php8.1-imagick/update new file mode 100644 index 00000000000..fb47044a964 --- /dev/null +++ b/srcpkgs/php8.1-imagick/update @@ -0,0 +1 @@ +pattern=')' From aa78e3790db6558d059c4fa3738a6ab08f2b2d76 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 15:29:23 -0400 Subject: [PATCH 1489/2369] New package: composer8.1-2.3.5 --- srcpkgs/composer8.1/files/composer8.1 | 2 ++ srcpkgs/composer8.1/template | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 srcpkgs/composer8.1/files/composer8.1 create mode 100644 srcpkgs/composer8.1/template diff --git a/srcpkgs/composer8.1/files/composer8.1 b/srcpkgs/composer8.1/files/composer8.1 new file mode 100644 index 00000000000..a3f41b8b557 --- /dev/null +++ b/srcpkgs/composer8.1/files/composer8.1 @@ -0,0 +1,2 @@ +#!/bin/sh +php8.1 -f /usr/libexec/composer.phar8.1 "$@" diff --git a/srcpkgs/composer8.1/template b/srcpkgs/composer8.1/template new file mode 100644 index 00000000000..9ae0765cf0d --- /dev/null +++ b/srcpkgs/composer8.1/template @@ -0,0 +1,26 @@ +# Template file for 'composer8.1' +pkgname=composer8.1 +version=2.3.5 +revision=1 +build_style=fetch +depends="php8.1" +short_desc="Dependency manager for PHP" +maintainer="Joel Beckmeyer " +license="MIT" +homepage="https://getcomposer.org/" +changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md" +distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar + https://raw.githubusercontent.com/composer/composer/main/LICENSE" +checksum="3b3b5a899c06a46aec280727bdf50aad14334f6bc40436ea76b07b650870d8f4 + 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c" + +do_install() { + vbin ${FILESDIR}/composer8.1 + + vinstall composer.phar 644 usr/libexec composer.phar8.1 + vlicense LICENSE + + vmkdir /etc/php8.1/conf.d + printf 'extension=%s\n' phar iconv openssl zip \ + >${DESTDIR}/etc/php8.1/conf.d/composer.ini +} From 33ead8059f93dec5bd34d041455bfd811ff34ea0 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 15 Mar 2022 15:31:58 -0400 Subject: [PATCH 1490/2369] New package: xdebug8.1-3.1.4 --- srcpkgs/xdebug8.1/INSTALL.msg | 1 + srcpkgs/xdebug8.1/template | 29 +++++++++++++++++++++++++++++ srcpkgs/xdebug8.1/update | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 srcpkgs/xdebug8.1/INSTALL.msg create mode 100644 srcpkgs/xdebug8.1/template create mode 100644 srcpkgs/xdebug8.1/update diff --git a/srcpkgs/xdebug8.1/INSTALL.msg b/srcpkgs/xdebug8.1/INSTALL.msg new file mode 100644 index 00000000000..04e3343216f --- /dev/null +++ b/srcpkgs/xdebug8.1/INSTALL.msg @@ -0,0 +1 @@ +You should add 'zend_extension="xdebug.so"' to php.ini diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template new file mode 100644 index 00000000000..62fa2b795f4 --- /dev/null +++ b/srcpkgs/xdebug8.1/template @@ -0,0 +1,29 @@ +# Template file for 'xdebug8.1' +pkgname=xdebug8.1 +version=3.1.4 +revision=1 +wrksrc="xdebug-${version}" +build_style=gnu-configure +configure_args="--with-php-config=/usr/bin/php-config8.1" +hostmakedepends="autoconf" +makedepends="php8.1-devel" +short_desc="PHP debugging extension" +maintainer="Joel Beckmeyer " +license="PHP-3.0" +homepage="http://xdebug.org" +changelog="https://xdebug.org/updates" +distfiles="http://xdebug.org/files/xdebug-${version}.tgz" +checksum=4195926f9f6c4e802ff749bb2ca85ac50636719a72e5389e372e35ef523505f9 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" php8.1-devel" +fi + +pre_configure() { + phpize8.1 +} + +do_install() { + make INSTALL_ROOT=${DESTDIR} install + vlicense LICENSE +} diff --git a/srcpkgs/xdebug8.1/update b/srcpkgs/xdebug8.1/update new file mode 100644 index 00000000000..280b0bc7e3a --- /dev/null +++ b/srcpkgs/xdebug8.1/update @@ -0,0 +1,2 @@ +site="https://xdebug.org/updates" +pattern='
.*Xdebug \K[\d.]+(?=
)' From 7b5c0b9dbbc31f78f9bf25379cd7d3f17344c43a Mon Sep 17 00:00:00 2001 From: PaperStork Date: Thu, 28 Apr 2022 14:30:05 +0200 Subject: [PATCH 1491/2369] scaleway-cli: update to 2.5.1. --- srcpkgs/scaleway-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template index 89407918a7a..caad6e99dde 100644 --- a/srcpkgs/scaleway-cli/template +++ b/srcpkgs/scaleway-cli/template @@ -1,6 +1,6 @@ # Template file for 'scaleway-cli' pkgname=scaleway-cli -version=2.4.0 +version=2.5.1 revision=1 build_style=go go_import_path=github.com/scaleway/scaleway-cli @@ -10,7 +10,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/scaleway/scaleway-cli" distfiles="https://github.com/scaleway/scaleway-cli/archive/v${version}.tar.gz" -checksum=7baa6d7af5602703bc9b1f54beb5a36642151cc12d6584d6ab76df8bb088365e +checksum=af926168122c192b10a19d701f2a03a41f14897b2a6c654499203edd2aafcafe post_install() { vdoc README.md README From 71efc34ed2f69f37c0ea7178492a9e2c2c0ebb1b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Apr 2022 12:30:31 +0200 Subject: [PATCH 1492/2369] cpanminus: update to 1.7046. --- srcpkgs/cpanminus/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cpanminus/template b/srcpkgs/cpanminus/template index 49ee16c6124..caa1f64e9ba 100644 --- a/srcpkgs/cpanminus/template +++ b/srcpkgs/cpanminus/template @@ -1,6 +1,6 @@ # Template file for 'cpanminus' pkgname=cpanminus -version=1.7045 +version=1.7046 revision=1 wrksrc="App-${pkgname}-${version}" build_style=perl-module @@ -12,4 +12,4 @@ maintainer="Leah Neukirchen " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/App-cpanminus" distfiles="${CPAN_SITE}/App/App-${pkgname}-${version}.tar.gz" -checksum=ac4e4adc23fec0ab54f088aca511f5a57d95e6c97a12a1cb98eed1fe0fe0e99c +checksum=3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862 From f3f12d3a440e677bf6cd1d81984b9820cfb523bc Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Apr 2022 12:39:21 +0200 Subject: [PATCH 1493/2369] xorgproto: update to 2022.1. --- srcpkgs/xorgproto/template | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template index e5a9b43ba34..525ac182658 100644 --- a/srcpkgs/xorgproto/template +++ b/srcpkgs/xorgproto/template @@ -1,16 +1,16 @@ # Template file for 'xorgproto' pkgname=xorgproto -version=2021.5 +version=2022.1 revision=1 -build_style=gnu-configure -configure_args="--enable-legacy" +build_style=meson +configure_args="-Dlegacy=true" hostmakedepends="xorg-util-macros" short_desc="Combined X.Org X11 Protocol headers" maintainer="Leah Neukirchen " license="MIT" homepage="https://xorg.freedesktop.org" distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.gz" -checksum=be6ddd6590881452fdfa170c1c9ff87209a98d36155332cbf2ccbc431add86ff +checksum=2a399e77d98fe53e9056726a1934b62cbaa6c41d7b1f41a354911b0925363343 replaces="bigreqsproto>=0 compositeproto>=0 damageproto>=0 dmxproto>=0 dri2proto>=0 dri3proto>=0 fixesproto>=0 fontsproto>=0 glproto>=0 inputproto>=0 kbproto>=0 presentproto>=0 printproto>=0 randrproto>=0 recordproto>=0 renderproto>=0 resourceproto>=0 scrnsaverproto>=0 @@ -32,11 +32,6 @@ provides="bigreqsproto-${version}_${revision} compositeproto-${version}_${revisi xproto-${version}_${revision} xf86bigfontproto-${version}_${revision} fontcacheproto-${version}_${revision}" -post_configure() { - # man/Xprint.7 is can't be generated thus remove the rule - sed -i Makefile -e "s;\(miscman_DATA =\).*;\1;" -} - post_install() { for license in COPYING-* ; do vlicense $license From 662b3ebae1f252794a9c1a24eed35e40dd2e4654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?= Date: Wed, 27 Apr 2022 19:28:54 +0200 Subject: [PATCH 1494/2369] libopenal: update to 1.22.0, adopt --- srcpkgs/libopenal/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template index c89016a3584..a396607b7ea 100644 --- a/srcpkgs/libopenal/template +++ b/srcpkgs/libopenal/template @@ -1,19 +1,19 @@ # Template file for 'libopenal' pkgname=libopenal -version=1.21.0 +version=1.22.0 revision=1 wrksrc="openal-soft-${version}" build_style=cmake -configure_args="-DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF" +configure_args="-DALSOFT_EXAMPLES=OFF" hostmakedepends="pkg-config" makedepends="zlib-devel alsa-lib-devel pulseaudio-devel SDL2-devel ffmpeg-devel jack-devel $(vopt_if sndio sndio-devel)" short_desc="Cross-platform 3D audio library" -maintainer="Orphaned " +maintainer="Sigrid Solveig Haflínudóttir " license="LGPL-2.1-or-later" homepage="http://openal-soft.org/" distfiles="http://openal-soft.org/openal-releases/openal-soft-${version}.tar.bz2" -checksum=2916b4fc24e23b0271ce0b3468832ad8b6d8441b1830215b28cc4fee6cc89297 +checksum=ce0f9300de3de7bc737b0be2a995619446e493521d070950eea53eddd533fc9b build_options="sndio" build_options_default="sndio" From b65d790d56224c0a5cf51562eb77bb48d98a650b Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 29 Apr 2022 13:34:34 +0100 Subject: [PATCH 1495/2369] inspircd: update to 3.13.0. --- srcpkgs/inspircd/INSTALL.msg | 2 +- srcpkgs/inspircd/template | 26 ++++++++++---------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/srcpkgs/inspircd/INSTALL.msg b/srcpkgs/inspircd/INSTALL.msg index 8f2d589b175..28be2fc456b 100644 --- a/srcpkgs/inspircd/INSTALL.msg +++ b/srcpkgs/inspircd/INSTALL.msg @@ -1,2 +1,2 @@ You need to create a configuration file before running inspircd. -Example configuration can be found at /etc/inspircd/examples/ +Example configuration can be found at /usr/share/doc/inspircd diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template index 86a42adea5a..d80ffdef290 100644 --- a/srcpkgs/inspircd/template +++ b/srcpkgs/inspircd/template @@ -1,20 +1,21 @@ # Template file for 'inspircd' pkgname=inspircd -version=3.10.0 +version=3.13.0 revision=1 build_style=gnu-makefile hostmakedepends="perl pkg-config" -makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel" +makedepends="gnutls-devel libmaxminddb-devel openssl-devel sqlite-devel" short_desc="Modular Internet Relay Chat server" maintainer="Alexander Gehrke " license="GPL-2.0-only" homepage="http://www.inspircd.org/" distfiles="https://github.com/inspircd/inspircd/archive/v${version}.tar.gz" -checksum=9bbf3581fc1a9443ef4c4595b208e5b8852483cb78b20fe3e98d225fa4538982 +checksum=0a4534114f5db1602c53ca4cfbb5ad623b9f990737d8c8f85890d8de47165729 system_accounts="inspircd" inspircd_homedir="/var/lib/inspircd" make_dirs=" + /run/inspircd 0750 ${pkgname} ${pkgname} /var/log/inspircd 0750 ${pkgname} ${pkgname} /var/lib/inspircd 0750 ${pkgname} ${pkgname}" @@ -26,24 +27,17 @@ pre_configure() { } do_configure() { - ./configure --enable-extras=m_ssl_openssl.cpp,m_regex_posix.cpp,m_sqlite3.cpp ./configure \ - --prefix=/usr \ - --config-dir=/etc/inspircd \ - --log-dir=/var/log/inspircd \ - --data-dir=/var/lib/inspircd \ - --manual-dir=/usr/share/man/man1 \ - --module-dir=/usr/lib/${pkgname}/modules \ - --binary-dir=/usr/bin \ + --enable-extras "geo_maxmind regex_posix regex_stdlib ssl_gnutls ssl_openssl sslrehashsignal sqlite3" + ./configure \ + --binary-dir /usr/bin \ + --disable-auto-extras \ + --disable-ownership \ --distribution-label voidlinux-${revision} \ - --gid 0 \ - --uid 0 \ - --disable-interactive + --system vsed -i 's/-ldl/& -lm/' GNUmakefile } post_install() { vsv inspircd - rm ${DESTDIR}/usr/${pkgname} - rm ${DESTDIR}/usr/inspircd.service } From c92b821ed210170ff867712ef990a9c26efbb205 Mon Sep 17 00:00:00 2001 From: Tuxliban Torvalds Date: Fri, 29 Apr 2022 11:17:11 -0500 Subject: [PATCH 1496/2369] oksh: update to 7.1 --- srcpkgs/oksh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/oksh/template b/srcpkgs/oksh/template index d41bc21f75f..79f73084b93 100644 --- a/srcpkgs/oksh/template +++ b/srcpkgs/oksh/template @@ -1,6 +1,6 @@ # Template file for 'oksh' pkgname=oksh -version=7.0 +version=7.1 revision=1 build_style=gnu-configure makedepends="ncurses-devel" @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="Public Domain" homepage="https://github.com/ibara/oksh" distfiles="https://github.com/ibara/oksh/releases/download/oksh-${version}/oksh-${version}.tar.gz" -checksum=21d5891f38ffea3a5d1aa8c494f0a5579c93778535e0a92275b102dec3221da1 +checksum=9dc0b0578d9d64d10c834f9757ca11f526b562bc5454da64b2cb270122f52064 register_shell="/bin/oksh" alternatives=" From a2350438317745ab0b4284ebf7720968332d8be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Sat, 30 Apr 2022 06:39:15 +0200 Subject: [PATCH 1497/2369] you-get: update to 0.4.1602. --- srcpkgs/you-get/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/you-get/template b/srcpkgs/you-get/template index c376e137b6c..71de2bf4e56 100644 --- a/srcpkgs/you-get/template +++ b/srcpkgs/you-get/template @@ -1,6 +1,6 @@ # Template file for 'you-get' pkgname=you-get -version=0.4.1555 +version=0.4.1602 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="MIT" homepage="https://you-get.org/" distfiles="${PYPI_SITE}/y/you-get/you-get-${version}.tar.gz" -checksum=99282aca720c7ee1d9ef4b63bbbd226e906ea170b789a459fafd5b0627b0b15f +checksum=4706c06cc4b9080ea93b4f13b9a4dbebb60cfe12d191c78e17b0fa895d17708f post_install() { vlicense LICENSE.txt From f82aaba81335cb76478f019bba5c035773fc8338 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 30 Apr 2022 08:02:25 +0200 Subject: [PATCH 1498/2369] linux5.4: update to 5.4.191. --- 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 25d8aeea2d8..1380552916a 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.190 +version=5.4.191 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=81d4e707775d55a20bcb30d22c61e91fafba057a5080918338b2f7542873f194 +checksum=288ca85fcdad18e950ccbe3d640594ee36d5aac226321ed935076fadb0cc0a3a python_version=3 nodebug=yes # -dbg package is generated below manually From 5f946fd5c5ac057947d7ae2987e477438ac13e0c Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 30 Apr 2022 08:25:09 +0200 Subject: [PATCH 1499/2369] linux4.19: update to 4.19.240. --- 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 a44ed5b0cd2..725d28a4a21 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.239 +version=4.19.240 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=bf7c5dc26c9a3113e43e4d32f73228788f8f6f005b9ddba379378786bc4c593b +checksum=72ac1fd5bdf9b1d0a6da1237692a0570028cb994e750f99992d374eb9fdd46c2 python_version=3 nodebug=yes # -dbg package is generated below manually From 06145720001c11de71f4d8a41fbd2b3dfcc50c35 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 30 Apr 2022 16:33:34 +0200 Subject: [PATCH 1500/2369] sbcl: update to 2.2.4. --- srcpkgs/sbcl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index b78c2520298..984a1f24ac0 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,6 +1,6 @@ # Template file for 'sbcl' pkgname=sbcl -version=2.2.3 +version=2.2.4 revision=1 archs="i686 x86_64* armv7l aarch64 ppc64le*" hostmakedepends="iana-etc texinfo" @@ -12,7 +12,7 @@ license="custom:BSD+public_domain" homepage="http://www.sbcl.org/" changelog="http://www.sbcl.org/news.html" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2" -checksum=de7f49e1f7750fd2cd89111ef70641cc5471355f621b737392ac68aa95f37f9f +checksum=fcdd251cbc65f7f808ed0ad77246848d1be166aa69a17f7499600184b7a57202 nocross=yes nopie=yes @@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d case "$XBPS_TARGET_MACHINE" in x86_64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2" - checksum+=" 8745f9358b686819209e188a93fb8cf5b4227a3f623af20504a68d129a314256" + checksum+=" 33b0d3ec4e71855b3c5c564ccc0759c09b3ed7ab65e7c4d7e80c519107635851" ;; arm*) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2" From 7ecc32dbc4a2d86c1dbc79f26489a6e4a01187a7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 30 Apr 2022 16:36:13 +0200 Subject: [PATCH 1501/2369] perl-LWP: update to 6.64. --- srcpkgs/perl-LWP/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template index c3fe1fd7ac9..a093660fbda 100644 --- a/srcpkgs/perl-LWP/template +++ b/srcpkgs/perl-LWP/template @@ -1,6 +1,6 @@ # Template file for 'perl-LWP' pkgname=perl-LWP -version=6.63 +version=6.64 revision=1 wrksrc="libwww-perl-${version}" build_style=perl-module @@ -17,4 +17,4 @@ maintainer="Leah Neukirchen " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/libwww-perl" distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz" -checksum=6e6a9479affdf23d7de91b6e2e1b903669af6296840a88c41e86d18067db7f17 +checksum=48335e0992b4875bd73c6661439f3506c2c6d92b5dd601582b8dc22e767d3dae From 68215c60bc1a21c2f560b4e17aecca03970bbb3b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 30 Apr 2022 16:38:20 +0200 Subject: [PATCH 1502/2369] perl-WWW-Mechanize: update to 2.07. --- srcpkgs/perl-WWW-Mechanize/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template index 6df7be5b4ba..6b2e839a781 100644 --- a/srcpkgs/perl-WWW-Mechanize/template +++ b/srcpkgs/perl-WWW-Mechanize/template @@ -1,6 +1,6 @@ # Template file for 'perl-WWW-Mechanize' pkgname=perl-WWW-Mechanize -version=2.06 +version=2.07 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -16,4 +16,4 @@ maintainer="Leah Neukirchen " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/WWW-Mechanize" distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz" -checksum=d97cd31e35fd1ff7078d3f568b62e3fe3911843a64d3c2d078eebd3ff9b8b38d +checksum=9863cedcffc6b032664992c27fe7cb4bf5f9ce89452e77dc960d1a4a3349e783 From 3bc3053c26a450954408a0eb9aed796c8d525240 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 30 Apr 2022 16:49:27 +0200 Subject: [PATCH 1503/2369] knot: update to 3.1.8. --- srcpkgs/knot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template index a8f43d8d92a..13dcf355e6e 100644 --- a/srcpkgs/knot/template +++ b/srcpkgs/knot/template @@ -1,6 +1,6 @@ # Template file for 'knot' pkgname=knot -version=3.1.7 +version=3.1.8 revision=1 build_style=gnu-configure configure_args=" @@ -18,7 +18,7 @@ maintainer="Duncaen " license="GPL-3.0-or-later" homepage="https://www.knot-dns.cz/" distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz" -checksum=ffb6887e238ce4c7df0cc76bb55a5093465275201ac12156a3390782dc49857b +checksum=767e458a56277a1270b359294c3be6c63fd734884d62a045e01756a46507aa94 system_accounts="_knot" _knot_homedir="/var/lib/knot" From 2bee23ce14cb4d79f7fb788554f2cb0285d05416 Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Sat, 30 Apr 2022 09:17:05 +0200 Subject: [PATCH 1504/2369] loksh: Update to 7.1 --- srcpkgs/loksh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/loksh/template b/srcpkgs/loksh/template index 634269418f4..da0f03e5ee2 100644 --- a/srcpkgs/loksh/template +++ b/srcpkgs/loksh/template @@ -1,6 +1,6 @@ # Template file for 'loksh' pkgname=loksh -version=7.0 +version=7.1 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Renato Aguiar " license="custom:Public Domain" homepage="https://github.com/dimkr/loksh" distfiles="https://github.com/dimkr/loksh/releases/download/${version}/loksh-${version}.tar.xz" -checksum=413275c9a259629bbdb4ce97c610c45bc14a589f73cd51571ed82eec58e45840 +checksum=ab7d274a057b83bc64643664094031126641aa91ee440a96765279991aab6938 register_shell="/bin/loksh" alternatives=" From 288524f06fd32a1bb4076f37efb2ebfb837055d2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 30 Apr 2022 17:14:00 +0200 Subject: [PATCH 1505/2369] cwm: update to 7.1. --- srcpkgs/cwm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cwm/template b/srcpkgs/cwm/template index 4dcc6e11819..ce893dcec72 100644 --- a/srcpkgs/cwm/template +++ b/srcpkgs/cwm/template @@ -1,6 +1,6 @@ # Template file for 'cwm' pkgname=cwm -version=6.7 +version=7.1 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config bison" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="ISC" homepage="http://man.openbsd.org/cwm" distfiles="https://github.com/leahneukirchen/cwm/archive/v${version}.tar.gz" -checksum=fdd3d5b4fe9b1b03e1fc270d3dd5a031218589a8e40170e8438d2b9c44a35f08 +checksum=4a58c5cb4312d8d0f03ba657d7656c12d8d7c1277aeb1c05272984501597bd90 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" From afd03afc848b3ea46221ae9f305016cb5f78f0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 30 Apr 2022 23:36:17 -0300 Subject: [PATCH 1506/2369] tree-sitter: update to 0.20.6. post_patch update for autocfg can be removed once [1] is merged. [1] https://github.com/tree-sitter/tree-sitter/pull/1731 --- srcpkgs/tree-sitter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template index aae7b848d6e..660cf7043a6 100644 --- a/srcpkgs/tree-sitter/template +++ b/srcpkgs/tree-sitter/template @@ -1,6 +1,6 @@ # Template file for 'tree-sitter' pkgname=tree-sitter -version=0.20.2 +version=0.20.6 revision=1 build_style=cargo make_install_args="--path=cli" @@ -9,7 +9,7 @@ maintainer="Érico Nogueira " license="MIT" homepage="https://tree-sitter.github.io" distfiles="https://github.com/tree-sitter/tree-sitter/archive/v${version}.tar.gz" -checksum=2a0445f8172bbf83db005aedb4e893d394e2b7b33251badd3c94c2c5cc37c403 +checksum=4d37eaef8a402a385998ff9aca3e1043b4a3bba899bceeff27a7178e1165b9de make_check=no # tests require generating fixtures from remote repositories post_patch() { From 5b81df06974555fd43e2df0ed5064b0af7b46182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 30 Apr 2022 23:57:06 -0300 Subject: [PATCH 1507/2369] elfutils: update to 0.187. Update checkdepends for glibc; for musl, tests no longer compile properly due to using error(3) functions. To avoid uncaught test failures, add conditional so glibc with debug packages enabled results in failures if tests error out. --- ...ompilation-on-platforms-without-erro.patch | 35 ------------------- srcpkgs/elfutils/template | 17 ++++++--- 2 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch diff --git a/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch b/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch deleted file mode 100644 index 329baac2537..00000000000 --- a/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: =?UTF-8?q?=C3=89rico=20Nogueira?= -Date: Wed, 10 Nov 2021 21:11:55 -0300 -Subject: [PATCH] debuginfod: fix compilation on platforms without - -"system.h" only declares the error() function, so it needs to be in an -'extern "C"' block, otherwise linking fails. - -Since we are here, use quotes for "system.h" header, since it's a local -header, not a system one. - -Signed-off-by: Érico Nogueira ---- - debuginfod/debuginfod.cxx | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx -index 521cb529..764e7b94 100644 ---- a/debuginfod/debuginfod.cxx -+++ b/debuginfod/debuginfod.cxx -@@ -33,11 +33,11 @@ - - extern "C" { - #include "printversion.h" -+#include "system.h" - } - - #include "debuginfod.h" - #include --#include - - #include - #ifdef __GNUC__ --- -2.33.1 - diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index 5d37eb20eeb..1fe41abe92d 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,6 +1,6 @@ # Template file for 'elfutils' pkgname=elfutils -version=0.186 +version=0.187 revision=1 build_style=gnu-configure configure_args="--program-prefix=eu-" @@ -8,13 +8,13 @@ hostmakedepends="automake libtool pkg-config" _devel_depends="bzip2-devel liblzma-devel zlib-devel libzstd-devel" makedepends="${_devel_depends} libcurl-devel libarchive-devel sqlite-devel libmicrohttpd-devel" -checkdepends="zstd bzip2 curl rpm cpio" +checkdepends="zstd bzip2 curl rpm cpio iproute2 procps-ng" short_desc="Utilities to handle ELF object files" maintainer="Érico Nogueira " license="GPL-3.0-or-later" homepage="https://sourceware.org/elfutils/" distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2" -checksum=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177 +checksum=e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8 # subpackages require explicit ordering subpackages="debuginfod libdebuginfod libelf elfutils-devel" @@ -31,8 +31,15 @@ fi do_check() { # test failures also expected if building with debug disabled - make check ${makejobs} || - msg_warn "Failure in testsuite, expected on musl systems, at least\n" + make check ${makejobs} || { + if [ "$XBPS_TARGET_LIBC" = musl ]; then + msg_warn "Expected testsuite failure: using musl\n" + elif [ -z "$XBPS_DEBUG_PKGS" ]; then + msg_warn "Expected testsuite failure: debug is disabled\n" + else + msg_error "Testsuite failure\n" + fi + } } libdebuginfod_package() { From 2880719c0ddbefbcf3b4a619cd20a808c24d6c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sun, 1 May 2022 00:53:56 -0300 Subject: [PATCH 1508/2369] python3-md2gemini: update to 1.9.0. --- srcpkgs/python3-md2gemini/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-md2gemini/template b/srcpkgs/python3-md2gemini/template index 4b4f88c7233..6ae29b77849 100644 --- a/srcpkgs/python3-md2gemini/template +++ b/srcpkgs/python3-md2gemini/template @@ -1,7 +1,7 @@ # Template file for 'python3-md2gemini' pkgname=python3-md2gemini -version=1.8.1 -revision=2 +version=1.9.0 +revision=1 wrksrc="md2gemini-${version}" build_style=python3-module hostmakedepends="python3-setuptools python3-mistune2 python3-cjkwrap @@ -13,7 +13,7 @@ maintainer="Érico Nogueira " license="LGPL-3.0-only" homepage="https://github.com/makeworld-the-better-one/md2gemini" distfiles="${PYPI_SITE}/m/md2gemini/md2gemini-${version}.tar.gz" -checksum=3ef2bd2d9e2b4968a844a2858f721348429f3a0b5976bd1c324198538103ca55 +checksum=775cee2be36aa0f4b7ea2861f2ac7d80e113f78b40a58f92192b6c73f6c84e75 post_install() { # remove tests directory polluting site-packages From 8618cd3b4ceb7689dd0a6624afcb61ef2d94cd76 Mon Sep 17 00:00:00 2001 From: Tuxliban Torvalds Date: Sat, 23 Apr 2022 03:02:01 -0500 Subject: [PATCH 1509/2369] python3-telegram: update to 0.15.0 --- srcpkgs/python3-telegram/template | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-telegram/template b/srcpkgs/python3-telegram/template index b9eebe0fde9..13b971bbd6b 100644 --- a/srcpkgs/python3-telegram/template +++ b/srcpkgs/python3-telegram/template @@ -1,20 +1,23 @@ # Template file for 'python3-telegram' pkgname=python3-telegram -version=0.14.0 -revision=3 +version=0.15.0 +revision=1 wrksrc=python-telegram-${version} build_style=python3-module -hostmakedepends="python3" +hostmakedepends="python3-setuptools" depends="libtd python3-setuptools" +checkdepends="python3-pytest $depends" short_desc="Python library for building Telegram clients" maintainer="Orphaned " license="MIT" homepage="https://github.com/alexander-akhmetov/python-telegram" distfiles="https://github.com/alexander-akhmetov/python-telegram/archive/${version}.tar.gz" -checksum=11b0a2387bae642eb7f134fe35b9ef67b8183aa961412bcdfa86ff404beed897 +checksum=eaa9c883e9a6415590eaada88b39817247361ee2ba959526081a14f3e66ecc0b post_extract() { - rm -r telegram/lib + # mocked_resource.assert_called_once_with('telegram', 'lib/linux/libtdjson.so') + # AssertionError: Expected 'mock' to be called once. Called 0 times. + rm tests/test_tdjson.py } post_install() { From 7c86aca2e0500d32ab230fb4a90df3ebe216b132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Sat, 30 Apr 2022 06:51:47 +0200 Subject: [PATCH 1510/2369] croc: update to 9.5.5. --- srcpkgs/croc/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template index 5a4e8dcb655..5683587f735 100644 --- a/srcpkgs/croc/template +++ b/srcpkgs/croc/template @@ -1,16 +1,15 @@ # Template file for 'croc' pkgname=croc -version=9.5.4 +version=9.5.5 revision=1 build_style=go go_import_path=github.com/schollz/croc/v${version%%.*} -hostmakedepends="git" short_desc="Easily and securely send things from one computer to another" maintainer="Benjamín Albiñana " license="MIT" homepage="https://github.com/schollz/croc" distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz" -checksum=b89b9d1c2e27e5ca710a7c524f70361122b8b0fd374c0be18f1e7337acca7d07 +checksum=221ebf034e05ef8c06b2e2290dfb83c6f8b4b3f8a9168d6d826b87ed3c62d51a post_install() { vlicense LICENSE From ded38f266397e4fded4900aa3f59483bc0265b95 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Thu, 28 Apr 2022 01:02:44 -0400 Subject: [PATCH 1511/2369] tailscale: update to 1.24.2. --- srcpkgs/tailscale/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template index 9b6db1157ae..d2411f20921 100644 --- a/srcpkgs/tailscale/template +++ b/srcpkgs/tailscale/template @@ -1,6 +1,6 @@ # Template file for 'tailscale' pkgname=tailscale -version=1.24.0 +version=1.24.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=3c8fe851c440d5dbd9dba2f3242924a7d99e7df37b5ae098507a8feb3663c76f +checksum=f1fe7770b4e372ace47c5b0ac4cbe21af95c3a6fb1828ee4f407fcfe35b7958f post_install() { vlicense LICENSE From a3b1f1c5df6edcc771b5e6ec71f3faeab69852da Mon Sep 17 00:00:00 2001 From: Michal Tvrznik Date: Sat, 30 Apr 2022 19:13:28 +0200 Subject: [PATCH 1512/2369] emptty: update to 0.8.0. --- srcpkgs/emptty/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template index 2bbbbf4a11e..9ba3fd93c74 100644 --- a/srcpkgs/emptty/template +++ b/srcpkgs/emptty/template @@ -1,6 +1,6 @@ # Template file for 'emptty' pkgname=emptty -version=0.7.1 +version=0.8.0 revision=1 build_style=go go_import_path=github.com/tvrzna/emptty @@ -10,7 +10,7 @@ maintainer="xXR01I1Xx " license="MIT" homepage="https://github.com/tvrzna/emptty" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=1d86dc0623773d43f9ced8c699ee82c812065ba18ecf277061210392fb2ec56a +checksum=b1c67e1661f6cde6c3d9723f6602d2ec9e7dbe8f11caf72f06102750ebd2c636 conf_files="/etc/emptty/conf /etc/pam.d/emptty" post_install() { From 775b1898642640eeb21289e514f9cd0d4cba63e3 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 30 Apr 2022 17:43:45 +0300 Subject: [PATCH 1513/2369] rssguard: update to 4.2.2. --- srcpkgs/rssguard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template index 300f07694c4..9a775b634fd 100644 --- a/srcpkgs/rssguard/template +++ b/srcpkgs/rssguard/template @@ -1,6 +1,6 @@ # Template file for 'rssguard' pkgname=rssguard -version=4.2.1 +version=4.2.2 revision=1 build_style=cmake configure_args="-DUSE_WEBENGINE="false"" @@ -14,7 +14,7 @@ maintainer="mobinmob " license="GPL-3.0-only" homepage="https://github.com/martinrotter/rssguard" distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz" -checksum=b404e3d8310c58ffb337bf1d2eb2c7cc10a692b00ed2666af30bd0153413cc05 +checksum=8f92257efa9321c1d511a977870c9ad053778256fd3cd8e7b1003d49c97e7af8 post_install() { # Install rssguard icon manually From 264c0f0e5e8426605c87035e17b27569d9e8f32a Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 9 Apr 2022 21:13:28 +0300 Subject: [PATCH 1514/2369] Thunar: update to 4.16.11. --- srcpkgs/Thunar/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template index 70631d39f65..4656fbc6226 100644 --- a/srcpkgs/Thunar/template +++ b/srcpkgs/Thunar/template @@ -1,7 +1,7 @@ # Template file for 'Thunar' pkgname=Thunar reverts="4.17.0_1" -version=4.16.10 +version=4.16.11 revision=1 wrksrc=thunar-${version} build_style=gnu-configure @@ -16,9 +16,9 @@ short_desc="Thunar File Manager" maintainer="Ulf " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://docs.xfce.org/xfce/thunar/Start" -changelog="https://raw.githubusercontent.com/xfce-mirror/thunar/master/NEWS" +changelog="https://gitlab.xfce.org/xfce/thunar/-/raw/xfce-${version%.*}/NEWS" distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2" -checksum=f105c8f5abc50c411f6218f913561ae3a485826bd0cd09503a4772d015899c92 +checksum=f47dde90b2e5e3e31920a4f57ddd3670282d0a90870a45e89148fce41b2a8a1b post_install() { rm -rf ${DESTDIR}/usr/lib/systemd From eb65e34fdfca688eef842a79179c1b97d893027a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?= Date: Thu, 28 Apr 2022 17:52:51 +0200 Subject: [PATCH 1515/2369] SDL2: update to 2.0.22, adopt --- srcpkgs/SDL2/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template index db3afefab3c..640b57bbee1 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -1,6 +1,6 @@ # Template file for 'SDL2' pkgname=SDL2 -version=2.0.20 +version=2.0.22 revision=1 build_style=gnu-configure configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev @@ -10,12 +10,12 @@ hostmakedepends="pkg-config nasm" makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel libsamplerate-devel" short_desc="Simple DirectMedia Layer (version 2)" -maintainer="Orphaned " +maintainer="Sigrid Solveig Haflínudóttir " license="Zlib" homepage="https://www.libsdl.org/" changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt" distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz" -checksum=c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06 +checksum=fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e # Package build options build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11" From 02f052e94b520a6e0ea163fba348b7ad6ffe19d4 Mon Sep 17 00:00:00 2001 From: Martin Dimov Date: Thu, 28 Apr 2022 02:53:19 +0300 Subject: [PATCH 1516/2369] spotify: update to 1.1.84. --- srcpkgs/spotify/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template index 32d439d290f..0dba9c4293c 100644 --- a/srcpkgs/spotify/template +++ b/srcpkgs/spotify/template @@ -1,8 +1,8 @@ # Template file for 'spotify' pkgname=spotify -version=1.1.80 +version=1.1.84 revision=1 -_ver="${version}.699.gc3dac750_amd64" +_ver="${version}.716.gc5f8b819_amd64" _filename="spotify-client_${_ver}.deb" archs="x86_64" create_wrksrc=yes @@ -14,7 +14,7 @@ maintainer="Stefan Mühlinghaus " license="custom:Proprietary" homepage="https://www.spotify.com" distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/${_filename}" -checksum=19f80255b89d768969ff9d6a05d90091a30c05f65eabdd968592d47a7754b80e +checksum=08e6b2666dc2a39624890e553a3046d05ecebe17bcc2fe930d49314b2fb812c7 _license_checksum=4465d0bba5deb87866184b04ba76604cd93561c0dc9cd21cacdf5b0295bdae3a repository=nonfree restricted=yes From d7564d0a6d3eb18f4ad78dc8611857183532a3b3 Mon Sep 17 00:00:00 2001 From: ologantr Date: Sat, 30 Apr 2022 10:38:10 +0200 Subject: [PATCH 1517/2369] apache: update to 2.4.53, adopt. Fixes CVE-2022-23943, CVE-2022-22721, CVE-2022-22720, CVE-2022-22719. --- srcpkgs/apache/patches/libressl.patch | 11 ----------- srcpkgs/apache/template | 15 +++++++++------ 2 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/apache/patches/libressl.patch diff --git a/srcpkgs/apache/patches/libressl.patch b/srcpkgs/apache/patches/libressl.patch deleted file mode 100644 index 300bd7ee1fa..00000000000 --- a/srcpkgs/apache/patches/libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/modules/ssl/ssl_engine_init.c.orig 2018-10-30 16:25:09.084840429 +0100 -+++ b/modules/ssl/ssl_engine_init.c 2018-10-30 16:25:55.019411636 +0100 -@@ -1492,7 +1492,7 @@ - X509_STORE_CTX *sctx; - X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx); - --#if OPENSSL_VERSION_NUMBER >= 0x1010100fL -+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) - /* For OpenSSL >=1.1.1, turn on client cert support which is - * otherwise turned off by default (by design). - * https://github.com/openssl/openssl/issues/6933 */ diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 2cdb6ca2f44..812286b52f2 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,6 +1,6 @@ # Template file for 'apache' pkgname=apache -version=2.4.52 +version=2.4.53 revision=1 wrksrc="httpd-${version}" build_style=gnu-configure @@ -19,24 +19,23 @@ configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all --enable-dav --enable-info --enable-cgi --enable-cgid --enable-dav-fs --enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so --enable-rewrite --enable-layout=XBPS --sysconfdir=/etc/${pkgname} - --enable-mpms-shared=all --with-pcre=${XBPS_CROSS_BASE}/usr - --with-z=${XBPS_CROSS_BASE}/usr" + --enable-mpms-shared=all --with-z=${XBPS_CROSS_BASE}/usr" conf_files=" /etc/${pkgname}/extra/*.conf /etc/${pkgname}/httpd.conf /etc/${pkgname}/magic /etc/${pkgname}/mime.types" hostmakedepends="pkg-config perl apr-util-devel" -makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel +makedepends="zlib-devel libuuid-devel pcre2-devel nghttp2-devel openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel" depends="apache-htpasswd" short_desc="Apache http server" -maintainer="Orphaned " +maintainer="ologantr " license="Apache-2.0" homepage="http://httpd.apache.org/" changelog="http://www.apache.org/dist/httpd/CHANGES_2.4" distfiles="https://dlcdn.apache.org/httpd/httpd-${version}.tar.bz2" -checksum=0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 +checksum=d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 system_accounts="_apache" _apache_homedir="/srv/www/$pkgname" @@ -63,6 +62,10 @@ pre_configure() { cat ${FILESDIR}/xbps.layout >> config.layout if [ "$CROSS_BUILD" ]; then + # pcre{,2}-config detection doesn't work on cross + # since httpd-2.4.53, manually export PCRE_CONFIG + # to let configure know where it is + export PCRE_CONFIG="${XBPS_CROSS_BASE}/usr/bin/pcre2-config" configure_args+=" --with-apr=$XBPS_WRAPPERDIR/apr-1-config --with-apr-util=$XBPS_WRAPPERDIR/apu-1-config" else From 3ac467debc1dadf9de2e2f40da07f28139f195ed Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 1 May 2022 12:55:30 +0200 Subject: [PATCH 1518/2369] bitmap: update to 1.1.0. --- srcpkgs/bitmap/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/bitmap/template b/srcpkgs/bitmap/template index 95b2d1556c2..a6455eeee1b 100644 --- a/srcpkgs/bitmap/template +++ b/srcpkgs/bitmap/template @@ -1,6 +1,6 @@ # Template file for 'bitmap' pkgname=bitmap -version=1.0.9 +version=1.1.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -9,8 +9,8 @@ short_desc="Bitmap editor and converter utilities for X" maintainer="Leah Neukirchen " license="MIT" homepage="http://xorg.freedesktop.org" -distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" -checksum=e0f3afad5272d796f54c33fa1b5bd1fb3f62843a54b28c87196d06a35123e5f5 +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" +checksum=8e86879c2feeece3f10e189330479cf51da0dd268355d1e3ee8a8497ab833690 conflicts="mesa-demos>0" post_install() { From 10354496be10b7d84e728255984595728c56661b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 1 May 2022 12:57:47 +0200 Subject: [PATCH 1519/2369] libX11: update to 1.8. --- srcpkgs/libX11/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template index e47acb6ecf6..4940467c5a2 100644 --- a/srcpkgs/libX11/template +++ b/srcpkgs/libX11/template @@ -1,6 +1,6 @@ # Template file for 'libX11' pkgname=libX11 -version=1.7.5 +version=1.8 revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="http://xorg.freedesktop.org/" distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz" -checksum=5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151 +checksum=081bf42ebab023aa92cfdb20c7af8c5ae13d13e88a5e22f90f4453ef80bbdde4 do_configure() { ./configure ${configure_args} From 2c15ad13b3899d51cccc3862cfe45ca08fb4df5b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 1 May 2022 13:00:08 +0200 Subject: [PATCH 1520/2369] slurm: update to 0.4.4. --- srcpkgs/slurm/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/slurm/template b/srcpkgs/slurm/template index 64ade843fce..c75b8ea1a66 100644 --- a/srcpkgs/slurm/template +++ b/srcpkgs/slurm/template @@ -1,22 +1,19 @@ # Template file for 'slurm' pkgname=slurm -version=0.4.3 -revision=5 +version=0.4.4 +revision=1 wrksrc="${pkgname}-upstream-${version}" -build_style="cmake" +build_style="meson" makedepends="ncurses-devel" short_desc="Yet another network load monitor" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/mattthias/slurm" distfiles="https://github.com/mattthias/slurm/archive/upstream/${version}.tar.gz" -checksum=b960c0d215927be1d02c176e1b189321856030226c91f840284886b727d3a3ac +checksum=2f846c9aa16f86cc0d3832c5cd1122b9d322a189f9e6acf8e9646dee12f9ac02 post_patch() { vsed -i '//d' os.h vsed -i 's,,,g' os.h vsed -i 's,,,g' os.h } -post_install() { - vman slurm.1 -} From 79f055d88867af23abae390bfbd1aedb74c3b3af Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 13:47:39 +0200 Subject: [PATCH 1521/2369] apostrophe: update to 2.6.3. --- srcpkgs/apostrophe/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template index 54a80188bda..ac880ca649a 100644 --- a/srcpkgs/apostrophe/template +++ b/srcpkgs/apostrophe/template @@ -1,6 +1,6 @@ # Template file for 'apostrophe' pkgname=apostrophe -version=2.6.2 +version=2.6.3 revision=1 wrksrc="$pkgname-v$version" build_style=meson @@ -15,4 +15,4 @@ license="GPL-3.0-only" homepage="https://gitlab.gnome.org/World/apostrophe" changelog="https://gitlab.gnome.org/World/apostrophe/-/raw/main/NEWS" distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz" -checksum=b06ca4593ceb21bcd7f9734e41ba3fb69f632b5ab24afcdc66500d18d242c068 +checksum=6f73c80146af0820ec705ec8b32ec64f0f323f51de6b6a4cfd4d02f0719876f3 From 504ed2bee3fac92070c7f3665df061e32be9c50c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 13:47:42 +0200 Subject: [PATCH 1522/2369] AppStream: update to 0.15.3. --- srcpkgs/AppStream/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template index b2d92072924..d30e5426335 100644 --- a/srcpkgs/AppStream/template +++ b/srcpkgs/AppStream/template @@ -1,6 +1,6 @@ # Template file for 'AppStream' pkgname=AppStream -version=0.15.2 +version=0.15.3 revision=1 wrksrc="appstream-${version}" build_style=meson @@ -17,7 +17,7 @@ license="GPL-2.0-or-later" homepage="https://github.com/ximion/appstream" changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS" distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz" -checksum=70c95545ac2cde87c9ba4a292648ed64ed1211fb24d792b5b9e84f870a83fe9d +checksum=349b4753c5e6d8118c8ea3883547b1fde11a8217ffd61248a181f18bdfc1670c conf_files="/etc/appstream.conf" triggers="appstream-cache" From c7a11df8b2d73914434c9de9730f94018aacec71 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 15:21:14 +0200 Subject: [PATCH 1523/2369] libadwaita: update to 1.1.1. --- srcpkgs/libadwaita/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template index aef0032bfb7..9a48617f470 100644 --- a/srcpkgs/libadwaita/template +++ b/srcpkgs/libadwaita/template @@ -1,6 +1,6 @@ # Template file for 'libadwaita' pkgname=libadwaita -version=1.1.0 +version=1.1.1 revision=1 build_style=meson build_helper="gir" @@ -15,7 +15,7 @@ maintainer="Michal Vasilek " license="LGPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/libadwaita/" distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz" -checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e +checksum=491169d4f6a11765328996bc088272d05c7235453bc0ee73c20dfd4bd67b401c build_options="gir gtk_doc" build_options_default="gir gtk_doc" From 3dac6dc8efa851d86c3583b9d7a0f4eac0c74e07 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 15:22:00 +0200 Subject: [PATCH 1524/2369] lagrange: update to 1.12.2. --- srcpkgs/lagrange/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template index 16787f411ee..12a3938f521 100644 --- a/srcpkgs/lagrange/template +++ b/srcpkgs/lagrange/template @@ -1,6 +1,6 @@ # Template file for 'lagrange' pkgname=lagrange -version=1.12.1 +version=1.12.2 revision=1 build_style=cmake hostmakedepends="pkg-config zip" @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://gmi.skyjake.fi/lagrange/" changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi" distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz" -checksum=8a342d9b7e980cd6d9771d72215dd543d411721685fb60fc2202e300cb5d6483 +checksum=cef0ef9543a87d3a4cc8ad83955f9a4e62af7bef4e786642c1ab5ec85ff8b950 post_install() { vlicense LICENSE.md From c8aefd56aafdc0e5db20b49fe886e3a88fd3c95a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 15:33:15 +0200 Subject: [PATCH 1525/2369] python3-mypy: update to 0.950. --- srcpkgs/python3-mypy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template index a92e1c803e4..ba0df7ee09d 100644 --- a/srcpkgs/python3-mypy/template +++ b/srcpkgs/python3-mypy/template @@ -1,6 +1,6 @@ # Template file for 'python3-mypy' pkgname=python3-mypy -version=0.942 +version=0.950 revision=1 wrksrc="mypy-${version}" build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Michal Vasilek " license="MIT" homepage="https://github.com/python/mypy" distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz" -checksum=17e44649fec92e9f82102b48a3bf7b4a5510ad0cd22fa21a104826b5db4903e2 +checksum=1b333cfbca1762ff15808a0ef4f71b5d3eed8528b23ea1c3fb50543c867d68de make_check=no # needs pytest-xdist and many tests fail post_install() { From c0ea22d2c99ca0ea582e2c8225fd36be62bd6faa Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 15:33:12 +0200 Subject: [PATCH 1526/2369] python3-astroid: update to 2.11.3. --- srcpkgs/python3-astroid/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template index ca5db18ccc7..8b0c64e8883 100644 --- a/srcpkgs/python3-astroid/template +++ b/srcpkgs/python3-astroid/template @@ -1,6 +1,6 @@ # Template file for 'python3-astroid' pkgname=python3-astroid -version=2.11.2 +version=2.11.3 revision=1 wrksrc="astroid-${version}" build_style=python3-module @@ -13,4 +13,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/PyCQA/astroid" changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog" distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz" -checksum=4a275523e2600c928ac95cda3ed7c1307dff2e6fbe24ef95ed867bda0fcaeab8 +checksum=455d18bfb08cec3bb61d273306c82cffc1de494c2ad4c67410494ebe6e192bc5 From 026f32eba93c4bcfd18817d25dfbe42f9a0f8609 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 15:23:03 +0200 Subject: [PATCH 1527/2369] pylint: update to 2.13.7. --- srcpkgs/pylint/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template index 2d53ba7420f..3a6db1a7ce3 100644 --- a/srcpkgs/pylint/template +++ b/srcpkgs/pylint/template @@ -1,6 +1,6 @@ # Template file for 'pylint' pkgname=pylint -version=2.13.5 +version=2.13.7 revision=1 build_style=python3-module make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py" @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://www.pylint.org/" changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog" distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz" -checksum=5450fd8014baf1663fb4860b7e1dc4f4c4eb9649598a210d68e97be0973c783f +checksum=c497a2b29e9c78322324e88b2303b388c28ed57a81601e365393ba68d976bc50 post_install() { # install example config and emacs files From 9bebb2de18658fbf3d0229c789fd29e34d4e4bc8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 15:47:47 +0200 Subject: [PATCH 1528/2369] gtk4: update to 4.6.3. --- srcpkgs/gtk4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index ed86ad7bab4..d26e4a18c43 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,6 +1,6 @@ # Template file for 'gtk4' pkgname=gtk4 -version=4.6.2 +version=4.6.3 revision=1 wrksrc="gtk-${version}" build_style=meson @@ -29,7 +29,7 @@ license="LGPL-2.1-or-later" homepage="https://www.gtk.org/" changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-6/NEWS" distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz" -checksum=ff263af609a50eb76056653592d929459aef4819a444c436f6d52c6f63c1faec +checksum=a57acd0e4482981700fdf86596c7413cb61ef47f75e4747fda809e8231b8d96c # Package build options build_options="broadway cloudproviders colord cups gir vulkan wayland x11" From 13306ff91ec770068c58e00084d6d4af01845a4a Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Sun, 10 Apr 2022 15:30:13 +0200 Subject: [PATCH 1529/2369] qpwgraph: update to 0.2.6. --- srcpkgs/qpwgraph/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qpwgraph/template b/srcpkgs/qpwgraph/template index 5e83972a706..3ecbdfb9e08 100644 --- a/srcpkgs/qpwgraph/template +++ b/srcpkgs/qpwgraph/template @@ -1,15 +1,15 @@ # Template file for 'qpwgraph' pkgname=qpwgraph -version=0.2.4 +version=0.2.6 revision=1 wrksrc="qpwgraph-v${version}" build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" -makedepends="alsa-lib-devel pipewire-devel qt5-devel" +makedepends="alsa-lib-devel pipewire-devel qt5-devel qt5-svg-devel" short_desc="Graph manager for PipeWire" maintainer="Frank Steinborn " license="GPL-2.0-or-later" homepage="https://gitlab.freedesktop.org/rncbc/qpwgraph" changelog="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/ChangeLog" distfiles="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/archive/v${version}/qpwgraph-v${version}.tar.gz" -checksum=5e2ad77e794367e3e1e6df5214e8770135941092ffac49bbbaaf7619decb54b5 +checksum=d9f8109ef87d947948f5d61f60480968d925d7a93fcf15e7fca8c45f194e2f90 From ab6902c8f74a54ecd7d86525265f2772e5d5cfd7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:06 +0200 Subject: [PATCH 1530/2369] httpstat: update to 1.1.0. --- srcpkgs/httpstat/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template index c6ecf6bf23a..ef084155b7b 100644 --- a/srcpkgs/httpstat/template +++ b/srcpkgs/httpstat/template @@ -1,16 +1,16 @@ # Template file for 'httpstat' pkgname=httpstat -version=1.0.0 -revision=12 +version=1.1.0 +revision=1 build_style=go +go_ldflags="-X=main.version=$version" go_import_path="github.com/davecheney/httpstat" -hostmakedepends="git" short_desc="It's like curl -v, with colours" -maintainer="Diogo Leal " +maintainer="Michal Vasilek " license="MIT" homepage="https://github.com/davecheney/httpstat" distfiles="https://github.com/davecheney/httpstat/archive/v${version}.tar.gz" -checksum=3a9e89141bb773ca5fa35b9b0ddd4832c17b317849471bacd0f1130333bbcd7b +checksum=58260ab0a56557d0c2509ea09ee3fe54fe21a49f95d94189efdd64caec84fa67 post_install() { vlicense LICENSE From 7dc490058ab407f85b484bb4f45c49160a4412a1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 24 Apr 2022 21:52:50 +0200 Subject: [PATCH 1531/2369] gettext: fix non-cross builds --- srcpkgs/gettext/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template index dfb11a1f886..2ab568366d2 100644 --- a/srcpkgs/gettext/template +++ b/srcpkgs/gettext/template @@ -14,7 +14,7 @@ configure_args="--disable-java --disable-native-java --disable-csharp # Either: # - Have xz in hostmakedepends; or # - Let gettext-devel depends on bzip2 -hostmakedepends="xz" +hostmakedepends="xz automake libtool" short_desc="Internationalized Message Handling Library and tools" maintainer="Enno Boland " license="GPL-3.0-or-later" @@ -36,12 +36,9 @@ else conflicts="gettext-libs>=0" fi -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" automake libtool" - pre_configure() { - autoreconf -fi - } -fi +pre_configure() { + autoreconf -fi +} post_install() { # don't overwrite musl's header From 577c0dcf0dd6bb162fe8163e6fe923620f95812d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 1 May 2022 18:43:10 +0200 Subject: [PATCH 1532/2369] libX11: revert to to 1.7.5. Due to upstream issue: https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/157 --- srcpkgs/libX11/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template index 4940467c5a2..a47190eca09 100644 --- a/srcpkgs/libX11/template +++ b/srcpkgs/libX11/template @@ -1,7 +1,8 @@ # Template file for 'libX11' pkgname=libX11 -version=1.8 -revision=1 +reverts="1.8.0_1" +version=1.7.5 +revision=2 build_style=gnu-configure configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto --enable-static --enable-malloc0returnsnull" @@ -12,7 +13,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="http://xorg.freedesktop.org/" distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz" -checksum=081bf42ebab023aa92cfdb20c7af8c5ae13d13e88a5e22f90f4453ef80bbdde4 +checksum=5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151 do_configure() { ./configure ${configure_args} From 74f6665a1e86b693c2ecb1b964bcd4442f135180 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 19:09:04 +0200 Subject: [PATCH 1533/2369] libX11: fix $reverts --- srcpkgs/libX11/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template index a47190eca09..6b81e23b0d1 100644 --- a/srcpkgs/libX11/template +++ b/srcpkgs/libX11/template @@ -1,8 +1,8 @@ # Template file for 'libX11' pkgname=libX11 -reverts="1.8.0_1" +reverts="1.8_1" version=1.7.5 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto --enable-static --enable-malloc0returnsnull" From 378db3cf5087877588aebaaa8ca3c9d94dfb54e0 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 27 Apr 2022 20:18:58 +0200 Subject: [PATCH 1534/2369] chromium: update to 101.0.4951.41. Co-Authored-By: q66 Closes https://github.com/void-linux/void-packages/pull/36887 --- ...romium-100-SCTHashdanceMetadata-move.patch | 35 ------------- .../patches/chromium-libxml-unbundle.patch | 10 ++++ .../fix-missing-cstdint-include-musl.patch | 10 ++++ ...ebcodecs-stop-using-AudioOpusEncoder.patch | 49 ------------------- .../patches/xxx-ppc64le-support.patch | 6 +-- srcpkgs/chromium/template | 4 +- 6 files changed, 25 insertions(+), 89 deletions(-) delete mode 100644 srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch create mode 100644 srcpkgs/chromium/patches/chromium-libxml-unbundle.patch create mode 100644 srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch delete mode 100644 srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch diff --git a/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch b/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch deleted file mode 100644 index 903942906c7..00000000000 --- a/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 364dc0067d1c20c7a2d21277a7ec0c4419d9bc11 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Wed, 23 Feb 2022 12:18:57 +0100 -Subject: [PATCH] GCC: explicitely move return value of SCTHashdanceMetadata::ToValue - -GCC rejects to do Return Value Optimization in -SCTHashdanceMetadata::ToValue, because the copy constructor is -deleted, and in that scenario RVO is rejected in GCC: - ../../services/network/sct_auditing/sct_auditing_reporter.cc: In member function ‘base::Value network::SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const’: - ../../services/network/sct_auditing/sct_auditing_reporter.cc:191:10: error: use of deleted function ‘base::Value::Value(const base::Value&)’ - 191 | return value; - | ^~~~~ - In file included from ../../services/network/sct_auditing/sct_auditing_reporter.h:14, - from ../../services/network/sct_auditing/sct_auditing_reporter.cc:5: - ../../base/values.h:254:3: note: declared here - 254 | Value(const Value&) = delete; - | ^~~~~ - -Bug: 819294 -Change-Id: I111e51dd10eee7b909d4ac3c0911aac18a589166 ---- - -diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc -index a057e8e..365527b 100644 ---- a/services/network/sct_auditing/sct_auditing_reporter.cc -+++ b/services/network/sct_auditing/sct_auditing_reporter.cc -@@ -188,7 +188,7 @@ - kLogIdKey, base::Base64Encode(base::as_bytes(base::make_span(log_id)))); - value.SetKey(kLogMMDKey, base::TimeDeltaToValue(log_mmd)); - value.SetKey(kCertificateExpiry, base::TimeToValue(certificate_expiry)); -- return value; -+ return std::move(value); - } - - // static diff --git a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch new file mode 100644 index 00000000000..5699bc8f8ea --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch @@ -0,0 +1,10 @@ +--- a/build/linux/unbundle/libxml.gn ++++ b/build/linux/unbundle/libxml.gn +@@ -19,6 +19,7 @@ static_library("libxml_utils") { + ":xml_reader", + ":xml_writer", + "//base/test:test_support", ++ "//services/data_decoder:lib", + "//services/data_decoder:xml_parser_fuzzer_deps", + ] + sources = [ diff --git a/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch b/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch new file mode 100644 index 00000000000..baa48c8f2a7 --- /dev/null +++ b/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch @@ -0,0 +1,10 @@ +--- a/net/third_party/quiche/src/http2/adapter/window_manager.h ++++ b/net/third_party/quiche/src/http2/adapter/window_manager.h +@@ -3,6 +3,7 @@ + + #include + ++#include + #include + + #include "common/platform/api/quiche_export.h" diff --git a/srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch b/srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch deleted file mode 100644 index 32957d32fa3..00000000000 --- a/srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3bd46cb9a51773f103ef52b39d6407740eb0d60a Mon Sep 17 00:00:00 2001 -From: Eugene Zemtsov -Date: Thu, 24 Feb 2022 23:17:20 +0000 -Subject: [PATCH] webcodecs: Stop using AudioOpusEncoder as backed for mojo - audio encoder - -AudioOpusEncoder was only used here for testing. Let's not let it get -comfortable. We'll use MF AAC encoder here when we have it. (Soon...) - -Bug: 1259883 -Change-Id: Ia1819395c8c8fd6d403d4b8558c12f9a1bf7e761 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3489449 -Commit-Queue: Eugene Zemtsov -Auto-Submit: Eugene Zemtsov -Reviewed-by: Dale Curtis -Commit-Queue: Dale Curtis -Cr-Commit-Position: refs/heads/main@{#974895} ---- - media/mojo/services/gpu_mojo_media_client.cc | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc -index 8f83a4d6cf6..40cdaff8d3a 100644 ---- a/media/mojo/services/gpu_mojo_media_client.cc -+++ b/media/mojo/services/gpu_mojo_media_client.cc -@@ -13,7 +13,6 @@ - #include "build/chromeos_buildflags.h" - #include "gpu/ipc/service/gpu_channel.h" - #include "media/audio/audio_features.h" --#include "media/audio/audio_opus_encoder.h" - #include "media/base/audio_decoder.h" - #include "media/base/cdm_factory.h" - #include "media/base/media_switches.h" -@@ -119,14 +118,7 @@ std::unique_ptr GpuMojoMediaClient::CreateAudioEncoder( - scoped_refptr task_runner) { - if (!base::FeatureList::IsEnabled(features::kPlatformAudioEncoder)) - return nullptr; -- // TODO(crbug.com/1259883) Right now Opus encoder is all we have, later on -- // we'll create a real platform encoder here. -- auto opus_encoder = std::make_unique(); -- auto encoding_runner = base::ThreadPool::CreateSequencedTaskRunner( -- {base::TaskPriority::USER_BLOCKING}); -- return std::make_unique(std::move(opus_encoder), -- std::move(encoding_runner), -- std::move(task_runner)); -+ return nullptr; - } - - VideoDecoderType GpuMojoMediaClient::GetDecoderImplementationType() { diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch index 0be29c1a4ee..79a1e2a1756 100644 --- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch +++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch @@ -2248,12 +2248,12 @@ index 7a1b2763c..beda8da9e 100644 --- a/third_party/crashpad/crashpad/snapshot/capture_memory.cc +++ b/third_party/crashpad/crashpad/snapshot/capture_memory.cc @@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(const CPUContext& context, - for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) { + for (size_t i = 0; i < std::size(context.mipsel->regs); ++i) { MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]); } +#elif defined(ARCH_CPU_PPC64_FAMILY) + MaybeCaptureMemoryAround(delegate, context.ppc64->nip); -+ for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) { ++ for (size_t i = 0; i < std::size(context.ppc64->regs); ++i) { + MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]); + } #else @@ -3527,7 +3527,7 @@ index ec3e56964..4cf8999a2 100644 - return buffer.str(); + + std::string ret(buffer.str()); -+ if (signbit(value) && ret[0] == '.') { ++ if (std::signbit(value) && ret[0] == '.') { + ret[0] = '-'; + } + return ret; diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index f655d29f3ba..0dce8772fdb 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=100.0.4896.127 +version=101.0.4951.41 revision=1 archs="i686* x86_64* aarch64* armv7l* ppc64le*" short_desc="Google's attempt at creating a safer, faster, and more stable browser" @@ -9,7 +9,7 @@ maintainer="Duncaen " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d +checksum=099863882e88b9a035fcb6b63dd5288554f6b27558e0ebce93e0d804465efa37 lib32disabled=yes From c9b636430139cd072eb273461fc2071e0c83c7ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Tue, 19 Apr 2022 16:42:30 +0200 Subject: [PATCH 1535/2369] homebank: update to 5.5.5. --- srcpkgs/homebank/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template index 57eca4181c4..84f52ed2fa7 100644 --- a/srcpkgs/homebank/template +++ b/srcpkgs/homebank/template @@ -1,6 +1,6 @@ # Template file for 'homebank' pkgname=homebank -version=5.5.4 +version=5.5.5 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config" @@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana " license="GPL-2.0-or-later" homepage="http://homebank.free.fr/" distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz" -checksum=0d0669bca099340ae5c213ea13cb2b93283bfc8a0e4cf7a5902c1829366e5765 +checksum=bece05ecb52392147424aa1e5a179389777b82bf468abebd73eb70b2af9c9e67 post_patch() { vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure From 836606ebd99e15a144b0a81ff49e797f29fac654 Mon Sep 17 00:00:00 2001 From: David Flatz Date: Mon, 2 May 2022 15:35:51 +0200 Subject: [PATCH 1536/2369] base-files: add alacritty to DIR_COLORS.256color --- srcpkgs/base-files/files/DIR_COLORS.256color | 1 + srcpkgs/base-files/template | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/base-files/files/DIR_COLORS.256color b/srcpkgs/base-files/files/DIR_COLORS.256color index 34fbe33a871..0e96e50eab5 100644 --- a/srcpkgs/base-files/files/DIR_COLORS.256color +++ b/srcpkgs/base-files/files/DIR_COLORS.256color @@ -20,6 +20,7 @@ COLOR tty OPTIONS -F -T 0 # Below, there should be one TERM entry for each termtype that is colorizable +TERM alacritty TERM putty-256color TERM rxvt-256color TERM screen-256color diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index bf7b7ef242b..2249d002f3f 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -1,7 +1,7 @@ # Template file for 'base-files' pkgname=base-files version=0.142 -revision=12 +revision=13 bootstrap=yes depends="xbps-triggers" short_desc="Void Linux base system files" From f509c377c1345cb88394723bba6fc9e222fd70d3 Mon Sep 17 00:00:00 2001 From: Brihadeesh S Date: Mon, 2 May 2022 12:15:26 +0530 Subject: [PATCH 1537/2369] e16: update to 1.0.24. e16: update to 1.0.24 --- srcpkgs/e16/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/e16/template b/srcpkgs/e16/template index 246087e36b5..30a4bc9b281 100644 --- a/srcpkgs/e16/template +++ b/srcpkgs/e16/template @@ -1,6 +1,6 @@ # Template file for 'e16' pkgname=e16 -version=1.0.23 +version=1.0.24 revision=1 build_style=gnu-configure configure_args="--sysconfdir=/etc --enable-sound=alsa" @@ -11,7 +11,7 @@ maintainer="Brihadeesh " license="BSD-2-Clause" homepage="https://www.enlightenment.org/e16" distfiles="$SOURCEFORGE_SITE/enlightenment/${pkgname}-${version}.tar.gz" -checksum=5b441bebf0c733e724ebe753f0c74aa632d0fead2bced67a3a7e988dc5de3336 +checksum=e5309b1a77595a5fe9c29231bf91057093b0b96eb592d2d6805fb6e556a2735a post_install() { # install gnome and kde session scripts From ca1ee6e2250bca9033540f1cd9a428565f4d69e6 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 1 May 2022 11:00:38 -0400 Subject: [PATCH 1538/2369] chezmoi: update to 2.15.2, cleanup. remove unnecessary variable, make more reproducible. --- srcpkgs/chezmoi/template | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index bacfc8c9b29..531370c9029 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,20 +1,25 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.15.1 +version=2.15.2 revision=1 build_style=go go_import_path="github.com/twpayne/chezmoi/v2" go_build_tags="noembeddocs noupgrade" -go_ldflags="-X main.version=${version} -X main.commit=v${version} - -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ) -X main.builtBy=xbps" +go_ldflags="-X main.version=${version} -X main.commit=v${version} -X main.builtBy=xbps" short_desc="Manage your dotfiles across multiple machines, securely" maintainer="classabbyamp " license="MIT" homepage="https://chezmoi.io/" distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz" -checksum=0100dcf8b70774595f56859e5d1b635319ba584ad7b280946352be328f36d679 +checksum=c06c62feeaa95d735191db19fb9f4ef473b7144e01004e789b03d9a3c9c5b4b6 -export CGO_ENABLED=1 +pre_build() { + local _date + if [ "$SOURCE_DATE_EPOCH" ]; then + _date="$(date --utc --date "@$SOURCE_DATE_EPOCH" "+%Y-%m-%d")" + go_ldflags+=" -X main.date=${_date}" + fi +} post_install() { vlicense LICENSE From a541fd758bfa6ad9326ac7ac93e378b7995d25f3 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Mon, 2 May 2022 13:05:10 -0400 Subject: [PATCH 1539/2369] nano: update to 6.3. --- srcpkgs/nano/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template index c168a9b2b9c..6efd3dcd6d1 100644 --- a/srcpkgs/nano/template +++ b/srcpkgs/nano/template @@ -1,6 +1,6 @@ # Template file for 'nano' pkgname=nano -version=6.2 +version=6.3 revision=1 build_style=gnu-configure configure_args="--enable-utf8" @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="https://www.nano-editor.org/" changelog="http://git.savannah.gnu.org/cgit/nano.git/plain/NEWS" distfiles="https://www.nano-editor.org/dist/v${version%%.*}/nano-${version}.tar.xz" -checksum=2bca1804bead6aaf4ad791f756e4749bb55ed860eec105a97fba864bc6a77cb3 +checksum=eb532da4985672730b500f685dbaab885a466d08fbbf7415832b95805e6f8687 post_install() { vsconf syntax/nanorc.nanorc From 91b9c035a32e29d6908be54cb8ec81bf506624d8 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Mon, 25 Apr 2022 16:22:44 +0530 Subject: [PATCH 1540/2369] spotify-adblock: update to 1.0.2 --- srcpkgs/spotify-adblock/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template index 8d64a84df72..ee363eab2c7 100644 --- a/srcpkgs/spotify-adblock/template +++ b/srcpkgs/spotify-adblock/template @@ -1,6 +1,6 @@ # Template file for 'spotify-adblock' pkgname=spotify-adblock -version=1.0.1 +version=1.0.2 revision=1 build_style=cargo conf_files="/etc/spotify-adblock/config.toml" @@ -9,7 +9,7 @@ maintainer="Subhaditya Nath " license="GPL-3.0-or-later" homepage="https://github.com/abba23/spotify-adblock" distfiles="https://github.com/abba23/spotify-adblock/archive/refs/tags/v${version}.tar.gz" -checksum=01edec4cc87fd0bbf77508fe6bcfdfba244771a992eca9d834df0f9399f1c360 +checksum=a0b5124573b95548e2f5ae36fc74fdab4fab9282d755affba754641e561aeac6 pre_install() { { sed -n '/Debian/q' From 5539ea9c894026a1a001a4c66167e4ba9b8c0282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 3 May 2022 11:24:20 +0700 Subject: [PATCH 1541/2369] tzutils: update to 2022a. --- srcpkgs/tzutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template index 814693a3a56..d0d6cf99dd9 100644 --- a/srcpkgs/tzutils/template +++ b/srcpkgs/tzutils/template @@ -1,6 +1,6 @@ # Template file for 'tzutils' pkgname=tzutils -version=2021e +version=2022a revision=1 bootstrap=yes wrksrc="tz-${version}" @@ -9,7 +9,7 @@ maintainer="Đoàn Trần Công Danh " license="Public Domain, BSD-3-Clause" homepage="https://www.iana.org/time-zones" distfiles="https://github.com/eggert/tz/archive/${version}.tar.gz" -checksum=11908a7f18530ca3013c8458d902a54cdd3382276bdd56891db074b1af4a26b8 +checksum=e9d82a851a15bb5db2cbaae2c3fc633743ad9edc069e3738c5e8908978064ed8 do_build() { echo "$version" >version From f59689dcbed0a698426c1cc196e13f6b2f4ce75e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 3 May 2022 11:24:16 +0700 Subject: [PATCH 1542/2369] tzdata: update to 2022a. --- srcpkgs/tzdata/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template index 576f199552d..fe7ca90f5ac 100644 --- a/srcpkgs/tzdata/template +++ b/srcpkgs/tzdata/template @@ -1,6 +1,6 @@ # Template file for 'tzdata' pkgname=tzdata -version=2021e +version=2022a revision=1 bootstrap=yes create_wrksrc=yes @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="Public Domain" homepage="http://www.iana.org/time-zones" distfiles="http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz" -checksum=07ec42b737d0d3c6be9c337f8abb5f00554a0f9cc4fcf01a703d69403b6bb2b1 +checksum=ef7fffd9f4f50f4f58328b35022a32a5a056b245c5cb3d6791dddb342f871664 do_install() { local timezones="africa antarctica asia australasia europe northamerica \ From 691967dbc2be1c59c97ce891ff4e2b40421eb095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 3 May 2022 11:23:38 +0700 Subject: [PATCH 1543/2369] nss: update to 3.78. --- srcpkgs/nss/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 5cc04daf52c..31d1b847a9d 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -3,7 +3,7 @@ _nsprver=4.32 pkgname=nss -version=3.77 +version=3.78 revision=1 hostmakedepends="perl which" 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=825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd +checksum=f455f341e787c1167328e80a84f77b9a557d595066dda6486a1874d72da68800 export NS_USE_GCC=1 export LIBRUNPATH= From cc1eded5740b7102e0d33a806819ebc8ce089550 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Tue, 3 May 2022 02:06:10 -0500 Subject: [PATCH 1544/2369] goreleaser: update to 1.8.3. --- srcpkgs/goreleaser/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template index cdeae7a0617..2062a8d28d0 100644 --- a/srcpkgs/goreleaser/template +++ b/srcpkgs/goreleaser/template @@ -1,6 +1,6 @@ # Template file for 'goreleaser' pkgname=goreleaser -version=1.2.5 +version=1.8.3 revision=1 build_style=go go_import_path=github.com/goreleaser/goreleaser @@ -9,7 +9,7 @@ maintainer="Michael Aldridge " license="MIT" homepage="https://goreleaser.com/" distfiles="https://github.com/goreleaser/goreleaser/archive/refs/tags/v$version.tar.gz" -checksum=f6ad356f4b53a3e4742bb429c636b974f04aab8d5d12f5fc6919526c83665d1a +checksum=3ac091dacf81357a83b5c8bf17bbcb325371111b88bc59fa79c8354be2273145 post_install() { vlicense LICENSE.md From 4d9ebdf504da67043b581a6550a19bf0d8bc0310 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Tue, 3 May 2022 02:09:01 -0500 Subject: [PATCH 1545/2369] xlunch: update to 4.7.3. --- srcpkgs/xlunch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template index 36c568aafa8..c3e9ed018c4 100644 --- a/srcpkgs/xlunch/template +++ b/srcpkgs/xlunch/template @@ -1,6 +1,6 @@ # Template file for 'xlunch' pkgname=xlunch -version=4.7.1 +version=4.7.3 revision=1 build_style=gnu-makefile make_build_target=xlunch @@ -10,7 +10,7 @@ maintainer="Michael Aldridge " license="GPL-3.0-or-later" homepage="http://xlunch.org/" distfiles="https://github.com/Tomas-M/xlunch/archive/v${version}.tar.gz" -checksum=9ee401638fde606539bb36e7754af83d5827e4764d4e8fcbe95f25d19338bf33 +checksum=9bc03634e8889f47d5727a8f3f49462cebc2c3576337593ffd9832801ea63e6c do_install() { vbin xlunch From fdca21121b0275a10662de9e47f60b24f5c1da00 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 30 Apr 2022 09:49:24 -0400 Subject: [PATCH 1546/2369] maturin: update to 0.12.14. --- srcpkgs/maturin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index 64140c2f5fe..4bb299175ca 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -1,6 +1,6 @@ # Template file for 'maturin' pkgname=maturin -version=0.12.12 +version=0.12.14 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="0da8b649dc91278363d6a07fee26ea53b8f2d9cd06139034dea3a5506baf12a0 +checksum="4b45ef2f5a63d7dde7700556f60d82222c7ccba64cea70950f909b06e8355249 30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e" # Tests use unstable features and fail to build make_check=no From 24e673d8e9063f64325936b1d6accfa7c77564e7 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 1 May 2022 22:04:13 -0400 Subject: [PATCH 1547/2369] python3-Pygments: update to 2.12.0. --- srcpkgs/python3-Pygments/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template index 5ac883fda32..89335f3d551 100644 --- a/srcpkgs/python3-Pygments/template +++ b/srcpkgs/python3-Pygments/template @@ -1,6 +1,6 @@ # Template file for 'python3-Pygments' pkgname=python3-Pygments -version=2.11.2 +version=2.12.0 revision=1 wrksrc="Pygments-${version}" build_style=python3-module @@ -15,7 +15,7 @@ license="BSD-2-Clause" homepage="https://pygments.org" changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES" distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz" -checksum=4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a +checksum=5eb116118f9612ff1ee89ac96437bb6b49e8f04d8a13b514ba26f620208e26eb alternatives="pygments:pygmentize:/usr/bin/pygmentize3" post_install() { From aa59af2922d6bce729724c2cc498f64f4d36ed25 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 1 May 2022 22:04:32 -0400 Subject: [PATCH 1548/2369] python3-cryptography_vectors: update to 37.0.1. --- srcpkgs/python3-cryptography_vectors/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template index c31863f52ad..4576117879d 100644 --- a/srcpkgs/python3-cryptography_vectors/template +++ b/srcpkgs/python3-cryptography_vectors/template @@ -1,6 +1,6 @@ # Template file for 'python3-cryptography_vectors' pkgname=python3-cryptography_vectors -version=36.0.2 +version=37.0.1 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -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=2a7924449a03025faf7f8754a6f4200001cab210734a6ce6ac1f6bdacd3a68e4 +checksum=66c9a714232be730fe822bd7e4e9da6231ff9e537ee4feb0f092c06b8ea4d94a post_install() { vlicense LICENSE From 0d7c6e754bbcdbc7b0b70089803792a3ebf9b1a8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 1 May 2022 22:21:03 -0400 Subject: [PATCH 1549/2369] python3-cryptography: update to 37.0.1. --- srcpkgs/python3-cryptography/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template index 278446d27ef..12fd50551a1 100644 --- a/srcpkgs/python3-cryptography/template +++ b/srcpkgs/python3-cryptography/template @@ -1,10 +1,11 @@ # Template file for 'python3-cryptography' pkgname=python3-cryptography -version=36.0.2 +version=37.0.1 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module build_helper="rust" +make_check_args="--ignore tests/bench/test_x509.py" hostmakedepends="python3-setuptools-rust python3-cffi cargo" makedepends="python3-devel openssl-devel" depends="python3-cffi" @@ -16,7 +17,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=70f8f4f7bb2ac9f340655cbac89d68c527af5bb4387522a8413e841e3e6628c9 +checksum=d610d0ee14dd9109006215c7c0de15eee91230b70a9bce2263461cf7c3720b83 if [ "$CROSS_BUILD" ]; then makedepends+=" rust-std" @@ -24,6 +25,10 @@ if [ "$CROSS_BUILD" ]; then export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include" fi +pre_check() { + vsed -i '/addopts/d' pyproject.toml +} + post_install() { vlicense LICENSE vlicense LICENSE.BSD From 27f5baa37d6f0da6a23ac1d50f8e42d17d032f29 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 1 May 2022 22:22:16 -0400 Subject: [PATCH 1550/2369] python3-imageio: update to 2.19.0. --- srcpkgs/python3-imageio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template index a5167cbc45e..17b15998352 100644 --- a/srcpkgs/python3-imageio/template +++ b/srcpkgs/python3-imageio/template @@ -1,6 +1,6 @@ # Template file for 'python3-imageio' pkgname=python3-imageio -version=2.17.0 +version=2.19.0 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford " license="BSD-2-Clause" homepage="https://github.com/imageio/imageio" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=34173213c7e90096743bf077d888dd1c0300e8ebfad8184ee24a968cc860af5c +checksum=df6f0f80b7e7dbad66e80d223ecfdcb6285c800716251aabc49fcf756b516168 post_install() { vlicense LICENSE From 4db73fc3ad277b90eed5f505d5e4aff39a5cb600 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 1 May 2022 22:30:04 -0400 Subject: [PATCH 1551/2369] python3-hypothesis: update to 6.46.0. --- srcpkgs/python3-hypothesis/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template index fd24d4f5249..f4017b40bb7 100644 --- a/srcpkgs/python3-hypothesis/template +++ b/srcpkgs/python3-hypothesis/template @@ -1,6 +1,6 @@ # Template file for 'python3-hypothesis' pkgname=python3-hypothesis -version=6.43.0 +version=6.46.0 revision=1 wrksrc="hypothesis-hypothesis-python-${version}" build_wrksrc=hypothesis-python @@ -15,7 +15,7 @@ license="MPL-2.0" homepage="https://hypothesis.works/" changelog="https://hypothesis.readthedocs.io/en/latest/changes.html" distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz" -checksum=57e04ecd3fb433604a17dbcf535947734f98bcced562a71c67513d98919d1d3b +checksum=47a115c01f40afa137747b3ddd8c2d7394be86da1318222eeecc66c227b49d38 do_check() { # Manually run the tests that tox considers part of the "full" suite, From b1d44f3af42090c1a1304f7ba79a3716bf89ed6b Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 1 May 2022 22:32:00 -0400 Subject: [PATCH 1552/2369] python3-ipython: update to 8.3.0. --- srcpkgs/python3-ipython/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template index dfaae66b583..99b847586a1 100644 --- a/srcpkgs/python3-ipython/template +++ b/srcpkgs/python3-ipython/template @@ -1,6 +1,6 @@ # Template file for 'python3-ipython' pkgname=python3-ipython -version=8.2.0 +version=8.3.0 revision=1 wrksrc="ipython-${version}" build_style=python3-module @@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://ipython.org/" distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz" -checksum=70e5eb132cac594a34b5f799bd252589009905f05104728aea6a403ec2519dc1 +checksum=807ae3cf43b84693c9272f70368440a9a7eaa2e7e6882dad943c32fbf7e51402 conflicts="python-ipython<=5.8.0_2" do_check() { From 0cc46d2b3f4603dc76a47eee6a4af62021e97d10 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 1 May 2022 22:32:21 -0400 Subject: [PATCH 1553/2369] python3-pytools: update to 2022.1.6. --- srcpkgs/python3-pytools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template index 6a57301a4d6..1367b8ec31b 100644 --- a/srcpkgs/python3-pytools/template +++ b/srcpkgs/python3-pytools/template @@ -1,6 +1,6 @@ # Template file for 'python3-pytools' pkgname=python3-pytools -version=2022.1.4 +version=2022.1.6 revision=1 wrksrc=${pkgname#*-}-${version} build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="X11" homepage="https://pypi.org/project/pytools" distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz" -checksum=ae25f7c9b196fcd0d15e53bfe05236fe7bc5efd923810fbaeeee1a4bc4b6764a +checksum=9271dc8a65da02fa3fe342e2be7979b2d10f792f3b54fb115e51bf10386eb770 post_install() { vlicense LICENSE From e5f893a8eab0921e6dc2e36ba0252d1faf8ad600 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 1 May 2022 22:32:35 -0400 Subject: [PATCH 1554/2369] python3-setuptools-rust: update to 1.3.0. --- srcpkgs/python3-setuptools-rust/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template index c2a506773ca..19b7dea2664 100644 --- a/srcpkgs/python3-setuptools-rust/template +++ b/srcpkgs/python3-setuptools-rust/template @@ -1,6 +1,6 @@ # Template file for 'python3-setuptools-rust' pkgname=python3-setuptools-rust -version=1.2.0 +version=1.3.0 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/PyO3/setuptools-rust" changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md" distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz" -checksum=0a4ada479e8c7e3d8bd7cb56e1a29acc2b2bb98c2325051b0cdcb57d7f056de8 +checksum=958c5bf4ab6483d59dab888538121871cc5006354a42fb0fbd50acf03caad1de # Tests have unpackaged dependencies make_check=no From c08ad0d875582ceb52acc8de4ef192fc262a9772 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 1 May 2022 22:32:47 -0400 Subject: [PATCH 1555/2369] python3-tifffile: update to 2022.4.28. --- 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 b8fb29af178..a3427332253 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.4.8 +version=2022.4.28 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=f4dafa604c949ebedc60a0fd41be0048399fea72b529efcff6330a29590ee5f6 +checksum=5ee740afa64bfc8da5b1e7badc5d4e20766f7631adb48792e5ee72978ba0fcff # Tests require unpackaged fsspec make_check=no From 46a37abf77804f4edd38aab16817968f9ad7dc66 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 1 May 2022 22:43:00 -0400 Subject: [PATCH 1556/2369] xpra: update to 4.3.3. --- srcpkgs/xpra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index 5bc9ea89fdf..d9485ca78e2 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,6 +1,6 @@ # Template file for 'xpra' pkgname=xpra -version=4.3.2 +version=4.3.3 revision=1 build_style=python3-module make_install_args="$(vopt_with docs)" @@ -17,7 +17,7 @@ license="GPL-2.0-or-later" homepage="https://xpra.org/" changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md" distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz" -checksum=1e548b8d20c243fba40692abb0aa2759e3bd3f2d3b6b51a160f82746cdf1d782 +checksum=06009ea2cd41b3ffaab51b01e29bb4d9e635ead795d378575f5379e5cb166a83 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*" system_groups="xpra" From 69d5ad4bc9acd55d6190dcd4ea939eb6aefef0e3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 3 May 2022 08:09:38 -0400 Subject: [PATCH 1557/2369] python3-matplotlib: update to 3.5.2. --- srcpkgs/python3-matplotlib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template index b4b1852b2e5..e4e03bc540b 100644 --- a/srcpkgs/python3-matplotlib/template +++ b/srcpkgs/python3-matplotlib/template @@ -1,6 +1,6 @@ # Template file for 'python3-matplotlib' pkgname=python3-matplotlib -version=3.5.1 +version=3.5.2 revision=1 wrksrc="matplotlib-${version}" build_style=python3-module @@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford " license="custom:matplotlib, BSD-3-Clause, MIT" homepage="https://matplotlib.org/" distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz" -checksum=9683da9a0c84d1c42d1bf92ecf6e012d302406a38fd987e3dfbcb7b58b2eea2d +checksum=c81325d1b0d822ef75fd71d243f98478cdca1f800a838a2a1bc8e4e17b8df93c replaces="python3-matplotlib-data>=0" # Comparison of images is too frail for validation make_check="no" From 46758393b5d87d13ba69fbec02a0e1a889aedce9 Mon Sep 17 00:00:00 2001 From: Piraty Date: Tue, 3 May 2022 08:45:00 +0200 Subject: [PATCH 1558/2369] kmonad: correct version to 0.4.1.20220321. Fixes: 78955200f6 ("kmonad: update to 65b501defdd0049563752f8af8c8c57f5a1ae38b") --- srcpkgs/kmonad/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template index 829d96a535e..bddd3b33b89 100644 --- a/srcpkgs/kmonad/template +++ b/srcpkgs/kmonad/template @@ -1,14 +1,17 @@ # Template file for 'kmonad' pkgname=kmonad -version=65b501defdd0049563752f8af8c8c57f5a1ae38b +reverts="65b501defdd0049563752f8af8c8c57f5a1ae38b_1" +_githash=65b501defdd0049563752f8af8c8c57f5a1ae38b +version=0.4.1.20220321 revision=1 +wrksrc="${pkgname}-${_githash}" build_style=haskell-stack stackage=lts-19.0 short_desc="Keyboard remapping utility providing qmk-like functionality" maintainer="slotThe " license="MIT" homepage="https://github.com/david-janssen/kmonad" -distfiles="${homepage}/archive/${version}.tar.gz" +distfiles="${homepage}/archive/${_githash}.tar.gz" checksum=2b0cb0c5d1575bf61b1c442476ad24103028c309d103fedb56214a3bb30f8c0f nopie_files="/usr/bin/kmonad" nocross=yes From 4283938ea6b5abe2826cfa83d5105ddbf6cff9c0 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Thu, 28 Apr 2022 15:44:54 -0400 Subject: [PATCH 1559/2369] python3-trimesh: update to 3.11.2. --- srcpkgs/python3-trimesh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template index 0a162818e7c..3bd4a284eca 100644 --- a/srcpkgs/python3-trimesh/template +++ b/srcpkgs/python3-trimesh/template @@ -1,6 +1,6 @@ # Template file for 'python3-trimesh' pkgname=python3-trimesh -version=3.10.8 +version=3.11.2 revision=1 wrksrc="trimesh-${version}" build_style=python3-module @@ -16,7 +16,7 @@ maintainer="Karl Nilsson " license="MIT" homepage="https://trimsh.org/" distfiles="https://github.com/mikedh/trimesh/archive/${version}.tar.gz" -checksum=465d30b17e1f62c467283422eb932b70ff4807f9346f3012195ac94675c837f3 +checksum=bee21e9aa5b6c98f46dde34d490a0082e5c209f99288435282e145d328f14672 post_install() { vlicense LICENSE.md From 772ebc8f95c7b7d7ae4929d3e5df27eb827e82c9 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Sun, 1 May 2022 15:48:38 -0400 Subject: [PATCH 1560/2369] python3-zeroconf: update to 0.38.5. --- srcpkgs/python3-zeroconf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template index acae59ecd99..0a32bfc59f8 100644 --- a/srcpkgs/python3-zeroconf/template +++ b/srcpkgs/python3-zeroconf/template @@ -1,6 +1,6 @@ # Template file for 'python3-zeroconf' pkgname=python3-zeroconf -version=0.38.4 +version=0.38.5 revision=1 wrksrc="python-zeroconf-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Karl Nilsson " license="LGPL-2.1-or-later" homepage="https://github.com/jstasiak/python-zeroconf" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=74ead61490a7573d1cab1e9e9ea6fe846be0843c4ddd55633788d4670837c0eb +checksum=54fa609011b5d2b2ff3a689471a2af16a4bc20edcc4077360e94e93ec4fbea98 do_check() { # IPv6 doesn't work on github CI From 6f5ea81fe694d1fa38319ac3bca029fa34db5bff Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 2 May 2022 18:07:41 +0200 Subject: [PATCH 1561/2369] gnumeric: update to 1.12.52. --- srcpkgs/gnumeric/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template index 51992c67f47..c516b93e1ae 100644 --- a/srcpkgs/gnumeric/template +++ b/srcpkgs/gnumeric/template @@ -1,17 +1,17 @@ # Template file for 'gnumeric' pkgname=gnumeric -version=1.12.51 +version=1.12.52 revision=1 build_style=gnu-configure hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config" -makedepends="goffice-devel librsvg-devel libxslt-devel" +makedepends="goffice-devel librsvg-devel libxslt-devel libxml2-devel" short_desc="GNOME Spreadsheet Program" maintainer="Duncaen " license="GPL-3.0-or-later" homepage="http://gnumeric.org/" changelog="https://github.com/GNOME/gnumeric/raw/mainline/NEWS" distfiles="${GNOME_SITE}/gnumeric/${version%.*}/gnumeric-${version}.tar.xz" -checksum=a00e6c6e4ecddadabd9b0ae18013d7b05937fdcb8f9aad5a73b95923c7aeb1dd +checksum=73cf73049a22a1d828506275b2c9378ec37c5ff37b68bb1f2f494f0d6400823b # This isn't a direct dependency but when soname bumping perl it will # cause build failures From 0c48b6656575758348b1bf2aa50bf55bed98df55 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 3 May 2022 17:33:26 +0200 Subject: [PATCH 1562/2369] syncthing: update to 1.20.0. --- srcpkgs/syncthing/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template index 6a267339527..10166603a68 100644 --- a/srcpkgs/syncthing/template +++ b/srcpkgs/syncthing/template @@ -1,6 +1,6 @@ # Template file for 'syncthing' pkgname=syncthing -version=1.19.2 +version=1.20.0 revision=1 build_style=go go_import_path="github.com/syncthing/syncthing" @@ -17,7 +17,7 @@ license="MPL-2.0" homepage="https://syncthing.net/" changelog="https://github.com/syncthing/syncthing/releases" distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz" -checksum=81be2d3b22fa7282eee9cc1dc7569975fa62e7149700dcedaf03d372fb012a1e +checksum=27d9b52f18ebd833938731ffaaeed4f34ced534ef3d1ed2bc126a495764f753d pre_build() { GOARCH= go generate \ From 01695b83dcf793b5f84545628f519b55b10b25de Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 2 May 2022 19:09:34 +0200 Subject: [PATCH 1563/2369] python3-pipenv: update to 2022.4.30. --- srcpkgs/python3-pipenv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template index 2c0c939cf5f..0b0975137e1 100644 --- a/srcpkgs/python3-pipenv/template +++ b/srcpkgs/python3-pipenv/template @@ -1,6 +1,6 @@ # Template file for 'python3-pipenv' pkgname=python3-pipenv -version=2022.4.21 +version=2022.4.30 revision=1 wrksrc="pipenv-${version}" build_style=python3-module @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/pypa/pipenv" changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst" distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz" -checksum=3f93229de25a4c3a658249f48407b80f347f076640a9fd50c476a2876212f781 +checksum=e26ded6ab90a7900676a1db9955d5ee714115f443aecc072b09497153ed237c7 conflicts="python-pipenv>=0" post_extract() { From 6d43c79bafb92a1effcb912fd2605bc7ed9f68f4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 3 May 2022 15:28:06 -0400 Subject: [PATCH 1564/2369] armadillo: update to 11.0.1. --- common/shlibs | 2 +- .../patches/9.700.2--include_dirs.patch | 40 ------------------- srcpkgs/armadillo/template | 18 +++++++-- 3 files changed, 15 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/armadillo/patches/9.700.2--include_dirs.patch diff --git a/common/shlibs b/common/shlibs index 4114151662f..a2d858413fd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3722,7 +3722,7 @@ libdrumstick-rt.so.1 drumstick-1.1.2_1 libnozzle.so.1 libnozzle1-1.11_4 libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1 libluv.so.1 libluv-1.30.1.0_1 -libarmadillo.so.9 armadillo-9.700.2_1 +libarmadillo.so.11 armadillo-11.0.1_1 libvarnishapi.so.2 libvarnishapi-6.3.0_1 libicns.so.1 libicns-0.8.1_1 librabbitmq.so.4 rabbitmq-c-0.10.0_2 diff --git a/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch b/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch deleted file mode 100644 index a19472dff13..00000000000 --- a/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a65f29c4cddccd22545746b077e6bd19d56e6bfb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= -Date: Fri, 24 Jul 2020 23:07:44 +0200 -Subject: [PATCH] Absolute paths can't match both cross and native use - - -diff --git include/armadillo_bits/config.hpp.cmake include/armadillo_bits/config.hpp.cmake -index be42243..a285e35 100644 ---- a/include/armadillo_bits/config.hpp.cmake -+++ b/include/armadillo_bits/config.hpp.cmake -@@ -50,7 +50,7 @@ - #endif - - #if !defined(ARMA_SUPERLU_INCLUDE_DIR) --#define ARMA_SUPERLU_INCLUDE_DIR ${ARMA_SUPERLU_INCLUDE_DIR}/ -+#define ARMA_SUPERLU_INCLUDE_DIR ./ - //// If you're using SuperLU and want to explicitly include the SuperLU headers, - //// uncomment the above define and specify the appropriate include directory. - //// Make sure the directory has a trailing / -@@ -94,7 +94,7 @@ - //// ARMA_BLAS_LONG, ARMA_BLAS_LONG_LONG, ARMA_USE_FORTRAN_HIDDEN_ARGS - - #cmakedefine ARMA_USE_ATLAS --#define ARMA_ATLAS_INCLUDE_DIR ${ARMA_ATLAS_INCLUDE_DIR}/ -+#define ARMA_ATLAS_INCLUDE_DIR ./ - //// If you're using ATLAS and the compiler can't find cblas.h and/or clapack.h - //// uncomment the above define and specify the appropriate include directory. - //// Make sure the directory has a trailing / -@@ -140,7 +140,7 @@ - #undef ARMA_USE_HDF5 - #define ARMA_USE_HDF5 - -- #define ARMA_HDF5_INCLUDE_DIR ${ARMA_HDF5_INCLUDE_DIR}/ -+ #define ARMA_HDF5_INCLUDE_DIR ./ - #endif - - #if !defined(ARMA_MAT_PREALLOC) --- -2.27.0 - diff --git a/srcpkgs/armadillo/template b/srcpkgs/armadillo/template index 9407c3aa8b4..7117b47a312 100644 --- a/srcpkgs/armadillo/template +++ b/srcpkgs/armadillo/template @@ -1,9 +1,10 @@ # Template file for 'armadillo' pkgname=armadillo -version=9.900.2 +version=11.0.1 revision=1 build_style=cmake -configure_args="-DDETECT_HDF5=$(vopt_if hdf5 ON OFF)" +configure_args="-DOPENBLAS_PROVIDES_LAPACK=true + -DDETECT_HDF5=$(vopt_if hdf5 ON OFF)" hostmakedepends="pkg-config" makedepends="openblas-devel superlu-devel $(vopt_if hdf5 hdf5-devel)" short_desc="C++ linear algebra library" @@ -11,15 +12,24 @@ maintainer="Julien Dehos " license="Apache-2.0" homepage="http://arma.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/arma/${pkgname}-${version}.tar.xz" -checksum=d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05 +checksum=e43d4449376c1fc8b562095431bb82cf9c4ff98a791a22a25d0f96e5e7937c22 build_options="hdf5" desc_option_hdf5="HDF5 support" -# hd5 is nocross + +# hdf5 is nocross if [ -z "$CROSS_BUILD" ]; then build_options_default="hdf5" fi +post_install() { + # Strip cross prefix from default header paths in config.hpp + if [ "$CROSS_BUILD" ]; then + vsed -e "s@${XBPS_CROSS_BASE}/@/@" \ + -i "${DESTDIR}/usr/include/armadillo_bits/config.hpp" + fi +} + armadillo-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From 53fdb237f145bb5986908108b88c453b3db789e9 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 4 May 2022 00:12:44 +0200 Subject: [PATCH 1565/2369] New package: opendht-2.3.1 --- common/shlibs | 1 + srcpkgs/opendht-devel | 1 + srcpkgs/opendht/template | 31 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 120000 srcpkgs/opendht-devel create mode 100644 srcpkgs/opendht/template diff --git a/common/shlibs b/common/shlibs index a2d858413fd..353e291f59d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -992,6 +992,7 @@ libmdbsql.so.0 libmdb-0.5_1 libkmod.so.2 libkmod-5_1 libestr.so.0 libestr-0.1.2_1 libee.so.0 libee-0.3.2_1 +libopendht.so.2 opendht-2.3.1_1 libobt.so.2 libopenbox-3.5.2_1 libobrender.so.32 libopenbox-3.6.1_1 libgssglue.so.1 libgssglue-0.3_1 diff --git a/srcpkgs/opendht-devel b/srcpkgs/opendht-devel new file mode 120000 index 00000000000..6e5a7c5ebfb --- /dev/null +++ b/srcpkgs/opendht-devel @@ -0,0 +1 @@ +opendht \ No newline at end of file diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template new file mode 100644 index 00000000000..c24ee3c5594 --- /dev/null +++ b/srcpkgs/opendht/template @@ -0,0 +1,31 @@ +# Template file for 'opendht' +pkgname=opendht +version=2.3.1 +revision=1 +build_style=cmake +configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF + -DOPENDHT_TESTS_NETWORK=OFF" +hostmakedepends="pkg-config" +makedepends="gnutls-devel msgpack-devel readline-devel libargon2-devel asio" +short_desc="Distributed Hash Table implementation" +maintainer="Piraty " +license="GPL-3.0-or-later" +homepage="https://github.com/savoirfairelinux/opendht" +distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/${version}.tar.gz" +checksum=9a75db4f119761d6524964b27d3a49aa809a6cb08bde963edc2f338458433c78 + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" +fi + +opendht-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/cmake" + vmove "usr/lib/pkgconfig" + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From c8d7af7bf75440d01b4c88e8cb64dba39a0fe950 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Mon, 2 May 2022 15:32:43 +0200 Subject: [PATCH 1566/2369] zellij: update to 0.29.1 --- srcpkgs/zellij/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template index 20a338d9103..293238e95a3 100644 --- a/srcpkgs/zellij/template +++ b/srcpkgs/zellij/template @@ -1,6 +1,6 @@ # Template file for 'zellij' pkgname=zellij -version=0.28.1 +version=0.29.1 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 @@ -15,7 +15,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=8c9495e70b1c0179200d6137dd892776c7153b0b54115edf0f39fd732bb62efe +checksum=340f5241c9b1abb5652b1531167f837fc573b9cfdefa551363a48930f8f1d4dd post_build() { ZELLIJ="target/${RUST_TARGET}/release/zellij" From acccbaa7b748caa0f628920cac7e24d37739037f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 10 Apr 2022 21:03:22 -0300 Subject: [PATCH 1567/2369] owncloudclient: update to 2.10.1, adopt. --- srcpkgs/owncloudclient/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template index d2297995cd1..3772509dcdd 100644 --- a/srcpkgs/owncloudclient/template +++ b/srcpkgs/owncloudclient/template @@ -1,6 +1,6 @@ # Template file for 'owncloudclient' pkgname=owncloudclient -version=2.10.0 +version=2.10.1 revision=1 wrksrc=client-${version} build_style=cmake @@ -12,12 +12,12 @@ makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel depends="qt5-plugin-sqlite qt5-svg" conf_files="/etc/ownCloud/sync-exclude.lst" short_desc="Connect to ownCloud servers" -maintainer="Nathan Owens " +maintainer="Gonzalo Tornaría " license="GPL-2.0-or-later" homepage="https://www.owncloud.org" changelog="https://raw.githubusercontent.com/owncloud/client/master/CHANGELOG.md" distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz" -checksum=fc3248eb9afa67bba946cf788319d6dcc419d155700cb10baebb19f6ccf6b583 +checksum=cd79c46e0c13b606ec08527f9f5f35fe295d4655c12510aa6805ccb797119c49 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-tools-devel" From 00654268ec9012a82523ab9f153d4b236e670fc3 Mon Sep 17 00:00:00 2001 From: dkwo Date: Fri, 29 Apr 2022 17:25:53 +0200 Subject: [PATCH 1568/2369] fwupd-efi: update to 1.3 --- srcpkgs/fwupd-efi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template index 663782fa1da..78a543fec1d 100644 --- a/srcpkgs/fwupd-efi/template +++ b/srcpkgs/fwupd-efi/template @@ -1,6 +1,6 @@ # Template file for 'fwupd-efi' pkgname=fwupd-efi -version=1.2 +version=1.3 revision=1 archs="x86_64* i686* arm* aarch64*" build_style=meson @@ -15,7 +15,7 @@ maintainer="dkwo " license="LGPL-2.1-or-later" homepage="https://github.com/fwupd/fwupd-efi" distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz" -checksum=568fa4a9eb884821661d47d0c04ad5681ffe26346a1f8186a068efe56854b77b +checksum=0e76057c178e221f63eaf9142fa1d06780a8eb3df7cf0c11f92660138dec5c83 if [ "$CROSS_BUILD" ]; then configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc" From 2ba03c39806303a02f683bf0340490f652c03181 Mon Sep 17 00:00:00 2001 From: dkwo Date: Fri, 29 Apr 2022 17:26:06 +0200 Subject: [PATCH 1569/2369] fwupd: update to 1.8.0 --- srcpkgs/fwupd/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index 9f15e0a43dd..189a8780874 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,7 +1,7 @@ # Template file for 'fwupd' pkgname=fwupd -version=1.7.5 -revision=2 +version=1.8.0 +revision=1 build_style=meson build_helper="gir" configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Delogind=true @@ -20,9 +20,9 @@ conf_files=" short_desc="Daemon to allow session software to update firmware" maintainer="Érico Nogueira " license="LGPL-2.1-or-later" -homepage="https://github.com/hughsie/fwupd" -distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz" -checksum=1acbec6727967ceb6dff9408a9312bb9eba5a7ebd0fde655122921a62d1d396c +homepage="https://github.com/fwupd/fwupd" +distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz" +checksum=1616394b6d23b5696b91ebfcd83fef537be21e9600daca3ec3a09519074385bd replaces="fwupdate>=0" case "$XBPS_TARGET_MACHINE" in From c982ad69f9b2fd9918f620ffe09835364124b652 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Sun, 1 May 2022 23:18:20 -0400 Subject: [PATCH 1570/2369] podman-compose: update to 1.0.3. --- srcpkgs/podman-compose/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/podman-compose/template b/srcpkgs/podman-compose/template index 4e1722d64ea..7f92015f8ec 100644 --- a/srcpkgs/podman-compose/template +++ b/srcpkgs/podman-compose/template @@ -1,6 +1,6 @@ # Template file for 'podman-compose' pkgname=podman-compose -version=1.0.2 +version=1.0.3 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -10,6 +10,6 @@ maintainer="juan " license="GPL-2.0-or-later" homepage="https://github.com/containers/podman-compose" distfiles="https://github.com/containers/podman-compose/archive/v${version}.tar.gz" -checksum=8eae5f2d89a423c66c26377c29955e077e7c90532e1a63989e8f04d973181c76 +checksum=b28e5792a50feee987e7864e0df1b6e8929c923c010e1f65493fe29b4c2aedcf # Source distribution does not script unit tests make_check=no From 7de632765e3d1f7381edd6593f5dca199200042c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 3 May 2022 12:40:00 +0200 Subject: [PATCH 1571/2369] Chipmunk2D: update to 7.0.3. --- .../patches/backport-zero-division.patch | 35 ------------------- srcpkgs/Chipmunk2D/template | 6 ++-- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/Chipmunk2D/patches/backport-zero-division.patch diff --git a/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch b/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch deleted file mode 100644 index 2ced601be10..00000000000 --- a/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6a5767cc5a6c8f88f8cc689c0916ddc0111308fe Mon Sep 17 00:00:00 2001 -From: Bram Stolk -Date: Fri, 30 Mar 2018 19:21:26 -0700 -Subject: [PATCH] Fix issue #144 of division by zero when setting zero mass, - zero moment. - ---- - src/cpBody.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git src/cpBody.c src/cpBody.c -index a8e0797..8ad2bc9 100644 ---- a/src/cpBody.c -+++ b/src/cpBody.c -@@ -258,7 +258,7 @@ cpBodySetMass(cpBody *body, cpFloat mass) - - cpBodyActivate(body); - body->m = mass; -- body->m_inv = 1.0f/mass; -+ body->m_inv = mass == 0.0f ? INFINITY : 1.0f/mass; - cpAssertSaneBody(body); - } - -@@ -275,7 +275,7 @@ cpBodySetMoment(cpBody *body, cpFloat moment) - - cpBodyActivate(body); - body->i = moment; -- body->i_inv = 1.0f/moment; -+ body->i_inv = moment == 0.0f ? INFINITY : 1.0f/moment; - cpAssertSaneBody(body); - } - --- -2.21.0 - diff --git a/srcpkgs/Chipmunk2D/template b/srcpkgs/Chipmunk2D/template index 142051ec0a4..e4342835ac7 100644 --- a/srcpkgs/Chipmunk2D/template +++ b/srcpkgs/Chipmunk2D/template @@ -1,6 +1,6 @@ # Template file for 'Chipmunk2D' pkgname=Chipmunk2D -version=7.0.2 +version=7.0.3 revision=1 wrksrc="Chipmunk2D-Chipmunk-${version}" build_style=cmake @@ -8,9 +8,9 @@ configure_args="-DBUILD_DEMOS=NO" short_desc="Fast and lightweight 2D game physics library" maintainer="Ekaterina Vaartis " license="MIT" -homepage="http://chipmunk-physics.net/" +homepage="https://chipmunk-physics.net/" distfiles="https://github.com/slembcke/Chipmunk2D/archive/Chipmunk-${version}.tar.gz" -checksum=6b6d8d5d910c4442fb9c8c4c46a178126d8c21d075cdb3ce439a7f8d8757b0ca +checksum=1e6f093812d6130e45bdf4cb80280cb3c93d1e1833d8cf989d554d7963b7899a post_install() { vlicense LICENSE.txt From b2551d3a7b74742f1feec75f4ceb625d5fd925e1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 3 May 2022 13:18:55 +0200 Subject: [PATCH 1572/2369] python3-astroid: update to 2.11.4. --- srcpkgs/python3-astroid/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template index 8b0c64e8883..bc3440d167b 100644 --- a/srcpkgs/python3-astroid/template +++ b/srcpkgs/python3-astroid/template @@ -1,6 +1,6 @@ # Template file for 'python3-astroid' pkgname=python3-astroid -version=2.11.3 +version=2.11.4 revision=1 wrksrc="astroid-${version}" build_style=python3-module @@ -13,4 +13,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/PyCQA/astroid" changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog" distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz" -checksum=455d18bfb08cec3bb61d273306c82cffc1de494c2ad4c67410494ebe6e192bc5 +checksum=08a17987045eda03c7088e12d54317a0bb28e60404634ab7a7808e644a667ad6 From 32e08e8d816455a705c6f40c281fc1994ad7baa4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 3 May 2022 13:18:59 +0200 Subject: [PATCH 1573/2369] pylint: update to 2.13.8. --- srcpkgs/pylint/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template index 3a6db1a7ce3..7abac2cbef1 100644 --- a/srcpkgs/pylint/template +++ b/srcpkgs/pylint/template @@ -1,6 +1,6 @@ # Template file for 'pylint' pkgname=pylint -version=2.13.7 +version=2.13.8 revision=1 build_style=python3-module make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py" @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://www.pylint.org/" changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog" distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz" -checksum=c497a2b29e9c78322324e88b2303b388c28ed57a81601e365393ba68d976bc50 +checksum=7bd4cfc0e3e4332f0f3d8f8fc9e967d2e2946912ca7a336f36d3f2ac99c5cd42 post_install() { # install example config and emacs files From 4c6faaa22ebdd18840058b333e8426326b576a6b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 3 May 2022 13:27:38 +0200 Subject: [PATCH 1574/2369] stig: update to 0.12.3a0. --- srcpkgs/stig/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template index 8f6f7cc177b..59d37e89baa 100644 --- a/srcpkgs/stig/template +++ b/srcpkgs/stig/template @@ -1,7 +1,7 @@ # Template file for 'stig' pkgname=stig -version=0.12.2a0 -revision=2 +version=0.12.3a0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-blinker python3-natsort python3-xdg python3-aiohttp @@ -11,5 +11,5 @@ maintainer="Michal Vasilek " license="GPL-3.0-or-later" homepage="https://github.com/rndusr/stig" distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz" -checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc +checksum=49cf2b8d73fa7f61a500672d02cd18a7155d842907b09450a5f92a9b360c6575 make_check=no # needs python3-asynctest which is not packaged From 3784b2c93e1d6d10217eb882faa538f97206a90e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 3 May 2022 13:31:19 +0200 Subject: [PATCH 1575/2369] lagrange: update to 1.13.2. --- srcpkgs/lagrange/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template index 12a3938f521..0e7f419708a 100644 --- a/srcpkgs/lagrange/template +++ b/srcpkgs/lagrange/template @@ -1,6 +1,6 @@ # Template file for 'lagrange' pkgname=lagrange -version=1.12.2 +version=1.13.2 revision=1 build_style=cmake hostmakedepends="pkg-config zip" @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://gmi.skyjake.fi/lagrange/" changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi" distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz" -checksum=cef0ef9543a87d3a4cc8ad83955f9a4e62af7bef4e786642c1ab5ec85ff8b950 +checksum=f84c5fe078734df06ada747f87760ea8863369be5519d1e56992c7c5278395da post_install() { vlicense LICENSE.md From 19d852732272b207b28277c193506b3ee9abe4eb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:00 +0200 Subject: [PATCH 1576/2369] NetAuth-ldap: remove git build dep --- srcpkgs/NetAuth-ldap/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template index ef3429113f6..299cbb22ae4 100644 --- a/srcpkgs/NetAuth-ldap/template +++ b/srcpkgs/NetAuth-ldap/template @@ -6,7 +6,6 @@ wrksrc=ldap-$version build_style=go go_import_path=github.com/netauth/ldap go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}" -hostmakedepends="git" short_desc="LDAP Proxy for NetAuth" maintainer="Michael Aldridge " license="MIT" From fb75f50ae506ff6d549a68423d4f5908bf4c0b6d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:01 +0200 Subject: [PATCH 1577/2369] NetAuth-localizer: remove git build dep --- srcpkgs/NetAuth-localizer/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template index 7039dd37cbe..dc57f91921b 100644 --- a/srcpkgs/NetAuth-localizer/template +++ b/srcpkgs/NetAuth-localizer/template @@ -6,7 +6,6 @@ wrksrc=localizer-$version build_style=go go_import_path=github.com/netauth/localizer go_package=${go_import_path}/cmd/localize -hostmakedepends="git" depends="snooze" short_desc="Make NetAuth accounts local in Linux" maintainer="Michael Aldridge " From c6eccef9e651a3cb4ee1eef0fe6e7ef92bc272ca Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:01 +0200 Subject: [PATCH 1578/2369] NetAuth-nsscache: remove git build dep --- srcpkgs/NetAuth-nsscache/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template index b7d171889aa..bb441ae25d4 100644 --- a/srcpkgs/NetAuth-nsscache/template +++ b/srcpkgs/NetAuth-nsscache/template @@ -5,7 +5,6 @@ revision=1 wrksrc="nsscache-$version" build_style=go go_import_path="github.com/netauth/nsscache" -hostmakedepends="git" short_desc="NetAuth nsscache implementation" maintainer="Michael Aldridge " license="MIT" From d4f8d17f4adf149eddd27a2cb6b8ced70fd407df Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:01 +0200 Subject: [PATCH 1579/2369] NetAuth-pam-helper: remove git build dep --- srcpkgs/NetAuth-pam-helper/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template index 8c961a56b40..763a72035ee 100644 --- a/srcpkgs/NetAuth-pam-helper/template +++ b/srcpkgs/NetAuth-pam-helper/template @@ -5,7 +5,6 @@ revision=1 wrksrc=pam-helper-$version build_style=go go_import_path="github.com/netauth/pam-helper" -hostmakedepends="git" short_desc="Helper executable to use with pam_exec" maintainer="Michael Aldridge " license="MIT" From 87cab417065c416be5ed2ddbc04db484c514acea Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:01 +0200 Subject: [PATCH 1580/2369] NetAuth-sftpgo-hook: remove git build dep --- srcpkgs/NetAuth-sftpgo-hook/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template index aab25468a2c..51862cc5398 100644 --- a/srcpkgs/NetAuth-sftpgo-hook/template +++ b/srcpkgs/NetAuth-sftpgo-hook/template @@ -5,7 +5,6 @@ revision=2 wrksrc=sftpgo-hook-$version build_style=go go_import_path=github.com/netauth/sftpgo-hook -hostmakedepends="git" depends="sftpgo" short_desc="External authorization hook for SFTPGo using NetAuth" maintainer="Michael Aldridge " From 999109673bc51517f5afece32d9df13b9141e5ae Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:01 +0200 Subject: [PATCH 1581/2369] NetAuth: remove git build dep --- srcpkgs/NetAuth/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template index 4a227be08ea..4586019d069 100644 --- a/srcpkgs/NetAuth/template +++ b/srcpkgs/NetAuth/template @@ -7,7 +7,6 @@ build_style="go" go_import_path="github.com/netauth/netauth" go_package="${go_import_path}/cmd/netauth ${go_import_path}/cmd/netauthd" -hostmakedepends="git" short_desc="Network authentication and identity system" maintainer="Michael Aldridge " license="MIT" From 0deec8ae216ace35dbb1332326f1876e05f86684 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:01 +0200 Subject: [PATCH 1582/2369] NetKeys: remove git build dep --- srcpkgs/NetKeys/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template index 9d5c4a4385d..cb0ef063efb 100644 --- a/srcpkgs/NetKeys/template +++ b/srcpkgs/NetKeys/template @@ -5,7 +5,6 @@ revision=1 wrksrc=netkeys-$version build_style=go go_import_path="github.com/netauth/netkeys" -hostmakedepends="git" short_desc="Key retrieval daemon for NetAuth" maintainer="Michael Aldridge " license="MIT" From d65aa9c832b40ce50e117881cc687752a987a0e5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:01 +0200 Subject: [PATCH 1583/2369] TerraState: remove git build dep --- srcpkgs/TerraState/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template index 5c87d170691..01ed55bb41c 100644 --- a/srcpkgs/TerraState/template +++ b/srcpkgs/TerraState/template @@ -7,7 +7,6 @@ make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate" build_style=go go_import_path="github.com/the-maldridge/terrastate" go_package="${go_import_path}/cmd/terrastate" -hostmakedepends="git" short_desc="Remote state for Terraform" maintainer="Michael Aldridge " license="MIT" From edf518927a466bb80ebdeb1c18e6cce9a4fff812 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:01 +0200 Subject: [PATCH 1584/2369] antibody: remove git build dep --- srcpkgs/antibody/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template index cb109f0b183..df466c33a9c 100644 --- a/srcpkgs/antibody/template +++ b/srcpkgs/antibody/template @@ -4,7 +4,6 @@ version=6.1.1 revision=1 build_style=go go_import_path=github.com/getantibody/antibody -hostmakedepends="git" short_desc="Fast and lightweight shell plugin manager" maintainer="SolitudeSF " license="MIT" From 0f2b1e22fde5ed89ce48f70a67e550ced6598a6d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:02 +0200 Subject: [PATCH 1585/2369] browserpass: remove git build dep --- srcpkgs/browserpass/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template index b6426a24975..63537def3f4 100644 --- a/srcpkgs/browserpass/template +++ b/srcpkgs/browserpass/template @@ -5,7 +5,6 @@ revision=1 wrksrc="browserpass-native-${version}" build_style=go go_import_path=github.com/browserpass/browserpass-native -hostmakedepends="git" short_desc="Browser extension for pass" maintainer="John " license="MIT" From 28aa99019dd3423d9035c697a7c2596f7a6fee18 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:02 +0200 Subject: [PATCH 1586/2369] cdetect: remove git build dep --- srcpkgs/cdetect/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template index b02df3a496e..e859340a9cb 100644 --- a/srcpkgs/cdetect/template +++ b/srcpkgs/cdetect/template @@ -4,7 +4,6 @@ version=0.5.4 revision=1 build_style=go go_import_path=github.com/xyproto/cdetect -hostmakedepends="git" short_desc="Detects the compiler (and version) used to compile an ELF binary" maintainer="Orphaned " license="MIT" From ee2a466973fc520ecd67a827308b36d431d1d8e0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:02 +0200 Subject: [PATCH 1587/2369] chroma: remove git build dep --- srcpkgs/chroma/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template index b549685882c..e2ae9e6a677 100644 --- a/srcpkgs/chroma/template +++ b/srcpkgs/chroma/template @@ -6,7 +6,6 @@ build_wrksrc="cmd/chroma" build_style=go go_import_path="github.com/alecthomas/chroma/cmd/chroma" go_ldflags="-X main.version=${version} -X main.date=$(date +%Y.%m.%d)" -hostmakedepends="git" short_desc="General purpose syntax highlighter" maintainer="Daniel Lewan " license="MIT" From f4b534783713bac11520db76c44be83631ea0449 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:02 +0200 Subject: [PATCH 1588/2369] consul-template: remove git build dep --- srcpkgs/consul-template/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template index 4faeaf1c9ae..d144f447c7b 100644 --- a/srcpkgs/consul-template/template +++ b/srcpkgs/consul-template/template @@ -4,7 +4,6 @@ version=0.28.0 revision=1 build_style=go go_import_path="github.com/hashicorp/consul-template" -hostmakedepends="git" short_desc="Template rendering, notifier, and supervisor for Consul and Vault data" maintainer="Noel Cower " license="MPL-2.0" From dc79d4f114c6462ce2bb4be9c805d0ec68f1b031 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:02 +0200 Subject: [PATCH 1589/2369] consul: remove git build dep --- srcpkgs/consul/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template index fc0e8050287..d31feecc270 100644 --- a/srcpkgs/consul/template +++ b/srcpkgs/consul/template @@ -9,7 +9,6 @@ go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import # consul has a vendor directory, but relies on replace statements in go.mod, so # force default non-vendor behavior. go_mod_mode=default -hostmakedepends="git" short_desc="Distributed solution to connect and configure applications" maintainer="iaroki " license="MPL-2.0" From c06b443d618802e66f74e8b2d2efc986116116d4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:02 +0200 Subject: [PATCH 1590/2369] crane: remove git build dep --- srcpkgs/crane/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template index edb04e896ae..5a304a9faf7 100644 --- a/srcpkgs/crane/template +++ b/srcpkgs/crane/template @@ -3,7 +3,6 @@ pkgname=crane version=3.6.0 revision=1 build_style=go -hostmakedepends="git" short_desc="Lift containers with ease" maintainer="Andrea Brancaleoni " license="MIT" From ee2773ccfe7e0b3248ed47016032e14d6ebf2971 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:03 +0200 Subject: [PATCH 1591/2369] distrobuilder: remove git build dep --- srcpkgs/distrobuilder/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template index fd58594e174..05f805c1ac1 100644 --- a/srcpkgs/distrobuilder/template +++ b/srcpkgs/distrobuilder/template @@ -6,7 +6,6 @@ wrksrc="distrobuilder-distrobuilder-${version}" build_style=go go_import_path="github.com/lxc/distrobuilder" go_package="github.com/lxc/distrobuilder/distrobuilder" -hostmakedepends="git" depends="debootstrap gnupg squashfs-tools" short_desc="System container image builder for LXC and LXD" maintainer="Robert Lowry " From 9e795a4217cc00e8d5475e1521f03df9741fa408 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:03 +0200 Subject: [PATCH 1592/2369] dlayer: remove git build dep --- srcpkgs/dlayer/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template index 527800ebc58..b909474e393 100644 --- a/srcpkgs/dlayer/template +++ b/srcpkgs/dlayer/template @@ -4,7 +4,6 @@ version=0.3.1 revision=1 build_style=go go_import_path=github.com/orisano/dlayer -hostmakedepends="git" short_desc="Dlayer is a docker layer analyzer" maintainer="Mate GABRI " license="MIT" From bbcac5b3b8e032ff9f523186a0f0b25acfa913f2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:03 +0200 Subject: [PATCH 1593/2369] elfinfo: remove git build dep --- srcpkgs/elfinfo/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template index 189d842b001..b354ced06d8 100644 --- a/srcpkgs/elfinfo/template +++ b/srcpkgs/elfinfo/template @@ -4,7 +4,6 @@ version=1.1.0 revision=1 build_style=go go_import_path=github.com/xyproto/elfinfo -hostmakedepends="git" short_desc="Emit basic information about an ELF file" maintainer="Alexander F. Rødseth " license="MIT" From 281cf975647fea3cfe7b498603002183b176aed4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:03 +0200 Subject: [PATCH 1594/2369] ensure-access: remove git build dep --- srcpkgs/ensure-access/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template index b5187c8bb4f..9d3abe47630 100644 --- a/srcpkgs/ensure-access/template +++ b/srcpkgs/ensure-access/template @@ -4,7 +4,6 @@ version=0.1.0 revision=1 build_style=go go_import_path=github.com/Noah-Huppert/ensure-access -hostmakedepends="git" short_desc="Tool which ensures permissions exists for files and directories" maintainer="Noah Huppert " license="MIT" From 3f92b222b39823f30e3011a76f3d9cb88100e38f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:03 +0200 Subject: [PATCH 1595/2369] exercism: remove git build dep --- srcpkgs/exercism/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template index eb696027500..5869f87dbce 100644 --- a/srcpkgs/exercism/template +++ b/srcpkgs/exercism/template @@ -6,7 +6,6 @@ wrksrc="cli-${version}" build_style=go go_import_path="github.com/exercism/cli" go_package="${go_import_path}/exercism" -hostmakedepends="git" short_desc="Command line tool for exercism.io" maintainer="SolitudeSF " license="MIT" From 4b6006665b0820561531623d4443af7aad2c051e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:03 +0200 Subject: [PATCH 1596/2369] figurine: remove git build dep --- srcpkgs/figurine/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template index bef430fa4ba..bf412358486 100644 --- a/srcpkgs/figurine/template +++ b/srcpkgs/figurine/template @@ -4,7 +4,6 @@ version=1.0.1 revision=1 build_style=go go_import_path=github.com/arsham/figurine -hostmakedepends="git" short_desc="Print your name in style" maintainer="travankor " license="Apache-2.0" From 4057c0a50ef9d7a57ba1fc2443c16933a5884a0b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:03 +0200 Subject: [PATCH 1597/2369] flint: remove git build dep --- srcpkgs/flint/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template index 9a6b0d8c0aa..a04ca9e022d 100644 --- a/srcpkgs/flint/template +++ b/srcpkgs/flint/template @@ -3,7 +3,6 @@ pkgname=flint version=0.1.0 revision=9 build_style=go -hostmakedepends="git" short_desc="Check your project for common sources of contributor friction" maintainer="Andrea Brancaleoni " license="MIT" From 929160b7e4c1c1756cf34e8bce3b1ff7d8e852cc Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:04 +0200 Subject: [PATCH 1598/2369] fzf: remove git build dep --- srcpkgs/fzf/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template index ec60af9ddc6..86789e858d6 100644 --- a/srcpkgs/fzf/template +++ b/srcpkgs/fzf/template @@ -4,7 +4,6 @@ version=0.30.0 revision=1 build_style=go go_import_path="github.com/junegunn/fzf" -hostmakedepends="git" makedepends="ncurses-devel" short_desc="Command-line fuzzy finder" maintainer="Leah Neukirchen " From 28ff00dbc3a534d57359730c855fc17b65d7fea7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:04 +0200 Subject: [PATCH 1599/2369] ghq: remove git build dep --- srcpkgs/ghq/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template index 50202b42a26..fbe3c19e451 100644 --- a/srcpkgs/ghq/template +++ b/srcpkgs/ghq/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path=github.com/x-motemen/ghq go_package="$go_import_path" -hostmakedepends="git" depends="git" short_desc="Remote repository management made easy" maintainer="Dominic Monroe " From 44018535edf57a86b2c14eb143b3ca4e2eb374f2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:04 +0200 Subject: [PATCH 1600/2369] gitbatch: remove git build dep --- srcpkgs/gitbatch/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template index 4464729f2b8..df26ed89b19 100644 --- a/srcpkgs/gitbatch/template +++ b/srcpkgs/gitbatch/template @@ -4,7 +4,6 @@ version=0.5.0 revision=1 build_style=go go_import_path=github.com/isacikgoz/gitbatch -hostmakedepends="git" short_desc="Command line tool to manage your git repositories in one place" maintainer="0x0f0f0f " license="MIT" From 39f02e21f7e7a03df4fc0edf41725732d5e4f902 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:04 +0200 Subject: [PATCH 1601/2369] glide: remove git build dep --- srcpkgs/glide/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template index 635084f7098..15948753606 100644 --- a/srcpkgs/glide/template +++ b/srcpkgs/glide/template @@ -4,7 +4,6 @@ version=0.13.3 revision=1 build_style=go go_import_path="github.com/Masterminds/glide" -hostmakedepends="git" depends="go git" short_desc="Vendor package management for golang" maintainer="ananteris " From 0294e4de0747ff4c37c886fac9452b2dbad6f94f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:04 +0200 Subject: [PATCH 1602/2369] glider: remove git build dep --- srcpkgs/glider/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template index e132cfda4b7..36282560269 100644 --- a/srcpkgs/glider/template +++ b/srcpkgs/glider/template @@ -4,7 +4,6 @@ version=0.13.0 revision=1 build_style=go go_import_path=github.com/nadoo/glider -hostmakedepends="git" short_desc="Forward proxy with multiple protocols support" maintainer="whoami " license="GPL-3.0-or-later" From 368aaf7c1ea2b3adfd5185d3353675d0f6d9f09a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:05 +0200 Subject: [PATCH 1603/2369] go-md2man: remove git build dep --- srcpkgs/go-md2man/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template index e1094a54cbe..5f5feb187d3 100644 --- a/srcpkgs/go-md2man/template +++ b/srcpkgs/go-md2man/template @@ -4,7 +4,6 @@ version=2.0.1 revision=1 build_style=go go_import_path=github.com/cpuguy83/go-md2man/v2 -hostmakedepends="git" short_desc="Convert md to manpages" maintainer="Daniel Lewan " license="MIT" From 744064b6fdd416a623cb8a231350c550d9811008 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:05 +0200 Subject: [PATCH 1604/2369] go-review: remove git build dep --- srcpkgs/go-review/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template index b352545bedb..907a214d401 100644 --- a/srcpkgs/go-review/template +++ b/srcpkgs/go-review/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/heppu/go-review" go_package="${go_import_path}/cmd/${pkgname}" -hostmakedepends="git" short_desc="Publish reports from different Go linters as gerrit reviews" maintainer="Renato Aguiar " license="MIT" From de4a4f3d0288a02f505f0801a0b5c378ab9502b2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:05 +0200 Subject: [PATCH 1605/2369] gobuster: remove git build dep --- srcpkgs/gobuster/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template index c5427cd4339..60e075b3182 100644 --- a/srcpkgs/gobuster/template +++ b/srcpkgs/gobuster/template @@ -4,7 +4,6 @@ version=3.1.0 revision=2 build_style=go go_import_path=github.com/OJ/gobuster/v3 -hostmakedepends="git" short_desc="Directory, file and DNS busting tool" maintainer="Andrew Benson " license="Apache-2.0" From f2e4c6395f2920fd3020efd4435d9232be938238 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:05 +0200 Subject: [PATCH 1606/2369] goimapnotify: remove git build dep --- srcpkgs/goimapnotify/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template index 4b54689a434..208db03d00e 100644 --- a/srcpkgs/goimapnotify/template +++ b/srcpkgs/goimapnotify/template @@ -4,7 +4,6 @@ version=2.3.7 revision=1 build_style=go go_import_path="gitlab.com/shackra/goimapnotify" -hostmakedepends="git" short_desc="Execute scripts on IMAP idle notifications (Go version)" maintainer="Andrew J. Hesford " license="GPL-3.0-only" From bb106579d28815822e3bd6aa1d290b5a113b9214 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:05 +0200 Subject: [PATCH 1607/2369] gomatrix: remove git build dep --- srcpkgs/gomatrix/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template index fae7a4343ed..eb9d6e7beda 100644 --- a/srcpkgs/gomatrix/template +++ b/srcpkgs/gomatrix/template @@ -4,7 +4,6 @@ version=101.0.0 revision=1 build_style=go go_import_path=github.com/GeertJohan/gomatrix -hostmakedepends="git" short_desc="Terminal Matrix display in golang" maintainer="Alex Childs " license="BSD-2-Clause" From 1a7450fd4e5f650d8be8f64d408a0ae012abf921 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:05 +0200 Subject: [PATCH 1608/2369] gotty: remove git build dep --- srcpkgs/gotty/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template index 0e5d268e992..58fc0572197 100644 --- a/srcpkgs/gotty/template +++ b/srcpkgs/gotty/template @@ -4,7 +4,6 @@ version=1.0.1 revision=8 build_style=go go_import_path="github.com/yudai/gotty" -hostmakedepends="git" short_desc="Share your terminal as a web application" maintainer="Diogo Leal " license="MIT" From e7d0b74e65904a2034182ec5279046f4feb9e669 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:05 +0200 Subject: [PATCH 1609/2369] goversion: remove git build dep --- srcpkgs/goversion/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template index 390551d2b42..ac45067873f 100644 --- a/srcpkgs/goversion/template +++ b/srcpkgs/goversion/template @@ -4,7 +4,6 @@ version=1.2.0 revision=3 build_style=go go_import_path=rsc.io/goversion -hostmakedepends="git" short_desc="Print version used to build Go executables" maintainer="Orphaned " license="BSD-3-Clause" From 9f3568bf1a4aa496534ead0b1dd9db94bce12f54 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:05 +0200 Subject: [PATCH 1610/2369] gucci: remove git build dep --- srcpkgs/gucci/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template index 37773ceba89..09992b5b65a 100644 --- a/srcpkgs/gucci/template +++ b/srcpkgs/gucci/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/noqcks/gucci" go_ldflags="-X main.AppVersion=${version}" -hostmakedepends="git" short_desc="Simple CLI templating tool written in Go" maintainer="Leah Neukirchen " license="MIT" From e9983b4fe730081694a199ae0a726726c3f430dc Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:05 +0200 Subject: [PATCH 1611/2369] gx: remove git build dep --- srcpkgs/gx/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/gx/template b/srcpkgs/gx/template index ff3ea0267c8..7414b6bab10 100644 --- a/srcpkgs/gx/template +++ b/srcpkgs/gx/template @@ -4,7 +4,6 @@ version=0.14.3 revision=1 build_style=go go_import_path="github.com/whyrusleeping/gx" -hostmakedepends="git" short_desc="Language-agnostic, universal package manager around IPFS" maintainer="lemmi " license="MIT" From e2bf115efc346773249cef85942291e42c360911 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:06 +0200 Subject: [PATCH 1612/2369] hey: remove git build dep --- srcpkgs/hey/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template index 84954e36b76..52427108dc6 100644 --- a/srcpkgs/hey/template +++ b/srcpkgs/hey/template @@ -4,7 +4,6 @@ version=0.1.4 revision=1 build_style=go go_import_path=github.com/rakyll/hey -hostmakedepends="git" short_desc="HTTP load generator" maintainer="Orphaned " license="Apache-2.0" From 3d87b0f37f8cf186cb505157965967ab0377b7e9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:06 +0200 Subject: [PATCH 1613/2369] hooktftp: remove git build dep --- srcpkgs/hooktftp/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template index 2cba14aec60..d9482c378c7 100644 --- a/srcpkgs/hooktftp/template +++ b/srcpkgs/hooktftp/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/tftp-go-team/hooktftp" go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp" -hostmakedepends="git" short_desc="Hook based tftp server" maintainer="Toyam Cox " license="MIT" From bed70ceae9b32b65f293f6f3bd552dbf3c39e122 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:06 +0200 Subject: [PATCH 1614/2369] hydroxide: remove git build dep --- srcpkgs/hydroxide/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template index 5f63ded6f75..c7fc20b5de9 100644 --- a/srcpkgs/hydroxide/template +++ b/srcpkgs/hydroxide/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path=github.com/emersion/hydroxide go_package=$go_import_path/cmd/hydroxide -hostmakedepends="git" short_desc="Third-party, open-source ProtonMail CardDAV, IMAP and SMTP bridge" maintainer="DirectorX " license="MIT" From 926047d49ea2d3f8cc8c4d72173ce6234f978bf7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:06 +0200 Subject: [PATCH 1615/2369] immortal: remove git build dep --- srcpkgs/immortal/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template index 76c1d8c6dab..e693e767adb 100644 --- a/srcpkgs/immortal/template +++ b/srcpkgs/immortal/template @@ -7,7 +7,6 @@ go_import_path=github.com/immortal/immortal go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl ${go_import_path}/cmd/immortaldir" go_ldflags="-X main.Version=v${version}" -hostmakedepends="git" short_desc="*nix cross-platform (OS agnostic) supervisor" maintainer="Orphaned " license="BSD-3-Clause" From d72526fabc16764710d50e77b3c804dbac836e82 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:06 +0200 Subject: [PATCH 1616/2369] ipfs-cluster: remove git build dep --- srcpkgs/ipfs-cluster/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template index ebb062d409c..27e6d6aad94 100644 --- a/srcpkgs/ipfs-cluster/template +++ b/srcpkgs/ipfs-cluster/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/ipfs/ipfs-cluster" go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service" -hostmakedepends="git" depends="go-ipfs" short_desc="Collective pinning and composition for IPFS" maintainer="Toyam Cox " From 0ddbdb7c875bac7d1a9dda937ed37bd1961511e9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:06 +0200 Subject: [PATCH 1617/2369] jid: remove git build dep --- srcpkgs/jid/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template index abce00a8353..52055ab9f9e 100644 --- a/srcpkgs/jid/template +++ b/srcpkgs/jid/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path=github.com/simeji/jid go_package=github.com/simeji/jid/cmd/jid -hostmakedepends="git" short_desc="Drill down JSON interactively by using filtering queries" maintainer="Orphaned " license="MIT" From 8fdc143ce4fe735a3e52aae17f3c84073bf1a10e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:06 +0200 Subject: [PATCH 1618/2369] joker: remove git build dep --- srcpkgs/joker/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template index a66fffbab25..2682f33a5df 100644 --- a/srcpkgs/joker/template +++ b/srcpkgs/joker/template @@ -4,7 +4,6 @@ version=0.14.1 revision=1 build_style=go go_import_path=github.com/candid82/joker -hostmakedepends="git" short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter" maintainer="Dominic Monroe " license="EPL-1.0" From 2cacdcce1ce6a364bf4fcc1f1b637fe31e3e8dfb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:06 +0200 Subject: [PATCH 1619/2369] jump: remove git build dep --- srcpkgs/jump/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template index b31f01bba49..9c4a258d56a 100644 --- a/srcpkgs/jump/template +++ b/srcpkgs/jump/template @@ -4,7 +4,6 @@ version=0.40.0 revision=1 build_style=go go_import_path=github.com/gsamokovarov/jump -hostmakedepends="git" short_desc="Fuzzy directory jumper that learns your habits" maintainer="Arthur Weagel " license="MIT" From 63576e402e5fe054efd216816648f6fc7d5742ac Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:07 +0200 Subject: [PATCH 1620/2369] keybase: remove git build dep --- srcpkgs/keybase/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template index 3e86e92e2f8..d0c5ace0df3 100644 --- a/srcpkgs/keybase/template +++ b/srcpkgs/keybase/template @@ -10,7 +10,6 @@ ${go_import_path}/go/kbfs/kbfsfuse ${go_import_path}/go/kbfs/kbfsgit/git-remote-keybase ${go_import_path}/go/kbfs/kbfstool ${go_import_path}/go/kbfs/redirector" go_build_tags="production" -hostmakedepends="git" depends="gnupg2" short_desc="Client for keybase.io" maintainer="Toyam Cox " From 5d23e4404e7114c8c6a00a5cd9c4ae7cd4686848 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:07 +0200 Subject: [PATCH 1621/2369] lego: remove git build dep --- srcpkgs/lego/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template index 6d46cd6a6e6..9605311ef9b 100644 --- a/srcpkgs/lego/template +++ b/srcpkgs/lego/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/go-acme/lego/v4" go_package="${go_import_path}/cmd/lego" -hostmakedepends="git" short_desc="Let's Encrypt client and ACME library written in Go" maintainer="Anachron " license="MIT" From f7eb1e6dc1300ad32188942601a989fadfe1b63a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:07 +0200 Subject: [PATCH 1622/2369] licensechecker: remove git build dep --- srcpkgs/licensechecker/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template index ec09ba9751f..f04bcd1fe4d 100644 --- a/srcpkgs/licensechecker/template +++ b/srcpkgs/licensechecker/template @@ -5,7 +5,6 @@ revision=5 wrksrc="lc-${version}" build_style=go go_import_path=github.com/boyter/lc -hostmakedepends="git" short_desc="Identify software licenses used on a source tree" maintainer="Orphaned " license="MIT" From 14eae881e115a2a65997e8cad7f370f395276540 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:07 +0200 Subject: [PATCH 1623/2369] massren: remove git build dep --- srcpkgs/massren/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template index d3f4250b2ec..d98fce7395b 100644 --- a/srcpkgs/massren/template +++ b/srcpkgs/massren/template @@ -3,7 +3,6 @@ pkgname=massren version=1.5.4 revision=7 build_style=go -hostmakedepends="git" short_desc="Massive renamer from command line" maintainer="Andrea Brancaleoni " license="MIT" From 59ca2b39415aaad6383af392afff4fffca26a6d4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:07 +0200 Subject: [PATCH 1624/2369] minify: remove git build dep --- srcpkgs/minify/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template index 9be3e9620c4..095c1e5a242 100644 --- a/srcpkgs/minify/template +++ b/srcpkgs/minify/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/tdewolff/minify/v2" go_package="${go_import_path}/cmd/minify" -hostmakedepends="git" short_desc="Go minifiers for web formats" maintainer="Leah Neukirchen " license="MIT" From a51e5d721f17f22057c870912dcdb45676ceac99 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:07 +0200 Subject: [PATCH 1625/2369] minio: remove git build dep --- srcpkgs/minio/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template index 58d745f326b..06cf90aec4a 100644 --- a/srcpkgs/minio/template +++ b/srcpkgs/minio/template @@ -7,7 +7,6 @@ wrksrc=${pkgname}-RELEASE.${_version} build_style=go go_import_path="github.com/minio/minio" conf_files="/etc/default/minio /etc/minio/config.json" -hostmakedepends="git" short_desc="Object storage server compatible with Amazon S3" maintainer="Gerardo Di Iorio " license="Apache-2.0" From eb549a9c1e06f1b78b547991fdca2b5754c11042 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:08 +0200 Subject: [PATCH 1626/2369] mountain-backup: remove git build dep --- srcpkgs/mountain-backup/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/mountain-backup/template b/srcpkgs/mountain-backup/template index 309cbda5305..bfbd5cb3cc0 100644 --- a/srcpkgs/mountain-backup/template +++ b/srcpkgs/mountain-backup/template @@ -4,7 +4,6 @@ version=0.2.0 revision=1 build_style=go go_import_path=github.com/Noah-Huppert/mountain-backup -hostmakedepends="git" short_desc="File backup tool" maintainer="Noah Huppert " license="MIT" From a8d853bf52ac71935ab16e06cc0d592e30ae986d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:08 +0200 Subject: [PATCH 1627/2369] nebula: remove git build dep --- srcpkgs/nebula/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/nebula/template b/srcpkgs/nebula/template index 888e436ae61..8e67012d17c 100644 --- a/srcpkgs/nebula/template +++ b/srcpkgs/nebula/template @@ -7,7 +7,6 @@ make_dirs="/etc/nebula 0750 root root" go_import_path=github.com/slackhq/nebula go_package="${go_import_path}/cmd/nebula ${go_import_path}/cmd/nebula-cert" go_ldflags="-X main.Build=${version}" -hostmakedepends="git" short_desc="Scalable overlay networking tool" maintainer="Noel Cower " license="MIT" From ae3616af97f233d6033cd1592a0478e7efcde534 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:08 +0200 Subject: [PATCH 1628/2369] node_exporter: remove git build dep --- srcpkgs/node_exporter/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template index f84cae0d6a1..baec4cfc14d 100644 --- a/srcpkgs/node_exporter/template +++ b/srcpkgs/node_exporter/template @@ -8,7 +8,6 @@ go_ldflags="-X ${go_import_path}/version.Version=${version} -X ${go_import_path}/version.Revision=${version} -X ${go_import_path}/version.Branch=${version} -X ${go_import_path}/version.BuildUser=VoidLinux" -hostmakedepends="git" short_desc="Exporter for machine metrics" maintainer="Toyam Cox " license="Apache-2.0" From 8bc2eb9db05ef806a4c1a00336c9f60e62e77b35 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:08 +0200 Subject: [PATCH 1629/2369] nomad: remove git build dep --- srcpkgs/nomad/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template index 8707ada37bf..7b53596b1ae 100644 --- a/srcpkgs/nomad/template +++ b/srcpkgs/nomad/template @@ -7,7 +7,6 @@ go_import_path="github.com/hashicorp/nomad" go_build_tags="ui release" _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" maintainer="Michael Aldridge " license="MPL-2.0" From 9ff93de908115cef3d83287343306e9d04b91fcc Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:08 +0200 Subject: [PATCH 1630/2369] obfs4proxy: remove git build dep --- srcpkgs/obfs4proxy/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/obfs4proxy/template b/srcpkgs/obfs4proxy/template index 1b9dd7e0b53..c38ce754ce8 100644 --- a/srcpkgs/obfs4proxy/template +++ b/srcpkgs/obfs4proxy/template @@ -7,7 +7,6 @@ wrksrc="${_pkgname}-${version}" build_style=go go_import_path=gitlab.com/yawning/obfs4.git go_package="${go_import_path}/obfs4proxy" -hostmakedepends="git" short_desc="Pluggable transport proxy for Tor, implementing obfs4" maintainer="Daniel Eyßer " license="BSD-2-Clause" From f32e36cd9bda15806a33b10f7c2ba540940089e8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:08 +0200 Subject: [PATCH 1631/2369] oh: remove git build dep --- srcpkgs/oh/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template index 03149b3ed69..1f9a346883c 100644 --- a/srcpkgs/oh/template +++ b/srcpkgs/oh/template @@ -4,7 +4,6 @@ version=0.8.0 revision=1 build_style=go go_import_path="github.com/michaelmacinnis/oh" -hostmakedepends="git" short_desc="Surprisingly powerful Unix shell" maintainer="Kyle Nusbaum " license="MIT" From a3d008fbe9a078c5dad7ac8894ae5757e8289547 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:08 +0200 Subject: [PATCH 1632/2369] pam_netauth: remove git build dep --- srcpkgs/pam_netauth/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template index 09a33291eb8..7c300852f69 100644 --- a/srcpkgs/pam_netauth/template +++ b/srcpkgs/pam_netauth/template @@ -4,7 +4,6 @@ version=0.3.5 revision=1 build_style=go go_import_path="github.com/netauth/pam_netauth" -hostmakedepends="git" makedepends=pam-devel short_desc="PAM plugin for NetAuth" maintainer="Michael Aldridge " From 40374e9db7a954a7186043c13e2be3d3ab16997d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:08 +0200 Subject: [PATCH 1633/2369] peco: remove git build dep --- srcpkgs/peco/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template index 0fc04b8036b..6f5679e73ca 100644 --- a/srcpkgs/peco/template +++ b/srcpkgs/peco/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/peco/peco" go_package="${go_import_path}/cmd/peco" -hostmakedepends="git" short_desc="Simplistic interactive filtering tool" maintainer="Leah Neukirchen " license="MIT" From db3a12d36bf7b2e360cb3773f1aa807b8ad6a702 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:09 +0200 Subject: [PATCH 1634/2369] pst: remove git build dep --- srcpkgs/pst/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/pst/template b/srcpkgs/pst/template index 9aa71e75839..b1d3888ae8b 100644 --- a/srcpkgs/pst/template +++ b/srcpkgs/pst/template @@ -4,7 +4,6 @@ version=1.3.2 revision=1 build_style=go go_import_path=github.com/skanehira/pst -hostmakedepends="git" short_desc="TUI process monitor" maintainer="Daniel Lewan " license="MIT" From 04da19e9a624dcd90730e7c856df85129680f3e3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:09 +0200 Subject: [PATCH 1635/2369] pwget: remove git build dep --- srcpkgs/pwget/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/pwget/template b/srcpkgs/pwget/template index ddc85de35f0..64cdcae14fb 100644 --- a/srcpkgs/pwget/template +++ b/srcpkgs/pwget/template @@ -4,7 +4,6 @@ version=2.0 revision=1 build_style=go go_import_path="github.com/majewsky/pwget" -hostmakedepends="git" short_desc="Single-binary stateless password manager" maintainer="Andy Weidenbaum " license="GPL-3.0-or-later" From 2a795d22876dacb1e46facd4683a5a72aa7d1a78 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:09 +0200 Subject: [PATCH 1636/2369] s: remove git build dep --- srcpkgs/s/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/s/template b/srcpkgs/s/template index 76a7da45824..8dd51767476 100644 --- a/srcpkgs/s/template +++ b/srcpkgs/s/template @@ -5,7 +5,6 @@ revision=1 build_helper=qemu build_style=go go_import_path=github.com/zquestz/s -hostmakedepends="git" short_desc="Web search from the terminal" maintainer="Daniel Lewan " license="MIT" From af7212f2af44ecd24954302a0f77e408403c722e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:09 +0200 Subject: [PATCH 1637/2369] saml2aws: remove git build dep --- srcpkgs/saml2aws/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template index 43cd823b7b5..a3afe9ed49f 100644 --- a/srcpkgs/saml2aws/template +++ b/srcpkgs/saml2aws/template @@ -6,7 +6,6 @@ build_style=go go_import_path=github.com/versent/saml2aws/v2 go_package="$go_import_path/cmd/saml2aws" go_ldflags="-X main.Version=${version}" -hostmakedepends="git" depends="aws-cli" short_desc="Get AWS temporary credentials from SAML provider" maintainer="Mate GABRI " From 83926fbb4fa4085f56ab9d0f99336c10aa2100ae Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:09 +0200 Subject: [PATCH 1638/2369] sampler: remove git build dep --- srcpkgs/sampler/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template index 8612da45a6a..be43f33416c 100644 --- a/srcpkgs/sampler/template +++ b/srcpkgs/sampler/template @@ -4,7 +4,6 @@ version=1.1.0 revision=1 build_style=go go_import_path="github.com/sqshq/sampler" -hostmakedepends="git" makedepends="alsa-lib-devel" short_desc="Tool for shell commands execution, visualization and alerting" maintainer="Renato Aguiar " From 690d3b2e9fee68f372748a5bec555bbd33738d3e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:09 +0200 Subject: [PATCH 1639/2369] seaweedfs: remove git build dep --- srcpkgs/seaweedfs/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template index 4c3a91e3a89..af07c3694fa 100644 --- a/srcpkgs/seaweedfs/template +++ b/srcpkgs/seaweedfs/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/chrislusf/seaweedfs" go_package="github.com/chrislusf/seaweedfs/weed" -hostmakedepends="git" short_desc="Simple and highly scalable distributed file system" maintainer="Toyam Cox " license="Apache-2.0" From 3c7645187b083a2a3a66c217ac735a92976fd165 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:09 +0200 Subject: [PATCH 1640/2369] shadowfox-updater: remove git build dep --- srcpkgs/shadowfox-updater/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template index 37e61375530..fb2eadb6f54 100644 --- a/srcpkgs/shadowfox-updater/template +++ b/srcpkgs/shadowfox-updater/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path=github.com/SrKomodo/shadowfox-updater go_ldflags="-X main.version=v${version}" -hostmakedepends="git" short_desc="Auto-updater for ShadowFox" maintainer="Renato Aguiar " license="MIT" From 1bc949baa8ace4e45131b1df6d3747cf50a5a6cf Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:10 +0200 Subject: [PATCH 1641/2369] sops: remove git build dep --- srcpkgs/sops/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template index f1215b6c3eb..ade18a059c5 100644 --- a/srcpkgs/sops/template +++ b/srcpkgs/sops/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="go.mozilla.org/sops/v3" go_package="${go_import_path}/cmd/sops" -hostmakedepends="git" short_desc="Simple and flexible tool for managing secrets" maintainer="Noel Cower " license="MPL-2.0" From 9a909f2ca70dc21822130ac4e2501f078b91063f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:10 +0200 Subject: [PATCH 1642/2369] syncthing: remove git build dep --- srcpkgs/syncthing/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template index 10166603a68..d1cdcc490bb 100644 --- a/srcpkgs/syncthing/template +++ b/srcpkgs/syncthing/template @@ -10,7 +10,6 @@ go_package=" ${go_import_path}/cmd/syncthing" go_build_tags="noupgrade" go_ldflags="-X github.com/syncthing/syncthing/lib/build.Version=v${version}" -hostmakedepends="git" short_desc="Open Source Continuous File Synchronization" maintainer="Duncaen " license="MPL-2.0" From ec5442b3d14a1adebd09b4420e0cece0edfc072a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:10 +0200 Subject: [PATCH 1643/2369] termshark: remove git build dep --- srcpkgs/termshark/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template index 4656690cb60..73a8d1976c5 100644 --- a/srcpkgs/termshark/template +++ b/srcpkgs/termshark/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/gcla/termshark/v2" go_package="${go_import_path}/cmd/termshark" -hostmakedepends="git" depends="wireshark" short_desc="Terminal UI for tshark, inspired by Wireshark" maintainer="Piraty " From a57cd92255e9dfbb4aa5f302600343f8ef632c1c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:10 +0200 Subject: [PATCH 1644/2369] terragrunt: remove git build dep --- srcpkgs/terragrunt/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template index b9945121353..2c5080b61c3 100644 --- a/srcpkgs/terragrunt/template +++ b/srcpkgs/terragrunt/template @@ -4,7 +4,6 @@ version=0.36.1 revision=1 build_style=go go_import_path="github.com/gruntwork-io/terragrunt" -hostmakedepends="git" depends="terraform" short_desc="Thin wrapper for Terraform that provides extra tools" maintainer="Andrea Brancaleoni " From b4315da69d45a7bb88032425dcbc37f5eba394d9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:10 +0200 Subject: [PATCH 1645/2369] tml: remove git build dep --- srcpkgs/tml/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template index 46ab37c0a3d..21810a85215 100644 --- a/srcpkgs/tml/template +++ b/srcpkgs/tml/template @@ -6,7 +6,6 @@ build_style=go go_import_path="github.com/liamg/tml" go_package="github.com/liamg/tml/tml" go_ldflags="-X github.com/liamg/tml/version.Version=${TRAVIS_TAG}" -hostmakedepends="git" short_desc="Tiny markup language for terminal output" maintainer="Benjamín Albiñana " license="Unlicense" From 09b15d934a6b27ab5e7aa17c9430800a79574f26 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:10 +0200 Subject: [PATCH 1646/2369] up: remove git build dep --- srcpkgs/up/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/up/template b/srcpkgs/up/template index dbaf768841d..3907504ad47 100644 --- a/srcpkgs/up/template +++ b/srcpkgs/up/template @@ -4,7 +4,6 @@ version=0.4 revision=1 build_style=go go_import_path=github.com/akavel/up -hostmakedepends="git" short_desc="Ultimate Plumber - write Linux pipes interactively" maintainer="Piraty " license="Apache-2.0" From 33af29be2952ead39f2197aa857a6cc711421a74 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:10 +0200 Subject: [PATCH 1647/2369] usql: remove git build dep --- srcpkgs/usql/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template index f5705bd21b3..45687345c30 100644 --- a/srcpkgs/usql/template +++ b/srcpkgs/usql/template @@ -4,7 +4,6 @@ version=0.9.5 revision=1 build_style=go go_import_path=github.com/xo/usql -hostmakedepends="git" short_desc="Universal command-line interface for SQL databases" maintainer="Alan Brown " license="MIT" From 218222605a8a56d859d544da7f00a23470400df7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:11 +0200 Subject: [PATCH 1648/2369] vault: remove git build dep --- srcpkgs/vault/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template index 49f6a4b405b..111feb18627 100644 --- a/srcpkgs/vault/template +++ b/srcpkgs/vault/template @@ -7,7 +7,6 @@ go_import_path="github.com/hashicorp/vault" go_build_tags="release" _git_commit=fcbe948b2542a13ee8036ad07dd8ebf8554f56cb go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}" -hostmakedepends="git" depends="libcap-progs" short_desc="Manage Secrets and Protect Sensitive Data" maintainer="Michael Aldridge " From 2b6976aad7982518d4b7e6084a5c4e8377e4f7b4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:11 +0200 Subject: [PATCH 1649/2369] websocketd: remove git build dep --- srcpkgs/websocketd/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template index 110a42b2a91..f6e09cd762d 100644 --- a/srcpkgs/websocketd/template +++ b/srcpkgs/websocketd/template @@ -4,7 +4,6 @@ version=0.4.1 revision=1 build_style=go go_import_path="github.com/joewalnes/websocketd" -hostmakedepends="git" short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server" maintainer="Andrea Brancaleoni " license="BSD-2-Clause" From 5aaff470cb27f67d040bfd35f5388c74054756c1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:11 +0200 Subject: [PATCH 1650/2369] wego: remove git build dep --- srcpkgs/wego/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template index 5e806bb8365..a02b1253a23 100644 --- a/srcpkgs/wego/template +++ b/srcpkgs/wego/template @@ -2,7 +2,6 @@ pkgname=wego version=2.1 revision=1 -hostmakedepends="git" build_style=go go_import_path=github.com/schachmat/wego short_desc="Weather client for the terminal" From c22485f3b06b0d18713aec4f6e3723365b7950a7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:11 +0200 Subject: [PATCH 1651/2369] xurls: remove git build dep --- srcpkgs/xurls/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template index 03a9960c67d..797420fe782 100644 --- a/srcpkgs/xurls/template +++ b/srcpkgs/xurls/template @@ -5,7 +5,6 @@ revision=2 build_style=go go_import_path="mvdan.cc/xurls/v2" go_package="${go_import_path}/cmd/xurls" -hostmakedepends="git" short_desc="Extract urls from text" maintainer="Orphaned " license="BSD-3-Clause" From 11e0a4bf797cefc8b866c711a148bbe1482e6b22 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:11 +0200 Subject: [PATCH 1652/2369] yggdrasil: remove git build dep --- srcpkgs/yggdrasil/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template index ce580cd5295..0839a7cda8a 100644 --- a/srcpkgs/yggdrasil/template +++ b/srcpkgs/yggdrasil/template @@ -5,7 +5,6 @@ revision=1 wrksrc="yggdrasil-go-${version}" build_style=go go_import_path=github.com/yggdrasil-network/yggdrasil-go -hostmakedepends="git" short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network" maintainer="Jan Christian Gruenhage " license="LGPL-3.0-only" From d4c70a16e3acd7dd96403f9381f3f03a9e388007 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:11 +0200 Subject: [PATCH 1653/2369] yj: remove git build dep --- srcpkgs/yj/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template index 395a2c6b15b..1574254ace3 100644 --- a/srcpkgs/yj/template +++ b/srcpkgs/yj/template @@ -4,7 +4,6 @@ version=5.1.0 revision=1 build_style=go go_import_path="github.com/sclevine/yj/v${version%%.*}" -hostmakedepends="git" short_desc="Convert YAML <=> TOML <=> JSON <=> HCL" maintainer="Leah Neukirchen " license="Apache-2.0" From d3966da2198c4ee73fc1ed672c517be412062cfd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:11 +0200 Subject: [PATCH 1654/2369] zrepl: remove git build dep --- srcpkgs/zrepl/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template index dd4b712b8e4..a989c805ab8 100644 --- a/srcpkgs/zrepl/template +++ b/srcpkgs/zrepl/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path=github.com/zrepl/zrepl go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}" -hostmakedepends="git" depends="zfs" short_desc="One-stop ZFS backup & replication solution" maintainer="Frans Bergman " From 0858be1c557f8994aa1544667fc0c01dec51d2c2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:03 +0200 Subject: [PATCH 1655/2369] dep: remove git build dep --- srcpkgs/dep/template | 5 ----- 1 file changed, 5 deletions(-) diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template index 79cce541059..65981b673f8 100644 --- a/srcpkgs/dep/template +++ b/srcpkgs/dep/template @@ -6,7 +6,6 @@ build_style=go go_import_path=github.com/golang/dep go_package="${go_import_path}/cmd/dep" go_ldflags="-X main.version=v${version}" -hostmakedepends="git" depends="git go" short_desc="Go dependency management tool" maintainer="Andrea Brancaleoni " @@ -15,10 +14,6 @@ homepage="https://github.com/golang/dep" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=929c8f759838f98323211ba408a831ea80d93b75beda8584b6d950f393a3298a -pre_build() { - git config --global http.https://gopkg.in.followRedirects true -} - post_install() { vlicense LICENSE } From 0bf0317af4974f19de7d691ea8531f86e5bd7ec5 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Tue, 3 May 2022 01:15:52 +0200 Subject: [PATCH 1656/2369] go-md2man: update to 2.0.2. --- srcpkgs/go-md2man/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template index 5f5feb187d3..c6771ad1f19 100644 --- a/srcpkgs/go-md2man/template +++ b/srcpkgs/go-md2man/template @@ -1,6 +1,6 @@ # Template file for 'go-md2man' pkgname=go-md2man -version=2.0.1 +version=2.0.2 revision=1 build_style=go go_import_path=github.com/cpuguy83/go-md2man/v2 @@ -9,7 +9,7 @@ maintainer="Daniel Lewan " license="MIT" homepage="https://github.com/cpuguy83/go-md2man" distfiles="https://github.com/cpuguy83/go-md2man/archive/v${version}.tar.gz" -checksum=889309ecf43e40d3a76d666b0259dcd71b340ea0fad003784ff3fe0b6c21990e +checksum=2f52e37101ea2734b02f2b54a53c74305b95b3a9a27792fdac962b5354aa3e4a post_install() { vlicense LICENSE.md From 1c889bbeaf8264b00fd96b77bd8ca2b8960e837c Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Tue, 3 May 2022 01:00:53 +0200 Subject: [PATCH 1657/2369] dragon: update to 1.2.0. --- srcpkgs/dragon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dragon/template b/srcpkgs/dragon/template index 61e86f39408..6e19adab1dc 100644 --- a/srcpkgs/dragon/template +++ b/srcpkgs/dragon/template @@ -1,6 +1,6 @@ # Template file for 'dragon' pkgname=dragon -version=1.1.1 +version=1.2.0 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Daniel Lewan " license="GPL-3.0-or-later" homepage="https://github.com/mwh/dragon" distfiles="https://github.com/mwh/dragon/archive/v${version}.tar.gz" -checksum=010a508c539c35bd128c54bbe57ad7c17c078e1b95e7bd3457a8589973e0b171 +checksum=9bda28e96d715c759c8a1db754bdfde5e7d83671e13cd25a892f6b5e29357994 do_install() { vbin dragon From cee8586e1dc15926b2530ae40c74a0685df832a0 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 2 May 2022 18:30:12 +0200 Subject: [PATCH 1658/2369] dbeaver: update to 22.0.4. --- srcpkgs/dbeaver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index a1e7ca0c300..5890f3e34d2 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -1,6 +1,6 @@ # Template file for 'dbeaver' pkgname=dbeaver -version=22.0.3 +version=22.0.4 revision=1 # the build downloads binaries linked to glibc archs="x86_64 aarch64" @@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum " license="Apache-2.0" homepage="https://dbeaver.io" distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz" -checksum=5af628ec7cd4c0e63fd074dd92d5668788136321cc273f778f20ff8c7907323a +checksum=ebb6c99d5875a7d68e7a6adb3dc99f2868096208f97137560ba6dbbfb3a06f37 nopie=true if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then From 932955146044362feb5a23d91541033db9269a30 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Tue, 3 May 2022 01:07:02 +0200 Subject: [PATCH 1659/2369] s: update to 0.6.6. --- srcpkgs/s/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s/template b/srcpkgs/s/template index 8dd51767476..18c984fc28b 100644 --- a/srcpkgs/s/template +++ b/srcpkgs/s/template @@ -1,6 +1,6 @@ # Template file for 's' pkgname=s -version=0.6.4 +version=0.6.6 revision=1 build_helper=qemu build_style=go @@ -10,7 +10,7 @@ maintainer="Daniel Lewan " license="MIT" homepage="https://github.com/zquestz/s" distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz" -checksum=5829a18da40cb5a936f32240b4244d2a0543cb85dc3d5e013ae5aa08557c148f +checksum=d91c8d2935f55dc6f241b7abc0325863846bdeac07a8f3bfa99b4a932d20ace3 post_build() { s_cli=$(find $GOPATH/bin -name s) From afb57ebb49e9c246371771e82ccf6d93661501c8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 13:41:23 +0200 Subject: [PATCH 1660/2369] New package: python3-versioningit-1.1.1 --- srcpkgs/python3-versioningit/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/python3-versioningit/template diff --git a/srcpkgs/python3-versioningit/template b/srcpkgs/python3-versioningit/template new file mode 100644 index 00000000000..4751d63ffa0 --- /dev/null +++ b/srcpkgs/python3-versioningit/template @@ -0,0 +1,19 @@ +# Template file for 'python3-versioningit' +pkgname=python3-versioningit +version=1.1.1 +revision=1 +wrksrc="versioningit-$version" +build_style=python3-pep517 +hostmakedepends="python3-wheel" +depends="python3-packaging python3-setuptools python3-tomli" +short_desc="Versioning It with your Version In Git" +maintainer="Michal Vasilek " +license="MIT" +homepage="https://github.com/jwodder/versioningit" +changelog="https://raw.githubusercontent.com/jwodder/versioningit/master/CHANGELOG.md" +distfiles="https://github.com/jwodder/versioningit/archive/refs/tags/v$version.tar.gz" +checksum=45d611fa50f3ef25f678468927b6295e27e295f39d55a5d8c0c426a0fae69445 + +post_install() { + vlicense LICENSE +} From 3dd1512c0dfaaacab1d4d806cf63725e8fa2edcd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 13:44:17 +0200 Subject: [PATCH 1661/2369] streamlink: update to 4.0.1. --- srcpkgs/streamlink/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template index 5b8427c56e9..ee0a31a9aa0 100644 --- a/srcpkgs/streamlink/template +++ b/srcpkgs/streamlink/template @@ -1,10 +1,10 @@ # Template file for 'streamlink' pkgname=streamlink -version=3.2.0 +version=4.0.1 revision=1 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-setuptools python3-lxml python3-pycryptodome python3-pycountry +build_style=python3-pep517 +hostmakedepends="python3-wheel python3-versioningit" +depends="python3-lxml python3-pycryptodome python3-pycountry python3-pysocks python3-requests python3-websocket-client python3-isodate" checkdepends="$depends python3-pytest python3-mock python3-requests-mock python3-freezegun" @@ -13,8 +13,8 @@ maintainer="Michal Vasilek " license="BSD-2-Clause" homepage="https://streamlink.github.io/" changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md" -distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz" -checksum=9770d2d83844c5378a73e14130dcb760abc856566caa0a41fc5b97a0ded5d926 +distfiles="https://github.com/streamlink/streamlink/releases/download/$version/streamlink-$version.tar.gz" +checksum=f38a4fd5c45b1628e7ebee43ba7f8522be5045565aa7c64009740baf853f20f5 make_check=ci-skip # some tests fail when running as root post_install() { From f991e72bf1d660ca3233aad7a1b912f33c4c9a54 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 1 May 2022 12:52:02 +0200 Subject: [PATCH 1662/2369] blush: update to 0.6.0. --- srcpkgs/blush/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template index c62c1a7bde8..6e6d068746e 100644 --- a/srcpkgs/blush/template +++ b/srcpkgs/blush/template @@ -1,16 +1,15 @@ # Template file for 'blush' pkgname=blush -version=0.5.3 -revision=3 +version=0.6.0 +revision=1 build_style=go go_import_path=github.com/arsham/blush -hostmakedepends="git" short_desc="Grep with colours" maintainer="travankor " license="MIT" homepage="https://github.com/arsham/blush" distfiles="https://github.com/arsham/blush/archive/v${version}.tar.gz" -checksum=1d96e080e7db9d57bb3aee1a7fae3df2aaa3a3f85cf41077e8235c78840ae740 +checksum=6db6b033bb5d4c4ac350b36b82d79447d5b91509db3a5eceb72ecb9484495e54 post_install() { vlicense LICENSE From 71b11fdbdb103dba980baf3905dc12eeb1deaf80 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 28 Feb 2022 14:40:07 +0100 Subject: [PATCH 1663/2369] xbps-src: add make_check_pre $make_check_pre can be used for wrapper commands like xvfb-run or dbus-run-session which are common ways to make tests work. This way many templates can avoid defining their own do_check function. --- Manual.md | 3 +++ common/build-style/cargo.sh | 2 +- common/build-style/cmake.sh | 2 +- common/build-style/configure.sh | 2 +- common/build-style/gnu-configure.sh | 2 +- common/build-style/gnu-makefile.sh | 2 +- common/build-style/meson.sh | 2 +- common/build-style/perl-ModuleBuild.sh | 2 +- common/build-style/perl-module.sh | 2 +- common/build-style/python-module.sh | 2 +- common/build-style/python3-module.sh | 4 ++-- common/build-style/python3-pep517.sh | 2 +- common/build-style/raku-dist.sh | 2 +- common/environment/setup/sourcepkg.sh | 2 +- 14 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Manual.md b/Manual.md index 8ec755499bb..1ce07792f54 100644 --- a/Manual.md +++ b/Manual.md @@ -600,6 +600,9 @@ path of the Python wheel produced by the build phase that will be installed; whe `python-pep517` build style will look for a wheel matching the package name and version in the current directory with respect to the install. +- `make_check_pre` The expression in front of `${make_cmd}`. This can be used for wrapper commands +or for setting environment variables for the check command. By default empty. + - `patch_args` The arguments to be passed in to the `patch(1)` command when applying patches to the package sources during `do_patch()`. Patches are stored in `srcpkgs//patches` and must be in `-p1` format. By default set to `-Np1`. diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh index 53c489772e7..573a6900361 100644 --- a/common/build-style/cargo.sh +++ b/common/build-style/cargo.sh @@ -11,7 +11,7 @@ do_build() { do_check() { : ${make_cmd:=cargo} - ${make_cmd} test --release --target ${RUST_TARGET} ${configure_args} \ + ${make_check_pre} ${make_cmd} test --release --target ${RUST_TARGET} ${configure_args} \ ${make_check_args} } diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 33a556be001..7d1d675c3ab 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -116,7 +116,7 @@ do_check() { : ${make_check_target:=test} - ${make_cmd} ${make_check_args} ${make_check_target} + ${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target} } do_install() { diff --git a/common/build-style/configure.sh b/common/build-style/configure.sh index 0963fc34793..6f2c94ace69 100644 --- a/common/build-style/configure.sh +++ b/common/build-style/configure.sh @@ -29,7 +29,7 @@ do_check() { : ${make_cmd:=make} : ${make_check_target:=check} - ${make_cmd} ${make_check_args} ${make_check_target} + ${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target} } do_install() { diff --git a/common/build-style/gnu-configure.sh b/common/build-style/gnu-configure.sh index 8121136cd12..f66b081955e 100644 --- a/common/build-style/gnu-configure.sh +++ b/common/build-style/gnu-configure.sh @@ -30,7 +30,7 @@ do_check() { : ${make_cmd:=make} : ${make_check_target:=check} - ${make_cmd} ${make_check_args} ${make_check_target} + ${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target} } do_install() { diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh index d7ea148fc48..2492749bd84 100644 --- a/common/build-style/gnu-makefile.sh +++ b/common/build-style/gnu-makefile.sh @@ -30,7 +30,7 @@ do_check() { : ${make_cmd:=make} : ${make_check_target:=check} - ${make_cmd} ${make_check_args} ${make_check_target} + ${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target} } do_install() { diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh index ab9f2cacfd0..a7bd901e976 100644 --- a/common/build-style/meson.sh +++ b/common/build-style/meson.sh @@ -138,7 +138,7 @@ do_check() { : ${make_check_target:=test} : ${meson_builddir:=build} - ${make_cmd} -C ${meson_builddir} ${makejobs} ${make_check_args} ${make_check_target} + ${make_check_pre} ${make_cmd} -C ${meson_builddir} ${makejobs} ${make_check_args} ${make_check_target} } do_install() { diff --git a/common/build-style/perl-ModuleBuild.sh b/common/build-style/perl-ModuleBuild.sh index a84373b5b0b..f21d2b0efb4 100644 --- a/common/build-style/perl-ModuleBuild.sh +++ b/common/build-style/perl-ModuleBuild.sh @@ -41,7 +41,7 @@ do_check() { if [ ! -x ./Build ]; then msg_error "$pkgver: cannot find ./Build script!\n" fi - ./Build test + ${make_check_pre} ./Build test } do_install() { diff --git a/common/build-style/perl-module.sh b/common/build-style/perl-module.sh index b9a01b13cfa..9126091cb2c 100644 --- a/common/build-style/perl-module.sh +++ b/common/build-style/perl-module.sh @@ -79,7 +79,7 @@ do_check() { : ${make_cmd:=make} : ${make_check_target:=test} - ${make_cmd} ${make_check_args} ${make_check_target} + ${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target} } do_install() { diff --git a/common/build-style/python-module.sh b/common/build-style/python-module.sh index 15cf7577adb..b80801a6724 100644 --- a/common/build-style/python-module.sh +++ b/common/build-style/python-module.sh @@ -49,7 +49,7 @@ do_check() { fi fi - python${pyver} setup.py ${make_check_target:-test} ${make_check_args} + ${make_check_pre} python${pyver} setup.py ${make_check_target:-test} ${make_check_args} rm build done } diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh index 093bdae8a00..8daf40e6921 100644 --- a/common/build-style/python3-module.sh +++ b/common/build-style/python3-module.sh @@ -25,7 +25,7 @@ do_build() { do_check() { if python3 -c 'import pytest' >/dev/null 2>&1; then - PYTHONPATH="$(cd build/lib* && pwd)" \ + ${make_check_pre} PYTHONPATH="$(cd build/lib* && pwd)" \ python3 -m pytest ${make_check_args} ${make_check_target} else # Fall back to deprecated setup.py test orchestration without pytest @@ -37,7 +37,7 @@ do_check() { fi : ${make_check_target:=test} - python3 setup.py ${make_check_target} ${make_check_args} + ${make_check_pre} python3 setup.py ${make_check_target} ${make_check_args} fi } diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh index 075f954a1a6..a733a521fb3 100644 --- a/common/build-style/python3-pep517.sh +++ b/common/build-style/python3-pep517.sh @@ -14,7 +14,7 @@ do_build() { do_check() { if python3 -c 'import pytest' >/dev/null 2>&1; then - python3 -m pytest ${make_check_args} ${make_check_target} + ${make_check_pre} python3 -m pytest ${make_check_args} ${make_check_target} else msg_warn "Unable to determine tests for PEP517 Python templates" return 0 diff --git a/common/build-style/raku-dist.sh b/common/build-style/raku-dist.sh index 3b1f28d6421..bbbba96e714 100644 --- a/common/build-style/raku-dist.sh +++ b/common/build-style/raku-dist.sh @@ -3,7 +3,7 @@ # do_check() { - RAKULIB=lib prove -r -e raku t/ + ${make_check_pre} RAKULIB=lib prove -r -e raku t/ } do_install() { diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh index bc06f745b78..e0e16d7915c 100644 --- a/common/environment/setup/sourcepkg.sh +++ b/common/environment/setup/sourcepkg.sh @@ -7,7 +7,7 @@ unset -v archs distfiles checksum build_style build_helper nocross broken unset -v configure_script configure_args wrksrc build_wrksrc create_wrksrc unset -v make_build_args make_check_args make_install_args unset -v make_build_target make_check_target make_install_target -unset -v make_cmd meson_cmd gem_cmd fetch_cmd +unset -v make_cmd meson_cmd gem_cmd fetch_cmd make_check_pre unset -v python_version stackage unset -v cmake_builddir meson_builddir unset -v meson_crossfile From e4c4912d521d63c99e450ba89bb3fb7008e4d065 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 28 Feb 2022 14:41:46 +0100 Subject: [PATCH 1664/2369] totem: fix tests --- srcpkgs/totem/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index c3e8c0911ba..bccea7f2a7c 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -12,21 +12,19 @@ makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel gst-plugins-ugly1 libSM-devel libXtst-devel libepc-devel libpeas-devel nautilus-devel zeitgeist-devel gst-plugins-base1-devel" depends="grilo-plugins gst-libav gst-plugins-good1 gst-plugins-ugly1 tracker3" +checkdepends="xvfb-run" short_desc="GNOME integrated movie player based on Gstreamer" maintainer="Enno Boland " license="LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Videos" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=fce562e2b26cbcfc0c678538dcc81f9dc15ce60d5a89ee4358907bf634304c40 +make_check_pre="xvfb-run" # XXX xulrunner plugin. # XXX reenable python plugin if pylint pkg exists. #pycompile_dirs="usr/lib/totem/plugins" -do_check() { - : -} - libtotem_package() { short_desc+=" - runtime library" pkg_install() { From cf96f3be07af082ae222db00e4297db7ac87bff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 30 Mar 2022 08:57:55 -0300 Subject: [PATCH 1665/2369] SuiteSparse: update to 5.12.0. --- .../patches/skip-demo-on-build.patch | 22 +++++++++++++++++++ srcpkgs/SuiteSparse/template | 7 +++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch diff --git a/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch b/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch new file mode 100644 index 00000000000..9ec775229ed --- /dev/null +++ b/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch @@ -0,0 +1,22 @@ +This is to avoid running demos on `make install`, which break cross compile + +--- a/Makefile ++++ b/Makefile +@@ -294,7 +294,7 @@ endif + # just compile GraphBLAS + gb: + echo $(CMAKE_OPTIONS) +- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) ++ ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) + + # compile and install GraphBLAS libgraphblas_renamed, for MATLAB + gbrenamed: +@@ -309,7 +309,7 @@ gbrenamed: + + # just compile Mongoose + mon: +- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) ++ ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) + + # compile and install Mongoose + moninstall: mon diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template index ab5c829e3ab..b304dfc8f78 100644 --- a/srcpkgs/SuiteSparse/template +++ b/srcpkgs/SuiteSparse/template @@ -1,7 +1,7 @@ # Template file for 'SuiteSparse' pkgname=SuiteSparse -version=5.10.1 -revision=2 +version=5.12.0 +revision=1 # XXX: re-enable TBB=-ltbb -DSPQR_CONFIG=-DHAVE_TBB when updating, if possible make_build_args="BLAS=-lblas LAPACK=-llapack" hostmakedepends="cmake chrpath" @@ -10,8 +10,9 @@ short_desc="Suite of sparse matrix software" maintainer="Gonzalo Tornaría " license="custom:multiple" homepage="https://people.engr.tamu.edu/davis/suitesparse.html" +changelog="https://raw.githubusercontent.com/DrTimothyAldenDavis/SuiteSparse/master/ChangeLog" distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz" -checksum=acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee +checksum=5fb0064a3398111976f30c5908a8c0b40df44c6dd8f0cc4bfa7b9e45d8c647de do_build() { make config library $make_build_args JOBS=$XBPS_MAKEJOBS From 4d20682ccd9eb5dae92245a88f2a8b8a06a003d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 30 Mar 2022 09:25:55 -0300 Subject: [PATCH 1666/2369] igraph: update to 0.9.8. --- srcpkgs/igraph/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/igraph/template b/srcpkgs/igraph/template index f131886aae6..983de0006d3 100644 --- a/srcpkgs/igraph/template +++ b/srcpkgs/igraph/template @@ -1,6 +1,6 @@ # Template file for 'igraph' pkgname=igraph -version=0.9.6 +version=0.9.8 revision=1 build_style=cmake configure_args="-DIGRAPH_ENABLE_TLS=on -DIGRAPH_ENABLE_LTO=on -DBUILD_SHARED_LIBS=ON" @@ -12,7 +12,7 @@ license="GPL-2.0-or-later" homepage="https://igraph.org/c/" changelog="https://raw.githubusercontent.com/igraph/igraph/master/CHANGELOG.md" distfiles="https://github.com/igraph/igraph/releases/download/${version}/igraph-${version}.tar.gz" -checksum=7c299ec54eecfe413758c332a42c4cb71d02d2951b2ac232584d317c5792f387 +checksum=f9a83473cea3e037b605b79b336be656b00dcf3037b233b4b250bd9270f36397 igraph-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 3d0b5e5ade78c02eaff196d406949ca018fbc959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 30 Mar 2022 09:39:35 -0300 Subject: [PATCH 1667/2369] planarity: update to 3.0.2.0. --- srcpkgs/planarity/template | 4 ++-- srcpkgs/planarity/update | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/planarity/template b/srcpkgs/planarity/template index aab5ce4a08f..fe5d9e08c9f 100644 --- a/srcpkgs/planarity/template +++ b/srcpkgs/planarity/template @@ -1,6 +1,6 @@ # Template file for 'planarity' pkgname=planarity -version=3.0.1.1 +version=3.0.2.0 revision=1 build_style=gnu-configure short_desc="Graph algorithms for planar embedding and related algorithms" @@ -8,7 +8,7 @@ maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/graph-algorithms/edge-addition-planarity-suite/" distfiles="https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_${version}/planarity-${version}.tar.gz" -checksum=50b686fce6e67ba3a4d0634632c16566539a95d7e51afd066f6b1d5ae0eab284 +checksum=b4897df8f323e660197242e0aa273a542a59782cad783d7334111a9ad49b9e08 post_install() { vlicense LICENSE.TXT diff --git a/srcpkgs/planarity/update b/srcpkgs/planarity/update index 315139e84f6..3dffcc02a42 100644 --- a/srcpkgs/planarity/update +++ b/srcpkgs/planarity/update @@ -1 +1,2 @@ site=https://github.com/graph-algorithms/edge-addition-planarity-suite/releases +ignore=*.WindowsExe From f82940a42f5271f1ba74f17034c648407e49d5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 30 Mar 2022 09:41:43 -0300 Subject: [PATCH 1668/2369] python3-cvxopt: update to 1.3.0. Also: - fix support for gsl - enable support for fftw --- srcpkgs/python3-cvxopt/patches/fix-gsl.patch | 11 +++++++++++ srcpkgs/python3-cvxopt/template | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/python3-cvxopt/patches/fix-gsl.patch diff --git a/srcpkgs/python3-cvxopt/patches/fix-gsl.patch b/srcpkgs/python3-cvxopt/patches/fix-gsl.patch new file mode 100644 index 00000000000..e32dc2fbf1e --- /dev/null +++ b/srcpkgs/python3-cvxopt/patches/fix-gsl.patch @@ -0,0 +1,11 @@ +--- a/setup.py 2022-03-07 18:58:58.000000000 -0300 ++++ b/setup.py 2022-04-14 22:25:18.860887901 -0300 +@@ -129,7 +129,7 @@ + # optional modules + + if BUILD_GSL: +- gsl = Extension('gsl', libraries = M_LIB + ['gsl'] + BLAS_LIB, ++ gsl = Extension('gsl', libraries = M_LIB + ['gsl', 'gslcblas'], + include_dirs = [ GSL_INC_DIR ], + library_dirs = [ GSL_LIB_DIR, BLAS_LIB_DIR ], + define_macros = GSL_MACROS, diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template index 0fb769b294e..d89abbcafa5 100644 --- a/srcpkgs/python3-cvxopt/template +++ b/srcpkgs/python3-cvxopt/template @@ -1,20 +1,22 @@ # Template file for 'python3-cvxopt' pkgname=python3-cvxopt -version=1.2.7 +version=1.3.0 revision=1 wrksrc="cvxopt-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -makedepends="python3-devel blas-devel lapack-devel SuiteSparse-devel gsl-devel glpk-devel" +makedepends="python3-devel blas-devel lapack-devel SuiteSparse-devel gsl-devel + glpk-devel fftw-devel" checkdepends="python3-pytest" short_desc="Python software for convex optimization" maintainer="Gonzalo Tornaría " license="GPL-3.0-or-later" homepage="http://cvxopt.org/" distfiles="${PYPI_SITE}/c/cvxopt/cvxopt-${version}.tar.gz" -checksum=3f9db1f4d4e820aaea81d6fc21054c89dc6327c84f935dd5a1eda1af11e1d504 +checksum=00b1b232f9d1f902d578a9d75814b67fa020758d5ae422e28ca8cef6269fa5c6 pre_build() { export CVXOPT_BUILD_GSL=1 export CVXOPT_BUILD_GLPK=1 + export CVXOPT_BUILD_FFTW=1 } From 2557ef6ff0ecca1106598b632c188b99ac978460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Fri, 8 Apr 2022 20:57:31 -0300 Subject: [PATCH 1669/2369] giac: update to 1.9.0.7. --- srcpkgs/giac/patches/fgamma.patch | 2 +- srcpkgs/giac/patches/micropy.patch | 18 ------------------ srcpkgs/giac/template | 10 ++++++++-- 3 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 srcpkgs/giac/patches/micropy.patch diff --git a/srcpkgs/giac/patches/fgamma.patch b/srcpkgs/giac/patches/fgamma.patch index 665803db13f..8cdc5fda88a 100644 --- a/srcpkgs/giac/patches/fgamma.patch +++ b/srcpkgs/giac/patches/fgamma.patch @@ -1,7 +1,7 @@ --- a/src/first.h 2017-09-22 20:44:12.000000000 +0200 +++ b/src/first.h 2017-11-14 15:26:53.529711489 +0100 @@ -503,7 +503,7 @@ - #if defined(__MINGW_H) || defined(VISUALC) // FIXME gamma, not used + #if defined(__MINGW_H) || defined(VISUALC) || defined(FXCG)// FIXME gamma, not used inline float fgamma(float f1){ return f1; } #else -inline float fgamma(float f1){ return gammaf(f1); } // or tgammaf(f1) on some versions of emscripten diff --git a/srcpkgs/giac/patches/micropy.patch b/srcpkgs/giac/patches/micropy.patch deleted file mode 100644 index 0e417a5a8ec..00000000000 --- a/srcpkgs/giac/patches/micropy.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/icas.cc 2021-03-02 04:52:40.000000000 -0300 -+++ b/src/icas.cc 2022-03-30 10:00:39.154056068 -0300 -@@ -1810,6 +1810,7 @@ - cerr << "// Setting tex log" << '\n'; - show_tex=true; - } -+#ifdef HAVE_LIBMICROPYTHON - if (getenv("GIAC_MICROPY")){ - cerr << "Micropython mode\n"; - python_compat(4 | python_compat(contextptr),contextptr); -@@ -1821,6 +1822,7 @@ - return 0; - } - } -+#endif - #ifdef HAVE_LIBREADLINE - if (ARGC==1){ - int taillemax=1000; diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template index fbdadc31dde..e892c8bf750 100644 --- a/srcpkgs/giac/template +++ b/srcpkgs/giac/template @@ -1,6 +1,6 @@ # Template file for 'giac' pkgname=giac -version=1.7.0.53 +version=1.9.0.7 revision=1 wrksrc="giac-${version%.*}" build_style=gnu-configure @@ -14,11 +14,17 @@ license="GPL-3.0-or-later" homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" changelog="https://www-fourier.ujf-grenoble.fr/~parisse/install_en#new" distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz" -checksum=74e5f98f63147c0197e4ce309601ae745312761be61c1a99c8a6bab4862e4a9f +checksum=72016988b7180e9b630ecabecc60969213e7b61418c2598c91acbaec139fd740 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812 LDFLAGS="-Wl,-z,stack-size=2097152" +post_extract() { + # remove a binary that works only for x86_64 host + # the binary will be rebuilt using host compiler + rm src/mkjs +} + post_install() { # remove duplicates rm -r ${DESTDIR}/usr/share/doc From ce8614b6f7f895aaed0ed3d50d5ff55190694675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Fri, 15 Apr 2022 13:51:02 -0300 Subject: [PATCH 1670/2369] pari-nflistdata: update to 20220326. --- srcpkgs/pari-nflistdata/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pari-nflistdata/template b/srcpkgs/pari-nflistdata/template index c6e66f228b9..c4089cdb84a 100644 --- a/srcpkgs/pari-nflistdata/template +++ b/srcpkgs/pari-nflistdata/template @@ -1,6 +1,6 @@ # Template file for 'pari-nflistdata' pkgname=pari-nflistdata -version=20210527 +version=20220326 revision=1 create_wrksrc=yes short_desc="PARI/GP database needed by nflist" @@ -8,10 +8,10 @@ maintainer="Gonzalo Tornaría " license="GPL-2.0-or-later" homepage="https://pari.math.u-bordeaux.fr/packages.html" distfiles="https://pari.math.u-bordeaux.fr/pub/pari/packages/${pkgname#pari-}.tgz>${pkgname}-${version}.tar.gz" -checksum=a123b2a6776a6579108254f5dbe9fd720ddbc7e46456b45e90a69e92a73b0597 +checksum=f298af350a0d329bb3b8d4ff6880865be213098d106b484d5477b1dc2e06b90f do_build() { - # compressed data files work ok (install-size: 4.1M -> 2.9M) + # compressed data files work ok (install-size: 15M -> 8.8M) find data -type f -size +4k -print0 | xargs -0 gzip -9 } From 2888026746a08590ec8dc3a79648d2d70504e8ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 28 Apr 2022 11:24:39 -0300 Subject: [PATCH 1671/2369] flintlib: update to 2.8.5. Also, enable openblas (used for matrix multiplication) --- srcpkgs/flintlib/template | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template index cebf8e30081..57a4a2de4f4 100644 --- a/srcpkgs/flintlib/template +++ b/srcpkgs/flintlib/template @@ -1,21 +1,24 @@ # Template file for 'flintlib' pkgname=flintlib -version=2.8.4 +version=2.8.5 revision=1 wrksrc="flint-${version}" build_style=configure -configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr $(vopt_if ntl --with-ntl=/usr)" -makedepends="mpfr-devel $(vopt_if ntl ntl-devel)" +configure_args="--prefix=/usr $(vopt_with ntl) + $(vopt_if openblas --with-blas=${XBPS_CROSS_BASE}/usr/include/openblas)" +makedepends="mpfr-devel $(vopt_if ntl ntl-devel) + $(vopt_if openblas openblas-devel)" short_desc="Fast Library for Number Theory" maintainer="Gonzalo Tornaría " license="LGPL-2.1-or-later" homepage="https://flintlib.org" changelog="https://raw.githubusercontent.com/wbhart/flint2/trunk/NEWS" distfiles="https://flintlib.org/flint-${version}.tar.gz" -checksum=61df92ea8c8e9dc692d46c71d7f50aaa09a33d4ba08d02a1784730a445e5e4be +checksum=5911fedff911100f15781f35e3a4fa934fe60e4aea02a8c10cc8918101c1eed8 -build_options="ntl" +build_options="ntl openblas" desc_option_ntl="enable NTL support" +build_options_default="openblas" if [ -z "$CROSS_BUILD" ]; then build_options_default+=" ntl" From 92ad1cb746d98bd5196997fcd8610c4c51d89af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 3 May 2022 23:07:32 -0300 Subject: [PATCH 1672/2369] primesieve: update to 7.9. --- srcpkgs/primesieve/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/primesieve/template b/srcpkgs/primesieve/template index 2737e1b3013..7bfb5bc29c2 100644 --- a/srcpkgs/primesieve/template +++ b/srcpkgs/primesieve/template @@ -1,6 +1,6 @@ # Template file for 'primesieve' pkgname=primesieve -version=7.8 +version=7.9 revision=1 build_style=cmake configure_args="-DBUILD_TESTS=ON -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF" @@ -10,7 +10,7 @@ license="BSD-2-Clause" homepage="https://github.com/kimwalisch/primesieve" changelog="https://raw.githubusercontent.com/kimwalisch/primesieve/master/ChangeLog" distfiles="https://github.com/kimwalisch/primesieve/archive/refs/tags/v${version}.tar.gz" -checksum=0cd0490259e6e919c6e3dd3f3e69ac6d91e6cbe616e22a219abe4006d9293d5d +checksum=c567f2a1a9d46a70020f920eb2c794142528a31a055995500e7fcb19642b7c91 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From 42133cca9cf4c07e261a1b764813ee22e3025098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 3 May 2022 23:07:36 -0300 Subject: [PATCH 1673/2369] primecount: update to 7.3. --- srcpkgs/primecount/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/primecount/template b/srcpkgs/primecount/template index 09a43b602f1..b20c0897c52 100644 --- a/srcpkgs/primecount/template +++ b/srcpkgs/primecount/template @@ -1,6 +1,6 @@ # Template file for 'primecount' pkgname=primecount -version=7.2 +version=7.3 revision=1 build_style=cmake configure_args="-DBUILD_TESTS=ON -DBUILD_LIBPRIMESIEVE=OFF @@ -10,8 +10,9 @@ short_desc="Fast prime counting function" maintainer="Gonzalo Tornaría " license="BSD-2-Clause" homepage="https://github.com/kimwalisch/primecount/" +changelog="https://raw.githubusercontent.com/kimwalisch/primecount/master/ChangeLog" distfiles="https://github.com/kimwalisch/primecount/archive/refs/tags/v${version}.tar.gz" -checksum=54c1eec33e665a780002dda20cf39ba0cefa8e846fdeda44734fb2265cba9257 +checksum=471fe21461e42e5f28404e17ff840fb527b3ec4064853253ee22cf4a81656332 build_options="native_build" From 3d9a049d404d3c3c266607e7cfe79c90613da02e Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 4 May 2022 19:40:52 +0200 Subject: [PATCH 1674/2369] syncthing: update to 1.20.1. --- srcpkgs/syncthing/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template index d1cdcc490bb..7d5c7893b3e 100644 --- a/srcpkgs/syncthing/template +++ b/srcpkgs/syncthing/template @@ -1,6 +1,6 @@ # Template file for 'syncthing' pkgname=syncthing -version=1.20.0 +version=1.20.1 revision=1 build_style=go go_import_path="github.com/syncthing/syncthing" @@ -16,7 +16,7 @@ license="MPL-2.0" homepage="https://syncthing.net/" changelog="https://github.com/syncthing/syncthing/releases" distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz" -checksum=27d9b52f18ebd833938731ffaaeed4f34ced534ef3d1ed2bc126a495764f753d +checksum=4b355eda64b9f52d53b34ab99a1ff73dc3d5ad5e43086223e7fc7f4d05a58a05 pre_build() { GOARCH= go generate \ From b4e831e3d9722be88be74889888d6097232e1c1e Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 4 May 2022 19:43:32 +0200 Subject: [PATCH 1675/2369] lollypop: update to 1.4.34. --- srcpkgs/lollypop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template index 02145a66a80..d30ca5dbb20 100644 --- a/srcpkgs/lollypop/template +++ b/srcpkgs/lollypop/template @@ -1,6 +1,6 @@ # Template file for 'lollypop' pkgname=lollypop -version=1.4.33 +version=1.4.34 revision=1 build_style=meson hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config" @@ -14,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=b1f806b3b844400131c7dc1bfad46843fc9ffcfbbf1fdeeab6bc348a74803529 +checksum=b1e6786c331c61232a26fbeca281cb47242ca56754fef4492aa79b9b0f4d1fae From fe6e40ca4f60c127b40025e3e7035d9f7294f246 Mon Sep 17 00:00:00 2001 From: Kyra Zimmer Date: Tue, 3 May 2022 10:35:41 +0200 Subject: [PATCH 1676/2369] sublime-merge-bin: update to 2071. --- srcpkgs/sublime-merge-bin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template index 8c5cd2e290f..73583df6b1e 100644 --- a/srcpkgs/sublime-merge-bin/template +++ b/srcpkgs/sublime-merge-bin/template @@ -1,6 +1,6 @@ # Template file for 'sublime-merge-bin' pkgname=sublime-merge-bin -version=2068 +version=2071 revision=1 archs="x86_64" wrksrc=sublime_merge @@ -12,7 +12,7 @@ license="custom:EULA" homepage="https://www.sublimemerge.com" changelog="https://www.sublimemerge.com/download" distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz" -checksum=0ac7994208eaafc07ae9295fff215966c9d115cdf3a8218a140cd274c45074d2 +checksum=c58564e45c7a55da07cdfd1c6e68702b212be470c46603e00e8056420fed4b45 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1 nopie=yes repository=nonfree From bf4c2a9064d76417a74002fced2165e88f50a8e5 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 4 May 2022 17:35:51 -0500 Subject: [PATCH 1677/2369] nvidia: fix broken symlink --- srcpkgs/nvidia/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index 3707accdab6..1ff0e8dbc33 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux" pkgname=nvidia version=510.60.02 -revision=1 +revision=2 maintainer="Andrew Benson " license="custom:NVIDIA Proprietary" homepage="https://www.nvidia.com" @@ -136,7 +136,7 @@ do_install() { vinstall 15_nvidia_gbm.json 755 usr/share/glvnd/egl_vendor.d vmkdir usr/lib/gbm - ln -sf libnvidia-allocator.so.${version} \ + ln -sf /usr/lib/libnvidia-allocator.so.${version} \ ${DESTDIR}/usr/lib/gbm/nvidia-drm_gbm.so vinstall 10_nvidia.json 755 usr/share/glvnd/egl_vendor.d From 8226c36642e7cda1c8f88139232ab334af5b1875 Mon Sep 17 00:00:00 2001 From: Markus Uhlin Date: Wed, 4 May 2022 22:00:53 +0200 Subject: [PATCH 1678/2369] swirc: update to 3.3.4. --- srcpkgs/swirc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template index 2f56d62942b..5a4b6482a3b 100644 --- a/srcpkgs/swirc/template +++ b/srcpkgs/swirc/template @@ -1,6 +1,6 @@ # Template file for 'swirc' pkgname=swirc -version=3.3.3 +version=3.3.4 revision=1 build_style=configure configure_args="$(vopt_with notify libnotify)" @@ -15,7 +15,7 @@ license="BSD-3-Clause, ISC, MIT" homepage="https://www.nifty-networks.net/swirc" changelog="https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md" distfiles="https://www.nifty-networks.net/swirc/releases/${pkgname}-${version}.tgz" -checksum="29bd8ece384527ab22ee994c000049ba4623e8ce6e0ca8023e1386ba60e72acf" +checksum="2a8404965e796a67555b10b54aaf53d32bbd63e1707cd8364c572a5ed7e3f837" build_options="notify" From 030e099b1b04e5d99643c33cfcca68b1aa324a5a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 4 May 2022 11:04:05 -0400 Subject: [PATCH 1679/2369] polybar: update to 3.6.3. --- srcpkgs/polybar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template index 9a2021d3538..b59ed9cd039 100644 --- a/srcpkgs/polybar/template +++ b/srcpkgs/polybar/template @@ -1,6 +1,6 @@ # Template file for 'polybar' pkgname=polybar -version=3.6.2 +version=3.6.3 revision=1 build_style=cmake configure_args="-DBUILD_CONFIG=OFF -DBUILD_DOC_HTML=OFF @@ -25,7 +25,7 @@ license="MIT" homepage="https://github.com/polybar/polybar" changelog="https://raw.githubusercontent.com/polybar/polybar/master/CHANGELOG.md" distfiles="https://github.com/polybar/polybar/releases/download/${version}/polybar-${version}.tar.gz" -checksum=73becc942e7d2418bc72bd194f2037a2a86792219fd561b663a8509fd5f547a0 +checksum=f25758573567208fc7b6f4d4115a6117a87389cbcc094cf605d079775be95fa5 # tries to download and build unstable/unreleased googletest during configure make_check=no From adcffa2526fec2bdc4248c5451f99a92f2259880 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Wed, 27 Apr 2022 09:27:20 +0200 Subject: [PATCH 1680/2369] google-chrome: update to 101.0.4951.41 --- 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 b20753366d9..c6614dbcd27 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,6 +1,6 @@ # Template file for 'google-chrome' pkgname=google-chrome -version=100.0.4896.127 +version=101.0.4951.41 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=d012bc3e5e000bffbd83cf20c48add187c52b065cc37408862c42d127aa4a656 +checksum=78d24e94017eb94ab771d49bcd4dd0684f86ca05bc40250fe3151040aefedf8a do_extract() { mkdir -p ${DESTDIR} From 6fd2b327e550a0b33d23ca02df120bf58b97ab94 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, 17 Apr 2022 00:16:10 +0700 Subject: [PATCH 1681/2369] refind: update to 0.13.3.1. --- .../patches/refind-install-abs-path.patch | 113 ++++++++++++++++++ srcpkgs/refind/template | 56 ++++----- 2 files changed, 134 insertions(+), 35 deletions(-) create mode 100644 srcpkgs/refind/patches/refind-install-abs-path.patch diff --git a/srcpkgs/refind/patches/refind-install-abs-path.patch b/srcpkgs/refind/patches/refind-install-abs-path.patch new file mode 100644 index 00000000000..22f30cbce01 --- /dev/null +++ b/srcpkgs/refind/patches/refind-install-abs-path.patch @@ -0,0 +1,113 @@ +Index: refind-0.13.3.1/refind-install +=================================================================== +--- refind-0.13.3.1.orig/refind-install ++++ refind-0.13.3.1/refind-install +@@ -342,19 +342,8 @@ DeterminePlatform() { + # $ThisDir to point to the directory in which this script resides, + # and $RefindDir to point to where the rEFInd binaries live + CheckForFiles() { +- # Note: $ThisDir points to real (not symlinked) script home on Linux, +- # enabling creating a symlink in /usr/sbin (or wherever); but on OS X, +- # "readlink" doesn't do the same thing as under Linux, so the script +- # must not be a symlink under OS X. +- case "$OSTYPE" in +- darwin*) +- ThisDir="$( cd -P "${BASH_SOURCE%/*}" && pwd )" +- ;; +- linux*) +- ThisDir="$(dirname "$(readlink -f "$0")")" +- ;; +- esac +- RefindDir="$ThisDir/refind" ++ ThisDir="/do/not/use/this/var" ++ RefindDir="/usr/share/refind" + + if [[ ! -f "$RefindDir/refind_$Platform.efi" ]] ; then + echo "The rEFInd binary file is missing! Aborting installation!" +@@ -363,8 +352,6 @@ CheckForFiles() { + + if [[ -f "$RefindDir/refind.conf-sample" ]] ; then + ConfFile="$RefindDir/refind.conf-sample" +- elif [[ -f "$ThisDir/refind.conf-sample" ]] ; then +- ConfFile="$ThisDir/refind.conf-sample" + else + echo "The sample configuration file is missing! Aborting installation!" + exit 1 +@@ -372,8 +359,6 @@ CheckForFiles() { + + if [[ -d "$RefindDir/icons" ]] ; then + IconsDir="$RefindDir/icons" +- elif [[ -d "$ThisDir/icons" ]] ; then +- IconsDir="$ThisDir/icons" + else + echo "The icons directory is missing! Aborting installation!" + exit 1 +@@ -603,7 +588,6 @@ SetBootFS() { + CopyDrivers() { + if [[ $InstallDrivers == "all" ]] ; then + mkdir -p "$InstallDir/$TargetDir/drivers_$1" +- cp "$ThisDir"/drivers_"$1"/*_"$1".efi "$InstallDir/$TargetDir/drivers_$1/" 2> /dev/null + cp "$RefindDir"/drivers_"$1"/*_"$1".efi "$InstallDir/$TargetDir/drivers_$1/" 2> /dev/null + elif [[ "$InstallDrivers" == "boot" ]] ; then + SetBootFS +@@ -628,7 +612,6 @@ CopyDrivers() { + if [[ -n $BootFS ]] ; then + echo "Installing driver for $BootFS (${DriverType}_$1.efi)" + mkdir -p "$InstallDir/$TargetDir/drivers_$1" +- cp "$ThisDir/drivers_$1/${DriverType}_$1.efi" "$InstallDir/$TargetDir/drivers_$1/" 2> /dev/null + cp "$RefindDir/drivers_$1/${DriverType}_$1.efi" "$InstallDir/$TargetDir/drivers_$1"/ 2> /dev/null + fi + fi +@@ -669,7 +652,6 @@ CopyRefindFiles() { + fi + if [[ $InstallDrivers == "all" ]] ; then + cp -r "$RefindDir"/drivers_* "$InstallDir/$TargetDir/" 2> /dev/null +- cp -r "$ThisDir"/drivers_* "$InstallDir/$TargetDir/" 2> /dev/null + elif [[ $Upgrade == 1 || $InstallToEspOnMac == 1 ]] ; then + CopyDrivers "$Platform" + CopyTools "$Platform" +@@ -693,8 +675,8 @@ CopyRefindFiles() { + if [[ $LocalKeys == 0 ]] ; then + echo "Storing copies of rEFInd Secure Boot public keys in $EtcKeysDir" + mkdir -p "$EtcKeysDir" +- cp "$ThisDir/keys/refind.cer" "$EtcKeysDir" 2> /dev/null +- cp "$ThisDir/keys/refind.crt" "$EtcKeysDir" 2> /dev/null ++ cp "$RefindDir/keys/refind.cer" "$EtcKeysDir" 2> /dev/null ++ cp "$RefindDir/keys/refind.crt" "$EtcKeysDir" 2> /dev/null + fi + fi + if [[ "$TargetDir" == '/System/Library/CoreServices' ]] ; then +@@ -731,7 +713,7 @@ CopyRefindFiles() { + Problems=1 + fi + mkdir -p "$InstallDir/$TargetDir/keys" +- cp -rf "$ThisDir"/keys/*.[cd]er "$InstallDir/$TargetDir/keys/" 2> /dev/null ++ cp -rf "$RefindDir"/keys/*.[cd]er "$InstallDir/$TargetDir/keys/" 2> /dev/null + cp -rf "$EtcKeysDir"/*.[cd]er "$InstallDir/$TargetDir/keys/" 2> /dev/null + if [[ -f "$InstallDir/$TargetDir/refind.conf" ]] ; then + echo "Existing refind.conf file found; copying sample file as refind.conf-sample" +@@ -1139,14 +1121,12 @@ ReSignBinaries() { + GenerateKeys + mkdir -p "$TempDir/drivers_$Platform" + cp "$RefindDir/refind.conf-sample $TempDir" 2> /dev/null +- cp "$ThisDir/refind.conf-sample $TempDir" 2> /dev/null + cp "$RefindDir/refind_ia32.efi $TempDir" 2> /dev/null + cp -a "$RefindDir/drivers_ia32 $TempDir" 2> /dev/null +- cp -a "$ThisDir/drivers_ia32 $TempDir" 2> /dev/null + SignOneBinary "$RefindDir/refind_$Platform.efi" "$TempDir/refind_$Platform.efi" + SaveIFS=$IFS + IFS=$(echo -en "\n\b") +- for Driver in $(ls "$RefindDir"/drivers_$Platform/*.efi "$ThisDir"/drivers_$Platform/*.efi 2> /dev/null) ; do ++ for Driver in $(ls "$RefindDir"/drivers_$Platform/*.efi 2> /dev/null) ; do + TempName=$(basename "$Driver") + SignOneBinary "$Driver" "$TempDir/drivers_$Platform/$TempName" + done +@@ -1403,7 +1383,7 @@ InstallSBKey() { + if [ "$LocalKeys" == "1" ] ; then + UsedDerKey="$DerKey" + else +- UsedDerKey="$ThisDir/keys/refind.cer" ++ UsedDerKey="$RefindDir/keys/refind.cer" + fi + if command -v mokutil &>/dev/null ; then + if mokutil --test-key "$UsedDerKey" &> /dev/null ; then diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template index 49d46290752..bec621c4e3a 100644 --- a/srcpkgs/refind/template +++ b/srcpkgs/refind/template @@ -1,6 +1,6 @@ # Template file for 'refind' pkgname=refind -version=0.13.2 +version=0.13.3.1 revision=1 archs="x86_64* i686* aarch64*" makedepends="gnu-efi-libs" @@ -10,27 +10,10 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-only, BSD-3-Clause, BSD-2-Clause, GPL-2.0-only, LGPL-2.1-only" homepage="https://sourceforge.net/projects/refind/" distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz" -checksum=dd58944854a42df5a2a943f15e5dcfd995808f28580df96ad39d68fb1e48c970 +checksum=7a3e3f0f81bd4ae95f24e120f44e01319231f488fef7cc8bf03a1aea23c6cfd1 python_version=2 conf_files="/etc/default/refind-kernel-hook.conf" - -post_extract() { - vsed -e 's|RefindDir=\"\$ThisDir/refind\"|RefindDir="/usr/share/refind"|g' \ - -i refind-install - - # Patch paths to libaries and includes for cross-compiling - vsed \ - -e "s|^EFIINC.*|EFIINC = ${XBPS_CROSS_BASE}/usr/include/efi|" \ - -e "s|^GNUEFILIB.*|GNUEFILIB = ${XBPS_CROSS_BASE}/usr/lib|" \ - -e "s|^EFILIB.*|EFILIB = ${XBPS_CROSS_BASE}/usr/lib|" \ - -e "s|^EFICRT0.*|EFICRT0 = ${XBPS_CROSS_BASE}/usr/lib|" \ - -i Make.common - - # Only this file is written in python3 - # All other files are python2 - vsed -e '1s,^.*python3$,#!/usr/bin/python3,' \ - -i refind-mkdefault -} +make_dirs="/etc/refind.d/keys 0755 root root" do_build() { unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS @@ -44,7 +27,12 @@ do_build() { export CROSS_COMPILE="${XBPS_CROSS_TRIPLET}-" fi - make ARCH=${_ARCH} gnuefi fs_gnuefi + make ARCH=${_ARCH} \ + EFIINC=${XBPS_CROSS_BASE}/usr/include/efi \ + GNUEFILIB=${XBPS_CROSS_BASE}/usr/lib \ + EFILIB=${XBPS_CROSS_BASE}/usr/lib \ + EFICRT0=${XBPS_CROSS_BASE}/usr/lib \ + gnuefi fs_gnuefi } do_install() { @@ -67,27 +55,25 @@ do_install() { vdoc README.txt vdoc CREDITS.txt vdoc NEWS.txt - vcopy docs/refind /usr/share/doc/refind - vcopy docs/Styles /usr/share/doc/refind + vcopy docs/refind usr/share/doc/refind + vcopy docs/Styles usr/share/doc/refind vman docs/man/mkrlconf.8 vman docs/man/mvrefind.8 vman docs/man/refind-install.8 vman docs/man/refind-mkdefault.8 - vmkdir usr/share/refind - vcopy refind/refind_${_EFI_ARCH}.efi /usr/share/refind/ - vcopy refind.conf-sample /usr/share/refind/ - vcopy fonts /usr/share/refind/ - vcopy icons /usr/share/refind/ - vcopy banners /usr/share/refind/ - vcopy images /usr/share/refind/ - vcopy drivers_${_EFI_ARCH} /usr/share/refind/ - vmkdir usr/share/refind/tools_${_EFI_ARCH} - vcopy gptsync/gptsync_${_EFI_ARCH}.efi /usr/share/refind/tools_${_EFI_ARCH}/ + vinstall refind/refind_${_EFI_ARCH}.efi 644 usr/share/refind/ + vinstall refind.conf-sample 644 usr/share/refind/ + vcopy keys usr/share/refind + vcopy fonts usr/share/refind/ + vcopy icons usr/share/refind/ + vcopy banners usr/share/refind/ + vcopy images usr/share/refind/ + vcopy drivers_${_EFI_ARCH} usr/share/refind/ + vinstall gptsync/gptsync_${_EFI_ARCH}.efi 644 \ + usr/share/refind/tools_${_EFI_ARCH}/ - vmkdir etc/refind.d - vcopy keys /etc/refind.d/ vinstall "${FILESDIR}/refind-kernel-hook.conf" 644 etc/default vinstall ${FILESDIR}/kernel.post-install 744 \ From e191e8c7c9291db634cbf38057a89c1e8caa7035 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, 5 May 2022 09:42:16 +0700 Subject: [PATCH 1682/2369] gnu-efi-libs: update to 3.0.14. --- srcpkgs/gnu-efi-libs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template index 0b8c679b522..a0e5ad82d53 100644 --- a/srcpkgs/gnu-efi-libs/template +++ b/srcpkgs/gnu-efi-libs/template @@ -1,7 +1,7 @@ # Template file for 'gnu-efi-libs' pkgname=gnu-efi-libs reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8 -version=3.0.12 +version=3.0.14 revision=1 wrksrc="gnu-efi-${version}" makedepends="pciutils-devel" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://sourceforge.net/projects/gnu-efi/" distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2" -checksum=0196f2e1fd3c334b66e610a608a0e59233474c7a01bec7bc53989639aa327669 +checksum=b73b643a0d5697d1f396d7431448e886dd805668789578e3e1a28277c9528435 nostrip=yes # If we are cross-building we need to pass the cross-compilation triplet From 1efee916e28ec69a96585bd82f3e206f1bbd146b 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, 5 May 2022 09:42:29 +0700 Subject: [PATCH 1683/2369] mutt: update to 2.2.4. --- srcpkgs/mutt/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index 4c65fcdec66..ba747971293 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -1,6 +1,6 @@ # Template file for 'mutt' pkgname=mutt -version=2.2.3 +version=2.2.4 revision=1 build_style=gnu-configure configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache @@ -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="perl pkg-config" +hostmakedepends="perl pkg-config gettext" makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel ncurses-devel zlib-devel" depends="cyrus-sasl-modules mime-types" @@ -18,7 +18,7 @@ license="GPL-2.0-or-later" homepage="http://www.mutt.org" changelog="http://mutt.org/relnotes/${version%.*}" distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz" -checksum=978addcdab454f447ed7d1de84b5767e714c30714285bf82e4a1745071d18d89 +checksum=b82776bebff0e10820a33fa1e7eafa5cba4ab3a011b08e83b66ed62d75c6e060 post_install() { # provided by mime-types From 7e70ea35c90ef2de736d57885925854656e451d3 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 20 Mar 2022 16:09:47 -0400 Subject: [PATCH 1684/2369] xbps-triggers: add openjdk-profile trigger This removes the need for each openjdk package to provide their own /etc/profile.d entry, and fixes the conflict caused by each providing their own. --- Manual.md | 8 +++++ srcpkgs/xbps-triggers/files/openjdk-profile | 39 +++++++++++++++++++++ srcpkgs/xbps-triggers/template | 2 +- 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100755 srcpkgs/xbps-triggers/files/openjdk-profile diff --git a/Manual.md b/Manual.md index 1ce07792f54..8afe781f0ec 100644 --- a/Manual.md +++ b/Manual.md @@ -62,6 +62,7 @@ packages for XBPS, the `Void Linux` native packaging system. * [kernel-hooks](#triggers_kernel_hooks) * [mimedb](#triggers_mimedb) * [mkdirs](#triggers_mkdirs) + * [openjdk-profile](#triggers_openjdk_profile) * [pango-modules](#triggers_pango_module) * [pycompile](#triggers_pycompile) * [register-shell](#triggers_register_shell) @@ -2000,6 +2001,13 @@ During removal it will delete the directory using `rmdir`. To include this trigger use the `make_dirs` variable, as the trigger won't do anything unless it is defined. + +#### openjdk-profile + +The openjdk-profile trigger is responsible for creating an entry in /etc/profile.d that +sets the `JAVA_HOME` environment variable to the currently-selected alternative for +`/usr/bin/java` on installation. This trigger must be manually requested. + #### pango-modules diff --git a/srcpkgs/xbps-triggers/files/openjdk-profile b/srcpkgs/xbps-triggers/files/openjdk-profile new file mode 100755 index 00000000000..007d9cd9eed --- /dev/null +++ b/srcpkgs/xbps-triggers/files/openjdk-profile @@ -0,0 +1,39 @@ +#!/bin/sh +# +# Adds an entry to /etc/profile.d for setting $JAVA_HOME. +# +# Arguments: $ACTION = [run/targets] +# $TARGET = [post-install/pre-remove] +# $PKGNAME +# $VERSION +# $UPDATE = [yes/no] +# +ACTION="$1" +TARGET="$2" +PKGNAME="$3" +VERSION="$4" +UPDATE="$5" + +jdkprofile=etc/profile.d/openjdk.sh + +case "$ACTION" in +targets) + echo "post-install" + ;; +run) + [ -f "$jdkprofile" ] && exit 0 + + cat > "$jdkprofile" <<'EOF' +if _java_bin=$(readlink -e /usr/bin/java); then + _java_bin="${_java_bin%/bin/java}" + [ -d "${_java_bin}" ] && export JAVA_HOME="${JAVA_HOME:=${_java_bin}}" +fi +unset _java_bin +EOF + ;; +*) + exit 1 + ;; +esac + +exit 0 diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index 5de97d53c21..b1e4f34a4dd 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -1,6 +1,6 @@ # Template file for 'xbps-triggers' pkgname=xbps-triggers -version=0.121 +version=0.122 revision=1 bootstrap=yes short_desc="XBPS triggers for Void Linux" From 259cbdc15d92042316f5fd11bda068e5ca2d0f8a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 20 Mar 2022 16:12:02 -0400 Subject: [PATCH 1685/2369] openjdk8: move /etc/profile.d/10-openjdk*.sh to trigger --- srcpkgs/openjdk8/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template index 9cced29b4be..9832b18555a 100644 --- a/srcpkgs/openjdk8/template +++ b/srcpkgs/openjdk8/template @@ -4,7 +4,7 @@ # TODO: config files? pkgname=openjdk8 version=8u322b04 -revision=1 +revision=2 _jdk_update="${version#*u}" _jdk_update="${_jdk_update%b*}" _jdk_build="${version#*b}" @@ -221,6 +221,8 @@ openjdk8-jre_package() { shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" short_desc+=" - runtime components" provides="java-runtime-${version}_1" + depends="xbps-triggers>=0.122_1" + triggers="openjdk-profile" alternatives=" java:/usr/bin/java:/${_jdk_home}/jre/bin/java java:/usr/bin/jjs:/${_jdk_home}/jre/bin/jjs @@ -236,10 +238,6 @@ openjdk8-jre_package() { " pkg_install() { vmove ${_jdk_home}/jre - vmkdir etc/profile.d - cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk8.sh < Date: Sun, 20 Mar 2022 16:12:04 -0400 Subject: [PATCH 1686/2369] openjdk11: move /etc/profile.d/10-openjdk*.sh to trigger --- srcpkgs/openjdk11/template | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index 711376c1082..45c775856fa 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -1,7 +1,7 @@ # Template file for 'openjdk11' pkgname=openjdk11 version=11.0.12+7 -revision=1 +revision=2 _java_ver="${version%%.*}" _jdk_home="usr/lib/jvm/openjdk${_java_ver}" wrksrc="jdk${_java_ver}u-jdk-${version}" @@ -160,7 +160,8 @@ openjdk11-jre_package() { shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" short_desc+=" - runtime components" provides="java-runtime-${version}_1" - depends="fontconfig" + depends="fontconfig xbps-triggers>=0.122_1" + triggers="openjdk-profile" alternatives=" java:/usr/bin/java:/${_jdk_home}/bin/java java:/usr/bin/jjs:/${_jdk_home}/bin/jjs @@ -179,11 +180,6 @@ openjdk11-jre_package() { vmove $_jdk_home/$f done - vmkdir etc/profile.d - cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh < Date: Sun, 20 Mar 2022 16:12:05 -0400 Subject: [PATCH 1687/2369] openjdk17: move /etc/profile.d/10-openjdk*.sh to trigger --- srcpkgs/openjdk17/template | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index 2554e49c54e..f60e96f7908 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -1,7 +1,7 @@ # Template file for 'openjdk17' pkgname=openjdk17 version=17.0.3+7 -revision=1 +revision=2 _gtest_ver=1.8.1 _java_ver="${version%%.*}" _jdk_update="${version#*+}" @@ -170,6 +170,8 @@ openjdk17-jre_package() { shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" short_desc+=" - runtime components" provides="java-runtime-${version}_1" + depends="xbps-triggers>=0.122_1" + triggers="openjdk-profile" alternatives=" java:/usr/bin/java:/${_jdk_home}/bin/java java:/usr/bin/jfr:/${_jdk_home}/bin/jfr @@ -185,11 +187,6 @@ openjdk17-jre_package() { vmove $_jdk_home/$f done - vmkdir etc/profile.d - cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk17.sh <<-EOF -export JAVA_HOME=\${JAVA_HOME=/$_jdk_home} -EOF - vlicense ASSEMBLY_EXCEPTION vlicense LICENSE } From 5b7f68e4781fe3269741a16fc5fdbdbf0ce236a2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:32 -0400 Subject: [PATCH 1688/2369] apache-fop: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/apache-fop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template index 96ab59bce8b..3b7c917a7c0 100644 --- a/srcpkgs/apache-fop/template +++ b/srcpkgs/apache-fop/template @@ -1,7 +1,7 @@ # Template file for 'apache-fop' pkgname=apache-fop version=2.5 -revision=2 +revision=3 wrksrc="fop-${version}" build_wrksrc="fop" hostmakedepends="openjdk8 apache-ant" @@ -18,7 +18,7 @@ conf_files="/etc/fop.conf" do_build() { . /etc/profile.d/apache-ant.sh - . /etc/profile.d/10_openjdk8.sh + . /etc/profile.d/openjdk.sh ant package } do_install() { From c1e21e8281df743127d01c14d79d3a9cfc308d48 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:35 -0400 Subject: [PATCH 1689/2369] apache-maven: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/apache-maven/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index c9603329c2c..cc1e3e56163 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,7 +1,7 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=2 +revision=3 hostmakedepends="openjdk8" depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" @@ -15,7 +15,7 @@ checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07 replaces="apache-maven-bin>=0" do_build() { - source /etc/profile.d/10_openjdk8.sh + source /etc/profile.d/openjdk.sh ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname} } From f1ea7e195042b167a6333ddff48df851584cb991 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:36 -0400 Subject: [PATCH 1690/2369] arduino: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/arduino/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template index 19daa0c1b1e..485d24ad5a2 100644 --- a/srcpkgs/arduino/template +++ b/srcpkgs/arduino/template @@ -1,7 +1,7 @@ # Template file for 'arduino' pkgname=arduino version=1.8.19 -revision=1 +revision=2 archs="x86_64* i686* aarch64* arm*" wrksrc=$pkgname-$version create_wrksrc=yes @@ -27,7 +27,7 @@ fi do_build() { . /etc/profile.d/apache-ant.sh - . /etc/profile.d/10_openjdk8.sh + . /etc/profile.d/openjdk.sh export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include/linux" export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include" From 7d5efdf34ea6db8e80379dc0330755e945baee5d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:37 -0400 Subject: [PATCH 1691/2369] bibletime: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/bibletime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template index 559755a9dd6..af3301e0236 100644 --- a/srcpkgs/bibletime/template +++ b/srcpkgs/bibletime/template @@ -4,7 +4,7 @@ # to start. pkgname=bibletime version=3.0 -revision=2 +revision=3 build_style=cmake configure_args="-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=/usr/share/xsl/docbook/html/chunk.xsl -DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=/usr/share/xsl/docbook/fo/docbook.xsl" @@ -20,7 +20,7 @@ distfiles="https://github.com/bibletime/bibletime/releases/download/v${version}/ checksum=d6beef62ad44b255e3dc4c5e89214bf01a0e85c9136073b0be12fca3d2b22622 pre_build() { - . /etc/profile.d/10_openjdk11.sh + . /etc/profile.d/openjdk.sh if [ "$XBPS_WORDSIZE" = "32" ]; then export _JAVA_OPTIONS="-Xmx1024m" fi From e394acbfb82a01dd6614e274b49781a65d3e5d60 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:37 -0400 Subject: [PATCH 1692/2369] davmail: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/davmail/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/davmail/template b/srcpkgs/davmail/template index 0482c0dce53..b739bf6b8bb 100644 --- a/srcpkgs/davmail/template +++ b/srcpkgs/davmail/template @@ -1,7 +1,7 @@ # Template file for 'davmail' pkgname=davmail version=5.5.1 -revision=2 +revision=3 _commit=3299 wrksrc=davmail-src-${version}-${_commit} hostmakedepends="openjdk8 apache-ant" @@ -13,7 +13,7 @@ distfiles="${SOURCEFORGE_SITE}/davmail/davmail-src-${version}-${_commit}.tgz" checksum=63e14eeda3fed2a1a5c55f864a8832f8842d597e797ca1e8874c9b66b811f508 do_build() { - . /etc/profile.d/10_openjdk8.sh + . /etc/profile.d/openjdk.sh . /etc/profile.d/apache-ant.sh ant jar From 6f35c9b27c9bb46aa9fd4083f848da4a9ac6595d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:38 -0400 Subject: [PATCH 1693/2369] freeplane: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/freeplane/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template index 2e7adb76ea4..fa4eeb5e80b 100644 --- a/srcpkgs/freeplane/template +++ b/srcpkgs/freeplane/template @@ -1,7 +1,7 @@ # Template file for 'freeplane' pkgname=freeplane version=1.9.12 -revision=1 +revision=2 wrksrc="freeplane-release-${version}" hostmakedepends="apache-ant openjdk8 unzip gradle" depends="virtual?java-runtime" @@ -23,7 +23,7 @@ esac do_build() { . /etc/profile.d/apache-ant.sh - . /etc/profile.d/10_openjdk8.sh + . /etc/profile.d/openjdk.sh gradle format_translation binZip -x test } From ede4deb2e50192ad5a0f47fdaa06d30cf5dc3067 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:38 -0400 Subject: [PATCH 1694/2369] freerouting: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/freerouting/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template index f643eabdb6f..bfde02fc9e2 100644 --- a/srcpkgs/freerouting/template +++ b/srcpkgs/freerouting/template @@ -1,7 +1,7 @@ # Template file for 'freerouting' pkgname=freerouting version=1.4.5.1 -revision=1 +revision=2 hostmakedepends="dos2unix gradle openjdk11" depends="openjdk11" short_desc="Advanced PCB autorouter" @@ -21,7 +21,7 @@ post_extract() { } do_build() { - . /etc/profile.d/10_openjdk11.sh + . /etc/profile.d/openjdk.sh gradle assemble } From 58e93e7dc2799de1601cfdc2d8315e448ff7af03 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:39 -0400 Subject: [PATCH 1695/2369] java-commons-io: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/java-commons-io/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/java-commons-io/template b/srcpkgs/java-commons-io/template index e91dcc87b8b..5b8413e2a03 100644 --- a/srcpkgs/java-commons-io/template +++ b/srcpkgs/java-commons-io/template @@ -2,7 +2,7 @@ _origname=commons-io pkgname=java-commons-io version=2.6 -revision=2 +revision=3 wrksrc="${_origname}-${version}-src" hostmakedepends="openjdk8 apache-maven which" depends="virtual?java-runtime" @@ -19,7 +19,7 @@ case "$XBPS_MACHINE" in esac do_build() { - source /etc/profile.d/10_openjdk8.sh + source /etc/profile.d/openjdk.sh mvn package -Dmaven.test.skip=true } From 2d4f70d0030c5b4e68cb60d16b2e8645eadec6f1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:39 -0400 Subject: [PATCH 1696/2369] jedit: fix name of /etc/profile.d/10_openjdk*.sh, hard-code openjdk11 --- srcpkgs/jedit/files/jedit | 4 +--- srcpkgs/jedit/template | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/jedit/files/jedit b/srcpkgs/jedit/files/jedit index 622bb917186..706d2f8dd45 100644 --- a/srcpkgs/jedit/files/jedit +++ b/srcpkgs/jedit/files/jedit @@ -1,10 +1,8 @@ #!/bin/sh # openjdk11 is required -. /etc/profile.d/10_openjdk11.sh - # default to gtk3, use antialiased fonts -exec "${JAVA_HOME}/bin/java" \ +exec "/usr/lib/jvm/openjdk11/bin/java" \ -Djdk.gtk.version=3 \ -Dawt.useSystemAAFontSettings=on \ -Dswing.aatext=true \ diff --git a/srcpkgs/jedit/template b/srcpkgs/jedit/template index cf7ac8cdd20..19ca4ac3df1 100644 --- a/srcpkgs/jedit/template +++ b/srcpkgs/jedit/template @@ -1,7 +1,7 @@ # Template file for 'jedit' pkgname=jedit version=5.6.0 -revision=1 +revision=2 wrksrc=jEdit hostmakedepends="apache-ant openjdk11 docbook-xsl" depends="openjdk11 desktop-file-utils" @@ -19,7 +19,7 @@ post_patch() { do_build() { . /etc/profile.d/apache-ant.sh - . /etc/profile.d/10_openjdk11.sh + . /etc/profile.d/openjdk.sh ant -propertyfile ${FILESDIR}/build.properties build ant -propertyfile ${FILESDIR}/build.properties docs-html From 9fa10014c78f2d2bd18e49457168616f36fe60c0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:40 -0400 Subject: [PATCH 1697/2369] kodi: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/kodi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index da81c7e2d0a..b4eeacdab62 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=19.4 -revision=1 +revision=2 _codename="Matrix" wrksrc="xbmc-${version}-${_codename}" build_style=cmake @@ -111,7 +111,7 @@ pre_configure() { xargs sed -i -e "s;-isystem;-I;g" fi - . /etc/profile.d/10_openjdk11.sh + . /etc/profile.d/openjdk.sh # Build tools needed to run on the host if [ "$CROSS_BUILD" ]; then From f07fd4a8e61493811dcd47745a345d23210ddf97 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:40 -0400 Subject: [PATCH 1698/2369] lightzone: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/lightzone/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template index 13242f01cc7..261626fb9df 100644 --- a/srcpkgs/lightzone/template +++ b/srcpkgs/lightzone/template @@ -1,7 +1,7 @@ # Template file for 'lightzone' pkgname=lightzone version=4.2.2 -revision=1 +revision=2 _ivy_version=2.4.0 wrksrc=LightZone-${version} hostmakedepends="automake git openjdk11 apache-ant javahelp2 rsync pkg-config" @@ -29,7 +29,7 @@ do_build() { vsed -i lightcrafts/jnisrc/tiff/GNUmakefile \ -e "s;\./configure;& --host=${XBPS_MACHINE%-musl};" - . /etc/profile.d/10_openjdk11.sh + . /etc/profile.d/openjdk.sh cd linux TARGET=${XBPS_TARGET_MACHINE%-musl} ant jar } From a786987797a7bbf7633d0f1ebd9436ee95f6d151 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:44 -0400 Subject: [PATCH 1699/2369] plantuml: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/plantuml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template index fff4ec18b20..85259ce2ca6 100644 --- a/srcpkgs/plantuml/template +++ b/srcpkgs/plantuml/template @@ -2,7 +2,7 @@ pkgname=plantuml reverts="8047_1 8053_1 8059_1" version=1.2021.14 -revision=1 +revision=2 create_wrksrc=yes hostmakedepends="apache-ant openjdk8" depends="virtual?java-environment graphviz" @@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz" checksum=468aeaaea0742d8312d0f2f709df140e599967d8284fc0555f842fd0a6fe6941 do_build() { - . /etc/profile.d/10_openjdk8.sh + . /etc/profile.d/openjdk.sh . /etc/profile.d/apache-ant.sh ant mv ${pkgname}.jar ${pkgname}-${version}.jar From 2f4bf848065e3b74a4751bcca2f9f8371463fed1 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 5 May 2022 00:01:06 -0400 Subject: [PATCH 1700/2369] apache-maven: fix distfiles --- srcpkgs/apache-maven/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index cc1e3e56163..e793e240b2c 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -8,8 +8,8 @@ short_desc="Software project management and comprehension tool" maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://maven.apache.org/" -distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/source/${pkgname}-${version}-src.tar.gz - https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz" +distfiles="https://dlcdn.apache.org/maven/maven-3/${version}/source/${pkgname}-${version}-src.tar.gz + https://dlcdn.apache.org/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz" checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07 26ad91d751b3a9a53087aefa743f4e16a17741d3915b219cf74112bf87a438c5" replaces="apache-maven-bin>=0" From 21d6dcf180b6f066c5ca778176be5f9a9d67c7c1 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 5 May 2022 00:09:42 -0400 Subject: [PATCH 1701/2369] apache-fop: fix distfiles --- srcpkgs/apache-fop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template index 3b7c917a7c0..82997c3555d 100644 --- a/srcpkgs/apache-fop/template +++ b/srcpkgs/apache-fop/template @@ -10,8 +10,8 @@ short_desc="Java print formatter driven by XSL formatting objects (XSL-FO)" maintainer="Orphaned " license="Apache-2.0" homepage="http://xmlgraphics.apache.org/fop/" -distfiles="http://mirror.dkd.de/apache/xmlgraphics/fop/source/fop-${version}-src.tar.gz - http://mirror.dkd.de/apache/xmlgraphics/fop/binaries/fop-${version}-bin.tar.gz" +distfiles="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-${version}-src.tar.gz + https://archive.apache.org/dist/xmlgraphics/fop/binaries/fop-${version}-bin.tar.gz" checksum="783077318139d581d5f485566d1b08bfc576003c53cfbf5beaeba503a24b4005 6a3c5f8915be5ef90fff202c818152d8252bb45b96d9c5d6550594903739e5ed" conf_files="/etc/fop.conf" From 8ef7ec10b0ccbb40ba255b7125ae32052124af59 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 5 May 2022 00:34:26 -0400 Subject: [PATCH 1702/2369] bibletime: explicitly require JRE to ensure profile is available to source --- srcpkgs/bibletime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template index af3301e0236..d8be23d33be 100644 --- a/srcpkgs/bibletime/template +++ b/srcpkgs/bibletime/template @@ -8,8 +8,8 @@ revision=3 build_style=cmake configure_args="-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=/usr/share/xsl/docbook/html/chunk.xsl -DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=/usr/share/xsl/docbook/fo/docbook.xsl" -hostmakedepends="pkg-config qt5-host-tools qt5-qmake apache-fop po4a - docbook-xsl docbook-xml libxslt" +hostmakedepends="pkg-config qt5-host-tools qt5-qmake openjdk8-jre apache-fop + po4a docbook-xsl docbook-xml libxslt" makedepends="clucene-devel libcurl-devel qt5-devel qt5-tools-devel qt5-svg-devel qt5-webkit-devel sword-devel zlib-devel qt5-declarative-devel" short_desc="Powerful cross platform Bible study tool" From a52be8a08a0f3ecbf6a74b9ad44201f1d849addb Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 5 May 2022 01:05:08 -0400 Subject: [PATCH 1703/2369] freeplane: mark broken --- srcpkgs/freeplane/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template index fa4eeb5e80b..67a233224e9 100644 --- a/srcpkgs/freeplane/template +++ b/srcpkgs/freeplane/template @@ -11,6 +11,7 @@ license="GPL-2.0-or-later" homepage="http://freeplane.sourceforge.net/" distfiles="https://github.com/freeplane/freeplane/archive/release-${version}.tar.gz" checksum=200002b5cbe3e3286a7595847d28356d3efd8498ff930fa05e5e90af622e544f +broken="https://build.voidlinux.org/builders/x86_64_builder/builds/37505/steps/shell_3/logs/stdio" make_dirs=" /usr/share/freeplane/fwdir/condperm/ 755 root root From c2f8e360d038969587bb2802b4c46fa350e6c21c Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 4 May 2022 22:48:32 +0200 Subject: [PATCH 1704/2369] mat2: update to 0.12.4. --- srcpkgs/mat2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mat2/template b/srcpkgs/mat2/template index 8ee8a477aa2..5a662f0b45e 100644 --- a/srcpkgs/mat2/template +++ b/srcpkgs/mat2/template @@ -1,6 +1,6 @@ # Template file for 'mat2' pkgname=mat2 -version=0.12.3 +version=0.12.4 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -10,4 +10,4 @@ maintainer="Piraty " license="LGPL-3.0-or-later" homepage="https://0xacab.org/jvoisin/mat2" distfiles="https://0xacab.org/jvoisin/mat2/-/archive/${version}/mat2-${version}.tar.gz" -checksum=6e7e8a87a0932a890455626d8b73e9c52288bc30761cce46bd17c60815e8bb54 +checksum=00c163bf05cc5d282e420dbf53113ae48a63e1cace90dc1d0ca44e23005d28a5 From dbab295b0a6f50691bac8208384c6497ed2d74d4 Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 5 May 2022 09:13:48 +0200 Subject: [PATCH 1705/2369] opendht: update to 2.4.4. --- srcpkgs/opendht/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template index c24ee3c5594..ebdbdde002c 100644 --- a/srcpkgs/opendht/template +++ b/srcpkgs/opendht/template @@ -1,6 +1,6 @@ # Template file for 'opendht' pkgname=opendht -version=2.3.1 +version=2.4.4 revision=1 build_style=cmake configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF @@ -12,7 +12,7 @@ maintainer="Piraty " license="GPL-3.0-or-later" homepage="https://github.com/savoirfairelinux/opendht" distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/${version}.tar.gz" -checksum=9a75db4f119761d6524964b27d3a49aa809a6cb08bde963edc2f338458433c78 +checksum=a4b452423f9a55f3c53ceaeeb43ec50f2747fdc89a546caa74cd79b93b6ede08 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From 5514135a6811ca5a218b935041a12009886e9337 Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 5 May 2022 09:14:07 +0200 Subject: [PATCH 1706/2369] qtox: update to 1.17.6. --- srcpkgs/qtox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template index f3fa78acb91..63d1196bd1a 100644 --- a/srcpkgs/qtox/template +++ b/srcpkgs/qtox/template @@ -1,6 +1,6 @@ # Template file for 'qtox' pkgname=qtox -version=1.17.4 +version=1.17.6 revision=1 wrksrc="qTox-${version}" build_style=cmake @@ -19,7 +19,7 @@ license="GPL-3.0-or-later" homepage="https://wiki.tox.chat/clients/qtox" changelog="https://raw.githubusercontent.com/qTox/qTox/master/CHANGELOG.md" distfiles="https://github.com/qTox/qTox/archive/v${version}.tar.gz" -checksum=3d2fe2a344c83c50e6603d2a4070f2cc0c6ccd13fa5e77457eff96f57ee6f8c2 +checksum=cd0781241b4ea536da90ce8c72ad9f2aa9bbdf9fbae5d38ee645e30d790fa7f2 build_options="snorenotify" build_options_default="snorenotify" From 99811949e09db26f9baabb36cbd9fcd6309003ae Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 5 May 2022 10:59:26 -0500 Subject: [PATCH 1707/2369] yara: update to 4.2.1. --- srcpkgs/yara/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template index fe171d75b35..df2a2f39937 100644 --- a/srcpkgs/yara/template +++ b/srcpkgs/yara/template @@ -1,6 +1,6 @@ # Template file for 'yara' pkgname=yara -version=4.2.0 +version=4.2.1 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=6f567d4e4b79a210cd57a820f59f19ee69b024188ef4645b1fc11488a4660951 +checksum=f26d9c481e6789181431ac410665f6ba25d551c2948995f84c9e17df7a93731a pre_configure() { autoreconf -fi From 0a1786cb8503450eee32dd9d1ed28e506699f3fb Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 5 May 2022 11:00:00 -0500 Subject: [PATCH 1708/2369] sqlmap: update to 1.6.5. --- srcpkgs/sqlmap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template index 74ce3a2ca71..67335427c81 100644 --- a/srcpkgs/sqlmap/template +++ b/srcpkgs/sqlmap/template @@ -1,6 +1,6 @@ # Template file for 'sqlmap' pkgname=sqlmap -version=1.6.4 +version=1.6.5 revision=1 pycompile_dirs="usr/libexec/sqlmap" depends="python3" @@ -9,7 +9,7 @@ maintainer="Andrew Benson " license="GPL-2.0-or-later" homepage="http://sqlmap.org" distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz" -checksum=14585e4fc95006467e52685c4838f024654d7e23cbd84eb12762a55918b8d561 +checksum=534194953d8a95ff1d28d1a19f9b2c1b6d021fe9bc3ea7368ecab2084ceba714 python_version=3 do_install() { From 9328798c485cd62c86fdb89fa505bfa7f06f0391 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 5 May 2022 11:01:59 -0500 Subject: [PATCH 1709/2369] python3-rich: update to 12.3.0. --- srcpkgs/python3-rich/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template index c3de71a5749..f9cd79d81ea 100644 --- a/srcpkgs/python3-rich/template +++ b/srcpkgs/python3-rich/template @@ -1,6 +1,6 @@ # Template file for 'python3-rich' pkgname=python3-rich -version=12.2.0 +version=12.3.0 revision=1 wrksrc="rich-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/willmcgugan/rich" distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz" -checksum=ea74bc9dad9589d8eea3e3fd0b136d8bf6e428888955f215824c2894f0da8b47 +checksum=7e8700cda776337036a712ff0495b04052fb5f957c7dfb8df997f88350044b64 make_check=extended # some checks only work on windows post_install() { From 0777ced7f0bcb4287a22eb70c69c201d9309ca80 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 5 May 2022 11:06:29 -0500 Subject: [PATCH 1710/2369] jc: update to 1.18.8. --- srcpkgs/jc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template index 992b2ebc206..24a52a65f65 100644 --- a/srcpkgs/jc/template +++ b/srcpkgs/jc/template @@ -1,6 +1,6 @@ # Template file for 'jc' pkgname=jc -version=1.18.7 +version=1.18.8 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,4 +11,4 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/kellyjonbrazil/jc" distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=eece56f592b04ddd19fb1fbac3ac6f0b27d6a731a05fb902813ccf0c0c78510d +checksum=a2cb40099cec38961477fbbbe14a8c3f41c9d3998e4cc402d9ae3d21171ff924 From 66e0bf212c37ccde1ec6ec77dec7fc81d7755b30 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 5 May 2022 11:07:15 -0500 Subject: [PATCH 1711/2369] python3-youtubesearch: update to 1.6.5. --- srcpkgs/python3-youtubesearch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template index 822d7eb70ee..494188c3a46 100644 --- a/srcpkgs/python3-youtubesearch/template +++ b/srcpkgs/python3-youtubesearch/template @@ -1,6 +1,6 @@ # Template file for 'python3-youtubesearch' pkgname=python3-youtubesearch -version=1.6.4 +version=1.6.5 revision=1 wrksrc="youtube-search-python-${version}" build_style=python3-module @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/alexmercerind/youtube-search-python" distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=a9dcc4536fd839beb29b12d93e59fb92b294a0d83b94b882b16a445158d1f8da +checksum=5e47c2bd09829aa830bc7f855693c20dfe49d2390c3041b0a44422cc743b3f00 make_check=no # no tests defined post_install() { From 8950650b4bd67146b4b875a48ee4779eea7c4366 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 4 May 2022 17:15:40 +0200 Subject: [PATCH 1712/2369] firefox: update to 100.0. --- srcpkgs/firefox/patches/fix-build-tier3.patch | 366 ------------------ srcpkgs/firefox/patches/sndio.patch | 52 --- srcpkgs/firefox/template | 8 +- 3 files changed, 4 insertions(+), 422 deletions(-) delete mode 100644 srcpkgs/firefox/patches/fix-build-tier3.patch delete mode 100644 srcpkgs/firefox/patches/sndio.patch diff --git a/srcpkgs/firefox/patches/fix-build-tier3.patch b/srcpkgs/firefox/patches/fix-build-tier3.patch deleted file mode 100644 index c7f5b7ea1f7..00000000000 --- a/srcpkgs/firefox/patches/fix-build-tier3.patch +++ /dev/null @@ -1,366 +0,0 @@ -commit 8a0c895dee94b3c15e56557eb1dd0114477a6056 -Author: q66 -Date: Sun Apr 10 00:38:30 2022 +0200 - - fix build on tier 3 platforms - - https://bugzilla.mozilla.org/show_bug.cgi?id=1758610 - -diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp -index 0fa127b..78c8961 100644 ---- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp -+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp -@@ -814,7 +814,7 @@ MediaResult FFmpegVideoDecoder::DoDecode( - # ifdef MOZ_WAYLAND_USE_VAAPI - // Create VideoFramePool in case we need it. - if (!mVideoFramePool && mEnableHardwareDecoding) { -- mVideoFramePool = MakeUnique(); -+ mVideoFramePool = MakeUnique>(); - } - - // Release unused VA-API surfaces before avcodec_receive_frame() as -diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h -index b1a2f73..c77d76f 100644 ---- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h -+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h -@@ -16,6 +16,9 @@ - #if LIBAVCODEC_VERSION_MAJOR >= 57 && LIBAVUTIL_VERSION_MAJOR >= 56 - # include "mozilla/layers/TextureClient.h" - #endif -+#ifdef MOZ_WAYLAND_USE_VAAPI -+# include "FFmpegVideoFramePool.h" -+#endif - - struct _VADRMPRIMESurfaceDescriptor; - typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor; -@@ -23,7 +26,6 @@ typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor; - namespace mozilla { - - class ImageBufferWrapper; --class VideoFramePool; - - template - class FFmpegVideoDecoder : public FFmpegDataDecoder {}; -@@ -138,7 +140,7 @@ class FFmpegVideoDecoder - AVBufferRef* mVAAPIDeviceContext; - bool mEnableHardwareDecoding; - VADisplay mDisplay; -- UniquePtr mVideoFramePool; -+ UniquePtr> mVideoFramePool; - static nsTArray mAcceleratedFormats; - #endif - RefPtr mImageAllocator; -diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp -index 7943e09..673b3fc 100644 ---- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp -+++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp -@@ -5,6 +5,7 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - #include "FFmpegVideoFramePool.h" -+#include "PlatformDecoderModule.h" - #include "FFmpegLog.h" - #include "mozilla/widget/DMABufLibWrapper.h" - #include "libavutil/pixfmt.h" -@@ -15,11 +16,11 @@ - - namespace mozilla { - --RefPtr VideoFrameSurfaceVAAPI::GetAsImage() { -+RefPtr VideoFrameSurface::GetAsImage() { - return new layers::DMABUFSurfaceImage(mSurface); - } - --VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface) -+VideoFrameSurface::VideoFrameSurface(DMABufSurface* aSurface) - : mSurface(aSurface), - mLib(nullptr), - mAVHWFramesContext(nullptr), -@@ -30,22 +31,22 @@ VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface) - MOZ_ASSERT(mSurface); - MOZ_RELEASE_ASSERT(mSurface->GetAsDMABufSurfaceYUV()); - mSurface->GlobalRefCountCreate(); -- FFMPEG_LOG("VideoFrameSurfaceVAAPI: creating surface UID = %d", -+ FFMPEG_LOG("VideoFrameSurface: creating surface UID = %d", - mSurface->GetUID()); - } - --void VideoFrameSurfaceVAAPI::LockVAAPIData(AVCodecContext* aAVCodecContext, -- AVFrame* aAVFrame, -- FFmpegLibWrapper* aLib) { -- FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI locking dmabuf surface UID = %d", -+void VideoFrameSurface::LockVAAPIData(AVCodecContext* aAVCodecContext, -+ AVFrame* aAVFrame, -+ FFmpegLibWrapper* aLib) { -+ FFMPEG_LOG("VideoFrameSurface: VAAPI locking dmabuf surface UID = %d", - mSurface->GetUID()); - mLib = aLib; - mAVHWFramesContext = aLib->av_buffer_ref(aAVCodecContext->hw_frames_ctx); - mHWAVBuffer = aLib->av_buffer_ref(aAVFrame->buf[0]); - } - --void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) { -- FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI releasing dmabuf surface UID = %d", -+void VideoFrameSurface::ReleaseVAAPIData(bool aForFrameRecycle) { -+ FFMPEG_LOG("VideoFrameSurface: VAAPI releasing dmabuf surface UID = %d", - mSurface->GetUID()); - - // It's possible to unref GPU data while IsUsed() is still set. -@@ -67,43 +68,43 @@ void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) { - } - } - --VideoFrameSurfaceVAAPI::~VideoFrameSurfaceVAAPI() { -- FFMPEG_LOG("VideoFrameSurfaceVAAPI: deleting dmabuf surface UID = %d", -+VideoFrameSurface::~VideoFrameSurface() { -+ FFMPEG_LOG("VideoFrameSurface: deleting dmabuf surface UID = %d", - mSurface->GetUID()); - // We're about to quit, no need to recycle the frames. - ReleaseVAAPIData(/* aForFrameRecycle */ false); - } - --VideoFramePool::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {} -+VideoFramePool::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {} - --VideoFramePool::~VideoFramePool() { -+VideoFramePool::~VideoFramePool() { - MutexAutoLock lock(mSurfaceLock); - mDMABufSurfaces.Clear(); - } - --void VideoFramePool::ReleaseUnusedVAAPIFrames() { -+void VideoFramePool::ReleaseUnusedVAAPIFrames() { - MutexAutoLock lock(mSurfaceLock); - for (const auto& surface : mDMABufSurfaces) { -- auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI(); -- if (!vaapiSurface->IsUsed()) { -- vaapiSurface->ReleaseVAAPIData(); -+ if (!surface->IsUsed()) { -+ surface->ReleaseVAAPIData(); - } - } - } - --RefPtr VideoFramePool::GetFreeVideoFrameSurface() { -+RefPtr> -+VideoFramePool::GetFreeVideoFrameSurface() { - for (auto& surface : mDMABufSurfaces) { - if (surface->IsUsed()) { - continue; - } -- auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI(); -- vaapiSurface->ReleaseVAAPIData(); -+ surface->ReleaseVAAPIData(); - return surface; - } - return nullptr; - } - --RefPtr VideoFramePool::GetVideoFrameSurface( -+RefPtr> -+VideoFramePool::GetVideoFrameSurface( - VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext, - AVFrame* aAVFrame, FFmpegLibWrapper* aLib) { - if (aVaDesc.fourcc != VA_FOURCC_NV12 && aVaDesc.fourcc != VA_FOURCC_YV12 && -@@ -113,7 +114,7 @@ RefPtr VideoFramePool::GetVideoFrameSurface( - } - - MutexAutoLock lock(mSurfaceLock); -- RefPtr videoSurface = GetFreeVideoFrameSurface(); -+ RefPtr> videoSurface = GetFreeVideoFrameSurface(); - if (!videoSurface) { - RefPtr surface = - DMABufSurfaceYUV::CreateYUVSurface(aVaDesc); -@@ -121,7 +122,7 @@ RefPtr VideoFramePool::GetVideoFrameSurface( - return nullptr; - } - FFMPEG_LOG("Created new VA-API DMABufSurface UID = %d", surface->GetUID()); -- RefPtr surf = new VideoFrameSurfaceVAAPI(surface); -+ RefPtr> surf = new VideoFrameSurface(surface); - if (!mTextureCreationWorks) { - mTextureCreationWorks = Some(surface->VerifyTextureCreation()); - } -@@ -138,11 +139,8 @@ RefPtr VideoFramePool::GetVideoFrameSurface( - } - FFMPEG_LOG("Reusing VA-API DMABufSurface UID = %d", surface->GetUID()); - } -- -- auto* vaapiSurface = videoSurface->AsVideoFrameSurfaceVAAPI(); -- vaapiSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib); -- vaapiSurface->MarkAsUsed(); -- -+ videoSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib); -+ videoSurface->MarkAsUsed(); - return videoSurface; - } - -diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h -index c506d22..c89b418 100644 ---- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h -+++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h -@@ -7,8 +7,9 @@ - #ifndef __FFmpegVideoFramePool_h__ - #define __FFmpegVideoFramePool_h__ - --#include "FFmpegVideoDecoder.h" - #include "FFmpegLibWrapper.h" -+#include "FFmpegLibs.h" -+#include "FFmpegLog.h" - - #include "mozilla/layers/DMABUFSurfaceImage.h" - #include "mozilla/widget/DMABufLibWrapper.h" -@@ -16,43 +17,16 @@ - - namespace mozilla { - --class VideoFramePool; --class VideoFrameSurfaceVAAPI; -- --class VideoFrameSurface { -- public: -- NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface) -- -- VideoFrameSurface() = default; -- -- virtual VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() { return nullptr; } -- -- virtual void SetYUVColorSpace(gfx::YUVColorSpace aColorSpace) = 0; -- virtual void SetColorRange(gfx::ColorRange aColorRange) = 0; -- -- virtual RefPtr GetDMABufSurface() { return nullptr; }; -- virtual RefPtr GetAsImage() = 0; -- -- // Don't allow VideoFrameSurface plain copy as it leads to -- // unexpected DMABufSurface/HW buffer releases and we don't want to -- // deep copy them. -- VideoFrameSurface(const VideoFrameSurface&) = delete; -- const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete; -- -- protected: -- virtual ~VideoFrameSurface(){}; --}; -- --// VideoFrameSurfaceVAAPI holds a reference to GPU data with a video frame. -+// VideoFrameSurface holds a reference to GPU data with a video frame. - // - // Actual GPU pixel data are stored at DMABufSurface and - // DMABufSurface is passed to gecko GL rendering pipeline via. - // DMABUFSurfaceImage. - // --// VideoFrameSurfaceVAAPI can optionally hold VA-API ffmpeg related data to keep -+// VideoFrameSurface can optionally hold VA-API ffmpeg related data to keep - // GPU data locked untill we need them. - // --// VideoFrameSurfaceVAAPI is used for both HW accelerated video decoding -+// VideoFrameSurface is used for both HW accelerated video decoding - // (VA-API) and ffmpeg SW decoding. - // - // VA-API scenario -@@ -72,13 +46,24 @@ class VideoFrameSurface { - // Unfortunately there isn't any obvious way how to mark particular VASurface - // as used. The best we can do is to hold a reference to particular AVBuffer - // from decoded AVFrame and AVHWFramesContext which owns the AVBuffer. --class VideoFrameSurfaceVAAPI final : public VideoFrameSurface { -- friend class VideoFramePool; -+template -+class VideoFrameSurface {}; -+template <> -+class VideoFrameSurface; -+ -+template -+class VideoFramePool {}; -+template <> -+class VideoFramePool; -+ -+template <> -+class VideoFrameSurface { -+ friend class VideoFramePool; - - public: -- explicit VideoFrameSurfaceVAAPI(DMABufSurface* aSurface); -+ NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface) - -- VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() final { return this; } -+ explicit VideoFrameSurface(DMABufSurface* aSurface); - - void SetYUVColorSpace(mozilla::gfx::YUVColorSpace aColorSpace) { - mSurface->GetAsDMABufSurfaceYUV()->SetYUVColorSpace(aColorSpace); -@@ -93,6 +78,12 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface { - - RefPtr GetAsImage(); - -+ // Don't allow VideoFrameSurface plain copy as it leads to -+ // unexpected DMABufSurface/HW buffer releases and we don't want to -+ // deep copy them. -+ VideoFrameSurface(const VideoFrameSurface&) = delete; -+ const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete; -+ - protected: - // Lock VAAPI related data - void LockVAAPIData(AVCodecContext* aAVCodecContext, AVFrame* aAVFrame, -@@ -107,7 +98,7 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface { - void MarkAsUsed() { mSurface->GlobalRefAdd(); } - - private: -- virtual ~VideoFrameSurfaceVAAPI(); -+ virtual ~VideoFrameSurface(); - - const RefPtr mSurface; - const FFmpegLibWrapper* mLib; -@@ -116,23 +107,24 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface { - }; - - // VideoFramePool class is thread-safe. --class VideoFramePool final { -+template <> -+class VideoFramePool { - public: - VideoFramePool(); - ~VideoFramePool(); - -- RefPtr GetVideoFrameSurface( -+ RefPtr> GetVideoFrameSurface( - VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext, - AVFrame* aAVFrame, FFmpegLibWrapper* aLib); - void ReleaseUnusedVAAPIFrames(); - - private: -- RefPtr GetFreeVideoFrameSurface(); -+ RefPtr> GetFreeVideoFrameSurface(); - - private: - // Protect mDMABufSurfaces pool access - Mutex mSurfaceLock; -- nsTArray> mDMABufSurfaces; -+ nsTArray>> mDMABufSurfaces; - // We may fail to create texture over DMABuf memory due to driver bugs so - // check that before we export first DMABuf video frame. - Maybe mTextureCreationWorks; -diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build -index de2611e..8ffdaae 100644 ---- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build -+++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build -@@ -30,6 +30,9 @@ if CONFIG['MOZ_WAYLAND']: - CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS'] - DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1 - USE_LIBS += ['mozva'] -+ UNIFIED_SOURCES += [ -+ '../FFmpegVideoFramePool.cpp', -+ ] - - include("/ipc/chromium/chromium-config.mozbuild") - -diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build -index 7d28420..1da28a1 100644 ---- a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build -+++ b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build -@@ -30,6 +30,9 @@ if CONFIG["MOZ_WAYLAND"]: - CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] - DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1 - USE_LIBS += ["mozva"] -+ UNIFIED_SOURCES += [ -+ "../FFmpegVideoFramePool.cpp", -+ ] - - include("/ipc/chromium/chromium-config.mozbuild") - diff --git a/srcpkgs/firefox/patches/sndio.patch b/srcpkgs/firefox/patches/sndio.patch deleted file mode 100644 index fa3b6fa8ab6..00000000000 --- a/srcpkgs/firefox/patches/sndio.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/old-configure.in -+++ b/old-configure.in -@@ -2818,6 +2818,22 @@ - _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES" - fi - -+dnl ================================== -+dnl = Check sndio availability -+dnl ================================== -+ -+MOZ_ARG_ENABLE_BOOL(sndio, -+[ --enable-sndio Enable sndio support], -+ MOZ_SNDIO=1, -+ MOZ_SNDIO=) -+ -+if test -n "$MOZ_SNDIO"; then -+ MOZ_SNDIO_LIBS="-lsndio" -+ AC_SUBST_LIST(MOZ_SNDIO_LIBS) -+fi -+ -+AC_SUBST(MOZ_SNDIO) -+ - dnl ======================================================== - dnl = - dnl = Maintainer debug option (no --enable equivalent) ---- a/media/libcubeb/src/moz.build -+++ b/media/libcubeb/src/moz.build -@@ -44,11 +44,13 @@ - ] - DEFINES['USE_JACK'] = True - --if CONFIG['OS_ARCH'] == 'OpenBSD': -+if CONFIG['MOZ_SNDIO']: - SOURCES += [ - 'cubeb_sndio.c', - ] - DEFINES['USE_SNDIO'] = True -+ -+if CONFIG['OS_ARCH'] == 'OpenBSD': - DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True - - if CONFIG['OS_TARGET'] == 'Darwin': ---- a/build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200 -+++ b/build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200 -@@ -88,6 +88,7 @@ - @old_configure_options( - "--cache-file", - "--datadir", -+ "--enable-sndio", - "--enable-official-branding", - "--includedir", - "--libdir", diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 8ee3b78f809..021bb6aee82 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=99.0 +version=100.0 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=513f8d2cafa39a2d50f2c4a25cc48093e89f715a706b941170fa48e397976327 +checksum=664c0cc4e0fb70886aa4e652d144996045d533a18eebc7d61093103cbb2d5e7f lib32disabled=yes @@ -172,7 +172,7 @@ do_build() { export MOZ_MAKE_FLAGS="${makejobs}" export MOZ_NOSPAM=1 export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild" - export MACH_USE_SYSTEM_PYTHON=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export AS=$CC @@ -191,7 +191,7 @@ ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' ' ./mach build } do_install() { - export MACH_USE_SYSTEM_PYTHON=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild" DESTDIR="$DESTDIR" ./mach install From ebaae3457e13f64a2e6a67f66ec582c77ea0ff2d Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 4 May 2022 17:18:04 +0200 Subject: [PATCH 1713/2369] firefox-i18n: update to 100.0. --- srcpkgs/firefox-i18n/template | 194 +++++++++++++++++----------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index 0e98d438bd2..f13acdfd6d5 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=99.0 +version=100.0 revision=1 build_style=meta short_desc="Firefox language packs" @@ -140,99 +140,99 @@ _pkgtmpl() { } } -checksum="e398f1b14ae79fcd74639a81b27c4cd38b09282ca625d1b72c69df09fc4ec1fc - a8cbef3ba5c35e33c0f1e02dcd2781cc362315d5b63e9e6065a22afbe460581f - 35b4f32eabd40875d518cb174858bb6d8ecff272f4ee677e0c108d8395707960 - 4f1a97c404347121c53799efd2a986860e030b7789e66e252d92b6a78012b681 - 580e9e9fde913ce410774d366bad95af3a67df52c688a6ad64ad59e8d33eab47 - 91236c6ecd7ee99927d5b69566cc30f4b1de6e7caca3336386f3e7bb995c96e2 - fa36e967b14e530993e3a50fcdc5f32e686f5b110f6cdee59b8c555c82294517 - c88a65b1f3c10085b0d5236a3e687b70cd9a620803393caf81b4ee0677330ef0 - c12d138948d4e5cebce1051f0cc750f8f9bfb23f733417e7e7b9596ee74a6980 - e4b9cdcb7c08beceecfef7d8b94d70a24e3f24404c73cd7cf5aed6572e293bf6 - 75d09dfb5c0b55b670c912feecd48bfdc7f936f31c41d8e4b2ede0e46d16f749 - 8780f97e115fbe8f156412757d1980517b85dc409fbbc8e0266bdcc7d0568c83 - 815c9a81efce33b19b9bcabd46093ea92bd062698575c83ea127f20a3495c984 - 76e9a327a69960f4ebd857b5b204d435d60461b7129aa70db90ebb28411ffaee - 8fdd5adfec75310172819a959a2b68ad3ecb614c94298be315804e730b43a160 - 8947c35c94f08bbb61a3beb8b106a776d0f0a3b2f247b9e49619ab9b9416bb19 - 7851a711a8de28c6e6c3c07814ef995263f4c3a48981742f1aa481389dab3897 - 8bb525f9045c91b3f539103eb398da1d1f71a580971a1adcc780198da36a2623 - 04cfc4a69fba8f3838d385179511954277cf1f6d8243663f338941c1e86a49ca - cd9f142ac06d16919b5f1102ae53f1241574057c75012198fe1dbdb7a8d63a8c - 8ff53385252becfbc2f15354ea57b873251584444129c137350e974dc488318c - 9a58559be92950e33051625e49dd3f5bae36c225b9a7030bec9a6aa78d45ba93 - 6e0f538d93f8b2d189c667c2aac37c6d1eb50fb802c4ee2ff310db15da57de56 - 2c051ea90460cda20296b1a69037e037b82258fe382c9031594974e75cbc10eb - 053dfbb9ad0feb3b54cab94bd8f5ac544ec598f9b819a7d163496f838104b8a5 - faa25b7302f249b9aaea768a7cf61f78f67e3637e9a62906361a1fae257d0161 - 54f02a1e948d2944b3889152b093200a0d31358df28f7309e5fb5d490616d317 - 7c104e3c70024163fc0fe7597df0a995b2e813319dc23268fe36e04f09f2ced7 - 2cf6b8e82042208407bfdbad01a3d5113c87f0bd37acb082452f1f6c22bf1485 - da05a0fe7a65ce243f0ec69ad60d93a3bc988383f983343a66b399a2de1a10a0 - 13da03264b7d522bcbb77cfb1fece6606f9efe742822325ced7627fe28add070 - 0d835b249070428d8d5e1c251ab46b19df71cc2858b69843a41eee897c27b396 - 5dbbe35e45b15dca15ba5de15aa55b4fce44d33fb456ca8184270c0f162567d7 - 9e6b2c13f0c2347fe27e189dea6dd8a3c5b23aaac668010213258bd26e0d3da7 - 1aa07979f8bb7d6039a11f64b3c93b3c70332def967af6fb426897b7c65fdba2 - c21b99ea6049d498bb446770801e3c9f8041bd11e0ae8164bd16a016f14f5578 - ed537abf79efa484fc920902d59ea1b840c6acf6fa540f435722f5c75a1bca90 - e9517bb3330ec5cb2a743dd56a69c912a35b6dafe6a7abeadfe1532a17963549 - cf97f81502f30c807fde8127c6f8ac1a9ea58508ba8d243ea0d6fbabe2ddc8b1 - 85b90f53e79bc2961b3f0c702ba5762ba7559c366d7682bc66b20514769c2a92 - bd31d635b44f039ad2f89e4ad1cd0f7fcbcec7e0d6d381f8bf89e17bb74aa952 - 10d597d44d8261cd0eebe024de51ba803c94792d13c5732d43ed9bec4db72783 - 33da29355095f9ae0383e21ae0c6d300d6a7f298c7e126e8747c71277b1175be - 84ff5d1b88c4205eba0f04e89daf4d91e9f25da4590367050917a6d34c629147 - 4de39e8b907391f197fe5d138f87985d74d3a34796c3963f2e33142164696f84 - 47e8c5ece6643d5c6cac713799c841e73c0bda691243ccd346b5e85b0a4810d1 - c196be8854dded19c2a85c5bb7f3ff3123da0d91852da7b16f844cb44e9d11fa - 7f97921badcf0c7ffeb92c6f1d1d2ada3afd0069e8e80a524ad3b7c0c1220f0a - 79d845fccaa1916f07dfd821c3ed95dd5647b70bd9a39e485caa66cc65a077f7 - 40ce23e0cc6e4fa5192e987bc835c1408d958a2fcfb8875370db517ff64c92a4 - 8f6f739077a383884d400c3062925e0e848be4942e3be0e378e589bfa3941c9c - 9f014d8807130a01ae008997393deb4c865c70482a4fe75f3cee0e9f8071246a - 240aa4b7091065ef0495c8f52eeb91b5a0cae03676c6ea4cedee9260e204dd6f - 788f7ab9bfbb7b692d4d28efad9ae3de964ef7bfa4e30f6f50a3bd178ac004ee - 04a7fbbc1b0769a5b66bb068385482e50c5f70298eba250235d259bc4aa3ea99 - 30a1707f4a57a2ba738eb27f5525daa12f0713e3bb7b1a3ebe2c710ac6e37a27 - bdc752daf3b4e8f8ea3980d98a01d7249f38dddf183909eb55a8c50ad30368e1 - 48332123774a79eed86d1e826021a05a3921ac5f95ca54e086f173c8e1e72fd1 - 31f2f1c2adabe35fd353d3720eb8458716f926e57c9d782518f943533cd1a72d - 4756150d141a8ce3e2bdca7fdb1b343466b19cb9a19adbfa25d86c39d0f7c933 - 024f3b186772c5381a458dda4a6b914fb2695f8c16e648c58d463072f10f5b57 - 8160d89f88b3c7d9e967377e513b8fc18e4a19faa55f95371db3553564db65bf - 6d2816247894f2e73ecb0258ee5a9b85b650542bac46a8587d547c8824e2d280 - d3e017f003c34a6768670ae2c8bbd5e3500f452647e36193614810ced595b2b3 - 7ceafc2a330620665c51e8b394d296ddb190d97f4cebcd0a247d0278d3a54274 - 6b6992a92df788fbd119446aabd9329b7edd1643a8dd1e3ca7b60dc7976b3b60 - 8dee92aa771ca1b0deb233b974f844b8025d4b25f2ff8be41d91c636565eb7f0 - b4fc00a30204c8c5b19c92bd3164b98955d9591366f89c194fe248bdbc0ce580 - 406335d53b11c42f34446adc68d6836a6841fc34af3c2f1fa621ddc2026017b4 - 7ac66cef872878f6e5568266d9c807da1cc4041ae51723cf387590954f73cf7d - 74c5306c711a4150cb6f89289067533a5438495a251d63cb06f586d27eafbeb4 - f3e67b76944280de1eb8df059bec0f0eafd06a4bc4e7c93e98c434a17192c084 - e13b87e04ee3fbf7ea0c02e4b176d6dc66dbd234b59cb245dfd225e65c5cdcd3 - bfab113c2dde187aaabfd89957c7dc840bbbb25c4f27b31fb422c9817035eaa8 - 7bde7feb01a40d3b89b78928154fcfc0eff8c77b086e360b940f61d45d7eadb0 - 18f2267d16b30aecfd2b6f9437cc79bca68084680b2770820323a968fd20c93e - 5bd5138456fae929520bbd821beddd1f934d156e3c99916e47df31b7bedaa32a - eb4db96ab4b78dede2d92db7c0c3dd4084971178f101a342655348a4b90a6487 - 07a06be606d6adacf1cb57cbf448ff18a7c13c90df9e11768ac3fe3e200569a2 - 090e6759314eb16b2169bd1f89387963ba81a0e565f1d77143f2da0e6d267e28 - 38cf5fa44116bc15f12db4506db386b147762838f25d991a0c39cdcd236533f6 - 448a4ab5be3d9f246f961705a02f31abcaa8c616351c4d05857c3db41ba83154 - 3fcfcc54f9ec4762b4b78ce0db9351ac59a717e4931d6267cacafa16d3d41057 - 7349863f4edfd79321be9b214384138596cbe16ecd2107cee58501e2511c438a - 4a50c82c68898c25dfdfcb95079750a455ba2e4d1397d5e51cc2991dce1be60b - 275ab1a945003153a10fd5bbebf8ce9af346e5ad2068c83eebdcd60ecf0ce99e - cce68831a20669468b108e3dd58dbc34cd981c874bdd299b715df838ba5ca0f9 - d6cdb55b0f8d7f3c9c4f3bc7906feb123f84243bfbd719eab75a6894cf455582 - 74012d5c8c22cc2f5780ae55020cdbe3c74f21671a2769fde907dbd63e0281bb - 14a02938f76ce51767746ecc104ff571f2da0429144ee981cd28af8b4eda3518 - dc05af8f59bdbf1c77d6d45dc1bf6bba634b782533e245993d852e39f145cfc9 - 557444ed827906476ec3385ffae1e1952acc5b3234840fc645ff892c9753b2f3 - 9925d116300b43f82061e1c04deae6c241cfb121d46364aa1f206e0d8bd9732a - aaf3249f295362530f04f23c00e309baa5a7a89c70bbf1a3a763b8ef66631ac8 - d289624c73955ff377057be150ff8d52118810a4adaf861fe51b7f0a0b80dbbf - 2f07d98e74625892478c321161f62db8c790d978dd4e5c3633c5cf5ef5d8d6b4" +checksum="05fc947ff479288182364d39a343fb33276f37266be02c17c6c2adb15c9209c4 + 8ffad9c79427474069ab2b5dc4cf772947a34b7988d68adb576e79b8a23ab67a + 523277c631901519063d41b63333aac3ac874b3e6a453566c0c1ea3fbb7a90aa + deb96111e07746d8ddc99e961dfc1e545cc9fd50e4eaade71fa40f5f575f9ac4 + dd1672b8e38ac2a29fe3be20b11a73c7935dae71ef2624fe92e755763a639d7c + 5e10c7080c772a441d3e3116cc964e162d6a5a2ced953bf5a6c59c303fdbcdf0 + edcb679e72e4ffd3b8fddcf231bcb07a5c0d44b2e1c32982b752f40cafaa625f + c4670cc9456a9c170b71b85a1a2486c10d9046f3fec7fd807555a32335d2fa9e + 57dcb0e6af8b0573a1188cbc4509e4a30fd1d027b686d73a6b793f6b21e86df2 + 5c385dede7eaa4e248a15f918c7f64e9125899ef742817bb39571ae0b37b34c4 + ff15f4844392d0cb50527bdf48d4873f55ba08d8500306ec9ca83405a704fbdc + eeefc55c1f80988ebf4c759e4f19092fae79b6335f450d24616c3b3db4985170 + ccb517a28a85c6aca804ae46bfeba7a0a3fa577111328ccb7bbfda2cb67cb055 + bb657cc31e3a2eaca1aa19df8532baa4c05d86c4eedb2dad41e1c85a977193fe + caea7efda0efd010947fef5260726cd1412d222faccab12a7017c6053e355fff + 1b2667186c51e750fdaf05efcf724a932d4b3e10f839396b36bf35c7b8fb58c9 + e079ce25240d5d286af227c19175446328174082e7f24db3da3366933b213327 + b534df3b5798fc73ec0989c7e2acadec5d96dc5c29f599ca34b6e3fc2d063ebe + 3b232b2de0b99a6d1cb4f0afa203edfb62896065de9aaf351860cca222f22327 + 520b578228ab2efb7880477276c2b9db430a77efacf590c75bd16cefb5a96d67 + 10ef072059fb1ed982d7e5a4e90f741f99213d15b94eeeb398d09d7f651aff3d + 9b882019ca6e4de58c8f229b344888814424b079e939dd362ea77cf50c9ed059 + f389a84de1dd7ff8375c66694168a1479697f9ce64e6d4c2824a585076b5aee0 + f4f3eedcbe27ee556a8e58cd0d07c9c530b0a83b68ada75e74a1d91977333b89 + 4d67fca1b1f12f4e5c8ac9e5f70140bda20e8c608ee77df4eb4dc97f9f984eaa + b73da525fa7ed072e2f2ef2d68eeba037de126942d1190d875d359de77f7006c + 4d2253d1d31a6740b24046c066a8342d240599a096585e848e7c065d0912d80e + 309eed3a6b60de8b338ae464d29db444320f55d31adf0a8b00885d0cca43ad93 + c92d925cd81c692f7180cc71fae28d77b3ff7466e365169d92e4288d40249a08 + 50b1fbc60bea33b12fc5d3fa676503c8417708db0451b9afaff604892612a23b + a42141c5c6c00be51e947f9a49ede93e2283050487200e28e71901480b845ff7 + fa552045ce9cd1b1ca47ef0a0aab50d1095ec9b2f46d3103efd957cdeeccb751 + 3974ecc24feab6d577d23bd27427136cb0389104011ff796d68d02a69d71789f + ca5eb3b04b1c4b32aeefbda17949a358257fe389d48dab1c886b9cec884fe0f9 + 846ad932823fd5764540e72d2e8854f87963f8caf4685eb60012bfb5923a75fd + f5a05fb9a4607f1589096e13b47f985d26253cb5bb5da1cb918865e9654e550e + 6717b235fa616b1b9d6684ef50863926d7ee3571811c215d226518916ad3e95f + a767439949302a6eb682c58c72c35920fb143deaac708ae72bad47bb42430945 + 985cd6fb46031859fb238c8b8ca3ae64f8583bab09e6719704c427d2589525c1 + 7c6b502db9cfa306bc214a3d17c5931b071072ab4326c6ce8bd7498ae126282a + e4d00cf895acdac207b1ed4f62280927850d3621ae6ed959bc0dd4adf377bfd7 + cc11c9b95bfb4e3ce0782c9f2c7e4c7fd92a3b0cc3f6f7bd1390921df1b59ac0 + 2951c4030c25c59407be23d4c8b203f68c302dee756b895a3ef1c21df1830146 + e659f2a38763062004fe34968fcdb805b00bf440e4b576ee7028c12a7d8493a4 + ed29465a92aeb657fa04c226fe3fac1edbe73f69f5001d18b379b21ceaf7f98f + b3c38d2d016017b6449bf73f55f63d67e0a9ebf8ba6df059e7d378f953b2a9f2 + 516d885123c351b24ed093ee1ac194d7297530852ef2bdc23b20903790d060a5 + 2744519881bda9cd1fc210629a4366886b55e840877e7fbcc11211c281d4668d + dff4045c796f34b4d31a55fb59aecae4b8dce24a12ed552d146707e9cc51187c + 3862311cc49c8e6d8e8f0f2f03303a0a137654f5cc6511f7f8931a50215f838c + d0cb5d6b31eaa479a903fcef3a9f014ba8939c446ef7a44e8d40b0a6760a17b6 + 7701f6381976c0f1c15c80f3661c6ef20a9953d5cefd64710da7814e875deccd + 9757690f40ea70ec1ed6ca4791cf7fafa4d7f9f58a4b1683cfe0be229c3c656a + 2d076430aea914ed0fe8c6cf3c9f61a2f7b5b6fefb87fa0631f3b1fca2274eec + a32477149c8bdf30590b7dfe931dba18bf9589271d01ffa58d47389dd6ecfe3d + 9da35b91db26edb8b8c48cbbd8b953fd7b7fbd74c2233a004c8a35de4fe473f3 + 5bee5ac2905748ba2ba0f0488f2ecfc409112e626b2e1580f21f1a6dfc685d6a + b362ca18cb856bec6aedd2a05b3dfcdfdc78ecdee19866f8aab6047c1603ae88 + 7a044e5236ba024e80065a8a159dc18c61fd938d39902e4f626615f927038783 + 26e198549ddf1df25f22801c74cba3c18440d17f1e9b90d96a83c38498213aba + 2ca078ccb32f81356f58db590a95ba27fda61dc2ce88d939bbb68d5392b4677b + 1b183032cf35b4c3ccc088ba63d83bbde55e1d1a14a0da756957345875a3a695 + 1dba115cf55edd6082e3e68366fa5aa679deae0262621f8ef574f6f6f7f3f5f0 + 915c75c205383edf6e31325b9717769dad24f6f457a390a80cf9063bd38fb29c + 055866db316ecf278f682a6389f9a42c422c3eda5fa3c5f4223adb18511c5c61 + f7ffd0af9d3f401e6fdb1425c19de890cfcf2077fadefb77aa9514d83701aefc + 9a518360c83589f326252c0096d0a7b766f271f40cf8ae99394cef5a46120306 + 2ed7c8a352d064d5813121238e385de73d02c70260a3622b774892c003d4fdcc + 4bce9dd4f8eac65f13f447976c61142aa9e227ebd79ef84e2205abbf383dc096 + 1f51826364ba69823a7c56c87523f5aadbf4e577c6d4934bc96021083efe2083 + d5b38929489bb0da1688c9f31d35051f5801a4111d60b49521bd736512a5812b + 31494871d4ee110921cca19eafd2ddc089ab51edb96e67de6d5e75b2293262b0 + 11166cc8dcbae00aaf39c58f23f1e357a942cf9fae1873e486aadefdd33bf933 + 9ff85ed3a21d63785e7c2475577097bd8a53cf4eaa7122bbf78225078abb7c96 + 82102671cd03006743333b73dae07f4cf0702ac96ecccdb86fa7b40e9ea85c74 + 8c9096f28cbce9b40d534cddab6ce9c3dd1003120b7201490d936743763af12d + c11653e2d1f845360c176a698f77b196230b7ad108f6e86033ba24b8fe7f8e1f + f728c9850b153bcd15d3fde9f134177d58db1cacd4ef42a9e9baccf5981c5195 + 2683e367a49ca9e3c9c278970a5b8a56f5718d948dc73c1fc26c5340cac4d005 + 96b0327b8766a6e3e40097cdcef6cdbb4498df256c9a0a43cb20bc7543fdf9fa + 9936f3f4a9a1c86ae0123c714f71b8652e7217f58c3e529d6f3e4737a930c044 + 5e6d54c42b0fc394142449727aea373cef5dec109c857d3f7de2576abc55394d + 7092c55e961b30bc42941730ed4ee831445c5d8682e51af8af1a134aa0a6be1b + 670723fe5f0d50cc59e1d4af1c8d3176ef6d2a4b61c56274a9a805c084bba72c + a04627bfb97a249b166c625630e4ba5875400e9fd6cd9f54e8d9c94dc43ec7e0 + c7c7bf41ad8a745da097fde5c9e06885f520cd8f2cb4bde06fee8b029ee85888 + 485d48e4c86c82c1812f603a7a02ac390134adccdfa25e86a6d0f75643bc5f2a + 55598530db9d7640fc73ee9881fb5c43b2a50b3b075454dc4e59baef93b4f70f + d4afee4357c8e49ac06d66b24606ed1265b8cb14979125e0e0d326335238779d + 28d511b6de7c0c92730c79523710624427e6cd320225827a49cc217c06e1d612 + 5c587ab32b4f5a835992f03ed47f875f962da36ecc48a6b4cd999de6f944e7e1 + 949ab674459d323cc04364ab6a8a141d1976d22c08c8705d434276405fada9fb + 1e7a6048da7b760b85301927b9a57ad7da041046df179126cd0126df97029927 + d3af2b83e1349e9db60b8caf47141f3e9ff339651823909f6ee98fdeb7b1134e + 53dd63b3de2a325b278084825883a19de8e7fdc8bc4fff88f24b052a64731094 + d4da572047b11729bc29c3f7f9c9afa68ea308b0f0d03515037c9bac77dfdb37" From e4e53fc98bd2f433c798bd86c0c4585cd8f5927c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 4 May 2022 21:44:51 +0200 Subject: [PATCH 1714/2369] common/: add script finding file conflicts --- common/scripts/lint-conflicts | 195 ++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100755 common/scripts/lint-conflicts diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts new file mode 100755 index 00000000000..bb0e2b2fd6b --- /dev/null +++ b/common/scripts/lint-conflicts @@ -0,0 +1,195 @@ +#!/usr/bin/env bash + +# Report packages installing same file and not marked with +# conflicts or replaces. +# Without argument, find conflicts between packages in local +# repository at hostdir/binpkgs and packages indexed in xlocate. +# With single path as argument, read that local repository. +# With -a flag, find conflicts between packages indexed in xlocate. + +if [ "$#" = 0 ]; then + binpkgs="$PWD/hostdir/binpkgs" +elif [ "$1" = -a ]; then + all=1 +elif [ -d "$1" ]; then + binpkgs="$1" +else + echo "Usage:" + echo "$0" + echo " check packages in ./hostdir/binpkgs" + echo "$0 path/to/hostdir/binpkgs" + echo " check packages there" + echo "$0 -a" + echo " check all packages indexed in xlocate" + exit 1 +fi + +declare -A newly_built conflicts_cache providers_cache pairs owners +repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree") +rv=0 + +template_exists() { + [ -f "srcpkgs/$1/template" ] +} + +partial_check() { + [ -z "$all" ] +} + +providers_of() { + # print the pkgname and packages that `provides` it + local pkgname=$1 + if [ "${providers_cache[$pkgname]}" = '' ]; then + local line provider_pkgver provided_pkgver provider_pkgname provided_pkgname + local -A providers + providers[$pkgname]=$pkgname + while read -r line; do + line=${line%%'('*} + provider_pkgver=${line%': '*} + provided_pkgver=${line#*': '} + provider_pkgname=${provider_pkgver%-*} + provided_pkgname=${provided_pkgver%-*} + # comes from $(xbps-query -s $pkgname), so $pkgname can be substring + if [ "$provided_pkgname" = "$pkgname" ]; then + providers[$provider_pkgname]=$provider_pkgname + fi + done < <(xbps-query "${repositories[@]}" -p provides -R -s "$pkgname") + # leading space ensures ${[]} != '' + providers_cache[$pkgname]=" ${providers[*]}" + fi + echo ${providers_cache[$pkgname]} +} + +conflicts_of() { + # print list of packages that are _marked_ as conflicting with given one + local pkgname=$1 + if [ "${conflicts_cache[$pkgname]}" = '' ]; then + local in_conflict provider + local -A all + while read -r in_conflict; do + in_conflict=${in_conflict%'<'*} + in_conflict=${in_conflict%'>'*} + providers_of "$in_conflict" > /dev/null # executing in same process to fill cache + for provider in $(providers_of "$in_conflict"); do + all[$provider]=$provider + done + done < <(xbps-query "${repositories[@]}" -p conflicts,replaces -R "$pkgname") + # leading space ensures ${[]} != '' + conflicts_cache[$pkgname]=" ${all[*]}" + fi + echo ${conflicts_cache[$pkgname]} +} + +conflict_between() { + # exit successfully if packages are _marked_ as conflicting + conflicts_of "$1" > /dev/null # executing in same process to fill cache + case " $(conflicts_of "$1") " in + *" $2 "*) return 0 + esac + conflicts_of "$2" > /dev/null # executing in same process to fill cache + case " $(conflicts_of "$2") " in + *" $1 "*) return 0 + esac + return 1 +} + +list_newly_built_files() { + # print one line per file in newly built packages + # each line contains pkgname and file path + local pkgver pkgname + while read -r pkgver; do + pkgname=${pkgver%-*} + xbps-query "${repositories[@]}" -i -f "$pkgname" | sed s'/ -> .*//;'" s/^/$pkgname /" + done < <(xbps-query "${repositories[@]}" -i -R -s '' | cut -d' ' -f 2) +} + +list_interesting_files() { + # list files potentially contained in more than one package + # each line contains pkgver/pkgname and file path + if partial_check; then + list_newly_built_files + else + xlocate / | sed s'/ -> .*//' | grep -F -f <(xlocate / | cut -f 2- | sed s'/ -> .*//' | sort | uniq -d) + fi +} + +group_by_file_full() { + # create associative array `owners` mapping file to list of packages + # for packages potentially conflicting with newly built ones + local pkgver file pkgname + while read -r pkgver file; do + pkgname=${pkgver%-*} + if template_exists "$pkgname"; then + owners[$file]+=" $pkgname" + fi + done < <(list_interesting_files) +} + +group_by_file_partial() { + # create associative array `owners` mapping file to list of packages + # for all packages in xlocate + local pkgname file + ## newly built packages + while read -r pkgname file; do + owners[$file]+=" $pkgname" + newly_built[$pkgname]=$pkgname + done < <(list_newly_built_files) + ## rest of repository + while read -r pkgver file; do + pkgname=${pkgver%-*} + if [ -z "${newly_built[$pkgname]}" ] && template_exists "$pkgname"; then + owners[$file]+=" $pkgname" + fi + done < <(xlocate / | sed s'/ -> .*//' | grep -F -f <(list_newly_built_files | cut -d ' ' -f 2-)) +} + +group_by_pair() { + # find package pairs owning same file and not marked as conflicting + local pkg file a b + while read -r pkg file; do + for a in ${owners[$file]}; do + for b in ${owners[$file]}; do + if ! [ "$a" "<" "$b" ]; then + continue + fi + if partial_check && [ -z "${newly_built[$a]}" ] && [ -z "${newly_built[$b]}" ]; then + continue + fi + if ! conflict_between "$a" "$b"; then + unset pair_files + local -A pair_files + eval "${pairs["$a $b"]}" + pair_files[$file]="$file" + pairs["$a $b"]="${pair_files[@]@A}" + fi + done + done + done < <(list_interesting_files) +} + +print_out() { + local pair file + if [ "${#pairs[@]}" = 0 ]; then + echo 1>&2 "No conflicts found in" "${repositories[@]#*=}" + exit 0 + fi + while read -r pair; do + rv=1 + echo "${pair% *} and ${pair#* } conflict for" + unset pair_files + eval "${pairs[$pair]}" + for file in "${pair_files[@]}"; do + echo " $file" + done | sort + done < <(printf '%s\n' "${!pairs[@]}" | sort) +} + +if partial_check; then + group_by_file_partial +else + group_by_file_full +fi +group_by_pair +print_out + +exit $rv From e900c63cf94fb81468818c09288762716da258fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 4 May 2022 21:44:51 +0200 Subject: [PATCH 1715/2369] .github: check file conflicts in x86_64 build job --- .github/workflows/build.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2ae7a3e728f..e4619a3f3c4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -94,6 +94,12 @@ jobs: "$here/common/travis/show_files.sh" "$BOOTSTRAP" "$ARCH" ) + - name: Check file conflicts + if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate + run: | + xlocate -S && + common/scripts/lint-conflicts $HOME/hostdir/binpkgs + - name: Verify repository state run: | ( From cc27e8e6f7e9c9c02024d6777896c2ec800b7205 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Mon, 2 May 2022 00:58:34 -0400 Subject: [PATCH 1716/2369] common/travis/xlint.sh: print Github annotations Turns xlint, version lint, and commit lint messages into warning or error annotaions. All are printed with special highlighting in the action log and summary. Xlint and version lint annotations are shown inline in the changes tab and commit view. Annotations without line number are shown at line 1. --- common/scripts/lint-commits | 10 +++++----- common/scripts/lint2annotations.awk | 11 +++++++++++ common/travis/xlint.sh | 5 +++-- 3 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 common/scripts/lint2annotations.awk diff --git a/common/scripts/lint-commits b/common/scripts/lint-commits index 01c4eda1700..7207ed81d5a 100755 --- a/common/scripts/lint-commits +++ b/common/scripts/lint-commits @@ -35,18 +35,18 @@ do /^$/ && !msg { msg = 1; next } !msg { next } # 3: long-line-is-banned-except-footnote-like-this-for-url - (NF > 2) && (length > 80) { print C ": long line: " $0; exit 1 } + (NF > 2) && (length > 80) { print "::error title=Commit Lint::" C ": long line: " $0; exit 1 } !subject { - if (length > 50) { print C ": subject is a bit long" } - if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print C ": subject does not follow CONTRIBUTING.md guildelines"; exit 1 } + if (length > 50) { print "::warning title=Commit Lint::" C ": subject is a bit long" } + if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print "::error title=Commit Lint::" C ": subject does not follow CONTRIBUTING.md guildelines"; exit 1 } # Below check is too noisy? # if (!($0 ~ "^New package:" || $0 ~ ".*: update to")) { - # print C ": not new package/update/removal?" + # print "::warning title=Commit Lint::" C ": not new package/update/removal?" # } subject = 1; next } /^$/ { body = 1; next } - !body { print C ": second line must be blank"; exit 1 } + !body { print "::error title=Commit Lint::" C ": second line must be blank"; exit 1 } ' || status=1 done exit $status diff --git a/common/scripts/lint2annotations.awk b/common/scripts/lint2annotations.awk new file mode 100644 index 00000000000..5405d697153 --- /dev/null +++ b/common/scripts/lint2annotations.awk @@ -0,0 +1,11 @@ +# Converts xlint/etc format lints into GH Actions annotations +# The original line is printed alongside the annotation command +{ + split($0, a, ": ") + split(a[1], b, ":") + msg = substr($0, index($0, ": ") + 2) + if (b[2]) { + line = ",line=" b[2] + } + printf "::error title=Template Lint,file=%s%s::%s\n", b[1], line, msg +} diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh index 6b3d9e91c90..327417c1c32 100755 --- a/common/travis/xlint.sh +++ b/common/travis/xlint.sh @@ -11,7 +11,8 @@ common/scripts/lint-commits $base $tip || EXITCODE=$? for t in $(awk '{ print "srcpkgs/" $0 "/template" }' /tmp/templates); do /bin/echo -e "\x1b[32mLinting $t...\x1b[0m" - xlint "$t" || EXITCODE=$? - common/scripts/lint-version-change "$t" $base $tip || EXITCODE=$? + xlint "$t" > /tmp/xlint_out || EXITCODE=$? + common/scripts/lint-version-change "$t" $base $tip > /tmp/vlint_out || EXITCODE=$? + awk -f common/scripts/lint2annotations.awk /tmp/xlint_out /tmp/vlint_out done exit $EXITCODE From b8a467f6ef4b879112c39381710550cda59a9613 Mon Sep 17 00:00:00 2001 From: Bas Ploeger <5904333+basploeger@users.noreply.github.com> Date: Sat, 2 Apr 2022 22:00:49 +0200 Subject: [PATCH 1717/2369] New package: apcupsd-3.14.14 --- srcpkgs/apcupsd/files/apcupsd/run | 3 +++ srcpkgs/apcupsd/template | 40 +++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 srcpkgs/apcupsd/files/apcupsd/run create mode 100644 srcpkgs/apcupsd/template diff --git a/srcpkgs/apcupsd/files/apcupsd/run b/srcpkgs/apcupsd/files/apcupsd/run new file mode 100644 index 00000000000..2c0b807da28 --- /dev/null +++ b/srcpkgs/apcupsd/files/apcupsd/run @@ -0,0 +1,3 @@ +#!/bin/sh +[ -r conf] && . ./conf +exec apcupsd -b ${OPTS} diff --git a/srcpkgs/apcupsd/template b/srcpkgs/apcupsd/template new file mode 100644 index 00000000000..ba1394b2d9d --- /dev/null +++ b/srcpkgs/apcupsd/template @@ -0,0 +1,40 @@ +# Template file for 'apcupsd' +pkgname=apcupsd +version=3.14.14 +revision=1 +build_style=gnu-configure +configure_args=" + --disable-install-distdir + --enable-modbus-usb + --enable-usb + --sysconfdir=/etc/apcupsd + --with-dev= + --with-halpolicydir= + --with-pwrfail-dir=/etc/apcupsd + --with-upscable=usb + --with-upstype=usb" +hostmakedepends="autoconf automake pkg-config" +makedepends="libusb-compat-devel net-snmp-devel" +depends="libusb-compat net-snmp nullmailer" +conf_files="/etc/apcupsd/*" +short_desc="APC UPS daemon with integrated tcp/ip remote shutdown" +maintainer="Bas Ploeger " +license="GPL-2.0-only" +homepage="http://www.apcupsd.org/" +distfiles="${SOURCEFORGE_SITE}/apcupsd/apcupsd-${version}.tar.gz" +checksum="db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867" + +# Avoid passing an invalid arg 'strip' to the install command for the binaries. +make_install_args="STRIP=" + +pre_configure() { + export SHUTDOWN=/usr/bin/shutdown + export WALL=/usr/bin/wall + export APCUPSD_MAIL=/usr/bin/mail +} + +post_install() { + # This binary is not needed and conflicts with a binary from an other package. + rm ${DESTDIR}/usr/bin/smtp + vsv apcupsd +} From 13af71e16e7e18307a4574b091b176b61e6cd364 Mon Sep 17 00:00:00 2001 From: Brihadeesh S Date: Mon, 2 May 2022 17:02:32 +0530 Subject: [PATCH 1718/2369] New package: paleta-1.0.2 --- srcpkgs/paleta/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/paleta/template diff --git a/srcpkgs/paleta/template b/srcpkgs/paleta/template new file mode 100644 index 00000000000..f61a1c05dcb --- /dev/null +++ b/srcpkgs/paleta/template @@ -0,0 +1,19 @@ +# Template file for 'paleta' +pkgname=paleta +version=1.0.2 +revision=1 +build_style=gnu-makefile +short_desc="Change terminal colors on-the-fly independent of terminal emulator" +maintainer="Brihadeesh " +license="MIT" +homepage="https://github.com/dylanaraps/paleta" +distfiles="https://github.com/dylanaraps/paleta/archive/${version}.tar.gz" +checksum=b6a44653266598cd4e027703b0b06acb3a753f632abf87ea30732d139cf1bd16 + +post_install() { + # copying palettes provided to package files + vmkdir /usr/share/paleta + vcopy palettes /usr/share/paleta/ + + vlicense LICENSE +} From 22091951353695cac3b16d5513a4818a1a2cda30 Mon Sep 17 00:00:00 2001 From: ologantr Date: Thu, 5 May 2022 17:15:34 +0200 Subject: [PATCH 1719/2369] sqlite: update to 3.38.4. --- srcpkgs/sqlite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index 17f75a5f22a..956daec63b5 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,6 +1,6 @@ # Template file for 'sqlite' pkgname=sqlite -version=3.38.3 +version=3.38.4 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=61f2dd93a2e38c33468b7125967c3218bf9f4dd8365def6025e314f905dc942e +checksum=1935751066c2fd447404caa78cfb8b2b701fad3f6b1cf40b3d658440f6cc7563 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \ From ee6ab7000122d6840c62292e0d0e9639f699f045 Mon Sep 17 00:00:00 2001 From: Omar Zeghouani Date: Fri, 6 May 2022 01:05:17 +0100 Subject: [PATCH 1720/2369] nnn: update to 4.5. --- srcpkgs/nnn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template index ac5827f0e9a..d8d3d2f5708 100644 --- a/srcpkgs/nnn/template +++ b/srcpkgs/nnn/template @@ -1,6 +1,6 @@ # Template file for 'nnn' pkgname=nnn -version=4.4 +version=4.5 revision=1 build_style=gnu-makefile make_install_target="install install-desktop" @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://github.com/jarun/nnn" changelog="https://raw.githubusercontent.com/jarun/nnn/master/CHANGELOG" distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz" -checksum=e04a3f0f0c2af1e18cb6f005d18267c7703644274d21bb93f03b30e4fd3d1653 +checksum=fadc15bd6d4400c06e5ccc47845b42e60774f368570e475bd882767ee18749aa if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-fts-devel" From e629eb0efc44857f5b8bfd487b7f7f64817b1e8b 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, 6 May 2022 18:11:09 +0700 Subject: [PATCH 1721/2369] Revert "git: update to 2.36.0." This reverts commit 0a0487fc3090b5b96e507f4ee2019293f95dd0b3. See: https://lore.kernel.org/git/xmqqlevfdbiq.fsf@gitster.g/ --- srcpkgs/git/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index e45663f9ff9..dc2146690ab 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,7 +1,8 @@ # Template file for 'git' pkgname=git -version=2.36.0 -revision=1 +reverts="2.36.0_1" +version=2.35.3 +revision=2 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto" makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel" # Required by https:// @@ -14,7 +15,7 @@ license="GPL-2.0-only" homepage="https://git-scm.com/" changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=af5ebfc1658464f5d0d45a2bfd884c935fb607a10cc021d95bc80778861cc1d3 +checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2 replaces="git-perl>=0" register_shell=/usr/bin/git-shell python_version=3 From 9aaa534ecf23c4f998f97fcaf838254d4d19ef94 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 5 May 2022 20:01:45 +0200 Subject: [PATCH 1722/2369] z3: update to 4.8.17. --- srcpkgs/z3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index d322211cbd9..598d15032a9 100644 --- a/srcpkgs/z3/template +++ b/srcpkgs/z3/template @@ -1,6 +1,6 @@ # Template file for 'z3' pkgname=z3 -version=4.8.16 +version=4.8.17 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=75f95e09f3f35fef746e571d5ec88a4efba27f1bc8f1a0ef1117167486ec3dc6 +checksum=1e57637ce8d5212fd38453df28e2730a18e0a633f723682267be87f5b858a126 build_options="ocaml" desc_option_ocaml="Enable support for OCaml bindings" From ced155bd6e0b69266cdfa3199f11013e1a73a920 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 6 May 2022 17:41:04 +0200 Subject: [PATCH 1723/2369] ecm: update to 7.0.5. --- srcpkgs/ecm/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/ecm/template b/srcpkgs/ecm/template index 6750b25dbec..496636f06ce 100644 --- a/srcpkgs/ecm/template +++ b/srcpkgs/ecm/template @@ -1,7 +1,7 @@ # Template file for 'ecm' pkgname=ecm -version=7.0.4 -revision=3 +version=7.0.5 +revision=1 build_style=gnu-configure configure_args="--enable-shared --enable-openmp" hostmakedepends="m4" @@ -10,8 +10,8 @@ short_desc="Elliptic Curve Method for Integer Factorization" maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="https://gitlab.inria.fr/zimmerma/ecm" -distfiles="https://gitlab.inria.fr/zimmerma/ecm/uploads/00c4c691a1ef8605b65bdf794a71539d/ecm-${version}.tar.gz" -checksum=0cf7b3eee8462cc6f98b418b47630e1eb6b3f4f8c3fc1fb005b08e2a1811ba43 +distfiles="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc922004e4b2/ecm-${version}.tar.gz" +checksum=c721dd22e557c4a5dac9ac7e156a400cd2298812dd1f9b56e89966de01471ba8 # ppc64 asm only provided for BE and ELFv1, we're ELFv2 for BE and LE case "$XBPS_TARGET_MACHINE" in From 121347fa682a499abb4c84b2c3e054eebadaa6c3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 6 May 2022 17:42:14 +0200 Subject: [PATCH 1724/2369] pgn-extract: update to 22.07. --- srcpkgs/pgn-extract/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pgn-extract/template b/srcpkgs/pgn-extract/template index 1b0d78af839..387cb780303 100644 --- a/srcpkgs/pgn-extract/template +++ b/srcpkgs/pgn-extract/template @@ -1,6 +1,6 @@ # Template file for 'pgn-extract' pkgname=pgn-extract -version=22.05 +version=22.07 revision=1 wrksrc="pgn-extract" build_style=gnu-makefile @@ -11,7 +11,7 @@ license="GPL-3.0-or-later" homepage="https://www.cs.kent.ac.uk/people/staff/djb/pgn-extract/" changelog="https://www.cs.kent.ac.uk/people/staff/djb/pgn-extract/changes.html" distfiles="https://www.cs.kent.ac.uk/~djb/pgn-extract/pgn-extract-${version/./-}.tgz" -checksum=73bbc4e011cc3a92330c0e0f8a6783a1c61b1a2c93165b3090b44a34980be40a +checksum=51dda2d8cca7a6390c82d7f928263e3885b4ab62eb7e16a4431877af903ea7a6 post_extract() { sed -i '/^CC=/d' Makefile From 8ef10e31b4e611dc915e7d157e82fc7829bdf8cd Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 18 Mar 2022 17:30:11 +0200 Subject: [PATCH 1725/2369] opera: update to 86.0.4363.50. --- srcpkgs/opera/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index f3965df0408..1be0482067b 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=84.0.4316.31 +version=86.0.4363.50 revision=1 archs="x86_64" create_wrksrc=yes @@ -10,8 +10,8 @@ short_desc="Fast, secure, easy to use browser" maintainer="mobinmob " license="custom:Proprietary" homepage="https://www.opera.com/computer" -distfiles="https://rpm.opera.com/rpm/opera_stable-${version}-linux-release-x64-signed.rpm" -checksum=6ae3c4ff44a4ae627724a8df3fcb2d5663ca8677a5eb62b5354b99fe21688608 +distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm" +checksum=94b73abd6e1d2a710ddbd437e11a1702d487cc9497258b90a131332123ce28a5 repository="nonfree" nostrip=yes @@ -27,7 +27,6 @@ do_install() { # Link executable in path ln -s ../lib/opera/opera "${DESTDIR}/usr/bin/opera" - # Install licenses - vlicense usr/lib64/opera/resources/eula_desktop_eea.txt - vlicense usr/lib64/opera/resources/eula_desktop_row.txt + # Install 3rd-party licenses + vlicense usr/lib64/opera/opera_autoupdate.licenses } From a18826f69e230883ab8e1c31f5bdbf054595dcd6 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 6 May 2022 17:17:06 -0500 Subject: [PATCH 1726/2369] nvidia390: update homepage --- srcpkgs/nvidia390/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template index c44d128eb27..903c74f394f 100644 --- a/srcpkgs/nvidia390/template +++ b/srcpkgs/nvidia390/template @@ -7,7 +7,7 @@ version=390.147 revision=2 maintainer="Andrew Benson " license="custom:NVIDIA Proprietary" -homepage="https://www.nvidia.com" +homepage="https://www.nvidia.com/en-us/drivers/unix/" archs="i686 x86_64" nopie=yes From 02cfc643a8f4540c8139f5011f51bcfa9e265b9e Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 6 May 2022 17:17:21 -0500 Subject: [PATCH 1727/2369] nvidia390: fix update check --- srcpkgs/nvidia390/update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nvidia390/update b/srcpkgs/nvidia390/update index b74fe6d69aa..0a48e18e115 100644 --- a/srcpkgs/nvidia390/update +++ b/srcpkgs/nvidia390/update @@ -1,2 +1,2 @@ -site="http://www.nvidia.com/object/unix.html" -pattern='390.+>\K[\d.]+(?=)' +site='https://forums.developer.nvidia.com/t/current-graphics-driver-releases/28500' +pattern='\K390[\d.]+(?=)' From a71ce3cb3921c7d27237cf26ea491fcf8e886871 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 6 May 2022 15:29:46 -0500 Subject: [PATCH 1728/2369] nvidia470: update homepage --- srcpkgs/nvidia470/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template index 20b23dfd4dc..d746210cc92 100644 --- a/srcpkgs/nvidia470/template +++ b/srcpkgs/nvidia470/template @@ -7,7 +7,7 @@ version=470.103.01 revision=3 maintainer="Andrew Benson " license="custom:NVIDIA Proprietary" -homepage="https://www.nvidia.com" +homepage="https://www.nvidia.com/en-us/drivers/unix/" archs="x86_64" nopie=yes From b95d5f8efee9bbafd5fd68834264d8a8b75441a3 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 6 May 2022 15:29:57 -0500 Subject: [PATCH 1729/2369] nvidia470: fix update check --- srcpkgs/nvidia470/update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nvidia470/update b/srcpkgs/nvidia470/update index d33b1d9a141..e0f201851c7 100644 --- a/srcpkgs/nvidia470/update +++ b/srcpkgs/nvidia470/update @@ -1,2 +1,2 @@ -site="http://www.nvidia.com/object/unix.html" -pattern='Branch Version.+>\K[\d.]+(?=)' +site='https://forums.developer.nvidia.com/t/current-graphics-driver-releases/28500' +pattern='\K470[\d.]+(?=)' From 803c6a390970c1b4feb9b23e598e2ac9961c36dd Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 6 May 2022 15:30:11 -0500 Subject: [PATCH 1730/2369] nvidia: update homepage --- srcpkgs/nvidia/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index 1ff0e8dbc33..94482a9de0e 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -7,7 +7,7 @@ version=510.60.02 revision=2 maintainer="Andrew Benson " license="custom:NVIDIA Proprietary" -homepage="https://www.nvidia.com" +homepage="https://www.nvidia.com/en-us/drivers/unix/" archs="x86_64" nopie=yes From e100553e76bb4b637d86437f5891cf3cb3b3f8e8 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 6 May 2022 17:23:41 -0500 Subject: [PATCH 1731/2369] nvidia: fix update check --- srcpkgs/nvidia/update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nvidia/update b/srcpkgs/nvidia/update index d33b1d9a141..c6ae1d281ec 100644 --- a/srcpkgs/nvidia/update +++ b/srcpkgs/nvidia/update @@ -1,2 +1,2 @@ -site="http://www.nvidia.com/object/unix.html" -pattern='Branch Version.+>\K[\d.]+(?=)' +site="https://forums.developer.nvidia.com/t/current-graphics-driver-releases/28500" +pattern='Current production branch release: \K[\d.]+(?= \(x86)' From 8dd65d2c158b415644ff35cc4dba2a63ef6331ae Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 6 May 2022 00:05:05 +0300 Subject: [PATCH 1732/2369] htop: update to 3.2.0. --- srcpkgs/htop/template | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template index 3b3cd7ade73..4edcd93cf2e 100644 --- a/srcpkgs/htop/template +++ b/srcpkgs/htop/template @@ -1,21 +1,14 @@ # Template file for 'htop' pkgname=htop -version=3.1.2 +version=3.2.0 revision=1 build_style=gnu-configure configure_args="--enable-unicode --enable-sensors" -hostmakedepends="automake" makedepends="ncurses-devel libsensors-devel" short_desc="Interactive process viewer" maintainer="Frank Steinborn " license="GPL-2.0-only" homepage="https://htop.dev/" -changelog="https://github.com/htop-dev/htop/blob/master/ChangeLog" -distfiles="https://github.com/htop-dev/htop/archive/${version}.tar.gz" -checksum=fe9559637c8f21f5fd531a4c072048a404173806acbdad1359c6b82fd87aa001 - -CFLAGS="-fcommon" - -pre_configure() { - ./autogen.sh -} +changelog="https://raw.githubusercontent.com/htop-dev/htop/main/ChangeLog" +distfiles="https://github.com/htop-dev/htop/releases/download/${version}/htop-${version}.tar.xz" +checksum=e0f645d4ac324f2c4c48aaa7a3a96d007b95516559550be0b56e423fc5b6d783 From b2cd0100bc334b9a542a028fcfd823247c083c7c Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 5 May 2022 11:41:49 -0400 Subject: [PATCH 1733/2369] freeplane: update to 1.9.14, hard-code jdk11 --- srcpkgs/freeplane/patches/jdk11-default.patch | 15 +++++++++++++++ srcpkgs/freeplane/template | 11 +++++------ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/freeplane/patches/jdk11-default.patch diff --git a/srcpkgs/freeplane/patches/jdk11-default.patch b/srcpkgs/freeplane/patches/jdk11-default.patch new file mode 100644 index 00000000000..2f27d35af84 --- /dev/null +++ b/srcpkgs/freeplane/patches/jdk11-default.patch @@ -0,0 +1,15 @@ +freeplane does not work with jdk17, so set jdk11 as the default. +This can be overridden by the upstream-created method still. + +--- a/freeplane_framework/script/freeplane.sh ++++ b/freeplane_framework/script/freeplane.sh +@@ -5,6 +5,9 @@ + set -x + fi + ++# set openjdk11 as the default, regardless of xbps-alternatives ++[ -z "$FREEPLANE_JAVA_HOME" ] && FREEPLANE_JAVA_HOME=/usr/lib/jvm/openjdk11 ++ + ########## FUNCTIONS DEFINITIONS ####################################### + + _debug() { diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template index 67a233224e9..1c65ce682b3 100644 --- a/srcpkgs/freeplane/template +++ b/srcpkgs/freeplane/template @@ -1,17 +1,16 @@ # Template file for 'freeplane' pkgname=freeplane -version=1.9.12 -revision=2 +version=1.9.14 +revision=1 wrksrc="freeplane-release-${version}" -hostmakedepends="apache-ant openjdk8 unzip gradle" -depends="virtual?java-runtime" +hostmakedepends="apache-ant openjdk11 unzip gradle" +depends="openjdk11-jre" short_desc="Application for Mind Mapping, Knowledge Management, Project Management" maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later" homepage="http://freeplane.sourceforge.net/" distfiles="https://github.com/freeplane/freeplane/archive/release-${version}.tar.gz" -checksum=200002b5cbe3e3286a7595847d28356d3efd8498ff930fa05e5e90af622e544f -broken="https://build.voidlinux.org/builders/x86_64_builder/builds/37505/steps/shell_3/logs/stdio" +checksum=8c463c997675b0e351724673e9ca6357f4ef47bd9df0c49b73645090fb19cd7f make_dirs=" /usr/share/freeplane/fwdir/condperm/ 755 root root From 08f3bffff585bd437cb28c4eab918c2ea2a0dbad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Fri, 6 May 2022 15:56:55 +0200 Subject: [PATCH 1734/2369] doctl: update to 1.74.0. --- srcpkgs/doctl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template index 23fbb957a0b..81d5feb1d6e 100644 --- a/srcpkgs/doctl/template +++ b/srcpkgs/doctl/template @@ -1,6 +1,6 @@ # Template file for 'doctl' pkgname=doctl -version=1.73.1 +version=1.74.0 revision=1 build_style=go go_import_path="github.com/digitalocean/doctl/cmd/doctl" @@ -14,4 +14,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=cada668df915bf4eaa7ef271ab0920002b2bc7f9b6b3cbd8598481646c52d4e8 +checksum=3b0fcd2daff4cdce575f7a833a36c3a63a66c0dbb9af50baafe3ec9fe02c3872 From 9a96eac082832058ea45c0b97c3187f1a6e8c787 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Fri, 6 May 2022 21:37:38 -0400 Subject: [PATCH 1735/2369] just: update to 1.1.3. --- srcpkgs/just/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/just/template b/srcpkgs/just/template index f3857ec4f01..eecc1f7890c 100644 --- a/srcpkgs/just/template +++ b/srcpkgs/just/template @@ -1,6 +1,6 @@ # Template file for 'just' pkgname=just -version=1.1.2 +version=1.1.3 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=5f04ce85dc2de7609d68c336a7c51f477f8ff079d8b209a0d72183615e3f1e55 +checksum=571f35b2b08d0e0617028854a8c2781b822544c58b8a081f4fc795a779c80878 make_check=ci-skip # test fails when run as root # Fix failing test From 0bd2285c14222da56711aae4ee3be3cade9e904a Mon Sep 17 00:00:00 2001 From: Imran Khan Date: Fri, 6 May 2022 22:32:16 +0600 Subject: [PATCH 1736/2369] fselect: update to 0.8.0. --- srcpkgs/fselect/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template index bdb1a6071b0..5c35c5be539 100644 --- a/srcpkgs/fselect/template +++ b/srcpkgs/fselect/template @@ -1,6 +1,6 @@ # Template file for 'fselect' pkgname=fselect -version=0.7.7 +version=0.8.0 revision=1 build_style=cargo short_desc="Find files with SQL-like queries" @@ -8,7 +8,7 @@ maintainer="SolitudeSF " license="Apache-2.0, MIT" homepage="https://github.com/jhspetersson/fselect" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=0dc6749a0c15a79639a183d44be630f59c7ce7c1af5a835fe0fd31c0eab4a653 +checksum=33dfcbbf7e598bce479b1fb5c17429af1bb309beab2e4bc95642e9f4b5c2ffbd post_install() { vlicense LICENSE-MIT From 7fab22cd54726d5b9739efc8729d5018c6a779a1 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Thu, 5 May 2022 17:05:48 +0200 Subject: [PATCH 1737/2369] master-pdf-editor: update to 5.8.52. --- srcpkgs/master-pdf-editor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template index 49f1604d8a0..8ffcc363e6d 100644 --- a/srcpkgs/master-pdf-editor/template +++ b/srcpkgs/master-pdf-editor/template @@ -1,6 +1,6 @@ # Template file for 'master-pdf-editor' pkgname=master-pdf-editor -version=5.8.33 +version=5.8.52 revision=1 archs="x86_64" wrksrc="master-pdf-editor-5" @@ -10,7 +10,7 @@ maintainer="Giuseppe Fierro " license="custom:Proprietary" homepage="https://code-industry.net/free-pdf-editor/" distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz" -checksum=b202c5fcda5a36590be6203597b43332260ac1170c0eed831dd4c869e1ceb5f2 +checksum=dba3e36371c897ebd463e59366d37a77c091f59fb1a73d7b58eb0213c2bff3e7 nostrip=yes repository=nonfree restricted=yes From c6c6bdd0a588fceddf91d47e5684ef7b3df2dd5c Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Thu, 5 May 2022 10:45:59 +0200 Subject: [PATCH 1738/2369] google-chrome: update to 101.0.4951.54 --- 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 c6614dbcd27..94cd9a30ad4 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,6 +1,6 @@ # Template file for 'google-chrome' pkgname=google-chrome -version=101.0.4951.41 +version=101.0.4951.54 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=78d24e94017eb94ab771d49bcd4dd0684f86ca05bc40250fe3151040aefedf8a +checksum=bedc9782f008645c3bcda9edbeeabf52ef15ed1d736a697819e56f2e5c37dad4 do_extract() { mkdir -p ${DESTDIR} From 451333232ece4cf4d75bd6570ba908a2f2742a70 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 7 May 2022 09:16:28 +0200 Subject: [PATCH 1739/2369] alkimia: update to 8.1.1. --- srcpkgs/alkimia/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/alkimia/template b/srcpkgs/alkimia/template index 5b385025413..b8f46d0139d 100644 --- a/srcpkgs/alkimia/template +++ b/srcpkgs/alkimia/template @@ -1,12 +1,12 @@ # Template file for 'alkimia' pkgname=alkimia -version=8.1.0 +version=8.1.1 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson -DSHARE_INSTALL_DIR=/usr/share -DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools - kcoreaddons gettext" + kcoreaddons gettext kpackage" makedepends="qt5-devel gmp-devel gmpxx-devel qt5-webkit-devel qt5-declarative-devel kconfig-devel kcoreaddons-devel kdelibs4support-devel kpackage-devel plasma-framework-devel knewstuff-devel" @@ -15,7 +15,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://www.linux-apps.com/content/show.php/libalkimia?content=137323" distfiles="${KDE_SITE}/alkimia/${version}/alkimia-${version}.tar.xz" -checksum=916807352707b0490cdd9ca65682eff73b00ca523029bda6fe7a2749a1bc927c +checksum=957adc63c0be54dd433e3268a37323be5456e5ab84ece27f73a1616a92db86d5 libalkimia-devel_package() { short_desc+=" - development files" From 6ad1aaecca1881512a493e353b4e4af3dc4143a8 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 7 May 2022 09:26:50 +0200 Subject: [PATCH 1740/2369] libvirt: update to 8.3.0. --- srcpkgs/libvirt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index e73c337822e..e6af657a3b8 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,6 +1,6 @@ # Template file for 'libvirt' pkgname=libvirt -version=8.2.0 +version=8.3.0 revision=1 build_style=meson configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run @@ -20,7 +20,7 @@ license="LGPL-2.1-or-later" homepage="https://libvirt.org" changelog="https://libvirt.org/news.html" distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz" -checksum=0ecd9c7dd52db7a2d124155ffa5e11de2fbd05014eceffbd1972b022d21becba +checksum=be229b9ad1d48be7007e7bf341fc990c65e24aea624c16db6b36d02c820df5eb # At least one test times out on CI but works locally make_check=ci-skip From e14c4a08131bd4c4d6d6e6e0cbd2c0667a3108a7 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 7 May 2022 09:29:31 +0200 Subject: [PATCH 1741/2369] libvirt-python3: update to 8.3.0. --- srcpkgs/libvirt-python3/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template index 2aea5df86fe..e9d77cf4359 100644 --- a/srcpkgs/libvirt-python3/template +++ b/srcpkgs/libvirt-python3/template @@ -1,10 +1,11 @@ # Template file for 'libvirt-python3' pkgname=libvirt-python3 -version=8.2.0 +version=8.3.0 revision=1 wrksrc="libvirt-python-${version}" build_style=python3-module -hostmakedepends="pkg-config python3-devel libvirt-devel libapparmor-devel" +hostmakedepends="pkg-config python3-devel python3-setuptools libvirt-devel + libapparmor-devel" makedepends="libvirt-devel python3-devel" checkdepends="python3-pytest python3-lxml python3-nose" short_desc="Libvirt virtualization API Python3 binding" @@ -12,7 +13,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://pypi.org/project/libvirt-python/" distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz" -checksum=f8b8cea67ff0d64d63029cc3410a4656e04ee9f26837a856bc0c287da55d053a +checksum=e936ff747c1d72b6618eebb7236ae69c255ca9e0de6e4153d95d8b9c6b2ecfc1 do_check() { PYTHONPATH="$(cd build/lib.* && pwd)" pytest From 20fdd66a1c42ce62645db9f154bc758082946760 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 7 May 2022 09:41:52 +0200 Subject: [PATCH 1742/2369] linux4.19: update to 4.19.241. --- srcpkgs/linux4.19/files/i386-dotconfig | 5 ++--- srcpkgs/linux4.19/files/ppc-dotconfig | 4 ++-- srcpkgs/linux4.19/files/ppc64-dotconfig | 5 ++--- srcpkgs/linux4.19/files/ppc64le-dotconfig | 5 ++--- srcpkgs/linux4.19/files/x86_64-dotconfig | 5 ++--- srcpkgs/linux4.19/template | 4 ++-- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/srcpkgs/linux4.19/files/i386-dotconfig b/srcpkgs/linux4.19/files/i386-dotconfig index 3a63fc47087..4552d18061c 100644 --- a/srcpkgs/linux4.19/files/i386-dotconfig +++ b/srcpkgs/linux4.19/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 4.19.230 Kernel Configuration +# Linux/i386 4.19.241 Kernel Configuration # # @@ -2003,6 +2003,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3237,8 +3238,6 @@ CONFIG_HYPERV_NET=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig index c58c80497ac..b5025b4536c 100644 --- a/srcpkgs/linux4.19/files/ppc-dotconfig +++ b/srcpkgs/linux4.19/files/ppc-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.19.230 Kernel Configuration +# Linux/powerpc 4.19.241 Kernel Configuration # # @@ -1649,6 +1649,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_MAC_FLOPPY=y CONFIG_CDROM=m # CONFIG_PARIDE is not set @@ -2931,7 +2932,6 @@ CONFIG_MISDN_W6692=m # CONFIG_MISDN_NETJET is not set CONFIG_MISDN_IPAC=m CONFIG_MISDN_ISAR=m -# CONFIG_NVM is not set # # Input device support diff --git a/srcpkgs/linux4.19/files/ppc64-dotconfig b/srcpkgs/linux4.19/files/ppc64-dotconfig index ad7f89793ef..ca44b106df4 100644 --- a/srcpkgs/linux4.19/files/ppc64-dotconfig +++ b/srcpkgs/linux4.19/files/ppc64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.19.230 Kernel Configuration +# Linux/powerpc 4.19.241 Kernel Configuration # # @@ -2018,6 +2018,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3317,8 +3318,6 @@ CONFIG_IEEE802154_HWSIM=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support diff --git a/srcpkgs/linux4.19/files/ppc64le-dotconfig b/srcpkgs/linux4.19/files/ppc64le-dotconfig index 195a7ef89b4..0c14831463a 100644 --- a/srcpkgs/linux4.19/files/ppc64le-dotconfig +++ b/srcpkgs/linux4.19/files/ppc64le-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.19.230 Kernel Configuration +# Linux/powerpc 4.19.241 Kernel Configuration # # @@ -1929,6 +1929,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3171,8 +3172,6 @@ CONFIG_IEEE802154_HWSIM=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support diff --git a/srcpkgs/linux4.19/files/x86_64-dotconfig b/srcpkgs/linux4.19/files/x86_64-dotconfig index 43c483127f5..0bcdb8d876c 100644 --- a/srcpkgs/linux4.19/files/x86_64-dotconfig +++ b/srcpkgs/linux4.19/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.230 Kernel Configuration +# Linux/x86_64 4.19.241 Kernel Configuration # # @@ -2053,6 +2053,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3308,8 +3309,6 @@ CONFIG_HYPERV_NET=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template index 725d28a4a21..d58249cf182 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.240 +version=4.19.241 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=72ac1fd5bdf9b1d0a6da1237692a0570028cb994e750f99992d374eb9fdd46c2 +checksum=4c6269d3c14e593151b035a55227110e632642d848032ef6992135c18488fe13 python_version=3 nodebug=yes # -dbg package is generated below manually From 5cfac90cbc47188a64699b25bace6865eeceaeb1 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 7 May 2022 10:26:17 +0200 Subject: [PATCH 1743/2369] wine: update to 7.8. --- srcpkgs/wine/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index b08032957c4..6fa72d3b0d6 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=7.7 +version=7.8 revision=1 _pkgver=${version/r/-r} create_wrksrc=yes @@ -13,8 +13,8 @@ license="LGPL-2.1-or-later" homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz" -checksum="52a4d06ba77080df4a4b022bf9c2cc05cfa1d79bd4bb08c6b88f7c3ae09d1464 - 9a8c18196ea346cdce84bd87693e911ecb505c1324b85bdbf60b115f8c487ab7" +checksum="8f76e9c96b50f2ac8e24e5deedfa3e0d9596a5706709226f65a94c6a160019b8 + 2561142889a700534b1d710d000cd6d819b9ed23c55b0f66b5af878b4a29a587" build_options="mingw staging xshm" build_options_default="mingw xshm" From d4a7ba3c33dc9126977eee2dcfae45b04f7eb3f1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 7 May 2022 11:36:48 +0200 Subject: [PATCH 1744/2369] libfido2: update to 1.11.0. --- srcpkgs/libfido2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template index b1ac557296c..85f27e57bfa 100644 --- a/srcpkgs/libfido2/template +++ b/srcpkgs/libfido2/template @@ -1,6 +1,6 @@ # Template file for 'libfido2' pkgname=libfido2 -version=1.10.0 +version=1.11.0 revision=1 build_style=cmake configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="BSD-2-Clause" homepage="https://github.com/Yubico/libfido2" distfiles="https://github.com/Yubico/libfido2/archive/${version}.tar.gz" -checksum=526efd3d56af706c05d09f3d21f18ee3b0b15ac0c1f5c5da1acbc27c2730b99b +checksum=0830c5853e3b44099a97166e0cec54a65b54b7faaac07071872f77b8e4d7b302 # udev rules used to be shipped by libu2f-host conf_files="/usr/lib/udev/rules.d/70-u2f.rules" conflicts="libu2f-host<=1.1.10_3" From 13123f5cd4d4602ba9b544e17dea9acb13e4a899 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 7 May 2022 11:37:50 +0200 Subject: [PATCH 1745/2369] carton: update to 1.0.35. --- srcpkgs/carton/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/carton/template b/srcpkgs/carton/template index 4ae5b32d16e..27d38371292 100644 --- a/srcpkgs/carton/template +++ b/srcpkgs/carton/template @@ -1,7 +1,7 @@ # Template file for 'carton' pkgname=carton -version=1.0.34 -revision=2 +version=1.0.35 +revision=1 wrksrc="Carton-v${version}" build_style=perl-module hostmakedepends="perl perl-Class-Tiny perl-JSON perl-Menlo-Legacy @@ -13,4 +13,4 @@ maintainer="Leah Neukirchen " homepage="https://metacpan.org/release/Carton" license="Artistic-1.0-Perl, GPL-1.0-or-later" distfiles="${CPAN_SITE}/XML/MIYAGAWA/Carton-v${version}.tar.gz" -checksum=77d42b92732bcfc18a59d341e56ce476205b1c4d380eab3a07224f5745c23e45 +checksum=9c4558ca97cd08b69fdfb52b28c3ddc2043ef52f0627b90e53d05a4087344175 From 38654e074289218051379413c1ea3aa2054375fe Mon Sep 17 00:00:00 2001 From: ologantr Date: Sat, 7 May 2022 14:17:27 +0200 Subject: [PATCH 1746/2369] sqlite: update to 3.38.5. --- srcpkgs/sqlite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index 956daec63b5..5ca279068b5 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,6 +1,6 @@ # Template file for 'sqlite' pkgname=sqlite -version=3.38.4 +version=3.38.5 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=1935751066c2fd447404caa78cfb8b2b701fad3f6b1cf40b3d658440f6cc7563 +checksum=5af07de982ba658fd91a03170c945f99c971f6955bc79df3266544373e39869c CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \ From 65c0dd452fc17c910a904485f9e77b220624d79a Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 6 May 2022 22:51:24 +0300 Subject: [PATCH 1747/2369] New package: s6-portable-utils-man-pages-2.2.4.0.1 --- srcpkgs/s6-portable-utils-man-pages/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/s6-portable-utils-man-pages/template diff --git a/srcpkgs/s6-portable-utils-man-pages/template b/srcpkgs/s6-portable-utils-man-pages/template new file mode 100644 index 00000000000..b040275bc53 --- /dev/null +++ b/srcpkgs/s6-portable-utils-man-pages/template @@ -0,0 +1,16 @@ +# Template file for 's6-portable-utils-man-pages' +pkgname=s6-portable-utils-man-pages +version=2.2.4.0.1 +revision=1 +build_style=gnu-makefile +hostmakedepends="mdocml" +short_desc="Documentation for s6-portable-utils in mdoc(7) format" +maintainer="mobinmob " +license="ISC" +homepage="https://github.com/flexibeast/s6-portable-utils-man-pages" +distfiles="https://github.com/flexibeast/s6-portable-utils-man-pages/archive/refs/tags/v${version}.tar.gz" +checksum=c5d7cd6ed2d9c91f92784e5d6dd80161e6a5195b4b90477083e07ba424eb6720 + +post_install() { + vlicense LICENSE +} From 0312c00bc79ceadd7a1e272cfa26d8a872536798 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 6 May 2022 22:43:39 +0300 Subject: [PATCH 1748/2369] execline-man-pages: update to 2.8.3.0.2. --- srcpkgs/execline-man-pages/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/execline-man-pages/template b/srcpkgs/execline-man-pages/template index fb3a1885cae..3bebd8f3ba1 100644 --- a/srcpkgs/execline-man-pages/template +++ b/srcpkgs/execline-man-pages/template @@ -1,6 +1,6 @@ # Template file for 'execline-man-pages' pkgname=execline-man-pages -version=2.8.1.0.4 +version=2.8.3.0.2 revision=1 build_style=gnu-makefile hostmakedepends="mdocml" @@ -9,7 +9,7 @@ maintainer="mobinmob " license="ISC" homepage="https://github.com/flexibeast/execline-man-pages" distfiles="https://github.com/flexibeast/execline-man-pages/archive/v${version}.tar.gz" -checksum=b535b83dc840b5285a19b9ee0ac3cd739912b069b3c4f3547d8b2ef6c6bcb98b +checksum=7862c8918faa3e82ff0a65b5c108498a2b0b3b07b3ebfb8a7e6491890e0e84b4 post_install() { vlicense LICENSE From 59227f9c962cc42ad87c0fc3367f4cc0d8fb476a Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 6 May 2022 20:59:47 +0300 Subject: [PATCH 1749/2369] lynx: update to 2.9.0dev.10. --- srcpkgs/lynx/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template index 6ec7a39b4e7..4266c099e15 100644 --- a/srcpkgs/lynx/template +++ b/srcpkgs/lynx/template @@ -1,17 +1,17 @@ # Template file for 'lynx' pkgname=lynx -version=2.9.0dev.9 +version=2.9.0dev.10 revision=1 wrksrc="lynx${version}" build_style=gnu-configure configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6" makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel" -short_desc="A text browser for the World Wide Web" +short_desc="Text browser for the World Wide Web" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://lynx.invisible-island.net/" distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2" -checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a +checksum=898ac82bcfcbd4b20ea39afdf66fd659b8773c7549623b0f8802bf392a41a912 pre_configure() { sed -i configure \ From 816eb17ee19b283df34277ab382b15a78b3e1a45 Mon Sep 17 00:00:00 2001 From: Mat Boehlke Date: Tue, 3 May 2022 11:55:59 -0500 Subject: [PATCH 1750/2369] gptfdisk: update to 1.0.9. --- srcpkgs/gptfdisk/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gptfdisk/template b/srcpkgs/gptfdisk/template index c1278f5d47d..a760af49bcc 100644 --- a/srcpkgs/gptfdisk/template +++ b/srcpkgs/gptfdisk/template @@ -1,6 +1,6 @@ # Template file for 'gptfdisk' pkgname=gptfdisk -version=1.0.8 +version=1.0.9 revision=1 build_style=gnu-makefile make_check_target=test @@ -8,9 +8,9 @@ makedepends="ncurses-devel popt-devel libuuid-devel" short_desc="GPT fdisk text-mode partitioning tool" maintainer="Orphaned " license="GPL-2.0-or-later" -homepage="http://www.rodsbooks.com/gdisk/" +homepage="https://www.rodsbooks.com/gdisk/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df +checksum=dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2 pre_build() { vsed -i 's###' gptcurses.cc From 201a1c0f40a1f715ae043d527f2b3b5bf6e8c159 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 6 May 2022 18:21:38 +0300 Subject: [PATCH 1751/2369] mupdf: update to 1.19.1. I also switched from a `tar.gz` tarball to a `tar.xz` one since it's smaller in size (87 MB vs 62 MB). --- srcpkgs/mupdf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template index c6331d12035..93286959c40 100644 --- a/srcpkgs/mupdf/template +++ b/srcpkgs/mupdf/template @@ -1,6 +1,6 @@ # Template file for 'mupdf' pkgname=mupdf -version=1.19.0 +version=1.19.1 revision=1 wrksrc="${pkgname}-${version}-source" hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel @@ -14,8 +14,8 @@ short_desc="Lightweight PDF and XPS viewer" maintainer="Enno Boland " license="AGPL-3.0-only" homepage="https://mupdf.com" -distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.gz" -checksum=21affcd4fcabf1cc7a896db95ba971552ba9df229ebec7720313a8803185deed +distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.xz" +checksum=b5eac663fe74f33c430eda342f655cf41fa73d71610f0884768a856a82e3803e pre_build() { # libmupdf-{threads,pkcs7}.a are required by fbpdf From e7bb0061d4fe34f863887adb1500f332e1c8c7e2 Mon Sep 17 00:00:00 2001 From: Mat Boehlke Date: Thu, 14 Apr 2022 10:44:44 -0500 Subject: [PATCH 1752/2369] dropbear: update to 2022.82. --- srcpkgs/dropbear/patches/test-without-pip.patch | 15 +++++++++++++++ srcpkgs/dropbear/template | 12 ++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/dropbear/patches/test-without-pip.patch diff --git a/srcpkgs/dropbear/patches/test-without-pip.patch b/srcpkgs/dropbear/patches/test-without-pip.patch new file mode 100644 index 00000000000..f726be40a34 --- /dev/null +++ b/srcpkgs/dropbear/patches/test-without-pip.patch @@ -0,0 +1,15 @@ +diff --git a/test/Makefile.in b/test/Makefile.in +index b2c8d43..5747310 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -13,9 +13,7 @@ one: venv/bin/pytest fakekey + fakekey: + ../dropbearkey -t ecdsa -f $@ + +-venv/bin/pytest: $(srcdir)/requirements.txt ++venv/bin/pytest: + python3 -m venv init venv +- ./venv/bin/pip install --upgrade pip +- ./venv/bin/pip install -r $(srcdir)/requirements.txt + + .PHONY: test diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template index 69981dcfe9e..8b792314536 100644 --- a/srcpkgs/dropbear/template +++ b/srcpkgs/dropbear/template @@ -1,19 +1,27 @@ # Template file for 'dropbear' pkgname=dropbear -version=2020.81 +version=2022.82 revision=1 build_style=gnu-configure configure_args="--enable-zlib --disable-bundled-libtom" makedepends="zlib-devel libtommath-devel libtomcrypt-devel" +checkdepends="python3-pytest python3-parsing python3-psutil openssh" short_desc="Small SSH server and client" maintainer="Orphaned " license="MIT" homepage="https://matt.ucc.asn.au/dropbear/dropbear.html" changelog="https://matt.ucc.asn.au/dropbear/CHANGES" distfiles="https://matt.ucc.asn.au/${pkgname}/releases/${pkgname}-${version}.tar.bz2" -checksum=48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b +checksum=3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1 make_dirs="/etc/dropbear 0755 root root" +# These tests don't work from within xbps-src +# and probably should not be run from there +pre_check() { + rm test/test_aslr.py + rm test/test_channels.py +} + post_install() { vsv dropbear vlicense LICENSE From 5e28dfa3664d1a29af7fe54bc14d1cb801ca4d10 Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Wed, 4 May 2022 16:45:42 +0200 Subject: [PATCH 1753/2369] python3-pivy: update to 0.6.7. Closes: #36984 [via git-merge-pr] --- srcpkgs/python3-pivy/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template index 6105058d998..a442b6a94c8 100644 --- a/srcpkgs/python3-pivy/template +++ b/srcpkgs/python3-pivy/template @@ -1,7 +1,7 @@ # Template file for 'python3-pivy' pkgname=python3-pivy -version=0.6.6 -revision=3 +version=0.6.7 +revision=1 wrksrc="pivy-${version}" build_style=cmake hostmakedepends="python3-devel swig" @@ -12,7 +12,7 @@ maintainer="yopito " license="ISC" homepage="https://github.com/coin3d/pivy" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=27204574d894cc12aba5df5251770f731f326a3e7de4499e06b5f5809cc5659e +checksum=37e33d85117aac27640e011df74ddcd77f270428300df916b46ee5c50645d582 # still relevant with pivy 0.6.6 ? case "$XBPS_TARGET_MACHINE" in From 0a51b6d0e7f0c425e232df4c32623fabbc26d9a4 Mon Sep 17 00:00:00 2001 From: Caleb Heydon Date: Sat, 9 Apr 2022 16:53:19 -0400 Subject: [PATCH 1754/2369] freecad: update to 0.19.4. Closes: #36607 [via git-merge-pr] --- srcpkgs/freecad/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index a2f04bd91f1..1e2aec024fd 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad -version=0.19.2 -revision=4 +version=0.19.4 +revision=1 wrksrc="FreeCAD-${version}" build_style=cmake @@ -36,7 +36,7 @@ maintainer="yopito " license="LGPL-2.0-or-later" homepage="https://freecadweb.org/" distfiles="https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz" -checksum=47e39e3d6fcafe6e0c68923fb1b86acda16986268e5e6011694057b940139fba +checksum=e40a1c343956e13c56cc8578d025ae83d68d9d20acda1732953bc8a3883e9722 if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" libexecinfo-devel" From e9170a9fce1b070185139e93e4cfe67d26b6bbc9 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 14 Oct 2021 14:43:08 -0400 Subject: [PATCH 1755/2369] New package: activityrelay-0.2.0 --- .../activityrelay/files/activityrelay/log/run | 1 + srcpkgs/activityrelay/files/activityrelay/run | 5 +++ srcpkgs/activityrelay/template | 36 +++++++++++++++++++ srcpkgs/activityrelay/update | 2 ++ 4 files changed, 44 insertions(+) create mode 120000 srcpkgs/activityrelay/files/activityrelay/log/run create mode 100755 srcpkgs/activityrelay/files/activityrelay/run create mode 100644 srcpkgs/activityrelay/template create mode 100644 srcpkgs/activityrelay/update diff --git a/srcpkgs/activityrelay/files/activityrelay/log/run b/srcpkgs/activityrelay/files/activityrelay/log/run new file mode 120000 index 00000000000..3a5b4a58605 --- /dev/null +++ b/srcpkgs/activityrelay/files/activityrelay/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/activityrelay/files/activityrelay/run b/srcpkgs/activityrelay/files/activityrelay/run new file mode 100755 index 00000000000..2082710dd44 --- /dev/null +++ b/srcpkgs/activityrelay/files/activityrelay/run @@ -0,0 +1,5 @@ +#!/bin/sh +[ -r ./conf ] && . ./conf +exec 2>&1 +exec chpst -u _activityrelay:_activityrelay activityrelay \ + -c ${CONFIG_FILE:-/etc/activityrelay/activityrelay.yaml} diff --git a/srcpkgs/activityrelay/template b/srcpkgs/activityrelay/template new file mode 100644 index 00000000000..dc8271c846d --- /dev/null +++ b/srcpkgs/activityrelay/template @@ -0,0 +1,36 @@ +# Template file for 'activityrelay' +pkgname=activityrelay +version=0.2.0 +revision=1 +wrksrc="relay-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-aiohttp python3-cachetools python3-click python3-pycryptodome + python3-yaml" +short_desc="Generic LitePub relay (works with LitePub consumers and Mastodon)" +maintainer="Joel Beckmeyer " +license="AGPL-3.0-or-later" +homepage="https://git.pleroma.social/pleroma/relay" +distfiles="https://git.pleroma.social/pleroma/relay/-/archive/${version}/relay-${version}.tar.gz" +checksum=32db6e1084ddc5b000d45e8f5f7e098132082ea04eb538fc4927e94f49ac2a50 +make_check=no # no tests specified + +system_accounts="_activityrelay" +_activityrelay_homedir="/var/lib/activityrelay" + +make_dirs="/var/lib/activityrelay 0700 _activityrelay _activityrelay + /etc/activityrelay 0755 _activityrelay _activityrelay" + +post_patch() { + vsed -i 's,relay.jsonld,/var/lib/activityrelay/relay.jsonld,' relay.yaml.example +} + +post_install() { + vsv activityrelay + vsconf installation/relay.caddy + vsconf installation/relay.nginx + vsconf relay.yaml.example + vsconf Dockerfile + + vlicense LICENSE +} diff --git a/srcpkgs/activityrelay/update b/srcpkgs/activityrelay/update new file mode 100644 index 00000000000..2a4e4176fdc --- /dev/null +++ b/srcpkgs/activityrelay/update @@ -0,0 +1,2 @@ +site="https://git.pleroma.social/pleroma/relay/-/tags" +pkgname="relay" From 71b7bc86a924f4c2f18c76c09abb9d289465b833 Mon Sep 17 00:00:00 2001 From: Ben Jargowsky Date: Tue, 4 Jan 2022 16:11:43 -0800 Subject: [PATCH 1756/2369] New package: R-cran-RInside-0.2.16 --- common/shlibs | 16 ++++++++++++++++ srcpkgs/R-cran-RInside/template | 12 ++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 srcpkgs/R-cran-RInside/template diff --git a/common/shlibs b/common/shlibs index 353e291f59d..784375c7c9a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4153,3 +4153,19 @@ librz_bin.so.0.3.4 rizin-0.3.4_1 libaravis-0.8.so.0 libaravis-0.8.21_1 libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1 libnvme.so.1 libnvme-1.0_1 +libRInside.so R-cran-RInside-0.2.16_1 +libXrdUtils.so.3 xrootd-5.4.0_1 +libXrdCl.so.3 xrootd-5.4.0_1 +libXrdServer.so.3 xrootd-5.4.0_1 +libXrdCrypto.so.2 xrootd-5.4.0_1 +libXrdPosix.so.3 xrootd-5.4.0_1 +libXrdHttpUtils.so.2 xrootd-5.4.0_1 +libXrdSsiLib.so.2 xrootd-5.4.0_1 +libXrdCryptoLite.so.2 xrootd-5.4.0_1 +libCore.so root-6.24.06_1 +libTree.so root-6.24.06_1 +libRIO.so root-6.24.06_1 +libMatrix.so root-6.24.06_1 +libThread.so root-6.24.06_1 +libTMVA.so root-6.24.06_1 +libMathCore.so root-6.24.06_1 diff --git a/srcpkgs/R-cran-RInside/template b/srcpkgs/R-cran-RInside/template new file mode 100644 index 00000000000..9bd19d893cd --- /dev/null +++ b/srcpkgs/R-cran-RInside/template @@ -0,0 +1,12 @@ +# Template file for 'R-cran-RInside' +pkgname=R-cran-RInside +version=0.2.17 +revision=1 +build_style=R-cran +makedepends="R-cran-Rcpp" +short_desc="C++ classes to embed R in C++ (and C) applications" +maintainer="Ben Jargowsky " +license="GPL-2.0-or-later" +homepage="https://CRAN.R-project.org/package=RInside" +checksum=0be28c44ee34cba669a7264d2b99c289230645598ca78e21682559dc31824348 +shlib_provides="libRInside.so" From 0823da4eeb7d37e448a88eb398a6756d20ec261d Mon Sep 17 00:00:00 2001 From: Ben Jargowsky Date: Tue, 11 Jan 2022 12:36:46 -0800 Subject: [PATCH 1757/2369] New package: xrootd-5.4.0 --- srcpkgs/xrootd/patches/musl.patch | 227 ++++++++++++++++++++++++++++++ srcpkgs/xrootd/template | 21 +++ 2 files changed, 248 insertions(+) create mode 100644 srcpkgs/xrootd/patches/musl.patch create mode 100644 srcpkgs/xrootd/template diff --git a/srcpkgs/xrootd/patches/musl.patch b/srcpkgs/xrootd/patches/musl.patch new file mode 100644 index 00000000000..7dccd97d6c4 --- /dev/null +++ b/srcpkgs/xrootd/patches/musl.patch @@ -0,0 +1,227 @@ +diff --git a/src/Xrd/XrdConfig.hh b/src/Xrd/XrdConfig.hh +index a06ad462f..702403d82 100644 +--- a/src/Xrd/XrdConfig.hh ++++ b/src/Xrd/XrdConfig.hh +@@ -34,6 +34,11 @@ + #include "Xrd/XrdProtLoad.hh" + #include "Xrd/XrdProtocol.hh" + ++#if defined(__linux__) && !defined(__GLIBC__) ++#define __NEED_mode_t ++#include ++#endif ++ + class XrdSysError; + class XrdTcpMonInfo; + class XrdNetSecurity; +diff --git a/src/XrdAcc/XrdAccGroups.cc b/src/XrdAcc/XrdAccGroups.cc +index e663fdd35..14c3b19d6 100644 +--- a/src/XrdAcc/XrdAccGroups.cc ++++ b/src/XrdAcc/XrdAccGroups.cc +@@ -46,6 +46,14 @@ + #include "XrdAcc/XrdAccGroups.hh" + #include "XrdAcc/XrdAccPrivs.hh" + ++#if defined(__linux__) && !defined(__GLIBC__) ++int innetgr(const char *netgroup, const char *host, const char *user, ++ const char *domain) ++{ ++ return 0; ++} ++#endif ++ + // Additionally, this routine does not support a user in more than + // NGROUPS_MAX groups. This is a standard unix limit defined in limits.h. + +diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh +index 9f9d8b91f..5ff49cbbc 100644 +--- a/src/XrdCl/XrdClFileStateHandler.hh ++++ b/src/XrdCl/XrdClFileStateHandler.hh +@@ -42,6 +42,12 @@ + #include + #include + ++#if defined(__linux__) && !defined(__GLIBC__) ++#define __NEED_suseconds_t ++#define __NEED_struct_timeval ++#include ++#endif ++ + namespace + { + class PgReadHandler; +diff --git a/src/XrdCl/XrdClMonitor.hh b/src/XrdCl/XrdClMonitor.hh +index 2fc753777..d22c3c275 100644 +--- a/src/XrdCl/XrdClMonitor.hh ++++ b/src/XrdCl/XrdClMonitor.hh +@@ -43,6 +43,12 @@ + + #include "XrdCl/XrdClFileSystem.hh" + ++#if defined(__linux__) && !defined(__GLIBC__) ++#define __NEED_suseconds_t ++#define __NEED_struct_timeval ++#include ++#endif ++ + namespace XrdCl + { + class URL; +diff --git a/src/XrdNet/XrdNetSecurity.cc b/src/XrdNet/XrdNetSecurity.cc +index 0f8451127..e39b1ef4b 100644 +--- a/src/XrdNet/XrdNetSecurity.cc ++++ b/src/XrdNet/XrdNetSecurity.cc +@@ -40,12 +40,14 @@ + #include + #include + #include ++#include "XrdSys/XrdWin32.hh" ++#endif ++#if WIN32 || defined(__linux__) && !defined(__GLIBC__) + int innetgr(const char *netgroup, const char *host, const char *user, + const char *domain) + { + return 0; + } +-#include "XrdSys/XrdWin32.hh" + #endif + + #include "XrdNet/XrdNetAddr.hh" +diff --git a/src/XrdPosix/XrdPosix.cc b/src/XrdPosix/XrdPosix.cc +index 0f32dc2ee..b6dea957f 100644 +--- a/src/XrdPosix/XrdPosix.cc ++++ b/src/XrdPosix/XrdPosix.cc +@@ -37,6 +37,9 @@ + #include + #include + #include ++#if defined(__linux__) && !defined(_IO_ERR_SEEN) ++#include ++#endif + + #include "XrdSys/XrdSysHeaders.hh" + #include "XrdPosix/XrdPosixLinkage.hh" +@@ -311,8 +314,12 @@ size_t XrdPosix_Fread(void *ptr, size_t size, size_t nitems, FILE *stream) + if (bytes > 0 && size) rc = bytes/size; + #ifndef SUNX86 + #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) ++#ifdef _IO_ERR_SEEN + else if (bytes < 0) stream->_flags |= _IO_ERR_SEEN; + else stream->_flags |= _IO_EOF_SEEN; ++#else ++ else if (bytes < 0) __fseterr(stream); ++#endif + #elif defined(__APPLE__) || defined(__FreeBSD__) + else if (bytes < 0) stream->_flags |= __SEOF; + else stream->_flags |= __SERR; +@@ -482,7 +489,11 @@ size_t XrdPosix_Fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream + if (bytes > 0 && size) rc = bytes/size; + #ifndef SUNX86 + #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) ++#ifdef _IO_ERR_SEEN + else stream->_flags |= _IO_ERR_SEEN; ++#else ++ else __fseterr(stream); ++#endif + #elif defined(__APPLE__) || defined(__FreeBSD__) + else stream->_flags |= __SERR; + #else +diff --git a/src/XrdPosix/XrdPosixLinkage.hh b/src/XrdPosix/XrdPosixLinkage.hh +index 903153252..b5cc6d4b4 100644 +--- a/src/XrdPosix/XrdPosixLinkage.hh ++++ b/src/XrdPosix/XrdPosixLinkage.hh +@@ -40,6 +40,7 @@ + #include + + #include "XrdPosix/XrdPosixOsDep.hh" ++#include "XrdPosix/XrdPosixXrootd.hh" + #include "XrdSys/XrdSysPlatform.hh" + + /******************************************************************************/ +diff --git a/src/XrdPosix/XrdPosixMap.hh b/src/XrdPosix/XrdPosixMap.hh +index ac2da483a..a15602787 100644 +--- a/src/XrdPosix/XrdPosixMap.hh ++++ b/src/XrdPosix/XrdPosixMap.hh +@@ -36,6 +36,11 @@ + #include "XrdCl/XrdClFileSystem.hh" + #include "XrdCl/XrdClXRootDResponses.hh" + ++#if defined(__linux__) && !defined(__GLIBC__) ++#define __NEED_dev_t ++#include ++#endif ++ + class XrdPosixMap + { + public: +diff --git a/src/XrdPosix/XrdPosixPreload.cc b/src/XrdPosix/XrdPosixPreload.cc +index 867b73479..d967c53b3 100644 +--- a/src/XrdPosix/XrdPosixPreload.cc ++++ b/src/XrdPosix/XrdPosixPreload.cc +@@ -42,6 +42,22 @@ + + #include "XrdPosix/XrdPosixExtern.hh" + ++#ifdef creat64 ++#undef creat64 ++#undef fseeko64 ++#undef ftello64 ++#undef ftruncate64 ++#undef lseek64 ++#undef open64 ++#undef pread64 ++#undef pwrite64 ++#undef readdir64 ++#undef readdir64_r ++#undef statfs64 ++#undef statvfs64 ++#undef truncate64 ++#endif ++ + /******************************************************************************/ + /* G l o b a l D e c l a r a t i o n s */ + /******************************************************************************/ +diff --git a/src/XrdSys/XrdSysPlatform.hh b/src/XrdSys/XrdSysPlatform.hh +index a1ac544ad..eaeaeabac 100644 +--- a/src/XrdSys/XrdSysPlatform.hh ++++ b/src/XrdSys/XrdSysPlatform.hh +@@ -241,16 +241,8 @@ extern "C" + #if defined(_AIX) || \ + (defined(XR__SUNGCC3) && !defined(__arch64__)) + # define SOCKLEN_t size_t +-#elif defined(XR__GLIBC) || \ +- defined(__FreeBSD__) || \ +- (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) || \ +- (defined(XR__SUNGCC3) && defined(__arch64__)) || defined(__APPLE__) || \ +- (defined(__sun) && defined(_SOCKLEN_T)) +-# ifndef SOCKLEN_t +-# define SOCKLEN_t socklen_t +-# endif + #elif !defined(SOCKLEN_t) +-# define SOCKLEN_t int ++# define SOCKLEN_t socklen_t + #endif + + #ifdef _LP64 +diff --git a/src/XrdSys/XrdSysPthread.hh b/src/XrdSys/XrdSysPthread.hh +index 17f8fd0be..78741a7dc 100644 +--- a/src/XrdSys/XrdSysPthread.hh ++++ b/src/XrdSys/XrdSysPthread.hh +@@ -351,7 +351,7 @@ enum PrefType {prefWR=1}; + + XrdSysRWLock(PrefType ptype) + { +-#ifdef __linux__ ++#ifdef __GLIBC__ + pthread_rwlockattr_t attr; + pthread_rwlockattr_setkind_np(&attr, + PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); +@@ -367,7 +367,7 @@ enum PrefType {prefWR=1}; + inline void ReInitialize(PrefType ptype) + { + pthread_rwlock_destroy(&lock); +-#ifdef __linux__ ++#ifdef __GLIBC__ + pthread_rwlockattr_t attr; + pthread_rwlockattr_setkind_np(&attr, + PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template new file mode 100644 index 00000000000..2bd0b59714c --- /dev/null +++ b/srcpkgs/xrootd/template @@ -0,0 +1,21 @@ +# Template file for 'xrootd' +pkgname=xrootd +version=5.4.2 +revision=1 +build_style=cmake +makedepends="zlib-devel openssl-devel libuuid-devel readline-devel" +short_desc="Low latency, scalable and fault tolerant access to data" +maintainer="Ben Jargowsky " +license="LGPL-3.0-or-later" +homepage="https://xrootd.slac.stanford.edu" +distfiles="http://xrootd.org/download/v${version}/xrootd-${version}.tar.gz" +checksum=d868ba5d8b71ec38f7a113d2d8f3e25bbcedc1bc23d21bba1686ddfdb2b900c1 + +if [ "$XBPS_TARGET_LIBC" = musl ]; then + configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo" + makedepends+=" libexecinfo-devel" +fi +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic" + makedepends+=" libatomic-devel" +fi From 91bd3b4fa5495620b746bac9ee197eb0beb00109 Mon Sep 17 00:00:00 2001 From: Ben Jargowsky Date: Tue, 11 Jan 2022 12:38:46 -0800 Subject: [PATCH 1758/2369] New package: libvdt-0.4.3 --- srcpkgs/libvdt-devel | 1 + srcpkgs/libvdt/template | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 120000 srcpkgs/libvdt-devel create mode 100644 srcpkgs/libvdt/template diff --git a/srcpkgs/libvdt-devel b/srcpkgs/libvdt-devel new file mode 120000 index 00000000000..25fca34b383 --- /dev/null +++ b/srcpkgs/libvdt-devel @@ -0,0 +1 @@ +libvdt \ No newline at end of file diff --git a/srcpkgs/libvdt/template b/srcpkgs/libvdt/template new file mode 100644 index 00000000000..3caa629d6eb --- /dev/null +++ b/srcpkgs/libvdt/template @@ -0,0 +1,28 @@ +# Template file for 'libvdt' +pkgname=libvdt +version=0.4.3 +revision=1 +wrksrc="vdt-${version}" +build_style=cmake +case "$XBPS_TARGET_MACHINE" in + aarch64*|arm*) + configure_args="-DSSE=OFF -DNEON=OFF" + make_cmd=make + export CMAKE_GENERATOR="Unix Makefiles" + ;; +esac +hostmakedepends="python3" +short_desc="Collection of fast and inline implementations of mathematical functions" +maintainer="Ben Jargowsky " +license="LGPL-3.0-or-later" +homepage="https://github.com/dpiparo/vdt" +distfiles="https://github.com/dpiparo/vdt/archive/refs/tags/v${version}.tar.gz" +checksum=705674612ebb5c182b65a8f61f4d173eb7fe7cdeee2235b402541a492e08ace1 + +libvdt-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + } +} From 4f52d528592c9ccab8076f27f7ea20a7869be278 Mon Sep 17 00:00:00 2001 From: Ben Jargowsky Date: Mon, 20 Dec 2021 23:55:36 -0500 Subject: [PATCH 1759/2369] New package: root-6.26.02 --- srcpkgs/python3-pyroot | 1 + srcpkgs/root-R | 1 + srcpkgs/root/INSTALL.msg | 3 ++ srcpkgs/root/patches/musl.patch | 21 +++++++++++ srcpkgs/root/template | 66 +++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+) create mode 120000 srcpkgs/python3-pyroot create mode 120000 srcpkgs/root-R create mode 100644 srcpkgs/root/INSTALL.msg create mode 100644 srcpkgs/root/patches/musl.patch create mode 100644 srcpkgs/root/template diff --git a/srcpkgs/python3-pyroot b/srcpkgs/python3-pyroot new file mode 120000 index 00000000000..93ca1422a8d --- /dev/null +++ b/srcpkgs/python3-pyroot @@ -0,0 +1 @@ +root \ No newline at end of file diff --git a/srcpkgs/root-R b/srcpkgs/root-R new file mode 120000 index 00000000000..93ca1422a8d --- /dev/null +++ b/srcpkgs/root-R @@ -0,0 +1 @@ +root \ No newline at end of file diff --git a/srcpkgs/root/INSTALL.msg b/srcpkgs/root/INSTALL.msg new file mode 100644 index 00000000000..4d92c4ced6b --- /dev/null +++ b/srcpkgs/root/INSTALL.msg @@ -0,0 +1,3 @@ +Before using ROOT, source 'thisroot.sh' to set up environmental variables. + +$ source /usr/bin/thisroot.sh # also available: thisroot.{csh,fish} diff --git a/srcpkgs/root/patches/musl.patch b/srcpkgs/root/patches/musl.patch new file mode 100644 index 00000000000..7605e91675a --- /dev/null +++ b/srcpkgs/root/patches/musl.patch @@ -0,0 +1,21 @@ +diff --git a/core/thread/src/TPosixThread.cxx b/core/thread/src/TPosixThread.cxx +index 1e879c1c3a..4e1245baeb 100644 +--- a/core/thread/src/TPosixThread.cxx ++++ b/core/thread/src/TPosixThread.cxx +@@ -37,13 +37,13 @@ Int_t TPosixThread::Run(TThread *th, const int affinity) + pthread_attr_init(attr); + + if (affinity >= 0) { +- #ifdef R__MACOSX +- Warning("Run", "Affinity setting not yet implemented on MacOS"); +- #else ++ #ifdef __GLIBC__ + cpu_set_t cpuset; + CPU_ZERO(&cpuset); + CPU_SET(affinity, &cpuset); + pthread_attr_setaffinity_np(attr, sizeof(cpu_set_t), &cpuset); ++ #else ++ Warning("Run", "Affinity setting not yet implemented on this platform"); + #endif + } + diff --git a/srcpkgs/root/template b/srcpkgs/root/template new file mode 100644 index 00000000000..bfc8cb6d8a3 --- /dev/null +++ b/srcpkgs/root/template @@ -0,0 +1,66 @@ +# Template file for 'root' +pkgname=root +version=6.26.02 +revision=1 +# Only i686 and x86_64 seem to be officially supported +archs="i686* x86_64*" +build_style=cmake +configure_args="-Dgnuinstall=ON -Druntime_cxxmodules=OFF + -Dclad=OFF $(vopt_if fortran '-Dfortran=ON') + -DXROOTD_XrdCl_LIBRARY=/usr/lib/libXrdCl.so.3 + -DCMAKE_INSTALL_LIBDIR=/usr/lib/root -Dr=ON + -DCMAKE_INSTALL_SYSCONFDIR='libexec/root' + $(vopt_if root7 '-Droot7=ON -DCMAKE_CXX_STANDARD=17 -Dwebgui=ON') + -DCMAKE_INSTALL_PYTHONDIR=${py3_sitelib/'usr/'}" +hostmakedepends="gcc-fortran" +makedepends="libX11-devel libXpm-devel libXft-devel libXext-devel + openssl-devel libpng-devel readline-devel tbb-devel liblz4-devel + pcre-devel xxHash-devel libzstd-devel liblzma-devel libvdt-devel + libxml2-devel python3-devel python3-numpy R-cran-Rcpp R-cran-RInside + xrootd" +depends="gcc" +case "$XBPS_TARGET_MACHINE" in + *-musl) + configure_args+=" -Dssl=OFF" + ;; +esac +short_desc="C++ framework for data processing created by CERN" +maintainer="Ben Jargowsky " +license="LGPL-2.1-or-later" +homepage="https://root.cern" +distfiles="https://root.cern/download/root_v${version}.source.tar.gz" +checksum=7ba96772271a726079506c5bf629c3ceb21bf0682567ed6145be30606d7cd9bb +build_options="fortran root7" +build_options_default="fortran" +python_version=3 +shlib_provides="libCore.so libTree.so libRIO.so libMatrix.so libThread.so + libTMVA.so libMathCore.so" + +post_install() { + rm -v ${DESTDIR}/usr/share/root/fonts/LICENSE + rm -v ${DESTDIR}/usr/share/root/fonts/[a-mt-z]*.ttf +} + +python3-pyroot_package() { + short_desc="Python interface to ROOT" + depends="root>=${version}_${revision} python3" + pkg_install() { + vmove ${py3_sitelib} + } +} +root-R_package() { + short_desc="ROOT interface to R" + depends="root>=${version}_${revision}" + pkg_install() { + vmove usr/include/root/RExports.h + vmove usr/include/root/TRDataFrame.h + vmove usr/include/root/TRFunctionExport.h + vmove usr/include/root/TRFunctionImport.h + vmove usr/include/root/TRInterface.h + vmove usr/include/root/TRInternalFunction.h + vmove usr/include/root/TRObject.h + vmove usr/lib/root/libRInterface.so + vmove usr/lib/root/libRMVA.so + vmove usr/lib/root/libRtools.so + } +} From 46becab2d61c8814c80ae9a8935e936af04b9fb7 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sun, 27 Mar 2022 21:26:45 +0300 Subject: [PATCH 1760/2369] anydesk: use the generic upstream tarball for the license. That fixes the issue with the eula checksums, thanks @tibequadorian. --- srcpkgs/anydesk/template | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template index ba95d8775fe..d2213403350 100644 --- a/srcpkgs/anydesk/template +++ b/srcpkgs/anydesk/template @@ -1,10 +1,11 @@ # Template file for 'anydesk' pkgname=anydesk version=6.1.1 -revision=1 +revision=2 archs="x86_64" -create_wrksrc=yes -hostmakedepends="patchelf rpmextract w3m" +create_wrksrc="yes" +hostmakedepends="patchelf rpmextract" +depends="hicolor-icon-theme" short_desc="Fast remote desktop application" maintainer="mobinmob " license="custom:Proprietary" @@ -13,28 +14,18 @@ homepage="https://anydesk.com/remote-desktop" nopie=yes restricted=yes -distfiles="https://download.anydesk.com/linux/anydesk_$version-1_x86_64.rpm" -checksum=93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a +distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_x86_64.rpm + https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" +checksum="93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a + 102e72c75502a4779083320322dd047e2b0c00a25ead7444a00aad1db54325aa" -_eula_digest=cf42c51d94d40c5890b103a1b2c5b62b5faad7af1e14933cab98dea8066175e8 - -post_extract() { - $XBPS_FETCH_CMD -o eula.html https://anydesk.com/en/terms - < eula.html w3m -dump -I utf-8 -T text/html | - sed -n '/envelope.p/q;/Terms [&] Conditions/,$p' >eula.txt - - filesum="$($XBPS_DIGEST_CMD eula.txt)" - if [ "$filesum" != $_eula_digest ]; then - msg_error "EULA changed, new digest: $filesum\n" - fi -} do_build() { patchelf --remove-needed libpangox-1.0.so.0 usr/bin/anydesk } do_install() { - vcopy usr/share usr - vbin usr/bin/anydesk - vlicense eula.txt + vlicense "${pkgname}-${version}"/copyright + rm -rf "${pkgname}-${version}" + vcopy "*" / } From e838300bb86c0c0a0e12883da89d9ad94cb12011 Mon Sep 17 00:00:00 2001 From: Piraty Date: Sat, 7 May 2022 19:19:31 +0200 Subject: [PATCH 1761/2369] xarcan: update to 0.6.1. --- srcpkgs/xarcan/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template index fef279d8e4b..fbd3d7e6e86 100644 --- a/srcpkgs/xarcan/template +++ b/srcpkgs/xarcan/template @@ -1,20 +1,20 @@ # Template file for 'xarcan' pkgname=xarcan -version=0.6.0 -revision=3 +version=0.6.1 +revision=1 build_style=meson configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false -Ddefault_font_path=/usr/share/fonts/X11" hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans" makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel - xorgproto libxshmfence-devel" + xorgproto libxshmfence-devel xcb-util-wm-devel" short_desc="Patched Xserver that bridges connections to Arcan" maintainer="Piraty " license="MIT, BSD-3-Clause" homepage="https://github.com/letoram/xarcan" distfiles="https://github.com/letoram/xarcan/archive/${version}.tar.gz" -checksum=db582bf9c412842fb263d4eb5118f4c1eb6e7b579042a179044d9467fdb98193 +checksum=b31c053a3b33e0af37528b8388f5687fe0d4af572bda0e507667dc7dd80ee1ba post_install() { rm -rf ${DESTDIR}/usr/{include,lib,share} From 1f7911445633ae3851f454bf6db74440313e6aca Mon Sep 17 00:00:00 2001 From: Piraty Date: Sat, 7 May 2022 19:21:44 +0200 Subject: [PATCH 1762/2369] acfgfs: update to 0.6.1. --- srcpkgs/acfgfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/acfgfs/template b/srcpkgs/acfgfs/template index 0e1ced9d4f0..91daf605535 100644 --- a/srcpkgs/acfgfs/template +++ b/srcpkgs/acfgfs/template @@ -1,7 +1,7 @@ # Template file for 'acfgfs' # !! keep synced with arcan pkgname=acfgfs -version=0.6.0.1 +version=0.6.1 revision=1 wrksrc=arcan-${version} build_wrksrc=src/tools/acfgfs @@ -13,7 +13,7 @@ maintainer="Piraty " license="BSD-3-Clause" homepage="https://arcan-fe.com" distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz" -checksum=7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed +checksum=ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551 case "${XBPS_TARGET_MACHINE}" in i686|armv6l|armv7l|ppc) From 7c40db1483d5185b819eabd249246a286a72a345 Mon Sep 17 00:00:00 2001 From: Piraty Date: Sat, 7 May 2022 19:23:43 +0200 Subject: [PATCH 1763/2369] exo: add changelog, fix homepage --- srcpkgs/exo/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template index 5dd6fc3c2a1..df5c22224d5 100644 --- a/srcpkgs/exo/template +++ b/srcpkgs/exo/template @@ -1,7 +1,7 @@ # Template file for 'exo' pkgname=exo version=4.16.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --with-locales-dir=/usr/share/locale" hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel" @@ -10,7 +10,8 @@ depends="hicolor-icon-theme desktop-file-utils" short_desc="Extension library for the Xfce desktop environment" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" -homepage="https://xfce.org/" +homepage="https://docs.xfce.org/xfce/exo/start" +changelog="https://gitlab.xfce.org/xfce/exo/-/blob/master/NEWS" distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2" checksum=722dff3c3fe23f0a65405e63889cf247c99d092d3f9fb16dec78d062cfb8fae6 From 1c953b417372661cc506f4ae8bf26b44dde17967 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 18 Apr 2022 14:57:36 -0400 Subject: [PATCH 1764/2369] common/travis/xpkgdiff.sh: add CI script to compare pkgs with xpkgdiff --- .github/workflows/build.yaml | 8 ++++++++ common/travis/xpkgdiff.sh | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100755 common/travis/xpkgdiff.sh diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e4619a3f3c4..f527ce1f897 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -94,6 +94,14 @@ jobs: "$here/common/travis/show_files.sh" "$BOOTSTRAP" "$ARCH" ) + - name: Compare to previous + run: | + ( + here="$(pwd)" + cd / + "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH" + ) + - name: Check file conflicts if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate run: | diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh new file mode 100755 index 00000000000..a36fd76e5d8 --- /dev/null +++ b/common/travis/xpkgdiff.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# +# xpkgdiff.sh + +export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo XBPS_HOSTDIR="$HOME/hostdir" +export DIFF='diff --unified=0 --report-identical-files --suppress-common-lines + --color=always --label REPO --label BUILT' + +while read -r pkg; do + for subpkg in $(xsubpkg $pkg); do + if xbps-query --repository=$HOME/hostdir/binpkgs \ + --repository=$HOME/hostdir/binpkgs/nonfree \ + -i "$subpkg" >&/dev/null; then + /bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m" + xpkgdiff -f $subpkg + /bin/echo -e "\x1b[34mMetadata Diff of $subpkg:\x1b[0m" + xpkgdiff -S $subpkg + /bin/echo -e "\x1b[34mDependency Diff of $subpkg:\x1b[0m" + xpkgdiff -x $subpkg + else + /bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m" + fi + done +done < /tmp/templates From aee8c942f8a93c4b2180c59d140bfcf265315920 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 7 May 2022 23:12:44 +0200 Subject: [PATCH 1765/2369] lagrange: update to 1.13.3. --- srcpkgs/lagrange/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template index 0e7f419708a..a430d64fda4 100644 --- a/srcpkgs/lagrange/template +++ b/srcpkgs/lagrange/template @@ -1,6 +1,6 @@ # Template file for 'lagrange' pkgname=lagrange -version=1.13.2 +version=1.13.3 revision=1 build_style=cmake hostmakedepends="pkg-config zip" @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://gmi.skyjake.fi/lagrange/" changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi" distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz" -checksum=f84c5fe078734df06ada747f87760ea8863369be5519d1e56992c7c5278395da +checksum=a25c48bb4c5c9eb81ba0e93609a5b0e350194eddab27bc55a5b86ae7b749259b post_install() { vlicense LICENSE.md From b2098a1fb301cd153d2d933f0a8086ba70f24849 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 21:50:38 +0100 Subject: [PATCH 1766/2369] New package: robin-hood-hashing-3.11.5 --- srcpkgs/robin-hood-hashing/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/robin-hood-hashing/template diff --git a/srcpkgs/robin-hood-hashing/template b/srcpkgs/robin-hood-hashing/template new file mode 100644 index 00000000000..63a9db6c3f8 --- /dev/null +++ b/srcpkgs/robin-hood-hashing/template @@ -0,0 +1,16 @@ +# Template file for 'robin-hood-hashing' +pkgname=robin-hood-hashing +version=3.11.5 +revision=1 +build_style=cmake +configure_args=" -DRH_STANDALONE_PROJECT=OFF" +short_desc="Fast & memory efficient hashtable based on robin hood hashing for C++" +maintainer="tibequadorian " +license="MIT" +homepage="https://github.com/martinus/robin-hood-hashing" +distfiles="https://github.com/martinus/robin-hood-hashing/archive/${version}.tar.gz" +checksum=3693e44dda569e9a8b87ce8263f7477b23af448a3c3600c8ab9004fe79c20ad0 + +post_install() { + vlicense LICENSE +} From cba469c178585530e9d7ed62cf80aa80aebe3cfd Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:15 +0100 Subject: [PATCH 1767/2369] SPIRV-Tools: update to 2022.1. --- srcpkgs/SPIRV-Tools/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template index 70d13dfb6da..ffb2fe25efa 100644 --- a/srcpkgs/SPIRV-Tools/template +++ b/srcpkgs/SPIRV-Tools/template @@ -1,6 +1,6 @@ # Template file for 'SPIRV-Tools' pkgname=SPIRV-Tools -version=2020.6 +version=2022.1 revision=1 build_style=cmake configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF @@ -8,11 +8,12 @@ configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF hostmakedepends="python3" makedepends="SPIRV-Headers" short_desc="API and commands for processing SPIR-V modules" -maintainer="Orphaned " +maintainer="tibequadorian " license="Apache-2.0" homepage="https://github.com/KhronosGroup/SPIRV-Tools" +changelog="https://raw.githubusercontent.com/KhronosGroup/SPIRV-Tools/master/CHANGES" distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz" -checksum=de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3 +checksum=844c0f590a0ab9237cec947e27cfc75bd14f39a68fc3b37d8f1b9e1b21490a58 SPIRV-Tools-devel_package() { depends="SPIRV-Tools-${version}_${revision}" From 3274e558133fc918b353cceaea25c03b576f5645 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:22 +0100 Subject: [PATCH 1768/2369] SPIRV-Headers: update to 1.3.204.1. --- srcpkgs/SPIRV-Headers/template | 16 +++++++++++----- srcpkgs/SPIRV-Headers/update | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/SPIRV-Headers/update diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template index 5dcf457c04c..8f3e68ba87c 100644 --- a/srcpkgs/SPIRV-Headers/template +++ b/srcpkgs/SPIRV-Headers/template @@ -1,11 +1,17 @@ # Template file for 'SPIRV-Headers' pkgname=SPIRV-Headers -version=1.5.4.raytracing.fixed +reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1" +version=1.3.204.1 revision=1 +wrksrc="SPIRV-Headers-sdk-${version}" build_style=cmake short_desc="Machine-readable files for the SPIR-V Registry" -maintainer="Orphaned " -license="GPL-3.0-or-later" +maintainer="tibequadorian " +license="MIT" homepage="https://github.com/KhronosGroup/SPIRV-Headers" -distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/${version}.tar.gz" -checksum=df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6 +distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-${version}.tar.gz" +checksum=262864053968c217d45b24b89044a7736a32361894743dd6cfe788df258c746c + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/SPIRV-Headers/update b/srcpkgs/SPIRV-Headers/update new file mode 100644 index 00000000000..2fa65238787 --- /dev/null +++ b/srcpkgs/SPIRV-Headers/update @@ -0,0 +1 @@ +pattern="/sdk-\K[0-9.]+(?=.tar.gz)" From 4e328a58f09e851ae5d99732ccf1642356370366 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:32 +0100 Subject: [PATCH 1769/2369] Vulkan-Headers: update to 1.3.204.1. --- srcpkgs/Vulkan-Headers/template | 9 +++++---- srcpkgs/Vulkan-Headers/update | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/Vulkan-Headers/template b/srcpkgs/Vulkan-Headers/template index d619f96e236..cb69e012e7a 100644 --- a/srcpkgs/Vulkan-Headers/template +++ b/srcpkgs/Vulkan-Headers/template @@ -1,11 +1,12 @@ # Template file for 'Vulkan-Headers' pkgname=Vulkan-Headers -version=1.2.182 +version=1.3.204.1 revision=1 +wrksrc="Vulkan-Headers-sdk-${version}" build_style=cmake short_desc="Vulkan header files" -maintainer="Arvin Ignaci " +maintainer="tibequadorian " license="Apache-2.0" homepage="https://www.khronos.org/vulkan/" -distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${version}.tar.gz" -checksum=38d1c953de7bb2d839556226851feeb690f0d23bc22ac46c823dcb66c97bfdc8 +distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-${version}.tar.gz" +checksum=9c4d33f71467c915749fbf48c0c3a8ee7833f15babf398e3463cd88791fb592e diff --git a/srcpkgs/Vulkan-Headers/update b/srcpkgs/Vulkan-Headers/update index 995551ef357..2fa65238787 100644 --- a/srcpkgs/Vulkan-Headers/update +++ b/srcpkgs/Vulkan-Headers/update @@ -1,2 +1 @@ -pkgname=sdk -pattern="/$pkgname-\K[0-9.]+(?=.tar.gz)" +pattern="/sdk-\K[0-9.]+(?=.tar.gz)" From e3e47b13bacee7f00bed95821dfcbebab839cb6e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:35 +0100 Subject: [PATCH 1770/2369] Vulkan-Tools: update to 1.3.204.1. --- srcpkgs/Vulkan-Tools/template | 12 ++++++------ srcpkgs/Vulkan-Tools/update | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template index 8d5c74629cb..8b80e1ec890 100644 --- a/srcpkgs/Vulkan-Tools/template +++ b/srcpkgs/Vulkan-Tools/template @@ -1,20 +1,20 @@ # Template file for 'Vulkan-Tools' pkgname=Vulkan-Tools -version=1.2.182 +version=1.3.204.1 revision=1 -wrksrc="${pkgname}-${version}" +wrksrc="Vulkan-Tools-sdk-${version}" build_style=cmake configure_args="-DGLSLANG_INSTALL_DIR=/usr -DBUILD_CUBE=$(vopt_if cube ON OFF) -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -Wno-dev" hostmakedepends="python3 pkg-config $(vopt_if cube glslang)" makedepends="Vulkan-Headers vulkan-loader libxcb-devel libxkbcommon-devel - wayland-devel libXrandr-devel" + wayland-devel wayland-protocols libXrandr-devel" short_desc="Official Vulkan tools and utilities" -maintainer="Arvin Ignaci " +maintainer="tibequadorian " license="Apache-2.0" homepage="https://www.khronos.org/vulkan/" -distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/v${version}.tar.gz" -checksum=50c959851230d1daba20235167faced7b7686ebe5d9e626dfb1fe5c92fa30b9e +distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-${version}.tar.gz" +checksum=3242f9ad158d02af9cc44186cbd415982387356a2dd8c0492af2fdace8c22f49 build_options="cube" desc_option_cube="Build cube vulkan demo" diff --git a/srcpkgs/Vulkan-Tools/update b/srcpkgs/Vulkan-Tools/update index 75a4ad43aa6..2fa65238787 100644 --- a/srcpkgs/Vulkan-Tools/update +++ b/srcpkgs/Vulkan-Tools/update @@ -1,2 +1 @@ -site=https://github.com/KhronosGroup/Vulkan-Tools/releases -pkgname=sdk +pattern="/sdk-\K[0-9.]+(?=.tar.gz)" From f0a036a6a49b28a04eb6356cd78649c9184d15e3 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:41 +0100 Subject: [PATCH 1771/2369] Vulkan-ValidationLayers: update to 1.3.204.1. --- srcpkgs/Vulkan-ValidationLayers/template | 14 +++++++------- srcpkgs/Vulkan-ValidationLayers/update | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/Vulkan-ValidationLayers/update diff --git a/srcpkgs/Vulkan-ValidationLayers/template b/srcpkgs/Vulkan-ValidationLayers/template index d89eb414b12..330c8e3169f 100644 --- a/srcpkgs/Vulkan-ValidationLayers/template +++ b/srcpkgs/Vulkan-ValidationLayers/template @@ -1,16 +1,16 @@ # Template file for 'Vulkan-ValidationLayers' pkgname=Vulkan-ValidationLayers -version=1.2.162 +version=1.3.204.1 revision=1 +wrksrc="Vulkan-ValidationLayers-sdk-${version}" build_style=cmake -configure_args="-Wno-dev -DSPIRV_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr - -DGLSLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -DBUILD_LAYER_SUPPORT_FILES=ON" +configure_args="-Wno-dev -DBUILD_LAYER_SUPPORT_FILES=ON" hostmakedepends="pkg-config" makedepends="Vulkan-Headers libXrandr-devel wayland-devel glslang-devel - SPIRV-Tools-devel SPIRV-Headers" + SPIRV-Tools-devel SPIRV-Headers robin-hood-hashing" short_desc="Khronos official Vulkan validation layers" -maintainer="Colin Gillespie " +maintainer="tibequadorian " license="Apache-2.0" homepage="https://www.khronos.org/vulkan/" -distfiles="https://github.com/KhronosGroup/${pkgname}/archive/v${version}.tar.gz" -checksum=83619b81a86e733383a71ea54f0f5e64e194bf596ee8ec4e36217bb0b29b8917 +distfiles="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-${version}.tar.gz" +checksum=a5e658a4c1f504ae38488acdbe2ab2799e2ae4b626104d76776f1c24b079f341 diff --git a/srcpkgs/Vulkan-ValidationLayers/update b/srcpkgs/Vulkan-ValidationLayers/update new file mode 100644 index 00000000000..2fa65238787 --- /dev/null +++ b/srcpkgs/Vulkan-ValidationLayers/update @@ -0,0 +1 @@ +pattern="/sdk-\K[0-9.]+(?=.tar.gz)" From 8b760daa6d6a616be2c57567e22a169347e88bcf Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Feb 2022 22:14:46 +0100 Subject: [PATCH 1772/2369] vulkan-loader: update to 1.3.204.1. --- srcpkgs/vulkan-loader/template | 10 +++++----- srcpkgs/vulkan-loader/update | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/vulkan-loader/template b/srcpkgs/vulkan-loader/template index 383d90ddd35..fb866dcb3ec 100644 --- a/srcpkgs/vulkan-loader/template +++ b/srcpkgs/vulkan-loader/template @@ -1,8 +1,8 @@ # Template file for 'vulkan-loader' pkgname=vulkan-loader -version=1.2.182 +version=1.3.204.1 revision=1 -wrksrc="Vulkan-Loader-${version}" +wrksrc="Vulkan-Loader-sdk-${version}" build_style=cmake configure_args="-Wno-dev -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -DBUILD_TESTS=OFF" @@ -10,8 +10,8 @@ hostmakedepends="python3 pkg-config" makedepends="Vulkan-Headers libxcb-devel libxkbcommon-devel wayland-devel libXrandr-devel" short_desc="Vulkan Installable Client Driver (ICD) loader" -maintainer="Arvin Ignaci " +maintainer="tibequadorian " license="Apache-2.0" homepage="https://www.khronos.org/vulkan/" -distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${version}.tar.gz" -checksum=0d1f9fde9d21642526e9baa55d30364c95035c4fe3c6db96836631991b44dd90 +distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-${version}.tar.gz" +checksum=5dcd42b564804f4c01891ddd429a4a5028113c4cf39b44256689e8f543773134 diff --git a/srcpkgs/vulkan-loader/update b/srcpkgs/vulkan-loader/update index 46acb07cbe8..c21c479d0e5 100644 --- a/srcpkgs/vulkan-loader/update +++ b/srcpkgs/vulkan-loader/update @@ -1,3 +1,3 @@ _pkgname=Vulkan-Loader -site="https://github.com/KhronosGroup/${_pkgname}/releases" +site="https://github.com/KhronosGroup/${_pkgname}/tags" pattern="/releases/tag/sdk-\K\d.\d.\d+.\d(?=)" From 378deed0ff2258779b533e2c698b7d9f52e299fb Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 7 May 2022 18:30:16 +0300 Subject: [PATCH 1773/2369] FeatherPad: update to 1.2.0. --- srcpkgs/FeatherPad/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template index 17c9bfbe501..a1c43cc24ae 100644 --- a/srcpkgs/FeatherPad/template +++ b/srcpkgs/FeatherPad/template @@ -1,6 +1,6 @@ # Template file for 'FeatherPad' pkgname=FeatherPad -version=1.1.1 +version=1.2.0 revision=1 build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools pkg-config" @@ -11,4 +11,4 @@ license="GPL-3.0-or-later" homepage="https://github.com/tsujan/FeatherPad" changelog="https://github.com/tsujan/FeatherPad/raw/master/ChangeLog" distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz" -checksum=8f2943224f04a1ee4b30b5b7f5b60f34d10d6fe9000e786e1b3a38369d293f8f +checksum=3926f496ff3a3e65d9d3ebf9f76cfa43a0a225580cbd3d1c362f37e3b13a60e8 From ab783484df2146572384fe0b25e4deddb8ebd2ef Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 7 May 2022 18:46:12 +0300 Subject: [PATCH 1774/2369] cmst: update to 2022.05.01. --- srcpkgs/cmst/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cmst/template b/srcpkgs/cmst/template index a7df44131f8..3acc6ff6b22 100644 --- a/srcpkgs/cmst/template +++ b/srcpkgs/cmst/template @@ -1,6 +1,6 @@ # Template file for 'cmst' pkgname=cmst -version=2022.01.05 +version=2022.05.01 revision=1 build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools" @@ -11,7 +11,7 @@ maintainer="Jonathan Lee " license="MIT" homepage="https://github.com/andrew-bibb/cmst" distfiles="https://github.com/andrew-bibb/cmst/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.xz" -checksum=6ddc0e3a702592ec98b80164aa2b5ad1edb66d3f8dce18a545f26a67a46dc13a +checksum=61c4ad7acad302814a677b0dd94092e336d47f55def2829c825e9128c9378dc4 post_install() { vlicense text/LICENSE } From c99310730ba70197c9065681950a3c9f129c2ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 25 Mar 2022 10:37:33 +0100 Subject: [PATCH 1775/2369] New package: python3-hcloud-1.16.0 --- srcpkgs/python3-hcloud/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/python3-hcloud/template diff --git a/srcpkgs/python3-hcloud/template b/srcpkgs/python3-hcloud/template new file mode 100644 index 00000000000..e0556027cb0 --- /dev/null +++ b/srcpkgs/python3-hcloud/template @@ -0,0 +1,19 @@ +# Template file for 'python3-hcloud' +pkgname=python3-hcloud +version=1.16.0 +revision=1 +wrksrc="${pkgname/python3-/}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-requests python3-future python3-dateutil" +checkdepends="${depends} python3-pytest-flake8 python3-isort python3-mock tox black" +short_desc="Official Hetzner Cloud python library" +maintainer="Jan Christian Grünhage " +license="MIT" +homepage="https://github.com/hetznercloud/hcloud-python" +distfiles="${PYPI_SITE}/h/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz" +checksum=c8b94557d93bcfe437f20a8176693ea4f54358b74986cc19d94ebc23f48e40cc + +post_install() { + vlicense LICENSE +} From 82994fae33306a335ef0fe6b8a260bbccbbb6497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Mon, 25 Apr 2022 08:47:29 +0200 Subject: [PATCH 1776/2369] New package: rink-0.6.3 --- srcpkgs/rink/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/rink/template diff --git a/srcpkgs/rink/template b/srcpkgs/rink/template new file mode 100644 index 00000000000..7772630d24b --- /dev/null +++ b/srcpkgs/rink/template @@ -0,0 +1,16 @@ +# Template file for 'rink' +pkgname=rink +version=0.6.3 +revision=1 +wrksrc=rink-rs-${version} +build_style=cargo +make_install_args="--path ./cli" +hostmakedepends="pkg-config" +makedepends="openssl-devel" +short_desc="Unit-aware calculator and conversion tool" +maintainer="Jan Christian Grünhage " +license="MPL-2.0, GPL-3.0-only" +homepage="https://github.com/tiffany352/rink-rs" +changelog="https://github.com/tiffany352/rink-rs/releases" +distfiles="https://github.com/tiffany352/rink-rs/archive/refs/tags/v${version}.tar.gz" +checksum=49431c12f57d58090b9f5f7f899e98bebffaeed8ca69b5ee140aad4b1c1d9dc8 From 263c9772a530b46aeaf509b6ff2b4fb9afb1bb70 Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated Date: Mon, 18 Apr 2022 16:24:23 +0200 Subject: [PATCH 1777/2369] pmbootstrap: update to 1.43.0. --- srcpkgs/pmbootstrap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template index 8d6ae321ef0..47496142593 100644 --- a/srcpkgs/pmbootstrap/template +++ b/srcpkgs/pmbootstrap/template @@ -1,6 +1,6 @@ # Template file for 'pmbootstrap' pkgname=pmbootstrap -version=1.42.0 +version=1.43.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -10,5 +10,5 @@ maintainer="bra1nwave " license="GPL-3.0-or-later" homepage="https://postmarketos.org" distfiles="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz" -checksum=c3df501a52f8deb2a982960b9ef604bf58b4f4bf8b63598707883933a3ac66cd +checksum=65f720fe8c8436cc13780e74978e2dfa66c4ca72e9e8567004015ff6f8a536a3 make_check=no # tests require chroot From a0fc161ecf435fd23801fd5a8cdff1f45a7ef338 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 7 May 2022 11:33:14 +0400 Subject: [PATCH 1778/2369] python3-regex: update to 2022.4.24. --- 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 57e5b7f4fb0..923919c0594 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.15 +version=2022.4.24 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=0a7b75cc7bb4cc0334380053e4671c560e31272c9d2d5a6c4b8e9ae2c9bd0f82 +checksum=92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255 do_check() { (cd build/lib* && python3 -m unittest regex/test_regex.py) From cb3aca7fbb4fc7cc7f46790a431737671c4a15e8 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 6 May 2022 21:12:55 +0300 Subject: [PATCH 1779/2369] .github: remove extraneous whitespace --- .github/issue_template.md | 2 +- .github/pull_request_template.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/issue_template.md b/.github/issue_template.md index 25a0538174c..10a72b0729c 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1,4 +1,4 @@ - + ### System * xuname: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ef2a5d7637a..8a9e2348494 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -13,7 +13,7 @@ https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuo and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> - file.xml +--> file.ps (psdocs) [by db2ps or xmlto] -# +--> file.pdf (pdfdocs) [by db2pdf or xmlto] -# +--> DIR=file (htmldocs) [by xmlto] -# +--> man/ (mandocs) [by xmlto] - - -# for PDF and PS output you can choose between xmlto and docbook-utils tools -PDF_METHOD = $(prefer-db2x) -PS_METHOD = $(prefer-db2x) - - -targets += $(DOCBOOKS) -BOOKS := $(addprefix $(obj)/,$(DOCBOOKS)) -xmldocs: $(BOOKS) -sgmldocs: xmldocs - -PS := $(patsubst %.xml, %.ps, $(BOOKS)) -psdocs: $(PS) - -PDF := $(patsubst %.xml, %.pdf, $(BOOKS)) -pdfdocs: $(PDF) - -HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS))) -htmldocs: $(HTML) - $(call cmd,build_main_index) - -MAN := $(patsubst %.xml, %.9, $(BOOKS)) -mandocs: $(MAN) - find $(obj)/man -name '*.9' | xargs gzip -nf - -# Default location for installed man pages -export INSTALL_MAN_PATH = $(objtree)/usr - -installmandocs: mandocs - mkdir -p $(INSTALL_MAN_PATH)/man/man9/ - find $(obj)/man -name '*.9.gz' -printf '%h %f\n' | \ - sort -k 2 -k 1 | uniq -f 1 | sed -e 's: :/:' | \ - xargs install -m 644 -t $(INSTALL_MAN_PATH)/man/man9/ - -# no-op for the DocBook toolchain -epubdocs: -latexdocs: -linkcheckdocs: - -### -#External programs used -KERNELDOCXMLREF = $(srctree)/scripts/kernel-doc-xml-ref -KERNELDOC = $(srctree)/scripts/kernel-doc -DOCPROC = $(objtree)/scripts/docproc -CHECK_LC_CTYPE = $(objtree)/scripts/check-lc_ctype - -# Use a fixed encoding - UTF-8 if the C library has support built-in -# or ASCII if not -LC_CTYPE := $(call try-run, LC_CTYPE=C.UTF-8 $(CHECK_LC_CTYPE),C.UTF-8,C) -export LC_CTYPE - -XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl -XMLTOFLAGS += --skip-validation - -### -# DOCPROC is used for two purposes: -# 1) To generate a dependency list for a .tmpl file -# 2) To preprocess a .tmpl file and call kernel-doc with -# appropriate parameters. -# The following rules are used to generate the .xml documentation -# required to generate the final targets. (ps, pdf, html). -quiet_cmd_docproc = DOCPROC $@ - cmd_docproc = SRCTREE=$(srctree)/ $(DOCPROC) doc $< >$@ -define rule_docproc - set -e; \ - $(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))';) \ - $(cmd_$(1)); \ - ( \ - echo 'cmd_$@ := $(cmd_$(1))'; \ - echo $@: `SRCTREE=$(srctree) $(DOCPROC) depend $<`; \ - ) > $(dir $@).$(notdir $@).cmd -endef - -%.xml: %.tmpl $(KERNELDOC) $(DOCPROC) $(KERNELDOCXMLREF) FORCE - $(call if_changed_rule,docproc) - -# Tell kbuild to always build the programs -always := $(hostprogs-y) - -notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \ - exit 1 -db2xtemplate = db2TYPE -o $(dir $@) $< -xmltotemplate = xmlto TYPE $(XMLTOFLAGS) -o $(dir $@) $< - -# determine which methods are available -ifeq ($(shell which db2ps >/dev/null 2>&1 && echo found),found) - use-db2x = db2x - prefer-db2x = db2x -else - use-db2x = notfound - prefer-db2x = $(use-xmlto) -endif -ifeq ($(shell which xmlto >/dev/null 2>&1 && echo found),found) - use-xmlto = xmlto - prefer-xmlto = xmlto -else - use-xmlto = notfound - prefer-xmlto = $(use-db2x) -endif - -# the commands, generated from the chosen template -quiet_cmd_db2ps = PS $@ - cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template)) -%.ps : %.xml - $(call cmd,db2ps) - -quiet_cmd_db2pdf = PDF $@ - cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template)) -%.pdf : %.xml - $(call cmd,db2pdf) - - -index = index.html -main_idx = $(obj)/$(index) -quiet_cmd_build_main_index = HTML $(main_idx) - cmd_build_main_index = rm -rf $(main_idx); \ - echo '

Linux Kernel HTML Documentation

' >> $(main_idx) && \ - echo '

Kernel Version: $(KERNELVERSION)

' >> $(main_idx) && \ - cat $(HTML) >> $(main_idx) - -quiet_cmd_db2html = HTML $@ - cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \ - echo ' \ - $(patsubst %.html,%,$(notdir $@))

' > $@ - -### -# Rules to create an aux XML and .db, and use them to re-process the DocBook XML -# to fill internal hyperlinks - gen_aux_xml = : - quiet_gen_aux_xml = echo ' XMLREF $@' -silent_gen_aux_xml = : -%.aux.xml: %.xml - @$($(quiet)gen_aux_xml) - @rm -rf $@ - @(cat $< | egrep "^ $<.db) - @$(KERNELDOCXMLREF) -db $<.db $< > $@ -.PRECIOUS: %.aux.xml - -%.html: %.aux.xml - @(which xmlto > /dev/null 2>&1) || \ - (echo "*** You need to install xmlto ***"; \ - exit 1) - @rm -rf $@ $(patsubst %.html,%,$@) - $(call cmd,db2html) - @if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \ - cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi - -quiet_cmd_db2man = MAN $@ - cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man/$(*F) $< ; fi -%.9 : %.xml - @(which xmlto > /dev/null 2>&1) || \ - (echo "*** You need to install xmlto ***"; \ - exit 1) - $(Q)mkdir -p $(obj)/man/$(*F) - $(call cmd,db2man) - @touch $@ - -### -# Rules to generate postscripts and PNG images from .fig format files -quiet_cmd_fig2eps = FIG2EPS $@ - cmd_fig2eps = fig2dev -Leps $< $@ - -%.eps: %.fig - @(which fig2dev > /dev/null 2>&1) || \ - (echo "*** You need to install transfig ***"; \ - exit 1) - $(call cmd,fig2eps) - -quiet_cmd_fig2png = FIG2PNG $@ - cmd_fig2png = fig2dev -Lpng $< $@ - -%.png: %.fig - @(which fig2dev > /dev/null 2>&1) || \ - (echo "*** You need to install transfig ***"; \ - exit 1) - $(call cmd,fig2png) - -### -# Rule to convert a .c file to inline XML documentation - gen_xml = : - quiet_gen_xml = echo ' GEN $@' -silent_gen_xml = : -%.xml: %.c - @$($(quiet)gen_xml) - @( \ - echo ""; \ - expand --tabs=8 < $< | \ - sed -e "s/&/\\&/g" \ - -e "s//\\>/g"; \ - echo "") > $@ - -endif # DOCBOOKS="" -endif # SPHINDIR=... - -### -# Help targets as used by the top-level makefile -dochelp: - @echo ' Linux kernel internal documentation in different formats (DocBook):' - @echo ' htmldocs - HTML' - @echo ' pdfdocs - PDF' - @echo ' psdocs - Postscript' - @echo ' xmldocs - XML DocBook' - @echo ' mandocs - man pages' - @echo ' installmandocs - install man pages generated by mandocs to INSTALL_MAN_PATH'; \ - echo ' (default: $(INSTALL_MAN_PATH))'; \ - echo '' - @echo ' cleandocs - clean all generated DocBook files' - @echo - @echo ' make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml' - @echo ' valid values for DOCBOOKS are: $(DOCBOOKS)' - @echo - @echo " make DOCBOOKS=\"\" [target] Don't generate docs from Docbook" - @echo ' This is useful to generate only the ReST docs (Sphinx)' - - -### -# Temporary files left by various tools -clean-files := $(DOCBOOKS) \ - $(patsubst %.xml, %.dvi, $(DOCBOOKS)) \ - $(patsubst %.xml, %.aux, $(DOCBOOKS)) \ - $(patsubst %.xml, %.tex, $(DOCBOOKS)) \ - $(patsubst %.xml, %.log, $(DOCBOOKS)) \ - $(patsubst %.xml, %.out, $(DOCBOOKS)) \ - $(patsubst %.xml, %.ps, $(DOCBOOKS)) \ - $(patsubst %.xml, %.pdf, $(DOCBOOKS)) \ - $(patsubst %.xml, %.html, $(DOCBOOKS)) \ - $(patsubst %.xml, %.9, $(DOCBOOKS)) \ - $(patsubst %.xml, %.aux.xml, $(DOCBOOKS)) \ - $(patsubst %.xml, %.xml.db, $(DOCBOOKS)) \ - $(patsubst %.xml, %.xml, $(DOCBOOKS)) \ - $(patsubst %.xml, .%.xml.cmd, $(DOCBOOKS)) \ - $(index) - -clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man - -cleandocs: - $(Q)rm -f $(call objectify, $(clean-files)) - $(Q)rm -rf $(call objectify, $(clean-dirs)) - -# Declare the contents of the .PHONY variable as phony. We keep that -# information in a variable so we can use it in if_changed and friends. - -.PHONY: $(PHONY) diff --git a/srcpkgs/pinebookpro-kernel/files/dotconfig b/srcpkgs/pinebookpro-kernel/files/dotconfig index 2c383ae7736..a4b353fa6e5 100644 --- a/srcpkgs/pinebookpro-kernel/files/dotconfig +++ b/srcpkgs/pinebookpro-kernel/files/dotconfig @@ -1,17 +1,21 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.9 Kernel Configuration +# Linux/arm64 5.15.28 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 10.2.1 20201203" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=100201 -CONFIG_LD_VERSION=235010000 CONFIG_CLANG_VERSION=0 +CONFIG_AS_IS_GNU=y +CONFIG_AS_VERSION=23501 +CONFIG_LD_IS_BFD=y +CONFIG_LD_VERSION=23501 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_INLINE=y +CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -21,6 +25,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set +# CONFIG_WERROR is not set CONFIG_LOCALVERSION="_1" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="" @@ -61,7 +66,6 @@ CONFIG_SPARSE_IRQ=y CONFIG_GENERIC_IRQ_DEBUGFS=y # end of IRQ subsystem -CONFIG_GENERIC_IRQ_MULTI_HANDLER=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_ARCH_HAS_TICK_BROADCAST=y @@ -79,9 +83,26 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y # end of Timers subsystem +CONFIG_BPF=y +CONFIG_HAVE_EBPF_JIT=y +CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y + +# +# BPF subsystem +# +CONFIG_BPF_SYSCALL=y +CONFIG_BPF_JIT=y +# CONFIG_BPF_JIT_ALWAYS_ON is not set +CONFIG_BPF_JIT_DEFAULT_ON=y +# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_USERMODE_DRIVER=y +# CONFIG_BPF_PRELOAD is not set +# end of BPF subsystem + # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set +# CONFIG_SCHED_CORE is not set # # CPU/Task time and stats accounting @@ -123,6 +144,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=23 CONFIG_LOG_CPU_MAX_BUF_SHIFT=14 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=15 +# CONFIG_PRINTK_INDEX is not set CONFIG_GENERIC_SCHED_CLOCK=y # @@ -155,6 +177,7 @@ CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_PERF=y CONFIG_CGROUP_BPF=y +CONFIG_CGROUP_MISC=y # CONFIG_CGROUP_DEBUG is not set CONFIG_SOCK_CGROUP_DATA=y CONFIG_NAMESPACES=y @@ -184,7 +207,6 @@ CONFIG_LD_ORPHAN_WARN=y CONFIG_SYSCTL=y CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_BPF=y CONFIG_EXPERT=y CONFIG_UID16=y CONFIG_MULTIUSER=y @@ -193,7 +215,6 @@ CONFIG_SYSFS_SYSCALL=y CONFIG_FHANDLE=y CONFIG_POSIX_TIMERS=y CONFIG_PRINTK=y -CONFIG_PRINTK_NMI=y CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y @@ -212,14 +233,9 @@ CONFIG_MEMBARRIER=y CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=y -CONFIG_BPF_SYSCALL=y -CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y -# CONFIG_BPF_JIT_ALWAYS_ON is not set -CONFIG_BPF_JIT_DEFAULT_ON=y -CONFIG_USERMODE_DRIVER=y -# CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_DEBUG_RSEQ is not set # CONFIG_EMBEDDED is not set @@ -235,7 +251,6 @@ CONFIG_PERF_EVENTS=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB_DEBUG=y -# CONFIG_SLUB_MEMCG_SYSFS_ON is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y @@ -245,6 +260,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB_FREELIST_HARDENED is not set # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set CONFIG_SLUB_CPU_PARTIAL=y +CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y # end of General setup @@ -261,16 +277,12 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 CONFIG_STACKTRACE_SUPPORT=y CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_LOCKDEP_SUPPORT=y -CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ZONE_DMA=y -CONFIG_ZONE_DMA32=y -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y CONFIG_SMP=y CONFIG_KERNEL_MODE_NEON=y CONFIG_FIX_EARLYCON_MEM=y @@ -282,10 +294,11 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y # Platform selection # # CONFIG_ARCH_ACTIONS is not set -# CONFIG_ARCH_AGILEX is not set # CONFIG_ARCH_SUNXI is not set # CONFIG_ARCH_ALPINE is not set +# CONFIG_ARCH_APPLE is not set # CONFIG_ARCH_BCM2835 is not set +# CONFIG_ARCH_BCM4908 is not set # CONFIG_ARCH_BCM_IPROC is not set # CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_BITMAIN is not set @@ -307,7 +320,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y CONFIG_ARCH_ROCKCHIP=y # CONFIG_ARCH_S32 is not set # CONFIG_ARCH_SEATTLE is not set -# CONFIG_ARCH_STRATIX10 is not set +# CONFIG_ARCH_INTEL_SOCFPGA is not set # CONFIG_ARCH_SYNQUACER is not set # CONFIG_ARCH_TEGRA is not set # CONFIG_ARCH_SPRD is not set @@ -317,7 +330,6 @@ CONFIG_ARCH_ROCKCHIP=y # CONFIG_ARCH_VEXPRESS is not set # CONFIG_ARCH_VISCONTI is not set # CONFIG_ARCH_XGENE is not set -# CONFIG_ARCH_ZX is not set # CONFIG_ARCH_ZYNQMP is not set # end of Platform selection @@ -337,6 +349,7 @@ CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=y CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y +CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y CONFIG_ARM64_ERRATUM_1024718=y CONFIG_ARM64_ERRATUM_1418040=y CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y @@ -359,6 +372,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1003=y CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_QDF2400_ERRATUM_0065=y CONFIG_QCOM_FALKOR_ERRATUM_E1041=y +CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y CONFIG_SOCIONEXT_SYNQUACER_PREITS=y # end of ARM errata workarounds via the alternatives framework @@ -377,32 +391,25 @@ CONFIG_SCHED_SMT=y CONFIG_NR_CPUS=256 CONFIG_HOTPLUG_CPU=y # CONFIG_NUMA is not set -CONFIG_HOLES_IN_ZONE=y CONFIG_HZ_100=y # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set CONFIG_HZ=100 CONFIG_SCHED_HRTICK=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HW_PERF_EVENTS=y -CONFIG_SYS_SUPPORTS_HUGETLBFS=y -CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y # CONFIG_KEXEC is not set # CONFIG_KEXEC_FILE is not set # CONFIG_CRASH_DUMP is not set +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 @@ -418,15 +425,15 @@ CONFIG_SETEND_EMULATION=y # CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y +CONFIG_AS_HAS_LDAPR=y +CONFIG_AS_HAS_LSE_ATOMICS=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_USE_LSE_ATOMICS=y -CONFIG_ARM64_VHE=y # end of ARMv8.1 architectural features # # ARMv8.2 architectural features # -CONFIG_ARM64_UAO=y # CONFIG_ARM64_PMEM is not set CONFIG_ARM64_RAS_EXTN=y CONFIG_ARM64_CNP=y @@ -436,6 +443,7 @@ CONFIG_ARM64_CNP=y # ARMv8.3 architectural features # CONFIG_ARM64_PTR_AUTH=y +CONFIG_ARM64_PTR_AUTH_KERNEL=y CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y CONFIG_AS_HAS_PAC=y @@ -453,6 +461,7 @@ CONFIG_ARM64_TLB_RANGE=y # # ARMv8.5 architectural features # +CONFIG_AS_HAS_ARMV8_5=y CONFIG_ARM64_BTI=y CONFIG_ARM64_BTI_KERNEL=y CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y @@ -462,6 +471,12 @@ CONFIG_ARM64_AS_HAS_MTE=y CONFIG_ARM64_MTE=y # end of ARMv8.5 architectural features +# +# ARMv8.7 architectural features +# +CONFIG_ARM64_EPAN=y +# end of ARMv8.7 architectural features + CONFIG_ARM64_SVE=y CONFIG_ARM64_MODULE_PLTS=y # CONFIG_ARM64_PSEUDO_NMI is not set @@ -482,7 +497,6 @@ CONFIG_DMI=y # end of Boot options CONFIG_SYSVIPC_COMPAT=y -CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y # # Power management options @@ -564,56 +578,11 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPUFREQ_DT=y CONFIG_CPUFREQ_DT_PLATDEV=y CONFIG_ACPI_CPPC_CPUFREQ=y +CONFIG_ACPI_CPPC_CPUFREQ_FIE=y CONFIG_ARM_SCPI_CPUFREQ=y # end of CPU Frequency scaling # end of CPU Power Management -# -# Firmware Drivers -# -# CONFIG_ARM_SCMI_PROTOCOL is not set -CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_ARM_SCPI_POWER_DOMAIN=y -# CONFIG_ARM_SDE_INTERFACE is not set -# CONFIG_FIRMWARE_MEMMAP is not set -CONFIG_DMIID=y -CONFIG_DMI_SYSFS=y -# CONFIG_ISCSI_IBFT is not set -# CONFIG_FW_CFG_SYSFS is not set -# CONFIG_GOOGLE_FIRMWARE is not set - -# -# EFI (Extensible Firmware Interface) Support -# -CONFIG_EFI_ESRT=y -CONFIG_EFI_VARS_PSTORE=y -CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y -CONFIG_EFI_PARAMS_FROM_FDT=y -CONFIG_EFI_RUNTIME_WRAPPERS=y -CONFIG_EFI_GENERIC_STUB=y -# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set -CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y -CONFIG_EFI_BOOTLOADER_CONTROL=y -# CONFIG_EFI_CAPSULE_LOADER is not set -# CONFIG_EFI_TEST is not set -# CONFIG_RESET_ATTACK_MITIGATION is not set -# CONFIG_EFI_DISABLE_PCI_DMA is not set -# end of EFI (Extensible Firmware Interface) Support - -CONFIG_EFI_EARLYCON=y -CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y -CONFIG_ARM_PSCI_FW=y -# CONFIG_ARM_PSCI_CHECKER is not set -CONFIG_HAVE_ARM_SMCCC=y -CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y -CONFIG_ARM_SMCCC_SOC_ID=y - -# -# Tegra firmware driver -# -# end of Tegra firmware driver -# end of Firmware Drivers - CONFIG_ARCH_SUPPORTS_ACPI=y CONFIG_ACPI=y CONFIG_ACPI_GENERIC_GSI=y @@ -665,7 +634,8 @@ CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y CONFIG_HAVE_KVM_IRQ_BYPASS=y CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y -CONFIG_KVM_ARM_PMU=y +CONFIG_KVM_XFER_TO_GUEST_WORK=y +# CONFIG_NVHE_EL2_DEBUG is not set CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_SHA256_ARM64=y CONFIG_CRYPTO_SHA512_ARM64=y @@ -691,7 +661,6 @@ CONFIG_CRYPTO_AES_ARM64_BS=y # General architecture-dependent options # CONFIG_CRASH_CORE=y -CONFIG_SET_FS=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y # CONFIG_STATIC_KEYS_SELFTEST is not set @@ -701,6 +670,7 @@ CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y CONFIG_HAVE_NMI=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y @@ -710,6 +680,7 @@ CONFIG_ARCH_HAS_KEEPINITRD=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_ARCH_WANTS_NO_INSTR=y CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y @@ -730,16 +701,23 @@ CONFIG_HAVE_ARCH_SECCOMP=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP=y CONFIG_SECCOMP_FILTER=y +# CONFIG_SECCOMP_CACHE_DEBUG is not set CONFIG_HAVE_ARCH_STACKLEAK=y CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_ARCH_SUPPORTS_LTO_CLANG=y +CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y +CONFIG_LTO_NONE=y +CONFIG_ARCH_SUPPORTS_CFI_CLANG=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MOVE_PUD=y CONFIG_HAVE_MOVE_PMD=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y @@ -754,6 +732,8 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_VMAP_STACK=y +CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y +# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y @@ -764,6 +744,8 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_RELR=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y # # GCOV-based kernel profiling @@ -788,27 +770,28 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set -CONFIG_MODULE_COMPRESS=y +# CONFIG_MODULE_COMPRESS_NONE is not set CONFIG_MODULE_COMPRESS_GZIP=y # CONFIG_MODULE_COMPRESS_XZ is not set +# CONFIG_MODULE_COMPRESS_ZSTD is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set -CONFIG_UNUSED_SYMBOLS=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" +# CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y -CONFIG_BLK_SCSI_REQUEST=y CONFIG_BLK_CGROUP_RWSTAT=y -CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_INTEGRITY_T10=y CONFIG_BLK_DEV_ZONED=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_DEV_THROTTLING_LOW is not set -CONFIG_BLK_CMDLINE_PARSER=y CONFIG_BLK_WBT=y +CONFIG_BLK_WBT_MQ=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_CGROUP_IOCOST is not set -CONFIG_BLK_WBT_MQ=y +# CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y CONFIG_BLK_SED_OPAL=y @@ -844,6 +827,7 @@ CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_PM=y +CONFIG_BLOCK_HOLDER_DEPRECATED=y # # IO Schedulers @@ -939,9 +923,6 @@ CONFIG_COREDUMP=y # # Memory Management options # -CONFIG_SELECT_MEMORY_MODEL=y -# CONFIG_FLATMEM_MANUAL is not set -CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y @@ -949,16 +930,19 @@ CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_HAVE_FAST_GUP=y CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # CONFIG_MEMORY_HOTPLUG is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_MEMORY_BALLOON=y CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y +CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_CONTIG_ALLOC=y CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_BOUNCE=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 @@ -970,6 +954,7 @@ CONFIG_FRONTSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set CONFIG_CMA_DEBUGFS=y +# CONFIG_CMA_SYSFS is not set CONFIG_CMA_AREAS=7 CONFIG_ZSWAP=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set @@ -992,12 +977,22 @@ CONFIG_ZSMALLOC=y CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_IDLE_PAGE_TRACKING is not set +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_PTE_DEVMAP=y -CONFIG_FRAME_VECTOR=y +CONFIG_ARCH_HAS_ZONE_DMA_SET=y +CONFIG_ZONE_DMA=y +CONFIG_ZONE_DMA32=y CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y # CONFIG_PERCPU_STATS is not set -# CONFIG_GUP_BENCHMARK is not set +# CONFIG_GUP_TEST is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_SECRETMEM=y + +# +# Data Access Monitoring +# +# CONFIG_DAMON is not set +# end of Data Access Monitoring # end of Memory Management options CONFIG_NET=y @@ -1014,6 +1009,7 @@ CONFIG_PACKET=y CONFIG_PACKET_DIAG=m CONFIG_UNIX=y CONFIG_UNIX_SCM=y +CONFIG_AF_UNIX_OOB=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m # CONFIG_TLS_DEVICE is not set @@ -1118,6 +1114,7 @@ CONFIG_IPV6_SEG6_LWTUNNEL=y CONFIG_IPV6_SEG6_HMAC=y CONFIG_IPV6_SEG6_BPF=y # CONFIG_IPV6_RPL_LWTUNNEL is not set +# CONFIG_IPV6_IOAM6_LWTUNNEL is not set CONFIG_NETLABEL=y # CONFIG_MPTCP is not set # CONFIG_NETWORK_SECMARK is not set @@ -1134,13 +1131,13 @@ CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_FAMILY_BRIDGE=y CONFIG_NETFILTER_FAMILY_ARP=y +# CONFIG_NETFILTER_NETLINK_HOOK is not set CONFIG_NETFILTER_NETLINK_ACCT=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NF_CONNTRACK=m -CONFIG_NF_LOG_COMMON=m -CONFIG_NF_LOG_NETDEV=m +CONFIG_NF_LOG_SYSLOG=m CONFIG_NETFILTER_CONNCOUNT=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_ZONES=y @@ -1209,9 +1206,11 @@ CONFIG_NF_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FIB_NETDEV=m +# CONFIG_NFT_REJECT_NETDEV is not set CONFIG_NF_FLOW_TABLE_INET=m CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XTABLES=y +CONFIG_NETFILTER_XTABLES_COMPAT=y # # Xtables combined modules @@ -1348,6 +1347,7 @@ CONFIG_IP_VS_SH=m CONFIG_IP_VS_MH=m CONFIG_IP_VS_SED=m CONFIG_IP_VS_NQ=m +# CONFIG_IP_VS_TWOS is not set # # IPVS SH scheduler @@ -1448,7 +1448,6 @@ CONFIG_NF_DEFRAG_IPV6=m CONFIG_NF_TABLES_BRIDGE=m # CONFIG_NFT_BRIDGE_META is not set CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NF_LOG_BRIDGE=m # CONFIG_NF_CONNTRACK_BRIDGE is not set CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m @@ -1525,23 +1524,28 @@ CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE_VLAN_FILTERING=y # CONFIG_BRIDGE_MRP is not set -CONFIG_HAVE_NET_DSA=y +# CONFIG_BRIDGE_CFM is not set CONFIG_NET_DSA=m # CONFIG_NET_DSA_TAG_AR9331 is not set CONFIG_NET_DSA_TAG_BRCM_COMMON=m CONFIG_NET_DSA_TAG_BRCM=m +CONFIG_NET_DSA_TAG_BRCM_LEGACY=m CONFIG_NET_DSA_TAG_BRCM_PREPEND=m +# CONFIG_NET_DSA_TAG_HELLCREEK is not set # CONFIG_NET_DSA_TAG_GSWIP is not set +CONFIG_NET_DSA_TAG_DSA_COMMON=m CONFIG_NET_DSA_TAG_DSA=m CONFIG_NET_DSA_TAG_EDSA=m # CONFIG_NET_DSA_TAG_MTK is not set # CONFIG_NET_DSA_TAG_KSZ is not set # CONFIG_NET_DSA_TAG_RTL4_A is not set # CONFIG_NET_DSA_TAG_OCELOT is not set +# CONFIG_NET_DSA_TAG_OCELOT_8021Q is not set CONFIG_NET_DSA_TAG_QCA=m # CONFIG_NET_DSA_TAG_LAN9303 is not set # CONFIG_NET_DSA_TAG_SJA1105 is not set CONFIG_NET_DSA_TAG_TRAILER=m +# CONFIG_NET_DSA_TAG_XRS700X is not set CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y @@ -1678,9 +1682,7 @@ CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y -CONFIG_BATMAN_ADV_DEBUGFS=y # CONFIG_BATMAN_ADV_DEBUG is not set -# CONFIG_BATMAN_ADV_SYSFS is not set CONFIG_OPENVSWITCH=m CONFIG_OPENVSWITCH_GRE=m CONFIG_OPENVSWITCH_VXLAN=m @@ -1701,14 +1703,15 @@ CONFIG_NET_SWITCHDEV=y CONFIG_NET_L3_MASTER_DEV=y # CONFIG_QRTR is not set # CONFIG_NET_NCSI is not set +CONFIG_PCPU_DEV_REFCNT=y CONFIG_RPS=y CONFIG_RFS_ACCEL=y +CONFIG_SOCK_RX_QUEUE_MAPPING=y CONFIG_XPS=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y -CONFIG_BPF_JIT=y CONFIG_BPF_STREAM_PARSER=y CONFIG_NET_FLOW_LIMIT=y @@ -1767,6 +1770,7 @@ CONFIG_CAN_CC770=m CONFIG_CAN_CC770_PLATFORM=m # CONFIG_CAN_IFI_CANFD is not set CONFIG_CAN_M_CAN=m +# CONFIG_CAN_M_CAN_PCI is not set # CONFIG_CAN_M_CAN_PLATFORM is not set # CONFIG_CAN_M_CAN_TCAN4X5X is not set # CONFIG_CAN_PEAK_PCIEFD is not set @@ -1795,6 +1799,7 @@ CONFIG_CAN_SOFTING=m CONFIG_CAN_8DEV_USB=m CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m +# CONFIG_CAN_ETAS_ES58X is not set CONFIG_CAN_GS_USB=m CONFIG_CAN_KVASER_USB=m # CONFIG_CAN_MCBA_USB is not set @@ -1818,6 +1823,7 @@ CONFIG_BT_LE=y CONFIG_BT_6LOWPAN=m # CONFIG_BT_LEDS is not set # CONFIG_BT_MSFTEXT is not set +# CONFIG_BT_AOSPEXT is not set CONFIG_BT_DEBUGFS=y # CONFIG_BT_SELFTEST is not set @@ -1858,11 +1864,13 @@ CONFIG_BT_ATH3K=m # CONFIG_BT_MTKSDIO is not set # CONFIG_BT_MTKUART is not set CONFIG_BT_HCIRSI=m +# CONFIG_BT_VIRTIO is not set # end of Bluetooth device drivers # CONFIG_AF_RXRPC is not set # CONFIG_AF_KCM is not set CONFIG_STREAM_PARSER=y +# CONFIG_MCTP is not set CONFIG_FIB_RULES=y CONFIG_WIRELESS=y CONFIG_WIRELESS_EXT=y @@ -1898,7 +1906,6 @@ CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 -# CONFIG_WIMAX is not set CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y @@ -1924,6 +1931,7 @@ CONFIG_NFC_SHDLC=y # CONFIG_NFC_TRF7970A is not set CONFIG_NFC_SIM=m CONFIG_NFC_PORT100=m +# CONFIG_NFC_VIRTUAL_NCI is not set # CONFIG_NFC_FDP is not set CONFIG_NFC_PN544=m CONFIG_NFC_PN544_I2C=m @@ -1941,6 +1949,7 @@ CONFIG_NFC_ST21NFCA_I2C=m # CONFIG_NFC_ST_NCI_SPI is not set # CONFIG_NFC_NXP_NCI is not set # CONFIG_NFC_S3FWRN5_I2C is not set +# CONFIG_NFC_S3FWRN82_UART is not set # CONFIG_NFC_ST95HF is not set # end of Near Field Communication (NFC) devices @@ -1950,12 +1959,12 @@ CONFIG_LWTUNNEL=y CONFIG_LWTUNNEL_BPF=y CONFIG_DST_CACHE=y CONFIG_GRO_CELLS=y +CONFIG_NET_SELFTESTS=y CONFIG_NET_SOCK_MSG=y CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y CONFIG_FAILOVER=m CONFIG_ETHTOOL_NETLINK=y -CONFIG_HAVE_EBPF_JIT=y # # Device Drivers @@ -1976,7 +1985,6 @@ CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y # CONFIG_PCIE_PTM is not set -# CONFIG_PCIE_BW is not set CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_QUIRKS=y @@ -2015,6 +2023,7 @@ CONFIG_PCI_XGENE_MSI=y # CONFIG_PCI_HOST_THUNDER_ECAM is not set CONFIG_PCIE_ROCKCHIP=y CONFIG_PCIE_ROCKCHIP_HOST=y +# CONFIG_PCIE_MICROCHIP_HOST is not set # # DesignWare PCI Core Support @@ -2024,6 +2033,7 @@ CONFIG_PCIE_DW_HOST=y CONFIG_PCIE_DW_PLAT=y CONFIG_PCIE_DW_PLAT_HOST=y CONFIG_PCI_HISI=y +# CONFIG_PCIE_ROCKCHIP_DW_HOST is not set # CONFIG_PCIE_KIRIN is not set # CONFIG_PCI_MESON is not set # CONFIG_PCIE_AL is not set @@ -2032,7 +2042,6 @@ CONFIG_PCI_HISI=y # # Mobiveil PCIe Core Support # -# CONFIG_PCIE_LAYERSCAPE_GEN4 is not set # end of Mobiveil PCIe Core Support # @@ -2055,12 +2064,14 @@ CONFIG_PCI_HISI=y # CONFIG_PCI_SW_SWITCHTEC is not set # end of PCI switch controller drivers +# CONFIG_CXL_BUS is not set # CONFIG_PCCARD is not set # CONFIG_RAPIDIO is not set # # Generic Driver Options # +CONFIG_AUXILIARY_BUS=y # CONFIG_UEVENT_HELPER is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y @@ -2088,9 +2099,8 @@ CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_SOC_BUS=y CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_I2C=y CONFIG_REGMAP_SPI=y -CONFIG_REGMAP_SPMI=y CONFIG_REGMAP_MMIO=y CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y @@ -2105,13 +2115,68 @@ CONFIG_ARM_CCI=y CONFIG_ARM_CCI400_COMMON=y # CONFIG_BRCMSTB_GISB_ARB is not set # CONFIG_MOXTET is not set -CONFIG_SIMPLE_PM_BUS=y CONFIG_VEXPRESS_CONFIG=y # CONFIG_MHI_BUS is not set # end of Bus devices CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y + +# +# Firmware Drivers +# + +# +# ARM System Control and Management Interface Protocol +# +# CONFIG_ARM_SCMI_PROTOCOL is not set +# end of ARM System Control and Management Interface Protocol + +CONFIG_ARM_SCPI_PROTOCOL=y +CONFIG_ARM_SCPI_POWER_DOMAIN=y +# CONFIG_ARM_SDE_INTERFACE is not set +# CONFIG_FIRMWARE_MEMMAP is not set +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=y +# CONFIG_ISCSI_IBFT is not set +# CONFIG_FW_CFG_SYSFS is not set +CONFIG_SYSFB=y +# CONFIG_SYSFB_SIMPLEFB is not set +# CONFIG_ARM_FFA_TRANSPORT is not set +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_ESRT=y +CONFIG_EFI_VARS_PSTORE=y +CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y +CONFIG_EFI_PARAMS_FROM_FDT=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_GENERIC_STUB=y +# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set +CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y +CONFIG_EFI_BOOTLOADER_CONTROL=y +# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_TEST is not set +# CONFIG_RESET_ATTACK_MITIGATION is not set +# CONFIG_EFI_DISABLE_PCI_DMA is not set +# end of EFI (Extensible Firmware Interface) Support + +CONFIG_EFI_EARLYCON=y +CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y +CONFIG_ARM_PSCI_FW=y +# CONFIG_ARM_PSCI_CHECKER is not set +CONFIG_HAVE_ARM_SMCCC=y +CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y +CONFIG_ARM_SMCCC_SOC_ID=y + +# +# Tegra firmware driver +# +# end of Tegra firmware driver +# end of Firmware Drivers + # CONFIG_GNSS is not set CONFIG_MTD=y # CONFIG_MTD_TESTS is not set @@ -2132,6 +2197,10 @@ CONFIG_MTD_OF_PARTS=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set + +# +# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK. +# # CONFIG_FTL is not set # CONFIG_NFTL is not set # CONFIG_INFTL is not set @@ -2182,6 +2251,7 @@ CONFIG_MTD_PHYSMAP_OF=y # CONFIG_MTD_PMC551 is not set # CONFIG_MTD_DATAFLASH is not set # CONFIG_MTD_MCHP23K256 is not set +# CONFIG_MTD_MCHP48L640 is not set # CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set @@ -2199,10 +2269,7 @@ CONFIG_MTD_PHYSMAP_OF=y # CONFIG_MTD_NAND_CORE=y # CONFIG_MTD_ONENAND is not set -CONFIG_MTD_NAND_ECC_SW_HAMMING=y -# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set CONFIG_MTD_RAW_NAND=y -# CONFIG_MTD_NAND_ECC_SW_BCH is not set # # Raw/parallel NAND flash controllers @@ -2216,6 +2283,8 @@ CONFIG_MTD_RAW_NAND=y # CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_NAND_CADENCE is not set # CONFIG_MTD_NAND_ARASAN is not set +# CONFIG_MTD_NAND_INTEL_LGM is not set +# CONFIG_MTD_NAND_ROCKCHIP is not set # # Misc @@ -2229,6 +2298,9 @@ CONFIG_MTD_RAW_NAND=y # ECC engine support # CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_ECC_SW_HAMMING=y +# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set +# CONFIG_MTD_NAND_ECC_SW_BCH is not set # end of ECC engine support # end of NAND @@ -2240,6 +2312,9 @@ CONFIG_MTD_NAND_ECC=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set +CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y +# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 @@ -2256,7 +2331,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_OVERLAY is not set # CONFIG_PARPORT is not set @@ -2272,16 +2346,21 @@ CONFIG_BLK_DEV_NULL_BLK=m CONFIG_CDROM=y # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=m +CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set +# CONFIG_ZRAM_DEF_COMP_LZO is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_842 is not set +CONFIG_ZRAM_DEF_COMP="lzo-rle" # CONFIG_ZRAM_WRITEBACK is not set # CONFIG_ZRAM_MEMORY_TRACKING is not set -CONFIG_BLK_DEV_UMEM=m CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_SKD=m CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 @@ -2317,6 +2396,7 @@ CONFIG_TIFM_CORE=y CONFIG_TIFM_7XX1=m # CONFIG_ICS932S401 is not set CONFIG_ENCLOSURE_SERVICES=m +# CONFIG_HI6421V600_IRQ is not set # CONFIG_HP_ILO is not set CONFIG_APDS9802ALS=m CONFIG_ISL29003=m @@ -2328,9 +2408,9 @@ CONFIG_SENSORS_APDS990X=m # CONFIG_DS1682 is not set # CONFIG_LATTICE_ECP3_CONFIG is not set CONFIG_SRAM=y +# CONFIG_DW_XDATA_PCIE is not set # CONFIG_PCI_ENDPOINT_TEST is not set # CONFIG_XILINX_SDFEC is not set -# CONFIG_PVPANIC is not set # CONFIG_HISI_HIKEY_USB is not set # CONFIG_C2PORT is not set @@ -2358,18 +2438,16 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y # end of Texas Instruments shared transport line discipline CONFIG_SENSORS_LIS3_I2C=m - -# -# Altera FPGA firmware download module (requires I2C) -# CONFIG_ALTERA_STAPL=m # CONFIG_GENWQE is not set CONFIG_ECHO=m +# CONFIG_BCM_VK is not set # CONFIG_MISC_ALCOR_PCI is not set # CONFIG_MISC_RTSX_PCI is not set # CONFIG_MISC_RTSX_USB is not set # CONFIG_HABANA_AI is not set # CONFIG_UACCE is not set +# CONFIG_PVPANIC is not set # end of Misc devices # @@ -2377,6 +2455,7 @@ CONFIG_ECHO=m # CONFIG_SCSI_MOD=y CONFIG_RAID_ATTRS=m +CONFIG_SCSI_COMMON=y CONFIG_SCSI=y CONFIG_SCSI_DMA=y CONFIG_SCSI_NETLINK=y @@ -2389,6 +2468,7 @@ CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_CHR_DEV_SG=y +CONFIG_BLK_DEV_BSG=y CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_ENCLOSURE=m CONFIG_SCSI_CONSTANTS=y @@ -2440,6 +2520,7 @@ CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m # CONFIG_SCSI_MPT3SAS is not set # CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_MPI3MR is not set # CONFIG_SCSI_SMARTPQI is not set CONFIG_SCSI_UFSHCD=y CONFIG_SCSI_UFSHCD_PCI=m @@ -2448,6 +2529,7 @@ CONFIG_SCSI_UFSHCD_PLATFORM=y # CONFIG_SCSI_UFS_CDNS_PLATFORM is not set # CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set # CONFIG_SCSI_UFS_BSG is not set +# CONFIG_SCSI_UFS_HPB is not set CONFIG_SCSI_HPTIOP=m # CONFIG_SCSI_MYRB is not set # CONFIG_SCSI_MYRS is not set @@ -2458,7 +2540,6 @@ CONFIG_SCSI_SNIC=m # CONFIG_SCSI_SNIC_DEBUG_FS is not set CONFIG_SCSI_DMX3191D=m # CONFIG_SCSI_FDOMAIN_PCI is not set -# CONFIG_SCSI_GDTH is not set # CONFIG_SCSI_IPS is not set CONFIG_SCSI_INITIO=m CONFIG_SCSI_INIA100=m @@ -2477,6 +2558,7 @@ CONFIG_TCM_QLA2XXX=m # CONFIG_TCM_QLA2XXX_DEBUG is not set CONFIG_SCSI_QLA_ISCSI=m # CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_EFCT is not set CONFIG_SCSI_DC395x=m CONFIG_SCSI_AM53C974=m CONFIG_SCSI_WD719X=m @@ -2635,6 +2717,7 @@ CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_QL=m CONFIG_DM_MULTIPATH_ST=m # CONFIG_DM_MULTIPATH_HST is not set +# CONFIG_DM_MULTIPATH_IOA is not set CONFIG_DM_DELAY=m CONFIG_DM_DUST=m CONFIG_DM_INIT=y @@ -2722,11 +2805,12 @@ CONFIG_NET_DSA_MV88E6060=m # CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set # CONFIG_NET_DSA_MICROCHIP_KSZ8795 is not set CONFIG_NET_DSA_MV88E6XXX=m -CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y CONFIG_NET_DSA_MV88E6XXX_PTP=y # CONFIG_NET_DSA_MSCC_SEVILLE is not set # CONFIG_NET_DSA_AR9331 is not set # CONFIG_NET_DSA_SJA1105 is not set +# CONFIG_NET_DSA_XRS700X_I2C is not set +# CONFIG_NET_DSA_XRS700X_MDIO is not set CONFIG_NET_DSA_QCA8K=m # CONFIG_NET_DSA_REALTEK_SMI is not set # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set @@ -2764,7 +2848,6 @@ CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m CONFIG_ALX=m -# CONFIG_NET_VENDOR_AURORA is not set CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y @@ -2831,7 +2914,10 @@ CONFIG_I40EVF=m # CONFIG_ICE is not set CONFIG_FM10K=m # CONFIG_IGC is not set +CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_JME=m +CONFIG_NET_VENDOR_LITEX=y +# CONFIG_LITEX_LITEETH is not set CONFIG_NET_VENDOR_MARVELL=y CONFIG_MVMDIO=m CONFIG_SKGE=m @@ -2851,6 +2937,7 @@ CONFIG_MLX4_CORE_GEN2=y # CONFIG_MLX5_CORE is not set # CONFIG_MLXSW_CORE is not set # CONFIG_MLXFW is not set +# CONFIG_MLXBF_GIGE is not set CONFIG_NET_VENDOR_MICREL=y # CONFIG_KS8842 is not set # CONFIG_KS8851 is not set @@ -2925,6 +3012,7 @@ CONFIG_DWMAC_DWC_QOS_ETH=m CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_ROCKCHIP=m # CONFIG_DWMAC_INTEL_PLAT is not set +# CONFIG_DWMAC_LOONGSON is not set # CONFIG_STMMAC_PCI is not set # CONFIG_NET_VENDOR_SUN is not set CONFIG_NET_VENDOR_SYNOPSYS=y @@ -2940,6 +3028,7 @@ CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_VELOCITY=m # CONFIG_NET_VENDOR_WIZNET is not set CONFIG_NET_VENDOR_XILINX=y +# CONFIG_XILINX_EMACLITE is not set # CONFIG_XILINX_AXI_EMAC is not set # CONFIG_XILINX_LL_TEMAC is not set # CONFIG_FDDI is not set @@ -2958,7 +3047,7 @@ CONFIG_SFP=m CONFIG_AMD_PHY=m # CONFIG_ADIN_PHY is not set # CONFIG_AQUANTIA_PHY is not set -# CONFIG_AX88796B_PHY is not set +CONFIG_AX88796B_PHY=m CONFIG_BROADCOM_PHY=m # CONFIG_BCM54140_PHY is not set CONFIG_BCM7XXX_PHY=m @@ -2974,11 +3063,16 @@ CONFIG_LXT_PHY=m CONFIG_LSI_ET1011C_PHY=m CONFIG_MARVELL_PHY=m CONFIG_MARVELL_10G_PHY=m +# CONFIG_MARVELL_88X2222_PHY is not set +# CONFIG_MAXLINEAR_GPHY is not set +# CONFIG_MEDIATEK_GE_PHY is not set CONFIG_MICREL_PHY=m CONFIG_MICROCHIP_PHY=m # CONFIG_MICROCHIP_T1_PHY is not set # CONFIG_MICROSEMI_PHY is not set +# CONFIG_MOTORCOMM_PHY is not set CONFIG_NATIONAL_PHY=m +# CONFIG_NXP_C45_TJA11XX_PHY is not set # CONFIG_NXP_TJA11XX_PHY is not set CONFIG_AT803X_PHY=m CONFIG_QSEMI_PHY=m @@ -2998,7 +3092,9 @@ CONFIG_VITESSE_PHY=m # CONFIG_MICREL_KS8995MA is not set CONFIG_MDIO_DEVICE=y CONFIG_MDIO_BUS=y +CONFIG_FWNODE_MDIO=y CONFIG_OF_MDIO=y +CONFIG_ACPI_MDIO=y CONFIG_MDIO_DEVRES=y CONFIG_MDIO_BITBANG=m CONFIG_MDIO_BCM_UNIMAC=m @@ -3087,8 +3183,8 @@ CONFIG_USB_SIERRA_NET=m CONFIG_USB_VL600=m CONFIG_USB_NET_CH9200=m # CONFIG_USB_NET_AQC111 is not set +# CONFIG_USB_RTL8153_ECM is not set CONFIG_WLAN=y -# CONFIG_WIRELESS_WDS is not set CONFIG_WLAN_VENDOR_ADMTEK=y CONFIG_ADM8211=m CONFIG_ATH_COMMON=m @@ -3248,7 +3344,6 @@ CONFIG_P54_USB=m CONFIG_P54_PCI=m # CONFIG_P54_SPI is not set CONFIG_P54_LEDS=y -CONFIG_PRISM54=m CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m @@ -3275,6 +3370,7 @@ CONFIG_MT7601U=m # CONFIG_MT7663U is not set # CONFIG_MT7663S is not set # CONFIG_MT7915E is not set +# CONFIG_MT7921E is not set CONFIG_WLAN_VENDOR_MICROCHIP=y # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set @@ -3362,10 +3458,6 @@ CONFIG_QTNFMAC_PCIE=m CONFIG_MAC80211_HWSIM=m CONFIG_USB_NET_RNDIS_WLAN=m # CONFIG_VIRT_WIFI is not set - -# -# Enable WiMAX (Networking options) to see the WiMAX drivers -# # CONFIG_WAN is not set CONFIG_IEEE802154_DRIVERS=m CONFIG_IEEE802154_FAKELB=m @@ -3377,12 +3469,18 @@ CONFIG_IEEE802154_ATUSB=m # CONFIG_IEEE802154_CA8210 is not set # CONFIG_IEEE802154_MCR20A is not set # CONFIG_IEEE802154_HWSIM is not set + +# +# Wireless WAN +# +# CONFIG_WWAN is not set +# end of Wireless WAN + # CONFIG_VMXNET3 is not set # CONFIG_FUJITSU_ES is not set # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -# CONFIG_NVM is not set # # Input device support @@ -3390,7 +3488,6 @@ CONFIG_NET_FAILOVER=m CONFIG_INPUT=y CONFIG_INPUT_LEDS=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_POLLDEV is not set CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_MATRIXKMAP=y @@ -3445,12 +3542,15 @@ CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_BYD=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y CONFIG_MOUSE_PS2_CYPRESS=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y CONFIG_MOUSE_PS2_SENTELIC=y # CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_PS2_FOCALTECH=y +CONFIG_MOUSE_PS2_SMBUS=y CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m @@ -3492,25 +3592,23 @@ CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_JOYSTICK_PSXPAD_SPI is not set # CONFIG_JOYSTICK_PXRC is not set +# CONFIG_JOYSTICK_QWIIC is not set # CONFIG_JOYSTICK_FSIA6B is not set CONFIG_INPUT_TABLET=y CONFIG_TABLET_USB_ACECAD=m CONFIG_TABLET_USB_AIPTEK=m -CONFIG_TABLET_USB_GTCO=m CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_PEGASUS=m CONFIG_TABLET_SERIAL_WACOM4=m CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_PROPERTIES=y # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_AD7877 is not set # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_AR1021_I2C is not set -CONFIG_TOUCHSCREEN_ATMEL_MXT=m -# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set -CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set # CONFIG_TOUCHSCREEN_BU21013 is not set # CONFIG_TOUCHSCREEN_BU21029 is not set # CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set @@ -3519,38 +3617,40 @@ CONFIG_TOUCHSCREEN_AUO_PIXCIR=m # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set -CONFIG_TOUCHSCREEN_DYNAPRO=m +# CONFIG_TOUCHSCREEN_DYNAPRO is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set -CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_EGALAX=m +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_EGALAX is not set # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set # CONFIG_TOUCHSCREEN_EXC3000 is not set -CONFIG_TOUCHSCREEN_FUJITSU=m +# CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GOODIX is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set -CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set +# CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_S6SY761 is not set -CONFIG_TOUCHSCREEN_GUNZE=m +# CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_EKTF2127 is not set -CONFIG_TOUCHSCREEN_ELAN=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_WACOM_W8001=m -CONFIG_TOUCHSCREEN_WACOM_I2C=m +# CONFIG_TOUCHSCREEN_ELAN is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set # CONFIG_TOUCHSCREEN_MAX11801 is not set -CONFIG_TOUCHSCREEN_MCS5000=m -CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MMS114 is not set # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set -CONFIG_TOUCHSCREEN_MTOUCH=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_EDT_FT5X06=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_PIXCIR=m +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_PIXCIR is not set # CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set -# CONFIG_TOUCHSCREEN_WM97XX is not set CONFIG_TOUCHSCREEN_USB_COMPOSITE=m CONFIG_TOUCHSCREEN_USB_EGALAX=y CONFIG_TOUCHSCREEN_USB_PANJIT=y @@ -3570,24 +3670,22 @@ CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y -CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_TOUCHSCREEN_TSC_SERIO=m +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set # CONFIG_TOUCHSCREEN_TSC2004 is not set # CONFIG_TOUCHSCREEN_TSC2005 is not set -CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set # CONFIG_TOUCHSCREEN_RM_TS is not set # CONFIG_TOUCHSCREEN_SILEAD is not set # CONFIG_TOUCHSCREEN_SIS_I2C is not set -CONFIG_TOUCHSCREEN_ST1232=m +# CONFIG_TOUCHSCREEN_ST1232 is not set # CONFIG_TOUCHSCREEN_STMFTS is not set # CONFIG_TOUCHSCREEN_SUR40 is not set # CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set # CONFIG_TOUCHSCREEN_SX8654 is not set # CONFIG_TOUCHSCREEN_TPS6507X is not set # CONFIG_TOUCHSCREEN_ZET6223 is not set -CONFIG_TOUCHSCREEN_ZFORCE=m -# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set +# CONFIG_TOUCHSCREEN_ZFORCE is not set # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set # CONFIG_TOUCHSCREEN_ZINITIX is not set @@ -3614,9 +3712,11 @@ CONFIG_INPUT_PWM_BEEPER=m # CONFIG_INPUT_PWM_VIBRA is not set CONFIG_INPUT_RK805_PWRKEY=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +# CONFIG_INPUT_DA7280_HAPTICS is not set # CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m # CONFIG_INPUT_SOC_BUTTON_ARRAY is not set @@ -3716,9 +3816,9 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_SIFIVE is not set # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SC16IS7XX is not set +# CONFIG_SERIAL_BCM63XX is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set -# CONFIG_SERIAL_IFX6X60 is not set # CONFIG_SERIAL_XILINX_PS_UART is not set CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 @@ -3732,19 +3832,13 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_NONSTANDARD=y -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set # CONFIG_MOXA_INTELLIO is not set # CONFIG_MOXA_SMARTIO is not set -CONFIG_SYNCLINKMP=m CONFIG_SYNCLINK_GT=m -# CONFIG_ISI is not set CONFIG_N_HDLC=m CONFIG_N_GSM=m CONFIG_NOZOMI=m # CONFIG_NULL_TTY is not set -# CONFIG_TRACE_SINK is not set CONFIG_HVC_DRIVER=y # CONFIG_HVC_DCC is not set CONFIG_SERIAL_DEV_BUS=y @@ -3765,19 +3859,18 @@ CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m # CONFIG_HW_RANDOM_BA431 is not set CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_HW_RANDOM_HISI_V2=y CONFIG_HW_RANDOM_CAVIUM=y # CONFIG_HW_RANDOM_CCTRNG is not set # CONFIG_HW_RANDOM_XIPHERA is not set +CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_APPLICOM is not set CONFIG_DEVMEM=y -CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=8192 CONFIG_DEVPORT=y CONFIG_TCG_TPM=y CONFIG_HW_RANDOM_TPM=y # CONFIG_TCG_TIS is not set # CONFIG_TCG_TIS_SPI is not set +# CONFIG_TCG_TIS_I2C_CR50 is not set # CONFIG_TCG_TIS_I2C_ATMEL is not set CONFIG_TCG_TIS_I2C_INFINEON=m # CONFIG_TCG_TIS_I2C_NUVOTON is not set @@ -3788,15 +3881,16 @@ CONFIG_TCG_ATMEL=m # CONFIG_TCG_TIS_ST33ZP24_I2C is not set # CONFIG_TCG_TIS_ST33ZP24_SPI is not set # CONFIG_XILLYBUS is not set -# end of Character devices - +# CONFIG_XILLYUSB is not set # CONFIG_RANDOM_TRUST_CPU is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set +# end of Character devices # # I2C support # -CONFIG_I2C=m +CONFIG_I2C=y +CONFIG_ACPI_I2C_OPREGION=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m @@ -3863,6 +3957,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m # CONFIG_I2C_EMEV2 is not set CONFIG_I2C_GPIO=m # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set +# CONFIG_I2C_HISI is not set # CONFIG_I2C_NOMADIK is not set # CONFIG_I2C_OCORES is not set CONFIG_I2C_PCA_PLATFORM=m @@ -3875,6 +3970,7 @@ CONFIG_I2C_SIMTEC=m # External I2C/SMBus adapter drivers # CONFIG_I2C_DIOLAN_U2C=m +# CONFIG_I2C_CP2615 is not set # CONFIG_I2C_ROBOTFUZZ_OSIF is not set # CONFIG_I2C_TAOS_EVM is not set CONFIG_I2C_TINY_USB=m @@ -3884,6 +3980,7 @@ CONFIG_I2C_VIPERBOARD=m # Other I2C/SMBus bus drivers # CONFIG_I2C_CROS_EC_TUNNEL=m +# CONFIG_I2C_VIRTIO is not set # end of I2C Hardware Bus support CONFIG_I2C_STUB=m @@ -3910,6 +4007,7 @@ CONFIG_SPI_BITBANG=y # CONFIG_SPI_CADENCE is not set # CONFIG_SPI_CADENCE_QUADSPI is not set # CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_HISI_KUNPENG is not set # CONFIG_SPI_HISI_SFC_V3XX is not set CONFIG_SPI_NXP_FLEXSPI=y CONFIG_SPI_GPIO=y @@ -3918,6 +4016,7 @@ CONFIG_SPI_GPIO=y CONFIG_SPI_PL022=y # CONFIG_SPI_PXA2XX is not set CONFIG_SPI_ROCKCHIP=y +# CONFIG_SPI_ROCKCHIP_SFC is not set # CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_SIFIVE is not set # CONFIG_SPI_MXIC is not set @@ -3941,6 +4040,7 @@ CONFIG_SPI_SPIDEV=m # CONFIG_SPI_SLAVE is not set CONFIG_SPI_DYNAMIC=y CONFIG_SPMI=y +# CONFIG_SPMI_HISI3670 is not set # CONFIG_HSI is not set CONFIG_PPS=m # CONFIG_PPS_DEBUG is not set @@ -3960,10 +4060,13 @@ CONFIG_PPS_CLIENT_GPIO=m # PTP clock support # CONFIG_PTP_1588_CLOCK=m +CONFIG_PTP_1588_CLOCK_OPTIONAL=m CONFIG_DP83640_PHY=m # CONFIG_PTP_1588_CLOCK_INES is not set +CONFIG_PTP_1588_CLOCK_KVM=m # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set # CONFIG_PTP_1588_CLOCK_IDTCM is not set +# CONFIG_PTP_1588_CLOCK_OCP is not set # end of PTP clock support CONFIG_PINCTRL=y @@ -3978,9 +4081,11 @@ CONFIG_PINCTRL_AMD=y # CONFIG_PINCTRL_MCP23S08 is not set CONFIG_PINCTRL_ROCKCHIP=y CONFIG_PINCTRL_SINGLE=y +# CONFIG_PINCTRL_SX150X is not set # CONFIG_PINCTRL_STMFX is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_OCELOT is not set +# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # # Renesas pinctrl drivers @@ -4010,10 +4115,12 @@ CONFIG_GPIO_DWAPB=y # CONFIG_GPIO_FTGPIO010 is not set CONFIG_GPIO_GENERIC_PLATFORM=y # CONFIG_GPIO_GRGPIO is not set +# CONFIG_GPIO_HISI is not set # CONFIG_GPIO_HLWD is not set # CONFIG_GPIO_LOGICVC is not set # CONFIG_GPIO_MB86S7X is not set CONFIG_GPIO_PL061=y +CONFIG_GPIO_ROCKCHIP=y # CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SIFIVE is not set CONFIG_GPIO_SYSCON=y @@ -4067,8 +4174,14 @@ CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_VIPERBOARD=m # end of USB GPIO expanders +# +# Virtual GPIO drivers +# # CONFIG_GPIO_AGGREGATOR is not set # CONFIG_GPIO_MOCKUP is not set +# CONFIG_GPIO_VIRTIO is not set +# end of Virtual GPIO drivers + CONFIG_W1=m CONFIG_W1_CON=y @@ -4112,6 +4225,7 @@ CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO_RESTART=y # CONFIG_POWER_RESET_LTC2952 is not set +# CONFIG_POWER_RESET_REGULATOR is not set CONFIG_POWER_RESET_RESTART=y CONFIG_POWER_RESET_VEXPRESS=y CONFIG_POWER_RESET_XGENE=y @@ -4136,10 +4250,7 @@ CONFIG_BATTERY_SBS=m CONFIG_CHARGER_SBS=m CONFIG_MANAGER_SBS=m # CONFIG_BATTERY_BQ27XXX is not set -CONFIG_CHARGER_AXP20X=m -# CONFIG_BATTERY_AXP20X is not set # CONFIG_AXP20X_POWER is not set -# CONFIG_AXP288_FUEL_GAUGE is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set @@ -4149,6 +4260,7 @@ CONFIG_CHARGER_AXP20X=m CONFIG_CHARGER_GPIO=y # CONFIG_CHARGER_MANAGER is not set # CONFIG_CHARGER_LT3651 is not set +# CONFIG_CHARGER_LTC4162L is not set # CONFIG_CHARGER_DETECTOR_MAX14656 is not set # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_BQ24190 is not set @@ -4157,10 +4269,14 @@ CONFIG_CHARGER_GPIO=y # CONFIG_CHARGER_BQ2515X is not set # CONFIG_CHARGER_BQ25890 is not set # CONFIG_CHARGER_BQ25980 is not set +# CONFIG_CHARGER_BQ256XX is not set CONFIG_CHARGER_SMB347=m # CONFIG_BATTERY_GAUGE_LTC2941 is not set +# CONFIG_BATTERY_GOLDFISH is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_CHARGER_RT9455 is not set CONFIG_CHARGER_CROS_USBPD=m +# CONFIG_CHARGER_CROS_PCHG is not set # CONFIG_CHARGER_UCS1002 is not set # CONFIG_CHARGER_BD99954 is not set CONFIG_HWMON=y @@ -4187,6 +4303,8 @@ CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m CONFIG_SENSORS_ADT7475=m +# CONFIG_SENSORS_AHT10 is not set +# CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set # CONFIG_SENSORS_AS370 is not set CONFIG_SENSORS_ASC7621=m # CONFIG_SENSORS_AXI_FAN_CONTROL is not set @@ -4194,6 +4312,7 @@ CONFIG_SENSORS_ARM_SCPI=y # CONFIG_SENSORS_ASPEED is not set CONFIG_SENSORS_ATXP1=m # CONFIG_SENSORS_CORSAIR_CPRO is not set +# CONFIG_SENSORS_CORSAIR_PSU is not set # CONFIG_SENSORS_DRIVETEMP is not set CONFIG_SENSORS_DS620=m CONFIG_SENSORS_DS1621=m @@ -4219,6 +4338,7 @@ CONFIG_SENSORS_LTC2945=m # CONFIG_SENSORS_LTC2947_I2C is not set # CONFIG_SENSORS_LTC2947_SPI is not set # CONFIG_SENSORS_LTC2990 is not set +# CONFIG_SENSORS_LTC2992 is not set CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4222=m @@ -4226,6 +4346,7 @@ CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4260=m CONFIG_SENSORS_LTC4261=m # CONFIG_SENSORS_MAX1111 is not set +# CONFIG_SENSORS_MAX127 is not set CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m @@ -4240,6 +4361,7 @@ CONFIG_SENSORS_MAX6697=m # CONFIG_SENSORS_MAX31790 is not set CONFIG_SENSORS_MCP3021=m # CONFIG_SENSORS_TC654 is not set +# CONFIG_SENSORS_TPS23861 is not set # CONFIG_SENSORS_MR75203 is not set # CONFIG_SENSORS_ADCXX is not set CONFIG_SENSORS_LM63=m @@ -4266,6 +4388,7 @@ CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m # CONFIG_SENSORS_NPCM7XX is not set +# CONFIG_SENSORS_NZXT_KRAKEN2 is not set # CONFIG_SENSORS_OCC_P8_I2C is not set CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m @@ -4273,9 +4396,13 @@ CONFIG_SENSORS_PMBUS=m # CONFIG_SENSORS_ADM1266 is not set CONFIG_SENSORS_ADM1275=m # CONFIG_SENSORS_BEL_PFE is not set +# CONFIG_SENSORS_BPA_RS600 is not set +# CONFIG_SENSORS_FSP_3Y is not set # CONFIG_SENSORS_IBM_CFFPS is not set +# CONFIG_SENSORS_DPS920AB is not set # CONFIG_SENSORS_INSPUR_IPSPS is not set # CONFIG_SENSORS_IR35221 is not set +# CONFIG_SENSORS_IR36021 is not set # CONFIG_SENSORS_IR38064 is not set # CONFIG_SENSORS_IRPS5401 is not set # CONFIG_SENSORS_ISL68137 is not set @@ -4283,6 +4410,7 @@ CONFIG_SENSORS_LM25066=m CONFIG_SENSORS_LTC2978=m # CONFIG_SENSORS_LTC2978_REGULATOR is not set # CONFIG_SENSORS_LTC3815 is not set +# CONFIG_SENSORS_MAX15301 is not set CONFIG_SENSORS_MAX16064=m # CONFIG_SENSORS_MAX16601 is not set # CONFIG_SENSORS_MAX20730 is not set @@ -4290,8 +4418,13 @@ CONFIG_SENSORS_MAX16064=m # CONFIG_SENSORS_MAX31785 is not set CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m +# CONFIG_SENSORS_MP2888 is not set # CONFIG_SENSORS_MP2975 is not set +# CONFIG_SENSORS_PIM4328 is not set +# CONFIG_SENSORS_PM6764TR is not set # CONFIG_SENSORS_PXE1610 is not set +# CONFIG_SENSORS_Q54SJ108A2 is not set +# CONFIG_SENSORS_STPDDC60 is not set CONFIG_SENSORS_TPS40422=m # CONFIG_SENSORS_TPS53679 is not set CONFIG_SENSORS_UCD9000=m @@ -4299,9 +4432,12 @@ CONFIG_SENSORS_UCD9200=m # CONFIG_SENSORS_XDPE122 is not set CONFIG_SENSORS_ZL6100=m CONFIG_SENSORS_PWM_FAN=m +# CONFIG_SENSORS_SBTSI is not set +# CONFIG_SENSORS_SBRMI is not set CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SHT21=m CONFIG_SENSORS_SHT3x=m +# CONFIG_SENSORS_SHT4x is not set CONFIG_SENSORS_SHTC1=m CONFIG_SENSORS_SIS5595=m CONFIG_SENSORS_DME1737=m @@ -4381,6 +4517,7 @@ CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_SYSFS is not set +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # # Watchdog Pretimeout Governors @@ -4443,6 +4580,10 @@ CONFIG_BCMA_DRIVER_GPIO=y # CONFIG_MFD_CORE=y # CONFIG_MFD_ACT8945A is not set +# CONFIG_MFD_AS3711 is not set +# CONFIG_MFD_AS3722 is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_AAT2870_CORE is not set # CONFIG_MFD_ATMEL_FLEXCOM is not set # CONFIG_MFD_ATMEL_HLCDC is not set # CONFIG_MFD_BCM590XX is not set @@ -4451,7 +4592,10 @@ CONFIG_MFD_AXP20X=m CONFIG_MFD_AXP20X_I2C=m CONFIG_MFD_CROS_EC_DEV=y # CONFIG_MFD_MADERA is not set +# CONFIG_PMIC_DA903X is not set # CONFIG_MFD_DA9052_SPI is not set +# CONFIG_MFD_DA9052_I2C is not set +# CONFIG_MFD_DA9055 is not set # CONFIG_MFD_DA9062 is not set # CONFIG_MFD_DA9063 is not set # CONFIG_MFD_DA9150 is not set @@ -4461,65 +4605,98 @@ CONFIG_MFD_CROS_EC_DEV=y # CONFIG_MFD_MC13XXX_I2C is not set # CONFIG_MFD_MP2629 is not set # CONFIG_MFD_HI6421_PMIC is not set +# CONFIG_MFD_HI6421_SPMI is not set # CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set # CONFIG_LPC_ICH is not set # CONFIG_LPC_SCH is not set +# CONFIG_MFD_INTEL_PMT is not set # CONFIG_MFD_IQS62X is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_88PM860X is not set # CONFIG_MFD_MAX14577 is not set +# CONFIG_MFD_MAX77620 is not set # CONFIG_MFD_MAX77650 is not set # CONFIG_MFD_MAX77686 is not set # CONFIG_MFD_MAX77693 is not set +# CONFIG_MFD_MAX77843 is not set # CONFIG_MFD_MAX8907 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set # CONFIG_MFD_MT6360 is not set # CONFIG_MFD_MT6397 is not set # CONFIG_MFD_MENF21BMC is not set # CONFIG_EZX_PCAP is not set # CONFIG_MFD_CPCAP is not set CONFIG_MFD_VIPERBOARD=m +# CONFIG_MFD_NTXEC is not set # CONFIG_MFD_RETU is not set # CONFIG_MFD_PCF50633 is not set -# CONFIG_UCB1400_CORE is not set # CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_RT4831 is not set # CONFIG_MFD_RT5033 is not set +# CONFIG_MFD_RC5T583 is not set CONFIG_MFD_RK808=m # CONFIG_MFD_RN5T618 is not set +# CONFIG_MFD_SEC_CORE is not set # CONFIG_MFD_SI476X_CORE is not set CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_SKY81452 is not set -# CONFIG_ABX500_CORE is not set # CONFIG_MFD_STMPE is not set CONFIG_MFD_SYSCON=y # CONFIG_MFD_TI_AM335X_TSCADC is not set # CONFIG_MFD_LP3943 is not set +# CONFIG_MFD_LP8788 is not set # CONFIG_MFD_TI_LMU is not set +# CONFIG_MFD_PALMAS is not set # CONFIG_TPS6105X is not set # CONFIG_TPS65010 is not set # CONFIG_TPS6507X is not set # CONFIG_MFD_TPS65086 is not set +# CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TI_LP873X is not set # CONFIG_MFD_TI_LP87565 is not set # CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set # CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_TPS80031 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_TWL6040_CORE is not set CONFIG_MFD_WL1273_CORE=m # CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TQMX86 is not set CONFIG_MFD_VX855=m +# CONFIG_MFD_LOCHNAGAR is not set # CONFIG_MFD_ARIZONA_I2C is not set # CONFIG_MFD_ARIZONA_SPI is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set # CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_ROHM_BD718XX is not set +# CONFIG_MFD_ROHM_BD70528 is not set +# CONFIG_MFD_ROHM_BD71828 is not set +# CONFIG_MFD_ROHM_BD957XMUF is not set +# CONFIG_MFD_STPMIC1 is not set # CONFIG_MFD_STMFX is not set +# CONFIG_MFD_ATC260X_I2C is not set # CONFIG_MFD_KHADAS_MCU is not set +# CONFIG_MFD_QCOM_PM8008 is not set CONFIG_MFD_VEXPRESS_SYSREG=y # CONFIG_RAVE_SP_CORE is not set # CONFIG_MFD_INTEL_M10_BMC is not set +# CONFIG_MFD_RSMU_I2C is not set +# CONFIG_MFD_RSMU_SPI is not set # end of Multifunction device drivers CONFIG_REGULATOR=y @@ -4532,6 +4709,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_AD5398 is not set CONFIG_REGULATOR_AXP20X=m # CONFIG_REGULATOR_CROS_EC is not set +# CONFIG_REGULATOR_DA9121 is not set # CONFIG_REGULATOR_DA9210 is not set # CONFIG_REGULATOR_DA9211 is not set CONFIG_REGULATOR_FAN53555=m @@ -4548,6 +4726,7 @@ CONFIG_REGULATOR_GPIO=y # CONFIG_REGULATOR_MAX1586 is not set # CONFIG_REGULATOR_MAX8649 is not set # CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8893 is not set # CONFIG_REGULATOR_MAX8952 is not set # CONFIG_REGULATOR_MAX8973 is not set # CONFIG_REGULATOR_MAX77826 is not set @@ -4557,7 +4736,9 @@ CONFIG_REGULATOR_GPIO=y # CONFIG_REGULATOR_MP886X is not set # CONFIG_REGULATOR_MPQ7920 is not set # CONFIG_REGULATOR_MT6311 is not set +# CONFIG_REGULATOR_MT6315 is not set # CONFIG_REGULATOR_PCA9450 is not set +# CONFIG_REGULATOR_PF8X00 is not set CONFIG_REGULATOR_PFUZE100=m # CONFIG_REGULATOR_PV88060 is not set # CONFIG_REGULATOR_PV88080 is not set @@ -4568,7 +4749,11 @@ CONFIG_REGULATOR_QCOM_SPMI=y # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set CONFIG_REGULATOR_RK808=m # CONFIG_REGULATOR_RT4801 is not set +# CONFIG_REGULATOR_RT6160 is not set +# CONFIG_REGULATOR_RT6245 is not set +# CONFIG_REGULATOR_RTQ2134 is not set # CONFIG_REGULATOR_RTMV20 is not set +# CONFIG_REGULATOR_RTQ6752 is not set # CONFIG_REGULATOR_SLG51000 is not set # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set @@ -4652,13 +4837,13 @@ CONFIG_MEDIA_TEST_SUPPORT=y # CONFIG_VIDEO_DEV=y CONFIG_MEDIA_CONTROLLER=y -CONFIG_DVB_CORE=m +CONFIG_DVB_CORE=y # end of Media core support # # Video4Linux options # -CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_V4L2_I2C=y CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_ADV_DEBUG is not set @@ -4697,7 +4882,6 @@ CONFIG_DVB_DYNAMIC_MINORS=y # # Media drivers # -CONFIG_TTPCI_EEPROM=m CONFIG_MEDIA_USB_SUPPORT=y # @@ -4874,7 +5058,6 @@ CONFIG_VIDEO_TW68=m # Media capture/analog TV support # CONFIG_VIDEO_IVTV=m -# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set CONFIG_VIDEO_IVTV_ALSA=m CONFIG_VIDEO_FB_IVTV=m CONFIG_VIDEO_HEXIUM_GEMINI=m @@ -4910,14 +5093,10 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_DVB_AV7110_IR=y -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_CORE=m CONFIG_DVB_BUDGET=m CONFIG_DVB_BUDGET_CI=m CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m CONFIG_DVB_B2C2_FLEXCOP_PCI=m # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set CONFIG_DVB_PLUTO2=m @@ -4960,6 +5139,7 @@ CONFIG_MEDIA_COMMON_OPTIONS=y # CONFIG_VIDEO_CX2341X=m CONFIG_VIDEO_TVEEPROM=m +CONFIG_TTPCI_EEPROM=m CONFIG_CYPRESS_FIRMWARE=m CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_V4L2=m @@ -4979,6 +5159,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_ASPEED is not set # CONFIG_VIDEO_MUX is not set +# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set # CONFIG_VIDEO_XILINX is not set CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set @@ -5106,13 +5287,18 @@ CONFIG_VIDEO_M52790=m # Camera sensor devices # # CONFIG_VIDEO_HI556 is not set +# CONFIG_VIDEO_IMX208 is not set # CONFIG_VIDEO_IMX214 is not set # CONFIG_VIDEO_IMX219 is not set # CONFIG_VIDEO_IMX258 is not set # CONFIG_VIDEO_IMX274 is not set # CONFIG_VIDEO_IMX290 is not set # CONFIG_VIDEO_IMX319 is not set +# CONFIG_VIDEO_IMX334 is not set +# CONFIG_VIDEO_IMX335 is not set # CONFIG_VIDEO_IMX355 is not set +# CONFIG_VIDEO_IMX412 is not set +# CONFIG_VIDEO_OV02A10 is not set # CONFIG_VIDEO_OV2640 is not set # CONFIG_VIDEO_OV2659 is not set # CONFIG_VIDEO_OV2680 is not set @@ -5121,6 +5307,7 @@ CONFIG_VIDEO_M52790=m # CONFIG_VIDEO_OV5640 is not set # CONFIG_VIDEO_OV5645 is not set # CONFIG_VIDEO_OV5647 is not set +# CONFIG_VIDEO_OV5648 is not set # CONFIG_VIDEO_OV6650 is not set # CONFIG_VIDEO_OV5670 is not set # CONFIG_VIDEO_OV5675 is not set @@ -5131,8 +5318,11 @@ CONFIG_VIDEO_M52790=m # CONFIG_VIDEO_OV7670 is not set # CONFIG_VIDEO_OV7740 is not set # CONFIG_VIDEO_OV8856 is not set +# CONFIG_VIDEO_OV8865 is not set +# CONFIG_VIDEO_OV9282 is not set # CONFIG_VIDEO_OV9640 is not set # CONFIG_VIDEO_OV9650 is not set +# CONFIG_VIDEO_OV9734 is not set # CONFIG_VIDEO_OV13858 is not set # CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_MT9M001 is not set @@ -5148,12 +5338,13 @@ CONFIG_VIDEO_M52790=m # CONFIG_VIDEO_NOON010PC30 is not set # CONFIG_VIDEO_M5MOLS is not set # CONFIG_VIDEO_RDACM20 is not set +# CONFIG_VIDEO_RDACM21 is not set # CONFIG_VIDEO_RJ54N1 is not set # CONFIG_VIDEO_S5K6AA is not set # CONFIG_VIDEO_S5K6A3 is not set # CONFIG_VIDEO_S5K4ECGX is not set # CONFIG_VIDEO_S5K5BAF is not set -# CONFIG_VIDEO_SMIAPP is not set +# CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_ET8EK8 is not set # CONFIG_VIDEO_S5C73M3 is not set # end of Camera sensor devices @@ -5188,7 +5379,7 @@ CONFIG_VIDEO_M52790=m CONFIG_CXD2880_SPI_DRV=m # end of Media SPI Adapters -CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER=y # # Customize TV tuners @@ -5291,7 +5482,6 @@ CONFIG_DVB_TDA10071=m # # DVB-T (terrestrial) frontends # -CONFIG_DVB_SP8870=m CONFIG_DVB_SP887X=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m @@ -5346,6 +5536,7 @@ CONFIG_DVB_AU8522=m CONFIG_DVB_AU8522_DTV=m CONFIG_DVB_AU8522_V4L=m CONFIG_DVB_S5H1411=m +CONFIG_DVB_MXL692=m # # ISDB-T (terrestrial) frontends @@ -5410,24 +5601,19 @@ CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_DRM=m CONFIG_DRM_MIPI_DSI=y +CONFIG_DRM_DP_AUX_BUS=m # CONFIG_DRM_DP_AUX_CHARDEV is not set # CONFIG_DRM_DEBUG_SELFTEST is not set CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_KMS_FB_HELPER=y # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_DP_CEC is not set -CONFIG_DRM_TTM=m -CONFIG_DRM_TTM_DMA_PAGE_POOL=y -CONFIG_DRM_VRAM_HELPER=m -CONFIG_DRM_TTM_HELPER=m CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_KMS_CMA_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=y -CONFIG_DRM_VM=y CONFIG_DRM_SCHED=m # @@ -5455,39 +5641,44 @@ CONFIG_DRM_VGEM=m # CONFIG_DRM_VKMS is not set CONFIG_DRM_ROCKCHIP=m CONFIG_ROCKCHIP_ANALOGIX_DP=y -# CONFIG_ROCKCHIP_CDN_DP is not set +CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_INNO_HDMI=y CONFIG_ROCKCHIP_LVDS=y CONFIG_ROCKCHIP_RGB=y # CONFIG_ROCKCHIP_RK3066_HDMI is not set +# CONFIG_DRM_VMWGFX is not set CONFIG_DRM_UDL=m -CONFIG_DRM_AST=m -CONFIG_DRM_MGAG200=m +# CONFIG_DRM_AST is not set +# CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_RCAR_DW_HDMI is not set # CONFIG_DRM_RCAR_LVDS is not set -CONFIG_DRM_QXL=m -CONFIG_DRM_BOCHS=m -CONFIG_DRM_VIRTIO_GPU=m +# CONFIG_DRM_QXL is not set +# CONFIG_DRM_VIRTIO_GPU is not set CONFIG_DRM_PANEL=y # # Display Panels # +# CONFIG_DRM_PANEL_ABT_Y030XX067A is not set # CONFIG_DRM_PANEL_ARM_VERSATILE is not set # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set +# CONFIG_DRM_PANEL_DSI_CM is not set # CONFIG_DRM_PANEL_LVDS is not set CONFIG_DRM_PANEL_SIMPLE=m # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set +# CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set +# CONFIG_DRM_PANEL_KHADAS_TS050 is not set # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set @@ -5496,6 +5687,7 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m # CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set +# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set @@ -5506,12 +5698,15 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set +# CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set +# CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set +# CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set # CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set @@ -5521,11 +5716,13 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set # CONFIG_DRM_PANEL_SONY_ACX424AKP is not set # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set +# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set +# CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels @@ -5536,9 +5733,14 @@ CONFIG_DRM_PANEL_BRIDGE=y # Display Interface Bridges # # CONFIG_DRM_CDNS_DSI is not set +# CONFIG_DRM_CHIPONE_ICN6211 is not set # CONFIG_DRM_CHRONTEL_CH7033 is not set +# CONFIG_DRM_CROS_EC_ANX7688 is not set # CONFIG_DRM_DISPLAY_CONNECTOR is not set +# CONFIG_DRM_LONTIUM_LT8912B is not set # CONFIG_DRM_LONTIUM_LT9611 is not set +# CONFIG_DRM_LONTIUM_LT9611UXC is not set +# CONFIG_DRM_ITE_IT66121 is not set # CONFIG_DRM_LVDS_CODEC is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set # CONFIG_DRM_NWL_MIPI_DSI is not set @@ -5556,11 +5758,13 @@ CONFIG_DRM_TOSHIBA_TC358767=m # CONFIG_DRM_TOSHIBA_TC358768 is not set # CONFIG_DRM_TOSHIBA_TC358775 is not set CONFIG_DRM_TI_TFP410=m +# CONFIG_DRM_TI_SN65DSI83 is not set # CONFIG_DRM_TI_SN65DSI86 is not set # CONFIG_DRM_TI_TPD12S015 is not set # CONFIG_DRM_ANALOGIX_ANX6345 is not set CONFIG_DRM_ANALOGIX_ANX78XX=m CONFIG_DRM_ANALOGIX_DP=m +# CONFIG_DRM_ANALOGIX_ANX7625 is not set CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7511_AUDIO=y CONFIG_DRM_I2C_ADV7511_CEC=y @@ -5573,12 +5777,14 @@ CONFIG_DRM_DW_MIPI_DSI=m # end of Display Interface Bridges # CONFIG_DRM_ETNAVIV is not set -# CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_HISI_HIBMC is not set -CONFIG_DRM_HISI_KIRIN=m +# CONFIG_DRM_HISI_KIRIN is not set # CONFIG_DRM_MXSFB is not set -CONFIG_DRM_CIRRUS_QEMU=m +# CONFIG_DRM_ARCPGU is not set +# CONFIG_DRM_BOCHS is not set +# CONFIG_DRM_CIRRUS_QEMU is not set # CONFIG_DRM_GM12U320 is not set +# CONFIG_DRM_SIMPLEDRM is not set # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9341 is not set @@ -5587,16 +5793,12 @@ CONFIG_DRM_CIRRUS_QEMU=m # CONFIG_TINYDRM_REPAPER is not set # CONFIG_TINYDRM_ST7586 is not set # CONFIG_TINYDRM_ST7735R is not set -CONFIG_DRM_PL111=m +# CONFIG_DRM_PL111 is not set # CONFIG_DRM_LIMA is not set CONFIG_DRM_PANFROST=m # CONFIG_DRM_TIDSS is not set -CONFIG_DRM_LEGACY=y -# CONFIG_DRM_TDFX is not set -# CONFIG_DRM_R128 is not set -# CONFIG_DRM_MGA is not set -# CONFIG_DRM_VIA is not set -# CONFIG_DRM_SAVAGE is not set +# CONFIG_DRM_GUD is not set +# CONFIG_DRM_LEGACY is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m # @@ -5687,7 +5889,7 @@ CONFIG_BACKLIGHT_PWM=m # CONFIG_BACKLIGHT_ADP8870 is not set # CONFIG_BACKLIGHT_LM3630A is not set # CONFIG_BACKLIGHT_LM3639 is not set -CONFIG_BACKLIGHT_LP855X=m +# CONFIG_BACKLIGHT_LP855X is not set CONFIG_BACKLIGHT_GPIO=m # CONFIG_BACKLIGHT_LV5207LP is not set # CONFIG_BACKLIGHT_BD6107 is not set @@ -5705,6 +5907,7 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set @@ -5742,20 +5945,17 @@ CONFIG_SND_DEBUG=y CONFIG_SND_DEBUG_VERBOSE=y # CONFIG_SND_PCM_XRUN_DEBUG is not set # CONFIG_SND_CTL_VALIDATION is not set +# CONFIG_SND_JACK_INJECTION_DEBUG is not set CONFIG_SND_VMASTER=y +CONFIG_SND_CTL_LED=m CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m # CONFIG_SND_SEQUENCER_OSS is not set CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQ_MIDI_EVENT=m CONFIG_SND_SEQ_MIDI=m -CONFIG_SND_SEQ_MIDI_EMUL=m CONFIG_SND_SEQ_VIRMIDI=m CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_OPL3_LIB_SEQ=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m CONFIG_SND_DRIVERS=y CONFIG_SND_DUMMY=m CONFIG_SND_ALOOP=m @@ -5763,75 +5963,70 @@ CONFIG_SND_VIRMIDI=m # CONFIG_SND_MTPAV is not set CONFIG_SND_SERIAL_U16550=m CONFIG_SND_MPU401=m -CONFIG_SND_AC97_POWER_SAVE=y -CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 CONFIG_SND_PCI=y -CONFIG_SND_AD1889=m +# CONFIG_SND_AD1889 is not set # CONFIG_SND_ALS300 is not set # CONFIG_SND_ALI5451 is not set -CONFIG_SND_ATIIXP=m -CONFIG_SND_ATIIXP_MODEM=m -CONFIG_SND_AU8810=m -CONFIG_SND_AU8820=m -CONFIG_SND_AU8830=m +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set # CONFIG_SND_AW2 is not set # CONFIG_SND_AZT3328 is not set -CONFIG_SND_BT87X=m -# CONFIG_SND_BT87X_OVERCLOCK is not set -CONFIG_SND_CA0106=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_OXYGEN_LIB=m -CONFIG_SND_OXYGEN=m -CONFIG_SND_CS4281=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CTXFI=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_INDIGOIOX=m -CONFIG_SND_INDIGODJX=m +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_OXYGEN is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CTXFI is not set +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_INDIGOIOX is not set +# CONFIG_SND_INDIGODJX is not set # CONFIG_SND_EMU10K1 is not set # CONFIG_SND_EMU10K1X is not set -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set # CONFIG_SND_ES1938 is not set # CONFIG_SND_ES1968 is not set -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set # CONFIG_SND_ICE1712 is not set -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_LOLA=m -CONFIG_SND_LX6464ES=m +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_LOLA is not set +# CONFIG_SND_LX6464ES is not set # CONFIG_SND_MAESTRO3 is not set -CONFIG_SND_MIXART=m -CONFIG_SND_NM256=m -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -CONFIG_SND_RME32=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SE6X is not set # CONFIG_SND_SONICVIBES is not set # CONFIG_SND_TRIDENT is not set -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VIRTUOSO=m -CONFIG_SND_VX222=m -CONFIG_SND_YMFPCI=m +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VIRTUOSO is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set # # HD-Audio @@ -5850,6 +6045,7 @@ CONFIG_SND_HDA_CODEC_SIGMATEL=m CONFIG_SND_HDA_CODEC_VIA=m CONFIG_SND_HDA_CODEC_HDMI=m CONFIG_SND_HDA_CODEC_CIRRUS=m +# CONFIG_SND_HDA_CODEC_CS8409 is not set CONFIG_SND_HDA_CODEC_CONEXANT=m CONFIG_SND_HDA_CODEC_CA0110=m CONFIG_SND_HDA_CODEC_CA0132=m @@ -5866,26 +6062,24 @@ CONFIG_SND_HDA_DSP_LOADER=y CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_INTEL_NHLT=y CONFIG_SND_INTEL_DSP_CONFIG=m -CONFIG_SND_SPI=y +CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m +# CONFIG_SND_SPI is not set CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y -CONFIG_SND_USB_UA101=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y -CONFIG_SND_USB_6FIRE=m -CONFIG_SND_USB_HIFACE=m +# CONFIG_SND_USB_UA101 is not set +# CONFIG_SND_USB_CAIAQ is not set +# CONFIG_SND_USB_6FIRE is not set +# CONFIG_SND_USB_HIFACE is not set # CONFIG_SND_BCD2000 is not set -CONFIG_SND_USB_LINE6=m -CONFIG_SND_USB_POD=m -CONFIG_SND_USB_PODHD=m -CONFIG_SND_USB_TONEPORT=m -CONFIG_SND_USB_VARIAX=m +# CONFIG_SND_USB_POD is not set +# CONFIG_SND_USB_PODHD is not set +# CONFIG_SND_USB_TONEPORT is not set +# CONFIG_SND_USB_VARIAX is not set CONFIG_SND_SOC=y CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y -CONFIG_SND_SOC_AMD_ACP=m -# CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set -# CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set +# CONFIG_SND_SOC_ADI is not set +# CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_ATMEL_SOC is not set # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set # CONFIG_SND_DESIGNWARE_I2S is not set @@ -5904,6 +6098,8 @@ CONFIG_SND_SOC_AMD_ACP=m # CONFIG_SND_SOC_FSL_SPDIF is not set # CONFIG_SND_SOC_FSL_ESAI is not set # CONFIG_SND_SOC_FSL_MICFIL is not set +# CONFIG_SND_SOC_FSL_XCVR is not set +# CONFIG_SND_SOC_FSL_RPMSG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # end of SoC Audio for Freescale CPUs @@ -5929,13 +6125,14 @@ CONFIG_SND_SOC_RK3399_GRU_SOUND=m # CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set # CONFIG_SND_SOC_XILINX_SPDIF is not set # CONFIG_SND_SOC_XTFPGA_I2S is not set -# CONFIG_ZX_TDM is not set -CONFIG_SND_SOC_I2C_AND_SPI=m +CONFIG_SND_SOC_I2C_AND_SPI=y # # CODEC drivers # # CONFIG_SND_SOC_AC97_CODEC is not set +# CONFIG_SND_SOC_ADAU1372_I2C is not set +# CONFIG_SND_SOC_ADAU1372_SPI is not set # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU1761_I2C is not set # CONFIG_SND_SOC_ADAU1761_SPI is not set @@ -5953,7 +6150,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set -CONFIG_SND_SOC_CROS_EC_CODEC=m +# CONFIG_SND_SOC_CROS_EC_CODEC is not set # CONFIG_SND_SOC_CS35L32 is not set # CONFIG_SND_SOC_CS35L33 is not set # CONFIG_SND_SOC_CS35L34 is not set @@ -5986,6 +6183,7 @@ CONFIG_SND_SOC_ES8328=m CONFIG_SND_SOC_ES8328_I2C=m CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_GTM601 is not set +# CONFIG_SND_SOC_ICS43432 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set # CONFIG_SND_SOC_MAX98088 is not set CONFIG_SND_SOC_MAX98090=m @@ -5996,8 +6194,8 @@ CONFIG_SND_SOC_MAX98357A=m # CONFIG_SND_SOC_MAX98373_I2C is not set # CONFIG_SND_SOC_MAX98390 is not set # CONFIG_SND_SOC_MAX9860 is not set -CONFIG_SND_SOC_MSM8916_WCD_ANALOG=y -CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=y +# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set +# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM1789_I2C is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -6006,23 +6204,27 @@ CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=y # CONFIG_SND_SOC_PCM186X_SPI is not set # CONFIG_SND_SOC_PCM3060_I2C is not set # CONFIG_SND_SOC_PCM3060_SPI is not set -CONFIG_SND_SOC_PCM3168A=m -CONFIG_SND_SOC_PCM3168A_I2C=m +# CONFIG_SND_SOC_PCM3168A_I2C is not set # CONFIG_SND_SOC_PCM3168A_SPI is not set +# CONFIG_SND_SOC_PCM5102A is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set -CONFIG_SND_SOC_RK3328=m +# CONFIG_SND_SOC_RK3328 is not set +# CONFIG_SND_SOC_RK817 is not set CONFIG_SND_SOC_RL6231=m CONFIG_SND_SOC_RT5514=m CONFIG_SND_SOC_RT5514_SPI=m # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set +# CONFIG_SND_SOC_RT5640 is not set CONFIG_SND_SOC_RT5645=m +# CONFIG_SND_SOC_RT5659 is not set # CONFIG_SND_SOC_SGTL5000 is not set CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m -# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +# CONFIG_SND_SOC_SIMPLE_MUX is not set # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM4567 is not set @@ -6039,12 +6241,14 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m # CONFIG_SND_SOC_TAS6424 is not set # CONFIG_SND_SOC_TDA7419 is not set # CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TFA989X is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set # CONFIG_SND_SOC_TLV320AIC23_SPI is not set # CONFIG_SND_SOC_TLV320AIC31XX is not set # CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set # CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set -# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set +# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set # CONFIG_SND_SOC_TLV320ADCX140 is not set CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_TSCS42XX is not set @@ -6074,22 +6278,26 @@ CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_WM8978 is not set # CONFIG_SND_SOC_WM8985 is not set # CONFIG_SND_SOC_ZL38060 is not set -# CONFIG_SND_SOC_ZX_AUD96P22 is not set # CONFIG_SND_SOC_MAX9759 is not set # CONFIG_SND_SOC_MT6351 is not set # CONFIG_SND_SOC_MT6358 is not set # CONFIG_SND_SOC_MT6660 is not set +# CONFIG_SND_SOC_NAU8315 is not set # CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_NAU8822 is not set # CONFIG_SND_SOC_NAU8824 is not set # CONFIG_SND_SOC_TPA6130A2 is not set +# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set +# CONFIG_SND_SOC_LPASS_VA_MACRO is not set +# CONFIG_SND_SOC_LPASS_RX_MACRO is not set +# CONFIG_SND_SOC_LPASS_TX_MACRO is not set # end of CODEC drivers CONFIG_SND_SIMPLE_CARD_UTILS=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_AUDIO_GRAPH_CARD=m -CONFIG_AC97_BUS=m +# CONFIG_SND_VIRTIO is not set # # HID support @@ -6131,6 +6339,7 @@ CONFIG_HID_EMS_FF=m CONFIG_HID_ELECOM=m CONFIG_HID_ELO=m CONFIG_HID_EZKEY=m +# CONFIG_HID_FT260 is not set CONFIG_HID_GEMBIRD=m CONFIG_HID_GFRM=m # CONFIG_HID_GLORIOUS is not set @@ -6181,11 +6390,13 @@ CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PLANTRONICS=m +# CONFIG_HID_PLAYSTATION is not set CONFIG_HID_PRIMAX=m CONFIG_HID_RETRODE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m +# CONFIG_HID_SEMITEK is not set CONFIG_HID_SONY=m CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m @@ -6227,7 +6438,9 @@ CONFIG_USB_HIDDEV=y # # I2C HID support # -CONFIG_I2C_HID=m +# CONFIG_I2C_HID_ACPI is not set +# CONFIG_I2C_HID_OF is not set +# CONFIG_I2C_HID_OF_GOODIX is not set # end of I2C HID support # end of HID support @@ -6332,7 +6545,7 @@ CONFIG_USBIP_VHCI_NR_HCS=1 CONFIG_USBIP_HOST=m CONFIG_USBIP_VUDC=m # CONFIG_USBIP_DEBUG is not set -# CONFIG_USB_CDNS3 is not set +# CONFIG_USB_CDNS_SUPPORT is not set CONFIG_USB_MUSB_HDRC=y # CONFIG_USB_MUSB_HOST is not set # CONFIG_USB_MUSB_GADGET is not set @@ -6432,7 +6645,6 @@ CONFIG_USB_SERIAL_SIERRAWIRELESS=m CONFIG_USB_SERIAL_SYMBOL=m CONFIG_USB_SERIAL_TI=m CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_WWAN=m CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m @@ -6442,6 +6654,7 @@ CONFIG_USB_SERIAL_WISHBONE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m CONFIG_USB_SERIAL_UPD78F0730=m +# CONFIG_USB_SERIAL_XR is not set CONFIG_USB_SERIAL_DEBUG=m # @@ -6600,11 +6813,12 @@ CONFIG_TYPEC_TCPM=y CONFIG_TYPEC_TCPCI=m # CONFIG_TYPEC_RT1711H is not set # CONFIG_TYPEC_TCPCI_MAXIM is not set -CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC_FUSB302=y # CONFIG_TYPEC_UCSI is not set -# CONFIG_TYPEC_HD3SS3220 is not set # CONFIG_TYPEC_TPS6598X is not set +# CONFIG_TYPEC_HD3SS3220 is not set # CONFIG_TYPEC_STUSB160X is not set +CONFIG_TYPEC_EXTCON=y # # USB Type-C Multiplexer/DeMultiplexer Switch support @@ -6695,9 +6909,7 @@ CONFIG_LEDS_CLASS_FLASH=m # # LED drivers # -# CONFIG_LEDS_AAT1290 is not set # CONFIG_LEDS_AN30259A is not set -# CONFIG_LEDS_AS3645A is not set # CONFIG_LEDS_AW2013 is not set # CONFIG_LEDS_BCM6328 is not set # CONFIG_LEDS_BCM6358 is not set @@ -6707,7 +6919,6 @@ CONFIG_LEDS_LM3530=m # CONFIG_LEDS_LM3532 is not set # CONFIG_LEDS_LM3642 is not set # CONFIG_LEDS_LM3692X is not set -# CONFIG_LEDS_LM3601X is not set # CONFIG_LEDS_PCA9532 is not set CONFIG_LEDS_GPIO=y CONFIG_LEDS_LP3944=m @@ -6726,7 +6937,6 @@ CONFIG_LEDS_LT3593=m # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TLC591XX is not set # CONFIG_LEDS_LM355x is not set -# CONFIG_LEDS_KTD2692 is not set # CONFIG_LEDS_IS31FL319X is not set # CONFIG_LEDS_IS31FL32XX is not set @@ -6739,6 +6949,16 @@ CONFIG_LEDS_SYSCON=y CONFIG_LEDS_USER=m # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_TI_LMU_COMMON is not set + +# +# Flash and Torch LED drivers +# +# CONFIG_LEDS_AAT1290 is not set +# CONFIG_LEDS_AS3645A is not set +# CONFIG_LEDS_KTD2692 is not set +# CONFIG_LEDS_LM3601X is not set +# CONFIG_LEDS_RT4505 is not set +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # @@ -6765,6 +6985,7 @@ CONFIG_LEDS_TRIGGER_PANIC=y CONFIG_LEDS_TRIGGER_NETDEV=y CONFIG_LEDS_TRIGGER_PATTERN=m CONFIG_LEDS_TRIGGER_AUDIO=m +# CONFIG_LEDS_TRIGGER_TTY is not set CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y @@ -6844,12 +7065,11 @@ CONFIG_RTC_DRV_EM3027=m # CONFIG_RTC_DRV_MAX6916 is not set # CONFIG_RTC_DRV_R9701 is not set # CONFIG_RTC_DRV_RX4581 is not set -# CONFIG_RTC_DRV_RX6110 is not set # CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_MAX6902 is not set # CONFIG_RTC_DRV_PCF2123 is not set # CONFIG_RTC_DRV_MCP795 is not set -CONFIG_RTC_I2C_AND_SPI=m +CONFIG_RTC_I2C_AND_SPI=y # # SPI and I2C RTC drivers @@ -6859,6 +7079,7 @@ CONFIG_RTC_DRV_DS3232_HWMON=y CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_RV3029C2=m CONFIG_RTC_DRV_RV3029_HWMON=y +# CONFIG_RTC_DRV_RX6110 is not set # # Platform RTC drivers @@ -6899,6 +7120,7 @@ CONFIG_RTC_DRV_PL031=y # HID Sensor RTC drivers # # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set +# CONFIG_RTC_DRV_GOLDFISH is not set CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -6943,14 +7165,17 @@ CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set # CONFIG_UDMABUF is not set # CONFIG_DMABUF_MOVE_NOTIFY is not set +# CONFIG_DMABUF_DEBUG is not set # CONFIG_DMABUF_SELFTESTS is not set # CONFIG_DMABUF_HEAPS is not set +# CONFIG_DMABUF_SYSFS_STATS is not set # end of DMABUF options CONFIG_AUXDISPLAY=y # CONFIG_HD44780 is not set # CONFIG_IMG_ASCII_LCD is not set # CONFIG_HT16K33 is not set +# CONFIG_LCD2S is not set # CONFIG_CHARLCD_BL_OFF is not set # CONFIG_CHARLCD_BL_ON is not set CONFIG_CHARLCD_BL_FLASH=y @@ -6964,13 +7189,14 @@ CONFIG_UIO_PCI_GENERIC=m # CONFIG_UIO_NETX is not set # CONFIG_UIO_PRUSS is not set # CONFIG_UIO_MF624 is not set +CONFIG_VFIO=m CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO_VIRQFD=m -CONFIG_VFIO=m # CONFIG_VFIO_NOIOMMU is not set -CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_PCI_MMAP=y CONFIG_VFIO_PCI_INTX=y +CONFIG_VFIO_PCI=m CONFIG_VFIO_PLATFORM=m CONFIG_VFIO_AMBA=m CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m @@ -6978,6 +7204,7 @@ CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m # CONFIG_VFIO_MDEV is not set # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO=y +CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y @@ -6986,7 +7213,6 @@ CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=m # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set -CONFIG_VIRTIO_DMA_SHARED_BUFFER=m # CONFIG_VDPA is not set CONFIG_VHOST_IOTLB=m CONFIG_VHOST=m @@ -6999,22 +7225,18 @@ CONFIG_VHOST_VSOCK=m # # Microsoft Hyper-V guest support # +# CONFIG_HYPERV is not set # end of Microsoft Hyper-V guest support # CONFIG_GREYBUS is not set -CONFIG_STAGING=y -CONFIG_PRISM2_USB=m # CONFIG_COMEDI is not set -CONFIG_RTL8192U=m -CONFIG_RTLLIB=m -CONFIG_RTLLIB_CRYPTO_CCMP=m -CONFIG_RTLLIB_CRYPTO_TKIP=m -CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m +CONFIG_STAGING=y +# CONFIG_PRISM2_USB is not set +# CONFIG_RTL8192U is not set +# CONFIG_RTLLIB is not set # CONFIG_RTL8723BS is not set -CONFIG_R8712U=m -CONFIG_R8188EU=m -CONFIG_88EU_AP_MODE=y +# CONFIG_R8712U is not set +# CONFIG_R8188EU is not set # CONFIG_RTS5208 is not set # CONFIG_VT6655 is not set # CONFIG_VT6656 is not set @@ -7048,7 +7270,6 @@ CONFIG_ADT7316_I2C=m # # Capacitance to digital converters # -CONFIG_AD7150=m CONFIG_AD7746=m # end of Capacitance to digital converters @@ -7086,68 +7307,30 @@ CONFIG_VIDEO_HANTRO=m CONFIG_VIDEO_HANTRO_ROCKCHIP=y CONFIG_VIDEO_ROCKCHIP_VDEC=m # CONFIG_VIDEO_ZORAN is not set -# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set +CONFIG_DVB_AV7110_IR=y +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_SP8870=m # # Android # CONFIG_ASHMEM=y -# CONFIG_ION is not set # end of Android # CONFIG_STAGING_BOARD is not set # CONFIG_LTE_GDM724X is not set # CONFIG_GS_FPGABOOT is not set # CONFIG_UNISYSSPAR is not set -CONFIG_FB_TFT=m -CONFIG_FB_TFT_AGM1264K_FL=m -CONFIG_FB_TFT_BD663474=m -CONFIG_FB_TFT_HX8340BN=m -CONFIG_FB_TFT_HX8347D=m -CONFIG_FB_TFT_HX8353D=m -CONFIG_FB_TFT_HX8357D=m -CONFIG_FB_TFT_ILI9163=m -CONFIG_FB_TFT_ILI9320=m -CONFIG_FB_TFT_ILI9325=m -CONFIG_FB_TFT_ILI9340=m -CONFIG_FB_TFT_ILI9341=m -CONFIG_FB_TFT_ILI9481=m -CONFIG_FB_TFT_ILI9486=m -CONFIG_FB_TFT_PCD8544=m -CONFIG_FB_TFT_RA8875=m -CONFIG_FB_TFT_S6D02A1=m -CONFIG_FB_TFT_S6D1121=m -# CONFIG_FB_TFT_SEPS525 is not set -CONFIG_FB_TFT_SH1106=m -CONFIG_FB_TFT_SSD1289=m -CONFIG_FB_TFT_SSD1305=m -CONFIG_FB_TFT_SSD1306=m -CONFIG_FB_TFT_SSD1331=m -CONFIG_FB_TFT_SSD1351=m -CONFIG_FB_TFT_ST7735R=m -CONFIG_FB_TFT_ST7789V=m -CONFIG_FB_TFT_TINYLCD=m -CONFIG_FB_TFT_TLS8204=m -CONFIG_FB_TFT_UC1611=m -CONFIG_FB_TFT_UC1701=m -CONFIG_FB_TFT_UPD161704=m -CONFIG_FB_TFT_WATTEROTT=m +# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set +# CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set # CONFIG_PI433 is not set - -# -# Gasket devices -# -# CONFIG_STAGING_GASKET_FRAMEWORK is not set -# end of Gasket devices - # CONFIG_XIL_AXIS_FIFO is not set # CONFIG_FIELDBUS_DEV is not set -# CONFIG_KPC2000 is not set # CONFIG_QLGE is not set # CONFIG_WFX is not set -# CONFIG_SPMI_HISI3670 is not set -# CONFIG_MFD_HI6421_SPMI is not set # CONFIG_GOLDFISH is not set CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_TBMC=m @@ -7167,10 +7350,20 @@ CONFIG_CROS_EC_TYPEC=y CONFIG_CROS_USBPD_LOGGER=m CONFIG_CROS_USBPD_NOTIFY=y # CONFIG_MELLANOX_PLATFORM is not set +# CONFIG_SURFACE_PLATFORMS is not set CONFIG_HAVE_CLK=y -CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y + +# +# Clock driver for ARM Reference designs +# +# CONFIG_ICST is not set +# CONFIG_CLK_SP810 is not set +# CONFIG_CLK_VEXPRESS_OSC is not set +# end of Clock driver for ARM Reference designs + +# CONFIG_LMK04832 is not set # CONFIG_COMMON_CLK_MAX9485 is not set CONFIG_COMMON_CLK_RK808=m CONFIG_COMMON_CLK_SCPI=y @@ -7182,22 +7375,19 @@ CONFIG_COMMON_CLK_SCPI=y # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_CLK_QORIQ is not set +# CONFIG_COMMON_CLK_AXI_CLKGEN is not set CONFIG_COMMON_CLK_XGENE=y CONFIG_COMMON_CLK_PWM=y # CONFIG_COMMON_CLK_VC5 is not set # CONFIG_COMMON_CLK_FIXED_MMIO is not set CONFIG_COMMON_CLK_ROCKCHIP=y -CONFIG_CLK_PX30=y -CONFIG_CLK_RV110X=y -CONFIG_CLK_RK3036=y -CONFIG_CLK_RK312X=y -CONFIG_CLK_RK3188=y -CONFIG_CLK_RK322X=y -CONFIG_CLK_RK3308=y -CONFIG_CLK_RK3328=y -CONFIG_CLK_RK3368=y +# CONFIG_CLK_PX30 is not set +# CONFIG_CLK_RK3308 is not set +# CONFIG_CLK_RK3328 is not set +# CONFIG_CLK_RK3368 is not set CONFIG_CLK_RK3399=y +# CONFIG_CLK_RK3568 is not set +# CONFIG_XILINX_VCU is not set CONFIG_HWSPINLOCK=y # @@ -7219,6 +7409,7 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_MAILBOX=y CONFIG_ARM_MHU=y +# CONFIG_ARM_MHU_V2 is not set CONFIG_PLATFORM_MHU=y # CONFIG_PL320_MBOX is not set CONFIG_ROCKCHIP_MBOX=y @@ -7240,6 +7431,8 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y # end of Generic IOMMU Pagetable Support # CONFIG_IOMMU_DEBUGFS is not set +CONFIG_IOMMU_DEFAULT_DMA_STRICT=y +# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_OF_IOMMU=y CONFIG_IOMMU_DMA=y @@ -7263,6 +7456,7 @@ CONFIG_REMOTEPROC=y # CONFIG_RPMSG=y CONFIG_RPMSG_CHAR=y +# CONFIG_RPMSG_NS is not set CONFIG_RPMSG_QCOM_GLINK=y CONFIG_RPMSG_QCOM_GLINK_RPM=y # CONFIG_RPMSG_VIRTIO is not set @@ -7279,11 +7473,6 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=y # # end of Amlogic SoC drivers -# -# Aspeed SoC drivers -# -# end of Aspeed SoC drivers - # # Broadcom SoC drivers # @@ -7302,6 +7491,12 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=y # # end of i.MX SoC drivers +# +# Enable LiteX SoC Builder specific drivers +# +# CONFIG_LITEX_SOC_CONTROLLER is not set +# end of Enable LiteX SoC Builder specific drivers + # # Qualcomm SoC drivers # @@ -7315,7 +7510,6 @@ CONFIG_ROCKCHIP_PM_DOMAINS=y # # Xilinx SoC drivers # -# CONFIG_XILINX_VCU is not set # end of Xilinx SoC drivers # end of SOC (System On Chip) specific Drivers @@ -7350,6 +7544,7 @@ CONFIG_EXTCON_GPIO=y # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USB_GPIO=y CONFIG_EXTCON_USBC_CROS_EC=y +# CONFIG_EXTCON_USBC_TUSB320 is not set CONFIG_MEMORY=y # CONFIG_ARM_PL172_MPMC is not set CONFIG_IIO=y @@ -7370,118 +7565,109 @@ CONFIG_IIO_TRIGGERED_EVENT=m # # Accelerometers # -CONFIG_ADIS16201=m -CONFIG_ADIS16209=m -CONFIG_ADXL345=m -CONFIG_ADXL345_I2C=m -CONFIG_ADXL345_SPI=m -CONFIG_ADXL372=m -CONFIG_ADXL372_SPI=m -CONFIG_ADXL372_I2C=m -CONFIG_BMA180=m -CONFIG_BMA220=m +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16209 is not set +# CONFIG_ADXL345_I2C is not set +# CONFIG_ADXL345_SPI is not set +# CONFIG_ADXL372_SPI is not set +# CONFIG_ADXL372_I2C is not set +# CONFIG_BMA180 is not set +# CONFIG_BMA220 is not set # CONFIG_BMA400 is not set -CONFIG_BMC150_ACCEL=m -CONFIG_BMC150_ACCEL_I2C=m -CONFIG_BMC150_ACCEL_SPI=m -CONFIG_DA280=m -CONFIG_DA311=m -CONFIG_DMARD06=m -CONFIG_DMARD09=m -CONFIG_DMARD10=m -CONFIG_HID_SENSOR_ACCEL_3D=m -CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m -CONFIG_IIO_ST_ACCEL_3AXIS=m -CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m -CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m -CONFIG_KXSD9=m -CONFIG_KXSD9_SPI=m -CONFIG_KXSD9_I2C=m -CONFIG_KXCJK1013=m -CONFIG_MC3230=m -CONFIG_MMA7455=m -CONFIG_MMA7455_I2C=m -CONFIG_MMA7455_SPI=m -CONFIG_MMA7660=m -CONFIG_MMA8452=m -CONFIG_MMA9551_CORE=m -CONFIG_MMA9551=m -CONFIG_MMA9553=m -CONFIG_MXC4005=m -CONFIG_MXC6255=m -CONFIG_SCA3000=m -CONFIG_STK8312=m -CONFIG_STK8BA50=m +# CONFIG_BMC150_ACCEL is not set +# CONFIG_BMI088_ACCEL is not set +# CONFIG_DA280 is not set +# CONFIG_DA311 is not set +# CONFIG_DMARD06 is not set +# CONFIG_DMARD09 is not set +# CONFIG_DMARD10 is not set +# CONFIG_FXLS8962AF_I2C is not set +# CONFIG_FXLS8962AF_SPI is not set +# CONFIG_HID_SENSOR_ACCEL_3D is not set +# CONFIG_IIO_ST_ACCEL_3AXIS is not set +# CONFIG_KXSD9 is not set +# CONFIG_KXCJK1013 is not set +# CONFIG_MC3230 is not set +# CONFIG_MMA7455_I2C is not set +# CONFIG_MMA7455_SPI is not set +# CONFIG_MMA7660 is not set +# CONFIG_MMA8452 is not set +# CONFIG_MMA9551 is not set +# CONFIG_MMA9553 is not set +# CONFIG_MXC4005 is not set +# CONFIG_MXC6255 is not set +# CONFIG_SCA3000 is not set +# CONFIG_SCA3300 is not set +# CONFIG_STK8312 is not set +# CONFIG_STK8BA50 is not set # end of Accelerometers # # Analog to digital converters # -CONFIG_AD_SIGMA_DELTA=m # CONFIG_AD7091R5 is not set -CONFIG_AD7124=m -CONFIG_AD7192=m -CONFIG_AD7266=m -CONFIG_AD7291=m +# CONFIG_AD7124 is not set +# CONFIG_AD7192 is not set +# CONFIG_AD7266 is not set +# CONFIG_AD7291 is not set # CONFIG_AD7292 is not set -CONFIG_AD7298=m -CONFIG_AD7476=m -CONFIG_AD7606=m -CONFIG_AD7606_IFACE_PARALLEL=m -CONFIG_AD7606_IFACE_SPI=m -CONFIG_AD7766=m -CONFIG_AD7768_1=m -CONFIG_AD7780=m -CONFIG_AD7791=m -CONFIG_AD7793=m -CONFIG_AD7887=m -CONFIG_AD7923=m -CONFIG_AD7949=m -CONFIG_AD799X=m -# CONFIG_AD9467 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7606_IFACE_PARALLEL is not set +# CONFIG_AD7606_IFACE_SPI is not set +# CONFIG_AD7766 is not set +# CONFIG_AD7768_1 is not set +# CONFIG_AD7780 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7887 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD7949 is not set +# CONFIG_AD799X is not set # CONFIG_ADI_AXI_ADC is not set -CONFIG_AXP20X_ADC=m -CONFIG_AXP288_ADC=m -CONFIG_CC10001_ADC=m -CONFIG_ENVELOPE_DETECTOR=m -CONFIG_HI8435=m -CONFIG_HX711=m -CONFIG_INA2XX_ADC=m -CONFIG_LTC2471=m -CONFIG_LTC2485=m +# CONFIG_AXP20X_ADC is not set +# CONFIG_AXP288_ADC is not set +# CONFIG_CC10001_ADC is not set +# CONFIG_ENVELOPE_DETECTOR is not set +# CONFIG_HI8435 is not set +# CONFIG_HX711 is not set +# CONFIG_INA2XX_ADC is not set +# CONFIG_LTC2471 is not set +# CONFIG_LTC2485 is not set # CONFIG_LTC2496 is not set -CONFIG_LTC2497=m -CONFIG_MAX1027=m -CONFIG_MAX11100=m -CONFIG_MAX1118=m +# CONFIG_LTC2497 is not set +# CONFIG_MAX1027 is not set +# CONFIG_MAX11100 is not set +# CONFIG_MAX1118 is not set # CONFIG_MAX1241 is not set -CONFIG_MAX1363=m -CONFIG_MAX9611=m -CONFIG_MCP320X=m -CONFIG_MCP3422=m -CONFIG_MCP3911=m -CONFIG_NAU7802=m -CONFIG_QCOM_VADC_COMMON=y -CONFIG_QCOM_SPMI_IADC=m -CONFIG_QCOM_SPMI_VADC=y -CONFIG_QCOM_SPMI_ADC5=m +# CONFIG_MAX1363 is not set +# CONFIG_MAX9611 is not set +# CONFIG_MCP320X is not set +# CONFIG_MCP3422 is not set +# CONFIG_MCP3911 is not set +# CONFIG_NAU7802 is not set +# CONFIG_QCOM_SPMI_IADC is not set +# CONFIG_QCOM_SPMI_VADC is not set +# CONFIG_QCOM_SPMI_ADC5 is not set CONFIG_ROCKCHIP_SARADC=m -CONFIG_SD_ADC_MODULATOR=m -CONFIG_TI_ADC081C=m -CONFIG_TI_ADC0832=m -CONFIG_TI_ADC084S021=m -CONFIG_TI_ADC12138=m -CONFIG_TI_ADC108S102=m -CONFIG_TI_ADC128S052=m -CONFIG_TI_ADC161S626=m -CONFIG_TI_ADS1015=m -CONFIG_TI_ADS7950=m -CONFIG_TI_ADS8344=m -CONFIG_TI_ADS8688=m -CONFIG_TI_ADS124S08=m -CONFIG_TI_TLC4541=m -CONFIG_VF610_ADC=m -CONFIG_VIPERBOARD_ADC=m +# CONFIG_SD_ADC_MODULATOR is not set +# CONFIG_TI_ADC081C is not set +# CONFIG_TI_ADC0832 is not set +# CONFIG_TI_ADC084S021 is not set +# CONFIG_TI_ADC12138 is not set +# CONFIG_TI_ADC108S102 is not set +# CONFIG_TI_ADC128S052 is not set +# CONFIG_TI_ADC161S626 is not set +# CONFIG_TI_ADS1015 is not set +# CONFIG_TI_ADS7950 is not set +# CONFIG_TI_ADS8344 is not set +# CONFIG_TI_ADS8688 is not set +# CONFIG_TI_ADS124S08 is not set +# CONFIG_TI_ADS131E08 is not set +# CONFIG_TI_TLC4541 is not set +# CONFIG_TI_TSC2046 is not set +# CONFIG_VF610_ADC is not set +# CONFIG_VIPERBOARD_ADC is not set # CONFIG_XILINX_XADC is not set # end of Analog to digital converters @@ -7494,30 +7680,34 @@ CONFIG_IIO_RESCALE=m # # Amplifiers # -CONFIG_AD8366=m +# CONFIG_AD8366 is not set # CONFIG_HMC425 is not set # end of Amplifiers +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# end of Capacitance to digital converters + # # Chemical Sensors # -CONFIG_ATLAS_PH_SENSOR=m +# CONFIG_ATLAS_PH_SENSOR is not set # CONFIG_ATLAS_EZO_SENSOR is not set -CONFIG_BME680=m -CONFIG_BME680_I2C=m -CONFIG_BME680_SPI=m -CONFIG_CCS811=m -CONFIG_IAQCORE=m -CONFIG_PMS7003=m +# CONFIG_BME680 is not set +# CONFIG_CCS811 is not set +# CONFIG_IAQCORE is not set +# CONFIG_PMS7003 is not set # CONFIG_SCD30_CORE is not set -CONFIG_SENSIRION_SGP30=m -CONFIG_SPS30=m -CONFIG_VZ89X=m +# CONFIG_SENSIRION_SGP30 is not set +# CONFIG_SENSIRION_SGP40 is not set +# CONFIG_SPS30_I2C is not set +# CONFIG_SPS30_SERIAL is not set +# CONFIG_VZ89X is not set # end of Chemical Sensors -CONFIG_IIO_CROS_EC_SENSORS_CORE=m -CONFIG_IIO_CROS_EC_SENSORS=m -# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set +# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set # # Hid Sensor IIO Common @@ -7526,7 +7716,10 @@ CONFIG_HID_SENSOR_IIO_COMMON=m CONFIG_HID_SENSOR_IIO_TRIGGER=m # end of Hid Sensor IIO Common -CONFIG_IIO_MS_SENSORS_I2C=m +# +# IIO SCMI Sensors +# +# end of IIO SCMI Sensors # # SSP Sensor Common @@ -7534,49 +7727,44 @@ CONFIG_IIO_MS_SENSORS_I2C=m # CONFIG_IIO_SSP_SENSORHUB is not set # end of SSP Sensor Common -CONFIG_IIO_ST_SENSORS_I2C=m -CONFIG_IIO_ST_SENSORS_SPI=m -CONFIG_IIO_ST_SENSORS_CORE=m - # # Digital to analog converters # -CONFIG_AD5064=m -CONFIG_AD5360=m -CONFIG_AD5380=m -CONFIG_AD5421=m -CONFIG_AD5446=m -CONFIG_AD5449=m -CONFIG_AD5592R_BASE=m -CONFIG_AD5592R=m -CONFIG_AD5593R=m -CONFIG_AD5504=m -CONFIG_AD5624R_SPI=m -CONFIG_AD5686=m -CONFIG_AD5686_SPI=m -CONFIG_AD5696_I2C=m -CONFIG_AD5755=m -CONFIG_AD5758=m -CONFIG_AD5761=m -CONFIG_AD5764=m +# CONFIG_AD5064 is not set +# CONFIG_AD5360 is not set +# CONFIG_AD5380 is not set +# CONFIG_AD5421 is not set +# CONFIG_AD5446 is not set +# CONFIG_AD5449 is not set +# CONFIG_AD5592R is not set +# CONFIG_AD5593R is not set +# CONFIG_AD5504 is not set +# CONFIG_AD5624R_SPI is not set +# CONFIG_AD5686_SPI is not set +# CONFIG_AD5696_I2C is not set +# CONFIG_AD5755 is not set +# CONFIG_AD5758 is not set +# CONFIG_AD5761 is not set +# CONFIG_AD5764 is not set +# CONFIG_AD5766 is not set # CONFIG_AD5770R is not set -CONFIG_AD5791=m -CONFIG_AD7303=m -CONFIG_AD8801=m -CONFIG_DPOT_DAC=m -CONFIG_DS4424=m -CONFIG_LTC1660=m -CONFIG_LTC2632=m -CONFIG_M62332=m -CONFIG_MAX517=m -CONFIG_MAX5821=m -CONFIG_MCP4725=m -CONFIG_MCP4922=m -CONFIG_TI_DAC082S085=m -CONFIG_TI_DAC5571=m -CONFIG_TI_DAC7311=m -CONFIG_TI_DAC7612=m -CONFIG_VF610_DAC=m +# CONFIG_AD5791 is not set +# CONFIG_AD7303 is not set +# CONFIG_AD8801 is not set +# CONFIG_DPOT_DAC is not set +# CONFIG_DS4424 is not set +# CONFIG_LTC1660 is not set +# CONFIG_LTC2632 is not set +# CONFIG_M62332 is not set +# CONFIG_MAX517 is not set +# CONFIG_MAX5821 is not set +# CONFIG_MCP4725 is not set +# CONFIG_MCP4922 is not set +# CONFIG_TI_DAC082S085 is not set +# CONFIG_TI_DAC5571 is not set +# CONFIG_TI_DAC7311 is not set +# CONFIG_TI_DAC7612 is not set +# CONFIG_VF610_DAC is not set # end of Digital to analog converters # @@ -7592,13 +7780,13 @@ CONFIG_VF610_DAC=m # # Clock Generator/Distribution # -CONFIG_AD9523=m +# CONFIG_AD9523 is not set # end of Clock Generator/Distribution # # Phase-Locked Loop (PLL) frequency synthesizers # -CONFIG_ADF4350=m +# CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set # end of Phase-Locked Loop (PLL) frequency synthesizers # end of Frequency Synthesizers DDS/PLL @@ -7606,25 +7794,18 @@ CONFIG_ADF4350=m # # Digital gyroscope sensors # -CONFIG_ADIS16080=m -CONFIG_ADIS16130=m -CONFIG_ADIS16136=m -CONFIG_ADIS16260=m +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADIS16260 is not set # CONFIG_ADXRS290 is not set -CONFIG_ADXRS450=m -CONFIG_BMG160=m -CONFIG_BMG160_I2C=m -CONFIG_BMG160_SPI=m -CONFIG_FXAS21002C=m -CONFIG_FXAS21002C_I2C=m -CONFIG_FXAS21002C_SPI=m -CONFIG_HID_SENSOR_GYRO_3D=m -CONFIG_MPU3050=m -CONFIG_MPU3050_I2C=m -CONFIG_IIO_ST_GYRO_3AXIS=m -CONFIG_IIO_ST_GYRO_I2C_3AXIS=m -CONFIG_IIO_ST_GYRO_SPI_3AXIS=m -CONFIG_ITG3200=m +# CONFIG_ADXRS450 is not set +# CONFIG_BMG160 is not set +# CONFIG_FXAS21002C is not set +# CONFIG_HID_SENSOR_GYRO_3D is not set +# CONFIG_MPU3050_I2C is not set +# CONFIG_IIO_ST_GYRO_3AXIS is not set +# CONFIG_ITG3200 is not set # end of Digital gyroscope sensors # @@ -7634,50 +7815,45 @@ CONFIG_ITG3200=m # # Heart Rate Monitors # -CONFIG_AFE4403=m -CONFIG_AFE4404=m -CONFIG_MAX30100=m -CONFIG_MAX30102=m +# CONFIG_AFE4403 is not set +# CONFIG_AFE4404 is not set +# CONFIG_MAX30100 is not set +# CONFIG_MAX30102 is not set # end of Heart Rate Monitors # end of Health Sensors # # Humidity sensors # -CONFIG_AM2315=m -CONFIG_DHT11=m -CONFIG_HDC100X=m +# CONFIG_AM2315 is not set +# CONFIG_DHT11 is not set +# CONFIG_HDC100X is not set # CONFIG_HDC2010 is not set -CONFIG_HID_SENSOR_HUMIDITY=m -CONFIG_HTS221=m -CONFIG_HTS221_I2C=m -CONFIG_HTS221_SPI=m -CONFIG_HTU21=m -CONFIG_SI7005=m -CONFIG_SI7020=m +# CONFIG_HID_SENSOR_HUMIDITY is not set +# CONFIG_HTS221 is not set +# CONFIG_HTU21 is not set +# CONFIG_SI7005 is not set +# CONFIG_SI7020 is not set # end of Humidity sensors # # Inertial measurement units # -CONFIG_ADIS16400=m +# CONFIG_ADIS16400 is not set # CONFIG_ADIS16460 is not set # CONFIG_ADIS16475 is not set -CONFIG_ADIS16480=m -CONFIG_BMI160=m -CONFIG_BMI160_I2C=m -CONFIG_BMI160_SPI=m +# CONFIG_ADIS16480 is not set +# CONFIG_BMI160_I2C is not set +# CONFIG_BMI160_SPI is not set # CONFIG_FXOS8700_I2C is not set # CONFIG_FXOS8700_SPI is not set -CONFIG_KMX61=m +# CONFIG_KMX61 is not set # CONFIG_INV_ICM42600_I2C is not set # CONFIG_INV_ICM42600_SPI is not set -CONFIG_INV_MPU6050_IIO=m -CONFIG_INV_MPU6050_I2C=m -CONFIG_INV_MPU6050_SPI=m -CONFIG_IIO_ST_LSM6DSX=m -CONFIG_IIO_ST_LSM6DSX_I2C=m -CONFIG_IIO_ST_LSM6DSX_SPI=m +# CONFIG_INV_MPU6050_I2C is not set +# CONFIG_INV_MPU6050_SPI is not set +# CONFIG_IIO_ST_LSM6DSX is not set +# CONFIG_IIO_ST_LSM9DS0 is not set # end of Inertial measurement units CONFIG_IIO_ADIS_LIB=m @@ -7686,80 +7862,74 @@ CONFIG_IIO_ADIS_LIB_BUFFER=y # # Light sensors # -CONFIG_ACPI_ALS=m -CONFIG_ADJD_S311=m +# CONFIG_ACPI_ALS is not set +# CONFIG_ADJD_S311 is not set # CONFIG_ADUX1020 is not set # CONFIG_AL3010 is not set -CONFIG_AL3320A=m -CONFIG_APDS9300=m -CONFIG_APDS9960=m +# CONFIG_AL3320A is not set +# CONFIG_APDS9300 is not set +# CONFIG_APDS9960 is not set # CONFIG_AS73211 is not set -CONFIG_BH1750=m -CONFIG_BH1780=m -CONFIG_CM32181=m -CONFIG_CM3232=m -CONFIG_CM3323=m -CONFIG_CM3605=m -CONFIG_CM36651=m -CONFIG_IIO_CROS_EC_LIGHT_PROX=m +# CONFIG_BH1750 is not set +# CONFIG_BH1780 is not set +# CONFIG_CM32181 is not set +# CONFIG_CM3232 is not set +# CONFIG_CM3323 is not set +# CONFIG_CM3605 is not set +# CONFIG_CM36651 is not set # CONFIG_GP2AP002 is not set -CONFIG_GP2AP020A00F=m -CONFIG_SENSORS_ISL29018=m -CONFIG_SENSORS_ISL29028=m -CONFIG_ISL29125=m -CONFIG_HID_SENSOR_ALS=m -CONFIG_HID_SENSOR_PROX=m -CONFIG_JSA1212=m -CONFIG_RPR0521=m -CONFIG_LTR501=m -CONFIG_LV0104CS=m -CONFIG_MAX44000=m -CONFIG_MAX44009=m +# CONFIG_GP2AP020A00F is not set +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_SENSORS_ISL29028 is not set +# CONFIG_ISL29125 is not set +# CONFIG_HID_SENSOR_ALS is not set +# CONFIG_HID_SENSOR_PROX is not set +# CONFIG_JSA1212 is not set +# CONFIG_RPR0521 is not set +# CONFIG_LTR501 is not set +# CONFIG_LV0104CS is not set +# CONFIG_MAX44000 is not set +# CONFIG_MAX44009 is not set # CONFIG_NOA1305 is not set -CONFIG_OPT3001=m -CONFIG_PA12203001=m -CONFIG_SI1133=m -CONFIG_SI1145=m -CONFIG_STK3310=m -CONFIG_ST_UVIS25=m -CONFIG_ST_UVIS25_I2C=m -CONFIG_ST_UVIS25_SPI=m -CONFIG_TCS3414=m -CONFIG_TCS3472=m -CONFIG_SENSORS_TSL2563=m -CONFIG_TSL2583=m -CONFIG_TSL2772=m -CONFIG_TSL4531=m -CONFIG_US5182D=m -CONFIG_VCNL4000=m -CONFIG_VCNL4035=m +# CONFIG_OPT3001 is not set +# CONFIG_PA12203001 is not set +# CONFIG_SI1133 is not set +# CONFIG_SI1145 is not set +# CONFIG_STK3310 is not set +# CONFIG_ST_UVIS25 is not set +# CONFIG_TCS3414 is not set +# CONFIG_TCS3472 is not set +# CONFIG_SENSORS_TSL2563 is not set +# CONFIG_TSL2583 is not set +# CONFIG_TSL2591 is not set +# CONFIG_TSL2772 is not set +# CONFIG_TSL4531 is not set +# CONFIG_US5182D is not set +# CONFIG_VCNL4000 is not set +# CONFIG_VCNL4035 is not set # CONFIG_VEML6030 is not set -CONFIG_VEML6070=m -CONFIG_VL6180=m -CONFIG_ZOPT2201=m +# CONFIG_VEML6070 is not set +# CONFIG_VL6180 is not set +# CONFIG_ZOPT2201 is not set # end of Light sensors # # Magnetometer sensors # -CONFIG_AK8974=m +# CONFIG_AK8974 is not set CONFIG_AK8975=m -CONFIG_AK09911=m -CONFIG_BMC150_MAGN=m -CONFIG_BMC150_MAGN_I2C=m -CONFIG_BMC150_MAGN_SPI=m -CONFIG_MAG3110=m -CONFIG_HID_SENSOR_MAGNETOMETER_3D=m -CONFIG_MMC35240=m -CONFIG_IIO_ST_MAGN_3AXIS=m -CONFIG_IIO_ST_MAGN_I2C_3AXIS=m -CONFIG_IIO_ST_MAGN_SPI_3AXIS=m -CONFIG_SENSORS_HMC5843=m -CONFIG_SENSORS_HMC5843_I2C=m -CONFIG_SENSORS_HMC5843_SPI=m -CONFIG_SENSORS_RM3100=m -CONFIG_SENSORS_RM3100_I2C=m -CONFIG_SENSORS_RM3100_SPI=m +# CONFIG_AK09911 is not set +# CONFIG_BMC150_MAGN_I2C is not set +# CONFIG_BMC150_MAGN_SPI is not set +# CONFIG_MAG3110 is not set +# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set +# CONFIG_MMC35240 is not set +# CONFIG_IIO_ST_MAGN_3AXIS is not set +# CONFIG_SENSORS_HMC5843_I2C is not set +# CONFIG_SENSORS_HMC5843_SPI is not set +# CONFIG_SENSORS_RM3100_I2C is not set +# CONFIG_SENSORS_RM3100_SPI is not set +# CONFIG_YAMAHA_YAS530 is not set # end of Magnetometer sensors # @@ -7787,102 +7957,96 @@ CONFIG_IIO_SYSFS_TRIGGER=m # # Linear and angular position sensors # +# CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set # end of Linear and angular position sensors # # Digital potentiometers # -CONFIG_AD5272=m -CONFIG_DS1803=m +# CONFIG_AD5110 is not set +# CONFIG_AD5272 is not set +# CONFIG_DS1803 is not set # CONFIG_MAX5432 is not set -CONFIG_MAX5481=m -CONFIG_MAX5487=m -CONFIG_MCP4018=m -CONFIG_MCP4131=m -CONFIG_MCP4531=m -CONFIG_MCP41010=m -CONFIG_TPL0102=m +# CONFIG_MAX5481 is not set +# CONFIG_MAX5487 is not set +# CONFIG_MCP4018 is not set +# CONFIG_MCP4131 is not set +# CONFIG_MCP4531 is not set +# CONFIG_MCP41010 is not set +# CONFIG_TPL0102 is not set # end of Digital potentiometers # # Digital potentiostats # -CONFIG_LMP91000=m +# CONFIG_LMP91000 is not set # end of Digital potentiostats # # Pressure sensors # -CONFIG_ABP060MG=m -CONFIG_BMP280=m -CONFIG_BMP280_I2C=m -CONFIG_BMP280_SPI=m -CONFIG_IIO_CROS_EC_BARO=m +# CONFIG_ABP060MG is not set +# CONFIG_BMP280 is not set # CONFIG_DLHL60D is not set # CONFIG_DPS310 is not set -CONFIG_HID_SENSOR_PRESS=m -CONFIG_HP03=m +# CONFIG_HID_SENSOR_PRESS is not set +# CONFIG_HP03 is not set # CONFIG_ICP10100 is not set -CONFIG_MPL115=m -CONFIG_MPL115_I2C=m -CONFIG_MPL115_SPI=m -CONFIG_MPL3115=m -CONFIG_MS5611=m -CONFIG_MS5611_I2C=m -CONFIG_MS5611_SPI=m -CONFIG_MS5637=m -CONFIG_IIO_ST_PRESS=m -CONFIG_IIO_ST_PRESS_I2C=m -CONFIG_IIO_ST_PRESS_SPI=m -CONFIG_T5403=m -CONFIG_HP206C=m -CONFIG_ZPA2326=m -CONFIG_ZPA2326_I2C=m -CONFIG_ZPA2326_SPI=m +# CONFIG_MPL115_I2C is not set +# CONFIG_MPL115_SPI is not set +# CONFIG_MPL3115 is not set +# CONFIG_MS5611 is not set +# CONFIG_MS5637 is not set +# CONFIG_IIO_ST_PRESS is not set +# CONFIG_T5403 is not set +# CONFIG_HP206C is not set +# CONFIG_ZPA2326 is not set # end of Pressure sensors # # Lightning sensors # -CONFIG_AS3935=m +# CONFIG_AS3935 is not set # end of Lightning sensors # # Proximity and distance sensors # -CONFIG_ISL29501=m -CONFIG_LIDAR_LITE_V2=m -CONFIG_MB1232=m +# CONFIG_CROS_EC_MKBP_PROXIMITY is not set +# CONFIG_ISL29501 is not set +# CONFIG_LIDAR_LITE_V2 is not set +# CONFIG_MB1232 is not set # CONFIG_PING is not set -CONFIG_RFD77402=m -CONFIG_SRF04=m +# CONFIG_RFD77402 is not set +# CONFIG_SRF04 is not set # CONFIG_SX9310 is not set -CONFIG_SX9500=m -CONFIG_SRF08=m +# CONFIG_SX9500 is not set +# CONFIG_SRF08 is not set # CONFIG_VCNL3020 is not set -CONFIG_VL53L0X_I2C=m +# CONFIG_VL53L0X_I2C is not set # end of Proximity and distance sensors # # Resolver to digital converters # -CONFIG_AD2S90=m -CONFIG_AD2S1200=m +# CONFIG_AD2S90 is not set +# CONFIG_AD2S1200 is not set # end of Resolver to digital converters # # Temperature sensors # # CONFIG_LTC2983 is not set -CONFIG_MAXIM_THERMOCOUPLE=m -CONFIG_HID_SENSOR_TEMP=m -CONFIG_MLX90614=m -CONFIG_MLX90632=m -CONFIG_TMP006=m -CONFIG_TMP007=m -CONFIG_TSYS01=m -CONFIG_TSYS02D=m -CONFIG_MAX31856=m +# CONFIG_MAXIM_THERMOCOUPLE is not set +# CONFIG_HID_SENSOR_TEMP is not set +# CONFIG_MLX90614 is not set +# CONFIG_MLX90632 is not set +# CONFIG_TMP006 is not set +# CONFIG_TMP007 is not set +# CONFIG_TMP117 is not set +# CONFIG_TSYS01 is not set +# CONFIG_TSYS02D is not set +# CONFIG_MAX31856 is not set # end of Temperature sensors # CONFIG_NTB is not set @@ -7890,7 +8054,9 @@ CONFIG_MAX31856=m CONFIG_PWM=y CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set +# CONFIG_PWM_ATMEL_TCB is not set CONFIG_PWM_CROS_EC=m +# CONFIG_PWM_DWC is not set # CONFIG_PWM_FSL_FTM is not set # CONFIG_PWM_PCA9685 is not set CONFIG_PWM_ROCKCHIP=y @@ -7912,8 +8078,6 @@ CONFIG_PARTITION_PERCPU=y # CONFIG_IPACK_BUS is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y -# CONFIG_RESET_BRCMSTB_RESCAL is not set -# CONFIG_RESET_INTEL_GW is not set # CONFIG_RESET_TI_SYSCON is not set # @@ -7922,7 +8086,7 @@ CONFIG_RESET_CONTROLLER=y CONFIG_GENERIC_PHY=y CONFIG_GENERIC_PHY_MIPI_DPHY=y CONFIG_PHY_XGENE=y -# CONFIG_USB_LGM_PHY is not set +# CONFIG_PHY_CAN_TRANSCEIVER is not set # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CADENCE_DPHY is not set @@ -7942,6 +8106,7 @@ CONFIG_PHY_ROCKCHIP_DP=y CONFIG_PHY_ROCKCHIP_EMMC=y CONFIG_PHY_ROCKCHIP_INNO_HDMI=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y +# CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY is not set # CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set CONFIG_PHY_ROCKCHIP_PCIE=y CONFIG_PHY_ROCKCHIP_TYPEC=y @@ -7952,6 +8117,7 @@ CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_POWERCAP=y # CONFIG_IDLE_INJECT is not set +# CONFIG_DTPM is not set # CONFIG_MCB is not set # @@ -7967,6 +8133,7 @@ CONFIG_ARM_PMU_ACPI=y # CONFIG_ARM_SMMU_V3_PMU is not set # CONFIG_ARM_DSU_PMU is not set # CONFIG_ARM_SPE_PMU is not set +# CONFIG_ARM_DMC620_PMU is not set CONFIG_HISI_PMU=y # end of Performance monitor support @@ -7998,6 +8165,7 @@ CONFIG_NVMEM_SYSFS=y # CONFIG_NVMEM_SPMI_SDAM is not set CONFIG_ROCKCHIP_EFUSE=y # CONFIG_ROCKCHIP_OTP is not set +# CONFIG_NVMEM_RMEM is not set # # HW tracing support @@ -8087,16 +8255,18 @@ CONFIG_F2FS_FS_SECURITY=y # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set # CONFIG_F2FS_FS_COMPRESSION is not set +CONFIG_F2FS_IOSTAT=y # CONFIG_ZONEFS_FS is not set # CONFIG_FS_DAX is not set CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y CONFIG_EXPORTFS_BLOCK_OPS=y CONFIG_FILE_LOCKING=y -CONFIG_MANDATORY_FILE_LOCKING=y CONFIG_FS_ENCRYPTION=y CONFIG_FS_ENCRYPTION_ALGS=y -# CONFIG_FS_VERITY is not set +CONFIG_FS_VERITY=y +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y @@ -8125,14 +8295,13 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y # # Caches # +CONFIG_NETFS_SUPPORT=m +CONFIG_NETFS_STATS=y CONFIG_FSCACHE=m CONFIG_FSCACHE_STATS=y -# CONFIG_FSCACHE_HISTOGRAM is not set # CONFIG_FSCACHE_DEBUG is not set -CONFIG_FSCACHE_OBJECT_LIST=y CONFIG_CACHEFILES=m # CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set # end of Caches # @@ -8158,6 +8327,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_NTFS_FS=m # CONFIG_NTFS_DEBUG is not set CONFIG_NTFS_RW=y +# CONFIG_NTFS3_FS is not set # end of DOS/FAT/EXFAT/NT Filesystems # @@ -8174,6 +8344,7 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set +CONFIG_ARCH_SUPPORTS_HUGETLBFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_MEMFD_CREATE=y @@ -8234,6 +8405,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y # CONFIG_ROMFS_BACKED_BY_BOTH is not set CONFIG_ROMFS_ON_BLOCK=y CONFIG_PSTORE=y +CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240 CONFIG_PSTORE_DEFLATE_COMPRESS=y # CONFIG_PSTORE_LZO_COMPRESS is not set # CONFIG_PSTORE_LZ4_COMPRESS is not set @@ -8263,7 +8435,7 @@ CONFIG_NFS_V4_1=y CONFIG_NFS_V4_2=y CONFIG_PNFS_FILE_LAYOUT=y CONFIG_PNFS_BLOCK=y -CONFIG_PNFS_FLEXFILE_LAYOUT=m +CONFIG_PNFS_FLEXFILE_LAYOUT=y CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" # CONFIG_NFS_V4_1_MIGRATION is not set CONFIG_NFS_V4_SECURITY_LABEL=y @@ -8288,6 +8460,7 @@ CONFIG_LOCKD=y CONFIG_LOCKD_V4=y CONFIG_NFS_ACL_SUPPORT=y CONFIG_NFS_COMMON=y +CONFIG_NFS_V4_2_SSC_HELPER=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y CONFIG_SUNRPC_BACKCHANNEL=y @@ -8302,7 +8475,6 @@ CONFIG_CEPH_FS_POSIX_ACL=y CONFIG_CIFS=m # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y @@ -8310,7 +8482,10 @@ CONFIG_CIFS_DEBUG=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set CONFIG_CIFS_DFS_UPCALL=y +# CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y +# CONFIG_SMB_SERVER is not set +CONFIG_SMBFS_COMMON=m CONFIG_CODA_FS=m # CONFIG_AFS_FS is not set CONFIG_9P_FS=m @@ -8404,7 +8579,9 @@ CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y CONFIG_SECURITY_YAMA=y # CONFIG_SECURITY_SAFESETID is not set # CONFIG_SECURITY_LOCKDOWN_LSM is not set +# CONFIG_SECURITY_LANDLOCK is not set # CONFIG_INTEGRITY is not set +# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set CONFIG_DEFAULT_SECURITY_APPARMOR=y # CONFIG_DEFAULT_SECURITY_DAC is not set CONFIG_LSM="yama,apparmor" @@ -8472,10 +8649,11 @@ CONFIG_CRYPTO_ENGINE=m # # Public-key cryptography # -CONFIG_CRYPTO_RSA=m +CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_ECC=m CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDSA=m # CONFIG_CRYPTO_ECRDSA is not set # CONFIG_CRYPTO_SM2 is not set CONFIG_CRYPTO_CURVE25519=m @@ -8530,17 +8708,13 @@ CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA3=y CONFIG_CRYPTO_SM3=y # CONFIG_CRYPTO_STREEBOG is not set -CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m # @@ -8559,7 +8733,6 @@ CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m @@ -8617,6 +8790,7 @@ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y CONFIG_CRYPTO_LIB_POLY1305=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m CONFIG_CRYPTO_LIB_SHA256=y +CONFIG_CRYPTO_LIB_SM4=y CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set @@ -8635,6 +8809,7 @@ CONFIG_CRYPTO_DEV_CCREE=m # CONFIG_CRYPTO_DEV_HISI_SEC2 is not set # CONFIG_CRYPTO_DEV_HISI_ZIP is not set # CONFIG_CRYPTO_DEV_HISI_HPRE is not set +# CONFIG_CRYPTO_DEV_HISI_TRNG is not set # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y @@ -8642,6 +8817,8 @@ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_X509_CERTIFICATE_PARSER=y # CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set CONFIG_PKCS7_MESSAGE_PARSER=y +# CONFIG_PKCS7_TEST_KEY is not set +# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set # # Certificates for signature checking @@ -8653,6 +8830,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set # end of Certificates for signature checking +CONFIG_BINARY_PRINTF=y + # # Library routines # @@ -8665,6 +8844,7 @@ CONFIG_HAVE_ARCH_BITREVERSE=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_CORDIC=m # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y @@ -8745,6 +8925,7 @@ CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y CONFIG_SWIOTLB=y +# CONFIG_DMA_RESTRICTED_POOL is not set CONFIG_DMA_NONCOHERENT_MMAP=y CONFIG_DMA_COHERENT_POOL=y CONFIG_DMA_REMAP=y @@ -8762,6 +8943,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MAX is not set CONFIG_CMA_ALIGNMENT=8 # CONFIG_DMA_API_DEBUG is not set +# CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y CONFIG_CHECK_SIGNATURE=y CONFIG_CPU_RMAP=y @@ -8788,9 +8970,11 @@ CONFIG_SG_POOL=y CONFIG_MEMREGION=y CONFIG_ARCH_STACKWALK=y CONFIG_SBITMAP=y -# CONFIG_STRING_SELFTEST is not set # end of Library routines +CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y +CONFIG_ASN1_ENCODER=m + # # Kernel hacking # @@ -8800,6 +8984,7 @@ CONFIG_SBITMAP=y # CONFIG_PRINTK_TIME=y # CONFIG_PRINTK_CALLER is not set +# CONFIG_STACKTRACE_BUILD_ID is not set CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONSOLE_LOGLEVEL_QUIET=4 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 @@ -8814,16 +8999,16 @@ CONFIG_DEBUG_BUGVERBOSE=y # Compile-time checks and compiler options # # CONFIG_DEBUG_INFO is not set -CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 CONFIG_STRIP_ASM_SYMS=y # CONFIG_READABLE_ASM is not set # CONFIG_HEADERS_INSTALL is not set CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y -# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set +# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y +# CONFIG_VMLINUX_MAP is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # end of Compile-time checks and compiler options @@ -8882,9 +9067,13 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y # CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y +CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y +CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set +CONFIG_HAVE_ARCH_KFENCE=y +# CONFIG_KFENCE is not set # end of Memory Debugging # CONFIG_DEBUG_SHIRQ is not set @@ -8937,10 +9126,10 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y # CONFIG_CSD_LOCK_WAIT_DEBUG is not set # end of Lock Debugging (spinlocks, mutexes, etc...) +# CONFIG_DEBUG_IRQFLAGS is not set CONFIG_STACKTRACE=y # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set # CONFIG_DEBUG_KOBJECT is not set -CONFIG_HAVE_DEBUG_BUGVERBOSE=y # # Debug kernel data structures @@ -8967,7 +9156,6 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # end of RCU Debugging # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set # CONFIG_LATENCYTOP is not set CONFIG_HAVE_FUNCTION_TRACER=y @@ -8980,7 +9168,6 @@ CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set # CONFIG_SAMPLES is not set -CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y CONFIG_STRICT_DEVMEM=y # CONFIG_IO_STRICT_DEVMEM is not set @@ -9003,6 +9190,7 @@ CONFIG_ARCH_HAS_KCOV=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y # CONFIG_KCOV is not set # CONFIG_RUNTIME_TESTING_MENU is not set +CONFIG_ARCH_USE_MEMTEST=y # CONFIG_MEMTEST is not set # end of Kernel Testing and Coverage # end of Kernel hacking diff --git a/srcpkgs/pinebookpro-kernel/patches/0005-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch b/srcpkgs/pinebookpro-kernel/patches/0005-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch deleted file mode 100644 index 2dff40be4b9..00000000000 --- a/srcpkgs/pinebookpro-kernel/patches/0005-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bdf0ad5977e37d8415f53011f8f8495e0ebce152 Mon Sep 17 00:00:00 2001 -From: Tobias Schramm -Date: Thu, 28 May 2020 14:34:47 +0200 -Subject: [PATCH 5/8] sound: soc: codecs: es8316: Run micdetect only if jack - status asserted - -Think this is (was?) required to prevent flapping of detection status on -the PBP. - -Signed-off-by: Tobias Schramm ---- - sound/soc/codecs/es8316.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c -index f9ec5cf82599..04bba9442060 100644 ---- a/sound/soc/codecs/es8316.c -+++ b/sound/soc/codecs/es8316.c -@@ -688,7 +688,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component) - snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE, - ES8316_GPIO_ENABLE_INTERRUPT, 0); - -- if (es8316->jack->status & SND_JACK_MICROPHONE) { -+ if (es8316->jack && (es8316->jack->status & SND_JACK_MICROPHONE)) { - es8316_disable_micbias_for_mic_gnd_short_detect(component); - snd_soc_jack_report(es8316->jack, 0, SND_JACK_BTN_0); - } --- -2.29.2 - diff --git a/srcpkgs/pinebookpro-kernel/patches/drm-rockchip-support-gamma-control-on-RK3399.patch b/srcpkgs/pinebookpro-kernel/patches/drm-rockchip-support-gamma-control-on-RK3399.patch new file mode 100644 index 00000000000..7969b640d8a --- /dev/null +++ b/srcpkgs/pinebookpro-kernel/patches/drm-rockchip-support-gamma-control-on-RK3399.patch @@ -0,0 +1,667 @@ +Source: https://patchwork.kernel.org/project/linux-rockchip/patch/20211019215843.42718-2-sigmaris@gmail.com/ +Upstream: no + +From patchwork Tue Oct 19 21:58:41 2021 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Hugh Cole-Baker +X-Patchwork-Id: 12571177 +Return-Path: + +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on + aws-us-west-2-korg-lkml-1.web.codeaurora.org +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id EF2BCC43217 + for ; + Tue, 19 Oct 2021 21:59:16 +0000 (UTC) +Received: from bombadil.infradead.org (bombadil.infradead.org + [198.137.202.133]) + (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.kernel.org (Postfix) with ESMTPS id BADCF60FDA + for ; + Tue, 19 Oct 2021 21:59:16 +0000 (UTC) +DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BADCF60FDA +Authentication-Results: mail.kernel.org; + dmarc=fail (p=none dis=none) header.from=gmail.com +Authentication-Results: mail.kernel.org; + spf=none smtp.mailfrom=lists.infradead.org +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=bombadil.20210309; h=Sender: + Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: + List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: + Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: + Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: + List-Owner; bh=EqcGhTXNHxLjs4GeNeyEmq5LQRaq+Myjxe15Omdo3zg=; b=WipF8awV3GyV0e + kgWAQIrKxNxmI+xZhPVMfYQrDKseHUh5l4MTVbElfsNAZnP6UY9y2RciAwS1T6QE6g7cWBToK+kSd + tgP1fTozzC6ykiWD4rvkUEDsthGCT1OC/xPjfMIBPVQk1TDVRY40iKHnmGz9kCRWsa09nkFDeslMW + ZoAV7QxTXvFpqflmFTe887J37+PxeSsqAtjUZwjrdTip6oybHVhd9q6eVrVPNz0c3EzopeFx/kOOm + Wvt2AWng+UCxTZoTZugNQBOBfOsv/QQgLfg0q9V6kNHycJtcevP6GsyYGZ+0LabMaqckOh9RK7O4x + Co47MeIsJRvrSAP295ng==; +Received: from localhost ([::1] helo=bombadil.infradead.org) + by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) + id 1mcx8a-002irO-35; Tue, 19 Oct 2021 21:59:12 +0000 +Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) + by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) + id 1mcx8J-002ihZ-Mf; Tue, 19 Oct 2021 21:58:57 +0000 +Received: by mail-wm1-x32e.google.com with SMTP id + z77-20020a1c7e50000000b0030db7b70b6bso5870939wmc.1; + Tue, 19 Oct 2021 14:58:54 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; + h=from:to:cc:subject:date:message-id:in-reply-to:references + :mime-version:content-transfer-encoding; + bh=Ws77StmGP8OqTFmlkQUufLolF3RfQn4nI0VMLqEcX8s=; + b=dGZQ8Q3orJrTzIZ4Gs9rn9dr9PAu9PCjkmUK5Lr6UkhpNzYMcMd3020nPpiG6Sqqpy + iLRrSxDSXQ7kSYllOPk2BtvQUGsDdBHD7NGzfb5c2CazkxrvtoLOMJXxZabDfp9dJ33y + Nc6l+vslIYyFBqsf5MjBRyT1WWM8BbqdLViNK1jE0RWT9LaZ+QLmNI1goCpLxyjClx5q + BHWHbXcWTtSRVC5h7zAbVkeTp5sxkU/JgDJP/NlgaeLhv5fT3vRPg7iwOgHc91kIXC5y + UrXcfWoKPWR5+n9loBQ6PqrQbibvW07GBRJNMSRCw72SB0r9diQgYYeWronJNwIqWDmB + vHpg== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20210112; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:mime-version:content-transfer-encoding; + bh=Ws77StmGP8OqTFmlkQUufLolF3RfQn4nI0VMLqEcX8s=; + b=sxveNLJpyeHIxAc0lLGzMi6dTwpuj5EC2Nq5+ypLTJu+vH83R/yV+whpVpI4yQbNQZ + uZfjds+vUF8T/kr+k9v72xQGg5VmtKIm4Al4j8+OdPupdsjUqwymsp40RUA476Pc1yX+ + DjIRdfFWS6YDp5foNGlLXHefuI4S/4fvGmW53BI7ZoEGldia25la5PCHUspe2VZI4Lgn + ZchGK4aT1RbEL0KBThFjSVt4mGon+KeHk8bjW5CI4EUuAAf4/jpppC69B5Cy+myMU/WE + Tujt2FKA0MGVxprviL1MniA81m5IEvewvG5eZhO59TnXKq+XY47lK0n5TGag9jEdT2LT + fcsg== +X-Gm-Message-State: AOAM533AZaW6ntLxS4JBa7mC0O7lveBcmLsJQF9kcmDdUxInS38G3xBI + I/e9THNRFXBr5BPQpV/GwEc= +X-Google-Smtp-Source: + ABdhPJxlnImj2nZarYrS7pboEsot76oZv/a0I0DfIZ6Yn6Tqye98tM7z2na6Er6vRQMM1xsYYiNxOg== +X-Received: by 2002:adf:97d0:: with SMTP id + t16mr45716779wrb.124.1634680732995; + Tue, 19 Oct 2021 14:58:52 -0700 (PDT) +Received: from apple.sigmaris.info (ebrouter.sigmaris.info. [82.69.107.165]) + by smtp.gmail.com with ESMTPSA id s3sm178540wrm.40.2021.10.19.14.58.52 + (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); + Tue, 19 Oct 2021 14:58:52 -0700 (PDT) +From: Hugh Cole-Baker +To: heiko@sntech.de, + hjc@rock-chips.com +Cc: dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, + linux-arm-kernel@lists.infradead.org, ezequiel@collabora.com, + Hugh Cole-Baker +Subject: [PATCH v2 1/3] drm/rockchip: define gamma registers for RK3399 +Date: Tue, 19 Oct 2021 22:58:41 +0100 +Message-Id: <20211019215843.42718-2-sigmaris@gmail.com> +X-Mailer: git-send-email 2.24.3 (Apple Git-128) +In-Reply-To: <20211019215843.42718-1-sigmaris@gmail.com> +References: <20211019215843.42718-1-sigmaris@gmail.com> +MIME-Version: 1.0 +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20211019_145855_763472_DAE885F2 +X-CRM114-Status: GOOD ( 15.39 ) +X-BeenThere: linux-rockchip@lists.infradead.org +X-Mailman-Version: 2.1.34 +Precedence: list +List-Id: Upstream kernel work for Rockchip platforms + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Sender: "Linux-rockchip" +Errors-To: + linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org + +The VOP on RK3399 has a different approach from previous versions for +setting a gamma lookup table, using an update_gamma_lut register. As +this differs from RK3288, give RK3399 its own set of "common" register +definitions. + +Signed-off-by: Hugh Cole-Baker +--- + +Changes from v1: no changes in this patch + + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 ++ + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 24 +++++++++++++++++++-- + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 1 + + 3 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +index 857d97cdc67c..14179e89bd21 100644 +--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h ++++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +@@ -99,6 +99,8 @@ struct vop_common { + struct vop_reg dither_down_en; + struct vop_reg dither_up; + struct vop_reg dsp_lut_en; ++ struct vop_reg update_gamma_lut; ++ struct vop_reg lut_buffer_index; + struct vop_reg gate_en; + struct vop_reg mmu_en; + struct vop_reg out_mode; +diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +index ca7cc82125cb..bfb7e130f09b 100644 +--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c ++++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +@@ -865,6 +865,24 @@ static const struct vop_output rk3399_output = { + .mipi_dual_channel_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 3), + }; + ++static const struct vop_common rk3399_common = { ++ .standby = VOP_REG_SYNC(RK3399_SYS_CTRL, 0x1, 22), ++ .gate_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 23), ++ .mmu_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 20), ++ .dither_down_sel = VOP_REG(RK3399_DSP_CTRL1, 0x1, 4), ++ .dither_down_mode = VOP_REG(RK3399_DSP_CTRL1, 0x1, 3), ++ .dither_down_en = VOP_REG(RK3399_DSP_CTRL1, 0x1, 2), ++ .pre_dither_down = VOP_REG(RK3399_DSP_CTRL1, 0x1, 1), ++ .dither_up = VOP_REG(RK3399_DSP_CTRL1, 0x1, 6), ++ .dsp_lut_en = VOP_REG(RK3399_DSP_CTRL1, 0x1, 0), ++ .update_gamma_lut = VOP_REG(RK3399_DSP_CTRL1, 0x1, 7), ++ .lut_buffer_index = VOP_REG(RK3399_DBG_POST_REG1, 0x1, 1), ++ .data_blank = VOP_REG(RK3399_DSP_CTRL0, 0x1, 19), ++ .dsp_blank = VOP_REG(RK3399_DSP_CTRL0, 0x3, 18), ++ .out_mode = VOP_REG(RK3399_DSP_CTRL0, 0xf, 0), ++ .cfg_done = VOP_REG_SYNC(RK3399_REG_CFG_DONE, 0x1, 0), ++}; ++ + static const struct vop_yuv2yuv_phy rk3399_yuv2yuv_win01_data = { + .y2r_coefficients = { + VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 0, 0xffff, 0), +@@ -944,7 +962,7 @@ static const struct vop_data rk3399_vop_big = { + .version = VOP_VERSION(3, 5), + .feature = VOP_FEATURE_OUTPUT_RGB10, + .intr = &rk3366_vop_intr, +- .common = &rk3288_common, ++ .common = &rk3399_common, + .modeset = &rk3288_modeset, + .output = &rk3399_output, + .afbc = &rk3399_vop_afbc, +@@ -952,6 +970,7 @@ static const struct vop_data rk3399_vop_big = { + .win = rk3399_vop_win_data, + .win_size = ARRAY_SIZE(rk3399_vop_win_data), + .win_yuv2yuv = rk3399_vop_big_win_yuv2yuv_data, ++ .lut_size = 1024, + }; + + static const struct vop_win_data rk3399_vop_lit_win_data[] = { +@@ -970,13 +989,14 @@ static const struct vop_win_yuv2yuv_data rk3399_vop_lit_win_yuv2yuv_data[] = { + static const struct vop_data rk3399_vop_lit = { + .version = VOP_VERSION(3, 6), + .intr = &rk3366_vop_intr, +- .common = &rk3288_common, ++ .common = &rk3399_common, + .modeset = &rk3288_modeset, + .output = &rk3399_output, + .misc = &rk3368_misc, + .win = rk3399_vop_lit_win_data, + .win_size = ARRAY_SIZE(rk3399_vop_lit_win_data), + .win_yuv2yuv = rk3399_vop_lit_win_yuv2yuv_data, ++ .lut_size = 256, + }; + + static const struct vop_win_data rk3228_vop_win_data[] = { +diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h +index 0b3cd65ba5c1..406e981c75bd 100644 +--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h ++++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h +@@ -628,6 +628,7 @@ + #define RK3399_YUV2YUV_WIN 0x02c0 + #define RK3399_YUV2YUV_POST 0x02c4 + #define RK3399_AUTO_GATING_EN 0x02cc ++#define RK3399_DBG_POST_REG1 0x036c + #define RK3399_WIN0_CSC_COE 0x03a0 + #define RK3399_WIN1_CSC_COE 0x03c0 + #define RK3399_WIN2_CSC_COE 0x03e0 + +From patchwork Tue Oct 19 21:58:42 2021 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Hugh Cole-Baker +X-Patchwork-Id: 12571179 +Return-Path: + +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on + aws-us-west-2-korg-lkml-1.web.codeaurora.org +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 85B47C433F5 + for ; + Tue, 19 Oct 2021 21:59:33 +0000 (UTC) +Received: from bombadil.infradead.org (bombadil.infradead.org + [198.137.202.133]) + (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.kernel.org (Postfix) with ESMTPS id 595856113D + for ; + Tue, 19 Oct 2021 21:59:33 +0000 (UTC) +DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 595856113D +Authentication-Results: mail.kernel.org; + dmarc=fail (p=none dis=none) header.from=gmail.com +Authentication-Results: mail.kernel.org; + spf=none smtp.mailfrom=lists.infradead.org +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=bombadil.20210309; h=Sender: + Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: + List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: + Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: + Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: + List-Owner; bh=tHyvTqRKxrtKIbj34MYknHzX+yLAnQqh47VxQue4tCk=; b=jZnpTJ3DoyBMFy + 53BFSj7Q2F7I6UvGzGrARdwtdy/GdZOQriN9rtqp0Jw6BHj/n2ercvi7m71vOUSovvx5MTV4NmCHa + UDHYDeQJSdRDxwq86bhU3kAZWb4EPkIrrXqZ0uEhA0f5w7dEwSw3r+3PpE15K6XFrVytUJNtcOxmZ + LUmJC4Q/ngOkxLB5um91h4YwdKXvfQkioiuaDwY49q0TzExLe5l9Ujt3HYxIvs1DcKJkbP+PtKO5W + K7osyX7sJvMa1NDDZf3Od/aDgOx0wAeiSetnxvN5vEdcirsNTfBcizUMdSrJMJOX+6rl1qKXe+MDu + 1q72eLFjWmMphhJFlPGg==; +Received: from localhost ([::1] helo=bombadil.infradead.org) + by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) + id 1mcx8r-002j2z-88; Tue, 19 Oct 2021 21:59:29 +0000 +Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) + by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) + id 1mcx8P-002ikY-5a; Tue, 19 Oct 2021 21:59:03 +0000 +Received: by mail-wm1-x333.google.com with SMTP id + n40-20020a05600c3ba800b0030da2439b21so5894295wms.0; + Tue, 19 Oct 2021 14:59:01 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; + h=from:to:cc:subject:date:message-id:in-reply-to:references + :mime-version:content-transfer-encoding; + bh=Q2/puQXisdIHy96scnY39dLOhAgOrf8qFIVS4zmDucw=; + b=mdJBK7nOU5EfOez2g0KuQcjPX1mqo1Yu1pyUoN+Yonchoy51OiK+gS5SHgjrEoxpOG + sDimMoXQXXfpFuyMt5InbeCA1ma78VxZZywXFdfahXW4HKbUjs2tnVUa+itAc40a/Lut + NxF/KtplJGjsU6gnEIouvEaFfzpcZMzpxv8D9kRUTed0sDtlerGTRROHvnHK6Pw2okZY + QRFluqjW3Vn4uKF7VXKbxGVFIj+s47JoFGFp45q5EuEIhsZUbBnh5vSeuhbfmUIGk//P + gFNhLcrUXRMbHK5TsyZLzZ7hZifip4eO5zDxP0adM8Pl2bLFIKMZ31phyOxVwysjxCxu + PDWg== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20210112; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:mime-version:content-transfer-encoding; + bh=Q2/puQXisdIHy96scnY39dLOhAgOrf8qFIVS4zmDucw=; + b=jn+JsIGvDA601iU5jMDQWABrrTP4pgk3O2OZBgof0QYw8ggY8zxTe/efUUPyXJIGTE + 2m3iE3Pcv5gj7Dcj4PIhzOg8zqSe1DU6P0hNO2BUxjZtLbEFis1NIct0ETnSFadB1BQB + ysjv58mVj+CNTkOB4SC7pZG3YnB9kiALfn5srFP5QIZbH7zEkUmlcC68MCiTovkam5VZ + edpald9X31meuqO248k3kWflmGaPoFpYgKDGHB1+gHVwrz/zdHEOfyW+ywMCqhAz9Ips + bHdQrFXJhfBm73e/YpzMo+CGW2pKgwVwKvgfaYk70AaV21ZQwmVchdrKL+JbaqB3Pb8M + q98A== +X-Gm-Message-State: AOAM5310Qyqstssdsu0x76uWY5DcBoeRppvU7QgcaPxDqN1ox6+rbUCB + 8ZjpkAW88saV2ZLk3LFE/SY= +X-Google-Smtp-Source: + ABdhPJyH6EYKD5Zz7cAvlgR25QY6isGkEOndRqrg115y3IbztxMbNkQ417bBT6OIYq5kolH2WJ4Otw== +X-Received: by 2002:a05:600c:1d05:: with SMTP id + l5mr7158510wms.97.1634680737804; + Tue, 19 Oct 2021 14:58:57 -0700 (PDT) +Received: from apple.sigmaris.info (ebrouter.sigmaris.info. [82.69.107.165]) + by smtp.gmail.com with ESMTPSA id s3sm178540wrm.40.2021.10.19.14.58.57 + (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); + Tue, 19 Oct 2021 14:58:57 -0700 (PDT) +From: Hugh Cole-Baker +To: heiko@sntech.de, + hjc@rock-chips.com +Cc: dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, + linux-arm-kernel@lists.infradead.org, ezequiel@collabora.com, + Hugh Cole-Baker +Subject: [PATCH v2 2/3] drm/rockchip: support gamma control on RK3399 +Date: Tue, 19 Oct 2021 22:58:42 +0100 +Message-Id: <20211019215843.42718-3-sigmaris@gmail.com> +X-Mailer: git-send-email 2.24.3 (Apple Git-128) +In-Reply-To: <20211019215843.42718-1-sigmaris@gmail.com> +References: <20211019215843.42718-1-sigmaris@gmail.com> +MIME-Version: 1.0 +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20211019_145901_258532_1013C062 +X-CRM114-Status: GOOD ( 23.54 ) +X-BeenThere: linux-rockchip@lists.infradead.org +X-Mailman-Version: 2.1.34 +Precedence: list +List-Id: Upstream kernel work for Rockchip platforms + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Sender: "Linux-rockchip" +Errors-To: + linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org + +The RK3399 has a 1024-entry gamma LUT with 10 bits per component on its +"big" VOP and a 256-entry, 8 bit per component LUT on the "little" VOP. +Compared to the RK3288, it no longer requires disabling gamma while +updating the LUT. On the RK3399, the LUT can be updated at any time as +the hardware has two LUT buffers, one can be written while the other is +in use. A swap of the buffers is triggered by writing 1 to the +update_gamma_lut register. + +Signed-off-by: Hugh Cole-Baker +--- + +Changes from v1: Moved the vop_crtc_gamma_set call to the end of +vop_crtc_atomic_enable after the clocks and CRTC are enabled. + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 105 +++++++++++++------- + 1 file changed, 71 insertions(+), 34 deletions(-) + +diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +index ba9e14da41b4..e2c97f1b26da 100644 +--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c ++++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -66,6 +67,9 @@ + #define VOP_REG_SET(vop, group, name, v) \ + vop_reg_set(vop, &vop->data->group->name, 0, ~0, v, #name) + ++#define VOP_HAS_REG(vop, group, name) \ ++ (!!(vop->data->group->name.mask)) ++ + #define VOP_INTR_SET_TYPE(vop, name, type, v) \ + do { \ + int i, reg = 0, mask = 0; \ +@@ -1204,17 +1208,22 @@ static bool vop_dsp_lut_is_enabled(struct vop *vop) + return vop_read_reg(vop, 0, &vop->data->common->dsp_lut_en); + } + ++static u32 vop_lut_buffer_index(struct vop *vop) ++{ ++ return vop_read_reg(vop, 0, &vop->data->common->lut_buffer_index); ++} ++ + static void vop_crtc_write_gamma_lut(struct vop *vop, struct drm_crtc *crtc) + { + struct drm_color_lut *lut = crtc->state->gamma_lut->data; +- unsigned int i; ++ unsigned int i, bpc = ilog2(vop->data->lut_size); + + for (i = 0; i < crtc->gamma_size; i++) { + u32 word; + +- word = (drm_color_lut_extract(lut[i].red, 10) << 20) | +- (drm_color_lut_extract(lut[i].green, 10) << 10) | +- drm_color_lut_extract(lut[i].blue, 10); ++ word = (drm_color_lut_extract(lut[i].red, bpc) << (2 * bpc)) | ++ (drm_color_lut_extract(lut[i].green, bpc) << bpc) | ++ drm_color_lut_extract(lut[i].blue, bpc); + writel(word, vop->lut_regs + i * 4); + } + } +@@ -1224,38 +1233,66 @@ static void vop_crtc_gamma_set(struct vop *vop, struct drm_crtc *crtc, + { + struct drm_crtc_state *state = crtc->state; + unsigned int idle; ++ u32 lut_idx, old_idx; + int ret; + + if (!vop->lut_regs) + return; +- /* +- * To disable gamma (gamma_lut is null) or to write +- * an update to the LUT, clear dsp_lut_en. +- */ +- spin_lock(&vop->reg_lock); +- VOP_REG_SET(vop, common, dsp_lut_en, 0); +- vop_cfg_done(vop); +- spin_unlock(&vop->reg_lock); + +- /* +- * In order to write the LUT to the internal memory, +- * we need to first make sure the dsp_lut_en bit is cleared. +- */ +- ret = readx_poll_timeout(vop_dsp_lut_is_enabled, vop, +- idle, !idle, 5, 30 * 1000); +- if (ret) { +- DRM_DEV_ERROR(vop->dev, "display LUT RAM enable timeout!\n"); +- return; +- } ++ if (!state->gamma_lut || !VOP_HAS_REG(vop, common, update_gamma_lut)) { ++ /* ++ * To disable gamma (gamma_lut is null) or to write ++ * an update to the LUT, clear dsp_lut_en. ++ */ ++ spin_lock(&vop->reg_lock); ++ VOP_REG_SET(vop, common, dsp_lut_en, 0); ++ vop_cfg_done(vop); ++ spin_unlock(&vop->reg_lock); + +- if (!state->gamma_lut) +- return; ++ /* ++ * In order to write the LUT to the internal memory, ++ * we need to first make sure the dsp_lut_en bit is cleared. ++ */ ++ ret = readx_poll_timeout(vop_dsp_lut_is_enabled, vop, ++ idle, !idle, 5, 30 * 1000); ++ if (ret) { ++ DRM_DEV_ERROR(vop->dev, "display LUT RAM enable timeout!\n"); ++ return; ++ } ++ ++ if (!state->gamma_lut) ++ return; ++ } else { ++ /* ++ * On RK3399 the gamma LUT can updated without clearing dsp_lut_en, ++ * by setting update_gamma_lut then waiting for lut_buffer_index change ++ */ ++ old_idx = vop_lut_buffer_index(vop); ++ } + + spin_lock(&vop->reg_lock); + vop_crtc_write_gamma_lut(vop, crtc); + VOP_REG_SET(vop, common, dsp_lut_en, 1); ++ VOP_REG_SET(vop, common, update_gamma_lut, 1); + vop_cfg_done(vop); + spin_unlock(&vop->reg_lock); ++ ++ if (VOP_HAS_REG(vop, common, update_gamma_lut)) { ++ ret = readx_poll_timeout(vop_lut_buffer_index, vop, ++ lut_idx, lut_idx != old_idx, 5, 30 * 1000); ++ if (ret) { ++ DRM_DEV_ERROR(vop->dev, "gamma LUT update timeout!\n"); ++ return; ++ } ++ ++ /* ++ * update_gamma_lut is auto cleared by HW, but write 0 to clear the bit ++ * in our backup of the regs. ++ */ ++ spin_lock(&vop->reg_lock); ++ VOP_REG_SET(vop, common, update_gamma_lut, 0); ++ spin_unlock(&vop->reg_lock); ++ } + } + + static void vop_crtc_atomic_begin(struct drm_crtc *crtc, +@@ -1305,14 +1342,6 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc, + return; + } + +- /* +- * If we have a GAMMA LUT in the state, then let's make sure +- * it's updated. We might be coming out of suspend, +- * which means the LUT internal memory needs to be re-written. +- */ +- if (crtc->state->gamma_lut) +- vop_crtc_gamma_set(vop, crtc, old_state); +- + mutex_lock(&vop->vop_lock); + + WARN_ON(vop->event); +@@ -1403,6 +1432,14 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc, + + VOP_REG_SET(vop, common, standby, 0); + mutex_unlock(&vop->vop_lock); ++ ++ /* ++ * If we have a GAMMA LUT in the state, then let's make sure ++ * it's updated. We might be coming out of suspend, ++ * which means the LUT internal memory needs to be re-written. ++ */ ++ if (crtc->state->gamma_lut) ++ vop_crtc_gamma_set(vop, crtc, old_state); + } + + static bool vop_fs_irq_is_pending(struct vop *vop) +@@ -2125,8 +2162,8 @@ static int vop_bind(struct device *dev, struct device *master, void *data) + + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (res) { +- if (!vop_data->lut_size) { +- DRM_DEV_ERROR(dev, "no gamma LUT size defined\n"); ++ if (vop_data->lut_size != 1024 && vop_data->lut_size != 256) { ++ DRM_DEV_ERROR(dev, "unsupported gamma LUT size %d\n", vop_data->lut_size); + return -EINVAL; + } + vop->lut_regs = devm_ioremap_resource(dev, res); + +From patchwork Tue Oct 19 21:58:43 2021 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Hugh Cole-Baker +X-Patchwork-Id: 12571181 +Return-Path: + +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on + aws-us-west-2-korg-lkml-1.web.codeaurora.org +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 6D49BC433F5 + for ; + Tue, 19 Oct 2021 22:00:01 +0000 (UTC) +Received: from bombadil.infradead.org (bombadil.infradead.org + [198.137.202.133]) + (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.kernel.org (Postfix) with ESMTPS id 2FA4660FDA + for ; + Tue, 19 Oct 2021 22:00:01 +0000 (UTC) +DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2FA4660FDA +Authentication-Results: mail.kernel.org; + dmarc=fail (p=none dis=none) header.from=gmail.com +Authentication-Results: mail.kernel.org; + spf=none smtp.mailfrom=lists.infradead.org +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=bombadil.20210309; h=Sender: + Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: + List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: + Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: + Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: + List-Owner; bh=x6/d2diqqgTC0AwbnyEkOK36w4vwRzp43AaTU68aj5M=; b=wkiGia5/EwS6cQ + SuVhyaTwREo92OuMyUFAEaHlaZXJMke3RttvX7iZ6ppbhCetp+wP0NzQTHAgryAGolioWpRPr8Bqa + yjYRAS/Lt6PEyPQAWwK8AgGZTi+ZjtP+eJiH4GMdXd/D0puZXnwfWZK/HvZDtTk882s6clzgQylG5 + nzNX86FCOLlAsuwNDZ6nOLDw3W+A2X5Ii++oF/gAjegyzYxXoton/PnPqq4eLXggmefeHypIfo4Sk + HzWEL/d4eWtI2Jwyi+q8LkuTKcnhdYhDlDcvdX771PJCkq/YhcpC+i65AWiL5hB2opn5q/Z6FozHW + 7viWXFDhM90u9a/5zWJg==; +Received: from localhost ([::1] helo=bombadil.infradead.org) + by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) + id 1mcx9I-002jH5-CN; Tue, 19 Oct 2021 21:59:56 +0000 +Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) + by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) + id 1mcx8P-002ikX-LK; Tue, 19 Oct 2021 21:59:04 +0000 +Received: by mail-wm1-x332.google.com with SMTP id + a140-20020a1c7f92000000b0030d8315b593so5820655wmd.5; + Tue, 19 Oct 2021 14:59:00 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; + h=from:to:cc:subject:date:message-id:in-reply-to:references + :mime-version:content-transfer-encoding; + bh=uCZAM1vvyZIsuTswhisB5UCt6gNS7FCdaVGaaFS3YV4=; + b=N9x2DcoC3Zq7l+EXYxzzDvYTGb6e0oKBL/owgOeCIM34js4lC6qA/TCA1k1opUXEUK + iJyLxAfyGd/1irS6OFaK6/VaWbkuhUSrXcg5VejFWZOTCNEheBAERgim9vZebgpODSTB + 0zfpE8VREGwYumyR5wQB7OI+ZVttjvlGw4zUdGt1trfhORiUkTkmFI/a6PYbJB9TlFRb + I4/WknNvC/do0cuW/idOQdbadmwvcobJTrlHbgf+cZmrX4RxL7vwtJjMvYku0e8WGnjY + iS38SlU6UOMwxnLaCRBqu8RVDT19yUl9mcbSU9vrJpfbI91HZeeKpD3RKOsshqR4E+dm + lwBQ== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20210112; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:mime-version:content-transfer-encoding; + bh=uCZAM1vvyZIsuTswhisB5UCt6gNS7FCdaVGaaFS3YV4=; + b=ZtozeJ/Sb8WHJMd0KU8pz9+jU0TGMxtub9urEkLpu0peP+z2iuJ2IC1R1fHuveNHM9 + qHCTWYIko+2U8h6BiSzTBkwKYqtNCH+3e85ImJhtwyX6QbEcNfwrOrShf+PSsYkfunx1 + 0CBcvHQB3SMQ983RS4X8YXtjeKYhUhJtCq45tsXs2DiMPP1/NiiNRQvqFnX+mlbRos0f + 1XrbESWVB/tYzAtCRK2IIyD7dtp8BYkhoudKR0Z0Hc1Q6BomDWFG9H0VV3yNWRgHwdp3 + FN+/YFLCLWmVhGZclMvqFYxIKZpr9nWPpTx6TYTWKFpPCTm4wtv3+U6EakPiCKZdZ84f + SKJw== +X-Gm-Message-State: AOAM532tmkKpoFPpmG1bg92UfYgCYfs57494dXW9qNEbXkobGNhzn4uH + U3AFIO+Y+oMp3e1o2nrxeyTtLUEVnPd/ho9y +X-Google-Smtp-Source: + ABdhPJxx3QAL6lyP35xXPqTB47LPyaFAa19cRinJBEnDBpBQBMv+2xmSW5ECPRIbVOY9Eer57KphDw== +X-Received: by 2002:adf:a413:: with SMTP id + d19mr48203915wra.246.1634680739774; + Tue, 19 Oct 2021 14:58:59 -0700 (PDT) +Received: from apple.sigmaris.info (ebrouter.sigmaris.info. [82.69.107.165]) + by smtp.gmail.com with ESMTPSA id s3sm178540wrm.40.2021.10.19.14.58.59 + (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); + Tue, 19 Oct 2021 14:58:59 -0700 (PDT) +From: Hugh Cole-Baker +To: heiko@sntech.de, + hjc@rock-chips.com +Cc: dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, + linux-arm-kernel@lists.infradead.org, ezequiel@collabora.com, + Hugh Cole-Baker +Subject: [PATCH v2 3/3] arm64: dts: rockchip: enable gamma control on RK3399 +Date: Tue, 19 Oct 2021 22:58:43 +0100 +Message-Id: <20211019215843.42718-4-sigmaris@gmail.com> +X-Mailer: git-send-email 2.24.3 (Apple Git-128) +In-Reply-To: <20211019215843.42718-1-sigmaris@gmail.com> +References: <20211019215843.42718-1-sigmaris@gmail.com> +MIME-Version: 1.0 +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20211019_145901_757551_331C36C9 +X-CRM114-Status: GOOD ( 11.48 ) +X-BeenThere: linux-rockchip@lists.infradead.org +X-Mailman-Version: 2.1.34 +Precedence: list +List-Id: Upstream kernel work for Rockchip platforms + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Sender: "Linux-rockchip" +Errors-To: + linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org + +Define the memory region on RK3399 VOPs containing the gamma LUT at +base+0x2000. + +Signed-off-by: Hugh Cole-Baker +--- + +Changes from v1: no changes in this patch + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +index 3871c7fd83b0..9cbf6ccdd256 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +@@ -1619,7 +1619,7 @@ i2s2: i2s@ff8a0000 { + + vopl: vop@ff8f0000 { + compatible = "rockchip,rk3399-vop-lit"; +- reg = <0x0 0xff8f0000 0x0 0x3efc>; ++ reg = <0x0 0xff8f0000 0x0 0x2000>, <0x0 0xff8f2000 0x0 0x400>; + interrupts = ; + assigned-clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>; + assigned-clock-rates = <400000000>, <100000000>; +@@ -1676,7 +1676,7 @@ vopl_mmu: iommu@ff8f3f00 { + + vopb: vop@ff900000 { + compatible = "rockchip,rk3399-vop-big"; +- reg = <0x0 0xff900000 0x0 0x3efc>; ++ reg = <0x0 0xff900000 0x0 0x2000>, <0x0 0xff902000 0x0 0x1000>; + interrupts = ; + assigned-clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>; + assigned-clock-rates = <400000000>, <100000000>; diff --git a/srcpkgs/pinebookpro-kernel/patches/pbp-dpaltmode.patch b/srcpkgs/pinebookpro-kernel/patches/pbp-dpaltmode.patch new file mode 100644 index 00000000000..4b65ea4e41e --- /dev/null +++ b/srcpkgs/pinebookpro-kernel/patches/pbp-dpaltmode.patch @@ -0,0 +1,854 @@ +Source: https://megous.com/git/linux +Upstream: no + +From 1fc012b18f91abf70e9ab8cbdef2f0e47e80c14e Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Sun, 7 Nov 2021 19:28:27 +0100 +Subject: usb: typec: fusb302: Set the current before enabling pullups + +This seems more reasonable and should avoid short period of incorrect +current setting being applied to CC pin. + +Signed-off-by: Ondrej Jirman +--- + drivers/usb/typec/tcpm/fusb302.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c +index 72f9001b0792..776a949ef6e3 100644 +--- a/drivers/usb/typec/tcpm/fusb302.c ++++ b/drivers/usb/typec/tcpm/fusb302.c +@@ -635,6 +635,14 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc) + goto done; + } + ++ /* adjust current for SRC */ ++ ret = fusb302_set_src_current(chip, cc_src_current[cc]); ++ if (ret < 0) { ++ fusb302_log(chip, "cannot set src current %s, ret=%d", ++ typec_cc_status_name[cc], ret); ++ goto done; ++ } ++ + ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES0, + switches0_mask, switches0_data); + if (ret < 0) { +@@ -645,14 +653,6 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc) + chip->cc1 = TYPEC_CC_OPEN; + chip->cc2 = TYPEC_CC_OPEN; + +- /* adjust current for SRC */ +- ret = fusb302_set_src_current(chip, cc_src_current[cc]); +- if (ret < 0) { +- fusb302_log(chip, "cannot set src current %s, ret=%d", +- typec_cc_status_name[cc], ret); +- goto done; +- } +- + /* enable/disable interrupts, BC_LVL for SNK and COMP_CHNG for SRC */ + switch (cc) { + case TYPEC_CC_RP_DEF: +-- +cgit v1.2.3 + +From cd26cebee9bf5e0a1a064d391195db761dbf40a6 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Tue, 23 Nov 2021 17:57:06 +0100 +Subject: usb: typec: fusb302: Update VBUS state even if VBUS interrupt is not + triggered + +This seems to improve robustness. + +Signed-off-by: Ondrej Jirman +--- + drivers/usb/typec/tcpm/fusb302.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c +index 70b0e15992af..1d5affaabcf3 100644 +--- a/drivers/usb/typec/tcpm/fusb302.c ++++ b/drivers/usb/typec/tcpm/fusb302.c +@@ -1716,14 +1716,16 @@ static void fusb302_irq_work(struct work_struct *work) + + fusb302_print_state(chip); + +- if (interrupt & FUSB_REG_INTERRUPT_VBUSOK) { +- vbus_present = !!(status0 & FUSB_REG_STATUS0_VBUSOK); ++ vbus_present = !!(status0 & FUSB_REG_STATUS0_VBUSOK); ++ if (interrupt & FUSB_REG_INTERRUPT_VBUSOK) + fusb302_log(chip, "IRQ: VBUS_OK, vbus=%s", + vbus_present ? "On" : "Off"); +- if (vbus_present != chip->vbus_present) { +- chip->vbus_present = vbus_present; +- tcpm_vbus_change(chip->tcpm_port); +- } ++ if (vbus_present != chip->vbus_present) { ++ chip->vbus_present = vbus_present; ++ if (!(interrupt & FUSB_REG_INTERRUPT_VBUSOK)) ++ fusb302_log(chip, "IRQ: VBUS changed without interrupt, vbus=%s", ++ vbus_present ? "On" : "Off"); ++ tcpm_vbus_change(chip->tcpm_port); + } + + if (interrupta & FUSB_REG_INTERRUPTA_TOGDONE) { +-- +cgit v1.2.3 + +From a8e657e94f489297fa7d80767980730207ebb1bd Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Sun, 14 Nov 2021 01:14:25 +0100 +Subject: usb: typec: fusb302: Add OF extcon support + +It's possible to create a dependency cycle between fusb302 and +other drivers via extcon device, so we retrieve the device on +demand after probe and not during probe. + +Signed-off-by: Ondrej Jirman +--- + drivers/usb/typec/tcpm/fusb302.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c +index ae3b930d774f..0c5dd0058f5e 100644 +--- a/drivers/usb/typec/tcpm/fusb302.c ++++ b/drivers/usb/typec/tcpm/fusb302.c +@@ -518,6 +518,16 @@ static int tcpm_get_current_limit(struct tcpc_dev *dev) + int current_limit = 0; + unsigned long timeout; + ++ /* ++ * To avoid cycles in OF dependencies, we get extcon when necessary ++ * outside of probe function. ++ */ ++ if (of_property_read_bool(chip->dev->of_node, "extcon") && !chip->extcon) { ++ chip->extcon = extcon_get_edev_by_phandle(chip->dev, 0); ++ if (IS_ERR(chip->extcon)) ++ chip->extcon = NULL; ++ } ++ + if (!chip->extcon) + return 0; + +-- +cgit v1.2.3 + +From b6d4f583034b4098587497cd0e138223b6697a25 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Sat, 20 Nov 2021 14:33:58 +0100 +Subject: usb: typec: fusb302: Fix register definitions + +MEASURE_VBUS bit is at position 6. MDAC bits are also wrong. + +Signed-off-by: Ondrej Jirman +--- + drivers/usb/typec/tcpm/fusb302_reg.h | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/drivers/usb/typec/tcpm/fusb302_reg.h b/drivers/usb/typec/tcpm/fusb302_reg.h +index edc0e4b0f1e6..f37d226c5027 100644 +--- a/drivers/usb/typec/tcpm/fusb302_reg.h ++++ b/drivers/usb/typec/tcpm/fusb302_reg.h +@@ -27,14 +27,13 @@ + #define FUSB_REG_SWITCHES1_TXCC2_EN BIT(1) + #define FUSB_REG_SWITCHES1_TXCC1_EN BIT(0) + #define FUSB_REG_MEASURE 0x04 +-#define FUSB_REG_MEASURE_MDAC5 BIT(7) +-#define FUSB_REG_MEASURE_MDAC4 BIT(6) +-#define FUSB_REG_MEASURE_MDAC3 BIT(5) +-#define FUSB_REG_MEASURE_MDAC2 BIT(4) +-#define FUSB_REG_MEASURE_MDAC1 BIT(3) +-#define FUSB_REG_MEASURE_MDAC0 BIT(2) +-#define FUSB_REG_MEASURE_VBUS BIT(1) +-#define FUSB_REG_MEASURE_XXXX5 BIT(0) ++#define FUSB_REG_MEASURE_VBUS BIT(6) ++#define FUSB_REG_MEASURE_MDAC5 BIT(5) ++#define FUSB_REG_MEASURE_MDAC4 BIT(4) ++#define FUSB_REG_MEASURE_MDAC3 BIT(3) ++#define FUSB_REG_MEASURE_MDAC2 BIT(2) ++#define FUSB_REG_MEASURE_MDAC1 BIT(1) ++#define FUSB_REG_MEASURE_MDAC0 BIT(0) + #define FUSB_REG_CONTROL0 0x06 + #define FUSB_REG_CONTROL0_TX_FLUSH BIT(6) + #define FUSB_REG_CONTROL0_INT_MASK BIT(5) +@@ -105,7 +104,6 @@ + #define FUSB_REG_STATUS0A_RX_SOFT_RESET BIT(1) + #define FUSB_REG_STATUS0A_RX_HARD_RESET BIT(0) + #define FUSB_REG_STATUS1A 0x3D +-#define FUSB_REG_STATUS1A_TOGSS BIT(3) + #define FUSB_REG_STATUS1A_TOGSS_RUNNING 0x0 + #define FUSB_REG_STATUS1A_TOGSS_SRC1 0x1 + #define FUSB_REG_STATUS1A_TOGSS_SRC2 0x2 +-- +cgit v1.2.3 + +From 5f43c360ba28cb7f53c35f0e4221cd0e9abd1624 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Sat, 20 Nov 2021 14:35:10 +0100 +Subject: usb: typec: fusb302: Clear interrupts before we start toggling + +This is recommended by the datasheet. + +Signed-off-by: Ondrej Jirman +--- + drivers/usb/typec/tcpm/fusb302.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c +index 0c5dd0058f5e..011dce5e73a2 100644 +--- a/drivers/usb/typec/tcpm/fusb302.c ++++ b/drivers/usb/typec/tcpm/fusb302.c +@@ -586,6 +586,7 @@ static int fusb302_set_toggling(struct fusb302_chip *chip, + enum toggling_mode mode) + { + int ret = 0; ++ u8 reg; + + /* first disable toggling */ + ret = fusb302_i2c_clear_bits(chip, FUSB_REG_CONTROL2, +@@ -644,6 +645,12 @@ static int fusb302_set_toggling(struct fusb302_chip *chip, + } else { + /* Datasheet says vconn MUST be off when toggling */ + WARN(chip->vconn_on, "Vconn is on during toggle start"); ++ ++ /* clear interrupts */ ++ ret = fusb302_i2c_read(chip, FUSB_REG_INTERRUPT, ®); ++ if (ret < 0) ++ return ret; ++ + /* unmask TOGDONE interrupt */ + ret = fusb302_i2c_clear_bits(chip, FUSB_REG_MASKA, + FUSB_REG_MASKA_TOGDONE); +-- +cgit v1.2.3 + +From c9c0c64a3ecabb48594a6da29bed7b70e7c1cbb9 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Sun, 7 Nov 2021 19:24:40 +0100 +Subject: usb: typec: typec-extcon: Add typec -> extcon bridge driver + +This bridge connects standard Type C port interfaces for controling +muxes, switches and usb roles to muxes, switches and usb role +drivers controlled via extcon interface. + +Signed-off-by: Ondrej Jirman +--- + drivers/usb/typec/Kconfig | 7 + + drivers/usb/typec/Makefile | 1 + + drivers/usb/typec/typec-extcon.c | 337 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 345 insertions(+) + create mode 100644 drivers/usb/typec/typec-extcon.c + +diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig +index ab480f38523a..01ecc5e590f1 100644 +--- a/drivers/usb/typec/Kconfig ++++ b/drivers/usb/typec/Kconfig +@@ -88,6 +88,13 @@ config TYPEC_QCOM_PMIC + It will also enable the VBUS output to connected devices when a + DFP connection is made. + ++config TYPEC_EXTCON ++ tristate "Type-C switch/mux -> extcon interface bridge driver" ++ depends on USB_ROLE_SWITCH ++ help ++ Say Y or M here if your system needs bridging between typec class ++ and extcon interfaces. ++ + source "drivers/usb/typec/mux/Kconfig" + + source "drivers/usb/typec/altmodes/Kconfig" +diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile +index a0adb8947a30..d9d829386b73 100644 +--- a/drivers/usb/typec/Makefile ++++ b/drivers/usb/typec/Makefile +@@ -8,4 +8,5 @@ obj-$(CONFIG_TYPEC_TPS6598X) += tipd/ + obj-$(CONFIG_TYPEC_HD3SS3220) += hd3ss3220.o + obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom-pmic-typec.o + obj-$(CONFIG_TYPEC_STUSB160X) += stusb160x.o ++obj-$(CONFIG_TYPEC_EXTCON) += typec-extcon.o + obj-$(CONFIG_TYPEC) += mux/ +diff --git a/drivers/usb/typec/typec-extcon.c b/drivers/usb/typec/typec-extcon.c +new file mode 100644 +index 000000000000..143ff2486f2f +--- /dev/null ++++ b/drivers/usb/typec/typec-extcon.c +@@ -0,0 +1,337 @@ ++/* ++ * typec -> extcon bridge ++ * Copyright (c) 2021 Ondřej Jirman ++ * ++ * This driver bridges standard type-c interfaces to drivers that ++ * expect extcon interface. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++struct typec_extcon { ++ struct device *dev; ++ ++ /* consumers */ ++ struct usb_role_switch *role_sw; ++ struct typec_switch *sw; ++ struct typec_mux *mux; ++ ++ /* providers */ ++ struct extcon_dev *extcon; ++ struct notifier_block extcon_nb; ++ ++ /* cached state from typec controller */ ++ enum usb_role role; ++ enum typec_orientation orientation; ++ struct typec_altmode alt; ++ unsigned long mode; ++ bool has_alt; ++ struct mutex lock; ++}; ++ ++static const unsigned int typec_extcon_cable[] = { ++ EXTCON_DISP_DP, ++ ++ EXTCON_USB, ++ EXTCON_USB_HOST, ++ ++ EXTCON_CHG_USB_SDP, ++ EXTCON_CHG_USB_CDP, ++ EXTCON_CHG_USB_DCP, ++ EXTCON_CHG_USB_ACA, ++ ++ EXTCON_NONE, ++}; ++ ++static void typec_extcon_set_cable(struct typec_extcon *tce, int id, bool on, ++ union extcon_property_value prop_ss, ++ union extcon_property_value prop_or) ++{ ++ union extcon_property_value cur_ss, cur_or; ++ bool prop_diff = false; ++ int ret; ++ ++ ret = extcon_get_property(tce->extcon, id, ++ EXTCON_PROP_USB_SS, &cur_ss); ++ if (ret || cur_ss.intval != prop_ss.intval) ++ prop_diff = true; ++ ++ ret = extcon_get_property(tce->extcon, id, ++ EXTCON_PROP_USB_TYPEC_POLARITY, &cur_or); ++ if (ret || cur_or.intval != prop_or.intval) ++ prop_diff = true; ++ ++ if (!on && extcon_get_state(tce->extcon, id)) { ++ extcon_set_state_sync(tce->extcon, id, false); ++ } else if (on && (!extcon_get_state(tce->extcon, id) || prop_diff)) { ++ extcon_set_state(tce->extcon, id, true); ++ extcon_set_property(tce->extcon, id, ++ EXTCON_PROP_USB_SS, prop_ss); ++ extcon_set_property(tce->extcon, id, ++ EXTCON_PROP_USB_TYPEC_POLARITY, prop_or); ++ extcon_sync(tce->extcon, id); ++ } ++} ++ ++static int typec_extcon_sync_extcon(struct typec_extcon *tce) ++{ ++ union extcon_property_value prop_ss, prop_or; ++ bool has_dp = false; ++ ++ mutex_lock(&tce->lock); ++ ++ /* connector is disconnected */ ++ if (tce->orientation == TYPEC_ORIENTATION_NONE) { ++ typec_extcon_set_cable(tce, EXTCON_USB, false, prop_ss, prop_or); ++ typec_extcon_set_cable(tce, EXTCON_USB_HOST, false, prop_ss, prop_or); ++ typec_extcon_set_cable(tce, EXTCON_DISP_DP, false, prop_ss, prop_or); ++ ++ extcon_set_state_sync(tce->extcon, EXTCON_CHG_USB_SDP, false); ++ extcon_set_state_sync(tce->extcon, EXTCON_CHG_USB_DCP, false); ++ extcon_set_state_sync(tce->extcon, EXTCON_CHG_USB_CDP, false); ++ extcon_set_state_sync(tce->extcon, EXTCON_CHG_USB_ACA, false); ++ ++ goto out_unlock; ++ } ++ ++ prop_or.intval = tce->orientation == TYPEC_ORIENTATION_NORMAL ? 0 : 1; ++ prop_ss.intval = 0; ++ ++ if (tce->has_alt && tce->alt.svid == USB_TYPEC_DP_SID) { ++ switch (tce->mode) { ++ case TYPEC_STATE_SAFE: ++ break; ++ case TYPEC_DP_STATE_C: ++ case TYPEC_DP_STATE_E: ++ has_dp = true; ++ break; ++ case TYPEC_DP_STATE_D: ++ has_dp = true; ++ fallthrough; ++ case TYPEC_STATE_USB: ++ prop_ss.intval = 1; ++ break; ++ default: ++ dev_err(tce->dev, "unhandled mux mode=%lu\n", tce->mode); ++ break; ++ } ++ } ++ ++ typec_extcon_set_cable(tce, EXTCON_USB, ++ tce->role == USB_ROLE_DEVICE, prop_ss, prop_or); ++ typec_extcon_set_cable(tce, EXTCON_USB_HOST, ++ tce->role == USB_ROLE_HOST, prop_ss, prop_or); ++ ++ typec_extcon_set_cable(tce, EXTCON_DISP_DP, has_dp, prop_ss, prop_or); ++ ++out_unlock: ++ mutex_unlock(&tce->lock); ++ return 0; ++} ++ ++static int typec_extcon_sw_set(struct typec_switch *sw, ++ enum typec_orientation orientation) ++{ ++ struct typec_extcon *tce = typec_switch_get_drvdata(sw); ++ ++ dev_dbg(tce->dev, "SW SET: orientation=%d\n", orientation); ++ ++ mutex_lock(&tce->lock); ++ tce->orientation = orientation; ++ mutex_unlock(&tce->lock); ++ ++ typec_extcon_sync_extcon(tce); ++ ++ return 0; ++} ++ ++static int typec_extcon_mux_set(struct typec_mux *mux, ++ struct typec_mux_state *state) ++{ ++ struct typec_extcon *tce = typec_mux_get_drvdata(mux); ++ struct typec_altmode *alt = state->alt; ++ ++ dev_dbg(tce->dev, "MUX SET: state->mode=%lu\n", state->mode); ++ if (alt) ++ dev_dbg(tce->dev, " ...alt: svid=%04hx mode=%d vdo=%08x active=%u\n", ++ alt->svid, alt->mode, alt->vdo, alt->active); ++ ++ mutex_lock(&tce->lock); ++ tce->mode = state->mode; ++ tce->has_alt = alt != NULL; ++ if (alt) ++ tce->alt = *alt; ++ mutex_unlock(&tce->lock); ++ ++ typec_extcon_sync_extcon(tce); ++ ++ return 0; ++} ++ ++static int typec_extcon_usb_set_role(struct usb_role_switch *sw, ++ enum usb_role role) ++{ ++ struct typec_extcon *tce = usb_role_switch_get_drvdata(sw); ++ ++ dev_dbg(tce->dev, "ROLE SET: role=%d\n", role); ++ ++ mutex_lock(&tce->lock); ++ tce->role = role; ++ mutex_unlock(&tce->lock); ++ ++ typec_extcon_sync_extcon(tce); ++ ++ return 0; ++} ++ ++static int typec_extcon_notifier(struct notifier_block *nb, ++ unsigned long action, void *data) ++{ ++ struct typec_extcon *tce = container_of(nb, struct typec_extcon, extcon_nb); ++ ++ bool sdp = extcon_get_state(tce->extcon, EXTCON_CHG_USB_SDP); ++ bool cdp = extcon_get_state(tce->extcon, EXTCON_CHG_USB_CDP); ++ bool dcp = extcon_get_state(tce->extcon, EXTCON_CHG_USB_DCP); ++ bool usb = extcon_get_state(tce->extcon, EXTCON_USB); ++ bool usb_host = extcon_get_state(tce->extcon, EXTCON_USB_HOST); ++ bool dp = extcon_get_state(tce->extcon, EXTCON_DISP_DP); ++ ++ dev_info(tce->dev, "extcon changed sdp=%d cdp=%d dcp=%d usb=%d usb_host=%d dp=%d\n", ++ sdp, cdp, dcp, usb, usb_host, dp); ++ ++ return NOTIFY_OK; ++} ++ ++static int typec_extcon_probe(struct platform_device *pdev) ++{ ++ struct typec_switch_desc sw_desc = { }; ++ struct typec_mux_desc mux_desc = { }; ++ struct usb_role_switch_desc role_desc = { }; ++ struct device *dev = &pdev->dev; ++ struct typec_extcon *tce; ++ int ret = 0; ++ ++ tce = devm_kzalloc(dev, sizeof(*tce), GFP_KERNEL); ++ if (!tce) ++ return -ENOMEM; ++ ++ tce->dev = &pdev->dev; ++ mutex_init(&tce->lock); ++ tce->mode = TYPEC_STATE_SAFE; ++ ++ sw_desc.drvdata = tce; ++ sw_desc.fwnode = dev->fwnode; ++ sw_desc.set = typec_extcon_sw_set; ++ ++ tce->sw = typec_switch_register(dev, &sw_desc); ++ if (IS_ERR(tce->sw)) ++ return dev_err_probe(dev, PTR_ERR(tce->sw), ++ "Error registering typec switch\n"); ++ ++ mux_desc.drvdata = tce; ++ mux_desc.fwnode = dev->fwnode; ++ mux_desc.set = typec_extcon_mux_set; ++ ++ tce->mux = typec_mux_register(dev, &mux_desc); ++ if (IS_ERR(tce->mux)) { ++ ret = dev_err_probe(dev, PTR_ERR(tce->mux), ++ "Error registering typec mux\n"); ++ goto err_sw; ++ } ++ ++ role_desc.driver_data = tce; ++ role_desc.fwnode = dev->fwnode; ++ role_desc.name = fwnode_get_name(dev->fwnode); ++ role_desc.set = typec_extcon_usb_set_role; ++ ++ tce->role_sw = usb_role_switch_register(dev, &role_desc); ++ if (IS_ERR(tce->role_sw)) { ++ ret = dev_err_probe(dev, PTR_ERR(tce->role_sw), ++ "Error registering USB role switch\n"); ++ goto err_mux; ++ } ++ ++ tce->extcon = devm_extcon_dev_allocate(dev, typec_extcon_cable); ++ if (IS_ERR(tce->extcon)) { ++ ret = PTR_ERR(tce->extcon); ++ goto err_role; ++ } ++ ++ ret = devm_extcon_dev_register(dev, tce->extcon); ++ if (ret) { ++ ret = dev_err_probe(dev, ret, "failed to register extcon device\n"); ++ goto err_role; ++ } ++ ++ extcon_set_property_capability(tce->extcon, EXTCON_USB, ++ EXTCON_PROP_USB_SS); ++ extcon_set_property_capability(tce->extcon, EXTCON_USB, ++ EXTCON_PROP_USB_TYPEC_POLARITY); ++ extcon_set_property_capability(tce->extcon, EXTCON_USB_HOST, ++ EXTCON_PROP_USB_SS); ++ extcon_set_property_capability(tce->extcon, EXTCON_USB_HOST, ++ EXTCON_PROP_USB_TYPEC_POLARITY); ++ extcon_set_property_capability(tce->extcon, EXTCON_DISP_DP, ++ EXTCON_PROP_USB_SS); ++ extcon_set_property_capability(tce->extcon, EXTCON_DISP_DP, ++ EXTCON_PROP_USB_TYPEC_POLARITY); ++ ++ tce->extcon_nb.notifier_call = typec_extcon_notifier; ++ ret = devm_extcon_register_notifier_all(dev, tce->extcon, &tce->extcon_nb); ++ if (ret) { ++ dev_err_probe(dev, ret, "Failed to register extcon notifier\n"); ++ goto err_role; ++ } ++ ++ return 0; ++ ++err_role: ++ usb_role_switch_unregister(tce->role_sw); ++err_mux: ++ typec_mux_unregister(tce->mux); ++err_sw: ++ typec_switch_unregister(tce->sw); ++ return ret; ++} ++ ++static int typec_extcon_remove(struct platform_device *pdev) ++{ ++ struct typec_extcon *tce = platform_get_drvdata(pdev); ++ ++ usb_role_switch_unregister(tce->role_sw); ++ typec_mux_unregister(tce->mux); ++ typec_switch_unregister(tce->sw); ++ ++ return 0; ++} ++ ++static struct of_device_id typec_extcon_of_match_table[] = { ++ { .compatible = "linux,typec-extcon-bridge" }, ++ { }, ++}; ++MODULE_DEVICE_TABLE(of, typec_extcon_of_match_table); ++ ++static struct platform_driver typec_extcon_driver = { ++ .driver = { ++ .name = "typec-extcon", ++ .of_match_table = typec_extcon_of_match_table, ++ }, ++ .probe = typec_extcon_probe, ++ .remove = typec_extcon_remove, ++}; ++ ++module_platform_driver(typec_extcon_driver); ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Ondrej Jirman "); ++MODULE_DESCRIPTION("typec -> extcon bridge driver"); +-- +cgit v1.2.3 + +From 4f9167affd8b3647ebc1b13cc3a0ff1b949b0c49 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Tue, 23 Nov 2021 17:32:18 +0100 +Subject: phy: rockchip-typec: Make sure the plug orientation is respected + +RK3399 TRM says about bit 8: + +typec_conn_dir_sel: TypeC connect direction select + +- 0: select typec_conn_dir (bit0 of this register) to TypeC PHY +- 1: select TCPC ouput typec_con_dir to TypeC PHY (default value) + +This means that by default, typec_conn_dir bit is not respected. +Fix setting of typec_conn_dir by setting typec_conn_dir to 0 first. + +Signed-off-by: Ondrej Jirman +--- + drivers/phy/rockchip/phy-rockchip-typec.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c +index d2bbdc96a167..fa10ee9a5794 100644 +--- a/drivers/phy/rockchip/phy-rockchip-typec.c ++++ b/drivers/phy/rockchip/phy-rockchip-typec.c +@@ -350,6 +350,7 @@ struct usb3phy_reg { + * struct rockchip_usb3phy_port_cfg - usb3-phy port configuration. + * @reg: the base address for usb3-phy config. + * @typec_conn_dir: the register of type-c connector direction. ++ * @typec_conn_dir_sel: the register of type-c connector direction source. + * @usb3tousb2_en: the register of type-c force usb2 to usb2 enable. + * @external_psm: the register of type-c phy external psm clock. + * @pipe_status: the register of type-c phy pipe status. +@@ -360,6 +361,7 @@ struct usb3phy_reg { + struct rockchip_usb3phy_port_cfg { + unsigned int reg; + struct usb3phy_reg typec_conn_dir; ++ struct usb3phy_reg typec_conn_dir_sel; + struct usb3phy_reg usb3tousb2_en; + struct usb3phy_reg external_psm; + struct usb3phy_reg pipe_status; +@@ -434,6 +436,7 @@ static const struct rockchip_usb3phy_port_cfg rk3399_usb3phy_port_cfgs[] = { + { + .reg = 0xff7c0000, + .typec_conn_dir = { 0xe580, 0, 16 }, ++ .typec_conn_dir_sel = { 0xe580, 8, 16+8 }, + .usb3tousb2_en = { 0xe580, 3, 19 }, + .external_psm = { 0xe588, 14, 30 }, + .pipe_status = { 0xe5c0, 0, 0 }, +@@ -444,6 +447,7 @@ static const struct rockchip_usb3phy_port_cfg rk3399_usb3phy_port_cfgs[] = { + { + .reg = 0xff800000, + .typec_conn_dir = { 0xe58c, 0, 16 }, ++ .typec_conn_dir_sel = { 0xe58c, 8, 16+8 }, + .usb3tousb2_en = { 0xe58c, 3, 19 }, + .external_psm = { 0xe594, 14, 30 }, + .pipe_status = { 0xe5c0, 16, 16 }, +@@ -739,6 +743,7 @@ static int tcphy_phy_init(struct rockchip_typec_phy *tcphy, u8 mode) + + reset_control_deassert(tcphy->tcphy_rst); + ++ property_enable(tcphy, &cfg->typec_conn_dir_sel, 0); + property_enable(tcphy, &cfg->typec_conn_dir, tcphy->flip); + tcphy_dp_aux_set_flip(tcphy); + +-- +cgit v1.2.3 + +From 331a9126d98c94f315482f14eed307d184a26f72 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Wed, 2 Dec 2020 12:09:45 +0100 +Subject: arm64: dts: rk3399-pinebook-pro: Fix USB-PD charging + +Signed-off-by: Ondrej Jirman +--- + arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +index c2f021a1a18f..d7fe1d99b546 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +@@ -713,9 +713,9 @@ + op-sink-microwatt = <1000000>; + power-role = "dual"; + sink-pdos = +- ; ++ ; + source-pdos = +- ; ++ ; + try-power-role = "sink"; + + ports { +-- +cgit v1.2.3 + +From 6947a3f43482268bc96d2eb6a7fc51323a83d9f7 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Sun, 14 Nov 2021 01:16:51 +0100 +Subject: arm64: dts: rk3399-pinebook-pro: Improve Type-C support on Pinebook + Pro + +This is using the same extcon bridge developed by me for Pinephone Pro. + +Signed-off-by: Ondrej Jirman +--- + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 51 +++++++++++++++++++--- + 1 file changed, 46 insertions(+), 5 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +index d7fe1d99b546..ae175ee3f4c3 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +@@ -345,7 +345,7 @@ + + /* Regulators supplied by vcc5v0_usb */ + /* Type C port power supply regulator */ +- vbus_5vout: vbus_typec: vbus-5vout { ++ vbus_5vout: vbus-5vout { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>; +@@ -384,6 +384,14 @@ + pinctrl-names = "default"; + pinctrl-0 = <&dc_det_pin>; + }; ++ ++ typec_extcon_bridge: typec-extcon { ++ compatible = "linux,typec-extcon-bridge"; ++ usb-role-switch; ++ orientation-switch; ++ mode-switch; ++ svid = /bits/ 16 <0xff01>; ++ }; + }; + + &cpu_b0 { +@@ -410,6 +418,12 @@ + cpu-supply = <&vdd_cpu_l>; + }; + ++&cdn_dp { ++ status = "okay"; ++ extcon = <&typec_extcon_bridge>; ++ phys = <&tcphy0_dp>; ++}; ++ + &edp { + force-hpd; + pinctrl-names = "default"; +@@ -704,7 +718,9 @@ + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&fusb0_int_pin>; +- vbus-supply = <&vbus_typec>; ++ vbus-supply = <&vbus_5vout>; ++ usb-role-switch = <&typec_extcon_bridge>; ++ extcon = <&typec_extcon_bridge>; + + connector { + compatible = "usb-c-connector"; +@@ -717,6 +733,15 @@ + source-pdos = + ; + try-power-role = "sink"; ++ mode-switch = <&typec_extcon_bridge>; ++ orientation-switch = <&typec_extcon_bridge>; ++ ++ altmodes { ++ dp { ++ svid = <0xff01>; ++ vdo = <0x0c0046>; ++ }; ++ }; + + ports { + #address-cells = <1>; +@@ -984,6 +1009,7 @@ + }; + + &tcphy0 { ++ extcon = <&typec_extcon_bridge>; + status = "okay"; + }; + +@@ -1017,13 +1043,20 @@ + + &u2phy0 { + status = "okay"; ++ extcon = <&typec_extcon_bridge>; + + u2phy0_otg: otg-port { ++ /* ++ * Type-C port on the left side of the chasis. ++ */ + status = "okay"; + }; + + u2phy0_host: host-port { +- phy-supply = <&vcc5v0_otg>; ++ /* ++ * USB 2.0 host port for the keyboard (internally connected). ++ */ ++ phy-supply = <&vcc5v0_usb>; + status = "okay"; + }; + +@@ -1038,11 +1071,18 @@ + status = "okay"; + + u2phy1_otg: otg-port { ++ /* ++ * USB 3.0 A port on the left side of the chasis. ++ */ + status = "okay"; + }; + + u2phy1_host: host-port { +- phy-supply = <&vcc5v0_otg>; ++ /* ++ * To the HUB that has USB camera and USB 2.0 port on the right ++ * side of the chasis. ++ */ ++ phy-supply = <&vcc5v0_usb>; + status = "okay"; + }; + }; +@@ -1093,7 +1133,8 @@ + }; + + &usbdrd_dwc3_0 { +- dr_mode = "host"; ++ dr_mode = "otg"; ++ extcon = <&typec_extcon_bridge>; + status = "okay"; + }; + +-- +cgit v1.2.3 + diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template index c8b1255026d..8c88917e5a7 100644 --- a/srcpkgs/pinebookpro-kernel/template +++ b/srcpkgs/pinebookpro-kernel/template @@ -1,15 +1,18 @@ # Template file for 'pinebookpro-kernel' pkgname=pinebookpro-kernel -version=5.10.46 +version=5.15.38 revision=1 archs="aarch64*" -wrksrc="linux-${version}" +wrksrc="linux-${version%.*}" short_desc="Linux kernel for Pinebook Pro" maintainer="Renato Aguiar " 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=569122a39c6b325befb9ac1c07da0c53e6363b3baacd82081d131b06c1dc1415 +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 + b62b570af247d884dd0232f509e4e33c5edf57240b1712733e61c37a1d4b4424" +skip_extraction="patch-${version}.xz" python_version=3 nodebug=yes # -dbg package is generated below manually @@ -19,7 +22,7 @@ noshlibprovides=yes preserve=yes hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel - openssl-devel perl uboot-mkimage cpio python3" + openssl-devel perl uboot-mkimage cpio pahole python3" _kernver="${version}_${revision}" triggers="kernel-hooks" @@ -28,6 +31,7 @@ kernel_hooks_version="${_kernver}" # These files could be modified when an external module is built. mutable_files=" /usr/lib/modules/${_kernver}/modules.builtin.bin + /usr/lib/modules/${_kernver}/modules.builtin.alias.bin /usr/lib/modules/${_kernver}/modules.softdep /usr/lib/modules/${_kernver}/modules.dep /usr/lib/modules/${_kernver}/modules.dep.bin @@ -37,40 +41,40 @@ mutable_files=" /usr/lib/modules/${_kernver}/modules.alias.bin /usr/lib/modules/${_kernver}/modules.devname" -do_configure() { - # 5.4 misses Documentation/DocBook. We ship the directory from 4.12 here. - cp -a $FILESDIR/DocBook -t Documentation +# reproducible build +export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0}) +export KBUILD_BUILD_USER=voidlinux +export KBUILD_BUILD_HOST=voidlinux - local arch subarch _args +if [ "$CROSS_BUILD" ]; then + _cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-" +fi + +pre_patch() { + xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1 +} + +do_configure() { + local arch arch=arm64 - if [ "$CROSS_BUILD" ]; then - _args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-" - fi - cp -f ${FILESDIR}/dotconfig .config - make ${makejobs} ARCH=$arch ${_args} oldconfig + make ${makejobs} ARCH=$arch ${_cross} oldconfig # Always use our revision to CONFIG_LOCALVERSION to match our pkg version. sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config } do_build() { - local arch _cross _args + local arch _args _args="Image modules dtbs" arch=arm64 - if [ "$CROSS_BUILD" ]; then - _cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-" - fi - if [ "${_patchver}" ]; then - _version="EXTRAVERSION=${_patchver}" - fi export LDFLAGS= - make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare - make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args} + make ARCH=$arch ${_cross} ${makejobs} prepare + make ARCH=$arch ${_cross} ${makejobs} ${_args} } do_install() { @@ -82,7 +86,7 @@ do_install() { sed -i '2iexit 0' scripts/depmod.sh # Install kernel, firmware and modules - make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install + make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} ${_cross} modules_install hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver} @@ -90,7 +94,7 @@ do_install() { vinstall System.map 644 boot System.map-${_kernver} vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver} - make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install + make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install # Switch to /usr. vmkdir usr @@ -109,7 +113,7 @@ do_install() { mkdir -p ${hdrdest}/$(dirname $file) install -Dm644 $file ${hdrdest}/${file} done - for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do + for file in $(find arch/${subarch:-$arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do mkdir -p ${hdrdest}/$(dirname $file) install -Dm644 $file ${hdrdest}/${file} done @@ -117,7 +121,7 @@ do_install() { # Remove firmware stuff provided by the "linux-firmware" pkg. rm -rf ${DESTDIR}/usr/lib/firmware - for i in acpi asm-generic clocksource config crypto drm generated linux \ + for i in acpi asm-generic clocksource config crypto drm generated linux vdso \ math-emu media net pcmcia scsi sound trace uapi video xen dt-bindings; do if [ -d include/$i ]; then cp -a include/$i ${hdrdest}/include @@ -132,7 +136,7 @@ do_install() { # if generated files from the scripts/ directory need to be included, # they need to be copied to ${hdrdest} before this step if [ "$CROSS_BUILD" ]; then - make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts + make ${makejobs} ARCH=${subarch:-$arch} ${_cross} _mrproper_scripts # remove host specific objects as well find scripts -name '*.o' -delete fi @@ -170,10 +174,6 @@ do_install() { cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i} done - # Add docbook makefile - install -Dm644 Documentation/DocBook/Makefile \ - ${hdrdest}/Documentation/DocBook/Makefile - # Add md headers mkdir -p ${hdrdest}/drivers/md cp drivers/md/*.h ${hdrdest}/drivers/md @@ -186,14 +186,7 @@ do_install() { mkdir -p ${hdrdest}/net/mac80211/ cp net/mac80211/*.h ${hdrdest}/net/mac80211 - # add dvb headers for external modules - mkdir -p ${hdrdest}/include/config/dvb/ - cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/ - # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new - mkdir -p ${hdrdest}/drivers/media/dvb-frontends - cp drivers/media/dvb-frontends/lgdt330x.h \ - ${hdrdest}/drivers/media/dvb-frontends/ cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/ # add dvb headers @@ -249,5 +242,6 @@ pinebookpro-kernel-dbg_package() { short_desc+=" - debugging symbols" pkg_install() { vmove usr/lib/debug + vmove "boot/System.map-${_kernver}" } } From 42b9640aa50ccea4a94067aeb8afa1d5958a9b99 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 1 Mar 2022 00:50:30 +0100 Subject: [PATCH 1837/2369] gmime: rename from gmime3 * drop gmime(2), it's not used by anything * make gmime3{,-devel} a transitional subpackage --- common/shlibs | 3 +- srcpkgs/gmime/files/iconv-detect.h | 1 + srcpkgs/gmime/files/musl-iconv-detect.h | 1 + srcpkgs/gmime/template | 81 ++++++++++++++++-------- srcpkgs/gmime/update | 1 - srcpkgs/gmime3 | 1 + srcpkgs/gmime3-devel | 2 +- srcpkgs/gmime3/files/iconv-detect.h | 6 -- srcpkgs/gmime3/files/musl-iconv-detect.h | 6 -- srcpkgs/gmime3/template | 68 -------------------- srcpkgs/gmime3/update | 1 - 11 files changed, 60 insertions(+), 111 deletions(-) delete mode 100644 srcpkgs/gmime/update create mode 120000 srcpkgs/gmime3 delete mode 100644 srcpkgs/gmime3/files/iconv-detect.h delete mode 100644 srcpkgs/gmime3/files/musl-iconv-detect.h delete mode 100644 srcpkgs/gmime3/template delete mode 100644 srcpkgs/gmime3/update diff --git a/common/shlibs b/common/shlibs index 784375c7c9a..d75ecdda38d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -745,7 +745,6 @@ libpulsecore-15.0.so libpulseaudio-15.0_1 libprojectM.so.3 projectM-3.1.7_2 liborc-0.4.so.0 orc-0.4.11_1 liborc-test-0.4.so.0 orc-0.4.11_1 -libgmime-2.6.so.0 gmime-2.6.4_1 libtotem-plparser.so.18 totem-pl-parser-3.26.1_1 libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1 libgladeui-2.so.13 libgladeui3-3.38.0_1 @@ -3574,7 +3573,7 @@ libcloudproviders.so.0 libcloudproviders-0.2.5_2 libKF5KDEGames.so.7 libkdegames-18.08.3_1 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1 libidn2.so.0 libidn2-2.1.1_1 -libgmime-3.0.so.0 gmime3-3.2.3_1 +libgmime-3.0.so.0 gmime-3.2.3_1 libgetdns.so.10 getdns-1.5.1_7 libgetdns_ext_event.so.10 getdns-1.5.1_7 libgetdns_ext_ev.so.10 getdns-1.5.1_7 diff --git a/srcpkgs/gmime/files/iconv-detect.h b/srcpkgs/gmime/files/iconv-detect.h index 714cb5aa9dd..6d9dd05b59e 100644 --- a/srcpkgs/gmime/files/iconv-detect.h +++ b/srcpkgs/gmime/files/iconv-detect.h @@ -2,4 +2,5 @@ #define ICONV_ISO_INT_FORMAT "iso-%u-%u" #define ICONV_ISO_STR_FORMAT "iso-%u-%s" +#define ICONV_SHIFT_JIS "shift-jis" #define ICONV_10646 "iso-10646" diff --git a/srcpkgs/gmime/files/musl-iconv-detect.h b/srcpkgs/gmime/files/musl-iconv-detect.h index 9f431bf9ff0..569da106b94 100644 --- a/srcpkgs/gmime/files/musl-iconv-detect.h +++ b/srcpkgs/gmime/files/musl-iconv-detect.h @@ -2,4 +2,5 @@ #define ICONV_ISO_INT_FORMAT "iso-%u-%u" #define ICONV_ISO_STR_FORMAT "iso-%u-%s" +#define ICONV_SHIFT_JIS "shift-jis" #define ICONV_10646 "UCS-4BE" diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template index 697cbd0ab67..57718cac3bf 100644 --- a/srcpkgs/gmime/template +++ b/srcpkgs/gmime/template @@ -1,43 +1,57 @@ # Template file for 'gmime' pkgname=gmime -version=2.6.23 -revision=4 +version=3.2.7 +revision=2 +wrksrc="gmime-${version}" build_style=gnu-configure build_helper="gir" -configure_args="--disable-static --disable-mono --enable-smime - --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr" -hostmakedepends="automake pkg-config intltool libtool - $(vopt_if gir gobject-introspection)" -makedepends="glib-devel gpgme-devel" +configure_args="--disable-static --enable-crypto $(vopt_enable vala) + $(vopt_enable gir introspection)" +hostmakedepends="pkg-config $(vopt_if vala vala)" +makedepends="glib-devel gpgme-devel libidn2-devel + $(vopt_if vala vala)" +checkdepends="gnupg2" short_desc="GNOME Core mime parsing library" -maintainer="Orphaned " -license="GPL-2.0-or-later" -homepage="http://www.gnome.org/" +maintainer="Enno Boland " +license="LGPL-2.1-or-later" +homepage="https://github.com/jstedfast/gmime" distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz" -checksum=7149686a71ca42a1390869b6074815106b061aaeaaa8f2ef8c12c191d9a79f6a +checksum=2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44 -# Package build options -build_options="gir" -build_options_default="gir" +build_options="gir vala" +build_options_default="gir vala" -if [ "$CROSS_BUILD" ]; then - configure_args+=" am_cv_func_iconv=yes am_cv_func_iconv_works=yes" - configure_args+=" am_cv_lib_iconv=no ac_cv_have_iconv_detect_h=yes" - configure_args+=" am_cv_proto_iconv_arg1=" -fi +pre_configure() { + [ -z "$CROSS_BUILD" ] && return 0 -pre_build() { - if [ -z "$CROSS_BUILD" ]; then - : - elif [ "$XBPS_TARGET_LIBC" = musl ]; then + configure_args+=" ac_cv_have_iconv_detect_h=yes" + + if [ "$XBPS_TARGET_LIBC" = musl ]; then cp ${FILESDIR}/musl-iconv-detect.h ${wrksrc}/iconv-detect.h else - cp ${FILESDIR}/iconv-detect.h ${wrksrc} + cp ${FILESDIR}/iconv-detect.h ${wrksrc}/iconv-detect.h + fi +} + +do_check() { + if [ "$XBPS_TARGET_LIBC" = musl ]; then + make check VERBOSITY=-vv | + awk ' + 1 + # utf-8 to iso-2022-jp is stateless + /GMimeFilterCharset.*utf-8.*iso-2022-jp/ { next } + # euc-kr has not been supported + /euc-kr to UTF-8/ { next } + $NF == "FAILED" { e = 1 } + END { exit e } + ' + else + make check fi } gmime-devel_package() { - depends="libglib-devel zlib-devel gmime>=${version}_${revision}" + depends="libglib-devel zlib-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -45,7 +59,22 @@ gmime-devel_package() { vmove "usr/lib/*.so" vmove usr/share/gtk-doc if [ "$build_option_gir" ]; then - vmove "usr/share/gir-*" + vmove usr/share/gir-1.0 + fi + if [ "$build_option_vala" ]; then + vmove usr/share/vala fi } } + +gmime3_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +} + +gmime3-devel_package() { + depends="${sourcepkg}-devel>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +} diff --git a/srcpkgs/gmime/update b/srcpkgs/gmime/update deleted file mode 100644 index 4ee52a63831..00000000000 --- a/srcpkgs/gmime/update +++ /dev/null @@ -1 +0,0 @@ -ignore="3*" # Packages in gmime3 diff --git a/srcpkgs/gmime3 b/srcpkgs/gmime3 new file mode 120000 index 00000000000..4173041bbe7 --- /dev/null +++ b/srcpkgs/gmime3 @@ -0,0 +1 @@ +gmime \ No newline at end of file diff --git a/srcpkgs/gmime3-devel b/srcpkgs/gmime3-devel index 8029aee6f9f..4173041bbe7 120000 --- a/srcpkgs/gmime3-devel +++ b/srcpkgs/gmime3-devel @@ -1 +1 @@ -gmime3 \ No newline at end of file +gmime \ No newline at end of file diff --git a/srcpkgs/gmime3/files/iconv-detect.h b/srcpkgs/gmime3/files/iconv-detect.h deleted file mode 100644 index 6d9dd05b59e..00000000000 --- a/srcpkgs/gmime3/files/iconv-detect.h +++ /dev/null @@ -1,6 +0,0 @@ -/* This is an auto-generated header, DO NOT EDIT! */ - -#define ICONV_ISO_INT_FORMAT "iso-%u-%u" -#define ICONV_ISO_STR_FORMAT "iso-%u-%s" -#define ICONV_SHIFT_JIS "shift-jis" -#define ICONV_10646 "iso-10646" diff --git a/srcpkgs/gmime3/files/musl-iconv-detect.h b/srcpkgs/gmime3/files/musl-iconv-detect.h deleted file mode 100644 index 569da106b94..00000000000 --- a/srcpkgs/gmime3/files/musl-iconv-detect.h +++ /dev/null @@ -1,6 +0,0 @@ -/* This is an auto-generated header, DO NOT EDIT! */ - -#define ICONV_ISO_INT_FORMAT "iso-%u-%u" -#define ICONV_ISO_STR_FORMAT "iso-%u-%s" -#define ICONV_SHIFT_JIS "shift-jis" -#define ICONV_10646 "UCS-4BE" diff --git a/srcpkgs/gmime3/template b/srcpkgs/gmime3/template deleted file mode 100644 index 43e04197d50..00000000000 --- a/srcpkgs/gmime3/template +++ /dev/null @@ -1,68 +0,0 @@ -# Template file for 'gmime3' -pkgname=gmime3 -version=3.2.7 -revision=1 -wrksrc="gmime-${version}" -build_style=gnu-configure -build_helper="gir" -configure_args="--disable-static --enable-crypto $(vopt_enable vala) - $(vopt_enable gir introspection)" -hostmakedepends="pkg-config $(vopt_if vala vala)" -makedepends="glib-devel gpgme-devel libidn2-devel - $(vopt_if vala vala)" -checkdepends="gnupg2" -short_desc="GNOME Core mime parsing library" -maintainer="Enno Boland " -license="LGPL-2.1-or-later" -homepage="https://github.com/jstedfast/gmime" -distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz" -checksum=2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44 - -build_options="gir vala" -build_options_default="gir vala" - -pre_configure() { - [ -z "$CROSS_BUILD" ] && return 0 - - configure_args+=" ac_cv_have_iconv_detect_h=yes" - - if [ "$XBPS_TARGET_LIBC" = musl ]; then - cp ${FILESDIR}/musl-iconv-detect.h ${wrksrc}/iconv-detect.h - else - cp ${FILESDIR}/iconv-detect.h ${wrksrc}/iconv-detect.h - fi -} - -do_check() { - if [ "$XBPS_TARGET_LIBC" = musl ]; then - make check VERBOSITY=-vv | - awk ' - 1 - # utf-8 to iso-2022-jp is stateless - /GMimeFilterCharset.*utf-8.*iso-2022-jp/ { next } - # euc-kr has not been supported - /euc-kr to UTF-8/ { next } - $NF == "FAILED" { e = 1 } - END { exit e } - ' - else - make check - fi -} - -gmime3-devel_package() { - depends="libglib-devel zlib-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - vmove usr/share/gtk-doc - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi - if [ "$build_option_vala" ]; then - vmove usr/share/vala - fi - } -} diff --git a/srcpkgs/gmime3/update b/srcpkgs/gmime3/update deleted file mode 100644 index 0b6f335b26f..00000000000 --- a/srcpkgs/gmime3/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=gmime From e4d934475a7c902e09b1eb46dedbf00a296b1b23 Mon Sep 17 00:00:00 2001 From: travankor Date: Thu, 28 Apr 2022 17:44:53 -0700 Subject: [PATCH 1838/2369] wayfire: update to 0.7.3. --- srcpkgs/wayfire/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index 9b0026c5856..6a9e874d172 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -1,13 +1,13 @@ # Template file for 'wayfire' pkgname=wayfire -version=0.7.2 -revision=2 +version=0.7.3 +revision=1 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403 build_style=meson configure_args="-Dprint_trace=false" hostmakedepends="pkg-config wayland-devel" -makedepends="wf-config-devel wlroots0.14-devel cairo-devel +makedepends="wf-config-devel wlroots-devel cairo-devel $(vopt_if image 'libjpeg-turbo-devel libpng-devel')" depends="xorg-server-xwayland" short_desc="3D wayland compositor" @@ -17,7 +17,7 @@ homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz" -checksum="e45fddcc22b7149d793fea08763c5b3dc0edf7c0be9d094575a32cf847560fd4 +checksum="72575b6d598087d6fe737a8066db5405d7cff88a3041447f56b83313ac9a0684 bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f 09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f" From caf6ce739d75410ecc1716e7cf9c9357f8d3369b Mon Sep 17 00:00:00 2001 From: travankor Date: Thu, 28 Apr 2022 17:45:55 -0700 Subject: [PATCH 1839/2369] wayfire-plugins-extra: fix build for wayfire update --- .../wayfire-plugins-extra/patches/mag.patch | 99 +++++++++++++++++++ srcpkgs/wayfire-plugins-extra/template | 2 +- 2 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/wayfire-plugins-extra/patches/mag.patch diff --git a/srcpkgs/wayfire-plugins-extra/patches/mag.patch b/srcpkgs/wayfire-plugins-extra/patches/mag.patch new file mode 100644 index 00000000000..0cb71ad5d86 --- /dev/null +++ b/srcpkgs/wayfire-plugins-extra/patches/mag.patch @@ -0,0 +1,99 @@ +diff --git a/src/mag.cpp b/src/mag.cpp +index 1ed4d73..f03cf7c 100644 +--- a/src/mag.cpp ++++ b/src/mag.cpp +@@ -35,16 +35,6 @@ + #include "wayfire/opengl.hpp" + #include + +-extern "C" +-{ +-#define static +-#include +-#include +-#include +-#include +-#undef static +-} +- + #include + + +@@ -171,19 +161,6 @@ class wayfire_magnifier : public wf::plugin_interface_t + + wf::effect_hook_t post_hook = [=] () + { +- wlr_dmabuf_attributes dmabuf_attribs; +- +- /* This plugin only works if this function succeeds. It will not +- * work with the x11 backend but works with drm, for example. */ +- if (!wlr_output_export_dmabuf(output->handle, &dmabuf_attribs)) +- { +- LOGE("Failed reading output contents"); +- deactivate(); +- active = false; +- +- return; +- } +- + auto cursor_position = output->get_cursor_position(); + + auto ortho = output->render->get_target_framebuffer() +@@ -201,9 +178,6 @@ class wayfire_magnifier : public wf::plugin_interface_t + float y = cursor.y; + + auto og = output->get_relative_geometry(); +- gl_geometry src_geometry = {0, 0, (float)og.width, (float)og.height}; +- auto transform = output->render->get_target_framebuffer().transform; +- transform = glm::inverse(transform); + + width = og.width; + height = og.height; +@@ -220,6 +194,9 @@ class wayfire_magnifier : public wf::plugin_interface_t + /* Compute zoom_box, forcing the zoom to stay on the output */ + gl_geometry zoom_box; + ++ /* Y-invert */ ++ y = 1.0 - y; ++ + zoom_box.x1 = x - level; + zoom_box.y1 = y - level; + zoom_box.x2 = x + level; +@@ -249,27 +226,25 @@ class wayfire_magnifier : public wf::plugin_interface_t + zoom_box.y2 = 1.0; + } + ++ zoom_box.x1 *= width - 1; ++ zoom_box.x2 *= width - 1; ++ zoom_box.y1 *= height - 1; ++ zoom_box.y2 *= height - 1; ++ + /* Copy zoom_box part of the output to our own texture to be + * read by the mag_view_t. */ +- auto wlr_texture = wlr_texture_from_dmabuf( +- wf::get_core().renderer, &dmabuf_attribs); +- +- wf::texture_t texture{wlr_texture}; + + OpenGL::render_begin(); + mag_view->mag_tex.allocate(width, height); + mag_view->mag_tex.geometry = og; + mag_view->mag_tex.bind(); +- +- OpenGL::render_transformed_texture(texture, src_geometry, zoom_box, +- transform * mag_view->mag_tex.get_orthographic_projection(), +- glm::vec4(1.0), +- OpenGL::TEXTURE_USE_TEX_GEOMETRY); ++ GL_CALL(glBindFramebuffer(GL_READ_FRAMEBUFFER, ++ output->render->get_target_framebuffer().fb)); ++ GL_CALL(glBlitFramebuffer(zoom_box.x1, zoom_box.y2, zoom_box.x2, zoom_box.y1, ++ 0, 0, width, height, ++ GL_COLOR_BUFFER_BIT, GL_LINEAR)); + OpenGL::render_end(); + +- wlr_texture_destroy(wlr_texture); +- wlr_dmabuf_attributes_finish(&dmabuf_attribs); +- + mag_view->damage(); + }; + diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template index 79b40857cf0..a666281e177 100644 --- a/srcpkgs/wayfire-plugins-extra/template +++ b/srcpkgs/wayfire-plugins-extra/template @@ -1,7 +1,7 @@ # Template file for 'wayfire-plugins-extra' pkgname=wayfire-plugins-extra version=0.7.0 -revision=5 +revision=6 build_style=meson hostmakedepends="pkg-config wayland-devel" makedepends="wayfire-devel glibmm-devel" From 552f4e8ddd0a7a21ead2284622fdcf3abafdecec Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sun, 8 May 2022 13:31:20 -0700 Subject: [PATCH 1840/2369] podman: update to 4.1.0 --- srcpkgs/podman/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template index a12ca2c3244..bc2e8cce46c 100644 --- a/srcpkgs/podman/template +++ b/srcpkgs/podman/template @@ -1,6 +1,6 @@ # Template file for 'podman' pkgname=podman -version=4.0.3 +version=4.1.0 revision=1 build_style=go go_import_path="github.com/containers/podman/v4" @@ -15,7 +15,7 @@ license="Apache-2.0" homepage="https://podman.io/" changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md" distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz" -checksum=e3b53fc9142d4f2dc085f17a377d92ffb8bfe7756c4f47b8128b38bcc3540cbc +checksum=f814e12a7311d486c1ccdc4eb021bc6dd24499569de7a572e436342876f70e95 if [ "$CROSS_BUILD" ]; then go_build_tags+=" containers_image_openpgp" @@ -30,9 +30,10 @@ post_install() { mv "${DESTDIR}/usr/bin/rootlessport" "${DESTDIR}/usr/libexec/podman/rootlessport" make install.man DESTDIR="${DESTDIR}" PREFIX="/usr" make install.completions DESTDIR="${DESTDIR}" PREFIX="/usr" - sed -e 's|# cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \ - vendor/github.com/containers/common/pkg/config/containers.conf \ - >containers.cgfs.conf + cp vendor/github.com/containers/common/pkg/config/containers.conf \ + containers.cgfs.conf + vsed -i -e 's|#cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \ + containers.cgfs.conf vinstall containers.cgfs.conf 644 usr/share/containers containers.conf vsv podman vsv podman-docker From 513b08e4491cf6c3ef0f1ee7f88ddf0fe62ec68d Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 9 May 2022 12:50:19 -0400 Subject: [PATCH 1841/2369] dendrite: update to 0.8.3. --- srcpkgs/dendrite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template index 998442981fc..7e8f9fd2731 100644 --- a/srcpkgs/dendrite/template +++ b/srcpkgs/dendrite/template @@ -1,6 +1,6 @@ # Template file for 'dendrite' pkgname=dendrite -version=0.8.2 +version=0.8.3 revision=1 build_style=go go_import_path="github.com/matrix-org/dendrite" @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://matrix.org/docs/projects/server/dendrite" changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md" distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz" -checksum=c09c53964434785d9828482a00e3300a7e54692a0052c71f6a245e147b46cd01 +checksum=2d61dc970bf812e13f7a81c65e811811ef950dad02631380650191214f2b5d5d system_accounts="_dendrite" _dendrite_homedir="/var/lib/dendrite" From c9f70e4a1f322984b6f18eca45cc34ec56723b77 Mon Sep 17 00:00:00 2001 From: Jose G Perez Taveras Date: Mon, 9 May 2022 12:28:03 -0400 Subject: [PATCH 1842/2369] font-iosevka: update to 15.3.0. --- 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 c971135ce5f..47928911536 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.2.0 +version=15.3.0 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 - b6b6bb50cd3c3db49739bea9fb5c92c22647631eb1b5a35aa7f48358c07ef529 - 45c853ac53b638457d943c0ccf7cf12ca77219ba7e092d7ac17ed965c5482da9" + 0ebdabed87473163055f2fbe6927e210c9259a94efdeac3ed54976bb0873ce0c + dc08f215c57fd3e3d9f4a69a600a2a0d92bd56bac47e6099c47374e7cee0b7ae" font_dirs="/usr/share/fonts/TTF" From 01ce3b04483b1e1610f1900144d2b0426c71b036 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 9 May 2022 19:23:31 -0400 Subject: [PATCH 1843/2369] chezmoi: update to 2.15.4. --- srcpkgs/chezmoi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 7f416e87378..119bcf35e55 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,6 +1,6 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.15.3 +version=2.15.4 revision=1 build_style=go go_import_path="github.com/twpayne/chezmoi/v2" @@ -11,7 +11,7 @@ maintainer="classabbyamp " license="MIT" homepage="https://chezmoi.io/" distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz" -checksum=2c0239c643795a13420f815c7e906720cd98594152b6d6fa546b0242462adc9e +checksum=879ce990f1655124af7e3bbf95dd3fb79453f8c1047d6f4ad5af30d86a674843 pre_build() { local _date From 076e12a32000163504ed63a786dbf72c7607e9e7 Mon Sep 17 00:00:00 2001 From: Philipp David Date: Tue, 10 May 2022 08:31:33 +0200 Subject: [PATCH 1844/2369] PolyMC: update to 1.2.2. --- srcpkgs/PolyMC/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template index 91b439b6b52..c3a336ce02a 100644 --- a/srcpkgs/PolyMC/template +++ b/srcpkgs/PolyMC/template @@ -1,6 +1,6 @@ # Template file for 'PolyMC' pkgname=PolyMC -version=1.2.1 +version=1.2.2 revision=1 build_style=cmake configure_args="-DLauncher_BUILD_PLATFORM=Void @@ -13,7 +13,7 @@ maintainer="Philipp David " license="GPL-3.0-only" homepage="https://polymc.org/" distfiles="https://github.com/PolyMC/PolyMC/releases/download/${version}/PolyMC-${version}.tar.gz" -checksum=cec7b0175bd0dc3ff2a43e822d1218772e0833332026ae681c81ecc5c51bf608 +checksum=4ce46406040b5315a598e412feecb70e5248cfc07fac9e3086597af12c102137 if [ -z "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DBUILD_TESTING=0" From 722a6924b0b5f87f03d276f07d284e34c074a32c Mon Sep 17 00:00:00 2001 From: Noel Cower Date: Mon, 9 May 2022 15:23:05 -0700 Subject: [PATCH 1845/2369] sops: update to 3.7.3. --- srcpkgs/sops/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template index ade18a059c5..09a33de74f5 100644 --- a/srcpkgs/sops/template +++ b/srcpkgs/sops/template @@ -1,6 +1,6 @@ # Template file for 'sops' pkgname=sops -version=3.7.0 +version=3.7.3 revision=1 build_style=go go_import_path="go.mozilla.org/sops/v3" @@ -10,4 +10,4 @@ maintainer="Noel Cower " license="MPL-2.0" homepage="https://github.com/mozilla/sops" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=909496eaed98f6ff4fadc216ad904ef2d2a82ff229e6af6cc0cb1625e2df5d83 +checksum=0e563f0c01c011ba52dd38602ac3ab0d4378f01edfa83063a00102587410ac38 From 23816373406667e13192914f05143bb944480603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 10 May 2022 18:58:53 +0200 Subject: [PATCH 1846/2369] .github/: skip file conflicts check if no packages are built workflow was limited to branches modifying srcpkgs/, but this still triggered when modifying only update files or removing template --- .github/workflows/build.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f527ce1f897..177944e1c03 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -105,8 +105,10 @@ jobs: - name: Check file conflicts if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate run: | - xlocate -S && - common/scripts/lint-conflicts $HOME/hostdir/binpkgs + if [ -s /tmp/templates ]; then + xlocate -S && + common/scripts/lint-conflicts $HOME/hostdir/binpkgs + fi - name: Verify repository state run: | From bda9720be0ee44f55b2229518d08da06dfae4a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 10 May 2022 20:33:18 +0200 Subject: [PATCH 1847/2369] common/scripts/lint-conflicts: handle emptied packages --- common/scripts/lint-conflicts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts index bb0e2b2fd6b..2917f72a89a 100755 --- a/common/scripts/lint-conflicts +++ b/common/scripts/lint-conflicts @@ -130,9 +130,12 @@ group_by_file_partial() { # for all packages in xlocate local pkgname file ## newly built packages + while read -r pkgver; do + pkgname=${pkgver%-*} + newly_built[$pkgname]=$pkgname + done < <(xbps-query "${repositories[@]}" -i -R -s '' | cut -d' ' -f 2) while read -r pkgname file; do owners[$file]+=" $pkgname" - newly_built[$pkgname]=$pkgname done < <(list_newly_built_files) ## rest of repository while read -r pkgver file; do From 8885cef1f90bb153358c9bccdec98879d6f9edf9 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 10 May 2022 15:33:46 -0500 Subject: [PATCH 1848/2369] python3-oletools: update to 0.60.1. --- srcpkgs/python3-oletools/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template index 08b132fac61..9e09720167d 100644 --- a/srcpkgs/python3-oletools/template +++ b/srcpkgs/python3-oletools/template @@ -1,7 +1,7 @@ # Template file for 'python3-oletools' pkgname=python3-oletools -version=0.60 -revision=2 +version=0.60.1 +revision=1 wrksrc="oletools-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,7 +13,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/decalage2/oletools" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=85500022ebf58e9bd514e295270cb5ac2b061b2e59912432a3a7ceffd88db3e0 +checksum=34cef47d88488126952f994be7b4c20d2758203b64f69335d3d8179ad3ae0992 post_install() { vlicense oletools/LICENSE.txt From 86cdf53df5d6d7a70beeb6f49cd75484d01aafec Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 10 May 2022 16:13:00 -0500 Subject: [PATCH 1849/2369] python3-ytmusicapi: update to 0.22.0. --- srcpkgs/python3-ytmusicapi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template index b791bcb33c0..faec190cff1 100644 --- a/srcpkgs/python3-ytmusicapi/template +++ b/srcpkgs/python3-ytmusicapi/template @@ -1,6 +1,6 @@ # Template file for 'python3-ytmusicapi' pkgname=python3-ytmusicapi -version=0.21.0 +version=0.22.0 revision=1 wrksrc="ytmusicapi-${version}" build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/sigma67/ytmusicapi" distfiles="${homepage}/archive/refs/tags/${version}.tar.gz" -checksum=338941fb2fb52078a69fa47a34456574e4e9998caead56d27e440bacacdb917c +checksum=5240fc8862a6bf7fd602bc420a0b48d81fae389acad6ff1ee8eeb5ed32ae09b9 post_install() { vlicense LICENSE From 5959d88fc6728c9751f345f334cb784e626ca127 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Tue, 10 May 2022 21:30:17 +0200 Subject: [PATCH 1850/2369] google-chrome: update to 101.0.4951.64 --- 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 94cd9a30ad4..c95d625d585 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,6 +1,6 @@ # Template file for 'google-chrome' pkgname=google-chrome -version=101.0.4951.54 +version=101.0.4951.64 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=bedc9782f008645c3bcda9edbeeabf52ef15ed1d736a697819e56f2e5c37dad4 +checksum=1b6dfea8fc0232ad88a02c997facb28b06c000d9d27cedfdbde278018fcc3292 do_extract() { mkdir -p ${DESTDIR} From be4d9f9ce3e8593fd6dc30090d70b202d39f504b Mon Sep 17 00:00:00 2001 From: Henry Precheur Date: Mon, 9 May 2022 09:14:51 -0700 Subject: [PATCH 1851/2369] zoom: update to 5.10.4.2845 --- srcpkgs/zoom/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template index aa16c7503ed..796df0c7ea2 100644 --- a/srcpkgs/zoom/template +++ b/srcpkgs/zoom/template @@ -1,6 +1,6 @@ # Template file for 'zoom' pkgname=zoom -version=5.9.6.2225 +version=5.10.4.2845 revision=1 archs="x86_64" wrksrc=zoom @@ -13,7 +13,7 @@ maintainer="Daniel Santana " license="custom:Proprietary" homepage="https://zoom.us/" distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm" -checksum=1e43ae0e43168586f5dd05ace1e646afe1455825b62b760e2dab0a3564da35e3 +checksum=b206618eacbae117eda78a0cfcd8986a553412dbba8f1891660e12c3366ad802 repository=nonfree noshlibprovides=yes noverifyrdeps=yes From 52674ab0d6f94cd16d1e52a0af6dc10fb509858a 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, 9 May 2022 17:38:45 +0700 Subject: [PATCH 1852/2369] git: update to 2.36.1. --- srcpkgs/git/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index dc2146690ab..702dca4ef81 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,8 +1,7 @@ # Template file for 'git' pkgname=git -reverts="2.36.0_1" -version=2.35.3 -revision=2 +version=2.36.1 +revision=1 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto" makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel" # Required by https:// @@ -15,7 +14,7 @@ license="GPL-2.0-only" homepage="https://git-scm.com/" changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2 +checksum=405d4a0ff6e818d1f12b3e92e1ac060f612adcb454f6299f70583058cb508370 replaces="git-perl>=0" register_shell=/usr/bin/git-shell python_version=3 From 041e5f6de5c5d04581c7f875d257fb0559d4a917 Mon Sep 17 00:00:00 2001 From: Tung Anh Vu Date: Mon, 9 May 2022 14:55:24 +0200 Subject: [PATCH 1853/2369] ipe: Add qt5-svg to depends Icons in toolbars (and possibly elsewhere) are not displayed without qt5-svg. Close: #37058 --- srcpkgs/ipe/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index fbd500a3dc9..a84d5c036b2 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -1,11 +1,12 @@ # Template file for 'ipe' pkgname=ipe version=7.2.24 -revision=5 +revision=6 _tools_commit=v7.2.20.1 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools" makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel lua53-devel poppler-devel qt5-devel libspiro-devel" +depends="qt5-svg" short_desc="Drawing editor for creating figures in PDF or EPS formats" maintainer="Leah Neukirchen " license="GPL-3.0-or-later" From d7c9da3ca26db7161e872876c5e660bab0037d20 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 11 May 2022 14:13:43 +0200 Subject: [PATCH 1854/2369] ugrep: update to 3.7.11. --- srcpkgs/ugrep/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template index fda7c355b64..eb86699fa39 100644 --- a/srcpkgs/ugrep/template +++ b/srcpkgs/ugrep/template @@ -1,6 +1,6 @@ # Template file for 'ugrep' pkgname=ugrep -version=3.7.10 +version=3.7.11 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=733503055e309e83898a403481d92357fc3b02d4642acdb51026dd2dd44e0477 +checksum=47cf3eee0a6eb759a5ee53b8e0e09d5d1843c5597cfd83e9c88f1b29e6873b2b post_install() { vlicense LICENSE.txt LICENSE From 0e1c9f6f581bca486b8822e93a137196de07239b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 11 May 2022 14:51:03 +0200 Subject: [PATCH 1855/2369] cloud-hypervisor: update to 23.1. --- srcpkgs/cloud-hypervisor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template index c94d8e45e3f..3305b00cc90 100644 --- a/srcpkgs/cloud-hypervisor/template +++ b/srcpkgs/cloud-hypervisor/template @@ -1,6 +1,6 @@ # Template file for 'cloud-hypervisor' pkgname=cloud-hypervisor -version=23.0 +version=23.1 revision=1 archs="aarch64* x86_64*" build_style=cargo @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="Apache-2.0, BSD-3-Clause" homepage="https://github.com/cloud-hypervisor/cloud-hypervisor" distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz" -checksum=80f058d3ae00e23f4762fcc1c7091f22a14801c5913298f54fbfb8591da52ba9 +checksum=c4e04a7f8af27517f3a07aee04a5eea4e81780f4ed5fa21876d282de0f998354 post_install() { vlicense LICENSE-APACHE From e2a0edf4910df98dfddc38de1e0d38ff6944ba8a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 11 May 2022 14:56:09 +0200 Subject: [PATCH 1856/2369] dovecot: update to 2.3.19. --- srcpkgs/dovecot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index bfee0c1db55..abce7c8b387 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -1,7 +1,7 @@ # Template file for 'dovecot' # revbump dovecot-plugin-pigeonhole when updating dovecot! pkgname=dovecot -version=2.3.18 +version=2.3.19 revision=1 build_style=gnu-configure configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin @@ -19,7 +19,7 @@ maintainer="Leah Neukirchen " license="LGPL-2.1-or-later" homepage="https://dovecot.org/" distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz" -checksum=06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33 +checksum=0173f693d441b6248b8a62aa5fd690021a1f04a12902653e0bf2e5b012fe437b keep_libtool_archives=yes if [ "$CROSS_BUILD" ]; then From 6b8ef389939eaa19423667dd33b5b3de8e5cc417 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 11 May 2022 15:42:28 +0200 Subject: [PATCH 1857/2369] dovecot-plugin-pigeonhole: update to 0.5.19. --- srcpkgs/dovecot-plugin-pigeonhole/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template index 97c54750ab0..d3b68337604 100644 --- a/srcpkgs/dovecot-plugin-pigeonhole/template +++ b/srcpkgs/dovecot-plugin-pigeonhole/template @@ -1,6 +1,6 @@ # Template file for 'dovecot-plugin-pigeonhole' pkgname=dovecot-plugin-pigeonhole -version=0.5.18 +version=0.5.19 revision=1 wrksrc="dovecot-2.3-pigeonhole-${version}" build_style=gnu-configure @@ -19,7 +19,7 @@ maintainer="Leah Neukirchen " license="LGPL-2.1-or-later" homepage="https://pigeonhole.dovecot.org" distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz" -checksum=a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5 +checksum=10b923efcc6f3c4d92ecdbb780e12a5c33e6d0fdbe3aba5fcd3ecde4179c730c dovecot-plugin-pigeonhole-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 947bc7fda6f29b24523e1c31bd6dbbc5dac747af Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 11 May 2022 20:56:38 +0200 Subject: [PATCH 1858/2369] youtube-viewer: update to 3.10.0. --- srcpkgs/youtube-viewer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template index af6941e4531..c7d726cdbf9 100644 --- a/srcpkgs/youtube-viewer/template +++ b/srcpkgs/youtube-viewer/template @@ -1,6 +1,6 @@ # Template file for 'youtube-viewer' pkgname=youtube-viewer -version=3.9.9 +version=3.10.0 revision=1 build_style=perl-ModuleBuild configure_args="--gtk" @@ -14,7 +14,7 @@ license="Artistic-2.0" homepage="https://github.com/trizen/youtube-viewer" changelog="https://github.com/trizen/youtube-viewer/releases" distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz" -checksum=29a326b6496bc6e96840d3c854d79a3ffb9e6006a033f11478c1633c1ac48a8b +checksum=68a2bd03c1f9a01809505e9beef75b4f64119f3709b3fb9ae6343d8b50c0bc85 gtk-youtube-viewer_package() { depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir" From 530042f295f0e519252cfe7a8d0e1ad4869d4bf2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 09:20:28 -0400 Subject: [PATCH 1859/2369] intel-ucode: update to 20220510. --- srcpkgs/intel-ucode/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template index e7e57d0f658..22516894871 100644 --- a/srcpkgs/intel-ucode/template +++ b/srcpkgs/intel-ucode/template @@ -1,6 +1,6 @@ # Template file for 'intel-ucode' pkgname=intel-ucode -version=20220419 +version=20220510 revision=1 archs="i686* x86_64*" wrksrc="Intel-Linux-Processor-Microcode-Data-Files-microcode-${version}" @@ -9,7 +9,7 @@ maintainer="Andrew J. Hesford " license="custom: Proprietary" homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files" distfiles="${homepage}/archive/microcode-${version}.tar.gz" -checksum=b8838d300e749c1dd55d8865bdd49dee5153beb5e29d4b0e613aee475e0c0881 +checksum=254ddc71b598fbb8dbb200ceb3af29aeb22f6bf50bc609e8f953cf9c8d286d2a repository=nonfree do_install() { From 9b328d42f1e0ceeec13bbce5d39d625249c93e38 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 09:41:25 -0400 Subject: [PATCH 1860/2369] maturin: update to 0.12.15. --- srcpkgs/maturin/patches/add-ppc-tier3.patch | 132 +++++++++++--------- srcpkgs/maturin/template | 4 +- 2 files changed, 74 insertions(+), 62 deletions(-) diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch index 5b5b7c2021a..b19d2ada15e 100644 --- a/srcpkgs/maturin/patches/add-ppc-tier3.patch +++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch @@ -1,7 +1,7 @@ -diff -ur setup.py setup.py +diff -u a/setup.py b/setup.py --- a/setup.py +++ b/setup.py -@@ -69,7 +69,7 @@ +@@ -71,7 +71,7 @@ "--message-format=json", ] @@ -10,66 +10,10 @@ diff -ur setup.py setup.py sys.platform == "win32" and platform.machine() == "ARM64" ): cargo_args.extend( -diff -ur src/target.rs src/target.rs ---- a/src/target.rs -+++ b/src/target.rs -@@ -40,6 +40,8 @@ - Armv7L, - Powerpc64Le, - Powerpc64, -+ PowerpcLe, -+ Powerpc, - X86, - X86_64, - S390X, -@@ -52,6 +54,8 @@ - Arch::Armv7L => write!(f, "armv7l"), - Arch::Powerpc64Le => write!(f, "ppc64le"), - Arch::Powerpc64 => write!(f, "ppc64"), -+ Arch::PowerpcLe => write!(f, "ppcle"), -+ Arch::Powerpc => write!(f, "ppc"), - Arch::X86 => write!(f, "i686"), - Arch::X86_64 => write!(f, "x86_64"), - Arch::S390X => write!(f, "s390x"), -@@ -67,6 +71,8 @@ - Arch::Armv7L, - Arch::Powerpc64, - Arch::Powerpc64Le, -+ Arch::PowerpcLe, -+ Arch::Powerpc, - Arch::S390X, - Arch::X86, - Arch::X86_64, -@@ -123,6 +129,8 @@ - target_lexicon::Architecture::Aarch64(_) => Arch::Aarch64, - target_lexicon::Architecture::Powerpc64 => Arch::Powerpc64, - target_lexicon::Architecture::Powerpc64le => Arch::Powerpc64Le, -+ target_lexicon::Architecture::PowerpcLe => Arch::PowerpcLe, -+ target_lexicon::Architecture::Powerpc => Arch::Powerpc, - target_lexicon::Architecture::S390x => Arch::S390X, - unsupported => bail!("The architecture {} is not supported", unsupported), - }; -@@ -200,7 +208,7 @@ - /// Returns the default Manylinux tag for this architecture - pub fn get_default_manylinux_tag(&self) -> PlatformTag { - match self.arch { -- Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::S390X => { -+ Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::PowerpcLe | Arch::Powerpc | Arch::S390X => { - PlatformTag::manylinux2014() - } - Arch::X86 | Arch::X86_64 => PlatformTag::manylinux2010(), -@@ -214,6 +222,8 @@ - Arch::Armv7L => 32, - Arch::Powerpc64 => 64, - Arch::Powerpc64Le => 64, -+ Arch::Powerpc => 32, -+ Arch::PowerpcLe => 32, - Arch::X86 => 32, - Arch::X86_64 => 64, - Arch::S390X => 64, +diff -u a/src/auditwheel/policy.rs b/src/auditwheel/policy.rs --- a/src/auditwheel/policy.rs +++ b/src/auditwheel/policy.rs -@@ -110,6 +110,8 @@ +@@ -100,6 +100,8 @@ Arch::Armv7L => "libc.musl-armv7.so.1", Arch::Powerpc64Le => "libc.musl-ppc64le.so.1", Arch::Powerpc64 => "", // musllinux doesn't support ppc64 @@ -78,3 +22,71 @@ diff -ur src/target.rs src/target.rs Arch::X86 => "libc.musl-x86.so.1", Arch::X86_64 => "libc.musl-x86_64.so.1", Arch::S390X => "libc.musl-s390x.so.1", +diff -u a/src/target.rs.orig b/src/target.rs +--- a/src/target.rs ++++ b/src/target.rs +@@ -52,6 +52,10 @@ + Powerpc64Le, + #[serde(alias = "ppc64")] + Powerpc64, ++ #[serde(alias = "ppcle")] ++ PowerpcLe, ++ #[serde(alias = "ppc")] ++ Powerpc, + #[serde(alias = "i686")] + X86, + X86_64, +@@ -65,6 +69,8 @@ + Arch::Armv7L => write!(f, "armv7l"), + Arch::Powerpc64Le => write!(f, "ppc64le"), + Arch::Powerpc64 => write!(f, "ppc64"), ++ Arch::PowerpcLe => write!(f, "ppcle"), ++ Arch::Powerpc => write!(f, "ppc"), + Arch::X86 => write!(f, "i686"), + Arch::X86_64 => write!(f, "x86_64"), + Arch::S390X => write!(f, "s390x"), +@@ -80,6 +86,8 @@ + Arch::Armv7L, + Arch::Powerpc64, + Arch::Powerpc64Le, ++ Arch::PowerpcLe, ++ Arch::Powerpc, + Arch::S390X, + Arch::X86, + Arch::X86_64, +@@ -154,6 +162,8 @@ + target_lexicon::Architecture::Aarch64(_) => Arch::Aarch64, + target_lexicon::Architecture::Powerpc64 => Arch::Powerpc64, + target_lexicon::Architecture::Powerpc64le => Arch::Powerpc64Le, ++ target_lexicon::Architecture::PowerpcLe => Arch::PowerpcLe, ++ target_lexicon::Architecture::Powerpc => Arch::Powerpc, + target_lexicon::Architecture::S390x => Arch::S390X, + unsupported => bail!("The architecture {} is not supported", unsupported), + }; +@@ -303,6 +313,8 @@ + Arch::Armv7L => "armv7l", + Arch::Powerpc64Le => "powerpc64le", + Arch::Powerpc64 => "powerpc64", ++ Arch::PowerpcLe => "powerpcle", ++ Arch::Powerpc => "powerpc", + Arch::X86 => "i386", + Arch::X86_64 => "x86_64", + Arch::S390X => "s390x", +@@ -327,7 +339,7 @@ + /// Returns the oldest possible Manylinux tag for this architecture + pub fn get_minimum_manylinux_tag(&self) -> PlatformTag { + match self.arch { +- Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::S390X => { ++ Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::PowerpcLe | Arch::Powerpc | Arch::S390X => { + PlatformTag::manylinux2014() + } + Arch::X86 | Arch::X86_64 => PlatformTag::manylinux2010(), +@@ -341,6 +353,8 @@ + Arch::Armv7L => 32, + Arch::Powerpc64 => 64, + Arch::Powerpc64Le => 64, ++ Arch::Powerpc => 32, ++ Arch::PowerpcLe => 32, + Arch::X86 => 32, + Arch::X86_64 => 64, + Arch::S390X => 64, diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index 4bb299175ca..fa332fc4282 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -1,6 +1,6 @@ # Template file for 'maturin' pkgname=maturin -version=0.12.14 +version=0.12.15 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="4b45ef2f5a63d7dde7700556f60d82222c7ccba64cea70950f909b06e8355249 +checksum="aa640e1620dc466778cd48f0c9cefe08a9ade265c7f0582b005c25e9f1518be4 30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e" # Tests use unstable features and fail to build make_check=no From 801aab3cf60ce5945f927992bbc19d268e8542e8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 09:43:32 -0400 Subject: [PATCH 1861/2369] python3-cryptography_vectors: update to 37.0.2. --- srcpkgs/python3-cryptography_vectors/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template index 4576117879d..e626eebdca9 100644 --- a/srcpkgs/python3-cryptography_vectors/template +++ b/srcpkgs/python3-cryptography_vectors/template @@ -1,6 +1,6 @@ # Template file for 'python3-cryptography_vectors' pkgname=python3-cryptography_vectors -version=37.0.1 +version=37.0.2 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -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=66c9a714232be730fe822bd7e4e9da6231ff9e537ee4feb0f092c06b8ea4d94a +checksum=7c65d3de51756f418142df605417ec2c6e961c364f70cc8a103030889d5a3219 post_install() { vlicense LICENSE From e06747785b761b639072f4cf26c1edfeabd1b32a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 09:45:53 -0400 Subject: [PATCH 1862/2369] python3-cryptography: update to 37.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 12fd50551a1..97c7c0f59f7 100644 --- a/srcpkgs/python3-cryptography/template +++ b/srcpkgs/python3-cryptography/template @@ -1,6 +1,6 @@ # Template file for 'python3-cryptography' pkgname=python3-cryptography -version=37.0.1 +version=37.0.2 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -17,7 +17,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=d610d0ee14dd9109006215c7c0de15eee91230b70a9bce2263461cf7c3720b83 +checksum=f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e if [ "$CROSS_BUILD" ]; then makedepends+=" rust-std" From 24df5b2a388fdda350f4a4e8d12292aad81e4e0d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 09:47:06 -0400 Subject: [PATCH 1863/2369] python3-imageio: update to 2.19.1. --- srcpkgs/python3-imageio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template index 17b15998352..6966116f3b8 100644 --- a/srcpkgs/python3-imageio/template +++ b/srcpkgs/python3-imageio/template @@ -1,6 +1,6 @@ # Template file for 'python3-imageio' pkgname=python3-imageio -version=2.19.0 +version=2.19.1 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford " license="BSD-2-Clause" homepage="https://github.com/imageio/imageio" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=df6f0f80b7e7dbad66e80d223ecfdcb6285c800716251aabc49fcf756b516168 +checksum=1c8ee257e71c544e663e824a6082bfbc080d1c673a7230487acc3f99112d9135 post_install() { vlicense LICENSE From 6311ab8d8d8cf5c829609dcaa70393f2ea8fa0bb Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 09:47:30 -0400 Subject: [PATCH 1864/2369] python3-more-itertools: update to 8.13.0. --- srcpkgs/python3-more-itertools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template index 59676a78053..914d46f0a69 100644 --- a/srcpkgs/python3-more-itertools/template +++ b/srcpkgs/python3-more-itertools/template @@ -1,6 +1,6 @@ # Template file for 'python3-more-itertools' pkgname=python3-more-itertools -version=8.12.0 +version=8.13.0 revision=1 wrksrc="more-itertools-${version}" build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="MIT" homepage="https://github.com/erikrose/more-itertools" distfiles="${PYPI_SITE}/m/more-itertools/more-itertools-${version}.tar.gz" -checksum=7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d247f6064 +checksum=a42901a0a5b169d925f6f217cd5a190e32ef54360905b9c39ee7db5313bfec0f post_install() { vlicense LICENSE From 29d881ac0ae00b30768f0eff94dac070140861fd Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 09:47:47 -0400 Subject: [PATCH 1865/2369] python3-pip: update to 22.1. --- srcpkgs/python3-pip/template | 4 ++-- srcpkgs/python3-pip/update | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/python3-pip/update diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template index 51b892eb059..2f0080bc1eb 100644 --- a/srcpkgs/python3-pip/template +++ b/srcpkgs/python3-pip/template @@ -1,6 +1,6 @@ # Template file for 'python3-pip' pkgname=python3-pip -version=22.0.4 +version=22.1 revision=1 wrksrc="pip-${version}" build_style=python3-module @@ -12,7 +12,7 @@ license="MIT" homepage="https://pip.pypa.io/" changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst" distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz" -checksum=b3a9de2c6ef801e9247d1527a4b16f92f2cc141cd1489f3fffaf6a9e96729764 +checksum=2debf847016cfe643fa1512e2d781d3ca9e5c878ba0652583842d50cc2bcc605 # Tests have unpackaged dependencies make_check=no diff --git a/srcpkgs/python3-pip/update b/srcpkgs/python3-pip/update new file mode 100644 index 00000000000..e9b0a0a5ea4 --- /dev/null +++ b/srcpkgs/python3-pip/update @@ -0,0 +1 @@ +ignore="*b*" From 7532a16ed801a7d8e23b39d3c374835987d62a29 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 09:48:09 -0400 Subject: [PATCH 1866/2369] python3-pytools: update to 2022.1.7. --- srcpkgs/python3-pytools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template index 1367b8ec31b..f019ed70383 100644 --- a/srcpkgs/python3-pytools/template +++ b/srcpkgs/python3-pytools/template @@ -1,6 +1,6 @@ # Template file for 'python3-pytools' pkgname=python3-pytools -version=2022.1.6 +version=2022.1.7 revision=1 wrksrc=${pkgname#*-}-${version} build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="X11" homepage="https://pypi.org/project/pytools" distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz" -checksum=9271dc8a65da02fa3fe342e2be7979b2d10f792f3b54fb115e51bf10386eb770 +checksum=9083e8b6e617560eebb7e0c22c01545b1599eb1c048fe72ca2796f22c040a317 post_install() { vlicense LICENSE From 9b90213e7d0deeac024a99118e5925b79cfb3a9a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 09:48:22 -0400 Subject: [PATCH 1867/2369] python3-tifffile: update to 2022.5.4. --- 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 a3427332253..eee1d7dcc28 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.4.28 +version=2022.5.4 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=5ee740afa64bfc8da5b1e7badc5d4e20766f7631adb48792e5ee72978ba0fcff +checksum=352ed08a1b0d91bccd0246139da8eec9b98ed8f7dd6c3f548fe2940fb67541e2 # Tests require unpackaged fsspec make_check=no From 9f0266c4468bcc6dd5a23fa309b02ca6b7ee227f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 09:53:10 -0400 Subject: [PATCH 1868/2369] qtutilities: update to 6.6.1. --- srcpkgs/qtutilities/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template index d0e2622414d..07c824a44a0 100644 --- a/srcpkgs/qtutilities/template +++ b/srcpkgs/qtutilities/template @@ -1,17 +1,22 @@ # Template file for 'qtutilities' pkgname=qtutilities -version=6.6.0 +version=6.6.1 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" hostmakedepends="qt5-qmake qt5-host-tools" makedepends="qt5-tools-devel cpp-utilities-devel" +checkdepends="xvfb-run" short_desc="Qt helper routines, including dialogs, widgets, and models" maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/qtutilities" distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz" -checksum=2dda37fd6e1cd957f0a2b395ce424ca23cfc893310c0cebc82d89dc960239d13 +checksum=118df63a255a181c14cf1588c6abddda73bc545125a8406aa8e0e4f9fa98a13d + +pre_check() { + ninja -C build tests +} qtutilities-devel_package() { short_desc+=" - development files" From 36faeb1e92f2258f8c30b93c03bef229dc33e222 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 09:54:02 -0400 Subject: [PATCH 1869/2369] tagparser: update to 11.2.0. --- srcpkgs/tagparser/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template index 494b83e203e..37fb00fc2c0 100644 --- a/srcpkgs/tagparser/template +++ b/srcpkgs/tagparser/template @@ -1,6 +1,6 @@ # Template file for 'tagparser' pkgname=tagparser -version=11.1.0 +version=11.2.0 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/tagparser" distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz" -checksum=dc3bd56ee7ddd3220062d2637b89dffc27747c3027c4b223a4697d693e55e2f1 +checksum=8f1ed6b15ec70f90d918c2c31f4ebbbca900cc8f35be76127d777316eb783f16 tagparser-devel_package() { short_desc+=" - development files" From 99eab171dd52e6ac340ae734c9a258c5ea227924 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 09:54:36 -0400 Subject: [PATCH 1870/2369] tageditor: update to 3.7.1. --- srcpkgs/tageditor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template index 0f9ad2024a6..a97acf3a24c 100644 --- a/srcpkgs/tageditor/template +++ b/srcpkgs/tageditor/template @@ -1,6 +1,6 @@ # Template file for 'tageditor' pkgname=tageditor -version=3.7.0 +version=3.7.1 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/tageditor" distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz" -checksum=e3814efdb9ca9bc386b51c602f8f4f507e8698ecdaf39a5849ed1795ddaa5c38 +checksum=df567627b91114da23664d4194f2fd2392cc24da7e59bd71e1e86f7638e2a5fb build_options="qt webengine webkit script" build_options_default="qt" From 01a88f3de539697fc11ec1a3de4ca424c873c340 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 12 May 2022 20:03:26 +0200 Subject: [PATCH 1871/2369] perl-LWP: update to 6.65. --- srcpkgs/perl-LWP/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template index a093660fbda..f61f2d0f0cb 100644 --- a/srcpkgs/perl-LWP/template +++ b/srcpkgs/perl-LWP/template @@ -1,6 +1,6 @@ # Template file for 'perl-LWP' pkgname=perl-LWP -version=6.64 +version=6.65 revision=1 wrksrc="libwww-perl-${version}" build_style=perl-module @@ -17,4 +17,4 @@ maintainer="Leah Neukirchen " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/libwww-perl" distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz" -checksum=48335e0992b4875bd73c6661439f3506c2c6d92b5dd601582b8dc22e767d3dae +checksum=ae048023d275e1d6ad72882fa8b818f6e16d18d9cbda1f6f8e4012b93d4c834c From 52d91a0f0230c6f245b3608bcdb74162b9cb7b11 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 12 May 2022 20:05:21 +0200 Subject: [PATCH 1872/2369] janet: update to 1.22.0. --- common/shlibs | 2 +- srcpkgs/janet/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index d75ecdda38d..680ab792051 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3904,7 +3904,7 @@ libcaribou.so.0 libcaribou-0.4.21_3 libtinyclipboard.so.1 tinyclipboard-16.01_1 libcbor.so.0.9 libcbor-0.9.0_1 libfido2.so.1 libfido2-1.6.0_2 -libjanet.so.1.21 janet-1.21.1_1 +libjanet.so.1.22 janet-1.22.0_1 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1 libcbang0.so cbang-1.6.0_3 libblosc.so.1 c-blosc-1.17.1_1 diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template index 8c3612e4dd7..83a1f7fb3d1 100644 --- a/srcpkgs/janet/template +++ b/srcpkgs/janet/template @@ -1,6 +1,6 @@ # Template file for 'janet' pkgname=janet -version=1.21.2 +version=1.22.0 revision=1 build_style=meson configure_args="-Db_lto=false" # breaks jpm @@ -10,7 +10,7 @@ license="MIT" homepage="https://janet-lang.org/" changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md" distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz" -checksum=52db8d18f93351256d0731810e8bea95516db8142f51eeb31664f7884bf63088 +checksum=7c6969f8e82badc7afa28aa1054555c1c91d2858f9f45c41a82557f5c5ce85bd post_install() { vlicense LICENSE From d7818a76d9bb7f766f9121067901571217ae4847 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 12 May 2022 21:00:44 +0200 Subject: [PATCH 1873/2369] lagrange: update to 1.13.4. --- srcpkgs/lagrange/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template index a430d64fda4..fad02e8df15 100644 --- a/srcpkgs/lagrange/template +++ b/srcpkgs/lagrange/template @@ -1,6 +1,6 @@ # Template file for 'lagrange' pkgname=lagrange -version=1.13.3 +version=1.13.4 revision=1 build_style=cmake hostmakedepends="pkg-config zip" @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://gmi.skyjake.fi/lagrange/" changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi" distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz" -checksum=a25c48bb4c5c9eb81ba0e93609a5b0e350194eddab27bc55a5b86ae7b749259b +checksum=3bd9c3c370f23da3d2ae63d6560721799a07c05fab6c7b8c592e7e8b2e8d4434 post_install() { vlicense LICENSE.md From e24f2b9b9449e24abfa67031b589d4d03768ac09 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 12 May 2022 21:07:54 +0200 Subject: [PATCH 1874/2369] mpdevil: update to 1.7.0. --- srcpkgs/mpdevil/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/mpdevil/template b/srcpkgs/mpdevil/template index 348f570c274..4cf34103022 100644 --- a/srcpkgs/mpdevil/template +++ b/srcpkgs/mpdevil/template @@ -1,13 +1,13 @@ # Template file for 'mpdevil' pkgname=mpdevil -version=1.4.1 +version=1.7.0 revision=1 -build_style=python3-module -hostmakedepends="python3-BeautifulSoup4 python3-mpd2 python3-requests python3-gobject intltool python3-distutils-extra" -depends="python3-BeautifulSoup4 python3-mpd2 python3-requests python3-gobject" +build_style=meson +hostmakedepends="gettext pkg-config glib-devel" +depends="python3-mpd2 python3-gobject gtk+3" short_desc="Simple music browser for MPD" maintainer="Michal Vasilek " license="GPL-3.0-or-later" homepage="https://github.com/SoongNoonien/mpdevil/" distfiles="https://github.com/SoongNoonien/mpdevil/archive/refs/tags/v$version.tar.gz" -checksum=6402fbc18dcefdd2e967f45690ea325112760cf9a87c644f3880ae14a654441d +checksum=5821963a766d1ed35a96200d1d7153176e47c361579d70a9822377f8b1df2718 From 26a0383cf150491d55bf322164ae4e849fdc6619 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Thu, 12 May 2022 12:52:28 +0200 Subject: [PATCH 1875/2369] pipe-viewer: update to 0.2.1 --- srcpkgs/pipe-viewer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template index 670d4181ab1..1b6091d47ff 100644 --- a/srcpkgs/pipe-viewer/template +++ b/srcpkgs/pipe-viewer/template @@ -1,6 +1,6 @@ # Template file for 'pipe-viewer' pkgname=pipe-viewer -version=0.2.0 +version=0.2.1 revision=1 build_style=perl-ModuleBuild configure_args="--gtk" @@ -14,7 +14,7 @@ license="Artistic-2.0" homepage="https://github.com/trizen/pipe-viewer" changelog="https://github.com/trizen/pipe-viewer/releases" distfiles="https://github.com/trizen/pipe-viewer/archive/${version}.tar.gz" -checksum=3913ecfaa3006f645603fb76df9962829138ca62d4b0acaf8b8d4d2e58902f64 +checksum=683b817415186f63cc0f7e0540a3935d965cf470d429525d17e1cefb2de22353 pipe-viewer-gtk_package() { depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir" From 69810f63cf839400d262d36e62ecde806671105c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 12 May 2022 22:52:22 +0200 Subject: [PATCH 1876/2369] nocache: update to 1.2. --- srcpkgs/nocache/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nocache/template b/srcpkgs/nocache/template index 1c4198631e7..b864dbd5c6f 100644 --- a/srcpkgs/nocache/template +++ b/srcpkgs/nocache/template @@ -1,17 +1,19 @@ # Template file for 'nocache' pkgname=nocache -version=1.1 +version=1.2 revision=1 build_style=gnu-makefile +make_check_target="test" +checkdepends="perl" short_desc="Minimize filesystem caching effects" maintainer="Duncaen " license="BSD-2-Clause" homepage="https://github.com/Feh/nocache" distfiles="https://github.com/Feh/nocache/archive/v${version}.tar.gz" -checksum=e5441b27f60e1af5551b76fe0c8a9da17b8c31675794d9d49bf59c7c47fbb9b9 +checksum=2f8c6adbc82da4477416e1eaf9d435cf52f602d07064602f433d4ba4ecad5fdd pre_build() { - sed -i -e '/#include /d' cachedel.c cachestats.c + vsed -e '/#include /d' -i cachedel.c -i cachestats.c } post_install() { From e263aac50e0c39da55b5be445ab2d5831fcf1d80 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 12 May 2022 20:31:00 -0400 Subject: [PATCH 1877/2369] Revert "python3-matplotlib: update to 3.5.2." This update breaks event-loop integration with IPython, preventing figures from updating without manually calling a draw function. This reverts commit 69d5ad4bc9acd55d6190dcd4ea939eb6aefef0e3. --- srcpkgs/python3-matplotlib/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template index e4e03bc540b..e4d44cb11ed 100644 --- a/srcpkgs/python3-matplotlib/template +++ b/srcpkgs/python3-matplotlib/template @@ -1,7 +1,8 @@ # Template file for 'python3-matplotlib' pkgname=python3-matplotlib -version=3.5.2 -revision=1 +reverts="3.5.2_1" +version=3.5.1 +revision=2 wrksrc="matplotlib-${version}" build_style=python3-module build_helper="numpy" @@ -14,7 +15,7 @@ maintainer="Andrew J. Hesford " license="custom:matplotlib, BSD-3-Clause, MIT" homepage="https://matplotlib.org/" distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz" -checksum=c81325d1b0d822ef75fd71d243f98478cdca1f800a838a2a1bc8e4e17b8df93c +checksum=9683da9a0c84d1c42d1bf92ecf6e012d302406a38fd987e3dfbcb7b58b2eea2d replaces="python3-matplotlib-data>=0" # Comparison of images is too frail for validation make_check="no" From 966bc8c97c3a5b8269d60eeb9de08f74e0910e21 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 13 May 2022 10:45:02 +0200 Subject: [PATCH 1878/2369] lagrange: disable SSE4.1 --- srcpkgs/lagrange/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template index fad02e8df15..584682270b7 100644 --- a/srcpkgs/lagrange/template +++ b/srcpkgs/lagrange/template @@ -1,8 +1,9 @@ # Template file for 'lagrange' pkgname=lagrange version=1.13.4 -revision=1 +revision=2 build_style=cmake +configure_args="-DTFDN_ENABLE_SSE41=NO" hostmakedepends="pkg-config zip" makedepends="pcre-devel SDL2-devel openssl-devel zlib-devel libunistring-devel mpg123-devel libcurl-devel fribidi-devel harfbuzz-devel libwebp-devel" From f4f1d9d3060d0f548ebf985e383fb8526a4f01b0 Mon Sep 17 00:00:00 2001 From: zenobit Date: Mon, 9 May 2022 20:36:08 +0200 Subject: [PATCH 1879/2369] lazydocker: update to 0.18.1 --- srcpkgs/lazydocker/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template index caf9198328f..50a36c7a589 100644 --- a/srcpkgs/lazydocker/template +++ b/srcpkgs/lazydocker/template @@ -1,17 +1,18 @@ # Template file for 'lazydocker' pkgname=lazydocker -version=0.13 +version=0.18.1 revision=1 wrksrc="lazydocker-${version}" build_style=go go_import_path=github.com/jesseduffield/lazydocker +go_ldflags="-X main.version=${version}" depends="docker docker-compose" short_desc="Simple terminal UI for docker and docker-compose, written in Go" maintainer="Benjamín Albiñana " license="MIT" homepage="https://github.com/jesseduffield/lazydocker" distfiles="https://github.com/jesseduffield/lazydocker/archive/v${version}.tar.gz" -checksum=4328ddcb3156ff57c1e21c0d2f9d9d67d48237a386d338f1d68831b6056dfe3e +checksum=f5081b846d530818e1f04b9e8479c801f287ac77ebdf063425a142ff50fc395b post_install() { vlicense LICENSE From e24ac077d6fe522d191d55c50de6659347229f9c Mon Sep 17 00:00:00 2001 From: akierig Date: Thu, 5 May 2022 15:18:37 -0500 Subject: [PATCH 1880/2369] Signal-Desktop: update to 5.43.0, adopt --- srcpkgs/Signal-Desktop/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template index 43e11503bd5..aee39932147 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.41.0 +version=5.43.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 @@ -10,11 +10,11 @@ archs="x86_64" hostmakedepends="git git-lfs nodejs python3 tar yarn" depends="cairo gtk+3 libvips pango" short_desc="Signal Private Messenger for Linux" -maintainer="Orphaned " +maintainer="akierig " 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=55a201912f5a41c1a76d210d3942078e734ac619df7ffb56083149ce4995e949 +checksum=9239dfc0356cec3c0aaea93e09d0ac44030037f24c1dcc3725e1e417c74af419 nostrip_files="signal-desktop" post_extract() { From 7197840f3a705ae582ca83073ee7ac7ec70a1f8a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 13 May 2022 13:25:00 +0200 Subject: [PATCH 1881/2369] linux5.10: update to 5.10.115. --- srcpkgs/linux5.10/files/i386-dotconfig | 5 ++--- srcpkgs/linux5.10/files/ppc-dotconfig | 4 ++-- srcpkgs/linux5.10/files/ppc64-dotconfig | 5 ++--- srcpkgs/linux5.10/files/ppc64le-dotconfig | 5 ++--- srcpkgs/linux5.10/files/x86_64-dotconfig | 5 ++--- srcpkgs/linux5.10/template | 4 ++-- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig index e3ea24162dc..70d61a837ef 100644 --- a/srcpkgs/linux5.10/files/i386-dotconfig +++ b/srcpkgs/linux5.10/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 5.10.99 Kernel Configuration +# Linux/i386 5.10.115 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2237,6 +2237,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3563,8 +3564,6 @@ CONFIG_HYPERV_NET=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig index 078ffac9ee0..4e8adac5af1 100644 --- a/srcpkgs/linux5.10/files/ppc-dotconfig +++ b/srcpkgs/linux5.10/files/ppc-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.10.99 Kernel Configuration +# Linux/powerpc 5.10.115 Kernel Configuration # CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -1815,6 +1815,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_MAC_FLOPPY=y CONFIG_CDROM=m # CONFIG_PARIDE is not set @@ -3139,7 +3140,6 @@ CONFIG_MISDN_W6692=m # CONFIG_MISDN_NETJET is not set CONFIG_MISDN_IPAC=m CONFIG_MISDN_ISAR=m -# CONFIG_NVM is not set # # Input device support diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig index 5d973825057..7227a355e3c 100644 --- a/srcpkgs/linux5.10/files/ppc64-dotconfig +++ b/srcpkgs/linux5.10/files/ppc64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.10.99 Kernel Configuration +# Linux/powerpc 5.10.115 Kernel Configuration # CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2243,6 +2243,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3640,8 +3641,6 @@ CONFIG_USB4_NET=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig index a5158c12dd3..de9c8c54e6a 100644 --- a/srcpkgs/linux5.10/files/ppc64le-dotconfig +++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.10.99 Kernel Configuration +# Linux/powerpc 5.10.115 Kernel Configuration # CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2143,6 +2143,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3475,8 +3476,6 @@ CONFIG_USB4_NET=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig index fa04bb81b4d..1a5057ad023 100644 --- a/srcpkgs/linux5.10/files/x86_64-dotconfig +++ b/srcpkgs/linux5.10/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.10.99 Kernel Configuration +# Linux/x86_64 5.10.115 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2297,6 +2297,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3635,8 +3636,6 @@ CONFIG_HYPERV_NET=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template index e2bf0b9cae3..c5bd16c1ade 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.113 +version=5.10.115 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=82516a02bb52456f6e8057217dde6e02b78003b1e058117557c2ae9661696dfc +checksum=f5e417b32f89318b6d0a230109a592ffd68997817463dc4692fa49ec7fe42f71 python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR. From 9bcbb33d65120e02ed4550be8c1b22f0b3298cca Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 13 May 2022 13:39:37 +0200 Subject: [PATCH 1882/2369] linux5.15: update to 5.15.39. --- srcpkgs/linux5.15/files/i386-dotconfig | 30 ++++++++++------------- srcpkgs/linux5.15/files/ppc-dotconfig | 24 +++++++++--------- srcpkgs/linux5.15/files/ppc64-dotconfig | 22 ++++++++--------- srcpkgs/linux5.15/files/ppc64le-dotconfig | 22 ++++++++--------- srcpkgs/linux5.15/files/x86_64-dotconfig | 25 ++++++++++--------- srcpkgs/linux5.15/template | 4 +-- 6 files changed, 62 insertions(+), 65 deletions(-) diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig index db7fdf4d3bb..0e497896cbb 100644 --- a/srcpkgs/linux5.15/files/i386-dotconfig +++ b/srcpkgs/linux5.15/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 5.15.22 Kernel Configuration +# Linux/i386 5.15.39 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2312,6 +2312,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -2934,6 +2935,7 @@ CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m CONFIG_ALX=m +CONFIG_CX_ECAT=m CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y @@ -2952,8 +2954,6 @@ CONFIG_BNXT_SRIOV=y CONFIG_BNXT_FLOWER_OFFLOAD=y CONFIG_BNXT_DCB=y CONFIG_BNXT_HWMON=y -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m CONFIG_NET_VENDOR_CADENCE=y CONFIG_MACB=m CONFIG_MACB_USE_HWSTAMP=y @@ -2973,7 +2973,6 @@ CONFIG_CHELSIO_TLS_DEVICE=m CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m CONFIG_NET_VENDOR_CORTINA=y -CONFIG_CX_ECAT=m CONFIG_DNET=m CONFIG_NET_VENDOR_DEC=y CONFIG_NET_TULIP=y @@ -3027,7 +3026,6 @@ CONFIG_I40EVF=m # CONFIG_ICE is not set CONFIG_FM10K=m CONFIG_IGC=m -CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_JME=m CONFIG_NET_VENDOR_LITEX=y CONFIG_NET_VENDOR_MARVELL=y @@ -3083,9 +3081,12 @@ CONFIG_ENC28J60=m CONFIG_ENCX24J600=m # CONFIG_LAN743X is not set CONFIG_NET_VENDOR_MICROSEMI=y +CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NI=y +CONFIG_NI_XGE_MANAGEMENT_ENET=m CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m @@ -3098,8 +3099,6 @@ CONFIG_NFP=m # CONFIG_NFP_APP_FLOWER is not set CONFIG_NFP_APP_ABM_NIC=y # CONFIG_NFP_DEBUG is not set -CONFIG_NET_VENDOR_NI=y -CONFIG_NI_XGE_MANAGEMENT_ENET=m CONFIG_NET_VENDOR_8390=y CONFIG_NE2K_PCI=m CONFIG_NET_VENDOR_NVIDIA=y @@ -3125,6 +3124,8 @@ CONFIG_QEDE=m CONFIG_QED_ISCSI=y CONFIG_QED_FCOE=y CONFIG_QED_OOO=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_QCOM_EMAC=m CONFIG_RMNET=m @@ -3145,6 +3146,11 @@ CONFIG_ROCKER=m CONFIG_NET_VENDOR_SAMSUNG=y CONFIG_SXGBE_ETH=m CONFIG_NET_VENDOR_SEEQ=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_SFC=m CONFIG_SFC_MTD=y @@ -3153,11 +3159,6 @@ CONFIG_SFC_SRIOV=y CONFIG_SFC_MCDI_LOGGING=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -CONFIG_SIS900=m -CONFIG_SIS190=m CONFIG_NET_VENDOR_SMSC=y CONFIG_EPIC100=m CONFIG_SMSC911X=m @@ -4832,15 +4833,11 @@ CONFIG_DEVFREQ_THERMAL=y CONFIG_INTEL_POWERCLAMP=m CONFIG_X86_THERMAL_VECTOR=y CONFIG_X86_PKG_TEMP_THERMAL=m -CONFIG_INTEL_SOC_DTS_IOSF_CORE=m # CONFIG_INTEL_SOC_DTS_THERMAL is not set # # ACPI INT340X thermal drivers # -CONFIG_INT340X_THERMAL=m -CONFIG_ACPI_THERMAL_REL=m -CONFIG_INT3406_THERMAL=m # end of ACPI INT340X thermal drivers CONFIG_INTEL_PCH_THERMAL=m @@ -9955,7 +9952,6 @@ CONFIG_STRIP_ASM_SYMS=y # CONFIG_HEADERS_INSTALL is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y -# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set CONFIG_FRAME_POINTER=y # CONFIG_VMLINUX_MAP is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set diff --git a/srcpkgs/linux5.15/files/ppc-dotconfig b/srcpkgs/linux5.15/files/ppc-dotconfig index 6ca79da6044..ad1e046893d 100644 --- a/srcpkgs/linux5.15/files/ppc-dotconfig +++ b/srcpkgs/linux5.15/files/ppc-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.15.22 Kernel Configuration +# Linux/powerpc 5.15.39 Kernel Configuration # CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -1865,7 +1865,6 @@ CONFIG_OF_EARLY_FLATTREE=y CONFIG_OF_KOBJ=y CONFIG_OF_ADDRESS=y CONFIG_OF_IRQ=y -CONFIG_OF_NET=y CONFIG_OF_RESERVED_MEM=y # CONFIG_OF_OVERLAY is not set CONFIG_OF_DMA_DEFAULT_COHERENT=y @@ -1882,6 +1881,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_MAC_FLOPPY=y CONFIG_CDROM=m # CONFIG_PARIDE is not set @@ -2479,8 +2479,6 @@ CONFIG_BNXT_SRIOV=y CONFIG_BNXT_FLOWER_OFFLOAD=y CONFIG_BNXT_DCB=y CONFIG_BNXT_HWMON=y -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m CONFIG_NET_VENDOR_CADENCE=y # CONFIG_MACB is not set CONFIG_NET_VENDOR_CAVIUM=y @@ -2566,7 +2564,6 @@ CONFIG_I40EVF=m CONFIG_ICE=m # CONFIG_FM10K is not set CONFIG_IGC=m -CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_JME=m CONFIG_NET_VENDOR_LITEX=y CONFIG_LITEX_LITEETH=m @@ -2608,9 +2605,12 @@ CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_ENCX24J600 is not set CONFIG_LAN743X=m CONFIG_NET_VENDOR_MICROSEMI=y +CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NI=y +# CONFIG_NI_XGE_MANAGEMENT_ENET is not set CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m @@ -2621,8 +2621,6 @@ CONFIG_VXGE=m CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NFP=m # CONFIG_NFP_DEBUG is not set -CONFIG_NET_VENDOR_NI=y -# CONFIG_NI_XGE_MANAGEMENT_ENET is not set CONFIG_NET_VENDOR_8390=y CONFIG_PCMCIA_AXNET=m CONFIG_NE2K_PCI=m @@ -2649,6 +2647,8 @@ CONFIG_QEDE=m CONFIG_QED_ISCSI=y CONFIG_QED_FCOE=y CONFIG_QED_OOO=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m CONFIG_NET_VENDOR_QUALCOMM=y # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set @@ -2669,17 +2669,17 @@ CONFIG_NET_VENDOR_ROCKER=y CONFIG_NET_VENDOR_SAMSUNG=y # CONFIG_SXGBE_ETH is not set # CONFIG_NET_VENDOR_SEEQ is not set +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_SFC=m CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y CONFIG_SFC_MCDI_LOGGING=y CONFIG_SFC_FALCON=m -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -CONFIG_SIS900=m -CONFIG_SIS190=m CONFIG_NET_VENDOR_SMSC=y CONFIG_PCMCIA_SMC91C92=m CONFIG_EPIC100=m diff --git a/srcpkgs/linux5.15/files/ppc64-dotconfig b/srcpkgs/linux5.15/files/ppc64-dotconfig index 355ff2fa768..6e196ad358c 100644 --- a/srcpkgs/linux5.15/files/ppc64-dotconfig +++ b/srcpkgs/linux5.15/files/ppc64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.15.22 Kernel Configuration +# Linux/powerpc 5.15.39 Kernel Configuration # CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2310,7 +2310,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 @@ -2328,6 +2327,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -2967,8 +2967,6 @@ CONFIG_BNXT_SRIOV=y CONFIG_BNXT_FLOWER_OFFLOAD=y CONFIG_BNXT_DCB=y CONFIG_BNXT_HWMON=y -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m CONFIG_NET_VENDOR_CADENCE=y CONFIG_MACB=m CONFIG_MACB_USE_HWSTAMP=y @@ -3073,7 +3071,6 @@ CONFIG_I40EVF=m CONFIG_ICE=m CONFIG_FM10K=m CONFIG_IGC=m -CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_JME=m CONFIG_NET_VENDOR_LITEX=y CONFIG_LITEX_LITEETH=m @@ -3130,9 +3127,11 @@ CONFIG_ENCX24J600=m CONFIG_LAN743X=m CONFIG_NET_VENDOR_MICROSEMI=y # CONFIG_MSCC_OCELOT_SWITCH is not set +CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_FEALNX=m +# CONFIG_NET_VENDOR_NI is not set CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m @@ -3145,7 +3144,6 @@ CONFIG_NFP=m # CONFIG_NFP_APP_FLOWER is not set CONFIG_NFP_APP_ABM_NIC=y # CONFIG_NFP_DEBUG is not set -# CONFIG_NET_VENDOR_NI is not set CONFIG_NET_VENDOR_8390=y CONFIG_PCMCIA_AXNET=m CONFIG_NE2K_PCI=m @@ -3176,6 +3174,8 @@ CONFIG_QED_RDMA=y CONFIG_QED_ISCSI=y CONFIG_QED_FCOE=y CONFIG_QED_OOO=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_QCA7000=m CONFIG_QCA7000_SPI=m @@ -3198,6 +3198,11 @@ CONFIG_ROCKER=m CONFIG_NET_VENDOR_SAMSUNG=y CONFIG_SXGBE_ETH=m CONFIG_NET_VENDOR_SEEQ=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_SFC=m CONFIG_SFC_MTD=y @@ -3206,11 +3211,6 @@ CONFIG_SFC_SRIOV=y CONFIG_SFC_MCDI_LOGGING=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -CONFIG_SIS900=m -CONFIG_SIS190=m CONFIG_NET_VENDOR_SMSC=y CONFIG_PCMCIA_SMC91C92=m CONFIG_EPIC100=m diff --git a/srcpkgs/linux5.15/files/ppc64le-dotconfig b/srcpkgs/linux5.15/files/ppc64le-dotconfig index 5148c4e5cf5..fb902ca0b43 100644 --- a/srcpkgs/linux5.15/files/ppc64le-dotconfig +++ b/srcpkgs/linux5.15/files/ppc64le-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.15.22 Kernel Configuration +# Linux/powerpc 5.15.39 Kernel Configuration # CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2207,7 +2207,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 @@ -2224,6 +2223,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -2844,8 +2844,6 @@ CONFIG_BNXT_SRIOV=y CONFIG_BNXT_FLOWER_OFFLOAD=y CONFIG_BNXT_DCB=y CONFIG_BNXT_HWMON=y -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m CONFIG_NET_VENDOR_CADENCE=y CONFIG_MACB=m CONFIG_MACB_USE_HWSTAMP=y @@ -2926,7 +2924,6 @@ CONFIG_I40EVF=m CONFIG_ICE=m CONFIG_FM10K=m CONFIG_IGC=m -CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_JME=m CONFIG_NET_VENDOR_LITEX=y CONFIG_LITEX_LITEETH=m @@ -2983,9 +2980,11 @@ CONFIG_ENCX24J600=m CONFIG_LAN743X=m CONFIG_NET_VENDOR_MICROSEMI=y # CONFIG_MSCC_OCELOT_SWITCH is not set +CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_FEALNX=m +# CONFIG_NET_VENDOR_NI is not set CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m @@ -2998,7 +2997,6 @@ CONFIG_NFP=m # CONFIG_NFP_APP_FLOWER is not set CONFIG_NFP_APP_ABM_NIC=y # CONFIG_NFP_DEBUG is not set -# CONFIG_NET_VENDOR_NI is not set CONFIG_NET_VENDOR_8390=y CONFIG_NE2K_PCI=m CONFIG_NET_VENDOR_NVIDIA=y @@ -3025,6 +3023,8 @@ CONFIG_QED_RDMA=y CONFIG_QED_ISCSI=y CONFIG_QED_FCOE=y CONFIG_QED_OOO=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_QCA7000=m CONFIG_QCA7000_SPI=m @@ -3047,6 +3047,11 @@ CONFIG_ROCKER=m CONFIG_NET_VENDOR_SAMSUNG=y CONFIG_SXGBE_ETH=m CONFIG_NET_VENDOR_SEEQ=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_SFC=m CONFIG_SFC_MTD=y @@ -3055,11 +3060,6 @@ CONFIG_SFC_SRIOV=y CONFIG_SFC_MCDI_LOGGING=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -CONFIG_SIS900=m -CONFIG_SIS190=m CONFIG_NET_VENDOR_SMSC=y CONFIG_EPIC100=m CONFIG_SMSC911X=m diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig index 225e5c5022e..32714ae9663 100644 --- a/srcpkgs/linux5.15/files/x86_64-dotconfig +++ b/srcpkgs/linux5.15/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.15.22 Kernel Configuration +# Linux/x86_64 5.15.39 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2376,6 +2376,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -2991,6 +2992,7 @@ CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m CONFIG_ALX=m +CONFIG_CX_ECAT=m CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y @@ -3009,8 +3011,6 @@ CONFIG_BNXT_SRIOV=y CONFIG_BNXT_FLOWER_OFFLOAD=y CONFIG_BNXT_DCB=y CONFIG_BNXT_HWMON=y -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m CONFIG_NET_VENDOR_CADENCE=y CONFIG_MACB=m CONFIG_MACB_USE_HWSTAMP=y @@ -3037,7 +3037,6 @@ CONFIG_CHELSIO_TLS_DEVICE=m CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m CONFIG_NET_VENDOR_CORTINA=y -CONFIG_CX_ECAT=m CONFIG_DNET=m CONFIG_NET_VENDOR_DEC=y CONFIG_NET_TULIP=y @@ -3093,8 +3092,6 @@ CONFIG_I40EVF=m CONFIG_ICE=m CONFIG_FM10K=m CONFIG_IGC=m -CONFIG_NET_VENDOR_MICROSOFT=y -CONFIG_MICROSOFT_MANA=m CONFIG_JME=m CONFIG_NET_VENDOR_LITEX=y CONFIG_NET_VENDOR_MARVELL=y @@ -3151,10 +3148,13 @@ CONFIG_ENCX24J600=m CONFIG_LAN743X=m CONFIG_NET_VENDOR_MICROSEMI=y CONFIG_MSCC_OCELOT_SWITCH_LIB=m +CONFIG_NET_VENDOR_MICROSOFT=y +CONFIG_MICROSOFT_MANA=m CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y CONFIG_FEALNX=m +# CONFIG_NET_VENDOR_NI is not set CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m @@ -3167,7 +3167,6 @@ CONFIG_NFP=m # CONFIG_NFP_APP_FLOWER is not set CONFIG_NFP_APP_ABM_NIC=y # CONFIG_NFP_DEBUG is not set -# CONFIG_NET_VENDOR_NI is not set CONFIG_NET_VENDOR_8390=y CONFIG_NE2K_PCI=m CONFIG_NET_VENDOR_NVIDIA=y @@ -3194,6 +3193,8 @@ CONFIG_QED_RDMA=y CONFIG_QED_ISCSI=y CONFIG_QED_FCOE=y CONFIG_QED_OOO=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_QCOM_EMAC=m CONFIG_RMNET=m @@ -3214,6 +3215,11 @@ CONFIG_ROCKER=m CONFIG_NET_VENDOR_SAMSUNG=y CONFIG_SXGBE_ETH=m CONFIG_NET_VENDOR_SEEQ=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_SFC=m CONFIG_SFC_MTD=y @@ -3222,11 +3228,6 @@ CONFIG_SFC_SRIOV=y CONFIG_SFC_MCDI_LOGGING=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -CONFIG_SIS900=m -CONFIG_SIS190=m CONFIG_NET_VENDOR_SMSC=y CONFIG_EPIC100=m CONFIG_SMSC911X=m diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template index ae0410039d0..9f2e16a7392 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.36 +version=5.15.39 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 - a40a27adb37c5ac569428c517f3eb51ce1148258db5b8a42aadb79128197d4a0" + b773d0ca695b0dbe1254f13396ae71120cb1e662fa89a698b29d828ba13a4b73" skip_extraction="patch-${version}.xz" python_version=3 From c969d4d986ef791c798dd98f3e149b930d503aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 13 May 2022 10:05:35 -0300 Subject: [PATCH 1883/2369] arduino-cli: update to 0.22.0. --- srcpkgs/arduino-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template index 832daeaf282..0653103ac37 100644 --- a/srcpkgs/arduino-cli/template +++ b/srcpkgs/arduino-cli/template @@ -1,6 +1,6 @@ # Template file for 'arduino-cli' pkgname=arduino-cli -version=0.19.0 +version=0.22.0 revision=1 build_helper=qemu build_style=go @@ -11,7 +11,7 @@ maintainer="Henry Naguski " license="GPL-3.0-or-later" homepage="https://github.com/arduino/arduino-cli" distfiles="https://github.com/arduino/arduino-cli/archive/${version}.tar.gz" -checksum=2828bcfc113a45dd486e72968092967ce90dcd15aaaa5ca9b96863e8ec7dbc7f +checksum=9b6bc045a0dbe8d34d90adbc5d32fdb29b1f1303c50c5893e47a2f2a517273e6 case "$XBPS_TARGET_MACHINE" in # the downloaded toolchains use glibc, this allows them to work on musl From a426162dab3ab6ffb24531a3870c6482195f256f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 13 May 2022 10:14:28 -0300 Subject: [PATCH 1884/2369] thunderbird: update to 91.9.0. --- srcpkgs/thunderbird/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index bf03d0a2eb6..d27434e30e2 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=91.8.0 +version=91.9.0 revision=1 build_helper="rust" short_desc="Standalone Mail/News reader" @@ -11,7 +11,7 @@ maintainer="Érico Nogueira " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.thunderbird.net/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=4a93d1773e17aa110341428165581f0176c347d55dd7f6cbed789ca8369da6fa +checksum=616e48327c4b0cdd2fd3c6385bfa4d380ba5cc7c52ce6014ae39d389a19fd092 lib32disabled=yes From b581872c4ad200b8c167efd6745d32549a0487a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 13 May 2022 10:14:32 -0300 Subject: [PATCH 1885/2369] thunderbird-i18n: update to 91.9.0. --- srcpkgs/thunderbird-i18n/template | 110 +++++++++++++++--------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index 0a299d66d96..b0492b7682f 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,6 +1,6 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=91.8.0 +version=91.9.0 revision=1 build_style=meta short_desc="Thunderbird language packs" @@ -95,57 +95,57 @@ _pkgtmpl() { } } -checksum="e338b3f00ce13b8b98213d9fb53dbdeaef8082517a2cda06a62c59d8f4021e1e - 0c6339b23d2de88b0cea5473289c05820d44fd89999037285ed19b6394e5d221 - 4f8254201247e6d8e01924715d101e4bce8f53d3799f129a0003b528cd994839 - f7c99eb62ab9ade49d2022edca802b4ebbdf53a753c378315cccf9bf2126bff3 - 13191acb9cec0bdd45527e09e1f28205fad9e4b67682018f9f0aa6d096b40a7d - 08e7f631467b5b1aca8d35c38936c854c3b8bbba975d1b30b5d43637e1b1cc3d - 8b40a658dd14af8b268bef3ae656524165c9e432f2df882c21a083b477379a76 - 68247d9f9e33f803446ba4c114d5db8173dc46aa93bf06c828a2d154c69e4ce6 - da155c974f591a6f7b29f42ddb82ed94fee8db34b0b7c67a18d747c38138fb7b - 3cf905249aeb0676d8a6206746c1d0ee03fba579bd39d9ec8e9cdc8a23ba6232 - 2afa46cf5301607dc1b18933bd3877842ffcb86563bb8ddf859114aa74bacf1c - d437fd884c900cdce7c22bfdf445819ebe8f27d6d2b32392e6ab4291188403b5 - 458ff1cd1a3a3357d6592f04fadc5bb6c06a1a8ae4e095de599c0a4b4f3f4c39 - 5a3cc430c53f3a2e7258be9c4dc90002e74b1df4fedd57d748034facdf09462f - aa41718568841dd4b2487023d7c68b88a7d4cce6634c2c8b2af5a5024e910491 - 8e08fca9f5b4284cd78cd80f54f2005cfaa9db9b2df596aabff3cf85fed3b032 - 00647c73c5d834c2daa7b1c04c152ba70e530f8917a88b48b876634e6735a08d - 3b367c2aeb5c0b7e7158570cba56473f36f0e4e2105528f6cff6424a8bb1b188 - 602f80592d721c0d1157845c9cf83547b4497842cfd37ae5466190d5f89fc2ca - 310a50fbd029f0bbb5d7b3b80b9f0882ddf03667caa2c93a1f2c878c32bd1404 - cf75c1a2992d11b2ea5f4160d34f793fd00d7eae2c3604fe35a96303bdd5b6d0 - 39255ccf6c1661287fab017e95a3c1eb74619d408bdce09dd359fd58f2303ca4 - 41e9b2df204081b13ff2adb391f0414b2b0ba4bf83bf2118a30c21265b19983e - f6be5a2cf4006b31459a887e14f69e61505e3577ece674e81356ae53b025b4ab - 22575da8459ceb57e1dd3e02c9a5e7219b894767438d810b94dfd6c4e97bb3ae - 27487ba8f1115f1aff0245629fdc1b785391d5af98521e58937677f173eb0f45 - 666bd43ccbdb37f097477273aa8ca11b9716c024f8c162bb81a1b07006044bc0 - 1907c178beac70dafdab55acbc87e56a9913142ffaa85be6cbe541361d53d24c - 20e7464b43f12dcdcb3892a6e9c7d7c46a2385a82953c388599cbeeabc362786 - 6a7e2ee51d92aa5db52816de0dbf103ce2abf40a34411498fb7b2380dc87101d - 2d2be878ba6d5afcb6823f58a6939ebe895290a925b13234ed2c63d013ad5165 - d329c730c338b7d9e4a3fc07fae4537dd0be0b86317db42b1270daaeb7025f98 - 51ead8dd506cc5aaf4dfb58be942b3061869c9c26bfec9b29930d0a627c32aa9 - ba4191dca0ec8a9eb70cc3d9d0a20d50fa87a5c0be3190db0ef5867532ef8318 - 4e849ddec5f68004315b93dc8e382774101a815e9bf476f10c8e804a9657aa2e - 04b06a1a5842962116ef0eae6dfa263197e04b5a560ce7386f786322b5199364 - 8f81e86174d6126e0e0551b1431713f09ca66e3dc546cd5a7838d17c2cddf52e - 1ca4983cf2de4a0ac8debdfba0c0e3844cd5020199f4ab054864dda7ae2170da - f625cda77e82c13e358d33df96d613ea8145a170b54ce399bfe960e0b88ef146 - 93b79805973de19cd0beaea81add9a0f40e3746b88648c6c7e90a0fbba857777 - 368b268f6b08b5e1d0f1ffeeb662ab4460bc3b60d6c3ced54a6efff44e6bec2e - 8de648e97c00fc1988ae5788944c3821304c49f49a669797e3bdc4c3637ff336 - 1489f343e79064d24549556f7d7164ea0e9e0e65256290f8287a00fdd256bd04 - 0f004c54f4fce861b709d6f0d394c6ebb01a16aedc29e6599f56c7d043e18936 - 8f7a814d8a47efa9fe1509b0ea450697e2e6007beb5b78e2937b3f2b133402b3 - 7db9b294668932d2e59309c452ab74d0d737eb6c8220f6fa5aafd7be66ea42dd - b9c81d14520928957f95e40faa80a8ed63e76758652fb3a73458a848d9703ac7 - 1129915d753dc68c4d4e23e6d4dea5de7c911f7d3204448b231f8755d7447c70 - 76badde28f93f4d8e05c163a357223bf1a85e9301cf6221b222553f637e33532 - c50d5aa28e33dee903a31b1ea73c01575d7d784cc86dfec0f853dc51e31bef40 - 6b897ca847c9d497895d2dc2164582836407902c2784219617ce14b80b140739 - 4cd25edb40fd1309d1121cb582001d580605eb12ec414fe4125d580b809927c9 - 2b822f814877d3b20ced442e466ff78cc0e2effa971b5e7b16ddd6bb9500c7c3 - b2962ead550ab841c4981a70a0f80f1baeb2d10165dc7536d069598643f3d4d5" +checksum="0ce1beef54dbedfa0805ac3f5cad1520f60acb09d2a39711fdb33532645e2924 + 6922131d1a57c6525a4ce4c495c809ecfe255f45c0b110dcccacf2137036153e + d039e0e8d4421c98eea04ca69fd48332c107ca3f57deec0b9985d8a3a60df5fa + 16a85769ebba4719732f10fde372c6363731d20ca228bd31d38db1b2dc7fe6e9 + 5363483b71670f2dd418519c5e0a7d9abb01057e15c7f5c3893285c478c9b7d5 + 7b49e28df13fc28691ab22223da98431f9b14c271a61fc863deda92512504d0f + acc349d2b4da8aeb7f554fe00efd75161919dde821b4dcb8170d7b74301a5274 + af60b34b9e7b6a04c67c0c105fc9a757409e1d15e8ba5ae59e1b57ec70c2afe1 + 99a7150815a0c8adf9eafa21779540ce08198f45a58566a4db149904659395bc + 6f5ac93dd4c69316ca3112db66c1da65a899ad94be13f135e96f4fca4b186a1a + 9adadd236b2095393ee811e0b952d70f034f816036dc90b31ca82cd3be4e2574 + 35654dc18ef7363eb6d603f229b8f53c2b0eb506bb4414b42699344887b18477 + e353e6d913c0b23863c3fcc1a91f37fb5cbeece2dcfbe4b45cad8d7673fa58d1 + da884de1c02b92b5421c84ffa9b3e83939add60cb2cb79336e5ba58e8ef74cd3 + cfae324fb7af7475baf1a7202e4da08dcfa422b09acc7fddde411322185ea5ce + b786362cf397dc5cec3d91ac592da033609c67a6d67a7e21a8133cdf52e9d604 + 0e04c656b7a14c3800286d95bd513eec63566e7ba28aefbd7cc55073395cd906 + e334ef8b569eb8eeaf8b95058b87c06c872edcda67cc5c7d3432b2021183469c + 001ae51d73e21e546da191b85596f3c33573cf1d81fc6141d329c9e6851e73c7 + 972803d21adf67fa61464f6f701a5f254fe223fc2e83e83cc3e2e47ecaa88be4 + c816a554eee3ebbbcde9efd991ca95c99d4402e87184ac13bb390c485048e9bb + 49328cf9998e464730a16dade381fbc8562457083fcdbe6a38814ef934a27d4e + 2039ca0bbaf1992d2709a010139106b09d38c32054402240e2e5cc66e6854598 + 744e711200cf8a568ad4200c3c5ce086798495874fb6f6581f1636f0bf8bbbfb + dc284a451c2bb8df5121edcc1b68c823f5f9210c7a97d162ecc5ab3575df1219 + 258b93a4bc5048c96e568f6d2bcd665ec8adfd47d82fd8247dd26bf9c6289f3c + e3b0cfdb2c428c3f6ba6dd589807245ed6cbfb6fe17cd27348a39e97151d2b40 + e9f5c2338acce514e958d7d9c77ad9428930f7ef9ba39291d7a2efe8045f3bf9 + 0ff0260f8a7456cee42b0528b45e3c9821cce159f8c81b057e53da027c6932e3 + aea0bec5ecbf61d6a44acc6c6946ebf002acc80c95c034f913a53d5ce28491c5 + 9f4982e6fa9c5deadf0f49116f79a5105ee5e9e623319e0a3f3fda6678a8ead4 + 893d5851100e2bfd462529bdb6fe8ab19c42cbebd7e02725d3ea79f9cccc0f16 + c44f697280b29c4961cb0f59dd4692068ba3bd80d56b3724288227bdbd227524 + c04195860e0871d89f7b8c0977d34a676746a8b504a1c871062f635c1000a9cb + 08dc12dc180c59fe76787243c292bd4896193d56940bda3ef6aa723c9fbb855f + 1cb6fdddb41a038f7eefc41af1a06d4da287a7d4ed958298799fdf724883cd19 + ece6218b8603fc7931bf2e3be52235b0448b0b418716c32323b9a118d9260f5c + 9e92c7a11b3e4d37d2377d5601a760f32ac79be0c7d2907a0cbabc340b141564 + dac4ae0c976d806f0a0e325405153e93cb37e31febb45d4fc03a3b8f1578fdbe + 62b63c940f24a826d538305a9d3e108308edaf4421aaff73c02e5fc03fbc2259 + 7eb08ab6108b8925229591368a33bb95dc880850860addaa914ea994f1e772c8 + b9b73326aef68b2b547b2654f995fce7e99c085e0c4ebea394ae276b0bc87c14 + d503a590b9e6b38b19574c71a95af806249f5ca7bab5a87256e6694bdcc17e08 + 30269418942d78ebc5560ffcb81bcf31d14a0579e356b14699af46af8c19da30 + 90113e8574ee41b463904012442bcd759147d6799ce743a9cbcf6860e6ae98b8 + a86cb03c5eb8bc498127c6453a306e46d089cce36b99dabc747e3696d0740463 + f014d4c67692dc424720f0ef23ac1f918a291cb904e31fd809bf4aff6c339c7e + fb1e4741305ec130ba7b06172ec34a08ca5b24c3e13a2e52249a21e1053482fd + 0d8120993a0430d3dacc71589495d1a9a811a8b17d2dd93cf2dc27e5613e2717 + 361835a4ae3117a1c34b782d47001c46d632d46674eb59b8ccfb168ccf53737b + f9410e78a0f43e4dfb06859aa84b2ddeceb8719552fb9cce41ba43a8f95f1805 + 4a1e7534982e55831056f0a59154c674025de11a332dbc083ad2fd66b9ea1e80 + e69994d2b0fd425ba0a73b0971358988ce7a0aa62fdc370a180175c0ff848fb0 + 2aedbe39ac0e555d0a27b6d266dc2e575dcb9e5ba057cf05dd6c6be8261571c7" From b2e6cfc150b32055dbdf7cb52702b2da07b90b41 Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Tue, 12 Apr 2022 06:49:28 +0530 Subject: [PATCH 1886/2369] wireplumber: update to 0.4.10, fix service. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 9f50345e006a3620a6142ffce4023229f8d42d7c added a runit service for wireplumber but set HOME to a directory that doesn't persist across boots. wireplumber stores the state configuration in ${XDG_STATE_HOME:-$HOME/.local/state}/wireplumber and pipewire-media-session (the default media router) uses /var/lib/pipewire as persistent location, so we can use the same directory. Co-authored-by: Érico Nogueira Closes: #36650 [via git-merge-pr] --- srcpkgs/wireplumber/files/wireplumber/run | 2 +- srcpkgs/wireplumber/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run index ae0cf99e200..9a28ecdbe9a 100644 --- a/srcpkgs/wireplumber/files/wireplumber/run +++ b/srcpkgs/wireplumber/files/wireplumber/run @@ -6,5 +6,5 @@ sv check dbus >/dev/null 2>&1 || exit 1 exec 2>&1 -export HOME=/var/run/pipewire +export XDG_STATE_HOME=/var/lib/pipewire exec chpst -u _pipewire:_pipewire:audio:video -P dbus-run-session wireplumber diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template index acbffa27fd8..1413d2ad84b 100644 --- a/srcpkgs/wireplumber/template +++ b/srcpkgs/wireplumber/template @@ -1,6 +1,6 @@ # Template file for 'wireplumber' pkgname=wireplumber -version=0.4.9 +version=0.4.10 revision=1 build_style=meson build_helper=gir @@ -14,7 +14,7 @@ license="MIT" homepage="https://pipewire.pages.freedesktop.org/wireplumber" changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst" distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz" -checksum=0b25774a2821286a1fa31afb7db8db0573f493b35c40a7031b6e5a30cec0bbe3 +checksum=bddc5bb3c47e97c170d27c712bc3c7912592aea1ea9df747e92685f5194456d4 post_install() { vlicense LICENSE From fbc6fcdfcf3a1bdc946f1bfdf8ee8b4f7a474ee0 Mon Sep 17 00:00:00 2001 From: Omar Polo Date: Mon, 2 May 2022 16:31:36 +0000 Subject: [PATCH 1887/2369] New package: got-0.70 --- srcpkgs/got/patches/cross.patch | 18 ++++++++++++++++++ srcpkgs/got/template | 23 +++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 srcpkgs/got/patches/cross.patch create mode 100644 srcpkgs/got/template diff --git a/srcpkgs/got/patches/cross.patch b/srcpkgs/got/patches/cross.patch new file mode 100644 index 00000000000..377a34c8c47 --- /dev/null +++ b/srcpkgs/got/patches/cross.patch @@ -0,0 +1,18 @@ +--- got-portable-0.69/configure.ac.orig ++++ got-portable-0.69/configure.ac +@@ -204,6 +204,7 @@ + [return (reallocarray(NULL, 1, 1) == NULL);] + )], + AC_MSG_RESULT(yes), ++ [AC_LIBOBJ(reallocarray) AC_MSG_RESULT([no])], + [AC_LIBOBJ(reallocarray) AC_MSG_RESULT([no])] + ) + AC_MSG_CHECKING([for working recallocarray]) +@@ -212,6 +213,7 @@ + [return (recallocarray(NULL, 1, 1, 1) == NULL);] + )], + AC_MSG_RESULT(yes), ++ [AC_LIBOBJ(recallocarray) AC_MSG_RESULT([no])], + [AC_LIBOBJ(recallocarray) AC_MSG_RESULT([no])] + ) + diff --git a/srcpkgs/got/template b/srcpkgs/got/template new file mode 100644 index 00000000000..4c0b09d07b0 --- /dev/null +++ b/srcpkgs/got/template @@ -0,0 +1,23 @@ +# Template file for 'got' +pkgname=got +version=0.70 +revision=1 +wrksrc=got-portable-${version} +build_style=gnu-configure +hostmakedepends="automake byacc pkg-config" +makedepends="libmd-devel zlib-devel libuuid-devel libbsd-devel ncurses-devel openssl-devel" +short_desc="VCS which prioritizes ease of use and simplicity over flexibility" +maintainer="Omar Polo " +license="ISC" +homepage="https://gameoftrees.org" +distfiles="https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz" +checksum="2e534ed89f794a61543e6d2cb306903ea04f93977ed241004585c6b85e8b074e" + +pre_configure() { + autoreconf -fi +} + +post_install() { + sed -n '/Copyright/,/PERFORMANCE/p' got/got.c > LICENSE + vlicense LICENSE +} From f5b095e0528371b0bbf3ffff8dc16c598e5d7653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Thu, 12 May 2022 12:05:46 +0200 Subject: [PATCH 1888/2369] lux: update to 0.15.0. --- srcpkgs/lux/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template index c09f51778e3..9e738499f20 100644 --- a/srcpkgs/lux/template +++ b/srcpkgs/lux/template @@ -1,6 +1,6 @@ # Template file for 'lux' pkgname=lux -version=0.14.0 +version=0.15.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=3d485c9703851f3fb5cdee9b029b5b6855f84bfd29b44cae310a031a6fa8c00f +checksum=41e45542587caa27bf8180e66c72c6c77e83d00f8dcba2e952c5a9b04d382c6c post_install() { vlicense LICENSE From 10593256ea99785202d393c526939c65dfa76e55 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Thu, 12 May 2022 21:49:21 +0300 Subject: [PATCH 1889/2369] opera: update to 86.0.4363.59. --- srcpkgs/opera/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index 1be0482067b..8bc185d3427 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=86.0.4363.50 +version=86.0.4363.59 revision=1 archs="x86_64" create_wrksrc=yes @@ -11,7 +11,7 @@ maintainer="mobinmob " license="custom:Proprietary" homepage="https://www.opera.com/computer" distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm" -checksum=94b73abd6e1d2a710ddbd437e11a1702d487cc9497258b90a131332123ce28a5 +checksum=426ea69abdc724c3cd36dd44d68071c02212e81162cd4238677d2aa160b09554 repository="nonfree" nostrip=yes From 9f1c9529c114babf81f9bf584da1c3f1f368b92e Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 10 May 2022 19:43:43 +0200 Subject: [PATCH 1890/2369] github-cli: update to 2.10.1 --- srcpkgs/github-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template index 744f8c4ddb1..86b6ad53bdf 100644 --- a/srcpkgs/github-cli/template +++ b/srcpkgs/github-cli/template @@ -1,6 +1,6 @@ # Template file for 'github-cli' pkgname=github-cli -version=2.9.0 +version=2.10.1 revision=1 wrksrc="cli-${version}" build_style=go @@ -13,7 +13,7 @@ license="MIT" homepage="https://cli.github.com" changelog="https://github.com/cli/cli/releases" distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz" -checksum=730b600d33afb67d84af4dca1af80cb1fbff79d302ac4f840fc8e9e4c25fceb7 +checksum=a94ba6a731ad558f7937d0ac46ff8034b56214ec9e24a9ad70296331b1bb12ed pre_build() { local _date From 26cd5a6a29fa21ab9bfecd9aba7efd505721f59f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Wed, 11 May 2022 12:36:23 +0200 Subject: [PATCH 1891/2369] doctl: update to 1.75.0. --- srcpkgs/doctl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template index 81d5feb1d6e..63cb90f307c 100644 --- a/srcpkgs/doctl/template +++ b/srcpkgs/doctl/template @@ -1,6 +1,6 @@ # Template file for 'doctl' pkgname=doctl -version=1.74.0 +version=1.75.0 revision=1 build_style=go go_import_path="github.com/digitalocean/doctl/cmd/doctl" @@ -14,4 +14,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=3b0fcd2daff4cdce575f7a833a36c3a63a66c0dbb9af50baafe3ec9fe02c3872 +checksum=3fe102d60f57ee8f9bd4a8f5094fd3ddfdf7af1bbaf35c7b8286a9ae3c8a8f3e From 577a13bd7d972547cfd81658a40df2be4d3ae6c9 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Sun, 8 May 2022 21:41:00 +0200 Subject: [PATCH 1892/2369] tdrop: update to 0.5.0. --- srcpkgs/tdrop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tdrop/template b/srcpkgs/tdrop/template index d2e9668b03a..14dfbaa93eb 100644 --- a/srcpkgs/tdrop/template +++ b/srcpkgs/tdrop/template @@ -1,6 +1,6 @@ # Template file for 'tdrop' pkgname=tdrop -version=0.4.0 +version=0.5.0 revision=1 depends="bash xdotool xprop xwininfo" short_desc="Turn terminal emulator or any program into dropdown window" @@ -8,7 +8,7 @@ maintainer="Daniel Lewan " license="BSD-2-Clause" homepage="https://github.com/noctuid/tdrop" distfiles="https://github.com/noctuid/tdrop/archive/${version}.tar.gz" -checksum=ef4c644ad6c2c350b2e0f97ae2712e9871e13a6baef9065bcc1d8125eb073bb1 +checksum=ac37c76cb936d8e4c1c0aba5874999e09b8acbe07a2e23e8181114bd4a2a0a5d do_install() { vbin tdrop From 8b3250742052f54a8c7c64a3de4af2d4beef6680 Mon Sep 17 00:00:00 2001 From: glaulher Date: Sun, 8 May 2022 15:05:58 -0300 Subject: [PATCH 1893/2369] icewm: update to 2.9.7. --- srcpkgs/icewm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template index f42cb153a7f..1ad1fd90468 100644 --- a/srcpkgs/icewm/template +++ b/srcpkgs/icewm/template @@ -1,6 +1,6 @@ # Template file for 'icewm' pkgname=icewm -version=2.9.6 +version=2.9.7 revision=1 build_style=cmake make_cmd=make @@ -18,7 +18,7 @@ license="GPL-2.0-or-later" homepage="https://ice-wm.org/" changelog="https://raw.githubusercontent.com/ice-wm/icewm/master/NEWS" distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz" -checksum=d1ff3ce7491d857c17ed0dc3dda47ddc5fdeee23ac910fa6c42ca55b7039d541 +checksum=c7ad8599dcd2912545fca9f72ab0b68d17bcb05bc11c1b3e1c7eb9f3761c4ea5 # broken tests make_check=no From a7d9b48f0501e0e252416d9ba365e509ead77342 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Thu, 28 Apr 2022 00:06:39 +0200 Subject: [PATCH 1894/2369] util-linux-common: update to 2.38 Closes: #36775 [via git-merge-pr] --- srcpkgs/util-linux-common/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template index 0d94f16d34e..b6e0f73d6cf 100644 --- a/srcpkgs/util-linux-common/template +++ b/srcpkgs/util-linux-common/template @@ -1,7 +1,7 @@ # Template file for 'util-linux-common' # Keep this package sync with util-linux pkgname=util-linux-common -version=2.37.2 +version=2.38 revision=1 wrksrc="util-linux-$version" build_style=gnu-configure @@ -17,7 +17,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://www.kernel.org/pub/linux/utils/util-linux/" distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz" -checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 +checksum=6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64 post_extract() { # hung inside xbps-src From d0cc270ad916daf48e63c2b2bde2551348761ca0 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Thu, 28 Apr 2022 00:06:27 +0200 Subject: [PATCH 1895/2369] util-linux: update to 2.38 --- ...t-before-reading-stdin-and-fix-unini.patch | 37 ------------------- ...ush-stdout-before-reading-from-stdin.patch | 27 -------------- ...w-flush-stdout-before-getting-answer.patch | 35 ------------------ srcpkgs/util-linux/template | 6 +-- 4 files changed, 3 insertions(+), 102 deletions(-) delete mode 100644 srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch delete mode 100644 srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch delete mode 100644 srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch diff --git a/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch b/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch deleted file mode 100644 index 0a99aa7fae5..00000000000 --- a/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 05907d0d9e7c85f33e168feab1eb36b464425054 Mon Sep 17 00:00:00 2001 -From: Lorenzo Beretta -Date: Mon, 25 Oct 2021 14:06:00 +0200 -Subject: [PATCH] chfn: flush stdout before reading stdin and fix uninitialized - variable - -Same problem as described in https://github.com/karelzak/util-linux/pull/1481 - -Signed-off-by: Lorenzo Beretta ---- - login-utils/chfn.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/login-utils/chfn.c b/login-utils/chfn.c -index 2508e14c9..ece5cdce0 100644 ---- a/login-utils/chfn.c -+++ b/login-utils/chfn.c -@@ -227,7 +227,7 @@ static char *ask_new_field(struct chfn_control *ctl, const char *question, - char *def_val) - { - int len; -- char *buf; -+ char *buf = NULL; /* leave initialized to NULL or getline segfaults */ - #ifndef HAVE_LIBREADLINE - size_t dummy = 0; - #endif -@@ -242,6 +242,7 @@ static char *ask_new_field(struct chfn_control *ctl, const char *question, - if ((buf = readline(" ")) == NULL) - #else - putchar(' '); -+ fflush(stdout); - if (getline(&buf, &dummy, stdin) < 0) - #endif - errx(EXIT_FAILURE, _("Aborted.")); --- -2.33.0 - diff --git a/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch b/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch deleted file mode 100644 index 280c7fd0a62..00000000000 --- a/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0a08200bd5664d1849e477f7f776ab4d13bb8422 Mon Sep 17 00:00:00 2001 -From: Lorenzo Beretta -Date: Mon, 25 Oct 2021 15:28:02 +0200 -Subject: [PATCH] chsh: fflush stdout before reading from stdin - -Same problem as described in https://github.com/karelzak/util-linux/pull/1481 - -Signed-off-by: Lorenzo Beretta ---- - login-utils/chsh.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/login-utils/chsh.c b/login-utils/chsh.c -index 349712072..3b446beeb 100644 ---- a/login-utils/chsh.c -+++ b/login-utils/chsh.c -@@ -210,6 +210,7 @@ static char *ask_new_shell(char *question, char *oldshell) - if ((ans = readline(" ")) == NULL) - #else - putchar(' '); -+ fflush(stdout); - if (getline(&ans, &dummy, stdin) < 0) - #endif - return NULL; --- -2.33.0 - diff --git a/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch b/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch deleted file mode 100644 index e17c31291bc..00000000000 --- a/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 34a9b65587a7d704db0344e859511af4a6756c89 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=89rico=20Nogueira?= -Date: Fri, 22 Oct 2021 14:28:50 -0300 -Subject: [PATCH] vipw: flush stdout before getting answer. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise the question is displayed only after the user presses Return, -and the program looks like it's hanging. - -This happens at least on musl libc. - -Reported by @loreb. - -Signed-off-by: Érico Nogueira ---- - login-utils/vipw.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/login-utils/vipw.c b/login-utils/vipw.c -index 8e63efde2..f59948a44 100644 ---- a/login-utils/vipw.c -+++ b/login-utils/vipw.c -@@ -353,6 +353,7 @@ int main(int argc, char *argv[]) - * which means they can be translated. */ - printf(_("Would you like to edit %s now [y/n]? "), orig_file); - -+ fflush(stdout); - if (fgets(response, sizeof(response), stdin) && - rpmatch(response) == RPMATCH_YES) - edit_file(1); --- -2.33.0 - diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index ae39761e102..63b38ec67f4 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -1,8 +1,8 @@ # Template file for 'util-linux' # Keep this package sync with util-linux-common pkgname=util-linux -version=2.37.2 -revision=2 +version=2.38 +revision=1 build_style=gnu-configure configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin @@ -22,7 +22,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.kernel.org/pub/linux/utils/util-linux/" distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz" -checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 +checksum=6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64 # Create uuidd system account for uuidd. system_accounts="_uuidd" From f6739cf6d814b57ce4078f868f80e0c61268fea7 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 22 Apr 2022 23:40:12 +0200 Subject: [PATCH 1896/2369] svt-av1: update to 1.0.0. --- common/shlibs | 2 +- srcpkgs/svt-av1/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 680ab792051..85b44e2cc5e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4123,7 +4123,7 @@ libjvm.so openjdk17-jre-17.0.1+12_1 librttopo.so.1 librttopo-1.1.0_1 libspatialite.so.7 libspatialite-5.0.1_1 mod_spatialite.so.7 libspatialite-5.0.1_1 -libSvtAv1Enc.so.0 libsvt-av1-0.9.0_1 +libSvtAv1Enc.so.1 libsvt-av1-1.0.0_1 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1 librz_bp.so.0.3.4 rizin-0.3.4_1 librz_reg.so.0.3.4 rizin-0.3.4_1 diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template index ab9386d90cb..7b08bf9c309 100644 --- a/srcpkgs/svt-av1/template +++ b/srcpkgs/svt-av1/template @@ -1,6 +1,6 @@ # Template file for 'svt-av1' pkgname=svt-av1 -version=0.9.1 +version=1.0.0 revision=1 wrksrc="SVT-AV1-v${version}" build_style=cmake @@ -11,7 +11,7 @@ license="BSD-3-Clause-Clear" homepage="https://gitlab.com/AOMediaCodec/SVT-AV1" changelog="https://gitlab.com/AOMediaCodec/SVT-AV1/-/raw/master/CHANGELOG.md" distfiles="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${version}/SVT-AV1-v${version}.tar.gz" -checksum=714154c08a90a5eb1f09c4d0d766621132711137af127468dc122c04ca9784ae +checksum=84030ef7f33645ddfcdd2dc8a08277e49f3c4297fc53711958060c8ce51dc22d if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then broken="32-bit is not supported" From 94583135f9363c2e4df4b066edce5e329d24e8fb Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 22 Apr 2022 23:40:50 +0200 Subject: [PATCH 1897/2369] ffmpeg: rebuild against svt-av1-1.0.0 --- srcpkgs/ffmpeg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 213aae8bbfa..8ffdd4401f2 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -2,7 +2,7 @@ # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg version=4.4.1 -revision=2 +revision=3 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned " license="GPL-3.0-or-later" From 2b7e3338fd7b065fe535c41a400d4f85dd0f2e8c Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sun, 8 May 2022 13:10:47 -0700 Subject: [PATCH 1898/2369] libslirp: update to 4.7.0 --- srcpkgs/libslirp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libslirp/template b/srcpkgs/libslirp/template index 17fc6fdc9f3..b22560ec3b3 100644 --- a/srcpkgs/libslirp/template +++ b/srcpkgs/libslirp/template @@ -1,6 +1,6 @@ # Template file for 'libslirp' pkgname=libslirp -version=4.6.1 +version=4.7.0 revision=1 wrksrc="libslirp-v${version}" build_style=meson @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://gitlab.freedesktop.org/slirp/libslirp" changelog="https://gitlab.freedesktop.org/slirp/libslirp/-/blob/master/CHANGELOG.md" distfiles="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${version}/libslirp-v${version}.tar.gz" -checksum=69ad4df0123742a29cc783b35de34771ed74d085482470df6313b6abeb799b11 +checksum=9398f0ec5a581d4e1cd6856b88ae83927e458d643788c3391a39e61b75db3d3b pre_configure() { printf '%s\n' "${version}" > .tarball-version From b944273ee7802b11a8b523537dea93d638970cda Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sun, 8 May 2022 13:20:05 -0700 Subject: [PATCH 1899/2369] slirp4netns: update to 1.2.0 --- srcpkgs/slirp4netns/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/slirp4netns/template b/srcpkgs/slirp4netns/template index 437145fa33d..d96168c502d 100644 --- a/srcpkgs/slirp4netns/template +++ b/srcpkgs/slirp4netns/template @@ -1,6 +1,6 @@ # Template file for 'slirp4netns' pkgname=slirp4netns -version=1.1.12 +version=1.2.0 revision=1 build_style=gnu-configure hostmakedepends="autoconf automake pkg-config" @@ -10,7 +10,7 @@ maintainer="Cameron Nemo " license="GPL-2.0-only" homepage="https://github.com/rootless-containers/slirp4netns" distfiles="https://github.com/rootless-containers/slirp4netns/archive/v${version}.tar.gz" -checksum=279dfe58a61b9d769f620b6c0552edd93daba75d7761f7c3742ec4d26aaa2962 +checksum=b584edde686d3cfbac210cbdb93c4b0ba5d8cc0a6a4d92b9dfc3c5baec99c727 # tests fail due to use of unshare (unavailable with chroot util-linux) make_check=no From 258bfdf4eb2deee86907c75ccf30bc23b2a04604 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Thu, 12 May 2022 19:54:47 -0400 Subject: [PATCH 1900/2369] gthumb: update to 3.12.2. --- .../patches/linguas-remove-duplicate.patch | 24 ------------------- srcpkgs/gthumb/template | 4 ++-- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/gthumb/patches/linguas-remove-duplicate.patch diff --git a/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch deleted file mode 100644 index 00e9dde8466..00000000000 --- a/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch +++ /dev/null @@ -1,24 +0,0 @@ -From daef485dffd67319c114cf1bda453bf6157e11ff Mon Sep 17 00:00:00 2001 -From: Paolo Bacchilega -Date: Tue, 11 Jan 2022 12:30:44 +0100 -Subject: [PATCH] LINGUAS: removed duplicated entry - ---- - help/LINGUAS | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/help/LINGUAS b/help/LINGUAS -index b615195e..aabf71ac 100644 ---- a/help/LINGUAS -+++ b/help/LINGUAS -@@ -9,7 +9,6 @@ eu - fr - hu - id --id - nl - oc - sl --- -GitLab - diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template index 13fb63a7fb1..6de1a2663eb 100644 --- a/srcpkgs/gthumb/template +++ b/srcpkgs/gthumb/template @@ -1,6 +1,6 @@ # Template file for 'gthumb' pkgname=gthumb -version=3.12.0 +version=3.12.2 revision=1 build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel" @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/action/show/Apps/Gthumb" changelog="https://gitlab.gnome.org/GNOME/gthumb/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gthumb/${version%.*}/gthumb-${version}.tar.xz" -checksum=3deffc030384e64b57361c437c79b481ae1489ef44c87ae856e81bb10d8e383f +checksum=97f8afe522535216541ebbf1e3b546d12a6beb38a8f0eb85f26e676934aad425 LDFLAGS="-fPIC" From b3bc6cd8210615e1a3d0e50898f4658e8f827478 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Wed, 11 May 2022 18:07:15 -0700 Subject: [PATCH 1901/2369] runc: update to 1.1.2 Fixes CVE-2022-29162 --- srcpkgs/runc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template index 182e20b9985..35f011484e7 100644 --- a/srcpkgs/runc/template +++ b/srcpkgs/runc/template @@ -1,6 +1,6 @@ # Template file for 'runc' pkgname=runc -version=1.1.1 +version=1.1.2 revision=1 build_style=go go_import_path=github.com/opencontainers/runc @@ -12,7 +12,7 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/opencontainers/runc" distfiles="https://github.com/opencontainers/runc/releases/download/v${version}/runc.tar.xz" -checksum=75c1f0bb19b209412c52599e24b33ac306cf7caf772c97577b7ebe964837a54b +checksum=78ad532465ce4c2802480644a8756c30ae99c1bf779f0243af4bca11c4d041de post_build() { make man From 6a11f1dfc6e2abdce26a7ff532d37b6b5f26a35b Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Thu, 11 Nov 2021 10:14:10 +0100 Subject: [PATCH 1902/2369] po4a: update to 0.66 --- srcpkgs/po4a/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template index c0094f9eaa9..8dd6a6ed641 100644 --- a/srcpkgs/po4a/template +++ b/srcpkgs/po4a/template @@ -1,6 +1,6 @@ # Template file for 'po4a' pkgname=po4a -version=0.63 +version=0.66 revision=1 build_style=perl-ModuleBuild _perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak @@ -9,9 +9,12 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext libxslt docbook-xsl" makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build" depends="${_perldeps} opensp gettext" +checkdepends="docbook opensp perl-Test-Pod texlive" short_desc="PO for anything (po4a) project to ease translations using gettext tools" maintainer="newbluemoon " license="GPL-2.0-or-later" homepage="https://po4a.org/" +changelog="https://raw.githubusercontent.com/mquinson/po4a/master/NEWS" distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz" -checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595 +checksum=8ae65c69b3a3e3911c449284aa9f07c80b74484fd211f6e2a7e6b57e09f3afd8 +make_check=ci-skip # cannot repoduce failure locally From 44cdf866b8f6b696a4cc03989bad59b30ef79646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 13 May 2022 12:00:29 -0300 Subject: [PATCH 1903/2369] curl: update to 7.83.1. --- srcpkgs/curl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 74358a24969..00cbfd70987 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,6 +1,6 @@ # Template file for 'curl' pkgname=curl -version=7.83.0 +version=7.83.1 revision=1 build_style=gnu-configure configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 @@ -24,7 +24,7 @@ license="MIT" homepage="https://curl.haxx.se" changelog="https://curl.haxx.se/changes.html#${version//./_}" distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2" -checksum=247c7ec7521c4258e65634e529270d214fe32969971cccb72845e7aa46831f96 +checksum=f539a36fb44a8260ec5d977e4e0dbdd2eee29ed90fcedaa9bc3c9f78a113bff0 build_options="gnutls gssapi ldap rtmp ssh ssl zstd" build_options_default="ssh ssl zstd" vopt_conflict ssl gnutls From fcf726cf3036e855653d5de85181ab20ef5639ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 13 May 2022 12:00:32 -0300 Subject: [PATCH 1904/2369] doxygen: update to 1.9.4. --- srcpkgs/doxygen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template index 946ceeebcc1..998bd04bcef 100644 --- a/srcpkgs/doxygen/template +++ b/srcpkgs/doxygen/template @@ -1,6 +1,6 @@ # Template file for 'doxygen' pkgname=doxygen -version=1.9.3 +version=1.9.4 revision=1 build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None" @@ -12,7 +12,7 @@ license="GPL-2.0-only" homepage="http://www.doxygen.org/" changelog="https://www.doxygen.nl/manual/changelog.html" distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz" -checksum=f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0 +checksum=a15e9cd8c0d02b7888bc8356eac200222ecff1defd32f3fe05257d81227b1f37 build_options="wizard" desc_option_wizard="build Qt5 GUI configuration tool, doxywizard" From 7706912452f3255c134f24a7137128995386390b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 13 May 2022 12:00:35 -0300 Subject: [PATCH 1905/2369] iwd: update to 1.27. --- srcpkgs/iwd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template index 66f55599c5e..0b01bad5a23 100644 --- a/srcpkgs/iwd/template +++ b/srcpkgs/iwd/template @@ -1,6 +1,6 @@ # Template file for 'iwd' pkgname=iwd -version=1.26 +version=1.27 revision=1 build_style=gnu-configure configure_args="--disable-systemd-service --enable-pie @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://iwd.wiki.kernel.org/" changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog" distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz" -checksum=0ff4541c2b7f14ec010c3cbd1f02350f1b58cb0c103412db22550e90d8040d6b +checksum=013b4a0a79629c20d915954fc3b5d0620ef6e0d6065db3c342f4b3f9111f46ec make_dirs="/var/lib/iwd 0600 root root /var/lib/ead 0600 root root /etc/iwd 755 root root" From 557021d251efd9d7150e14fb98e4a0dba4a42bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 13 May 2022 12:00:37 -0300 Subject: [PATCH 1906/2369] ell: update to 0.50. --- srcpkgs/ell/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template index bb563505e80..fdfbd4e413a 100644 --- a/srcpkgs/ell/template +++ b/srcpkgs/ell/template @@ -1,7 +1,7 @@ # Template file for 'ell' # ell ABI isn't stable! Always test dependants after updates and update common/shlibs pkgname=ell -version=0.45 +version=0.50 revision=1 build_style=gnu-configure configure_args="--enable-glib" @@ -13,7 +13,7 @@ maintainer="Érico Nogueira " license="GPL-2.0-only" homepage="https://01.org/ell" distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=fedfcceee56eb63ab1eb98bf120a3cfbecee50bcd893874328c889f1b381e7d7 +checksum=0fe51d51c6eddc2a2784092f1dfdd1143a5ef27f15c274ecfbadd680d3a72fd9 # tests depend on kernel features make_check=extended From 02a74c14212fee19e627c521551566285b7c9147 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Thu, 12 May 2022 17:41:51 -0400 Subject: [PATCH 1907/2369] libfilezilla: update to 0.37.2. --- common/shlibs | 2 +- srcpkgs/libfilezilla/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 85b44e2cc5e..a143f5928c4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2623,7 +2623,7 @@ libhwloc.so.15 libhwloc-2.0.4_1 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1 -libfilezilla.so.24 libfilezilla-0.36.0_1 +libfilezilla.so.25 libfilezilla-0.37.2_1 libtommath.so.1 libtommath-1.0_1 libKF5ItemViews.so.5 kitemviews-5.26.0_1 libunicorn.so.1 unicorn-1.0_1 diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template index de4331d8fcc..9c50531cbbb 100644 --- a/srcpkgs/libfilezilla/template +++ b/srcpkgs/libfilezilla/template @@ -1,7 +1,7 @@ # Template file for 'libfilezilla' # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable pkgname=libfilezilla -version=0.36.0 +version=0.37.2 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://lib.filezilla-project.org/" changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co" distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=c0271c18ede7fbbc826b21c972c2cb0ff96744ee5a15c91d8d74e9bc3853a872 +checksum=e51140ee63646ba92ae41969c1fbff25946dc452410d3c4daf91cd792bfee2d5 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From 7afa0938e98f93875a74506c8db67e33e759f8cf Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Thu, 12 May 2022 17:42:10 -0400 Subject: [PATCH 1908/2369] filezilla: update to 3.59.0. --- srcpkgs/filezilla/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index 0c5abd1a1b5..3d6a65eaf38 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -1,6 +1,6 @@ # Template file for 'filezilla' pkgname=filezilla -version=3.58.0 +version=3.59.0 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://filezilla-project.org" changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co" distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2" -checksum=d0fe7f72e01f7742baa06466818b186e8e91fff62d6ee7b2f0e884b6b3385d88 +checksum=ad82d70e55dca8e0e2b2e194c68f3c8f2e003a46b7920cf0b6d6e8433e911501 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils" From 0d6dec72223416d8b63a55861184a20baa28b017 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 13 May 2022 17:10:34 +0200 Subject: [PATCH 1909/2369] libqtxdg: update to 3.9.1. --- srcpkgs/libqtxdg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template index b8bea143f36..b4f1e5ab53a 100644 --- a/srcpkgs/libqtxdg/template +++ b/srcpkgs/libqtxdg/template @@ -1,6 +1,6 @@ # Template file for 'libqtxdg' pkgname=libqtxdg -version=3.9.0 +version=3.9.1 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools lxqt-build-tools" @@ -10,7 +10,7 @@ maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/libqtxdg/archive/${version}.tar.gz" -checksum=4dc7e3e65e6bcd50010647ef781ef5601b08ce024b0b1155e6a68316696c5a58 +checksum=6866a9f5bf83ef46c436342a266ae4562f81823f8d053c028c0c87c2223332cb libqtxdg-devel_package() { short_desc+=" - development files" From 143ca65590318dcb53dd7fb3a471e8d98e8554f0 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 13 May 2022 17:13:36 +0200 Subject: [PATCH 1910/2369] libkdcraw5: update to 22.04.1. --- srcpkgs/libkdcraw5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template index f71d7b6c6ac..0e357c09c46 100644 --- a/srcpkgs/libkdcraw5/template +++ b/srcpkgs/libkdcraw5/template @@ -1,6 +1,6 @@ # Template file for 'libkdcraw5' pkgname=libkdcraw5 -version=22.04.0 +version=22.04.1 revision=1 wrksrc="libkdcraw-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/graphics/" distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz" -checksum=f92cee9a87fdef59f12bde784e1ec2b13b2677c82634e303f20ed8055ddb3e79 +checksum=62942d392519e86e880e5c5b0dc1bda124f245380546299536d755f4eb12a8a5 libkdcraw5-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 166e417ab4b1f7934be6e10a9b366648b595eb41 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 13 May 2022 18:22:04 +0200 Subject: [PATCH 1911/2369] gwenview: update to 22.04.1. --- srcpkgs/gwenview/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template index a9eafcc90cf..c91d1866d19 100644 --- a/srcpkgs/gwenview/template +++ b/srcpkgs/gwenview/template @@ -1,6 +1,6 @@ # Template file for 'gwenview' pkgname=gwenview -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake build_helper=qemu @@ -16,4 +16,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/graphics/gwenview" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=73683096898c59388cd566cc8f71d7677fd0b22a2ab42a6d5f82f1232372ab05 +checksum=f99a8f6eb7c7e2ba8b3f434512a2050cf64e032c48830c3ad80dbbb6d5e9cc4a From 03d83921390983e3cf8870dfe274bad5210c980a Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 13 May 2022 18:28:53 +0200 Subject: [PATCH 1912/2369] linux5.4: update to 5.4.193. --- srcpkgs/linux5.4/files/arm64-dotconfig | 3 +-- srcpkgs/linux5.4/files/x86_64-dotconfig | 5 ++--- srcpkgs/linux5.4/template | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig index 2b70d687ce1..21f6ee83333 100644 --- a/srcpkgs/linux5.4/files/arm64-dotconfig +++ b/srcpkgs/linux5.4/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.4.187 Kernel Configuration +# Linux/arm64 5.4.193 Kernel Configuration # # @@ -3835,7 +3835,6 @@ CONFIG_VMXNET3=m CONFIG_NETDEVSIM=m CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -# CONFIG_NVM is not set # # Input device support diff --git a/srcpkgs/linux5.4/files/x86_64-dotconfig b/srcpkgs/linux5.4/files/x86_64-dotconfig index 42961c8c8ad..0ecfe841959 100644 --- a/srcpkgs/linux5.4/files/x86_64-dotconfig +++ b/srcpkgs/linux5.4/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.4.180 Kernel Configuration +# Linux/x86_64 5.4.193 Kernel Configuration # # @@ -2199,6 +2199,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3524,8 +3525,6 @@ CONFIG_HYPERV_NET=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template index 1380552916a..8c274c1b365 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.191 +version=5.4.193 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=288ca85fcdad18e950ccbe3d640594ee36d5aac226321ed935076fadb0cc0a3a +checksum=0d16d343956d311e3f4ab3f032fd626d8e6b67c0db94edd32f561407d374f2a0 python_version=3 nodebug=yes # -dbg package is generated below manually From a901ffe5b00ec5217b3746e0d7de5d37d2af69ba Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 13 May 2022 18:30:58 +0200 Subject: [PATCH 1913/2369] linux4.19: update to 4.19.242. --- 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 d58249cf182..0b504065d4b 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.241 +version=4.19.242 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=4c6269d3c14e593151b035a55227110e632642d848032ef6992135c18488fe13 +checksum=59bcfd094ec26b03ca506199224cff53c13325e62d22bd4e31ef4ccafe7265a2 python_version=3 nodebug=yes # -dbg package is generated below manually From 840369175b60bd4e4c049eafde98eed0c4f97356 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Fri, 13 May 2022 18:32:01 +0200 Subject: [PATCH 1914/2369] remmina: update to 1.4.25. --- srcpkgs/remmina/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template index a784eb1b6af..77f5663cf47 100644 --- a/srcpkgs/remmina/template +++ b/srcpkgs/remmina/template @@ -1,6 +1,6 @@ # Template file for 'remmina' pkgname=remmina -version=1.4.24 +version=1.4.25 revision=1 wrksrc="Remmina-v${version}" build_style=cmake @@ -12,7 +12,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel libsecret-devel libsodium-devel libsoup-devel libssh-devel libva-devel libvncserver-devel libxkbfile-devel opus-devel phodav-devel spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel - vte3-devel libappindicator-devel" + vte3-devel libappindicator-devel webkit2gtk-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Remote desktop client written in GTK+" maintainer="Frank Steinborn " @@ -20,7 +20,7 @@ license="GPL-2.0-or-later" homepage="https://remmina.org" changelog="https://gitlab.com/Remmina/Remmina/-/raw/master/CHANGELOG.md" distfiles="https://gitlab.com/Remmina/Remmina/-/archive/v${version}/Remmina-v${version}.tar.bz2" -checksum=76a42062689b32fb6e41c59084fd52135ac8ea7806b119a40e0e1134ff0231fe +checksum=7c860c22b77b928fc93c5ab50cdb8af14a6a9160d17c548b9f084f66e634c9f2 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" libexecinfo-devel" From bd4c1abbd4b4b9aba5a66e12cc3cd25186f970b8 Mon Sep 17 00:00:00 2001 From: Elaine Gibson Date: Sun, 24 Apr 2022 19:33:01 +0100 Subject: [PATCH 1915/2369] radare2: update to 5.6.8. --- common/shlibs | 45 ++++++++++++----------- srcpkgs/radare2-devel | 1 + srcpkgs/radare2/patches/sys_openssl.patch | 21 +++++++++++ srcpkgs/radare2/patches/try.patch | 20 ---------- srcpkgs/radare2/template | 25 ++++++++++--- 5 files changed, 64 insertions(+), 48 deletions(-) create mode 120000 srcpkgs/radare2-devel create mode 100644 srcpkgs/radare2/patches/sys_openssl.patch delete mode 100644 srcpkgs/radare2/patches/try.patch diff --git a/common/shlibs b/common/shlibs index a143f5928c4..a95bc3054f1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3184,28 +3184,29 @@ libkdeconnectinterfaces.so.21 kdeconnect-21.03.80_1 libkdeconnectcore.so.21 kdeconnect-21.03.80_1 libkpmcore.so.11 kpmcore-21.03.80_1 libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6 -libr_core.so.5.0.0 radare2-5.0.0_1 -libr_config.so.5.0.0 radare2-5.0.0_1 -libr_cons.so.5.0.0 radare2-5.0.0_1 -libr_util.so.5.0.0 radare2-5.0.0_1 -libr_flag.so.5.0.0 radare2-5.0.0_1 -libr_asm.so.5.0.0 radare2-5.0.0_1 -libr_bin.so.5.0.0 radare2-5.0.0_1 -libr_anal.so.5.0.0 radare2-5.0.0_1 -libr_lang.so.5.0.0 radare2-5.0.0_1 -libr_debug.so.5.0.0 radare2-5.0.0_1 -libr_egg.so.5.0.0 radare2-5.0.0_1 -libr_bp.so.5.0.0 radare2-5.0.0_1 -libr_search.so.5.0.0 radare2-5.0.0_1 -libr_io.so.5.0.0 radare2-5.0.0_1 -libr_hash.so.5.0.0 radare2-5.0.0_1 -libr_socket.so.5.0.0 radare2-5.0.0_1 -libr_parse.so.5.0.0 radare2-5.0.0_1 -libr_syscall.so.5.0.0 radare2-5.0.0_1 -libr_crypto.so.5.0.0 radare2-5.0.0_1 -libr_fs.so.5.0.0 radare2-5.0.0_1 -libr_magic.so.5.0.0 radare2-5.0.0_1 -libr_reg.so.5.0.0 radare2-5.0.0_1 +libr_core.so.5.6.8 radare2-5.6.8_1 +libr_config.so.5.6.8 radare2-5.6.8_1 +libr_cons.so.5.6.8 radare2-5.6.8_1 +libr_util.so.5.6.8 radare2-5.6.8_1 +libr_flag.so.5.6.8 radare2-5.6.8_1 +libr_asm.so.5.6.8 radare2-5.6.8_1 +libr_bin.so.5.6.8 radare2-5.6.8_1 +libr_anal.so.5.6.8 radare2-5.6.8_1 +libr_lang.so.5.6.8 radare2-5.6.8_1 +libr_debug.so.5.6.8 radare2-5.6.8_1 +libr_egg.so.5.6.8 radare2-5.6.8_1 +libr_bp.so.5.6.8 radare2-5.6.8_1 +libr_search.so.5.6.8 radare2-5.6.8_1 +libr_io.so.5.6.8 radare2-5.6.8_1 +libr_hash.so.5.6.8 radare2-5.6.8_1 +libr_socket.so.5.6.8 radare2-5.6.8_1 +libr_parse.so.5.6.8 radare2-5.6.8_1 +libr_syscall.so.5.6.8 radare2-5.6.8_1 +libr_crypto.so.5.6.8 radare2-5.6.8_1 +libr_fs.so.5.6.8 radare2-5.6.8_1 +libr_magic.so.5.6.8 radare2-5.6.8_1 +libr_reg.so.5.6.8 radare2-5.6.8_1 +libr_main.so.5.6.8 radare2-5.6.8_1 libykpiv.so.1 libykpiv-2.1.1_2 libykcs11.so.1 libykcs11-2.1.1_2 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1 diff --git a/srcpkgs/radare2-devel b/srcpkgs/radare2-devel new file mode 120000 index 00000000000..fef4c7d8311 --- /dev/null +++ b/srcpkgs/radare2-devel @@ -0,0 +1 @@ +radare2 \ No newline at end of file diff --git a/srcpkgs/radare2/patches/sys_openssl.patch b/srcpkgs/radare2/patches/sys_openssl.patch new file mode 100644 index 00000000000..1711c75aaa8 --- /dev/null +++ b/srcpkgs/radare2/patches/sys_openssl.patch @@ -0,0 +1,21 @@ +From bdaff5a9fdd628482cd03a384a8804f228eecf9a Mon Sep 17 00:00:00 2001 +From: ypsvlq <86775241+ypsvlq@users.noreply.github.com> +Date: Tue, 10 May 2022 08:24:14 +0100 +Subject: [PATCH] Fix meson build with use_sys_openssl ##build + +--- + libr/socket/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libr/socket/meson.build b/libr/socket/meson.build +index 4e8614e9e57b..135c7b50efb9 100644 +--- a/libr/socket/meson.build ++++ b/libr/socket/meson.build +@@ -20,7 +20,6 @@ endif + + if use_sys_openssl + r_util_deps += [sys_openssl] +- r_util_static_deps += [sys_openssl] + endif + + r_socket = library('r_socket', r_socket_sources, diff --git a/srcpkgs/radare2/patches/try.patch b/srcpkgs/radare2/patches/try.patch deleted file mode 100644 index 332d9e08319..00000000000 --- a/srcpkgs/radare2/patches/try.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/shlr/Makefile 2020-12-21 09:39:46.000000000 +0100 -+++ b/shlr/Makefile 2021-01-04 22:13:43.513442861 +0100 -@@ -122,7 +122,7 @@ - SDB_LIBA=sdb/src/libsdb.a - - $(SDB_HOST): -- $(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC) -+ $(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC) LD=ld - - $(SDB_LIBA): - $(MAKE) sdb-target -@@ -136,7 +136,7 @@ - @echo ">>>>>>>>" - @echo - $(MAKE) -C sdb clean ; rm -f sdb/src/*.o sdb/src/sdb_version.h -- $(MAKE) -C sdb/src "CC=${HOST_CC}" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} ${PIC}' bin -+ $(MAKE) -C sdb/src "CC=${HOST_CC}" "LD=ld" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} ${PIC}' bin - cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/src/.sdb${BUILD_EXT_EXE} - cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/sdb$(BUILD_EXT_EXE) - -file sdb/sdb$(BUILD_EXT_EXE) diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template index 39818e99e7f..9baabf50014 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,19 +1,32 @@ # Template file for 'radare2' -# cutter needs to be bumped when radare2 is updated pkgname=radare2 -version=5.0.0 +version=5.6.8 revision=1 build_style=meson -configure_args="-Duse_sys_capstone=true -Denable_tests=false" +configure_args="-Denable_tests=false -Duse_sys_capstone=true + -Duse_sys_magic=true -Duse_sys_xxhash=true + -Duse_ssl=true -Duse_sys_openssl=true -Duse_libuv=true + -Duse_sys_zlib=true -Duse_sys_zip=true -Duse_sys_lz4=true" hostmakedepends="pkg-config" -makedepends="capstone-devel" +makedepends="capstone-devel file-devel xxHash-devel openssl-devel libuv-devel + zlib-devel libzip-devel liblz4-devel" short_desc="Advanced command line debugger and hexadecimal editor" maintainer="Orphaned " license="LGPL-3.0-only" -homepage="http://www.radare.org" +homepage="https://www.radare.org" distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz" -checksum=517dd80ebd0569f31498887338eacb92e8cf054bc4625eef8ffe9ea174c1adae +checksum=320d4f4733402cbc38303c7d37db04716e4376138da44d3664bb73adbdd77e0c case "$XBPS_TARGET_MACHINE" in mips*) CFLAGS="-Os";; esac + +radare2-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From 2f30655b583a63df4a1f9253faf071ab28ef71cc Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 13 May 2022 09:34:24 -0400 Subject: [PATCH 1916/2369] dendrite: update to 0.8.5. --- srcpkgs/dendrite/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template index 7e8f9fd2731..283fce81071 100644 --- a/srcpkgs/dendrite/template +++ b/srcpkgs/dendrite/template @@ -1,6 +1,6 @@ # Template file for 'dendrite' pkgname=dendrite -version=0.8.3 +version=0.8.5 revision=1 build_style=go go_import_path="github.com/matrix-org/dendrite" @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://matrix.org/docs/projects/server/dendrite" changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md" distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz" -checksum=2d61dc970bf812e13f7a81c65e811811ef950dad02631380650191214f2b5d5d +checksum=43b8197515a713bb2c0bb867abd0898104a53756f0c34b22601c4deebb898974 system_accounts="_dendrite" _dendrite_homedir="/var/lib/dendrite" @@ -25,11 +25,11 @@ make_dirs=" pre_configure() { vsed -e 's,\./logs,/var/log/dendrite,' \ -e 's,: matrix_key.pem,: /etc/dendrite/matrix_key.pem,' \ - -i dendrite-config.yaml + -i dendrite-sample.monolith.yaml } post_install() { - vsconf dendrite-config.yaml dendrite.yaml + vsconf dendrite-sample.monolith.yaml vsv dendrite-monolith-server cd "${DESTDIR}"/usr/bin From 207f5bafaa4cae004638ad1452b8db82575e8733 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Fri, 13 May 2022 18:27:45 +0200 Subject: [PATCH 1917/2369] xfce4-terminal: update to 1.0.3. --- srcpkgs/xfce4-terminal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template index 418817a0ac3..d3aaada3790 100644 --- a/srcpkgs/xfce4-terminal/template +++ b/srcpkgs/xfce4-terminal/template @@ -1,6 +1,6 @@ # Template file for 'xfce4-terminal' pkgname=xfce4-terminal -version=1.0.2 +version=1.0.3 revision=1 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale" @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://docs.xfce.org/apps/xfce4-terminal/start" changelog="https://gitlab.xfce.org/apps/xfce4-terminal/-/raw/master/NEWS" distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=ac1543167b43322ad2483ffb033a7e74669ecb59f4b63016a3c183d96141d326 +checksum=1c69a6d2edffbaf30d7123da82fd05c12259fc279caf7c491520158cc67ff5ed From aa0922feb18dbd1ec36eb6aa9fd0e6639a9a8079 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Fri, 13 May 2022 18:30:28 +0200 Subject: [PATCH 1918/2369] ltris: update to 1.2.4. --- srcpkgs/ltris/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template index 98846feaac3..80d9f0a9f45 100644 --- a/srcpkgs/ltris/template +++ b/srcpkgs/ltris/template @@ -1,6 +1,6 @@ # Template file for 'ltris' pkgname=ltris -version=1.2.3 +version=1.2.4 revision=1 build_style=gnu-configure configure_args="--localstatedir=/var/games/ltris" @@ -11,6 +11,6 @@ maintainer="Frank Steinborn " license="GPL-2.0-or-later" homepage="http://lgames.sourceforge.net/index.php?project=LTris" distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz" -checksum=0ec4ad053e066a296529e923c2f626fa0a19c094c5ae03e44359f9c9e50955a8 +checksum=d6eb7b301023278604d9292a92f2fd2f5103ee412a75a126d2550e2ec2368f83 nocheckperms=yes # uses a world-writable .hscr file for global leaderboard CFLAGS+=" -fgnu89-inline" From a2acedce5566332ca867664a4db2458a2c6c2cd2 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Sun, 10 Apr 2022 15:32:56 +0200 Subject: [PATCH 1919/2369] chatty: update to 0.18. --- srcpkgs/chatty/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template index 32821e5277f..58ab4862f6f 100644 --- a/srcpkgs/chatty/template +++ b/srcpkgs/chatty/template @@ -1,6 +1,6 @@ # Template file for 'chatty' pkgname=chatty -version=0.17 +version=0.18 revision=1 hostmakedepends="gradle" depends="virtual?java-runtime" @@ -9,7 +9,7 @@ maintainer="Frank Steinborn " license="GPL-3.0-or-later" homepage="https://chatty.github.io/" distfiles="https://github.com/chatty/chatty/archive/v${version}.tar.gz" -checksum=1d649d87fccb23b05136df387d4e23d79c2254b4c9f66ac09bc15c575d5680dd +checksum=cbc4009a233168a751cf2732cd5da79d851151fe866a74f75651e8eab75dc4f7 do_build() { gradle shadowJar From fe257b226e09b399cbe502ca6618a1f315781f89 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 12 May 2022 14:03:23 +0200 Subject: [PATCH 1920/2369] bat: update to 0.21.0 --- srcpkgs/bat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template index e3f210b3cab..11e11a56fd6 100644 --- a/srcpkgs/bat/template +++ b/srcpkgs/bat/template @@ -1,6 +1,6 @@ # Template file for 'bat' pkgname=bat -version=0.20.0 +version=0.21.0 revision=1 build_style=cargo hostmakedepends="cmake llvm clang" @@ -10,7 +10,7 @@ maintainer="John " license="Apache-2.0, MIT" homepage="https://github.com/sharkdp/bat" distfiles="https://github.com/sharkdp/bat/archive/v${version}.tar.gz" -checksum=12eca3add56f21b8056a4c17cfb5bffc45e107f23f75a8e0f5de948d8e997c39 +checksum=3dff1e52d577d0a105f4afe3fe7722a4a2b8bb2eb3e7a6a5284ac7add586a3ee post_patch() { # fixes an indexmap error when cross compiling From cbbcbc5dd34053393ebf030baea17811e53d754c Mon Sep 17 00:00:00 2001 From: Eloi Torrents Date: Sat, 30 Apr 2022 00:19:44 +0200 Subject: [PATCH 1921/2369] New Package: clickclack-0.2.3 --- srcpkgs/clickclack/template | 16 ++++++++++++++++ srcpkgs/clickclack/update | 1 + 2 files changed, 17 insertions(+) create mode 100644 srcpkgs/clickclack/template create mode 100644 srcpkgs/clickclack/update diff --git a/srcpkgs/clickclack/template b/srcpkgs/clickclack/template new file mode 100644 index 00000000000..bb137432cd3 --- /dev/null +++ b/srcpkgs/clickclack/template @@ -0,0 +1,16 @@ +# Template file for 'clickclack' +pkgname=clickclack +version=0.2.3 +revision=1 +build_style=gnu-makefile +makedepends="SDL2-devel" +short_desc="Simple haptic feedback and audio feedback tool" +maintainer="Eloi Torrents " +license=MIT +homepage=https://git.sr.ht/~proycon/clickclack +distfiles="https://git.sr.ht/~proycon/clickclack/archive/${version}.tar.gz" +checksum=940f13ae1aa8b33677d8153db4af848233cb45dbb755320463dc3f980c73cced + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/clickclack/update b/srcpkgs/clickclack/update new file mode 100644 index 00000000000..963c41fa75b --- /dev/null +++ b/srcpkgs/clickclack/update @@ -0,0 +1 @@ +pattern='\s{12}\K[\d.]+' From 5ec2556004b445a7d50a043606619722c630fde4 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 12 Apr 2022 15:28:23 -0400 Subject: [PATCH 1922/2369] common/hooks/pre-pkg/04-generate-runtime-deps.sh: sort deps for reproducibility fixes #36641 --- common/hooks/pre-pkg/04-generate-runtime-deps.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh index c8f8c04d488..987b0cece9c 100644 --- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh +++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh @@ -34,15 +34,14 @@ add_rundep() { store_pkgdestdir_rundeps() { if [ -n "$run_depends" ]; then - : > ${PKGDESTDIR}/rdeps for f in ${run_depends}; do _curdep="$(echo "$f" | sed -e 's,\(.*\)?.*,\1,')" if [ -z "$($XBPS_UHELPER_CMD getpkgdepname ${_curdep} 2>/dev/null)" -a \ -z "$($XBPS_UHELPER_CMD getpkgname ${_curdep} 2>/dev/null)" ]; then _curdep="${_curdep}>=0" fi - printf -- "${_curdep} " >> ${PKGDESTDIR}/rdeps - done + printf -- "${_curdep}\n" + done | sort | xargs > ${PKGDESTDIR}/rdeps fi } @@ -145,7 +144,7 @@ hook() { if [ "${_pkgname}" != "${pkgname}" ]; then echo " SONAME: $f <-> ${_sdep}" - sorequires+="${f} " + sorequires+="${f}\n" else # Ignore libs by current pkg echo " SONAME: $f <-> ${_rdep} (ignored)" @@ -163,9 +162,9 @@ hook() { store_pkgdestdir_rundeps for f in ${shlib_requires}; do - sorequires+="${f} " + sorequires+="${f}\n" done if [ -n "${sorequires}" ]; then - echo "${sorequires}" > ${PKGDESTDIR}/shlib-requires + echo "${sorequires}" | sort | xargs > ${PKGDESTDIR}/shlib-requires fi } From fb9aef712b119ab57c02a177a8731a6e4c441f85 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 13 May 2022 16:13:57 -0400 Subject: [PATCH 1923/2369] common/hooks/pre-pkg/04-generate-runtime-deps.sh: fix sorequires --- common/hooks/pre-pkg/04-generate-runtime-deps.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh index 987b0cece9c..eb19ebfe708 100644 --- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh +++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh @@ -144,7 +144,7 @@ hook() { if [ "${_pkgname}" != "${pkgname}" ]; then echo " SONAME: $f <-> ${_sdep}" - sorequires+="${f}\n" + sorequires+="${f} " else # Ignore libs by current pkg echo " SONAME: $f <-> ${_rdep} (ignored)" @@ -162,9 +162,9 @@ hook() { store_pkgdestdir_rundeps for f in ${shlib_requires}; do - sorequires+="${f}\n" + sorequires+="${f} " done if [ -n "${sorequires}" ]; then - echo "${sorequires}" | sort | xargs > ${PKGDESTDIR}/shlib-requires + echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires fi } From f1d3e7cb7e83f5ffc7452fac6e0a1a9bdf7a7fb8 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Fri, 13 May 2022 18:17:57 +0200 Subject: [PATCH 1924/2369] node_exporter: update to 1.3.1. --- srcpkgs/node_exporter/template | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template index baec4cfc14d..5be5dc50d5e 100644 --- a/srcpkgs/node_exporter/template +++ b/srcpkgs/node_exporter/template @@ -1,7 +1,7 @@ # Template file for 'node_exporter' pkgname=node_exporter -version=1.1.2 -revision=2 +version=1.3.1 +revision=1 build_style=go go_import_path="github.com/prometheus/node_exporter" go_ldflags="-X ${go_import_path}/version.Version=${version} @@ -14,8 +14,7 @@ license="Apache-2.0" homepage="https://prometheus.io/" changelog="https://raw.githubusercontent.com/prometheus/node_exporter/master/CHANGELOG.md" distfiles="https://github.com/prometheus/node_exporter/archive/v${version}.tar.gz" -checksum=edb40c783bd5767f174b916c89a768496ccae0f74811ba1d03c57c32cd250bbd -python_version=3 +checksum=66856b6b8953e094c46d7dd5aabd32801375cf4d13d9fe388e320cbaeaff573a system_accounts="_node_exporter" @@ -25,9 +24,3 @@ post_install() { vsconf example-rules.yml vsv node_exporter } - -# REMARKS: -# The following remark is now obsolete: -# ON UPDATE: Be sure to update the default list of collectors in the sv run -# file. There is no easy way at 0.14.0 to go from the -h output -# of node_exporter to taking the default list and appending runit. From e3d1cb057e19e9cbe4073fbf7ab78574ad3cbd85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Fri, 13 May 2022 23:58:58 +0200 Subject: [PATCH 1925/2369] mpd: update to 0.23.7. --- srcpkgs/mpd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index b34c78c1181..944431faaf1 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,6 +1,6 @@ # Template file for 'mpd' pkgname=mpd -version=0.23.6 +version=0.23.7 revision=1 build_style=meson configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true @@ -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=cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed +checksum=960dcbac717c388f5dcc4fd945e3af19a476f2b15f367e9653d4c7a948768211 LDFLAGS="-Wl,-z,stack-size=1048576" system_accounts="mpd" From 439adad7ddd697a05f37ca88f1cb83feb1ef1024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Sun, 8 May 2022 14:35:27 +0200 Subject: [PATCH 1926/2369] tor: update to 0.4.7.7. --- srcpkgs/tor/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template index 025d1020584..ec1efb4fb8b 100644 --- a/srcpkgs/tor/template +++ b/srcpkgs/tor/template @@ -1,6 +1,6 @@ # Template file for 'tor' pkgname=tor -version=0.4.6.10 +version=0.4.7.7 revision=1 build_style=gnu-configure configure_args="--enable-zstd" @@ -14,11 +14,11 @@ license="BSD-3-Clause" homepage="https://www.torproject.org/" changelog="https://gitlab.torproject.org/tpo/core/tor/-/raw/main/ChangeLog" distfiles="https://dist.torproject.org/tor-${version}.tar.gz" -checksum=94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c +checksum=3e131158b52b9435d7e43d1c47ef288b96d005342cc44b8c950bb403851a5b44 conf_files="/etc/tor/torrc" system_accounts="tor" -tor_homedir=/var/lib/tor +tor_homedir="/var/lib/tor" make_dirs="/var/lib/tor 0700 tor tor" pre_configure() { From ecc3ab42f7122a1b3ca3937a9d21fb88a48ca62a Mon Sep 17 00:00:00 2001 From: Martin Dimov Date: Mon, 9 May 2022 17:28:52 +0300 Subject: [PATCH 1927/2369] bleachbit: update to 4.4.2. --- srcpkgs/bleachbit/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template index 20b148a472a..7bca1dfd6a2 100644 --- a/srcpkgs/bleachbit/template +++ b/srcpkgs/bleachbit/template @@ -1,15 +1,15 @@ # Template file for 'bleachbit' pkgname=bleachbit -version=4.4.0 +version=4.4.2 revision=1 build_style=gnu-makefile make_install_args="prefix=/usr" -hostmakedepends="python3 gettext" -depends="python3-gobject python3-scandir gtk+3 desktop-file-utils hicolor-icon-theme" +hostmakedepends="python3 gettext desktop-file-utils" +depends="gtk+3 python3-gobject python3-scandir python3-chardet" short_desc="Deletes unneeded files to free disk space and maintain privacy" maintainer="graysky " license="GPL-3.0-or-later" homepage="https://www.bleachbit.org/" distfiles="https://github.com/bleachbit/bleachbit/archive/v${version}.tar.gz" -checksum=c45dad54d8c1da90be315e6d2403cba4c6fc59453b107d6d8ce0ca975228146f +checksum=6001c864688e36bd8f950c1341923c9347c2373149a9ce98dc26c39023b51997 python_version=3 From a94097863406c684c59eb5d9a0a613d16ddc5db3 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sun, 8 May 2022 20:41:22 +0530 Subject: [PATCH 1928/2369] avrdude: update to 7.0, remove build options Build options can be added back if anybody demands. Until then, they aren't necessary. Changelog should point to the latest changelog, so that users can see what changes have been made before upgrading. --- srcpkgs/avrdude/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/avrdude/template b/srcpkgs/avrdude/template index 5ebe45ae47e..b30f9fb1372 100644 --- a/srcpkgs/avrdude/template +++ b/srcpkgs/avrdude/template @@ -1,9 +1,9 @@ # Template file for 'avrdude' pkgname=avrdude -version=6.4 +version=7.0 revision=1 build_style=gnu-configure -configure_args="$(vopt_enable gpio linuxgpio) $(vopt_enable spi linuxspi)" +configure_args="--enable-linuxspi --enable-linuxgpio --enable-parport" hostmakedepends="flex" makedepends="elfutils-devel libusb-devel libusb-compat-devel libftdi1-devel hidapi-devel" @@ -12,10 +12,7 @@ short_desc="Utility to manipulate ROM and EEPROM of AVR microcontrollers" maintainer="Subhaditya Nath " license="GPL-2.0-only" homepage="http://www.nongnu.org/avrdude/" +changelog="https://raw.githubusercontent.com/avrdudes/avrdude/master/NEWS" distfiles="$NONGNU_SITE/$pkgname/${pkgname}-$version.tar.gz" -checksum=a9be7066f70a9dcf4bf0736fcf531db6a3250aed1a24cc643add27641b7110f9 +checksum=c0ef65d98d6040ca0b4f2b700d51463c2a1f94665441f39d15d97442dbb79b54 conf_files="/etc/avrdude.conf" -build_options="gpio spi" -desc_option_spi="Enable LINUXSPI support" -desc_option_gpio="Enable LINUXGPIO support" -build_options_default="${build_options}" From fc5efdf02d73769766481499e08a1c75fc6c27e0 Mon Sep 17 00:00:00 2001 From: Kyra Zimmer Date: Thu, 12 May 2022 07:46:37 +0200 Subject: [PATCH 1929/2369] verilator: update to 4.222. --- srcpkgs/verilator/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/verilator/template b/srcpkgs/verilator/template index dc61d2c8326..3864a6ed814 100644 --- a/srcpkgs/verilator/template +++ b/srcpkgs/verilator/template @@ -1,16 +1,16 @@ # Template file for 'verilator' pkgname=verilator -version=4.104 +version=4.222 revision=1 build_style=gnu-configure -hostmakedepends="autoconf flex" +hostmakedepends="autoconf flex python3" makedepends="libfl-devel" short_desc="SystemVerilog simulator and lint system" maintainer="Sasha Krassovsky " license="LGPL-3.0-only" homepage="https://veripool.org/wiki/verilator" distfiles="https://github.com/verilator/verilator/archive/v${version}.tar.gz" -checksum=6d42fa468234461e4a0c3154d5602cdded7b22d57f14be92c27a65d418a4a010 +checksum=15c60175807c0f3536c3c5b435f131c2b1e8725aefd30645efd946bf401b4c84 pre_configure() { autoconf From 24668fd8feb0863a9671e2e1ac660d71266ceb41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 13 May 2022 21:45:36 -0300 Subject: [PATCH 1930/2369] manpages-pt-br: update to 4.14.0. Also add new languages. Some of these were present already but not as proper subpackages, instead in manpages-pt-br. This commit fixes that. --- srcpkgs/manpages-cs | 1 + srcpkgs/manpages-da | 1 + srcpkgs/manpages-el | 1 + srcpkgs/manpages-es | 1 + srcpkgs/manpages-fi | 1 + srcpkgs/manpages-hu | 1 + srcpkgs/manpages-id | 1 + srcpkgs/manpages-it | 1 + srcpkgs/manpages-mk | 1 + srcpkgs/manpages-nb | 1 + srcpkgs/manpages-pt-br/template | 107 ++++++++++++++++++++++++++++++-- srcpkgs/manpages-sr | 1 + srcpkgs/manpages-sv | 1 + srcpkgs/manpages-uk | 1 + srcpkgs/manpages-vi | 1 + 15 files changed, 117 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/manpages-cs create mode 120000 srcpkgs/manpages-da create mode 120000 srcpkgs/manpages-el create mode 120000 srcpkgs/manpages-es create mode 120000 srcpkgs/manpages-fi create mode 120000 srcpkgs/manpages-hu create mode 120000 srcpkgs/manpages-id create mode 120000 srcpkgs/manpages-it create mode 120000 srcpkgs/manpages-mk create mode 120000 srcpkgs/manpages-nb create mode 120000 srcpkgs/manpages-sr create mode 120000 srcpkgs/manpages-sv create mode 120000 srcpkgs/manpages-uk create mode 120000 srcpkgs/manpages-vi diff --git a/srcpkgs/manpages-cs b/srcpkgs/manpages-cs new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-cs @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-da b/srcpkgs/manpages-da new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-da @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-el b/srcpkgs/manpages-el new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-el @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-es b/srcpkgs/manpages-es new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-es @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-fi b/srcpkgs/manpages-fi new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-fi @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-hu b/srcpkgs/manpages-hu new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-hu @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-id b/srcpkgs/manpages-id new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-id @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-it b/srcpkgs/manpages-it new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-it @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-mk b/srcpkgs/manpages-mk new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-mk @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-nb b/srcpkgs/manpages-nb new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-nb @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-pt-br/template b/srcpkgs/manpages-pt-br/template index 8a053c3eeab..f6e969138b2 100644 --- a/srcpkgs/manpages-pt-br/template +++ b/srcpkgs/manpages-pt-br/template @@ -1,9 +1,10 @@ # Template file for 'manpages-pt-br' pkgname=manpages-pt-br -version=4.11.0 +version=4.14.0 revision=1 +_commit=2a0461feb98f408bac9454b87325aacb1dd014f2 _prjname=manpages-l10n -wrksrc=${_prjname}-v${version} +wrksrc=${_prjname}-${version}-${_commit} build_style=gnu-configure make_build_args="comp_extension= compressor=cat" hostmakedepends="po4a" @@ -12,8 +13,8 @@ short_desc="${_desc} - Brazilian Portuguese (Português Brasileiro)" maintainer="Érico Nogueira " license="GPL-3.0-or-later" homepage="https://manpages-l10n-team.pages.debian.net/manpages-l10n/" -distfiles="https://salsa.debian.org/manpages-l10n-team/${_prjname}/-/archive/v${version}/${_prjname}-v${version}.tar.gz" -checksum=e40e6ece56281f9d6075daff9c56f34b1d335414d4c88c0a081c27c852371b7d +distfiles="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/${version}/${_prjname}-v${version}.tar.gz" +checksum=33f9f867e958faa0b3a699d503809d56aed3eadfcc349d329a79b545071c544f post_install() { find $DESTDIR -name '*systemd*' -delete @@ -53,3 +54,101 @@ manpages-ro_package() { vmove usr/share/man/ro } } + +manpages-vi_package() { + short_desc+="${_desc} - Vietnamese (Tiếng Việt)" + pkg_install() { + vmove usr/share/man/vi + } +} + +manpages-uk_package() { + short_desc+="${_desc} - Ukrainian (Украї́нська Мо́ва)" + pkg_install() { + vmove usr/share/man/uk + } +} + +manpages-sv_package() { + short_desc+="${_desc} - Swedish (Svenska)" + pkg_install() { + vmove usr/share/man/sv + } +} + +manpages-sr_package() { + short_desc+="${_desc} - Serbian (Српски Језик)" + pkg_install() { + vmove usr/share/man/sr + } +} + +manpages-nb_package() { + short_desc+="${_desc} - Norwegian Bokmål (Bokmål)" + pkg_install() { + vmove usr/share/man/nb + } +} + +manpages-mk_package() { + short_desc+="${_desc} - Macedonian (Македонски)" + pkg_install() { + vmove usr/share/man/mk + } +} + +manpages-it_package() { + short_desc+="${_desc} - Italian (Italiano)" + pkg_install() { + vmove usr/share/man/it + } +} + +manpages-id_package() { + short_desc+="${_desc} - Indonesian (Bahasa Indonesia)" + pkg_install() { + vmove usr/share/man/id + } +} + +manpages-hu_package() { + short_desc+="${_desc} - Hungarian (Magyar Nyelv)" + pkg_install() { + vmove usr/share/man/hu + } +} + +manpages-fi_package() { + short_desc+="${_desc} - Finnish (Suomi)" + pkg_install() { + vmove usr/share/man/fi + } +} + +manpages-es_package() { + short_desc+="${_desc} - Spanish (Español)" + pkg_install() { + vmove usr/share/man/es + } +} + +manpages-el_package() { + short_desc+="${_desc} - Greek (Ελληνικά)" + pkg_install() { + vmove usr/share/man/el + } +} + +manpages-da_package() { + short_desc+="${_desc} - Danish (Dansk)" + pkg_install() { + vmove usr/share/man/da + } +} + +manpages-cs_package() { + short_desc+="${_desc} - Czech (Čeština)" + pkg_install() { + vmove usr/share/man/cs + } +} diff --git a/srcpkgs/manpages-sr b/srcpkgs/manpages-sr new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-sr @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-sv b/srcpkgs/manpages-sv new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-sv @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-uk b/srcpkgs/manpages-uk new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-uk @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file diff --git a/srcpkgs/manpages-vi b/srcpkgs/manpages-vi new file mode 120000 index 00000000000..3cf72f5bb89 --- /dev/null +++ b/srcpkgs/manpages-vi @@ -0,0 +1 @@ +manpages-pt-br \ No newline at end of file From 2742b981e22969795d58b1d32a8761d6aa1b7fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 13 May 2022 21:47:32 -0300 Subject: [PATCH 1931/2369] sdcc: update to 4.2.0. --- srcpkgs/sdcc/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sdcc/template b/srcpkgs/sdcc/template index c1c1c055eaa..85a0a7131c3 100644 --- a/srcpkgs/sdcc/template +++ b/srcpkgs/sdcc/template @@ -1,8 +1,7 @@ # Template file for 'sdcc' pkgname=sdcc -version=4.1.0 +version=4.2.0 revision=1 -wrksrc=sdcc build_style=gnu-configure configure_args="--enable-libgc $(vopt_enable nonfree non-free)" hostmakedepends="automake flex bison gputils texinfo" @@ -12,7 +11,7 @@ maintainer="Érico Nogueira " license="GPL-2.0-or-later" homepage="http://sdcc.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/sdcc/${pkgname}-src-${version}.tar.bz2" -checksum=81edf776d5a2dc61a4b5c3408929db7b25874d69c46e4a71b116be1322fd533f +checksum=b49bae1d23bcd6057a82c4ffe5613f9cd0cbcfd1e940e9d84c4bfe9df0a8c053 python_version=3 nostrip=yes From e053b3bf428292b0780c359553ba99bcc1381779 Mon Sep 17 00:00:00 2001 From: shtayerc Date: Sun, 8 May 2022 19:40:55 +0200 Subject: [PATCH 1932/2369] aerc: update to 0.10.0 --- srcpkgs/aerc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template index 30a43148402..9741c99ba38 100644 --- a/srcpkgs/aerc/template +++ b/srcpkgs/aerc/template @@ -1,6 +1,6 @@ # Template file for 'aerc' pkgname=aerc -version=0.9.0 +version=0.10.0 revision=1 build_style=go go_import_path="git.sr.ht/~rjarry/aerc" @@ -13,7 +13,7 @@ maintainer="shtayerc " license="MIT" homepage="https://aerc-mail.org" distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz" -checksum=b5901feb37a55edd1f713e76c1012ac3fc0757202ddacd7d388cc7ce60638023 +checksum=14d6c622a012069deb1a31b51ecdd187fd11041c8e46f396ac22830b00e4c114 post_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install From cb021093ee9085371e4515369a5cc70329d994a7 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sun, 8 May 2022 09:10:57 +0300 Subject: [PATCH 1933/2369] bftpd: update to 6.1. --- srcpkgs/bftpd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bftpd/template b/srcpkgs/bftpd/template index e153a1dac49..7c456ad4fc6 100644 --- a/srcpkgs/bftpd/template +++ b/srcpkgs/bftpd/template @@ -1,6 +1,6 @@ # Template file for 'bftpd' pkgname=bftpd -version=6.0 +version=6.1 revision=1 wrksrc="$pkgname" build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Norbert Vegh " license="GPL-2.0-only" homepage="http://bftpd.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/bftpd/bftpd-${version}.tar.gz" -checksum=b7e602cacebb76b60a703dc65f1495cd9a381d345902b22903a1287dec8f025c +checksum=9721d0614e1a5d0fe6b80c9a8a04ada8efd42cbdfddd239e95a8059ae283aa6f CFLAGS="-fcommon" From e93f5df0fd639da3e433b517ae445b60e738d2dc Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Sat, 7 May 2022 17:17:34 -0300 Subject: [PATCH 1934/2369] oil: update to 0.10.0 --- srcpkgs/oil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template index 7def1be3658..8866e01d7f9 100644 --- a/srcpkgs/oil/template +++ b/srcpkgs/oil/template @@ -1,6 +1,6 @@ # Template file for 'oil' pkgname=oil -version=0.9.9 +version=0.10.0 revision=1 build_style=configure configure_args="--prefix=/usr $(vopt_with readline)" @@ -11,7 +11,7 @@ maintainer="MarcoAPC " license="Apache-2.0" homepage="https://www.oilshell.org" distfiles="${homepage}/download/${pkgname}-${version}.tar.xz" -checksum=6f6b4c4b9cf8a1e8e1dc2ff7bf39c85a11b871ddda9e9e51b9f7e1a0e46b2824 +checksum=cf7da9494ba9f0f101d27f0d0b5e248f8a54721ddeec13dd54652c9528580296 register_shell="/usr/bin/osh" nocross="Build systems gets confused with host and cross toolchains/headers" nostrip=yes From 9b3b69ffdb21b8862bc9f1f39b9cf2c9a1d9d32d Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 6 May 2022 20:39:07 +0300 Subject: [PATCH 1935/2369] krita: update to 5.0.6. --- srcpkgs/krita/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 68e67ccb815..c388e3b0505 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,6 +1,6 @@ # Template file for 'krita' pkgname=krita -version=5.0.5 +version=5.0.6 revision=1 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" @@ -22,7 +22,7 @@ maintainer="John " license="GPL-3.0-only" homepage="https://krita.org/" distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz" -checksum=162fff4596484e688655d4636373b1a77bcea39824c655b477afc1463aaf2dae +checksum=edd76d1b3e5fd00cffb90c4fdaa4dafecc8bf3638d1f7bccf463ec11ea3e0e62 python_version=3 replaces="calligra-krita>=0" make_check=no From 028e9e3067bf3165051d25cad97c24ce53e858fa Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Thu, 5 May 2022 23:52:07 +0300 Subject: [PATCH 1936/2369] fribidi: update to 1.0.12. --- srcpkgs/fribidi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template index 50f61f6e98c..39f2fbc41ca 100644 --- a/srcpkgs/fribidi/template +++ b/srcpkgs/fribidi/template @@ -1,6 +1,6 @@ # Template file for 'fribidi' pkgname=fribidi -version=1.0.11 +version=1.0.12 revision=1 build_style=gnu-configure configure_args="--disable-docs" @@ -11,7 +11,7 @@ license="LGPL-2.1-or-later" homepage="https://github.com/fribidi/fribidi/" changelog="https://raw.githubusercontent.com/fribidi/fribidi/master/NEWS" distfiles="https://github.com/fribidi/fribidi/archive/v${version}.tar.gz" -checksum=0e6d631c184e1012fb3ae86e80adabf26e46b4ffee2332e679eb308edd337398 +checksum=2e9e859876571f03567ac91e5ed3b5308791f31cda083408c2b60fa1fe00a39d disable_parallel_build=yes pre_configure() { From 6707af6d17da90e9b60ecde0ec9326c7ac8469df Mon Sep 17 00:00:00 2001 From: zenobit Date: Sun, 8 May 2022 16:09:45 +0200 Subject: [PATCH 1937/2369] yad: update to 12.0 --- srcpkgs/yad/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template index a9d75e6930e..a16f62311a4 100644 --- a/srcpkgs/yad/template +++ b/srcpkgs/yad/template @@ -1,6 +1,6 @@ # Template file for 'yad' pkgname=yad -version=11.1 +version=12.0 revision=1 build_style=gnu-configure configure_args="--enable-icon-browser" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/v1cont/yad" changelog="https://raw.githubusercontent.com/v1cont/yad/master/NEWS" distfiles="https://github.com/v1cont/yad/releases/download/v${version}/yad-${version}.tar.xz" -checksum=ca61d422d6d464d7f473d1e5bd14d3ca05d311ef203f1c67bbea7c23bf0eae2f +checksum=65dbfa72a229f6cbd131470caf4f70fec98fe935a1436acb58c841fa2a8bddde pre_configure() { autoreconf -ivf From ddcf656ce0fbe40f98e0f98d577cf3befd55d1e6 Mon Sep 17 00:00:00 2001 From: zenobit Date: Sun, 8 May 2022 15:34:13 +0200 Subject: [PATCH 1938/2369] gitea: update to 1.16.7 --- srcpkgs/gitea/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index c8b9b361ce2..b24b3171b49 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -1,6 +1,6 @@ # Template file for 'gitea' pkgname=gitea -version=1.16.5 +version=1.16.7 revision=1 create_wrksrc=yes build_style=go @@ -32,7 +32,7 @@ license="MIT" homepage="https://gitea.io" changelog="https://raw.githubusercontent.com/go-gitea/gitea/main/CHANGELOG.md" distfiles="https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz" -checksum=d9aab2e8357ca1a22eaffb328356e4e355a8f851a4de6fb4e7eb54ca80f0187b +checksum=51599b16d1c2e16dd617e0e9b5d1cc314a1ef141394d582833d411b9ccd2ac48 system_accounts="_gitea" _gitea_homedir="/var/lib/gitea" From 2fe9173aeaa38285e5765e80c0221ff11a5123c5 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Fri, 13 May 2022 22:46:21 -0400 Subject: [PATCH 1939/2369] dua-cli: update to 2.17.5 --- srcpkgs/dua-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template index ea5c1c27dad..31df51fc5c5 100644 --- a/srcpkgs/dua-cli/template +++ b/srcpkgs/dua-cli/template @@ -1,6 +1,6 @@ # Template file for 'dua-cli' pkgname=dua-cli -version=2.17.1 +version=2.17.5 revision=1 build_style=cargo short_desc="Tool to conveniently learn about the disk usage of directories" @@ -9,7 +9,7 @@ license="MIT" homepage="https://github.com/Byron/dua-cli" changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md" distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz" -checksum=d9af81b30f83d080472e91da3e07b42294904827ad5274d9aaf51d346072d2f1 +checksum=805a911300bbb5234c25f607b25444988a97c260c03c02932844aeee0ba108e1 post_install() { vlicense LICENSE From 12c699dd984f8a8eb96c86df56b459249625ccd0 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Fri, 13 May 2022 22:19:47 -0400 Subject: [PATCH 1940/2369] procs: update to 0.12.2 --- srcpkgs/procs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template index 84e47b23614..350cb3742e0 100644 --- a/srcpkgs/procs/template +++ b/srcpkgs/procs/template @@ -1,6 +1,6 @@ # Template file for 'procs' pkgname=procs -version=0.12.1 +version=0.12.2 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=ce84e98dd85cb8d5afda871ad2ddceb4faec077d9e019469aa668a75821e4fc2 +checksum=14be8440fe85dc46e544a3f7e89b887db455a61db981d5f75b91fd89b366d84f post_build() { PROCS="target/${RUST_TARGET}/release/procs" From f175e21f994b86ea75eb5374b2bf1212dd29f671 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Fri, 13 May 2022 21:53:57 -0400 Subject: [PATCH 1941/2369] fnott: update to 1.2.1 --- srcpkgs/fnott/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fnott/template b/srcpkgs/fnott/template index 713071aa9f0..cb7c4c766ad 100644 --- a/srcpkgs/fnott/template +++ b/srcpkgs/fnott/template @@ -1,6 +1,6 @@ # Template file for 'fnott' pkgname=fnott -version=1.2.0 +version=1.2.1 revision=1 wrksrc=$pkgname build_style=meson @@ -11,7 +11,7 @@ maintainer="travankor " license="MIT" homepage="https://codeberg.org/dnkl/fnott/" distfiles="https://codeberg.org/dnkl/fnott/archive/${version}.tar.gz" -checksum=d6cfb7efcfad5e0aa95c5fd9632c638a53a0debfc17128e70922a1ba9f841470 +checksum=a4e72845cde23aff0653f9b218a32cb40ae628b3f690dc02333ea95469faf216 post_install() { vlicense LICENSE From 8436c870a0f897ade76396517fae11d5176b025e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 13 May 2022 20:14:55 +0200 Subject: [PATCH 1942/2369] php: update to 7.4.29. --- srcpkgs/php/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 700226b020b..c6a628cf686 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,6 +1,6 @@ # Template file for 'php' pkgname=php -version=7.4.27 +version=7.4.29 revision=1 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel @@ -13,7 +13,7 @@ maintainer="Steve Prybylski " license="PHP-3.01" homepage="https://www.php.net" distfiles="http://www.php.net/distributions/php-${version}.tar.xz" -checksum=3f8b937310f155822752229c2c2feb8cc2621e25a728e7b94d0d74c128c43d0c +checksum=7d0f07869f33311ff3fe1138dc0d6c0d673c37fcb737eaed2c6c10a949f1aed6 conf_files="/etc/php/php.ini" From ec00c131657589e7db3b67d5161af3117ccc727f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 13 May 2022 20:14:57 +0200 Subject: [PATCH 1943/2369] php8.0: update to 8.0.19. --- srcpkgs/php8.0/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template index 2ddb350061f..c4a6df3a389 100644 --- a/srcpkgs/php8.0/template +++ b/srcpkgs/php8.0/template @@ -1,10 +1,10 @@ # Template file for 'php8.0' pkgname=php8.0 -version=8.0.18 +version=8.0.19 revision=1 _php_version=8.0 wrksrc="php-${version}" -hostmakedepends="bison pkg-config apache-devel curl" +hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel @@ -15,9 +15,7 @@ maintainer="Joel Beckmeyer " license="PHP-3.01" homepage="https://www.php.net" distfiles="https://www.php.net/distributions/php-${version}.tar.gz" -checksum=cd980f5a2f422362f8c52d314ed25140c6f472877c5442c4f3304205f54e192a - -fetch_cmd="curl -O" +checksum=48e57634d350bcab4745d25d9d94ffa474649bf4f7e879fad163226c0d107bb5 conf_files="/etc/php${_php_version}/php.ini" From e6da5a4b29ee97a6bf521738d4d9a1c3993a8ea6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 13 May 2022 20:14:58 +0200 Subject: [PATCH 1944/2369] php8.1: update to 8.1.6. --- srcpkgs/php8.1/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template index 16da7be3f32..9852f076d51 100644 --- a/srcpkgs/php8.1/template +++ b/srcpkgs/php8.1/template @@ -1,10 +1,10 @@ # Template file for 'php8.1' pkgname=php8.1 -version=8.1.5 +version=8.1.6 revision=1 _php_version=8.1 wrksrc="php-${version}" -hostmakedepends="bison pkg-config apache-devel curl" +hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel @@ -15,9 +15,7 @@ maintainer="Joel Beckmeyer " license="PHP-3.01" homepage="https://www.php.net" distfiles="https://www.php.net/distributions/php-${version}.tar.gz" -checksum=44d637627746082395d5d3d3d6ae7d71e780b82a8d55a0228887158c4316bf11 - -fetch_cmd="curl -O" +checksum=e847745fd66fc8c57fac993a609fefcded93fddccd225f0620a26bb5ae5753c3 conf_files="/etc/php${_php_version}/php.ini" From 36274904cf4e13ee94acbea8fb06bbd4be65580b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 15 Mar 2021 19:12:50 +0100 Subject: [PATCH 1945/2369] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups The `/-/` sequence is always between e.g. archive and the repo path, so this should work reliably for distfiles. If gitlab is used only as a homepage, this still wroks if homepage points to the base repo (which it usually does) --- common/xbps-src/shutils/update_check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh index 0a624274f50..1f0ed7b1fe4 100644 --- a/common/xbps-src/shutils/update_check.sh +++ b/common/xbps-src/shutils/update_check.sh @@ -123,7 +123,7 @@ update_check() { url="https://github.com/$pkgurlname/tags" rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';; *//gitlab.*) - pkgurlname="$(printf %s "$url" | cut -d/ -f1-5)" + pkgurlname="$(printf %s "$url" | sed 's%/-/*%%g')" url="$pkgurlname/tags" rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d.]+(?=\.tar\.gz")';; *bitbucket.org*) From fddef76fcc6a1b8d2839ea840137b87ecc367e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 14 May 2022 15:36:27 +0200 Subject: [PATCH 1946/2369] xbps-src/shutils/update_check.sh: change gitlab check to handle old urls --- common/xbps-src/shutils/update_check.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh index 1f0ed7b1fe4..7348260f54a 100644 --- a/common/xbps-src/shutils/update_check.sh +++ b/common/xbps-src/shutils/update_check.sh @@ -123,7 +123,10 @@ update_check() { url="https://github.com/$pkgurlname/tags" rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';; *//gitlab.*) - pkgurlname="$(printf %s "$url" | sed 's%/-/*%%g')" + case "$url" in + */-/*) pkgurlname="$(printf %s "$url" | sed -e 's%/-/.*%%g; s%/$%%')";; + *) pkgurlname="$(printf %s "$url" | cut -d / -f 1-5)";; + esac url="$pkgurlname/tags" rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d.]+(?=\.tar\.gz")';; *bitbucket.org*) From 91af7ef711cc471615a6bc567e772d5050832350 Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Fri, 22 Apr 2022 06:33:47 +0700 Subject: [PATCH 1947/2369] kamoso: update to 21.04.1, orphan package --- srcpkgs/kamoso/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template index 5b065d6f578..dd41855bf15 100644 --- a/srcpkgs/kamoso/template +++ b/srcpkgs/kamoso/template @@ -1,6 +1,6 @@ # Template file for 'kamoso' pkgname=kamoso -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends=" @@ -15,9 +15,9 @@ depends=" gst-plugins-bad1 phonon-qt5 qt5-graphicaleffects qt5-quickcontrols kirigami2 purpose" short_desc="Simple and friendly program to use your webcam recorder" -maintainer="Hervy Qurrotul Ainur Rozi " +maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://apps.kde.org/kamoso/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kamoso" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=2bde8e8e6de25673a412ba6a966e898959ee5625dcadadc1bc295c12ad7128e1 +checksum=5b8c58640624701b05cb8534c14b26fdccb43828c50eb347e114da9fb32d3d0d From df2264da50fa6b88cd755ace845a570bc24cf41c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 14 May 2022 16:31:35 +0200 Subject: [PATCH 1948/2369] tcsh: update to 6.24.01. --- srcpkgs/tcsh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template index d9c9d0d7c8a..d18e79e784d 100644 --- a/srcpkgs/tcsh/template +++ b/srcpkgs/tcsh/template @@ -1,6 +1,6 @@ # Template file for 'tcsh' pkgname=tcsh -version=6.24.00 +version=6.24.01 revision=1 build_style=gnu-configure conf_files="/etc/csh.login /etc/csh.cshrc" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://www.tcsh.org/" distfiles="https://astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=60be2c504bd8f1fa6e424b1956495d7e7ced52a2ac94db5fd27f4b6bfc8f74f0 +checksum=5659a1b973b1f947e36238cb17a00210ac4cff3b496f8f851acd77172ab91d7e register_shell="/bin/tcsh /bin/csh" post_extract() { From c9b7bc1131920c139645215ae195a01ebde11ac8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 14 May 2022 16:32:41 +0200 Subject: [PATCH 1949/2369] spigot: update to 20220509.4b9cde0. --- srcpkgs/spigot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/spigot/template b/srcpkgs/spigot/template index 6f9899faa78..d4c744b18bd 100644 --- a/srcpkgs/spigot/template +++ b/srcpkgs/spigot/template @@ -1,6 +1,6 @@ # Template file for 'spigot' pkgname=spigot -version=20210527.7dd3cfd +version=20220509.4b9cde0 revision=1 build_style=cmake makedepends="gmp-devel ncurses-devel" @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://www.chiark.greenend.org.uk/~sgtatham/spigot/" distfiles="https://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=1014b79607cbb6cc8143c9b3a093f266144124d9a4552785e5779c1a072faadc +checksum=d32514c9e3a16c5a58bfbc8cfbad076fa50c7744273237e0bba3d15dc6e2102d post_install() { vlicense LICENCE From 24994a52f9882e3e83b711ecaf98e4c9a844be30 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 14 May 2022 16:33:24 +0200 Subject: [PATCH 1950/2369] nsd: update to 4.5.0. --- srcpkgs/nsd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template index 74062c7a360..2e42a1014fb 100644 --- a/srcpkgs/nsd/template +++ b/srcpkgs/nsd/template @@ -1,6 +1,6 @@ # Template file for 'nsd' pkgname=nsd -version=4.4.0 +version=4.5.0 revision=1 build_style=gnu-configure configure_args="--enable-ratelimit --enable-ratelimit-default-is-off @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://www.nlnetlabs.nl/projects/nsd/" changelog="https://github.com/NLnetLabs/nsd/blob/NSD_${version//./_}_REL/doc/ChangeLog" distfiles="https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=cfcd6fdd99344ca5a7ef7c2940c241bcef471fc3252ba3dcbd4c57e0638e8836 +checksum=5ae7a704ab92c8a49f3c8f3a29565ce194c51a721c29c75ea7d43c13372d79c5 system_accounts="nsd" nsd_homedir=/var/db/nsd make_dirs="/var/db/nsd 0755 nsd nsd" From 0092427835c6192aeec0434853e6467de5844159 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 14 May 2022 11:00:55 -0500 Subject: [PATCH 1951/2369] nomad: update to 1.3.0. --- srcpkgs/nomad/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template index 7b53596b1ae..6618e86058d 100644 --- a/srcpkgs/nomad/template +++ b/srcpkgs/nomad/template @@ -1,18 +1,18 @@ # Template file for 'nomad' pkgname=nomad -version=1.2.6 +version=1.3.0 revision=1 build_style=go go_import_path="github.com/hashicorp/nomad" go_build_tags="ui release" -_git_commit=95514d569610f15ce49b4a7a1a6bfd3e7b3e7b4f +_git_commit=52e95d64113e01be05d585d8b4c07f6f19efebbc go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}" short_desc="Cluster scheduler designed to easily integrate into existing workflows" maintainer="Michael Aldridge " license="MPL-2.0" homepage="https://www.nomadproject.io/" distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz" -checksum=c69ec89ae5f76704d4b3ecb842b130f3d90e579bfd31191721b5f2da99f95a93 +checksum=ce00994e1dbd89d0685237b6815322780e09c414fcc80b019e0d163ea1cb7ac0 post_install() { vlicense LICENSE From 001f80859eefb9e839accd838521ff813aff84c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 11 May 2022 21:35:45 +0200 Subject: [PATCH 1952/2369] perl-Stow: replace with stow --- srcpkgs/perl-Stow | 1 + srcpkgs/perl-Stow/template | 15 --------------- srcpkgs/stow/template | 8 +++++++- 3 files changed, 8 insertions(+), 16 deletions(-) create mode 120000 srcpkgs/perl-Stow delete mode 100644 srcpkgs/perl-Stow/template diff --git a/srcpkgs/perl-Stow b/srcpkgs/perl-Stow new file mode 120000 index 00000000000..1466463c80c --- /dev/null +++ b/srcpkgs/perl-Stow @@ -0,0 +1 @@ +stow \ No newline at end of file diff --git a/srcpkgs/perl-Stow/template b/srcpkgs/perl-Stow/template deleted file mode 100644 index 33dfbcc7cf0..00000000000 --- a/srcpkgs/perl-Stow/template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'perl-Stow' -pkgname=perl-Stow -version=2.3.1 -revision=2 -wrksrc="Stow-v${version}" -build_style=perl-ModuleBuild -hostmakedepends="perl perl-Module-Build perl-Test-Output perl-IO-stringy" -makedepends="${hostmakedepends}" -depends="${makedepends}" -short_desc="Perl module for managing symlinks" -maintainer="Martin Harrigan " -license="GPL-3.0-or-later" -homepage="https://metacpan.org/release/Stow" -distfiles="${CPAN_SITE}/Finance/ASPIERS/Stow-v${version}.tar.gz" -checksum=5062a1f8d0c03e38aca5cf46b72de0cba03f901279729338b7b2f93e518182d8 diff --git a/srcpkgs/stow/template b/srcpkgs/stow/template index cb6eb1aa119..f20c72acbc1 100644 --- a/srcpkgs/stow/template +++ b/srcpkgs/stow/template @@ -1,7 +1,7 @@ # Template file for 'stow' pkgname=stow version=2.3.1 -revision=3 +revision=4 build_style=gnu-configure make_check_target="test" hostmakedepends="perl" @@ -14,3 +14,9 @@ license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/stow/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=09d5d99671b78537fd9b2c0b39a5e9761a7a0e979f6fdb7eabfa58ee45f03d4b + +perl-Stow_package() { + build_style=meta + depends="stow>=${version}_${revision}" + short_desc+=" (transitional dummy package)" +} From 297696c88d4146035b2623b2707876406f537e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 11 May 2022 23:49:38 +0200 Subject: [PATCH 1953/2369] bash-completion: resolve conflict with pacman --- srcpkgs/bash-completion/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index 8908de525e8..74d80d5f5dd 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -1,7 +1,7 @@ # Template file for 'bash-completion' pkgname=bash-completion version=2.11 -revision=3 +revision=4 build_style=gnu-configure make_install_args="profiledir=/etc/bash/bashrc.d" depends="bash" @@ -60,3 +60,8 @@ pre_check() { done export PYTEST_ADDOPTS } + +post_install() { + # for slackware's that we don't have, conflicts with pacman's + rm ${DESTDIR}/usr/share/bash-completion/completions/makepkg +} From 458a8369427442717d091e4cf960fca8a545cf32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 11 May 2022 23:50:21 +0200 Subject: [PATCH 1954/2369] bff-apankrat: resolve conflict with bff --- srcpkgs/bff-apankrat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bff-apankrat/template b/srcpkgs/bff-apankrat/template index 452aa4c3f0b..9355d1ef7e3 100644 --- a/srcpkgs/bff-apankrat/template +++ b/srcpkgs/bff-apankrat/template @@ -1,7 +1,7 @@ # Template file for 'bff-apankrat' pkgname=bff-apankrat version=1.0.7 -revision=1 +revision=2 wrksrc="bff-${version}" build_style=gnu-makefile short_desc="Moderately-optimizing brainfuck interpreter" @@ -12,7 +12,7 @@ distfiles="https://github.com/apankrat/bff/archive/v${version}.tar.gz" checksum=1f8787f8bc12ae4282112dabc5b85f03002269dce57023ee0443250d5a68702f do_install() { - vbin bff + vbin bff bff-apankrat head -n 13 bff.c > LICENSE vlicense LICENSE } From 772bb0109a2e5264d7021dc89858d458a7756e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 11 May 2022 23:54:43 +0200 Subject: [PATCH 1955/2369] nullmailer: provide smtp-server - resolve conflict with other `smtp-server`s - fix tests --- srcpkgs/nullmailer/template | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/srcpkgs/nullmailer/template b/srcpkgs/nullmailer/template index 16a0bc618ef..0812b846f8e 100644 --- a/srcpkgs/nullmailer/template +++ b/srcpkgs/nullmailer/template @@ -1,7 +1,7 @@ # Template file for 'nullmailer' pkgname=nullmailer version=2.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-tls" conf_files="/etc/nullmailer/*" @@ -10,6 +10,7 @@ make_dirs=" /var/spool/nullmailer/queue 0700 _nullmail root /var/spool/nullmailer/tmp 0700 _nullmail root" makedepends="gnutls-devel" +checkdepends="daemontools ucspi-tcp" short_desc="Simple relay-only mail transport agent" maintainer="Deneys S. Maartens " license="GPL-2.0-or-later" @@ -17,6 +18,13 @@ homepage="https://untroubled.org/nullmailer/" distfiles="https://untroubled.org/nullmailer/archive/nullmailer-${version}.tar.gz" checksum=9886fa627b7e7e775e2f09fbe789247b1ca304f152da04ff705e50079263a855 system_accounts="_nullmail" +provides="smtp-server-0_1" +replaces="smtp-server>=0" + +pre_check() { + # Hangs, possibly missing test data + vsed -i test/tests/smtp-auth -e '/Testing auth permanent failure with smtp/,/error/d' +} post_install() { for f in mailq sendmail; do From 15d2499b4d5be603902de1ecd51599ef22c883d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 11 May 2022 23:55:13 +0200 Subject: [PATCH 1956/2369] qdirstat-cache-writer: resolve conflict with qdirstat --- srcpkgs/qdirstat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template index 5016c664a01..d297cd50e41 100644 --- a/srcpkgs/qdirstat/template +++ b/srcpkgs/qdirstat/template @@ -1,7 +1,7 @@ # Template file for 'qdirstat' pkgname=qdirstat version=1.8 -revision=3 +revision=4 build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="zlib-devel qt5-devel" @@ -21,6 +21,6 @@ qdirstat-cache-writer_package() { depends="perl" pkg_install() { vmove usr/bin/qdirstat-cache-writer - vman man/qdirstat-cache-writer.1 + vmove usr/share/man/man1/qdirstat-cache-writer.1.gz } } From 6ab45118e1c98c5ea16ba41f20255dd0a6e4be1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 11 May 2022 23:55:29 +0200 Subject: [PATCH 1957/2369] zsh-completions: resolve conflict with cheat --- srcpkgs/zsh-completions/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/zsh-completions/template b/srcpkgs/zsh-completions/template index db1fa7a5f51..dfbb5cde85b 100644 --- a/srcpkgs/zsh-completions/template +++ b/srcpkgs/zsh-completions/template @@ -1,7 +1,7 @@ # Template file for 'zsh-completions' pkgname=zsh-completions version=0.33.0 -revision=1 +revision=2 depends="zsh" short_desc="Additional completions for Zsh" maintainer="Alexander Gehrke " @@ -16,6 +16,7 @@ post_patch() { do_install() { vmkdir usr/share/zsh/site-functions/ + rm src/_cheat # cheat package includes better one vcopy src/_* usr/share/zsh/site-functions/ vlicense LICENSE } From 4847a780255411ef3f02dd41d086adf03a5878d0 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 14 May 2022 18:28:39 +0300 Subject: [PATCH 1958/2369] toybox: update to 0.8.7. --- srcpkgs/toybox/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/toybox/template b/srcpkgs/toybox/template index 74b0a779e29..722e17bc230 100644 --- a/srcpkgs/toybox/template +++ b/srcpkgs/toybox/template @@ -1,6 +1,6 @@ # Template file for 'toybox' pkgname=toybox -version=0.8.5 +version=0.8.7 revision=1 create_wrksrc=yes short_desc="BSD-licensed alternative to busybox" @@ -8,7 +8,7 @@ maintainer="Steve Prybylski " license="0BSD" homepage="http://www.landley.net/toybox" distfiles="http://www.landley.net/toybox/downloads/toybox-${version}.tar.gz" -checksum=bfd230c187726347f7e31a1fc5841705871dfe4f3cbc6628f512b54e57360949 +checksum=b508bf336f82cb0739b77111f945931d1a143b5a53905cb753cd2607cfdd1494 post_extract() { mv toybox-${version} toybox @@ -40,6 +40,7 @@ _rm_failing_tests() { rm tests/hostname.test rm tests/losetup.test rm tests/rmdir.test + rm tests/rm.test } do_check() { From aa5eb7c874f81155639cbb4e5bdd54188b4b069f Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 14 May 2022 18:23:39 +0300 Subject: [PATCH 1959/2369] pidgin: update to 2.14.9. --- srcpkgs/pidgin/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template index 7b38bc31906..d9010fb67b4 100644 --- a/srcpkgs/pidgin/template +++ b/srcpkgs/pidgin/template @@ -1,7 +1,7 @@ # Template file for 'pidgin' pkgname=pidgin -version=2.14.8 -revision=2 +version=2.14.9 +revision=1 build_style=gnu-configure configure_args="--disable-schemas-install --disable-meanwhile --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv @@ -15,7 +15,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://pidgin.im/" distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2" -checksum=3f8085c0211c4ca1ba9f8a03889b3d60738432c1673b57b0086070ef6e094cca +checksum=1872d1629a26e9b775d9ec0bdd3d3fd348f721376f320b29bcd5ff3f0443222b python_version=2 lib32disabled=yes From e4327f92d30923a630a584002583105f0543e541 Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Tue, 3 May 2022 19:49:15 +0700 Subject: [PATCH 1960/2369] kdenlive: update to 22.04.1 - add opencv (for motion tracking) - remove vlc (only as optional media player) --- srcpkgs/kdenlive/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template index a4871c0af64..1cc4793c923 100644 --- a/srcpkgs/kdenlive/template +++ b/srcpkgs/kdenlive/template @@ -1,6 +1,6 @@ # Template file for 'kdenlive' pkgname=kdenlive -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends=" @@ -10,14 +10,14 @@ makedepends=" kdeclarative-devel kfilemetadata5-devel knewstuff-devel knotifyconfig-devel kplotting-devel mlt7-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel v4l-utils-devel ksolid-devel qt5-quickcontrols2-devel qt5-networkauth-devel" -depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc" +depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit opencv qt5-quickcontrols" checkdepends="$depends" short_desc="Non-linear video editor" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://kdenlive.org" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=7aa3fee6f2938664f2e35dae97a67ebfdedb6aec2bf4bbabfca5e7b1456c55c1 +checksum=ae879041f18ee89b3fef2dc85cbb6899bf184c433b234d0c2145085767952a4e # FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails make_check=extended From 34cbc6b0da564064b5c58e933cf38f9ea7d772c7 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 14 May 2022 21:12:51 -0500 Subject: [PATCH 1961/2369] consul: update to 1.12.0. --- srcpkgs/consul/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template index d31feecc270..9f3f4d50721 100644 --- a/srcpkgs/consul/template +++ b/srcpkgs/consul/template @@ -1,10 +1,10 @@ # Template file for 'consul' pkgname=consul -version=1.11.4 +version=1.12.0 revision=1 build_style=go go_import_path="github.com/hashicorp/consul" -_git_commit=944e8ce64201ab2bbe923b207883d08a4dcff73a +_git_commit=09a8cdb4a5c0c53201d7888d9fb618dde007cdd8 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. @@ -14,7 +14,7 @@ maintainer="iaroki " license="MPL-2.0" homepage="https://www.consul.io/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=253200fbf79aefee632c5cde9f90e6df6eddcb2766f2909b0d347c4438065126 +checksum=87b3fe01d0a772dc1cbab31cf38ab05d651d93cd1632aa289faf06988a65d617 post_install() { vlicense LICENSE From 0b89862e9fa7aff07c2331ea5994bbe3aceb7cbe Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 14 May 2022 21:21:12 -0500 Subject: [PATCH 1962/2369] vault: update to 1.10.3. --- srcpkgs/vault/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template index 111feb18627..c9243585313 100644 --- a/srcpkgs/vault/template +++ b/srcpkgs/vault/template @@ -1,11 +1,11 @@ # Template file for 'vault' pkgname=vault -version=1.10.0 +version=1.10.3 revision=1 build_style=go go_import_path="github.com/hashicorp/vault" go_build_tags="release" -_git_commit=fcbe948b2542a13ee8036ad07dd8ebf8554f56cb +_git_commit=af866591ee60485f05d6e32dd63dde93df686dfb go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}" depends="libcap-progs" short_desc="Manage Secrets and Protect Sensitive Data" @@ -13,7 +13,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=4b3303af72b9383369d6219dc88beaef3b343b262625e5d7c6a309ae9286d8c2 +checksum=5f7d3d2fcd856b5595182e02c40c976b520658be3cca8638edac5a20869c8373 system_accounts="_vault" make_dirs="/var/lib/vault 0700 _vault _vault /etc/vault 0750 root _vault" From 3eca36e4c9fdcd62159012e51fb74bb5e7ce5687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sun, 15 May 2022 00:29:14 -0300 Subject: [PATCH 1963/2369] linux5.4: update i686 config. --- srcpkgs/linux5.4/files/i386-dotconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux5.4/files/i386-dotconfig b/srcpkgs/linux5.4/files/i386-dotconfig index e27c6fe9edf..fa6a30fd709 100644 --- a/srcpkgs/linux5.4/files/i386-dotconfig +++ b/srcpkgs/linux5.4/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 5.4.180 Kernel Configuration +# Linux/i386 5.4.193 Kernel Configuration # # @@ -2143,6 +2143,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3449,8 +3450,6 @@ CONFIG_HYPERV_NET=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support From de7bd4b5077aae0df2e57d7ce43f6feeb08f3f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sun, 15 May 2022 00:29:40 -0300 Subject: [PATCH 1964/2369] horizon: update to 2.3.0. --- srcpkgs/horizon/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template index 8615a24596f..1165f67ab71 100644 --- a/srcpkgs/horizon/template +++ b/srcpkgs/horizon/template @@ -1,6 +1,6 @@ # Template file for 'horizon' pkgname=horizon -version=2.1.0 +version=2.3.0 revision=1 build_style=gnu-makefile make_build_args="GOLD=" @@ -9,14 +9,14 @@ make_use_env=yes hostmakedepends="pkg-config glib-devel" makedepends="cairomm-devel librsvg-devel yaml-cpp-devel sqlite-devel boost-devel glm libgit2-devel libcurl-devel occt-devel cppzmq libpodofo-devel libzip-devel - gtkmm-devel libepoxy-devel libsodium-devel" + gtkmm-devel libepoxy-devel libsodium-devel libarchive-devel libspnav-devel" short_desc="Free EDA package" maintainer="Érico Nogueira " license="GPL-3.0-only" homepage="https://horizon-eda.org/" changelog="https://raw.githubusercontent.com/horizon-eda/horizon/master/CHANGELOG.md" distfiles="https://github.com/horizon-eda/horizon/archive/v${version}.tar.gz" -checksum=2ba7a64ef0d8f22ad12e6a5a9c108f865eeb468f954f51ee5fbc03e6a847549a +checksum=32045e46ad54469cce926508c09d0d1701dc49fb6ab613be2bc99b0e0a0662b3 if [ "$CROSS_BUILD" ]; then make_build_args+=" INC_OCE=-I$XBPS_CROSS_BASE/usr/include/opencascade" From affe9132cb5e58279b5c1839ce85e77aaba52000 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:09:02 +0200 Subject: [PATCH 1965/2369] libtpms: update to 0.9.4. --- srcpkgs/libtpms/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template index 9d8d52f00aa..ad897ea2a62 100644 --- a/srcpkgs/libtpms/template +++ b/srcpkgs/libtpms/template @@ -1,6 +1,6 @@ # Template file for 'libtpms' pkgname=libtpms -version=0.9.1 +version=0.9.4 revision=1 build_style=gnu-configure hostmakedepends="libtool automake pkg-config" @@ -10,7 +10,7 @@ maintainer="John " license="BSD-3-Clause, custom:IBM" homepage="https://github.com/stefanberger/libtpms" distfiles="https://github.com/stefanberger/libtpms/archive/refs/tags/v${version}.tar.gz" -checksum=9a4d1ed07b78142c394faad1a1481771d470048f5859e80593fe42c82e5635a5 +checksum=61d6f947a60686ec98e7cc5861f0999bd6cdaa1fc2b8901b8dc68d1a715b35cf pre_configure() { autoreconf -f -i From 87aecc90d287658304ab740652abbb0bc1d2acbb Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:09:04 +0200 Subject: [PATCH 1966/2369] swtpm: update to 0.7.3. --- srcpkgs/swtpm/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template index dd12bc9e41f..d1eeb0a56a5 100644 --- a/srcpkgs/swtpm/template +++ b/srcpkgs/swtpm/template @@ -1,6 +1,6 @@ # Template file for 'swtpm' pkgname=swtpm -version=0.7.0 +version=0.7.3 revision=1 build_style=gnu-configure configure_args="--with-gnutls ac_cv_path_TCSD=" @@ -14,11 +14,11 @@ maintainer="John " license="BSD-3-Clause" homepage="https://github.com/stefanberger/swtpm" distfiles="https://github.com/stefanberger/swtpm/archive/refs/tags/v${version}.tar.gz" -checksum=bed41871ad42ec852c450f5764be36b6c16456b943b912351eca9c29ce382976 +checksum=e856d1f5842fb3335164f02f2c545dd329efbc3416db20b7a327e991a4cd49c8 # check expects that root directory is setup fully for swtpm with e.g. tss user created make_check=no ignore_elf_files="/usr/share/swtpm/swtpm-localca" -make_dirs="/usr/lib/swtpm-localca 0750 tss root" +make_dirs="/var/lib/swtpm-localca 0750 tss root" conf_files="/etc/swtpm-localca.conf /etc/swtpm-localca.options From bf8f0b767874e5f9615aff852c6a5b823ac16332 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:09:13 +0200 Subject: [PATCH 1967/2369] bluedevil: update to 5.24.5. --- srcpkgs/bluedevil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template index b76585975dd..7c47f2823be 100644 --- a/srcpkgs/bluedevil/template +++ b/srcpkgs/bluedevil/template @@ -1,6 +1,6 @@ # Template file for 'bluedevil' pkgname=bluedevil -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/bluedevil" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=83778e9cd952c6efeb786395d3fb9f5d4e6aa65d2ef2bc02ad7d256a3201f0d6 +checksum=c96999c1400804e8bddc8b9801c4951f82daca83110e036bdc9c89faaeb31efa if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel" From 1e6d08b3006645cb4d26d3dba43400de52c6732f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:09:14 +0200 Subject: [PATCH 1968/2369] breeze-gtk: update to 5.24.5. --- srcpkgs/breeze-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template index 20473061da4..403f6fb2677 100644 --- a/srcpkgs/breeze-gtk/template +++ b/srcpkgs/breeze-gtk/template @@ -1,6 +1,6 @@ # Template file for 'breeze-gtk' pkgname=breeze-gtk -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules sassc python3 python3-cairo" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/breeze-gtk" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=b2fe8150a8576fb39d26b809e6b9cb06e2c2d2b039558ad75307d62ed857a168 +checksum=23716cc08d570ddcf0e739fef2f585f3469d801313ab2c0ba89f494f93f94530 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel" From 3146dba326b3417f0c0803f3b851b2b4196b68b9 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:09:54 +0200 Subject: [PATCH 1969/2369] breeze: update to 5.24.5. --- srcpkgs/breeze/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template index 64bc70e3be0..3b55c9d71a5 100644 --- a/srcpkgs/breeze/template +++ b/srcpkgs/breeze/template @@ -1,6 +1,6 @@ # Template file for 'breeze' pkgname=breeze -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/breeze" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=e369ee21e6aab1d5e3ae222ecd84bdb59f3d29ce3b61965b498bbfe84c949805 +checksum=8525a6b50da5523c3d21c1223e0f2b8ad4a2d147e48e5d128e1c6ee06baaf0a3 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 70271a0280a4a2c07c46c0e2e5364ab2042aa6bf Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:09:56 +0200 Subject: [PATCH 1970/2369] kactivitymanagerd: update to 5.24.5. --- srcpkgs/kactivitymanagerd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template index e8fc45c0000..d53668245c2 100644 --- a/srcpkgs/kactivitymanagerd/template +++ b/srcpkgs/kactivitymanagerd/template @@ -1,6 +1,6 @@ # Template file for 'kactivitymanagerd' pkgname=kactivitymanagerd -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake build_helper="qemu" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kactivitymanagerd" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=8128371fd75f7dd4ccb2203ad775e6f12db28bbb64047d0fd63eb745d8735529 +checksum=ea9276b022264b3b92a1307be83ca0030a5f12270d9ad5ff1e92f82c1928cd48 From 92f9be02be3aa349e91697c6e88e72dc21a4b755 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:09:59 +0200 Subject: [PATCH 1971/2369] kde-cli-tools: update to 5.24.5. --- srcpkgs/kde-cli-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template index 0f61ce9efc6..d8774cbd926 100644 --- a/srcpkgs/kde-cli-tools/template +++ b/srcpkgs/kde-cli-tools/template @@ -1,6 +1,6 @@ # Template file for 'kde-cli-tools' pkgname=kde-cli-tools -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kde-cli-tools" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=ffe4c8d3f4e97c57801360ba32cb70c961ad5796d56d4f0bae10ab2ec68759f0 +checksum=e7f0dd3469b7b3152e72514f1f6ce544514067011ebd0137cb0957d37ad6d329 post_install() { ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin From 1bc3052cc1106a07aedb579b050d4a7fdc2f311e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:01 +0200 Subject: [PATCH 1972/2369] kde-gtk-config5: update to 5.24.5. --- srcpkgs/kde-gtk-config5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template index ca92bc05101..3bd609544f8 100644 --- a/srcpkgs/kde-gtk-config5/template +++ b/srcpkgs/kde-gtk-config5/template @@ -1,6 +1,6 @@ # Template file for 'kde-gtk-config5' pkgname=kde-gtk-config5 -version=5.24.4 +version=5.24.5 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -15,7 +15,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kde-gtk-config" distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz" -checksum=b17aaad5f96890426a8864ba51f026732007e47fd42c4ce4df3e469b455f570b +checksum=98a19c230fd4559818276c13295250bd3508e2869f979f8c8472d339299ee869 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kcoreaddons" From 3f364e19a9fc6d7f218b571f131522b57ebcb0a0 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:03 +0200 Subject: [PATCH 1973/2369] kdecoration: update to 5.24.5. --- srcpkgs/kdecoration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template index 511d4d62709..cba7c08d197 100644 --- a/srcpkgs/kdecoration/template +++ b/srcpkgs/kdecoration/template @@ -1,6 +1,6 @@ # Template file for 'kdecoration' pkgname=kdecoration -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kdecoration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=2c999206c51a6a6c5ecda211773276438f0069a2e1c81d4903ae5712c6f28c15 +checksum=273087d6345fd1f7bcefa570f56123cde4355832952dba6cb228fe04a6a152c2 kdecoration-devel_package() { short_desc+=" - development" From 94928140a5eba619fb84e4704e6cab8ae5215a3f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:05 +0200 Subject: [PATCH 1974/2369] kdeplasma-addons5: update to 5.24.5. --- srcpkgs/kdeplasma-addons5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template index 22c2981a4dd..169fbd46faa 100644 --- a/srcpkgs/kdeplasma-addons5/template +++ b/srcpkgs/kdeplasma-addons5/template @@ -1,6 +1,6 @@ # Template file for 'kdeplasma-addons5' pkgname=kdeplasma-addons5 -version=5.24.4 +version=5.24.5 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kdeplasma-addons" distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz" -checksum=d721d32d16f34ef1066bdf2fcb781d5bc1aca7cf5cdf3a71c6fef2dfe668680d +checksum=3db52bc3c594d92deea3cfcb3112b4fa6ce328b7481acaa79187dab274e5e80e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 36cce8263112fa41e69f51cf71f6b944c4b2ab61 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:07 +0200 Subject: [PATCH 1975/2369] kgamma5: update to 5.24.5. --- srcpkgs/kgamma5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template index 75f1ab3613c..dd6c2e7ad48 100644 --- a/srcpkgs/kgamma5/template +++ b/srcpkgs/kgamma5/template @@ -1,6 +1,6 @@ # Template file for 'kgamma5' pkgname=kgamma5 -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kgamma5" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=73ed9897b2281a8ddd7b47f063d548fa71b683662a63b5648ba590160bcf3f7c +checksum=8086897a9faa9b1be0222a9505b05b6d2d89f2d730f1f461da63395c581bf1c4 From ce687c764b2b2c206e58da088c025e04457049e3 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:10 +0200 Subject: [PATCH 1976/2369] khotkeys: update to 5.24.5. --- srcpkgs/khotkeys/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template index 38c24c59dde..8e4d7a53334 100644 --- a/srcpkgs/khotkeys/template +++ b/srcpkgs/khotkeys/template @@ -1,6 +1,6 @@ # Template file for 'khotkeys' pkgname=khotkeys -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/plasma/khotkeys" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=5aac75b05f0b5a63ea924b02645bbfacfe18fef3d5c23182b482ebc5d17f6d0c +checksum=7a2307b4ca1dca1b240a59ea4bbbceb48b1f6759c9ce3bb36b3cab7274f6a71a if [ "$CROSS_BUILD" ]; then configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" From 2db4f511dde31dc818df0ba4d0d6aca7a15a3da6 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:13 +0200 Subject: [PATCH 1977/2369] kinfocenter: update to 5.24.5. --- srcpkgs/kinfocenter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template index 34fe68536c2..9c0cf6f993f 100644 --- a/srcpkgs/kinfocenter/template +++ b/srcpkgs/kinfocenter/template @@ -1,6 +1,6 @@ # Template file for 'kinfocenter' pkgname=kinfocenter -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only" homepage="https://invent.kde.org/plasma/kinfocenter" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=dc5b84964de4b68e45300477039c656d622a9546340e997eb8249de6a532b838 +checksum=c1d241c05ebc578633512bf304b7e5bf461c7e63e45285913e212786eac14b30 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel" From 9e3d6247e00838162ed3be0305489873f271782f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:16 +0200 Subject: [PATCH 1978/2369] kmenuedit: update to 5.24.5. --- srcpkgs/kmenuedit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template index 3f4a699195b..b1a389b142a 100644 --- a/srcpkgs/kmenuedit/template +++ b/srcpkgs/kmenuedit/template @@ -1,6 +1,6 @@ # Template file for 'kmenuedit' pkgname=kmenuedit -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kmenuedit" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=147a7e9a15393375c2b22b5dfb025a87f3356cf756cf3b17615ba989bb443466 +checksum=78a776a8cd6db98334335b68011ac887f9b27bb52cb4d0b504d14aafe032340a From a9dd84c6a34f4174181a16c7646c0d8cbe6f69cc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:18 +0200 Subject: [PATCH 1979/2369] kscreen: update to 5.24.5. --- srcpkgs/kscreen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template index c7f235baf15..12e9a3fc231 100644 --- a/srcpkgs/kscreen/template +++ b/srcpkgs/kscreen/template @@ -1,6 +1,6 @@ # Template file for 'kscreen' pkgname=kscreen -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kscreen" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=3048edb7e1231b0d7a33b2e10a202e6fce34e34f47079fc87f8177d7aa871b6a +checksum=d9c351ad25783596aae466e305ad80de48ff3094a219ec6ffe08c7870ea3b5bc if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 7676c4720013a481c19b7400a44298136849c016 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:19 +0200 Subject: [PATCH 1980/2369] kscreenlocker: update to 5.24.5. --- srcpkgs/kscreenlocker/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template index 4b50eb78ee5..4f2877a5ae4 100644 --- a/srcpkgs/kscreenlocker/template +++ b/srcpkgs/kscreenlocker/template @@ -1,6 +1,6 @@ # Template file for 'kscreenlocker' pkgname=kscreenlocker -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kscreenlocker" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=fb226273064422f9f73b6b091e26396349e0cfd53a88398b79fa2acd1540ecf7 +checksum=3270a1845c9fc694a50db38de4c27586d2f488152e1bcf88be0088d6799bf98e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wayland-devel" From 49a29486751a1bcb853bf416e2d9b8b198dc0547 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:21 +0200 Subject: [PATCH 1981/2369] ksshaskpass: update to 5.24.5. --- srcpkgs/ksshaskpass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template index 4deaf3217e6..15e89443b35 100644 --- a/srcpkgs/ksshaskpass/template +++ b/srcpkgs/ksshaskpass/template @@ -1,6 +1,6 @@ # Template file for 'ksshaskpass' pkgname=ksshaskpass -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,5 +12,5 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/ksshaskpass" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=34c5d4f196d09c4ebe8990d3761bc70059436e272ad46a761e71b5910e0f44dd +checksum=3fe20b23ae5f777d7dd15069212c15826121ce70e5260283d61ad34bad8383cb alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass" From 97a2562e97104261dcc792586241d172fdd51b76 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:23 +0200 Subject: [PATCH 1982/2369] ksystemstats: update to 5.24.5. --- srcpkgs/ksystemstats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template index f912db7fea5..e4d9ab1e634 100644 --- a/srcpkgs/ksystemstats/template +++ b/srcpkgs/ksystemstats/template @@ -1,6 +1,6 @@ # Template file for 'ksystemstats' pkgname=ksystemstats -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake gettext @@ -12,4 +12,4 @@ maintainer="John " license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only" homepage="https://invent.kde.org/plasma/ksystemstats" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=8dc735e9133ab01e537d71121b0e76e078f4fffce2d86b4c5d62c85878ee47dd +checksum=0bacd8f8a494addb4afa37d59236429f8898ab5b80882abde44f41182aa759f7 From 4d9ef0996ba0d0703d99f02343a1810cdfdf751a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:25 +0200 Subject: [PATCH 1983/2369] kwallet-pam: update to 5.24.5. --- srcpkgs/kwallet-pam/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template index 9e206f9e5cc..54376f6b856 100644 --- a/srcpkgs/kwallet-pam/template +++ b/srcpkgs/kwallet-pam/template @@ -1,6 +1,6 @@ # Template file for 'kwallet-pam' pkgname=kwallet-pam -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules" @@ -11,4 +11,4 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kwallet-pam" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=99d4e1acc24e89376f6eb5fad78f6055b4c3a9fff73459845af32841743bdf68 +checksum=238ed9b80fe3fc72d10a728801c873a0c85db9b9823f3a62ef7d39d6e9a4acea From 695b053e18c60fa29ffe13acb844ab6ce94b234c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:27 +0200 Subject: [PATCH 1984/2369] kwayland-integration: update to 5.24.5. --- srcpkgs/kwayland-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template index d4dc57cef6d..4c671829a5d 100644 --- a/srcpkgs/kwayland-integration/template +++ b/srcpkgs/kwayland-integration/template @@ -1,6 +1,6 @@ # Template file for 'kwayland-integration' pkgname=kwayland-integration -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/kwayland-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=d2e74baa0e2966b92330b8df7567b0b1cc85a71ea24c3f453da39aed035aceb2 +checksum=806a9607bb70f95b08ccad55f28eaf0a85adc1439afa2d2717b7c9d6c33022ec From bbf9f5ed1e3c710a1640303b3275162ffe9a36c0 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:29 +0200 Subject: [PATCH 1985/2369] kwayland-server: update to 5.24.5. --- srcpkgs/kwayland-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template index 19bd5a8345a..3b1b1efb8d8 100644 --- a/srcpkgs/kwayland-server/template +++ b/srcpkgs/kwayland-server/template @@ -1,6 +1,6 @@ # Template file for 'kwayland-server' pkgname=kwayland-server -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake build_helper="qemu" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/kwayland-server" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=d1790bd7584dce9a36a432819b170ce72d34d5df79083b1b41dfe3e021b6e988 +checksum=2ddabe29794489d11096ed831ad4d5c1626130019322d4305d58df84c835b279 kwayland-server-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From f8328e79fcd07270e14c49fabfb25800eb548501 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:40 +0200 Subject: [PATCH 1986/2369] kwin: update to 5.24.5. --- srcpkgs/kwin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template index 855d5bcaa84..3aac33c97cd 100644 --- a/srcpkgs/kwin/template +++ b/srcpkgs/kwin/template @@ -1,6 +1,6 @@ # Template file for 'kwin' pkgname=kwin -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake build_helper=qemu @@ -21,7 +21,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kwin" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=e2142321a9b1189665354838a66baeb2189235b705efca2364777bc3a3698ce3 +checksum=f35e15254cebeb8afc5eae1c694a603e04097fe3e7e0033a5f5fc255835eaf82 build_options="pipewire" build_options_default="pipewire" From 9c0b8ba804030799135eaa3745c1476566435efb Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:42 +0200 Subject: [PATCH 1987/2369] kwrited: update to 5.24.5. --- srcpkgs/kwrited/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template index 38a32a832c3..b33f3a1963a 100644 --- a/srcpkgs/kwrited/template +++ b/srcpkgs/kwrited/template @@ -1,6 +1,6 @@ # Template file for 'kwrited' pkgname=kwrited -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,4 +11,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kwrited" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=62d700b673102f2740ed34e305902260c7035f5c8cc6ef19494a98f3088c0649 +checksum=6204a31fe1e160c8d664e68b30a1d91d31ead2bbfd7cd5841eeb39cb91dcd23d From e4cc68338d184c4dbf50359d2422e4f1b4fcdaa1 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:44 +0200 Subject: [PATCH 1988/2369] layer-shell-qt: update to 5.24.5. --- srcpkgs/layer-shell-qt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template index 0249259ea03..9fd4f43f792 100644 --- a/srcpkgs/layer-shell-qt/template +++ b/srcpkgs/layer-shell-qt/template @@ -1,6 +1,6 @@ # Template file for 'layer-shell-qt' pkgname=layer-shell-qt -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/layer-shell-qt" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=a0979fdb2f61a6d2c68fe2d93573d5b46597021600d748a379d18cb9af711e0f +checksum=f591600cc0697cc94ce765bd17b1f9e3ab52d3d58c4de89e2820de3a7377b279 layer-shell-qt-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From e72e661e07ebe4371dc5de6cf78437dd6e044b3b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:45 +0200 Subject: [PATCH 1989/2369] libkscreen: update to 5.24.5. --- srcpkgs/libkscreen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template index 1b82bcea103..108314ca7b5 100644 --- a/srcpkgs/libkscreen/template +++ b/srcpkgs/libkscreen/template @@ -1,6 +1,6 @@ # Template file for 'libkscreen' pkgname=libkscreen -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/libkscreen" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=016dec6d912b2a733ebdd26bfe5e31029651bd5b4e476d95a541765a68dd67f7 +checksum=7ff118af3320e53d2c1cb9f324d2ee13d087062ef354d219f20503da5ac06fc9 libkscreen-devel_package() { short_desc+=" - development" From 50ecdfba56784ef9a7af10979c983b39ceb4e8d4 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:47 +0200 Subject: [PATCH 1990/2369] libksysguard: update to 5.24.5. --- srcpkgs/libksysguard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template index c5cc1f76430..d635b103f32 100644 --- a/srcpkgs/libksysguard/template +++ b/srcpkgs/libksysguard/template @@ -1,6 +1,6 @@ # Template file for 'libksysguard' pkgname=libksysguard -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/libksysguard" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=76da2a7fb7f760c55111db756d91dd3041721baa8a1f8863ad9e0bc0a6a02402 +checksum=b06cb33a6e17c04c47ed4ded72a122acd6a2af60776c18719cdd74be27eb41ec build_options="webengine" From 39e9e5b2e32737bba814e0927d41e2d74e7bebec Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:49 +0200 Subject: [PATCH 1991/2369] milou: update to 5.24.5. --- srcpkgs/milou/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template index fe5a6384746..539e9435f37 100644 --- a/srcpkgs/milou/template +++ b/srcpkgs/milou/template @@ -1,6 +1,6 @@ # Template file for 'milou' pkgname=milou -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LPGL-2.1-or-later" homepage="https://invent.kde.org/plasma/milou" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=3109ad6c97415d74fccdfd26681360ff0925e58af7a1c72905437eb99faff37c +checksum=c1594e8b575d7de7b7cafe8a6f37dbe7c75d338075c6fa0fd8ec08d283ff05e6 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 064f868cd9190b92477788d44e09a139ed1c904b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:57 +0200 Subject: [PATCH 1992/2369] oxygen: update to 5.24.5. --- srcpkgs/oxygen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template index 2bfa8498a22..4cf06488fa6 100644 --- a/srcpkgs/oxygen/template +++ b/srcpkgs/oxygen/template @@ -1,6 +1,6 @@ # Template file for 'oxygen' pkgname=oxygen -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/oxygen" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=804d033afab3f16319d92a8e5dacfb2a5797f8661a64029ee9e9b3c0b0f87ab4 +checksum=3b58ef1edd0d704113adacb50b163dbc34a71fcdd9762a97beb23d53393700be From 111fb75f8ea3a24d18bd9c5af40b797a91249099 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:10:59 +0200 Subject: [PATCH 1993/2369] plasma-browser-integration: update to 5.24.5. --- srcpkgs/plasma-browser-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template index ad1a10231be..8955230045e 100644 --- a/srcpkgs/plasma-browser-integration/template +++ b/srcpkgs/plasma-browser-integration/template @@ -1,6 +1,6 @@ # Template file for 'plasma-browser-integration' pkgname=plasma-browser-integration -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF @@ -14,4 +14,4 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/plasma-browser-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=677af76b6f7072312d63bd8230af6e6920d7b69942ad69cdf0a29356ce695bc1 +checksum=1b67baf45996b66c63e88a6df5572c83a3f36b777a9df2802c192abd8df5cbf7 From 58bffbd2c5d076a908b087dccdfbe52a6bed5896 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:11:09 +0200 Subject: [PATCH 1994/2369] plasma-desktop: update to 5.24.5. --- srcpkgs/plasma-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template index 6d2b3752e21..9bc60832c68 100644 --- a/srcpkgs/plasma-desktop/template +++ b/srcpkgs/plasma-desktop/template @@ -1,6 +1,6 @@ # Template file for 'plasma-desktop' pkgname=plasma-desktop -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF @@ -18,6 +18,6 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2" homepage="https://invent.kde.org/plasma/plasma-desktop" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=b0e23046300e49acf93d9181d0c8dda2008a9a843a441af2528a91abc5c7d025 +checksum=af58796c43a7eb909d4c6782e899e428c9b569a9ab92eb34ba7391c763002c46 replaces="user-manager>=0" python_version=3 From c782eb4658502b5f93be48dc54553155bafd11ab Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:11:11 +0200 Subject: [PATCH 1995/2369] plasma-disks: update to 5.24.5. --- srcpkgs/plasma-disks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template index 025d7ab6e17..423c637a22b 100644 --- a/srcpkgs/plasma-disks/template +++ b/srcpkgs/plasma-disks/template @@ -1,6 +1,6 @@ # Template file for 'plasma-disks' pkgname=plasma-disks -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/plasma-disks" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=cf8a33e81b8d3b6b2d94374eb673adec19639eef8c2df803e1721630c67525d6 +checksum=139495ade44ac725856bb4567dfd503fa9eb92c0f7dcca268aa1286e59a974f4 From 9b0882728449346026fca97e2c273859b3063790 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:11:14 +0200 Subject: [PATCH 1996/2369] plasma-firewall: update to 5.24.5. --- srcpkgs/plasma-firewall/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template index be8466cd08c..9e3576a024c 100644 --- a/srcpkgs/plasma-firewall/template +++ b/srcpkgs/plasma-firewall/template @@ -1,6 +1,6 @@ # Template file for 'plasma-firewall' pkgname=plasma-firewall -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcmutils @@ -11,4 +11,4 @@ maintainer="John " license="GPL-2.0-only OR GPL-3.0-only" homepage="https://invent.kde.org/network/plasma-firewall" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=a2bae12766e6536b7cd6d6445368f8249bf79d488d30dc5d57e2aed6442d2f39 +checksum=84a49688753645c234dec4ad84ac726a3aa2def18795e2f139cff21c16bd6956 From 75e5b11bbfb8392dc0f92d5995ae9ac5304d3162 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:11:16 +0200 Subject: [PATCH 1997/2369] plasma-integration: update to 5.24.5. --- srcpkgs/plasma-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template index b5f6098c11d..f62cd003506 100644 --- a/srcpkgs/plasma-integration/template +++ b/srcpkgs/plasma-integration/template @@ -1,6 +1,6 @@ # Template file for 'plasma-integration' pkgname=plasma-integration -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,4 +14,4 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/plasma/plasma-integration" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=73d4993d2c7aeabbb068e8d28821566d04f2dcb882dd1d92feadc2062b3b4db4 +checksum=cd4490e1e23276bd4f7827ec1c6a3dee6703b8065bd5b4f3fad8112b53eadf7a From b626712cbbbaba49f88c87b3900adee7075756cd Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:11:18 +0200 Subject: [PATCH 1998/2369] plasma-nm: update to 5.24.5. --- srcpkgs/plasma-nm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template index ee283ed3c55..a6339194bc8 100644 --- a/srcpkgs/plasma-nm/template +++ b/srcpkgs/plasma-nm/template @@ -1,6 +1,6 @@ # Template file for 'plasma-nm' pkgname=plasma-nm -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-nm" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=086c28cfdaa6f4de785662ccd8123cd48b2a333fbaa2ca70b2a6d9dc3622ec2f +checksum=ae1026cf7d2fb60f862ac9b985da4f7001f54267602062e461d0849f1d2fb429 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From 6962b53c12205057e9526bfd670e28a435bc2bc1 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:11:20 +0200 Subject: [PATCH 1999/2369] plasma-pa: update to 5.24.5. --- srcpkgs/plasma-pa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template index 36cffcd23b0..98baa5aaf91 100644 --- a/srcpkgs/plasma-pa/template +++ b/srcpkgs/plasma-pa/template @@ -1,6 +1,6 @@ # Template file for 'plasma-pa' pkgname=plasma-pa -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-pa" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=ffe5b915e5e1d2e5d4de719502793dd5b91cd9715cc44f82c88fc5ff0556d325 +checksum=068f0d393a87d3f3c8031eaecd1c2d2bdb17e73c510e020280ab18da3c15f8d1 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel" From 414965145f0a9c19b608a2948d8aa260cc5fd873 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:11:22 +0200 Subject: [PATCH 2000/2369] plasma-sdk: update to 5.24.5. --- srcpkgs/plasma-sdk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template index 98e9f404e1c..6af830b1aae 100644 --- a/srcpkgs/plasma-sdk/template +++ b/srcpkgs/plasma-sdk/template @@ -1,6 +1,6 @@ # Template file for 'plasma-sdk' pkgname=plasma-sdk -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-sdk" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=ecf35743a28c350aada480248bbc138b726315e53f36bb39afe5fba0d27d6ffe +checksum=1cd4db58018bc827572e5d2f08d6a9a037dd7a0cd0dd72c858e7c42d27d36534 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework" From a5e45d6ff4eb88502be805c93f7850fa21ffab0e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:11:24 +0200 Subject: [PATCH 2001/2369] plasma-systemmonitor: update to 5.24.5. --- srcpkgs/plasma-systemmonitor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template index 8a77dfdc149..d9ab9d8da69 100644 --- a/srcpkgs/plasma-systemmonitor/template +++ b/srcpkgs/plasma-systemmonitor/template @@ -1,6 +1,6 @@ # Template file for 'plasma-systemmonitor' pkgname=plasma-systemmonitor -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake @@ -12,4 +12,4 @@ maintainer="John " license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only" homepage="https://invent.kde.org/plasma/plasma-systemmonitor" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=1ff2853be75349892642a0144cc64a15c5f1bffacb0637e8b5c269055ead9a49 +checksum=156bd761c4e2e334475ed0e7d0de6bc6f5009197f168d53c846c5c5b67e1a0ef From 0f068fea77d1e9359c74a45c52eb7c7e5af2f39d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:11:26 +0200 Subject: [PATCH 2002/2369] plasma-thunderbolt: update to 5.24.5. --- srcpkgs/plasma-thunderbolt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template index 6dc40e6212f..8869f2df4f1 100644 --- a/srcpkgs/plasma-thunderbolt/template +++ b/srcpkgs/plasma-thunderbolt/template @@ -1,6 +1,6 @@ # Template file for 'plasma-thunderbolt' pkgname=plasma-thunderbolt -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kcmutils @@ -12,7 +12,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/plasma/plasma-thunderbolt" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=1efecdd4b5e3302b37ae28964cd371d404189f7879a9752f000b6df4745b0ab3 +checksum=9485a89477c629083be0933f44ee96ec65f079c39b16a1ba5f131bb0044d19e0 do_check() { : # Requires running dbus and bolt services From 11a80cd77ae10bc1c1bd87e826cb38d856972f0f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:11:28 +0200 Subject: [PATCH 2003/2369] plasma-vault: update to 5.24.5. --- srcpkgs/plasma-vault/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template index 7010aff50a8..04d057b95eb 100644 --- a/srcpkgs/plasma-vault/template +++ b/srcpkgs/plasma-vault/template @@ -1,6 +1,6 @@ # Template file for 'plasma-vault' pkgname=plasma-vault -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake @@ -14,4 +14,4 @@ maintainer="Giuseppe Fierro " license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/KDE/plasma-vault" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=0169c2b8d48fbfccf132317f62cec342d2f1cbc7352e52a513ca575198f84966 +checksum=8122c33727ce5b9c338bdbfe7a96086dedbe9932a73c08cfd39863fe9dff9e99 From 991f90ec7cd723bdd27729c7c5df29f2bdcc0303 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:12:50 +0200 Subject: [PATCH 2004/2369] plasma-workspace-wallpapers: update to 5.24.5. --- srcpkgs/plasma-workspace-wallpapers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template index f0f8e072fbe..d9b6085b81d 100644 --- a/srcpkgs/plasma-workspace-wallpapers/template +++ b/srcpkgs/plasma-workspace-wallpapers/template @@ -1,6 +1,6 @@ # Template file for 'plasma-workspace-wallpapers' pkgname=plasma-workspace-wallpapers -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -10,4 +10,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=243cf6bb613d30ccb92e183938dcd3e02c1c7a11624a447c35c56a5eac3def42 +checksum=119b6732ac14447e49362d9544ff4431ed703dc03e7854926fbf72fd49ab4b29 From b9f1df0f1f55a7b849fb8178af225c6cd3a32ec3 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:11 +0200 Subject: [PATCH 2005/2369] plasma-workspace: update to 5.24.5. --- srcpkgs/plasma-workspace/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index ac82a06c4a9..aa7680e4d8c 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -1,6 +1,6 @@ # Template file for 'plasma-workspace' pkgname=plasma-workspace -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF @@ -23,7 +23,7 @@ maintainer="John " license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-workspace" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=5b0e40b090d6bd1fe1f902a60633e4417ce711b34c32bfd2fce5b16bb9b2ec70 +checksum=b9912691e0becfa0839dbf7750ea24729b72bad0216bef27584f9faf882064f6 build_options="pipewire" build_options_default="pipewire" From 32ab4722790d9484533b9e4c2a8e9edca1eb6282 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:13 +0200 Subject: [PATCH 2006/2369] polkit-kde-agent: update to 5.24.5. --- srcpkgs/polkit-kde-agent/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template index 84ef537290a..56a84b2d289 100644 --- a/srcpkgs/polkit-kde-agent/template +++ b/srcpkgs/polkit-kde-agent/template @@ -1,6 +1,6 @@ # Template file for 'polkit-kde-agent' pkgname=polkit-kde-agent -version=5.24.4 +version=5.24.5 revision=1 wrksrc="${pkgname}-1-${version}" build_style=cmake @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://commits.kde.org/polkit-kde-agent" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz" -checksum=955246c593d0332bfbe386e81aaf7714e9ac8b8e7743c8c2e4f334b28dd685ad +checksum=89a61cc4f2dee58dd420317b0732a67f954cd22f03d47c4bb33d9c6a5361e870 From fd375471b9879a368778581805d8619bf535abb2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:16 +0200 Subject: [PATCH 2007/2369] powerdevil: update to 5.24.5. --- srcpkgs/powerdevil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template index 32ac96524c8..bb5713c0e60 100644 --- a/srcpkgs/powerdevil/template +++ b/srcpkgs/powerdevil/template @@ -1,6 +1,6 @@ # Template file for 'powerdevil' pkgname=powerdevil -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/powerdevil" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=ef70c00e36d4ddbaedeb0efeba68523289e6e112b12951460c8d36075de9546a +checksum=964ca1b876005595c361add1eab5fa80c8d63da12c1201bdcd234914c6cc23f3 From 170d46a9b461310c0e6c3198b5d85c82abdcc615 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:18 +0200 Subject: [PATCH 2008/2369] sddm-kcm: update to 5.24.5. --- srcpkgs/sddm-kcm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template index e0b11b4e4cd..a25508f6fd3 100644 --- a/srcpkgs/sddm-kcm/template +++ b/srcpkgs/sddm-kcm/template @@ -1,6 +1,6 @@ # Template file for 'sddm-kcm' pkgname=sddm-kcm -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,4 +14,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/sddm-kcm" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=bef347b9e066a756d71263b19552fbbf9b8a1d6d22861060bdfd1ead5ab9d85d +checksum=cf9262036c4b3c149663335ab7b3770705924554e227e924dee3c4cfae83e597 From 18dc6c15f76d5e4b95c104f95a77cea8bd47244f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:20 +0200 Subject: [PATCH 2009/2369] systemsettings: update to 5.24.5. --- srcpkgs/systemsettings/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template index b18700451dd..8bdaf8cd638 100644 --- a/srcpkgs/systemsettings/template +++ b/srcpkgs/systemsettings/template @@ -1,6 +1,6 @@ # Template file for 'systemsettings' pkgname=systemsettings -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,4 +14,4 @@ maintainer="John " license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://invent.kde.org/plasma/systemsettings" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=69921f98956b3559f8c37821b67d32ac8d6aef254888c15df8f86f99903e1533 +checksum=5b72b53f0bd8760b35844732a60f99713d45d0f80cecaca80de965e84effe9e5 From bb09adc352bc928ba385b53a8feac6528b23a4b6 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:21 +0200 Subject: [PATCH 2010/2369] xdg-desktop-portal-kde: update to 5.24.5. --- srcpkgs/xdg-desktop-portal-kde/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template index 9f3a47148a1..1d2fce78de3 100644 --- a/srcpkgs/xdg-desktop-portal-kde/template +++ b/srcpkgs/xdg-desktop-portal-kde/template @@ -1,6 +1,6 @@ # Template file for 'xdg-desktop-portal-kde' pkgname=xdg-desktop-portal-kde -version=5.24.4 +version=5.24.5 revision=1 build_style=cmake configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner" @@ -13,4 +13,4 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=11684916288bb4a452b75004e2d122a4a1264a562f7945af98d466e49c59dc1e +checksum=b59ccf65d29aef2ce6af9757a5c87eddd87b633fba2e45470f92b18b2ce5c6fe From db9f25dea42e11ae6c71a0929e092739ea0dc95d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:32 +0200 Subject: [PATCH 2011/2369] attica: update to 5.94.0. --- srcpkgs/attica/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template index 47179ef8bd6..e7539d0176e 100644 --- a/srcpkgs/attica/template +++ b/srcpkgs/attica/template @@ -1,6 +1,6 @@ # Template file for 'attica' pkgname=attica -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/attica" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=81c18009911beb07d1868de78dd7fc1c4b1e8312bd95d916f4d4a80a800592e1 +checksum=f6293699da5794812080ba2d41b4ea05e830532678af324d8e852f508f2def65 do_check() { cd build From a59713534007fcc661113cc3cdca389782bd0ea7 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:34 +0200 Subject: [PATCH 2012/2369] baloo5: update to 5.94.0. --- srcpkgs/baloo5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template index f687851bcda..48b4235f16b 100644 --- a/srcpkgs/baloo5/template +++ b/srcpkgs/baloo5/template @@ -1,6 +1,6 @@ # Template file for 'baloo5' pkgname=baloo5 -version=5.93.0 +version=5.94.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/Baloo" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=25d11569fddb8ad0dddbaa91cedd3d96f0ad58a2cc23de920950db6ba3aed5cd +checksum=9dc4182e5803c32a47d6a82588f6a6b36837fb44a90fe4404750886150b9273a do_check() { cd build From 8e7da098c1c627da653c55c74538be030ac2117d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:36 +0200 Subject: [PATCH 2013/2369] bluez-qt5: update to 5.94.0. --- srcpkgs/bluez-qt5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template index e6939e618cf..2bda9496bd7 100644 --- a/srcpkgs/bluez-qt5/template +++ b/srcpkgs/bluez-qt5/template @@ -1,6 +1,6 @@ # Template file for 'bluez-qt5' pkgname=bluez-qt5 -version=5.93.0 +version=5.94.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/bluez-qt" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=ab5d84eaa37791b57c8379282a3c3afd7ef0b2ebbef83c3f12f6b3bfd9123624 +checksum=7e776feb095e727abea0fec4b3ae3c81d704a0527b8ff3257d799feee2cc0632 do_check() { cd build From d196b17a54fd6b34643a0d8bcf6a01ec8788043f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:41 +0200 Subject: [PATCH 2014/2369] breeze-icons: update to 5.94.0. --- srcpkgs/breeze-icons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template index 4aa9c5c952b..0a07951510a 100644 --- a/srcpkgs/breeze-icons/template +++ b/srcpkgs/breeze-icons/template @@ -1,6 +1,6 @@ # Template file for 'breeze-icons' pkgname=breeze-icons -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-3.0-or-later" homepage="https://community.kde.org/Frameworks" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4367dfa6b48aa645a3680489be96e03a9a6fc20f57277b3ca5e37ce8df4d03e6 +checksum=3e0b3fd2374dba82ca304c066938345f25b0eb85dca7169267c84f62bfb3a3bb nostrip=yes if [ -z "$CROSS_BUILD" ]; then From 1d4dbc3ae936f7919407587197c19868c7b9ea8e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:43 +0200 Subject: [PATCH 2015/2369] extra-cmake-modules: update to 5.94.0. --- srcpkgs/extra-cmake-modules/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template index 19615d19ee4..2d483c20bf8 100644 --- a/srcpkgs/extra-cmake-modules/template +++ b/srcpkgs/extra-cmake-modules/template @@ -1,6 +1,6 @@ # Template file for 'extra-cmake-modules' pkgname=extra-cmake-modules -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_HTML_DOCS=ON" @@ -12,7 +12,7 @@ maintainer="John " license="BSD-3-Clause" homepage="https://invent.kde.org/frameworks/extra-cmake-modules" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=093dea7b11647bc5f74e6971d47ef15b5c410cba2b4620acae00f008d5480b21 +checksum=23548a8ce2b998cfa675fc00112bf93914ee25194f0bfdf832d283c8d678d279 python_version=3 do_check() { From cdd4d998e1b58a9179514717e1a45bd3c9cc765d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:47 +0200 Subject: [PATCH 2016/2369] frameworkintegration: update to 5.94.0. --- srcpkgs/frameworkintegration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template index 130a97e3755..d67f04101e3 100644 --- a/srcpkgs/frameworkintegration/template +++ b/srcpkgs/frameworkintegration/template @@ -1,6 +1,6 @@ # Template file for 'frameworkintegration' pkgname=frameworkintegration -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules pkg-config @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/frameworkintegration" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=156e54c9ee679bda943a279c28c6a834ca02e991b3f53a1b92f8c3931388a2a6 +checksum=9a64abebf8d242765ae759611fc9819a03403047ed56b8dd71aba7a0bbb4faa6 frameworkintegration-devel_package() { short_desc+=" - development" From c0ce4150e7cba7a5ea6c14e7a327cee040f42c97 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:49 +0200 Subject: [PATCH 2017/2369] kactivities5-stats: update to 5.94.0. --- srcpkgs/kactivities5-stats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template index 5fa940f06ee..e3f3396b6db 100644 --- a/srcpkgs/kactivities5-stats/template +++ b/srcpkgs/kactivities5-stats/template @@ -1,6 +1,6 @@ # Template file for 'kactivities5-stats' pkgname=kactivities5-stats -version=5.93.0 +version=5.94.0 revision=1 wrksrc="${pkgname/5/}-${version}" build_style=cmake @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://api.kde.org/frameworks/kactivities/html/index.html" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz" -checksum=f1069872228e05aea349a0d3f7961da27d1aad3e4c28d0a408fceb98edef03a8 +checksum=83fe7d109d830f348f18432949902700ee8a6a934cbaf3f89ae7bbfb28ef2340 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" From 122beed71b1e4c2058ecdbd5bdcec09fa5505845 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:51 +0200 Subject: [PATCH 2018/2369] kactivities5: update to 5.94.0. --- srcpkgs/kactivities5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template index 467b2ed2fed..90e69f8f83a 100644 --- a/srcpkgs/kactivities5/template +++ b/srcpkgs/kactivities5/template @@ -1,6 +1,6 @@ # Template file for 'kactivities5' pkgname=kactivities5 -version=5.93.0 +version=5.94.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kactivities" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=eb6b204382d3bba1b32b5752a3e8382a5a7bbd8be4b95b774c68c501a2f16843 +checksum=52dd5eba3daeb2a9bbb3a1865b3219277b3ca6357c2870c3570dfac10f445adf if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools" From 6c133e5746619715c91af95743a21fe7182f1d94 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:53 +0200 Subject: [PATCH 2019/2369] kapidox: update to 5.94.0. --- srcpkgs/kapidox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template index 5e8664d5b6e..0128d4be7da 100644 --- a/srcpkgs/kapidox/template +++ b/srcpkgs/kapidox/template @@ -1,6 +1,6 @@ # Template file for 'kapidox' pkgname=kapidox -version=5.93.0 +version=5.94.0 revision=1 build_style=python3-module hostmakedepends="python3 python3-setuptools" @@ -11,7 +11,7 @@ maintainer="John " license="BSD-2-Clause, CC0-1.0" homepage="https://invent.kde.org/frameworks/kapidox" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4228326a35342de8f0a301ed8afa379ef2102d99588a79808e7e86f2a4f81d5b +checksum=1ca7520539bfe3179ae8b50b9a7c381478080d520a68f9fbb7e73b5946e55577 post_install() { vlicense LICENSES/BSD-2-Clause.txt From a2ae1160206777af215a692823ffcfe3bff162d2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:56 +0200 Subject: [PATCH 2020/2369] karchive: update to 5.94.0. --- srcpkgs/karchive/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template index dcc4a9d14cb..9564f05437b 100644 --- a/srcpkgs/karchive/template +++ b/srcpkgs/karchive/template @@ -1,6 +1,6 @@ # Template file for 'karchive' pkgname=karchive -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/karchive" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=61e326a840860270b7f8b9e8966462085b4f309be5c3a84c3b265eb95694c7fb +checksum=55cd87a5437a649c168efbce4af132b992aa67dd9a3a8ced7cff0144f155e1e4 karchive-devel_package() { short_desc+=" - development" From 66251bafda1e796170c2ff67079ebd0ae6b0cba6 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:13:58 +0200 Subject: [PATCH 2021/2369] kauth: update to 5.94.0. --- srcpkgs/kauth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template index 8877514c6a7..ccfb3ce26ec 100644 --- a/srcpkgs/kauth/template +++ b/srcpkgs/kauth/template @@ -1,6 +1,6 @@ # Template file for 'kauth' pkgname=kauth -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kauth" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=34580078bfdf631835f3ac52955f2149209908b935a7cfec6fe5b4956c3ada6c +checksum=9cfed0ad69a8fa5df88273a5ef340d7b6dff1cd3e9d53bda16f3cf4afdd64159 do_check() { cd build From 94d85d771e2739431168e81452e026a3a36e576c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:00 +0200 Subject: [PATCH 2022/2369] kbookmarks: update to 5.94.0. --- srcpkgs/kbookmarks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template index cf60805f220..917bc5bdc97 100644 --- a/srcpkgs/kbookmarks/template +++ b/srcpkgs/kbookmarks/template @@ -1,6 +1,6 @@ # Template file for 'kbookmarks' pkgname=kbookmarks -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only" homepage="https://invent.kde.org/frameworks/kbookmarks" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3eeff795ff99be90b0d59c6e5fbef02022e9fb48c9b4dab098a3c27e10fd863f +checksum=8ccb99ab6f6e9babd503abd043ab183b849cfd9248d3b7d4e2805c75735f517c kbookmarks-devel_package() { short_desc+=" - development" From c0d5591912de9697a0777c927424d9ceb1235d6b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:02 +0200 Subject: [PATCH 2023/2369] kcalendarcore: update to 5.94.0. --- srcpkgs/kcalendarcore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template index 4e7766af00c..6c53e506cbb 100644 --- a/srcpkgs/kcalendarcore/template +++ b/srcpkgs/kcalendarcore/template @@ -1,7 +1,7 @@ # Template file for 'kcalendarcore' pkgname=kcalendarcore reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1" -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1609bc141739fce0abed59a353a0e356f4fa7a1b3659d3bc77737010875c1d3f +checksum=3bab1ae2e8214fb889b742d4a4f2c6acfd0bf40a4c4933cc91c66d21d77c042b replaces="kcalcore>=0" do_check() { From cb487cf0e65ad3da7bb34e1a42a450bc4a37f1fc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:04 +0200 Subject: [PATCH 2024/2369] kcmutils: update to 5.94.0. --- srcpkgs/kcmutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template index 19bea867195..8d03cac1f90 100644 --- a/srcpkgs/kcmutils/template +++ b/srcpkgs/kcmutils/template @@ -1,6 +1,6 @@ # Template file for 'kcmutils' pkgname=kcmutils -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.0-only" homepage="https://invent.kde.org/frameworks/kcmutils" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1445f978b7ffd69fd7c25d965812755679c4fdba23eb9837da37a8b5b2d30d6d +checksum=798cef6990cdcb22e4822ea12c3c0b9aa35797806e93fb474a2f58632cd53309 kcmutils-devel_package() { short_desc+=" - development" From eb35920e8adf5102ee3e960303ce5deaa4163c0b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:06 +0200 Subject: [PATCH 2025/2369] kcodecs: update to 5.94.0. --- srcpkgs/kcodecs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template index 0a5c8577d24..48b83e78626 100644 --- a/srcpkgs/kcodecs/template +++ b/srcpkgs/kcodecs/template @@ -1,6 +1,6 @@ # Template file for 'kcodecs' pkgname=kcodecs -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kcodecs" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0efc5c8baab3142f8a0ab9369b255061772a57a80fb616b7305bf98235b2288b +checksum=bcc0e9fb1c1d259f05a326de160639a46c4bb6e0cce6fbc8244c39f251b8e7f9 kcodecs-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 897e21cee08c2a8254c732a7eb9453efba5e27e0 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:08 +0200 Subject: [PATCH 2026/2369] kcompletion: update to 5.94.0. --- srcpkgs/kcompletion/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template index fb4b7970b80..a38fc1a11a5 100644 --- a/srcpkgs/kcompletion/template +++ b/srcpkgs/kcompletion/template @@ -1,6 +1,6 @@ # Template file for 'kcompletion' pkgname=kcompletion -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kcompletion" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7f8c9355e8875b619ca852741e972f41c252aa2e95b439161acc7b32d9e8fb9c +checksum=1ad13d41650bbe352b0c2ecfd8c059015f9441cbf7534a2bcc9ed17a3bfa6ea4 kcompletion-devel_package() { short_desc+=" - development" From 19f15c1a21fe1fb69f9c75a5d372f7a4a9a97311 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:10 +0200 Subject: [PATCH 2027/2369] kconfig: update to 5.94.0. --- srcpkgs/kconfig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template index 402cf928ecb..9b68611ec39 100644 --- a/srcpkgs/kconfig/template +++ b/srcpkgs/kconfig/template @@ -1,6 +1,6 @@ # Template file for 'kconfig' pkgname=kconfig -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kconfig" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=71857c20d4829017c22dd6d46ae5a642c86344960e21bc1520458fb76d02c06e +checksum=8e6d9104f070d94f083be000ea116acae3499b0dd110fa4c9c55f51ea91cb3d7 do_check() { cd build From 1572d6a08c9c51a407fe094f606b2244c4b21227 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:12 +0200 Subject: [PATCH 2028/2369] kconfigwidgets: update to 5.94.0. --- srcpkgs/kconfigwidgets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template index a8fec7e42db..830b2fdae6b 100644 --- a/srcpkgs/kconfigwidgets/template +++ b/srcpkgs/kconfigwidgets/template @@ -1,6 +1,6 @@ # Template file for 'kconfigwidgets' pkgname=kconfigwidgets -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kconfigwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=db18e0f2217ead6dd6f5877551902d5da86aa026686e3c564f5f96be279f24bb +checksum=35055f637ff44b0f0e67f9b5c79307d37f5c259289bf71b2a24c0203f82fb508 kconfigwidgets-devel_package() { short_desc+=" - development" From f0b90f46b067c575f4f3757a2c59f73f3f8da66a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:14 +0200 Subject: [PATCH 2029/2369] kcontacts: update to 5.94.0. --- srcpkgs/kcontacts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template index bf35f07ce99..a27b215a57e 100644 --- a/srcpkgs/kcontacts/template +++ b/srcpkgs/kcontacts/template @@ -1,7 +1,7 @@ # Template file for 'kcontacts' pkgname=kcontacts reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1" -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcontacts" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5d7c8c6c6ccfa99188d9e4d7ab6165ec5b2bceea59a01edc6b309910fd604c75 +checksum=f7f317dfd9b270249cf168a699b39236490b5b21ec2ef1d186b59e29566252f8 kcontacts-devel_package() { short_desc+=" - development" From 1d2c89d7730bd604ceada23796213a1923d28874 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:16 +0200 Subject: [PATCH 2030/2369] kcoreaddons: update to 5.94.0. --- srcpkgs/kcoreaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template index 0db03a77e30..8e075632231 100644 --- a/srcpkgs/kcoreaddons/template +++ b/srcpkgs/kcoreaddons/template @@ -1,6 +1,6 @@ # Template file for 'kcoreaddons' pkgname=kcoreaddons -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kcoreaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=920a278af97dea3add06770a6f3604744c20d667973cb71cf477145785dbf043 +checksum=5c10b6ce070d6aa9b15abe7483b67f8802cec175e0eaeefc18a27c0e01ce110b post_install() { vsed -e 's;${_IMPORT_PREFIX};/usr;g' \ From d10a388753bb4967ac835c042f277ca59049235f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:18 +0200 Subject: [PATCH 2031/2369] kcrash: update to 5.94.0. --- srcpkgs/kcrash/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template index c05bc460033..c7c464516a7 100644 --- a/srcpkgs/kcrash/template +++ b/srcpkgs/kcrash/template @@ -1,6 +1,6 @@ # Template file for 'kcrash' pkgname=kcrash -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kcrash" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2ff8d6c6924b2b752ef4a929390606bb55ce2aa55c582927269bd65556992dd6 +checksum=48c7792ca8c2ad6e9b6c8e9a260cdfcee5ed8d8769c4a8a199de7bf671f03cf5 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons" From b739955c58cb30bf7704c83ed06700cbea538a21 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:19 +0200 Subject: [PATCH 2032/2369] kdav: update to 5.94.0. --- srcpkgs/kdav/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template index 32b1865fbe2..39533fd3bf1 100644 --- a/srcpkgs/kdav/template +++ b/srcpkgs/kdav/template @@ -1,7 +1,7 @@ # Template file for 'kdav' pkgname=kdav reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1" -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kdav" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a7d3d40120f0a1b20f8492ea1635507a95e041582f5496a133de24720934ad68 +checksum=8b211ec6e1009f11ae5d0769e21947a473d6ca479ea8a16701a808aa57335b3e kdav-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From 7d49d2bf555113f2fdbef7aec17c8dc3ee266dbf Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:21 +0200 Subject: [PATCH 2033/2369] kdbusaddons: update to 5.94.0. --- srcpkgs/kdbusaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template index 5e03127aa8a..247de9346fc 100644 --- a/srcpkgs/kdbusaddons/template +++ b/srcpkgs/kdbusaddons/template @@ -1,6 +1,6 @@ # Template file for 'kdbusaddons' pkgname=kdbusaddons -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdbusaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=cc2c74501e65b97af1849ff454e51393f3a07755c155854bdee741a006822ad9 +checksum=0a1530117ccad6f1ea7b9db653bdf99adfe7f15f3f9394c3d885028f3ff4dae8 do_check() { cd build From 48c50d5896dd8e6c597d784cbc262f82c812bed0 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:23 +0200 Subject: [PATCH 2034/2369] kdeclarative: update to 5.94.0. --- srcpkgs/kdeclarative/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template index 96902ea275a..5d853acf58f 100644 --- a/srcpkgs/kdeclarative/template +++ b/srcpkgs/kdeclarative/template @@ -1,6 +1,6 @@ # Template file for 'kdeclarative' pkgname=kdeclarative -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules pkg-config @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdeclarative" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=08a945c793aa8d89d87c42d29c9c11e7c28c47916ae728369ab478892d325067 +checksum=f2996ca7671994f42c9233897d10d6bc93ffc2b12865ae07e516a93812dd6b08 do_check() { cd build From c8a4cb7c0ec807979d169c0795e522c1c9a30d2a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:25 +0200 Subject: [PATCH 2035/2369] kded: update to 5.94.0. --- srcpkgs/kded/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template index 30238cc5f87..f6cb6da3f19 100644 --- a/srcpkgs/kded/template +++ b/srcpkgs/kded/template @@ -1,6 +1,6 @@ # Template file for 'kded' pkgname=kded -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kded" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1992310921cccaf8fa2ca1abc8328aec5bc2e60a3d9f562f25b30885378159df +checksum=2f4d61a3e8c64f81e5916558d48e381d0a3890c5ad388f27934944136c44f3c5 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools" From 3d70f1c5bbc67a6b9c0710e02f377cd5131ec2db Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:31 +0200 Subject: [PATCH 2036/2369] kdelibs4support: update to 5.94.0. --- srcpkgs/kdelibs4support/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template index ae42683b9b1..e3ec30c70a3 100644 --- a/srcpkgs/kdelibs4support/template +++ b/srcpkgs/kdelibs4support/template @@ -1,6 +1,6 @@ # Template file for 'kdelibs4support' pkgname=kdelibs4support -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON @@ -17,7 +17,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdelibs4support" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=6a3e1d80cc6babc12930f24f9afd1ed10b46ae58ea71d44a466178212b07377c +checksum=d726ebb00766d3d5ed39603601c4b9541659bebc4bb7b755eec25bffd8a76033 if [ "$CROSS_BUILD" ]; then # gettaddrinfo runtime test is always fine (can't be achieved in crossbuild) From 696dcea09afeeb1fb65d579a1e0e2a21780da537 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:32 +0200 Subject: [PATCH 2037/2369] kdesignerplugin: update to 5.94.0. --- srcpkgs/kdesignerplugin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template index b81b6562cf6..6742406d5bc 100644 --- a/srcpkgs/kdesignerplugin/template +++ b/srcpkgs/kdesignerplugin/template @@ -1,6 +1,6 @@ # Template file for 'kdesignerplugin' pkgname=kdesignerplugin -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-only" homepage="https://invent.kde.org/frameworks/kdesignerplugin" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=f19ab4fc1ed58b89642d8f9f75a5da2f2ef0093c97183f336ffeb7208e628aaf +checksum=6bd051e47f3a9f301e26b876036b1a36ccf2a2c7e6747f3a96a157c0c3a78a03 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools" From 54327c41bcea256de6a56250d2925b520589c6bf Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:34 +0200 Subject: [PATCH 2038/2369] kdesu: update to 5.94.0. --- srcpkgs/kdesu/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template index 1271d28ade3..ecf34e383a6 100644 --- a/srcpkgs/kdesu/template +++ b/srcpkgs/kdesu/template @@ -1,6 +1,6 @@ # Template file for 'kdesu' pkgname=kdesu -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only" homepage="https://invent.kde.org/frameworks/kdesu" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7f029d9a8959f0e2ca516ab3fb6b4ebd49ca0f0d19c72369451b6894d8138dbf +checksum=90494323ebab4c8cdd93c068c2c4fe3a8457513cee21d7887fc4473028a9dce1 kdesu-devel_package() { short_desc+=" - development" From b3ad2c46e6b251df5e89210144bb579f98a76fec Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:36 +0200 Subject: [PATCH 2039/2369] kdewebkit: update to 5.94.0. --- srcpkgs/kdewebkit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template index c667f015e07..2fd81d12199 100644 --- a/srcpkgs/kdewebkit/template +++ b/srcpkgs/kdewebkit/template @@ -1,6 +1,6 @@ # Template file for 'kdewebkit' pkgname=kdewebkit -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kdewebkit" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=a2fe9b5660763d4dd74244c00bf7b1a407438279a81f2a3ef3813ea250fd2f55 +checksum=9bca73e8e67ccb89a044514ff6f6c02f6e65003cb34bc7e358a44182bc710d59 kdewebkit-devel_package() { short_desc+=" - development" From 9967ea892e7fa30daa9e7eededf6e614309ba0a1 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:38 +0200 Subject: [PATCH 2040/2369] kdnssd: update to 5.94.0. --- srcpkgs/kdnssd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template index 42554c85407..4090acbb9e6 100644 --- a/srcpkgs/kdnssd/template +++ b/srcpkgs/kdnssd/template @@ -1,6 +1,6 @@ # Template file for 'kdnssd' pkgname=kdnssd -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kdnssd" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=dc97364f14b5867ea5bb2986f6ad3c84ab1acc952f50d460b3e9aed03f2f903b +checksum=28eba2ff83d92bb80eac5bb771d5d5bf40c975d4b26a74d388092b034a964863 kdnssd-devel_package() { short_desc+=" - development" From 31202688bc034c2e36911af2f881ecb0cc7aaf8a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:40 +0200 Subject: [PATCH 2041/2369] kdoctools: update to 5.94.0. --- srcpkgs/kdoctools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template index a43404728d1..8abfa56316d 100644 --- a/srcpkgs/kdoctools/template +++ b/srcpkgs/kdoctools/template @@ -1,6 +1,6 @@ # Template file for 'kdoctools' pkgname=kdoctools -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake build_helper=qemu @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kdoctools" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=25e83ff151c53667b94e25a5c41993796164683a43913820a5651f3610b65d5c +checksum=f54e61ffe8c5e634e7d6e341020b63346d40b524d4a22565c86b9147033cd2f4 if [ "$CROSS_BUILD" ]; then configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper" From 60a4d432c2f60396678d7965d146317bd0b6f465 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:44 +0200 Subject: [PATCH 2042/2369] kemoticons: update to 5.94.0. --- srcpkgs/kemoticons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template index 5b7281e3bca..4525d35dcee 100644 --- a/srcpkgs/kemoticons/template +++ b/srcpkgs/kemoticons/template @@ -1,6 +1,6 @@ # Template file for 'kemoticons' pkgname=kemoticons -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later, CC-BY-4.0" homepage="https://invent.kde.org/frameworks/kemoticons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=83ca3df374935cf103a8fdaa85900d0acadbffc9d3aa8bfed073e804cd5ae410 +checksum=fa7db15d75a017e75514af4361ae3dd91a22ac9d9e2daf41a8e7e33bcce31302 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" From 83d8b17498a53696f2c0f9041993baf1d9a4b98f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:47 +0200 Subject: [PATCH 2043/2369] kfilemetadata5: update to 5.94.0. --- srcpkgs/kfilemetadata5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template index eb162fdff6d..add84045349 100644 --- a/srcpkgs/kfilemetadata5/template +++ b/srcpkgs/kfilemetadata5/template @@ -1,6 +1,6 @@ # Template file for 'kfilemetadata5' pkgname=kfilemetadata5 -version=5.93.0 +version=5.94.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kfilemetadata" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=3015c071a5f068f6e45d36238aa0243d3788a95ec84362ba79ed0369e676a816 +checksum=7f573b1a30349e331309dcf9e3374d7a304b6bdd0453a122366f7bd2574977e6 kfilemetadata5-devel_package() { short_desc+=" - development" From dea8957d18abe6bf93f3a5487163a69a09d38fa1 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:49 +0200 Subject: [PATCH 2044/2369] kglobalaccel: update to 5.94.0. --- srcpkgs/kglobalaccel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template index 7df12f5a247..09ed09ffa79 100644 --- a/srcpkgs/kglobalaccel/template +++ b/srcpkgs/kglobalaccel/template @@ -1,6 +1,6 @@ # Template file for 'kglobalaccel' pkgname=kglobalaccel -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kglobalaccel" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c806b8f2b029c7632d99c55cb711f9f4c1697555fde53ad4f67167efee97b712 +checksum=a34b00116a72d0973cdeb203a5d237da63cc307e9e294dfaedb00ff0a36835e9 kglobalaccel-devel_package() { short_desc+=" - development" From 5770f0f0fd94b9b32ae50c046445ecb23f13ddec Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:51 +0200 Subject: [PATCH 2045/2369] kguiaddons: update to 5.94.0. --- srcpkgs/kguiaddons/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template index 72f3ba0d1e7..db66b082a69 100644 --- a/srcpkgs/kguiaddons/template +++ b/srcpkgs/kguiaddons/template @@ -1,19 +1,19 @@ # Template file for 'kguiaddons' pkgname=kguiaddons -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner" hostmakedepends="kcoreaddons pkg-config extra-cmake-modules wayland-devel qt5-wayland qt5-host-tools qt5-tools-devel" makedepends="qt5-tools-devel qt5-x11extras-devel xcb-util-devel - qt5-wayland-devel wayland-devel" + plasma-wayland-protocols qt5-wayland-devel wayland-devel" short_desc="KDE frameworks - Addons to QtGui" maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kguiaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=27f26392140bd1abcb86c154fd6fd87e50b2493787827b2b1cacaf76544af40a +checksum=f23182a7268d37cbc32eaa77bdc9dddc6429a8eff912f57841f6d96c71973873 kguiaddons-devel_package() { short_desc+=" - development" From 279424001bd4281cd4f28f543d891ca3f532ddd5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:52 +0200 Subject: [PATCH 2046/2369] kholidays: update to 5.94.0. --- srcpkgs/kholidays/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template index eaa54144eb2..cc78337a49f 100644 --- a/srcpkgs/kholidays/template +++ b/srcpkgs/kholidays/template @@ -1,7 +1,7 @@ # Template file for 'kholidays' pkgname=kholidays reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1" -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kholidays" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0d4a1fb823501ee73b2c4d80468777adedf93c80f36b3a680cad91cc6704b841 +checksum=e53735539c9d7658e3c18e0d8b0f81bc9ce27ff32a868bac32c19c12288a055d if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" From a164eeed8dcdbc95be5cbf02c54eb74b86d2c37f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:14:55 +0200 Subject: [PATCH 2047/2369] khtml: update to 5.94.0. --- srcpkgs/khtml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template index de17fc72af8..99705db8fbd 100644 --- a/srcpkgs/khtml/template +++ b/srcpkgs/khtml/template @@ -1,6 +1,6 @@ # Template file for 'khtml' pkgname=khtml -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/khtml" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=31bfb6752ed7248b98e2bdc723e8e10c11b5fc9f7bf7edd8dedad1162f86614b +checksum=98bd2a284a2fbc1c2d93cd6719d18baeccd5258dfaa48b1fe74bb61e24fe9b79 khtml-devel_package() { short_desc+=" - development" From 132a1a4434907dd896302ddeb69059f29735c100 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:00 +0200 Subject: [PATCH 2048/2369] ki18n: update to 5.94.0. --- srcpkgs/ki18n/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template index 956d6aa7040..5139b30bbdf 100644 --- a/srcpkgs/ki18n/template +++ b/srcpkgs/ki18n/template @@ -1,6 +1,6 @@ # Template file for 'ki18n' pkgname=ki18n -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/ki18n" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c2705400d175f18612dfe1afb28dc14accf614f7cfd65409dfa7fdcde5237339 +checksum=0c5a8332343570e8530469840d67c72a28a04a7257578e5a962c73824508944a ki18n-devel_package() { short_desc+=" - development" From 9295cc06fd20d10ca1df6cf1a0df52346907e973 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:02 +0200 Subject: [PATCH 2049/2369] kiconthemes: update to 5.94.0. --- srcpkgs/kiconthemes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template index 532d5ec8121..613b98a4f40 100644 --- a/srcpkgs/kiconthemes/template +++ b/srcpkgs/kiconthemes/template @@ -1,6 +1,6 @@ # Template file for 'kiconthemes' pkgname=kiconthemes -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-only, GPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kiconthemes" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=75f7c5b34f4f1a228b4cbd81a284dbfdc0c0810ddd3a39e69f9363ab3598e2b4 +checksum=d972d81dcd7ccb74ef4abd4db2a88512a07ea459a301b94e7a98b831ab814993 kiconthemes-devel_package() { short_desc+=" - development" From e6c066059df3de2c32dc992a5a8fdc5d9f751cbe Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:04 +0200 Subject: [PATCH 2050/2369] kidletime: update to 5.94.0. --- srcpkgs/kidletime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template index 0556c9a0e3d..02ad544802b 100644 --- a/srcpkgs/kidletime/template +++ b/srcpkgs/kidletime/template @@ -1,6 +1,6 @@ # Template file for 'kidletime' pkgname=kidletime -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kidletime" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4d9315dfe1faaeb62eae5ba60f683483de56317826d9b8da2bd58feebcb7b7d9 +checksum=a61c3d545bcec8866cf6aeb8df00dc4f239f1725ace09b8ef1946839c4b4e3e8 kidletime-devel_package() { short_desc+=" - development" From 731581c0650d51286cb4c5f4acb79a65a789a829 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:09 +0200 Subject: [PATCH 2051/2369] kimageformats: update to 5.94.0. --- srcpkgs/kimageformats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template index bc8b9f09a2c..d94eb968f1c 100644 --- a/srcpkgs/kimageformats/template +++ b/srcpkgs/kimageformats/template @@ -1,6 +1,6 @@ # Template file for 'kimageformats' pkgname=kimageformats -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DKIMAGEFORMATS_HEIF=ON" @@ -12,4 +12,4 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kimageformats" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=15b0ed9de57af95979e0e40496b980f243cd81e2a400d5f64d12478e1dddc7d0 +checksum=b189626c091dc9959d586a229c47ca36443b77d79706476ff89a50f9e8774e54 From 9aeda420cc9d1c65be02424b762cba9d47f1b944 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:11 +0200 Subject: [PATCH 2052/2369] kinit: update to 5.94.0. --- srcpkgs/kinit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template index f94cc0038dd..67433100a92 100644 --- a/srcpkgs/kinit/template +++ b/srcpkgs/kinit/template @@ -1,6 +1,6 @@ # Template file for 'kinit' pkgname=kinit -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only" homepage="https://invent.kde.org/frameworks/kinit" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=db36a3bd5b30163b7a4ed8c7a907bec585acab841306755b0d8d32ef3d1ce498 +checksum=ee98f909cea837dc0e8cae363fda5891fac89de388aaf75388e3ae9f3e1ebc61 kinit-devel_package() { short_desc+=" - development" From 7b27ac039669180d3920219715642f5149fa5ecf Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:14 +0200 Subject: [PATCH 2053/2369] kio: update to 5.94.0. --- srcpkgs/kio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template index 3047212a796..076fcc67cdb 100644 --- a/srcpkgs/kio/template +++ b/srcpkgs/kio/template @@ -1,6 +1,6 @@ # Template file for 'kio' pkgname=kio -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON @@ -16,7 +16,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kio" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d290a4bcfb5ec9eb9047c84a7c420df831131b92ab6c9d28a3aa0eef9f5d4c44 +checksum=85c0bf8e49d845730d95c85c0292330a5bf03ed63a008cbf02ec9d02f990d09b do_check() { : # Pain to get working in limited enviroment, excpects e.g. real disks From 28317f234cc043d573de7f62c95afcc43485f3b6 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:16 +0200 Subject: [PATCH 2054/2369] kirigami2: update to 5.94.0. --- srcpkgs/kirigami2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template index f504292b636..ba071308005 100644 --- a/srcpkgs/kirigami2/template +++ b/srcpkgs/kirigami2/template @@ -1,6 +1,6 @@ # Template file for 'kirigami2' pkgname=kirigami2 -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="https://techbase.kde.org/Kirigami" distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz" -checksum=a7c2a824eb776011ae9dc94698588e8c6988ac399669723631fab26edd47ab8f +checksum=d7f27da3325feb339f4e1a3db78df44f05e4f505f36e15c7caeac04da0428e39 kirigami2-devel_package() { short_desc+=" - development" From 7526175b5a6c3c00db092522c4a2542fce3f6b73 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:19 +0200 Subject: [PATCH 2055/2369] kitemmodels: update to 5.94.0. --- srcpkgs/kitemmodels/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template index bbf9bbf094c..35f165bf194 100644 --- a/srcpkgs/kitemmodels/template +++ b/srcpkgs/kitemmodels/template @@ -1,6 +1,6 @@ # Template file for 'kitemmodels' pkgname=kitemmodels -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kitemmodels" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5bb9918b92ac37f1bc52c5abe04e8dbea54f31fa0101edad6d9e92c3a9f0485b +checksum=705ff2b97502b2ba436f9371b559e47f2a7634bf5b06d26c8243387d6a084f89 kitemmodels-devel_package() { short_desc+=" - development" From 71631a4d94bf9833013dcb4f957870f657d79207 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:21 +0200 Subject: [PATCH 2056/2369] kitemviews: update to 5.94.0. --- srcpkgs/kitemviews/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template index 4518704713d..67d0d7e9ad9 100644 --- a/srcpkgs/kitemviews/template +++ b/srcpkgs/kitemviews/template @@ -1,6 +1,6 @@ # Template file for 'kitemviews' pkgname=kitemviews -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kitemviews" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=93f01dec3b795b28cc6f6859873ebb941a9504eaafd13ff9f72b987d71e55abf +checksum=5b75334b719ce07f4aa33236ef4bd11829504ff381670818ef57a7526938b52e kitemviews-devel_package() { short_desc+=" - development" From 5c667f1a5ff45f951aa91d19a6990a5bc344399b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:22 +0200 Subject: [PATCH 2057/2369] kjobwidgets: update to 5.94.0. --- srcpkgs/kjobwidgets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template index c79eb99642d..b9db92ebb87 100644 --- a/srcpkgs/kjobwidgets/template +++ b/srcpkgs/kjobwidgets/template @@ -1,6 +1,6 @@ # Template file for 'kjobwidgets' pkgname=kjobwidgets -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-only, LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kjobwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=62449b747d6fa5b32a1cb317b2b614172e42be3b85f39b02d6a07adc267c39fb +checksum=014f45fca82886af463956c533f5ba868700ac7ec61733f35a7fabad0042b007 kjobwidgets-devel_package() { short_desc+=" - development" From 9688c817889abe97a59770fd583ca22fed453866 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:24 +0200 Subject: [PATCH 2058/2369] kjs: update to 5.94.0. --- srcpkgs/kjs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template index 263bf627d7a..46e552bf899 100644 --- a/srcpkgs/kjs/template +++ b/srcpkgs/kjs/template @@ -1,6 +1,6 @@ # Template file for 'kjs' pkgname=kjs -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kjs" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=85aa01de9c2775564c895d3efbcfb8cc68da9a84f511176fef16742cbbf90942 +checksum=f93e14a2deb978ccb8e7b0e7e6a2e4c3a23fe9ffe5a64d569c824302d93b3c1b if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs" From b83c0b8a0e8cef038aabb3359127c479ff6057af Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:26 +0200 Subject: [PATCH 2059/2369] kjsembed: update to 5.94.0. --- srcpkgs/kjsembed/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template index d93a1a3b818..074c3ba9f1a 100644 --- a/srcpkgs/kjsembed/template +++ b/srcpkgs/kjsembed/template @@ -1,6 +1,6 @@ # Template file for 'kjsembed' pkgname=kjsembed -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="gettext kcoreaddons extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kjsembed" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=fa55d3bf0b3f9026eb573cc909b1fbe53bea7090f3da465e9bb293dc0f81d424 +checksum=f3ce37479d0f579feeeebc837074b3d138a37989884149b92f12b107fedef62e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools" From 11669d6f841ff2d1cb54bb9869684787246ce098 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:28 +0200 Subject: [PATCH 2060/2369] kmediaplayer: update to 5.94.0. --- srcpkgs/kmediaplayer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template index 5ebec5415b1..b803dbd9b42 100644 --- a/srcpkgs/kmediaplayer/template +++ b/srcpkgs/kmediaplayer/template @@ -1,6 +1,6 @@ # Template file for 'kmediaplayer' pkgname=kmediaplayer -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules @@ -11,7 +11,7 @@ maintainer="John " license="X11" homepage="https://invent.kde.org/frameworks/kmediaplayer" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=ada8afb5b0fea3af2112812792eff062d3830dfde4d8784b7e1fc3711e74830a +checksum=0bf1f6df0ce21d397ca168307b3b3e57d10c0fb90369cee03bbfbf9fa7d8208c kmediaplayer-devel_package() { short_desc+=" - development" From 3b40fb5de6def4b1d454e824bb03aa0552eea442 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:32 +0200 Subject: [PATCH 2061/2369] knewstuff: update to 5.94.0. --- srcpkgs/knewstuff/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template index dc604a8611c..bc45f43afe2 100644 --- a/srcpkgs/knewstuff/template +++ b/srcpkgs/knewstuff/template @@ -1,18 +1,19 @@ # Template file for 'knewstuff' pkgname=knewstuff -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext kpackage qt5-host-tools qt5-qmake python3" -makedepends="kio-devel kpackage-devel attica-devel" +makedepends="kio-devel kpackage-devel attica-devel + syndication-devel kirigami2-devel" depends="kdeclarative qt5-quickcontrols" short_desc="KDE Framework for downloading and sharing additional application data" maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/knewstuff" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2adc48e26c04c05f61f6ff1007f77ea43036b76d769535617e88d3f35ebb5759 +checksum=aacd014f99ab66d40ae98333cb56257244ca552bc4df0ce04de4e29bae90336f knewstuff-devel_package() { short_desc+=" - development" From 10ed2257a2052555ec9fa6aaedca9d7d7d75cef2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:33 +0200 Subject: [PATCH 2062/2369] knotifications: update to 5.94.0. --- srcpkgs/knotifications/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template index 782d259b261..d7f8260d8a2 100644 --- a/srcpkgs/knotifications/template +++ b/srcpkgs/knotifications/template @@ -1,6 +1,6 @@ # Template file for 'knotifications' pkgname=knotifications -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/knotifications" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fe191b1fe55881d7e212a3b70fe08d53e47c32793d38f5d5a4d82b796796da4b +checksum=c8d51ce32b65f096c75da3e7bdb033202086cabaa8faad3bcdd46730b74b43bf knotifications-devel_package() { short_desc+=" - development" From 60625c3de6508288bd3ea69a2fb3df18bd859b24 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:35 +0200 Subject: [PATCH 2063/2369] knotifyconfig: update to 5.94.0. --- srcpkgs/knotifyconfig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template index 1ac13b7254d..e69a58ab907 100644 --- a/srcpkgs/knotifyconfig/template +++ b/srcpkgs/knotifyconfig/template @@ -1,6 +1,6 @@ # Template file for 'knotifyconfig' pkgname=knotifyconfig -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/knotifyconfig" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=cc9de166631555451965cd007b82f0ab529d6b909bc259e26e59feee586619cd +checksum=ab85989a7482ab8e2feddd1d3c6a1f2f81a16af67894bd9dea725421c3ba8910 knotifyconfig-devel_package() { short_desc+=" - development" From 119b7441f1dcdccfea31fdfabaa758dbe1310c61 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:37 +0200 Subject: [PATCH 2064/2369] kpackage: update to 5.94.0. --- srcpkgs/kpackage/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template index 0c03af3cb83..c1214c00262 100644 --- a/srcpkgs/kpackage/template +++ b/srcpkgs/kpackage/template @@ -1,6 +1,6 @@ # Template file for 'kpackage' pkgname=kpackage -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kpackage" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8de6ecd6ed1cf746b9919d93283aa650922211b51bb2d22027102f67c42ec5cd +checksum=4d4c9c2920c9b10f6879f2d8a29426615e9e6b13d78c0b751ea4a656b4baf414 post_install() { vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \ From 3be79098e47ba67bc38c0d0fd58303c32c249f8e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:40 +0200 Subject: [PATCH 2065/2369] kparts: update to 5.94.0. --- srcpkgs/kparts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template index 9ed54c4d5bd..ef2dd1d22be 100644 --- a/srcpkgs/kparts/template +++ b/srcpkgs/kparts/template @@ -1,6 +1,6 @@ # Template file for 'kparts' pkgname=kparts -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kparts" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c888e9664cc71a2f52904fa42d6bcedaa76c50c720ef0bee8d8b0c98bbcd1675 +checksum=05a5120f1a97dce84f5ea85d80eb4eb50793f800ce2af055d1d73ce61ed06bba do_check() { : # test can not find packages assets?! From 76589119dea69f05b3580303ccc93c4aaabf9e3a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:42 +0200 Subject: [PATCH 2066/2369] kpeople: update to 5.94.0. --- srcpkgs/kpeople/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template index b6d0c705401..d83af4e4af1 100644 --- a/srcpkgs/kpeople/template +++ b/srcpkgs/kpeople/template @@ -1,6 +1,6 @@ # Template file for 'kpeople' pkgname=kpeople -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kpeople" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d3e1266982fa2abdd7b216d018569ea83c71312e2cfa35a0bee845e8bb49f371 +checksum=217eba378c223e3518914512fc303a106101d26fa1a8fc57495abbd0d36a5274 do_check() { cd build From 477b37e6369a2e1af8325c5bc43e05bd9735eca3 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:44 +0200 Subject: [PATCH 2067/2369] kplotting: update to 5.94.0. --- srcpkgs/kplotting/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template index a39daf53e9c..6a66c890cbc 100644 --- a/srcpkgs/kplotting/template +++ b/srcpkgs/kplotting/template @@ -1,6 +1,6 @@ # Template file for 'kplotting' pkgname=kplotting -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_DESIGNERPLUGIN=ON" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kplotting" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=586d1b694213f55259ffb6a96a10648baff6e3ce45c58d7c44734d6096b6a26d +checksum=783d6d618601d58077c4ac7920a579af7b877b26a64a6f453570da36b57606aa kplotting-devel_package() { short_desc+=" - development" From 5101e28bba2b554c7ac94b95ba6901c42a5f5e04 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:45 +0200 Subject: [PATCH 2068/2369] kpty: update to 5.94.0. --- srcpkgs/kpty/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template index c5e5c306e49..12a7ad77d5f 100644 --- a/srcpkgs/kpty/template +++ b/srcpkgs/kpty/template @@ -1,6 +1,6 @@ # Template file for 'kpty' pkgname=kpty -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kpty" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2a05154dbf9eb082f32f33b494dc36c3b24a59c14521167f3306a04c3649ec12 +checksum=569a60318b54cca6a5c5fb1e182556010d2f4c052961b125ad852ffa015746ca kpty-devel_package() { short_desc+=" - development" From b4a007588f56236f2b4732665d6bfc1192e1a7d6 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:47 +0200 Subject: [PATCH 2069/2369] kquickcharts: update to 5.94.0. --- srcpkgs/kquickcharts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template index 4fe68d7329a..1f407b752e4 100644 --- a/srcpkgs/kquickcharts/template +++ b/srcpkgs/kquickcharts/template @@ -1,6 +1,6 @@ # Template file for 'kquickcharts' pkgname=kquickcharts -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-only OR LGPL-3.0-only" homepage="https://community.kde.org/Frameworks" distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz" -checksum=24346ac484d1d785bff27e0de5d29a7f7d3d73568074f8bdaeb869ff1004a848 +checksum=3065fabdb4938b68194060794abc90feac19e73dcb7648591c58e2c9cfea9528 do_check() { cd build From e6ad9e5cac6fa699895a30e3204be7b728d6e977 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:49 +0200 Subject: [PATCH 2070/2369] kross: update to 5.94.0. --- srcpkgs/kross/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template index 31a60cd2c56..a307f5bdeda 100644 --- a/srcpkgs/kross/template +++ b/srcpkgs/kross/template @@ -1,6 +1,6 @@ # Template file for 'kross' pkgname=kross -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args=" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kross" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=2ba6fd2438731b1704537889120c0dcdf1eb36bffd1e921736e85834a5551ac3 +checksum=1d6925bd2530ded6ea97f832fda42de0e24d1d7302e52262171fd0461f642d49 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From ea35d0f242604e4ca2f4cd9b817d5452e521199d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:51 +0200 Subject: [PATCH 2071/2369] krunner: update to 5.94.0. --- srcpkgs/krunner/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template index 6eb7f598ef0..413b433ec69 100644 --- a/srcpkgs/krunner/template +++ b/srcpkgs/krunner/template @@ -1,6 +1,6 @@ # Template file for 'krunner' pkgname=krunner -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/krunner" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2dc6b9169d415d87f5e2d82e2263183f42589cc1e962c9d6d0c60b6dfa48c991 +checksum=32b0bcda190884f9de2f8a598c854ed2d29cab199dda5d341364913321b7cbd1 do_check() { cd build From d0d43244b2acb6de28df76acff2db14b2cb1ae1f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:53 +0200 Subject: [PATCH 2072/2369] kservice: update to 5.94.0. --- srcpkgs/kservice/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template index de717b3257a..27ba8af0748 100644 --- a/srcpkgs/kservice/template +++ b/srcpkgs/kservice/template @@ -1,6 +1,6 @@ # Template file for 'kservice' pkgname=kservice -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kservice" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=46cf92f837fb890e311c5affaaa8b01d1d66b47dd272a30ae148472ef3e67431 +checksum=1aad105fc0a4060b1cbe6e29f96f93a01af254159c9263c080d94e4eeae43b32 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools" From 844927786148aa3504df3f962b55eb7483808026 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:55 +0200 Subject: [PATCH 2073/2369] ksolid: update to 5.94.0. --- srcpkgs/ksolid/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template index d38f0b79b18..0f787d3516b 100644 --- a/srcpkgs/ksolid/template +++ b/srcpkgs/ksolid/template @@ -1,6 +1,6 @@ # Template file for 'ksolid' pkgname=ksolid -version=5.93.0 +version=5.94.0 revision=1 wrksrc="${pkgname#k}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/solid" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz" -checksum=22eff3f94608793fecb532e097d9022a14c828a0ffad0f73666088153f0d6bea +checksum=9d8ed401e36b6a4b9e51438c8e2d359129b9d6149deb8240cb894b1128fa1107 libksolid_package() { short_desc+=" - runtime library" From 96f0330cd4152c8e4c680e1c37e282c538b6d0a5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:15:57 +0200 Subject: [PATCH 2074/2369] ktexteditor: update to 5.94.0. --- srcpkgs/ktexteditor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template index 6e0d131bcd2..5fab6876dc1 100644 --- a/srcpkgs/ktexteditor/template +++ b/srcpkgs/ktexteditor/template @@ -1,6 +1,6 @@ # Template file for 'ktexteditor' pkgname=ktexteditor -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args=" @@ -14,7 +14,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/ktexteditor" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7af437b882cd2da9cf9780cb660f9242b9c2400a5ff55cf6ca8608b6e62bd6c3 +checksum=d82d9997167d718ab821dce40e8752205a5ab60f2e69a1bffaf2265455e1b3b6 do_check() { cd build From cf45ccd8e48ee05dced901241e5dc0e1785044d2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:16:00 +0200 Subject: [PATCH 2075/2369] ktextwidgets: update to 5.94.0. --- srcpkgs/ktextwidgets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template index d685d6d0a91..a4a83792c67 100644 --- a/srcpkgs/ktextwidgets/template +++ b/srcpkgs/ktextwidgets/template @@ -1,6 +1,6 @@ # Template file for 'ktextwidgets' pkgname=ktextwidgets -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/ktextwidgets" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e27f588929db35f485ebbd6ddec45ec0c56f86844935013f8a39df8bdfb7c215 +checksum=44fceedacb526f4c3c66c1d55257bb39881c7dcca55dae0deccefd84399ed866 ktextwidgets-devel_package() { short_desc+=" - development" From d338a52e3e5d4325c66903752244d8090ea2a5a4 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:16:02 +0200 Subject: [PATCH 2076/2369] kunitconversion: update to 5.94.0. --- srcpkgs/kunitconversion/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template index 0629a5319eb..c126fc6841d 100644 --- a/srcpkgs/kunitconversion/template +++ b/srcpkgs/kunitconversion/template @@ -1,6 +1,6 @@ # Template file for 'kunitconversion' pkgname=kunitconversion -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kunitconversion" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9baefb6aed92d2b32727f9492f1322a9e0b17b609c2d82296f4ee10b55a02fc8 +checksum=e4adf0f124db45134042e706b466c30e531398996f872294119887af9ca38049 kunitconversion-devel_package() { short_desc+=" - development" From 541869dcce1a21400da2f1cb044dd1fe82338131 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:16:04 +0200 Subject: [PATCH 2077/2369] kwallet: update to 5.94.0. --- srcpkgs/kwallet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template index 9df7aac1b7e..a66634cb13f 100644 --- a/srcpkgs/kwallet/template +++ b/srcpkgs/kwallet/template @@ -1,6 +1,6 @@ # Template file for 'kwallet' pkgname=kwallet -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwallet" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ed56f6477efb250b454f7b7861a16a5ea972487c1373647b7094047ce20fddeb +checksum=01366b42754ee7543b67fe57deb39bc2a772923eda3e6ea70a59f8ef955e2a32 kwallet-devel_package() { short_desc+=" - development" From 55b576a78682e46390f1f3f0a3f2c0534d414d62 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:16:06 +0200 Subject: [PATCH 2078/2369] kwayland: update to 5.94.0. --- srcpkgs/kwayland/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template index f67e288b91a..be5d66338ce 100644 --- a/srcpkgs/kwayland/template +++ b/srcpkgs/kwayland/template @@ -1,6 +1,6 @@ # Template file for 'kwayland' pkgname=kwayland -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwayland" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1648a273ad1c0c1895a0edff9a3e97eb151e1e3533362e0f01d72706ac0a7abe +checksum=b2a4d8e1b4d81ce798c991cfb34210ba095f6406a37f4714ae3ab64abaca2636 kwayland-devel_package() { short_desc+=" - development" From e27ad932beb2af71e75776863af48f1d4c233c7d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:16:11 +0200 Subject: [PATCH 2079/2369] kwidgetsaddons: update to 5.94.0. --- srcpkgs/kwidgetsaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template index 1b80c8140b8..c6863ab7bb7 100644 --- a/srcpkgs/kwidgetsaddons/template +++ b/srcpkgs/kwidgetsaddons/template @@ -1,6 +1,6 @@ # Template file for 'kwidgetsaddons' pkgname=kwidgetsaddons -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwidgetsaddons" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9c35e17d8c6faae58bfd48180bf968b813e6bfe2d49041b3285f8e326842a410 +checksum=678eed15c65d6298a5f720bc6dec1a6eed4e742431f7210a1d6bad261a003d32 do_check() { cd build From 84d6b95fc66dc9c250474dae7c7068ce07b34670 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:16:13 +0200 Subject: [PATCH 2080/2369] kwindowsystem: update to 5.94.0. --- srcpkgs/kwindowsystem/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template index f33ceba374d..980bcbdf52b 100644 --- a/srcpkgs/kwindowsystem/template +++ b/srcpkgs/kwindowsystem/template @@ -1,6 +1,6 @@ # Template file for 'kwindowsystem' pkgname=kwindowsystem -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake # Check stage requires a running X Server @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kwindowsystem" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=97cb223a4d1a7487a3ed496e10ff5e8c320ea7458eb34cbe4ed114bc19ebe4a1 +checksum=52ebb7d4e9ac3f24fadfd5265ff8cc390efbccf6fa6d084e5a573c3b2aa43c78 kwindowsystem-devel_package() { short_desc+=" - development" From c6b385bf06131c356c536efea0ac44f728536adc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:16:15 +0200 Subject: [PATCH 2081/2369] kxmlgui: update to 5.94.0. --- srcpkgs/kxmlgui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template index 92a6b2d152d..8080e90da11 100644 --- a/srcpkgs/kxmlgui/template +++ b/srcpkgs/kxmlgui/template @@ -1,6 +1,6 @@ # Template file for 'kxmlgui' pkgname=kxmlgui -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/kxmlgui" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=74ba65d95fac0cd09cb66e14d199efc739e1a8c9aec25812f41cfc64d7f4b099 +checksum=43a31730ff0ed113320817aa35a04e53b6ec647ab94320cf3b075adc38619dd6 do_check() { cd build From 916ca1f4ea321f3c519440ae08ba2ed0bd47da3b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:16:17 +0200 Subject: [PATCH 2082/2369] kxmlrpcclient: update to 5.94.0. --- srcpkgs/kxmlrpcclient/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template index 20010cf52f3..c5e11b6709a 100644 --- a/srcpkgs/kxmlrpcclient/template +++ b/srcpkgs/kxmlrpcclient/template @@ -1,6 +1,6 @@ # Template file for 'kxmlrpcclient' pkgname=kxmlrpcclient -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later, BSD-2-Clause" homepage="https://invent.kde.org/frameworks/kxmlrpcclient" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" -checksum=0cb41aff9f5660d95ee6d669f9c70692b55c089d0e1b9705e19b19fc2c49376c +checksum=65ac95cb022d5c7ca54c1e601211969aba06858773d881feb0004628a3451f82 post_install() { vlicense LICENSES/BSD-2-Clause.txt From c72e3e031daa91840f2331362e86bf9da85f45c3 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:16:19 +0200 Subject: [PATCH 2083/2369] modemmanager-qt5: update to 5.94.0. --- srcpkgs/modemmanager-qt5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template index b669557f11b..78f3c7a86a5 100644 --- a/srcpkgs/modemmanager-qt5/template +++ b/srcpkgs/modemmanager-qt5/template @@ -1,6 +1,6 @@ # Template file for 'modemmanager-qt5' pkgname=modemmanager-qt5 -version=5.93.0 +version=5.94.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/modemmanager-qt" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=3aedde6936524b9d0dea07ead34f44fcff50da2ccc0da73d6208893e270a67a8 +checksum=7928dc36bad38a9721305d59bb6d318e35118843001c21aa8802ce11ce11bff2 do_check() { cd build From 0677e5ef9b195d562d056e9e90a7596438b0bdb7 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:16:21 +0200 Subject: [PATCH 2084/2369] networkmanager-qt5: update to 5.94.0. --- srcpkgs/networkmanager-qt5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template index de46374e651..b80cd9d6482 100644 --- a/srcpkgs/networkmanager-qt5/template +++ b/srcpkgs/networkmanager-qt5/template @@ -1,6 +1,6 @@ # Template file for 'networkmanager-qt5' pkgname=networkmanager-qt5 -version=5.93.0 +version=5.94.0 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/networkmanager-qt" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" -checksum=b8588ce2d811094682f51ea6150f3c58baa398fc91339bcb511bf60bc0eba960 +checksum=12208cc319ff0e77bbc1c37437e0fde57f62aa2a4d0f9e26110e8eb27b986502 do_check() { cd build From b0a4927b9105978f64ee525986730576d3dfb7b2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:22 +0200 Subject: [PATCH 2085/2369] oxygen-icons5: update to 5.94.0. --- srcpkgs/oxygen-icons5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template index 62aa2f6abdb..8876060c0c9 100644 --- a/srcpkgs/oxygen-icons5/template +++ b/srcpkgs/oxygen-icons5/template @@ -1,6 +1,6 @@ # Template file for 'oxygen-icons5' pkgname=oxygen-icons5 -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later, LGPL-3.0-or-later" homepage="https://invent.kde.org/frameworks/oxygen-icons5" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=734e3f44dc3be665350ac5de7f333ab954d3e3b777765b691603b3647c353005 +checksum=203d9dbc3fb783c8c31c3d3d59624e31b502a50beea31505dcc56d8c33fcd1d0 conflicts="oxygen-icons>=0" oxygen-icons_package() { From 0d544cc3344faf576edbc2cbb87388c126fac6e2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:23 +0200 Subject: [PATCH 2086/2369] plasma-framework: update to 5.94.0. --- srcpkgs/plasma-framework/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template index 2ccf8a0c297..670f0892379 100644 --- a/srcpkgs/plasma-framework/template +++ b/srcpkgs/plasma-framework/template @@ -1,6 +1,6 @@ # Template file for 'plasma-framework' pkgname=plasma-framework -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -15,7 +15,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/plasma-framework" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d4a2c687ea2ea8dfe7c256eb58441fc458102ed4b445dc24685513dd96b5c322 +checksum=6cebfb9e7b61062194119bf7c4ef0e9529cd7321c8e06fb68b68fa518815ed2a do_check() { cd build From 5871fee0e9111b8e3d7089df46230b11509e574d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:25 +0200 Subject: [PATCH 2087/2369] prison: update to 5.94.0. --- srcpkgs/prison/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template index fdd1d0b1a11..4abb24f2d9d 100644 --- a/srcpkgs/prison/template +++ b/srcpkgs/prison/template @@ -1,6 +1,6 @@ # Template file for 'prison' pkgname=prison -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen @@ -12,7 +12,7 @@ maintainer="John " license="MIT" homepage="https://community.kde.org/Frameworks" distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz" -checksum=1f43de6622cf263c6b71f9a801174e2791c09b5a0d52c602715659ddfb82fb56 +checksum=99607978559f63dba65d796c5edaf6c54e8aee5d31882d856347ea5ada06d1cb post_install() { vlicense LICENSES/BSD-3-Clause.txt From 93ac7f639763c1364488de868f5b5115ea070e0c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:26 +0200 Subject: [PATCH 2088/2369] purpose: update to 5.94.0. --- srcpkgs/purpose/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template index 4c9f91568f2..e826b58f213 100644 --- a/srcpkgs/purpose/template +++ b/srcpkgs/purpose/template @@ -1,6 +1,6 @@ # Template file for 'purpose' pkgname=purpose -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/purpose" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=dc0bc0c7c5d9b27e21856132ceeb3893555a36f3944ebc97da2eb76a74e92cc4 +checksum=73adff977f2a69624abaf6340d6609dde41f404600feb28e51e1c7db4541b3ab do_check() { cd build From 952a63176615d5075cb95ab8162abeedeaf2ee40 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:28 +0200 Subject: [PATCH 2089/2369] qqc2-desktop-style: update to 5.94.0. --- srcpkgs/qqc2-desktop-style/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template index ee40061fe5d..1f89a4a2948 100644 --- a/srcpkgs/qqc2-desktop-style/template +++ b/srcpkgs/qqc2-desktop-style/template @@ -1,6 +1,6 @@ # Template file for 'qqc2-desktop-style' pkgname=qqc2-desktop-style -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/qqc2-desktop-style" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=161ec085a529e23532badb7723c78051e7b4c3a3fe11d3c4ab8bab93213ba9a8 +checksum=0b15210dbe93c22e423c876b27ca2f530f66cb72c6c5bcc7f854848ded0e7e48 qqc2-desktop-style-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 6b52108cc008ce4231cbe401fe9765a4978c5967 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:29 +0200 Subject: [PATCH 2090/2369] sonnet: update to 5.94.0. --- srcpkgs/sonnet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template index ae917562a6e..886f71fb6e1 100644 --- a/srcpkgs/sonnet/template +++ b/srcpkgs/sonnet/template @@ -1,6 +1,6 @@ # Template file for 'sonnet' pkgname=sonnet -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/sonnet" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3c146ba45edee43bf2e8bc48b116a38e0c28d2294fe61b44dc8254b881210d9c +checksum=8c570a64748d6bb6b91dff6fbf5e0cc5da7634c9a6f867944e99442066b7474c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" sonnet" From 21d345b999678ea93646786a672d3f849cb4f37e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:31 +0200 Subject: [PATCH 2091/2369] syndication: update to 5.94.0. --- srcpkgs/syndication/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template index bbb41153856..d0715f91d15 100644 --- a/srcpkgs/syndication/template +++ b/srcpkgs/syndication/template @@ -1,7 +1,7 @@ # Template file for 'syndication' pkgname=syndication reverts="18.08.0_1 18.08.0_2 18.08.1_1" -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz" -checksum=35f14e36076760170df44785df39f522407f58cfa36faf91564696587d8eda23 +checksum=458e12e4d4898d5e660ea6a3fe0d6158c208f5d4176451e1132423df2044685b syndication-devel_package() { short_desc+=" - development" From e065231d4dca2e1a7d7df568bf82dd423083b313 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:33 +0200 Subject: [PATCH 2092/2369] syntax-highlighting: update to 5.94.0. --- srcpkgs/syntax-highlighting/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template index 0f92ee3b944..72f6043303d 100644 --- a/srcpkgs/syntax-highlighting/template +++ b/srcpkgs/syntax-highlighting/template @@ -1,6 +1,6 @@ # Template file for 'syntax-highlighting' pkgname=syntax-highlighting -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer" @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/syntax-highlighting" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ebdb51f8922d2bc97457c7df376e6600d5ee9805fdc1ac7f7d6be35a3fec711b +checksum=cf871332a50355836919fdd833a82c32b3d5fe7fea8fa3e58714c39c8ddde5a6 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" syntax-highlighting" From 94ec3579fc9cd91568b4fa216c3e13ac1e8ea9a6 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:34 +0200 Subject: [PATCH 2093/2369] threadweaver: update to 5.94.0. --- srcpkgs/threadweaver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template index 89e6a9a71b9..d1798ff3ef4 100644 --- a/srcpkgs/threadweaver/template +++ b/srcpkgs/threadweaver/template @@ -1,6 +1,6 @@ # Template file for 'threadweaver' pkgname=threadweaver -version=5.93.0 +version=5.94.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/threadweaver" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6c0db7d276052ebc4d512b43792ae2127cb5fafb1cfee890b5f20bd05c06f185 +checksum=87d8431a62c53b7e433b49dfad4fd6cacb58356a50cfa17ac480c6bb00a8e1c5 threadweaver-devel_package() { short_desc+=" - development" From 21e145ec69329524fb87e6d7b3cbddc8935fb4ae Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:43 +0200 Subject: [PATCH 2094/2369] dolphin-plugins: update to 22.04.1. --- srcpkgs/dolphin-plugins/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template index cc08eb66a54..b1dfd4dc672 100644 --- a/srcpkgs/dolphin-plugins/template +++ b/srcpkgs/dolphin-plugins/template @@ -1,6 +1,6 @@ # Template file for 'dolphin-plugins' pkgname=dolphin-plugins -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig" @@ -10,4 +10,4 @@ maintainer="Domenico Panella " license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=65b5aa7fcc6b1d07499596a220ab54f0eeff2e60b2079f4180e13094b8337f65 +checksum=81220b19a5224fe720a2c5755900519b29b625a89051fd9ce269d611b122b0ff From 03c42e5896a95e3014dd2632d3324069cf092c52 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:44 +0200 Subject: [PATCH 2095/2369] khelpcenter: update to 22.04.1. --- srcpkgs/khelpcenter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template index 90578676016..b6af1198f55 100644 --- a/srcpkgs/khelpcenter/template +++ b/srcpkgs/khelpcenter/template @@ -1,6 +1,6 @@ # Template file for 'khelpcenter' pkgname=khelpcenter -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/system/org.kde.Help" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=193b2caf6a24bbb5f9f0d4e992cb58844258dd7691ac967a4e0068bc4e6141ba +checksum=c87d35c5942d7f13b9889b777ade17c5f8e745b0c52a3173f5e645666b665272 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake" From 9f20938d0ceb4f7467ec9585301aefabb282dd00 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:47 +0200 Subject: [PATCH 2096/2369] kate5: update to 22.04.1. --- srcpkgs/kate5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template index 7f8402eddc1..dd4240f84fb 100644 --- a/srcpkgs/kate5/template +++ b/srcpkgs/kate5/template @@ -1,6 +1,6 @@ # Template file for 'kate5' pkgname=kate5 -version=21.12.3 +version=22.04.1 revision=1 wrksrc="${pkgname%5}-${version}" build_style=cmake @@ -14,7 +14,7 @@ maintainer="John " license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://kde.org/applications/en/utilities/org.kde.kate" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz" -checksum=afa5141fb2746fc18ea2d97bd80ec37c096589822fe0b0e7ec00c63d0198e0de +checksum=f46ec33d7edf8032efcd489cc431ebf3f93e703e0e7d88a51e93941fd8509849 if [ "$CROSS_BUILD" ]; then configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake" From 124e17ba6361e6e79239c9dbcc84ef8525b70768 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:48 +0200 Subject: [PATCH 2097/2369] konsole: update to 22.04.1. --- ...0c2b791275f3727f2240ca7fab9f58db943d.patch | 86 +++++++++++++++++++ srcpkgs/konsole/template | 4 +- 2 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/konsole/patches/f6310c2b791275f3727f2240ca7fab9f58db943d.patch diff --git a/srcpkgs/konsole/patches/f6310c2b791275f3727f2240ca7fab9f58db943d.patch b/srcpkgs/konsole/patches/f6310c2b791275f3727f2240ca7fab9f58db943d.patch new file mode 100644 index 00000000000..f04148e72f8 --- /dev/null +++ b/srcpkgs/konsole/patches/f6310c2b791275f3727f2240ca7fab9f58db943d.patch @@ -0,0 +1,86 @@ +From f6310c2b791275f3727f2240ca7fab9f58db943d Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Tue, 22 Mar 2022 22:08:10 +0100 +Subject: [PATCH] Detect the presence of malloc_trim to fix the build with musl + +malloc_trim is indeed a GNU extension, but an extension of glibc. +Relying on __GNUC__ unfortunately doesn't help with that. Check for +the actual presence of malloc_trim with cmake's check_function_exists +instead. +This fixes the build with musl libc, which doesn't come with +malloc_trim. + +Co-authored-by: Ahmad Samir +--- + CMakeLists.txt | 2 +- + src/Screen.cpp | 17 +++++++---------- + src/config-konsole.h.cmake | 4 ++-- + 3 files changed, 10 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e6775aeef..9e990c37d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ set(HAVE_X11 ${X11_FOUND}) + # Check for function GETPWUID + check_symbol_exists(getpwuid "pwd.h" HAVE_GETPWUID) + +-check_include_files(malloc.h HAVE_MALLOC_H) ++check_function_exists(malloc_trim HAVE_MALLOC_TRIM) + + # See above includes for defaults + add_definitions( +diff --git a/src/Screen.cpp b/src/Screen.cpp +index ad578b4fd..10876f988 100644 +--- a/src/Screen.cpp ++++ b/src/Screen.cpp +@@ -28,13 +28,11 @@ + #include "history/HistoryType.h" + #include "profile/Profile.h" + +-#ifdef HAVE_MALLOC_H +- // For malloc_trim, which is a GNU extension +- #ifdef __GNUC__ +- extern "C" { +- #include +- } +- #endif ++#ifdef HAVE_MALLOC_TRIM ++// For malloc_trim, which is a GNU extension ++extern "C" { ++#include ++} + #endif + + using namespace Konsole; +@@ -1797,14 +1797,13 @@ + t.scroll(_history); + } + +-#ifdef HAVE_MALLOC_H ++#ifdef HAVE_MALLOC_TRIM ++ + #ifdef Q_OS_LINUX +-#ifdef __GNUC__ + // We might have been using gigabytes of memory, so make sure it is actually released + malloc_trim(0); + #endif + #endif +-#endif + } + + bool Screen::hasScroll() const +diff --git a/src/config-konsole.h.cmake b/src/config-konsole.h.cmake +index b74992b0a..4b1d9b515 100644 +--- a/src/config-konsole.h.cmake ++++ b/src/config-konsole.h.cmake +@@ -15,5 +15,5 @@ + + #cmakedefine HAVE_GETPWUID ${HAVE_GETPWUID} + +-/* Define to 1 if you have the header file. */ +-#cmakedefine HAVE_MALLOC_H 1 ++/* Defined if system has the malloc_trim function, which is a GNU extension */ ++#cmakedefine HAVE_MALLOC_TRIM +-- +GitLab diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template index 61c59d3fc3c..6483bcd8fe3 100644 --- a/srcpkgs/konsole/template +++ b/srcpkgs/konsole/template @@ -1,6 +1,6 @@ # Template file for 'konsole' pkgname=konsole -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF -GNinja" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later" homepage="https://kde.org/applications/en/system/org.kde.konsole" distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz" -checksum=1a9727a1ab878bce3419a3fa9cedf41cf0ed778dc7d9ce5a66314755bba8581b +checksum=8d049888a9be2464ec5c0c961fbab155fea679a714558f9ad6e13720c56822e3 replaces="konsole5>=0" # FIXME: after we switch cmake build-style to ninja, remove this as well as # the ninja host-dependency and configure_arg as they will become superfluous From 318bbd438ad554b7c096062793e8e8ca5df42181 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:50 +0200 Subject: [PATCH 2098/2369] baloo-widgets5: update to 22.04.1. --- srcpkgs/baloo-widgets5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template index c91a22fe9d3..8a9b4c13bbc 100644 --- a/srcpkgs/baloo-widgets5/template +++ b/srcpkgs/baloo-widgets5/template @@ -1,6 +1,6 @@ # Template file for 'baloo-widgets5' pkgname=baloo-widgets5 -version=21.12.3 +version=22.04.1 revision=1 wrksrc="baloo-widgets-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://invent.kde.org/libraries/baloo-widgets" distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz" -checksum=1b66aa05d60e6523a9458977f50fa5bed4a9e908c0813cd428b1abf57475cc31 +checksum=680722c0124f9f149227221778fa4f3e30788e5bb6b202ac8cbcfd412d6e73ae baloo-widgets5-devel_package() { short_desc+=" - development" From 414267da7ff44ca4cb636d1ed62465d5aa10a280 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:51 +0200 Subject: [PATCH 2099/2369] kio-extras: update to 22.04.1. --- srcpkgs/kio-extras/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template index ea210a9a562..1ead831c057 100644 --- a/srcpkgs/kio-extras/template +++ b/srcpkgs/kio-extras/template @@ -1,6 +1,6 @@ # Template file for 'kio-extras' pkgname=kio-extras -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp" @@ -15,4 +15,4 @@ maintainer="Denis Revin " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://invent.kde.org/network/kio-extras" distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz" -checksum=b1400209157f5ff21e0981a54c8bdb442a51764ccd88fecdd7e49f989bb4f787 +checksum=a4475107e06d740e0d3fb9e80fa3c58d389508d48d6434e4ab21d6cac25ff814 From 015fc09b2fa7cea7a912552bb323b185af045d5d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:56 +0200 Subject: [PATCH 2100/2369] akonadi-calendar: update to 22.04.1. --- srcpkgs/akonadi-calendar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template index a600d71f87e..2ea65468ed4 100644 --- a/srcpkgs/akonadi-calendar/template +++ b/srcpkgs/akonadi-calendar/template @@ -1,6 +1,6 @@ # Template file for 'akonadi-calendar' pkgname=akonadi-calendar -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz" -checksum=78617cb53b3e9a4abdae34db63e57fb884ad412428fb722f9806a87e9337fe43 +checksum=359c86f9fe84ea0b66629f143244dda0c14b534e34feacf88971f5170ba111cb akonadi-calendar-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From ddb86f989da6477a21c7ab0bb24544771b4d85fd Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:58 +0200 Subject: [PATCH 2101/2369] akonadi-contacts: update to 22.04.1. --- srcpkgs/akonadi-contacts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template index 90a30d0eb2c..0e4786133fa 100644 --- a/srcpkgs/akonadi-contacts/template +++ b/srcpkgs/akonadi-contacts/template @@ -1,6 +1,6 @@ # Template file for 'akonadi-contacts' pkgname=akonadi-contacts -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM/Akonadi" distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz" -checksum=b5a50748877cac1209bbbfbb19cbd20441c0563924aceceaba081fa113903d12 +checksum=cdf2c60ab9d0d197eeddafc558506e3d1862c0e5648baf34eb6e43f87449390e if [ "$CROSS_BUILD" ];then hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig" From 32ed662781055ce8d10e6480c8dea5a549be803c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:18:59 +0200 Subject: [PATCH 2102/2369] akonadi-import-wizard: update to 22.04.1. --- srcpkgs/akonadi-import-wizard/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template index b664301805f..5ab0a8f7095 100644 --- a/srcpkgs/akonadi-import-wizard/template +++ b/srcpkgs/akonadi-import-wizard/template @@ -1,17 +1,18 @@ # Template file for 'akonadi-import-wizard' pkgname=akonadi-import-wizard -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake gettext" -makedepends="kcontacts-devel mailcommon-devel mailimporter-devel messagelib-devel" +makedepends="kcontacts-devel mailcommon-devel mailimporter-devel messagelib-devel + kcalutils-devel" short_desc="Import data from other mail clients to KMail" maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=92f1f46a7e1eccc83ae738c9c3a0c3dddecb2c6385f4f62b4a17b3f647e97db9 +checksum=7244e9c7a1f61a3ebdfc4b5331ce42ecf678cb483c8f0a06d6dbbd52d0fff761 akonadi-import-wizard-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 3bdd0f1bc10fb9a5ea4488e70b0e17b760e579e1 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:00 +0200 Subject: [PATCH 2103/2369] akonadi-mime: update to 22.04.1. --- srcpkgs/akonadi-mime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template index c4b4df73fa1..a749a2a614f 100644 --- a/srcpkgs/akonadi-mime/template +++ b/srcpkgs/akonadi-mime/template @@ -1,6 +1,6 @@ # Template file for 'akonadi-mime' pkgname=akonadi-mime -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3 @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM/Akonadi" distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz" -checksum=bbcf7ef38a113765176b5325c7c458562084bfd1a56e6680b8e584f48b5b99ad +checksum=6f5808f19431c42654da7e8e729a8b0dad0e9ed1d0057efc035fd78c88347d0e if [ "$CROSS_BUILD" ];then hostmakedepends+=" qt5-qmake qt5-host-tools kconfig" From ad71921dfa631db9fe196f85fabf851f478934b5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:02 +0200 Subject: [PATCH 2104/2369] akonadi-notes: update to 22.04.1. --- srcpkgs/akonadi-notes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template index 2468cd51220..8d7f87ab274 100644 --- a/srcpkgs/akonadi-notes/template +++ b/srcpkgs/akonadi-notes/template @@ -1,6 +1,6 @@ # Template file for 'akonadi-notes' pkgname=akonadi-notes -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://kontact.kde.org/" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=4ba78418ef7c866bb00db799069efcd445f3232751bc18197ddff5f763e26c76 +checksum=5363c67945a98bbe8d0c10c42870eb42ee6730efc6cfa59c98316944df3e3a85 akonadi-notes-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 7ed7e70a3d94b5491c04726f038406fe8d68a548 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:03 +0200 Subject: [PATCH 2105/2369] akonadi-search: update to 22.04.1. --- srcpkgs/akonadi-search/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template index c8e9882dd47..bc270672f17 100644 --- a/srcpkgs/akonadi-search/template +++ b/srcpkgs/akonadi-search/template @@ -1,6 +1,6 @@ # Template file for 'akonadi-search' pkgname=akonadi-search -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz" -checksum=d76c0edccf2e25b9e86469d21a32015315e77cb05f489fc3bffb27d6e5ffa6c5 +checksum=731ecb9ead8fd2e4cffeb72199bf1b6165c71d69e3dddbb38a75521d4bab3e2b akonadi-search-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From ef42d0127833552ee7ad1caddd8e755e509ea17d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:04 +0200 Subject: [PATCH 2106/2369] akonadi5: update to 22.04.1. --- srcpkgs/akonadi5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template index 6fd3230cdaa..26a997672ed 100644 --- a/srcpkgs/akonadi5/template +++ b/srcpkgs/akonadi5/template @@ -1,6 +1,6 @@ # Template file for 'akonadi5' pkgname=akonadi5 -version=21.12.3 +version=22.04.1 revision=1 wrksrc="akonadi-${version}" build_style=cmake @@ -19,7 +19,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM/Akonadi" distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz" -checksum=4fe8ded706faf6ce87a48b7f164cbdd4eb71a342501eb9a0db40a87666cfda08 +checksum=daf8cde6cdfe3bebf1b56ffa33705deab479454d0622fcd824e839f89a213981 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From 9c2ae823810ca413146dd1212160772827c97bb9 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:06 +0200 Subject: [PATCH 2107/2369] akregator: update to 22.04.1. --- srcpkgs/akregator/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template index 3319b8d9f64..15400416e8d 100644 --- a/srcpkgs/akregator/template +++ b/srcpkgs/akregator/template @@ -1,6 +1,6 @@ # Template file for 'akregator' pkgname=akregator -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -13,4 +13,4 @@ maintainer="Orphaned " license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/applications/internet/akregator" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=c8a1fa0682123189b3c31c52c3f73d72c4f8a6dcaddad91a2391defe9360c5fb +checksum=e29f8af6c6526591d87feb221481a6ba79141a1bd12ca87fc4af46c609fe56a1 From 52d47394b2b6499f7bd948b217572c1750a3461e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:07 +0200 Subject: [PATCH 2108/2369] ark: update to 22.04.1. --- srcpkgs/ark/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template index cf6c31c7756..37061e10b14 100644 --- a/srcpkgs/ark/template +++ b/srcpkgs/ark/template @@ -1,6 +1,6 @@ # Template file for 'ark' pkgname=ark -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/utilities/org.kde.ark" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=4817458000a8f0c241cc59aed1c52ae4338c9d3c5f4f65a57080abb1ec5b60dc +checksum=765ecb081dbb0aaf3d41f53fabd27152ffee38bfff885bfd73a5b80150e66dc6 do_check() { cd build From f35bfdb53cfe84c7e4fd51800445ebfdddeb6c93 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:09 +0200 Subject: [PATCH 2109/2369] calendarsupport: update to 22.04.1. --- srcpkgs/calendarsupport/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template index 01b884d2508..a70cae62110 100644 --- a/srcpkgs/calendarsupport/template +++ b/srcpkgs/calendarsupport/template @@ -1,6 +1,6 @@ # Template file for 'calendarsupport' pkgname=calendarsupport -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz" -checksum=77a337bea4bf5cac162d09684794edca3e3f6997f30949857ae1b23340b4d62a +checksum=10b395b52c3a892b32ec5ba6663a85536930cfa751d8d01fafb5429d0083aeab calendarsupport-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From a62df215b67d0f87af579c72b4637062bd064716 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:10 +0200 Subject: [PATCH 2110/2369] dragon-player: update to 22.04.1. --- srcpkgs/dragon-player/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template index fd0948ebc1c..d2d506f5c33 100644 --- a/srcpkgs/dragon-player/template +++ b/srcpkgs/dragon-player/template @@ -1,6 +1,6 @@ # Template file for 'dragon-player' pkgname=dragon-player -version=21.12.3 +version=22.04.1 revision=1 wrksrc="dragon-${version}" build_style=cmake @@ -13,4 +13,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/multimedia/org.kde.dragonplayer" distfiles="${KDE_SITE}/release-service/${version}/src/dragon-${version}.tar.xz" -checksum=e1bae79adf88ae980a41ff475260c4d6e9f0b04b1f88df44d2bd4ab217e53c26 +checksum=37bd492b88480569a59f74e9788bf7a24cbda5c2153f33c02f8b2b6f7ca9035b From af18f59a00da60e3547ed4eb7a967c00920a0c21 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:12 +0200 Subject: [PATCH 2111/2369] elisa: update to 22.04.1. --- srcpkgs/elisa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template index db7b9fae4ff..186af4f1b6f 100644 --- a/srcpkgs/elisa/template +++ b/srcpkgs/elisa/template @@ -1,6 +1,6 @@ # Template file for 'elisa' pkgname=elisa -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://kde.org/applications/en/multimedia/org.kde.elisa" distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz" -checksum=8afd7c82af4b4e023bcab3b473997baf5cf7ab4153f497c3b698328706d9e931 +checksum=77bea9ed938ccda42818fc89612c86242e391fba435ba4a48a832404be155e05 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel" From a6b7b80a0e1d85eaf68a83448ac0206394842d2c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:13 +0200 Subject: [PATCH 2112/2369] eventviews: update to 22.04.1. --- srcpkgs/eventviews/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template index d55340fe660..63d0a86693a 100644 --- a/srcpkgs/eventviews/template +++ b/srcpkgs/eventviews/template @@ -1,6 +1,6 @@ # Template file for 'eventviews' pkgname=eventviews -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=828bcb2263f72d931dfd0b74d86f18dcc8afaeb928b3ceeae42dd8ab3963a907 +checksum=ad0814c2bae3536dfd363f0b7bef7fd629944467a5aece0d033e70cb8f0f6e48 eventviews-devel_package() { short_desc+=" - development" From ffb8c66fabe268b37e3d52af1a8c7e68aaff9324 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:14 +0200 Subject: [PATCH 2113/2369] ffmpegthumbs: update to 22.04.1. --- srcpkgs/ffmpegthumbs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template index 72f6ccaeedd..0f28d432b1d 100644 --- a/srcpkgs/ffmpegthumbs/template +++ b/srcpkgs/ffmpegthumbs/template @@ -1,6 +1,6 @@ # Template file for 'ffmpegthumbs' pkgname=ffmpegthumbs -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#ffmpegthumbs" distfiles="${KDE_SITE}/release-service/${version}/src/ffmpegthumbs-${version}.tar.xz" -checksum=9a9b310eef45990f065449688801f435fbc9e0a936c83e6e307f7e0546bf4f74 +checksum=8c2f7bdccde8f6ee78f8c6fe77cd6d0558fcc0173fb6605f04fddf453c9d7875 From 62e98b6f8605df20e226acf9b44f85062a1fd3d9 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:16 +0200 Subject: [PATCH 2114/2369] filelight: update to 22.04.1. --- srcpkgs/filelight/patches/musl.patch | 26 ++++++++++++++++++++++++++ srcpkgs/filelight/template | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/srcpkgs/filelight/patches/musl.patch b/srcpkgs/filelight/patches/musl.patch index e97ad3ffc1b..56b36abac39 100644 --- a/srcpkgs/filelight/patches/musl.patch +++ b/srcpkgs/filelight/patches/musl.patch @@ -39,3 +39,29 @@ -#endif - #endif +--- a/src/posixWalker.cpp 2022-05-09 04:52:35.000000000 +0200 ++++ - 2022-05-15 17:20:54.296063960 +0200 +@@ -3,6 +3,10 @@ + + #include "posixWalker.h" + ++#ifndef S_BLKSIZE ++#define S_BLKSIZE 512 ++#endif ++ + static void outputError(const QByteArray &path) + { + /// show error message that stat or opendir may give +--- a/autotests/directoryIteratorTest.cpp 2022-05-09 04:52:35.000000000 +0200 ++++ - 2022-05-15 17:21:05.992082135 +0200 +@@ -8,6 +8,10 @@ + #include "directoryIterator.h" + #include "test-config.h" + ++#ifndef S_BLKSIZE ++#define S_BLKSIZE 512 ++#endif ++ + class DirectoryIteratorTest : public QObject + { + Q_OBJECT diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template index 30e825e0eee..fa8bade7361 100644 --- a/srcpkgs/filelight/template +++ b/srcpkgs/filelight/template @@ -1,6 +1,6 @@ # Template file for 'filelight' pkgname=filelight -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-only" homepage="https://utils.kde.org/projects/filelight/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight" distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz" -checksum=434fa7439732905c4655cc376d2c89e86a5fcc5371ee6fda16400917a8e4e587 +checksum=b639aef7f2db474367e38b5ed2faee32b6affc7f78595d8d184e9f909172f91b From c22ba139969de919834767ebd9541fa5e387ca3a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:17 +0200 Subject: [PATCH 2115/2369] grantleetheme: update to 22.04.1. --- srcpkgs/grantleetheme/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template index b6db35eedbc..03bab8a0d8a 100644 --- a/srcpkgs/grantleetheme/template +++ b/srcpkgs/grantleetheme/template @@ -1,6 +1,6 @@ # Template file for 'grantleetheme' pkgname=grantleetheme -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE" @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz" -checksum=67d9d531e4f326ea4efd40a955c9d2c6e8e54b9a02678dcee4c10b3917d503f1 +checksum=7532503e0a3b090734217db20cc6461140c02cd0d00b85793064724f964e7a2a grantleetheme-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedpends}" From 44206a0bc64222969f10133da974cc75ebc873cf Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:19 +0200 Subject: [PATCH 2116/2369] incidenceeditor: update to 22.04.1. --- srcpkgs/incidenceeditor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template index 7490da76989..82cdbe42675 100644 --- a/srcpkgs/incidenceeditor/template +++ b/srcpkgs/incidenceeditor/template @@ -1,6 +1,6 @@ # Template file for 'incidenceeditor' pkgname=incidenceeditor -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=aa278c3710a08622fedb2e38d329947aa03bbe30c4101ec7831ce2fb9ea36ee9 +checksum=832d5332caa888205e1680a6636b31429e77b5a0b0807445234ab74df3936340 do_check() { # failing tests are disabled From 87dc997721e413525117664262833209e5d4099d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:20 +0200 Subject: [PATCH 2117/2369] juk: update to 22.04.1. --- srcpkgs/juk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template index 08664e3fed3..c83a111c2c5 100644 --- a/srcpkgs/juk/template +++ b/srcpkgs/juk/template @@ -1,6 +1,6 @@ # Template file for 'juk' pkgname=juk -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools @@ -12,4 +12,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://juk.kde.org/" distfiles="${KDE_SITE}/release-service/${version}/src/juk-${version}.tar.xz" -checksum=9a61b68b9993e1eb9551e1b899f0d4d616b74b5fdf0d9edc40d0a41406e8ffc6 +checksum=a0aeeafedacc9b9569152e334e83c76dcd1dbb9b201664ad52f56371da8b2cb1 From c717f93592f1a34c8f20263fe210ee2a7b562d8a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:23 +0200 Subject: [PATCH 2118/2369] k3b: update to 22.04.1. --- srcpkgs/k3b/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template index c2eab8d7964..3c8c150df56 100644 --- a/srcpkgs/k3b/template +++ b/srcpkgs/k3b/template @@ -1,6 +1,6 @@ # Template file for 'k3b' pkgname=k3b -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext @@ -16,4 +16,4 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/multimedia/org.kde.k3b" changelog="https://kde.org/announcements/changelogs/gear/${version}/#k3b" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=5856d71fd5cf7f14eb646107f76e521869b4ac99df3411257c9f3427267b6504 +checksum=d79037e95c7d567b9e6453f9f6cb72f4d764d43180aa8854ee935a338ed354fb From 4e57503d0e446f9ecadfdf97cf338ef4f78aaf7f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:24 +0200 Subject: [PATCH 2119/2369] kaccounts-integration: update to 22.04.1. --- srcpkgs/kaccounts-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template index 7a8b45b2da0..db39510102f 100644 --- a/srcpkgs/kaccounts-integration/template +++ b/srcpkgs/kaccounts-integration/template @@ -1,6 +1,6 @@ # Template file for 'kaccounts-integration' pkgname=kaccounts-integration -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://cgit.kde.org/kaccounts-integration.git/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration" distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz" -checksum=3e5197c1c7ddce92dd5bdcdcc05492f3c63c468e3c1e743c6e747114d34d08b8 +checksum=72ed8df11b396ffaedb5196996ff3101051271432a7347952e19cdfe306144fa kaccounts-integration-devel_package() { short_desc+=" - development" From 9eaacf5e76f61dc869675cb8c71da312181c1297 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:26 +0200 Subject: [PATCH 2120/2369] kaccounts-providers: update to 22.04.1. --- srcpkgs/kaccounts-providers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template index 09f7d22603b..5e41147ff95 100644 --- a/srcpkgs/kaccounts-providers/template +++ b/srcpkgs/kaccounts-providers/template @@ -1,6 +1,6 @@ # Template file for 'kaccounts-providers' pkgname=kaccounts-providers -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://cgit.kde.org/kaccounts-providers.git/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers" distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz" -checksum=297a55bcfa26379e9501b70f17da238a4ae23fd908b3afaa0052853a1cca0e34 +checksum=b8533965489af122ad8d96d86dea3a0e4f7ff7771e8a1763b9b4b7ef9fb4f056 build_options="nextcloud" desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)" From 8072eee063c9f0c7512447f715c6876a2d74437c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:27 +0200 Subject: [PATCH 2121/2369] kaddressbook: update to 22.04.1. --- srcpkgs/kaddressbook/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template index 585719896ba..f396dc86b9c 100644 --- a/srcpkgs/kaddressbook/template +++ b/srcpkgs/kaddressbook/template @@ -1,6 +1,6 @@ # Template file for 'kaddressbook' pkgname=kaddressbook -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -13,7 +13,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/office/org.kde.kaddressbook" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=ad02369e61e42b32cd8a302e6510cffb99a20115a83412389e81a6e49b03f8c3 +checksum=c0a467b6de83a07ef6b92aa1ff1f7eea8740185a269aaf5a1656e5439c5ae6d8 kaddressbook-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 08e746cb867cd8d60c703285565e9ca3c7ab78b1 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:29 +0200 Subject: [PATCH 2122/2369] kalarm: update to 22.04.1. --- srcpkgs/kalarm/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template index 9a40d89caf4..d7d8bae4232 100644 --- a/srcpkgs/kalarm/template +++ b/srcpkgs/kalarm/template @@ -1,15 +1,16 @@ # Template file for 'kalarm' pkgname=kalarm -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools kauth kconfig gettext" -makedepends="kalarmcal-devel mailcommon-devel messagelib-devel kidletime-devel - knotifyconfig-devel" +makedepends="mailcommon-devel messagelib-devel kidletime-devel + kcalutils-devel kholidays-devel knotifyconfig-devel" short_desc="Personal alarm scheduler" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/utilities/kalarm" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=71cca4083a29d20485612d505b3ab99190722d3948af2cee52111a5263673cd6 +checksum=958106e7c537ee5d006c4bae49d4708eeb8e8a19aa1e8485d1d474feaa478f11 +replaces="kalarmcal>=0" From 5ff5e46d15893a4ae5269e225089542a9097ba4a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:30 +0200 Subject: [PATCH 2123/2369] kalarmcal: remove package --- common/shlibs | 1 - srcpkgs/kalarmcal-devel | 1 - srcpkgs/kalarmcal/template | 26 -------------------------- 3 files changed, 28 deletions(-) delete mode 120000 srcpkgs/kalarmcal-devel delete mode 100644 srcpkgs/kalarmcal/template diff --git a/common/shlibs b/common/shlibs index a95bc3054f1..7607a62859c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -512,7 +512,6 @@ libKF5CalendarSupport.so.5 calendarsupport-17.12.3_1 libKF5AkonadiNotes.so.5 akonadi-notes-17.12.3_1 libKPimKDAV.so.5 kdav-5.72.0_1 libKF5DAV.so.5 kdav-5.72.0_1 -libKF5AlarmCalendar.so.5 kalarmcal-17.12.3_1 libakonadi-singlefileresource.so.5 kdepim-runtime-17.12.3_1 libkmindexreader.so.5 kdepim-runtime-17.12.3_1 libkdexoauth2.so.3 kdepim-runtime-17.12.3_1 diff --git a/srcpkgs/kalarmcal-devel b/srcpkgs/kalarmcal-devel deleted file mode 120000 index d1b3ef0bb31..00000000000 --- a/srcpkgs/kalarmcal-devel +++ /dev/null @@ -1 +0,0 @@ -kalarmcal \ No newline at end of file diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template deleted file mode 100644 index 7e5cf95394f..00000000000 --- a/srcpkgs/kalarmcal/template +++ /dev/null @@ -1,26 +0,0 @@ -# Template file for 'kalarmcal' -pkgname=kalarmcal -version=21.12.3 -revision=1 -build_style=cmake -hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 - gettext kdoctools kdesignerplugin" -makedepends="kidentitymanagement-devel kholidays-devel kcalendarcore-devel akonadi5-devel - kdelibs4support-devel kcalutils-devel" -short_desc="KAlarm client library" -maintainer="John " -license="LGPL-2.1-or-later" -homepage="https://community.kde.org/KDE_PIM" -distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=194f97ee30c8382ac7fd80432e72f04f5db3f3fe4a009ab487c82c014eae1798 - -kalarmcal-devel_package() { - depends="${sourcepkg}>=${version}_${revision} ${makedepends}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/lib/qt5/mkspecs - vmove "usr/lib/*.so" - } -} From 48ea5926344c98d7b8f19b3524993e43fb4b49b0 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:32 +0200 Subject: [PATCH 2124/2369] kapman: update to 22.04.1. --- srcpkgs/kapman/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kapman/template b/srcpkgs/kapman/template index 4e84c65b75c..54a19dd7497 100644 --- a/srcpkgs/kapman/template +++ b/srcpkgs/kapman/template @@ -1,6 +1,6 @@ # Template file for 'kapman' pkgname=kapman -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/games/org.kde.kapman" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kapman" distfiles="${KDE_SITE}/release-service/${version}/src/kapman-${version}.tar.xz" -checksum=7318f2de85402da182d630e53890ac0fde78f21b0ef6013b226e533fdef9e4a4 +checksum=730a218d8a2fcd2b7f736b2c3875642ba7fc79590654125ab293d6aeeaafd5a8 From 54fc3ccabd976bf8eabf22b5a0dacb23bb22302a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:34 +0200 Subject: [PATCH 2125/2369] kblocks: update to 22.04.1. --- srcpkgs/kblocks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kblocks/template b/srcpkgs/kblocks/template index 9ef7a1b7e27..b3a1ce9eb28 100644 --- a/srcpkgs/kblocks/template +++ b/srcpkgs/kblocks/template @@ -1,6 +1,6 @@ # Template file for 'kblocks' pkgname=kblocks -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig @@ -14,4 +14,4 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/games/org.kde.kblocks" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kblocks" distfiles="${KDE_SITE}/release-service/${version}/src/kblocks-${version}.tar.xz" -checksum=91ae615c64645e7244e436aff487dcff8e6b126bc1d018e6430720cd4d6272d8 +checksum=6d34f530007087db2ab5dcf0fdfab2946d7075008e99696fb5bb2d27ef5df4b5 From 08de7abd33eff75b3874cb8ff7170ead2b8435e5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:35 +0200 Subject: [PATCH 2126/2369] kcachegrind: update to 22.04.1. --- srcpkgs/kcachegrind/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template index d46aefe7cb9..3d1915bffa2 100644 --- a/srcpkgs/kcachegrind/template +++ b/srcpkgs/kcachegrind/template @@ -1,6 +1,6 @@ # Template file for 'kcachegrind' pkgname=kcachegrind -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -13,5 +13,5 @@ license="GPL-2.0-only, GFDL-1.2-only" homepage="https://kde.org/applications/development/kcachegrind/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind" distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz" -checksum=aed09ea5dc01ace24c76ed69edef5111c47f53992ba45896365b53cd3fc8890d +checksum=5af150fc24f36f67f4c86ccb7a5a85067619685c4639fa905195136e84a7785b python_version=2 From d41669295b5704fd961612225ad1853f7b7c2453 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:36 +0200 Subject: [PATCH 2127/2369] kcalc: update to 22.04.1. --- srcpkgs/kcalc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcalc/template b/srcpkgs/kcalc/template index 877954b3dfb..35ff05723e8 100644 --- a/srcpkgs/kcalc/template +++ b/srcpkgs/kcalc/template @@ -1,6 +1,6 @@ # Template file for 'kcalc' pkgname=kcalc -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/utilities/org.kde.kcalc" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcalc" distfiles="${KDE_SITE}/release-service/${version}/src/kcalc-${version}.tar.xz" -checksum=986ca84e82fda9325171a84c8efd7fd4eb2a82e3082af536473db24f33fcd897 +checksum=f4b1db0f7f1185e6060ef86538a1467ed25214d063703997e8b2ae026b65ce26 From f2bede9e582d072a06069da6cd11c55eba01af36 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:38 +0200 Subject: [PATCH 2128/2369] kcalutils: update to 22.04.1. --- srcpkgs/kcalutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template index 7f4328aeab8..73f7f360f38 100644 --- a/srcpkgs/kcalutils/template +++ b/srcpkgs/kcalutils/template @@ -1,6 +1,6 @@ # Template file for 'kcalutils' pkgname=kcalutils -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz" -checksum=9a35191c4424ed195e697a0601b1e449654b740cd6d72aa85fa845ffe574da00 +checksum=d8ab231623f20d9014d9a77d480b06b4c1639d10d2e122b9e4c2651bfdf8fc6d kcalutils-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From 1fa0033806451935935f97479561444d141d06cb Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:39 +0200 Subject: [PATCH 2129/2369] kcharselect: update to 22.04.1. --- srcpkgs/kcharselect/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcharselect/template b/srcpkgs/kcharselect/template index 81baec03474..41a89b9994a 100644 --- a/srcpkgs/kcharselect/template +++ b/srcpkgs/kcharselect/template @@ -1,6 +1,6 @@ # Template file for 'kcharselect' pkgname=kcharselect -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons gettext" @@ -11,7 +11,7 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/utilities/org.kde.kcharselect" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcharselect" distfiles="${KDE_SITE}/release-service/${version}/src/kcharselect-${version}.tar.xz" -checksum=c713581d6d0b300d408208ecb69d9752f6c7ac75f704439070d5099f5cfa51a9 +checksum=69522b00031af8bc564dfcf17472d410683e560a0443e2e41a51370410769c68 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kdoctools python3 qt5-host-tools qt5-qmake" From 8e308aef3fafa2657c94c38115db2e862b06c766 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:41 +0200 Subject: [PATCH 2130/2369] kcolorchooser: update to 22.04.1. --- srcpkgs/kcolorchooser/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcolorchooser/template b/srcpkgs/kcolorchooser/template index be3e0741cc0..65cb65e4ecd 100644 --- a/srcpkgs/kcolorchooser/template +++ b/srcpkgs/kcolorchooser/template @@ -1,6 +1,6 @@ # Template file for 'kcolorchooser' pkgname=kcolorchooser -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons gettext" @@ -11,7 +11,7 @@ license="MIT" homepage="https://kde.org/applications/en/graphics/org.kde.kcolorchooser" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcolorchooser" distfiles="${KDE_SITE}/release-service/${version}/src/kcolorchooser-${version}.tar.xz" -checksum=fadc3df8e6b47de72681434ecc9370a92fc23cf2aa97c4988b60f524155fd64a +checksum=f9e78bca7ce4ce3cd1cc4503542d9c7e6753aee0ba4fa5146a3fe09e4b3e32e9 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" From 04eeb67bd7780a5d4ca60d6b151c2e5e7e8a2758 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:42 +0200 Subject: [PATCH 2131/2369] kcron: update to 22.04.1. --- srcpkgs/kcron/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template index 636aad34dab..8568a91546c 100644 --- a/srcpkgs/kcron/template +++ b/srcpkgs/kcron/template @@ -1,6 +1,6 @@ # Template file for 'kcron' pkgname=kcron -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://userbase.kde.org/System_Settings/Task_Scheduler" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron" distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz" -checksum=d8ace47c86633ba677b64c765efe0b6f3de27cb75c17ae2434c498b07f3c0648 +checksum=550e736e2d21c72bd83dbfb6b7d3bd435bc40bb7ff7b3d2de4ea0382fe98e595 From d55562bb9fdd7ea3fc8b7bdf213af65db0b766db Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:43 +0200 Subject: [PATCH 2132/2369] kdeconnect: update to 22.04.1. --- common/shlibs | 6 +++--- srcpkgs/kdeconnect/template | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7607a62859c..829d4007b3d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3179,9 +3179,9 @@ libsquirrel.so.0 squirrel-libs-3.1_1 libsqstdlib.so.0 squirrel-libs-3.1_1 libexecinfo.so.1 libexecinfo-1.1_1 libkdeconnectpluginkcm.so.2 kdeconnect-20.12.2_1 -libkdeconnectinterfaces.so.21 kdeconnect-21.03.80_1 -libkdeconnectcore.so.21 kdeconnect-21.03.80_1 -libkpmcore.so.11 kpmcore-21.03.80_1 +libkdeconnectinterfaces.so.22 kdeconnect-22.04.1_1 +libkdeconnectcore.so.22 kdeconnect-22.04.1_1 +libkpmcore.so.12 kpmcore-22.04.1_1 libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6 libr_core.so.5.6.8 radare2-5.6.8_1 libr_config.so.5.6.8 radare2-5.6.8_1 diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template index a7b4fcf1e5b..1f48792b51c 100644 --- a/srcpkgs/kdeconnect/template +++ b/srcpkgs/kdeconnect/template @@ -1,6 +1,6 @@ # Template file for 'kdeconnect' pkgname=kdeconnect -version=21.12.3 +version=22.04.1 revision=1 wrksrc="kdeconnect-kde-${version}" build_style=cmake @@ -19,5 +19,5 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://github.com/KDE/kdeconnect-kde" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz" -checksum=8fc84f22ad5fa1371a109679f283baaf8728c05a92b9a6f36629b8f8d9a933d9 +checksum=6dd9ba48bb80ba607e73097bf05fb8d914f3ccc1d10f8ea8e279a918c2b0a57a python_version=3 From 78c45edd72e361776b6b34ef030b0e9c451cc1ef Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:45 +0200 Subject: [PATCH 2133/2369] kdegraphics-mobipocket: update to 22.04.1. --- srcpkgs/libqmobipocket | 1 - srcpkgs/libqmobipocket-devel | 2 +- .../template | 16 +++++----------- 3 files changed, 6 insertions(+), 13 deletions(-) delete mode 120000 srcpkgs/libqmobipocket rename srcpkgs/{kdegraphics-mobipocket => libqmobipocket}/template (72%) diff --git a/srcpkgs/libqmobipocket b/srcpkgs/libqmobipocket deleted file mode 120000 index b58879252b9..00000000000 --- a/srcpkgs/libqmobipocket +++ /dev/null @@ -1 +0,0 @@ -kdegraphics-mobipocket \ No newline at end of file diff --git a/srcpkgs/libqmobipocket-devel b/srcpkgs/libqmobipocket-devel index b58879252b9..5b1b2b17ef7 120000 --- a/srcpkgs/libqmobipocket-devel +++ b/srcpkgs/libqmobipocket-devel @@ -1 +1 @@ -kdegraphics-mobipocket \ No newline at end of file +libqmobipocket \ No newline at end of file diff --git a/srcpkgs/kdegraphics-mobipocket/template b/srcpkgs/libqmobipocket/template similarity index 72% rename from srcpkgs/kdegraphics-mobipocket/template rename to srcpkgs/libqmobipocket/template index 13f0ad0fbde..eb665365282 100644 --- a/srcpkgs/kdegraphics-mobipocket/template +++ b/srcpkgs/libqmobipocket/template @@ -1,7 +1,8 @@ -# Template file for 'kdegraphics-mobipocket' -pkgname=kdegraphics-mobipocket -version=21.12.3 +# Template file for 'libqmobipocket' +pkgname=libqmobipocket +version=22.04.1 revision=1 +wrksrc="kdegraphics-mobipocket-${version}" build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake gettext" makedepends="kio-devel" @@ -11,14 +12,7 @@ license="GPL-2.0-or-later" homepage="https://projects.kde.org/projects/kde/kdegraphics-mobipocket" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdegraphics-mobipocket" distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-mobipocket-${version}.tar.xz" -checksum=58c4dc769972a1472a9cfe1d134a77a12e9a78357829247d247aa73bc8e83124 - -libqmobipocket_package() { - short_desc+=" - runtime library" - pkg_install() { - vmove "usr/lib/*.so.*" - } -} +checksum=e7e31efa63d478b049aca107bf8fd9731fcc357b67fdc62dab3f3307f4d41f5d libqmobipocket-devel_package() { short_desc+=" - development files" From 6c88f2f5fb7ee8f72ed83bc201bca8493ee28d4f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:46 +0200 Subject: [PATCH 2134/2369] kdegraphics-thumbnailers: update to 22.04.1. --- srcpkgs/kdegraphics-mobipocket | 1 + srcpkgs/kdegraphics-thumbnailers/template | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/kdegraphics-mobipocket diff --git a/srcpkgs/kdegraphics-mobipocket b/srcpkgs/kdegraphics-mobipocket new file mode 120000 index 00000000000..3c1f23ee29e --- /dev/null +++ b/srcpkgs/kdegraphics-mobipocket @@ -0,0 +1 @@ +kdegraphics-thumbnailers \ No newline at end of file diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template index 7419cd1f4de..a4d12104796 100644 --- a/srcpkgs/kdegraphics-thumbnailers/template +++ b/srcpkgs/kdegraphics-thumbnailers/template @@ -1,14 +1,20 @@ # Template file for 'kdegraphics-thumbnailers' pkgname=kdegraphics-thumbnailers -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext" -makedepends="qt5-devel kio-devel libkexiv25-devel" +makedepends="qt5-devel kio-devel libkexiv25-devel libqmobipocket-devel" depends="ghostscript" short_desc="KDE Plasma 5 Thumbnailers for various graphics file formats" maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers" distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz" -checksum=0379a413575705c6ea412aca00c8488f3ae895f9c8d799258a449c600dcd0d6a +checksum=1706ae5b009cd79c95674ed8fdfb48f6206948cdd280b59074ce7f55b29c19f9 + +kdegraphics-mobipocket_package() { + short_desc+=" (transitional dummy package)" + depends="${sourcepkg}>=${version}_${revision}" + build_style=meta +} From 0e036cb03a4322f5efd512031fd981305d2b33bb Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:48 +0200 Subject: [PATCH 2135/2369] kdepim-addons: update to 22.04.1. --- srcpkgs/kdepim-addons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdepim-addons/template b/srcpkgs/kdepim-addons/template index 18142a0233e..3bac99179a3 100644 --- a/srcpkgs/kdepim-addons/template +++ b/srcpkgs/kdepim-addons/template @@ -1,6 +1,6 @@ # Template file for 'kdepim-addons' pkgname=kdepim-addons -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules python3 kdoctools kcoreaddons @@ -16,7 +16,7 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-late homepage="https://invent.kde.org/pim/kdepim-addons" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdepim-addons" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=d0909026abf6aabbbf6720cb91120e2df955db2f5c50117e019db1243e4067df +checksum=ae44004d989328a21476d3226a79c2a39667cd3bc820b779a83adb604df1af64 do_check() { # failing tests are disabled From 86d116408a769aa0c38a5c5f1afbfe0f5f15ac8e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:49 +0200 Subject: [PATCH 2136/2369] kdepim-runtime: update to 22.04.1. --- srcpkgs/kdepim-runtime/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template index 4ab89aad0da..5f5cc4ff862 100644 --- a/srcpkgs/kdepim-runtime/template +++ b/srcpkgs/kdepim-runtime/template @@ -1,21 +1,21 @@ # Template file for 'kdepim-runtime' pkgname=kdepim-runtime -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake # XXX KolabLibraries, Kolabxml hostmakedepends="extra-cmake-modules python3 kdoctools kdesignerplugin gettext qt5-qmake qt5-host-tools" makedepends="akonadi-calendar-devel akonadi-notes-devel knotifyconfig-devel - pimcommon-devel kdav-devel libkgapi-devel kalarmcal-devel kmbox-devel + pimcommon-devel kdav-devel libkgapi-devel kmbox-devel qt5-networkauth-devel qca-qt5-devel qt5-webengine-devel - qt5-webchannel-devel" + kholidays-devel qt5-webchannel-devel" short_desc="KDE PIM runtime applications/libraries" maintainer="John " license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause" homepage="https://invent.kde.org/unmaintained/kdepimlibs" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=f5b00a947cd74a39ee18d61dbfbc59b9b8b5137b52674bb42905d89d98b519aa +checksum=b5fb61f475ce441a9db5b8258b1cb510b26391d95d95a960305250f569fb903f post_install() { for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do From 427ee3cc0cabc8a4fdc6b03a9740953626290fa5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:51 +0200 Subject: [PATCH 2137/2369] kdevelop-php: update to 22.04.1. --- srcpkgs/kdevelop-php/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdevelop-php/template b/srcpkgs/kdevelop-php/template index e3a2875e174..88a48aaf7f7 100644 --- a/srcpkgs/kdevelop-php/template +++ b/srcpkgs/kdevelop-php/template @@ -1,6 +1,6 @@ # Template file for 'kdevelop-php' pkgname=kdevelop-php -version=21.12.3 +version=22.04.1 revision=1 wrksrc="kdev-php-${version}" build_style=cmake @@ -16,4 +16,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://www.kdevelop.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdev-php" distfiles="${KDE_SITE}/release-service/${version}/src/kdev-php-${version}.tar.xz" -checksum=4a85438a51bf6e3faedca3f64c2ffd08355d20fd4214c12fe010f003f5c3b17c +checksum=5e40d2412accda564b56710eea25c165c776b0146449b1d79b45751c97ffbbb3 From fdb0c6d9c136a07c1cc49455849c5370894017e6 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:53 +0200 Subject: [PATCH 2138/2369] kdevelop: update to 22.04.1. --- common/shlibs | 30 +++++++++++++++--------------- srcpkgs/kdevelop/template | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/common/shlibs b/common/shlibs index 829d4007b3d..0fbd5ba82cc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2680,21 +2680,21 @@ libvidstab.so.1.1 libvidstab-1.1.0_1 libxdo.so.3 xdotool-3.20150503.1_1 libabigail.so.0 libabigail-1.0.rc3_1 libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1 -libKDevCMakeCommon.so.35 kdevelop-21.12.2_1 -libKDevClangPrivate.so.35 kdevelop-21.12.2_1 -libKDevCompileAnalyzerCommon.so.35 kdevelop-21.12.2_1 -libKDevPlatformDebugger.so.57 kdevelop-21.12.2_1 -libKDevPlatformDocumentation.so.57 kdevelop-21.12.2_1 -libKDevPlatformInterfaces.so.57 kdevelop-21.12.2_1 -libKDevPlatformLanguage.so.57 kdevelop-21.12.2_1 -libKDevPlatformOutputView.so.57 kdevelop-21.12.2_1 -libKDevPlatformProject.so.57 kdevelop-21.12.2_1 -libKDevPlatformSerialization.so.57 kdevelop-21.12.2_1 -libKDevPlatformShell.so.57 kdevelop-21.12.2_1 -libKDevPlatformSublime.so.57 kdevelop-21.12.2_1 -libKDevPlatformTests.so.57 kdevelop-21.12.2_1 -libKDevPlatformUtil.so.57 kdevelop-21.12.2_1 -libKDevPlatformVcs.so.57 kdevelop-21.12.2_1 +libKDevCMakeCommon.so.36 kdevelop-22.04.1_1 +libKDevClangPrivate.so.36 kdevelop-22.04.1_1 +libKDevCompileAnalyzerCommon.so.36 kdevelop-22.04.1_1 +libKDevPlatformDebugger.so.58 kdevelop-22.04.1_1 +libKDevPlatformDocumentation.so.58 kdevelop-22.04.1_1 +libKDevPlatformInterfaces.so.58 kdevelop-22.04.1_1 +libKDevPlatformLanguage.so.58 kdevelop-22.04.1_1 +libKDevPlatformOutputView.so.58 kdevelop-22.04.1_1 +libKDevPlatformProject.so.58 kdevelop-22.04.1_1 +libKDevPlatformSerialization.so.58 kdevelop-22.04.1_1 +libKDevPlatformShell.so.58 kdevelop-22.04.1_1 +libKDevPlatformSublime.so.58 kdevelop-22.04.1_1 +libKDevPlatformTests.so.58 kdevelop-22.04.1_1 +libKDevPlatformUtil.so.58 kdevelop-22.04.1_1 +libKDevPlatformVcs.so.58 kdevelop-22.04.1_1 libts.so.0 tslib-1.6_1 libobs.so.0 obs-0.14.1_2 libobsglad.so.0 obs-0.14.1_2 diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template index 010185849d8..8dee78d9f0c 100644 --- a/srcpkgs/kdevelop/template +++ b/srcpkgs/kdevelop/template @@ -1,6 +1,6 @@ # Template file for 'kdevelop' pkgname=kdevelop -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -19,7 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.kdevelop.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdevelop" distfiles="${KDE_SITE}/release-service/${version}/src/kdevelop-${version}.tar.xz" -checksum=86f36502559675aaae2afc8f2d649ee29997cd75a32116acf63e9edce94717ea +checksum=22f3f50d2d484c821ca39f66f953d61a7f77e596ce9d38b552a721f48366cdd8 build_options="webengine" desc_option_webengine="Use Qt5 WebEngine for documentation" From 174e2520eeac9a284191340e3f37d0d3cdfe2717 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:55 +0200 Subject: [PATCH 2139/2369] kdialog: update to 22.04.1. --- srcpkgs/kdialog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template index 64efbaad5e8..5da6a6f830e 100644 --- a/srcpkgs/kdialog/template +++ b/srcpkgs/kdialog/template @@ -1,6 +1,6 @@ # Template file for 'kdialog' pkgname=kdialog -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3 @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://invent.kde.org/utilities/kdialog" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdialog" distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz" -checksum=ac47479b576b87e8a82d62f4b685941b6ab54a44a06391c4c0762db159930589 +checksum=95933b853cfc053c6881e27be945c96419a138994a57a28cf8dddab866de1763 From cf371e7a5b58e37576a1ee8ee7973ee729d51ab2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:56 +0200 Subject: [PATCH 2140/2369] keditbookmarks: update to 22.04.1. --- srcpkgs/keditbookmarks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template index 5291ab00f99..0ed901f95aa 100644 --- a/srcpkgs/keditbookmarks/template +++ b/srcpkgs/keditbookmarks/template @@ -1,6 +1,6 @@ # Template file for 'keditbookmarks' pkgname=keditbookmarks -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#keditbookmarks" distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz" -checksum=d6daabf60acec49cac1401da1019f965a96e8fd41b967694b2c8fd6723b87327 +checksum=c22b7649f0779cc51f64ac2dca95174b8e41da2b54f65cef02290ae021413d2e From 133bf4c4595ff66159e976a0e266a8da73a656c1 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:57 +0200 Subject: [PATCH 2141/2369] kfind: update to 22.04.1. --- srcpkgs/kfind/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template index 06de53b604a..d722b800a4a 100644 --- a/srcpkgs/kfind/template +++ b/srcpkgs/kfind/template @@ -1,6 +1,6 @@ # Template file for 'kfind' pkgname=kfind -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/utilities/kfind/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kfind" distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz" -checksum=5133cad0be64fb3fc3f9666b01b4cff8141016f31c244ed39a3e21fc298b6935 +checksum=ac92abee62045f7eb97aaf12b6f8e272e3b066681f6b0f07976a5f456d9639d7 From f63a77890d1e46d71b5e02c0ffe3a0e8680e8778 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:19:59 +0200 Subject: [PATCH 2142/2369] kget: update to 22.04.1. --- srcpkgs/kget/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kget/template b/srcpkgs/kget/template index 619e663138b..cdf9e98935f 100644 --- a/srcpkgs/kget/template +++ b/srcpkgs/kget/template @@ -1,6 +1,6 @@ # Template file for 'kget' pkgname=kget -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -14,4 +14,4 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://invent.kde.org/network/kget" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=9460f6890e66b252bc8cad5414e0aaf2d0d48070bddb1aec61ea90fff74b44f0 +checksum=2de3cd0cf8d1f4b2a54240b7c4e514acf5388b4573e7502c27dc7266c5d81bed From de07ce3b169b496bb9c8202f772ca3bdb8846ea2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:01 +0200 Subject: [PATCH 2143/2369] kgpg: update to 22.04.1. --- srcpkgs/kgpg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kgpg/template b/srcpkgs/kgpg/template index 8487622df3e..f837f1e425d 100644 --- a/srcpkgs/kgpg/template +++ b/srcpkgs/kgpg/template @@ -1,6 +1,6 @@ # Template file for 'kgpg' pkgname=kgpg -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext @@ -18,4 +18,4 @@ license="GPL-2.0-only" homepage="https://kde.org/applications/en/utilities/org.kde.kgpg" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kgpg" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=632bcf685fc9604ecc09933d0257533fd208177abba75bc14c853cdec91bf8d7 +checksum=c5bf5d77538bbb8a7ee6bd1b39cacc71fe67a7d7395799c47c75d57ae018ec35 From 19dc5f033fa1ccba7d7b5f6831f20c55d9a4d648 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:02 +0200 Subject: [PATCH 2144/2369] kidentitymanagement: update to 22.04.1. --- common/shlibs | 1 + srcpkgs/kidentitymanagement/template | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index 0fbd5ba82cc..ee2395bc2b0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3230,6 +3230,7 @@ libKF5AkonadiWidgets.so.5 akonadi5-17.12.0_1 libKF5AkonadiXml.so.5 akonadi5-17.12.0_1 libKF5PimTextEdit.so.5 kpimtextedit-17.12.0_1 libKF5IdentityManagement.so.5 kidentitymanagement-17.12.0_1 +libKF5IdentityManagementWidgets.so.5 kidentitymanagement-22.04.0_1 libKChart.so.2 kdiagram-2.6.0_1 libKGantt.so.2 kdiagram-2.6.0_1 libscrypt.so.0 libscrypt-1.21_1 diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template index 4629eb5dc28..981eae91032 100644 --- a/srcpkgs/kidentitymanagement/template +++ b/srcpkgs/kidentitymanagement/template @@ -1,6 +1,6 @@ # Template file for 'kidentitymanagement' pkgname=kidentitymanagement -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/pim/kidentitymanagement" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=64e698618d4384fa98512d208776eb94abc2aa514356f162950546882bddbca3 +checksum=746a01e43dae1841ec412257f64cc25dd19139403e9119ff746882883ac80738 kidentitymanagement-devel_package() { short_desc+=" - development" From 4e2cb09b49236019529b4a90e74d4517e3e1b9c0 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:04 +0200 Subject: [PATCH 2145/2369] kig: update to 22.04.1. --- srcpkgs/kig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template index 3f291745d31..6fa9a2b95ef 100644 --- a/srcpkgs/kig/template +++ b/srcpkgs/kig/template @@ -1,6 +1,6 @@ # Template file for 'kig' pkgname=kig -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext @@ -12,4 +12,4 @@ license="GPL-2.0-only" homepage="https://www.kde.org/applications/education/kig/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kig" distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz" -checksum=6dd9e280e3f0bca4c900f9fd8ef2e138eb8f1b021adf4ffe4e29804adddc7965 +checksum=850c826c9823e3abaff4504c03874755565e2d6732982b4bdffcccedd841e2e3 From 0aa86c08cee612f3d827df2f45aba8c597e4c149 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:05 +0200 Subject: [PATCH 2146/2369] kimap: update to 22.04.1. --- srcpkgs/kimap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template index 8557da8b5f2..81987d3bab3 100644 --- a/srcpkgs/kimap/template +++ b/srcpkgs/kimap/template @@ -1,6 +1,6 @@ # Template file for 'kimap' pkgname=kimap -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz" -checksum=fd96fa20b465ea442df960b57f5c27640e452b92d099a1f11bd051b7e74f4d86 +checksum=743f7e5b089233654467811008c7b8d4f9d697e26661c5aef2751733c02e2465 do_check() { : # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server From fb812e38f037e4cefb9984e87ee386950694c7e3 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:07 +0200 Subject: [PATCH 2147/2369] kio-gdrive: update to 22.04.1. --- srcpkgs/kio-gdrive/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template index d1e30118047..dba5da596c9 100644 --- a/srcpkgs/kio-gdrive/template +++ b/srcpkgs/kio-gdrive/template @@ -1,6 +1,6 @@ # Template file for 'kio-gdrive' pkgname=kio-gdrive -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools @@ -14,4 +14,4 @@ license="GPL-2.0-or-later" homepage="https://community.kde.org/KIO_GDrive" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kio-gdrive" distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz" -checksum=9f910baa87f707d1f28c9da5d3f1b104b992f7c7b3ca2ca532cb3646d92c84ec +checksum=06160b034bce0fb29205e8d201a337129010b53137b00ebe30dd596045350b8b From 0ea0465702b6af291ded350e27c75b9f09e26851 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:08 +0200 Subject: [PATCH 2148/2369] kitinerary: update to 22.04.1. --- .../temporarily-disable-broken-test.patch | 16 ---------------- srcpkgs/kitinerary/template | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch diff --git a/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch b/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch deleted file mode 100644 index 4e7bb1ce88b..00000000000 --- a/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch +++ /dev/null @@ -1,16 +0,0 @@ -Temporarily disable the calendarhandler test. -This test has been fixed upstream, so this should be able to be - removed in the next release. - -diff -Naur a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt ---- a/autotests/CMakeLists.txt 2022-04-18 11:34:57.356111303 -0700 -+++ b/autotests/CMakeLists.txt 2022-04-18 11:33:56.175938220 -0700 -@@ -35,7 +35,7 @@ - ecm_add_test(postprocessortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary) - ecm_add_test(extractorvalidatortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary) - if (TARGET KF5::CalendarCore) -- ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary) -+ #ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary) - ecm_add_test(extractortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary KPim::PkPass) - endif() - ecm_add_test(documentutiltest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary) diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template index aa5ad07fe21..343ef64911d 100644 --- a/srcpkgs/kitinerary/template +++ b/srcpkgs/kitinerary/template @@ -1,6 +1,6 @@ # Template file for 'kitinerary' pkgname=kitinerary -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel" @@ -12,7 +12,7 @@ license="LGPL-2.1-or-later" homepage="https://kontact.kde.org" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kitinerary" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=b15f8aac50ac7eaf2fc23e40c7a165283e99844f88d96cb2a45face8a3cc8c4d +checksum=306a74c9be1b37dbba7e6876d81426b01af52f80ef139087949042bcc6956b7a kitinerary-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From d2a7924e745c6560241010ed5e75d6f0710e5c2c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:09 +0200 Subject: [PATCH 2149/2369] kldap: update to 22.04.1. --- srcpkgs/kldap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template index e5eeb67963d..b71d9ef2e34 100644 --- a/srcpkgs/kldap/template +++ b/srcpkgs/kldap/template @@ -1,6 +1,6 @@ # Template file for 'kldap' pkgname=kldap -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz" -checksum=0abce0ebca12a6ee71e6b93a727579d20900fdbc750f059283dbd1d4a1d3948e +checksum=0bd291d6b2695e97813c00203c94a0d76f19d0898ab7ab70f0a7c59a10d806dc kldap-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From d45e1b696056d9cb9219df643f42c66c19de5384 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:11 +0200 Subject: [PATCH 2150/2369] kleopatra: update to 22.04.1. --- srcpkgs/kleopatra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template index 4edaad7b4fc..8d6f461297b 100644 --- a/srcpkgs/kleopatra/template +++ b/srcpkgs/kleopatra/template @@ -1,6 +1,6 @@ # Template file for 'kleopatra' pkgname=kleopatra -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig" @@ -12,7 +12,7 @@ maintainer="Justin Jagieniak " license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later" homepage="https://www.kde.org/applications/utilities/kleopatra/" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=9a4ad9c602d557c0547d47229def661749bfe213a34992ec8d18e88c410dc681 +checksum=d30e6335b78c6fce6ad22e5482032d0f8a02740b46fe9fdc3263d39ceaeaae23 do_check() { dbus-run-session ninja -C build test From 93a3a3dc3d81bbc02a2cb13c0fb1094cbdfffadb Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:12 +0200 Subject: [PATCH 2151/2369] kmag: update to 22.04.1. --- srcpkgs/kmag/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template index a68adf87381..08027cfdcac 100644 --- a/srcpkgs/kmag/template +++ b/srcpkgs/kmag/template @@ -1,6 +1,6 @@ # Template file for 'kmag' pkgname=kmag -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/utilities/kmag/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmag" distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz" -checksum=e65aaaa3e480c215384bae721afb36d7e50a7f8ab27aa4013eb46de1f43d97af +checksum=ff2341c12d3f4eeced74339912079120266a3830451e8486a810ffedf2e3316a From 94ced4a53dc87cb6c8c4ab7e3cf75d55d9fe72cf Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:14 +0200 Subject: [PATCH 2152/2369] kmail-account-wizard: update to 22.04.1. --- srcpkgs/kmail-account-wizard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template index 39c89a1b260..d3dbeca761e 100644 --- a/srcpkgs/kmail-account-wizard/template +++ b/srcpkgs/kmail-account-wizard/template @@ -1,6 +1,6 @@ # Template file for 'kmail-account-wizard' pkgname=kmail-account-wizard -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3 @@ -12,4 +12,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz" -checksum=ef9227b88d842cb52bd6f96a1a5dd30fbfbc6377074cb56e745ac7b84dcd222b +checksum=d3253e6395e27ef42904b50b8cd7abcc6797351efcf54d45b3ce12b41bba2f85 From 20b888f9dd7be503cd5f567d59024a251fb9ea85 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:16 +0200 Subject: [PATCH 2153/2369] kmail: update to 22.04.1. --- srcpkgs/kmail/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template index e75cd76144a..054659f11f8 100644 --- a/srcpkgs/kmail/template +++ b/srcpkgs/kmail/template @@ -1,6 +1,6 @@ # Template file for 'kmail' pkgname=kmail -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake @@ -15,4 +15,4 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later" homepage="https://kde.org/applications/en/internet/org.kde.kmail2" distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz" -checksum=e023a8ced8bc6ea5fe40bc30a0a803812c04ce0245f0e8a5612d42711c33d0ce +checksum=a44043a7c293981494ad5552db29f5aff1d8859013352c96791ccae3d15e93e8 From 23100323887e685e322a526aa684aaebb222c0b2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:17 +0200 Subject: [PATCH 2154/2369] kmailtransport: update to 22.04.1. --- srcpkgs/kmailtransport/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template index 51dbdef1525..679f7343fd8 100644 --- a/srcpkgs/kmailtransport/template +++ b/srcpkgs/kmailtransport/template @@ -1,6 +1,6 @@ # Template file for 'kmailtransport' pkgname=kmailtransport -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -12,7 +12,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz" -checksum=26ba38d87c0072f448d63966cab31914903c7dfa73817846d2d1a8808e7e7750 +checksum=8f1dc26f0dad28e81bce0f8ade3d83c811841bdb56a9b982032b1a233725add2 kmailtransport-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From db78a62d614136bdb7c77a0bb8b98dfed1a2fd1b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:19 +0200 Subject: [PATCH 2155/2369] kmbox: update to 22.04.1. --- srcpkgs/kmbox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template index bc35b8709de..a6dade4ca18 100644 --- a/srcpkgs/kmbox/template +++ b/srcpkgs/kmbox/template @@ -1,6 +1,6 @@ # Template file for 'kmbox' pkgname=kmbox -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz" -checksum=19731646fccea7f1615e7b0a6d2a1682e6afdf444ff74a6d40f6a821e1149411 +checksum=91b89f23b98a1a86fbf25bac17318364241a05c5601d20bce7b4fdced6af2691 kmbox-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 38b71a225c1268712adca874de806604325c475e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:20 +0200 Subject: [PATCH 2156/2369] kmime: update to 22.04.1. --- srcpkgs/kmime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template index dd6b7a36145..c783cf4a865 100644 --- a/srcpkgs/kmime/template +++ b/srcpkgs/kmime/template @@ -1,6 +1,6 @@ # Template file for 'kmime' pkgname=kmime -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules python3 gettext" @@ -10,7 +10,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz" -checksum=fc5a1b86a18c0b0ef67759e3813cb49b3286b101f8494ce0497737ee29a1470f +checksum=a7f94a60d204f7546a711551feafb05549caf25d5831ecb9942cad32caddca05 if [ "CROSS_BUILD" ];then hostmakedepends+=" qt5-qmake qt5-host-tools" From 7a0be64e0dfcd3709d481ff8302c5b1121379ad8 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:22 +0200 Subject: [PATCH 2157/2369] kmines: update to 22.04.1. --- srcpkgs/kmines/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmines/template b/srcpkgs/kmines/template index fc5f71db232..bfdd1048c31 100644 --- a/srcpkgs/kmines/template +++ b/srcpkgs/kmines/template @@ -1,6 +1,6 @@ # Template file for 'kmines' pkgname=kmines -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig @@ -14,4 +14,4 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/games/org.kde.kmines" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmines" distfiles="${KDE_SITE}/release-service/${version}/src/kmines-${version}.tar.xz" -checksum=8cbef528fdffd990cbaa3836ac8c23aa591e88c33942e9badd7c8cf33d03bef3 +checksum=4450fadd3155108e25b308c86b1a5ef82d1080340369ba90528f025abb4f9de5 From 64c8f2f555e37db5fa2689fc214cd1a5acf883c2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:23 +0200 Subject: [PATCH 2158/2369] kmix: update to 22.04.1. --- srcpkgs/kmix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template index e4bf7c548be..34b494824b3 100644 --- a/srcpkgs/kmix/template +++ b/srcpkgs/kmix/template @@ -1,6 +1,6 @@ # Template file for 'kmix' pkgname=kmix -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/applications/multimedia/kmix/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmix" distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz" -checksum=3f41a53cb7033fde10ae92b693a6b84c0da045e570e83136dbc659afa89e5e7a +checksum=5cb779f8c899025d32893913ef5c7b54cb9091b20a7712a161a9ae309b1a8eba From 2086b0cbc2b06db0a3669b05950c9123b8ed3173 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:25 +0200 Subject: [PATCH 2159/2369] knights: update to 22.04.1. --- srcpkgs/knights/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template index 40ccaef520d..80992e62ff7 100644 --- a/srcpkgs/knights/template +++ b/srcpkgs/knights/template @@ -1,6 +1,6 @@ # Template file for 'knights' pkgname=knights -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -11,4 +11,4 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://kde.org/applications/en/games/org.kde.knights" distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz" -checksum=a4138f8ae91e587a749f930064fecb62d9eb210671977ac8e083b76cc28b4bd4 +checksum=5296758dbaf431283002ba1f5e6262c1835a78710ff339f1391637f88f470e05 From 553b68ba173d1982655df9192aa196418bcf79d7 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:26 +0200 Subject: [PATCH 2160/2369] knotes: update to 22.04.1. --- srcpkgs/knotes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template index a19c79190bd..0acc654ef0c 100644 --- a/srcpkgs/knotes/template +++ b/srcpkgs/knotes/template @@ -1,6 +1,6 @@ # Template file for 'knotes' pkgname=knotes -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt @@ -12,4 +12,4 @@ maintainer="Orphaned " license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://apps.kde.org/knotes/" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=a721328deea314066352a92bf99c22163cd7eb1f10f4d36b893d78cdb102f21e +checksum=41b46d073bfa312bd69675d99d7b5b290ddf9d59c1ac21c0ff758c9674742ac0 From 89085f703db123b2fa811fb8eb632f9d6db1a760 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:28 +0200 Subject: [PATCH 2161/2369] kolourpaint: update to 22.04.1. --- srcpkgs/kolourpaint/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template index 5a81652e6b0..f717108dd44 100644 --- a/srcpkgs/kolourpaint/template +++ b/srcpkgs/kolourpaint/template @@ -1,6 +1,6 @@ # Template file for 'kolourpaint' pkgname=kolourpaint -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only" homepage="http://www.kolourpaint.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint" distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz" -checksum=aeb2e439f32d9b1d7556e807c0902c870b90691f84764266e3f7fd92af5d9163 +checksum=4d5096c7e40a592583f597ff388b3bc7c64e5b75f1b12e73b18e4bd7b777afeb post_install() { vlicense COPYING From 8d2aefd3c6da824081c9b96aeab861ea09cef3fc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:30 +0200 Subject: [PATCH 2162/2369] kompare: update to 22.04.1. --- srcpkgs/kompare/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template index 457830d2011..812edd32644 100644 --- a/srcpkgs/kompare/template +++ b/srcpkgs/kompare/template @@ -1,6 +1,6 @@ # Template file for 'kompare' pkgname=kompare -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only" homepage="https://www.kde.org/applications/development/kompare/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kompare" distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz" -checksum=e2e0ee484b2eb098d9315ea26a0b68abce64ae02572baab998a5711f609c018d +checksum=15fc7e13926dd0a994f50edc5b4ff17d7564f2f0781598a2106f6edb8bac534e From 2c53bb3429fc6502bf5f3cf8d2431ce4755625f3 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:32 +0200 Subject: [PATCH 2163/2369] konqueror: update to 22.04.1. --- srcpkgs/konqueror/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/konqueror/template b/srcpkgs/konqueror/template index 95df0730579..a8c83ec4e0c 100644 --- a/srcpkgs/konqueror/template +++ b/srcpkgs/konqueror/template @@ -1,6 +1,6 @@ # Template file for 'konqueror' pkgname=konqueror -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://kde.org/applications/internet/org.kde.konqueror" distfiles="${KDE_SITE}/release-service/${version}/src/konqueror-${version}.tar.xz" -checksum=fd8e66566ac926dbbdf701fcaa3ff154b857d72f033df75ee9d75260c3c17f7c +checksum=2744e2eaab3ebbd8949699cccfd6f849376b10b8a0f9cef00249207701e947ef do_check() { : From b6c7913035e5a71aade0cb4919ff514b97b1ee60 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:34 +0200 Subject: [PATCH 2164/2369] konquest: update to 22.04.1. --- srcpkgs/konquest/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/konquest/template b/srcpkgs/konquest/template index 7005b60793a..b241cd02d7c 100644 --- a/srcpkgs/konquest/template +++ b/srcpkgs/konquest/template @@ -1,6 +1,6 @@ # Template file for 'konquest' pkgname=konquest -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kdoctools @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/games/org.kde.konquest" changelog="https://kde.org/announcements/changelogs/gear/${version}/#konquest" distfiles="${KDE_SITE}/release-service/${version}/src/konquest-${version}.tar.xz" -checksum=00793a5a0e9a88f7de2003ee620a65d7689221dbf731c21b113d83a313862a53 +checksum=b901d71ce47fe86c26e92e7d965002371cabc93a802d84cf23fa77e94de45265 From efd9060ced58a3e27a9940d75f1fc7fe521ccf1f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:35 +0200 Subject: [PATCH 2165/2369] kontact: update to 22.04.1. --- srcpkgs/kontact/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kontact/template b/srcpkgs/kontact/template index cdf7623d328..0736368c0ff 100644 --- a/srcpkgs/kontact/template +++ b/srcpkgs/kontact/template @@ -1,6 +1,6 @@ # Template file for 'kontact' pkgname=kontact -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools @@ -13,4 +13,4 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/office/org.kde.kontact" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=20b923182a5ea30540bb8ce6db0883d07434d0f3490f8ac80354654ac93ae19a +checksum=962321abcf6d1f1aeed2368b98159e8afab0f71eef4c81ae7ce48c6267b479a6 From 8879264dc02222769c72c8976d14870b7be2b6b7 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:36 +0200 Subject: [PATCH 2166/2369] kontactinterface: update to 22.04.1. --- srcpkgs/kontactinterface/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template index 57fb764a3bd..fd38bf901ed 100644 --- a/srcpkgs/kontactinterface/template +++ b/srcpkgs/kontactinterface/template @@ -1,6 +1,6 @@ # Template file for 'kontactinterface' pkgname=kontactinterface -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://kontact.kde.org/" distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz" -checksum=e8b0408b7e634e9802ae81caaba3e154a5474a5bfc0c1981386dccb508069de3 +checksum=a30ab91e4b38c691ef5e7f4b81dddb318ec6006faf5cb4a44823bd0ed618ca6b kontactinterface-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From bb054b2b5c9148d869119cd24003227c1e036b91 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:38 +0200 Subject: [PATCH 2167/2369] konversation: update to 22.04.1. --- srcpkgs/konversation/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template index 5358aed5c72..a6934f6f197 100644 --- a/srcpkgs/konversation/template +++ b/srcpkgs/konversation/template @@ -1,6 +1,6 @@ # Template file for 'konversation' pkgname=konversation -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons @@ -13,5 +13,5 @@ license="GPL-2.0-or-later" homepage="https://konversation.kde.org" changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz" -checksum=f89c3854edd6dabcceff7a3615b532ac34d5b4769be1e125789e41d67e7f9b8a +checksum=d1b3f3ce151f0cc6a6ed566658ea24120e6b8539e35a15b20620b0b6c50efebf python_version=3 From 91d0cba714d2f083b2071930ffb1a684a2a1806f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:40 +0200 Subject: [PATCH 2168/2369] korganizer: update to 22.04.1. --- srcpkgs/korganizer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/korganizer/template b/srcpkgs/korganizer/template index 1787addb124..40b1223a296 100644 --- a/srcpkgs/korganizer/template +++ b/srcpkgs/korganizer/template @@ -1,6 +1,6 @@ # Template file for 'korganizer' pkgname=korganizer -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools @@ -12,4 +12,4 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/office/org.kde.korganizer" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=19c02adddade1a398fe77e30d56f03a4cb0433598e4212793d603734f4f7571c +checksum=594ce6973ff95d278f546db012deac6dc454cecc05b92e499eaac88716d45534 From 196811275b9d822f5722f7b0132dd961ab591b34 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:42 +0200 Subject: [PATCH 2169/2369] kpat: update to 22.04.1. --- srcpkgs/kpat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template index e3d3d8d5ad3..63cb7a7b143 100644 --- a/srcpkgs/kpat/template +++ b/srcpkgs/kpat/template @@ -1,6 +1,6 @@ # Template file for 'kpat' pkgname=kpat -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake configure_args="-DWITH_BH_SOLVER=OFF" @@ -14,4 +14,4 @@ license="GPL-2.0-only" homepage="https://kde.org/applications/games/kpat" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpat" distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz" -checksum=275e2e4508980dbc53bd598c7abd05a21dd5c50b255e750436639cc75f67a44d +checksum=ea9938aa038467e1f5c3356e9e6dd09cf394e6887a69a573ffd4d5d76d11a1f1 From fae6e80ec7c8ee4f71ad756fea3d22fa5b47b533 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:43 +0200 Subject: [PATCH 2170/2369] kpimtextedit: update to 22.04.1. --- srcpkgs/kpimtextedit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template index e838f5d3ac5..f1f6c3dac9a 100644 --- a/srcpkgs/kpimtextedit/template +++ b/srcpkgs/kpimtextedit/template @@ -1,6 +1,6 @@ # Template file for 'kpimtextedit' pkgname=kpimtextedit -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools @@ -13,7 +13,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/pim/kpimtextedit" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=54f3e7bea55e051240a7b328553eb43131e6c0ce33bf67eb0e28decae4c219a6 +checksum=f6cedefcc351069e01d0f3f15d4eaefe0ecb2865aaab3e17811af54a39f9bfc7 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-tools-devel" From 3a0abefb13b4345723afae704cae3a7e23a1aa3e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:44 +0200 Subject: [PATCH 2171/2369] kpkpass: update to 22.04.1. --- srcpkgs/kpkpass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpkpass/template b/srcpkgs/kpkpass/template index c615112cdce..8869dac35bf 100644 --- a/srcpkgs/kpkpass/template +++ b/srcpkgs/kpkpass/template @@ -1,6 +1,6 @@ # Template file for 'kpkpass' pkgname=kpkpass -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools shared-mime-info" @@ -11,7 +11,7 @@ license="LGPL-2.1-or-later" homepage="https://kontact.kde.org" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpkpass" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=678e79e450c5859d53c436ab991f4eadffd742dad129e4254953b98e2944c815 +checksum=5e5cadca3951f7e3439713f295d549e0ab2f5e4a013c604fb9a703ea9e99411d kpkpass-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From f5a8050b14d4b70d6c0f1406eb164f505c768019 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:46 +0200 Subject: [PATCH 2172/2369] kpmcore: update to 22.04.1. --- srcpkgs/kpmcore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpmcore/template b/srcpkgs/kpmcore/template index cf275bae79c..b78ba261139 100644 --- a/srcpkgs/kpmcore/template +++ b/srcpkgs/kpmcore/template @@ -1,6 +1,6 @@ # Template file for 'kpmcore' pkgname=kpmcore -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ license="GPL-3.0-or-later" homepage="https://kde.org/applications/system/org.kde.partitionmanager" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpmcore" distfiles="${KDE_SITE}/release-service/$version/src/$pkgname-$version.tar.xz" -checksum=6ad7a6d04a1c28bca9e934a3d7664fcb91069f841a8292208764ff4eca5300a6 +checksum=70d043cc125bd040d6b2af091e3a038d1780702fa327cda070300e94027c64f8 if [ -n "$CROSS_BUILD" ]; then configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" From 2bc3301926a16c01cacf0e5eec884db51fcf76a1 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:47 +0200 Subject: [PATCH 2173/2369] kqtquickcharts: update to 22.04.1. --- srcpkgs/kqtquickcharts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template index 54a784cecaa..7c78e719d72 100644 --- a/srcpkgs/kqtquickcharts/template +++ b/srcpkgs/kqtquickcharts/template @@ -1,6 +1,6 @@ # Template file for 'kqtquickcharts' pkgname=kqtquickcharts -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://edu.kde.org/" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=b9f6ee7a7028c29b43729028e4d78ed043f0acb3c40b4405108010eb3e62893e +checksum=e85918af3a24aaedcabe9ba47c31cc50fd3227dc95ffd1d1a6dc2d1394e62c2c kqtquickcharts-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 85a5893479e8d06139b3ef4ae9941be0e0a01e4f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:49 +0200 Subject: [PATCH 2174/2369] krdc: update to 22.04.1. --- srcpkgs/krdc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/krdc/template b/srcpkgs/krdc/template index 95ad42e261a..eaa9d65e8aa 100644 --- a/srcpkgs/krdc/template +++ b/srcpkgs/krdc/template @@ -1,6 +1,6 @@ # Template file for 'krdc' pkgname=krdc -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" @@ -16,7 +16,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later" homepage="https://kde.org/applications/en/internet/org.kde.krdc" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=12088c5881c66897e698477d813cb5fa31f221b55cab74c53e94b6ba294bd726 +checksum=ff233533b9f4381262633f5d390cfbe00bd9b36f4a784210068ba5998b2a8f31 krdc-devel_package() { short_desc+=" - development files" From c7df42fe4f67dc86cc9b96852a6817d2e77edc7b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:50 +0200 Subject: [PATCH 2175/2369] krfb: update to 22.04.1. --- srcpkgs/krfb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template index 795ecb6b26e..4128d7ed1c9 100644 --- a/srcpkgs/krfb/template +++ b/srcpkgs/krfb/template @@ -1,6 +1,6 @@ # Template file for 'krfb' pkgname=krfb -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner" @@ -16,4 +16,4 @@ maintainer="Orphaned " license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later" homepage="https://kde.org/applications/en/system/org.kde.krfb" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=16ec7684243d9488380abd621edf5dd6916a45a097fe780705b1a32fe0de14e5 +checksum=777b12e7abff962aad997377ffb377f46382d5f7265242a8e9643dcb2c1f0401 From 42730d6b6503205820a82d1aa43a323bb2f644f5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:51 +0200 Subject: [PATCH 2176/2369] kruler: update to 22.04.1. --- srcpkgs/kruler/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template index 8c70ce20727..5446477eae2 100644 --- a/srcpkgs/kruler/template +++ b/srcpkgs/kruler/template @@ -1,6 +1,6 @@ # Template file for 'kruler' pkgname=kruler -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/graphics/kruler/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kruler" distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz" -checksum=f4f189b606813fb2f42e40f7664adafafdcd210e474909b9e93ff30eba18cd45 +checksum=f7848cac9c7a3c6c3d03edc90dc78ff7df97a1beff374e469419f9ca4112e16e From 70f67f18747246fe51f3694d62d09fecdaf3079a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:53 +0200 Subject: [PATCH 2177/2369] ksmtp: update to 22.04.1. --- srcpkgs/ksmtp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template index 068a3a0db67..dc0ce4c75fd 100644 --- a/srcpkgs/ksmtp/template +++ b/srcpkgs/ksmtp/template @@ -1,6 +1,6 @@ # Template file for 'ksmtp' pkgname=ksmtp -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz" -checksum=22da5a72c957d8a38d7b5792013edaa826da8d41eeba30db66ece9f0f42bbe4d +checksum=f445692c54310c737d6afffeb8a2ce9d6c17164ca6145fc7f983f8adfe79f458 ksmtp-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 1a32160e15f287bf48a106d906f808db678a0fbf Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:54 +0200 Subject: [PATCH 2178/2369] ksystemlog: update to 22.04.1. --- srcpkgs/ksystemlog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template index 53c40ccabd7..e342cd165a9 100644 --- a/srcpkgs/ksystemlog/template +++ b/srcpkgs/ksystemlog/template @@ -1,6 +1,6 @@ # Template file for 'ksystemlog' pkgname=ksystemlog -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/system/ksystemlog/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksystemlog" distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz" -checksum=25525e28756928ddb014ccec6f352c7378473ad417971608989818484b2847a4 +checksum=d761a1e42d02479311bbe6a57724a2db5c9011615a8ce83813fe63fa9822eb36 From 26ad8b922e130064d11a824fcef48decb369bdd6 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:56 +0200 Subject: [PATCH 2179/2369] kteatime: update to 22.04.1. --- srcpkgs/kteatime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template index dc8dbc93579..e4df7b1d71f 100644 --- a/srcpkgs/kteatime/template +++ b/srcpkgs/kteatime/template @@ -1,6 +1,6 @@ # Template file for 'kteatime' pkgname=kteatime -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/games/kteatime/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime" distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz" -checksum=f3098313f7df6de082490c11ae6f840d3f73d2c3be22fb56d4bb0c15baf81df6 +checksum=d5bf75bdc3cafe4b7dc9b4ddff9baacf0f7f903d2a97fa45abf7739b9588655b From 266bc36c8f9c9d629151d050dfafd65333adfcad Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:57 +0200 Subject: [PATCH 2180/2369] ktnef: update to 22.04.1. --- srcpkgs/ktnef/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template index fb8003e8f7f..ab3214a40e6 100644 --- a/srcpkgs/ktnef/template +++ b/srcpkgs/ktnef/template @@ -1,6 +1,6 @@ # Template file for 'ktnef' pkgname=ktnef -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz" -checksum=d496cc88668646b9b4c13a07de26e1e82bd5dec973737001717d52856c48c9c6 +checksum=8938f4940ef6c65c67da761d1fe6e17bbcf36b37c4704bf6fff0f105258af6e6 ktnef-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From b03e08e6b53cd405214c441df66566029e1b515d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:20:59 +0200 Subject: [PATCH 2181/2369] ktorrent: update to 22.04.1. --- srcpkgs/ktorrent/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ktorrent/template b/srcpkgs/ktorrent/template index bf45561f789..48c693f7284 100644 --- a/srcpkgs/ktorrent/template +++ b/srcpkgs/ktorrent/template @@ -1,6 +1,6 @@ # Template file for 'ktorrent' pkgname=ktorrent -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DWITH_SYSTEM_GEOIP=ON" @@ -16,7 +16,7 @@ license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/internet/ktorrent" changelog="https://kde.org/announcements/changelogs/gear/${version}/#ktorrent" distfiles="${KDE_SITE}/release-service/${version}/src/ktorrent-${version}.tar.xz" -checksum=ed97d2d4b58c8305cac04067988514442711447215d7e255816d92b918363d08 +checksum=f359d69fd8fd9125b2738d72c55a2ee286556b5c1fd25a0c8fdda1ffda08d8b2 if [ "$CROSS_BUILD" ]; then configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" From 358c5650810f4d49b9a709799f1170c7ad5e3053 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:01 +0200 Subject: [PATCH 2182/2369] ktouch: update to 22.04.1. --- srcpkgs/ktouch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ktouch/template b/srcpkgs/ktouch/template index 09d394c0760..cd47e20ca07 100644 --- a/srcpkgs/ktouch/template +++ b/srcpkgs/ktouch/template @@ -1,6 +1,6 @@ # Template file for 'ktouch' pkgname=ktouch -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools @@ -16,4 +16,4 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/education/org.kde.ktouch" changelog="https://kde.org/announcements/changelogs/gear/${version}/#ktouch" distfiles="${KDE_SITE}/release-service/${version}/src/ktouch-${version}.tar.xz" -checksum=cd0ab11fff7cb03c40569f9cdcdef9db723044b87372bb2126baeb82f20b2072 +checksum=52cf92c131b75662c27d936a5811f1af13e428766deb4823df766cc07a3ae367 From a0dbbf0c689de2f7766af189aa243fd66a29882f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:12 +0200 Subject: [PATCH 2183/2369] ktuberling: update to 22.04.1. --- srcpkgs/ktuberling/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template index 6fe6ec899db..10b831fcde3 100644 --- a/srcpkgs/ktuberling/template +++ b/srcpkgs/ktuberling/template @@ -1,6 +1,6 @@ # Template file for 'ktuberling' pkgname=ktuberling -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools @@ -12,4 +12,4 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://kde.org/applications/games/org.kde.ktuberling" distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz" -checksum=4fbffaeff31ab4c28919a825504f15dc90f89aa249e579bd7fcf265990b09aab +checksum=4522ad76f14d82baff654556d9ef9be0b90d460e586a983e51cb13d7715139ac From c6c58e3e7134f007d42e7a9da21acc9a46caec0d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:14 +0200 Subject: [PATCH 2184/2369] kturtle: update to 22.04.1. --- srcpkgs/kturtle/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template index f3be8755660..2914d16c671 100644 --- a/srcpkgs/kturtle/template +++ b/srcpkgs/kturtle/template @@ -1,6 +1,6 @@ # Template file for 'kturtle' pkgname=kturtle -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools @@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only" homepage="https://www.kde.org/applications/education/kturtle/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kturtle" distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz" -checksum=fd42b1380e7e46d6c1e5bc4cbe538edcf9ed9bfc5abf54141393adc28fe38427 +checksum=15c6c08d2539e22d62524d0acad713397ddfce7fb7275a8b99eb76ea87c043bf From 55bbab4ed24ba4f66902e907ea3de253f757ef1c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:15 +0200 Subject: [PATCH 2185/2369] kwalletmanager: update to 22.04.1. --- srcpkgs/kwalletmanager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template index 902061e38dc..47d52d3a5f8 100644 --- a/srcpkgs/kwalletmanager/template +++ b/srcpkgs/kwalletmanager/template @@ -1,6 +1,6 @@ # Template file for 'kwalletmanager' pkgname=kwalletmanager -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config @@ -12,4 +12,4 @@ license="GPL-2.0-only" homepage="https://kde.org/applications/system/org.kde.kwalletmanager5" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager" distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz" -checksum=d33824ae0abc7972fed9d7dad6acea9f67e7274ee5b15c0bb1df72b1a24aec17 +checksum=289e181b2dadb9e2b1068e5ab9e844d5a99d05c6d83f47e492524befd2f70e5a From 8ffad03031ce3fbae9b1f7438ff6412a6c68e36e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:16 +0200 Subject: [PATCH 2186/2369] libgravatar: update to 22.04.1. --- srcpkgs/libgravatar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template index 3319038eeb7..15d0b46671b 100644 --- a/srcpkgs/libgravatar/template +++ b/srcpkgs/libgravatar/template @@ -1,6 +1,6 @@ # Template file for 'libgravatar' pkgname=libgravatar -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz" -checksum=076ed85282b04eee4960072bf5ffaca514bb24f61510af9a3a8c3fe5daf030ae +checksum=d6bbb3c449585a881fa49ca82d5ad9d189aabb7b698ca9d59e07ce3e2a14c53b libgravatar-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 925d503a4070b1fcad65f6262c220aaea4bb63d8 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:18 +0200 Subject: [PATCH 2187/2369] libkcddb: update to 22.04.1. --- srcpkgs/libkcddb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template index fbcc0153671..23746ea0d69 100644 --- a/srcpkgs/libkcddb/template +++ b/srcpkgs/libkcddb/template @@ -1,6 +1,6 @@ # Template file for 'libkcddb' pkgname=libkcddb -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools @@ -12,7 +12,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only" homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb" changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkcddb" distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz" -checksum=ddc91cc5112c5a749fccf18bb9a6b169279f6d5658fed3b4d60646d9ccbb0775 +checksum=10538a73e7e463fb8a7e98f4b43be6c995932402ce4f79345cc5b7779cc30b00 libkcddb-devel_package() { depends="libkcddb>=${version}_${revision}" From fe62bf364cab1d5b0f4f928a75ba34f4e6585c60 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:20 +0200 Subject: [PATCH 2188/2369] libkdegames: update to 22.04.1. --- srcpkgs/libkdegames/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template index 7aafa5cf73f..50767058c21 100644 --- a/srcpkgs/libkdegames/template +++ b/srcpkgs/libkdegames/template @@ -1,6 +1,6 @@ # Template file for 'libkdegames' pkgname=libkdegames -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools @@ -12,7 +12,7 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/games" changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkdegames" distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz" -checksum=4dd8d80dbfd2806d420bb6efc2df64a175e8273d9ea34b9c61a0a7daae342e76 +checksum=0ce94753c590ac4019b3f11ca0b4de83d8bb0dc619de15fc73be7f3a820fd9e0 libkdegames-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From 446186ef218ba91b3930b2e6de84f8d6b1f9835e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:22 +0200 Subject: [PATCH 2189/2369] libkdepim: update to 22.04.1. --- srcpkgs/libkdepim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template index 72b396350b3..a86488439df 100644 --- a/srcpkgs/libkdepim/template +++ b/srcpkgs/libkdepim/template @@ -1,6 +1,6 @@ # Template file for 'libkdepim' pkgname=libkdepim -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz" -checksum=9c579e68c7686862988b9baf43a34e5952b2d00033b01e80c53e3959bee9323d +checksum=963bbeb53f34576354fe5e040e79de80ea536dec342ee59058716b2708f74174 if [ "$CROSS_BUILD" ]; then configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" From bbb4b4f70122b91cee0f893fe7196e1f03a9416b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:23 +0200 Subject: [PATCH 2190/2369] libkexiv25: update to 22.04.1. --- srcpkgs/libkexiv25/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template index ef84c329eb3..2eac31dc6f9 100644 --- a/srcpkgs/libkexiv25/template +++ b/srcpkgs/libkexiv25/template @@ -1,6 +1,6 @@ # Template file for 'libkexiv25' pkgname=libkexiv25 -version=21.12.3 +version=22.04.1 revision=1 wrksrc="libkexiv2-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Denis Revin " license="GPL-2.0-or-later" homepage="https://invent.kde.org/graphics/libkexiv2" distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz" -checksum=491496b277fb3bebf17b1f2488fc8e905e08f888415edc4dcd26039e53335564 +checksum=376f38b3391f7a14e9ee1f41e97270b9003227c76ac5c4a9a3eb50d6075ed5da libkexiv25-devel_package() { short_desc+=" - development files" From b6373f212dab1fad4a17fcdbf4e28920a2e7c415 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:24 +0200 Subject: [PATCH 2191/2369] libkgapi: update to 22.04.1. --- srcpkgs/libkgapi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template index 0ed84474492..3d6c363a21e 100644 --- a/srcpkgs/libkgapi/template +++ b/srcpkgs/libkgapi/template @@ -1,6 +1,6 @@ # Template file for 'libkgapi' pkgname=libkgapi -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3 @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-2.1-or-later" homepage="https://invent.kde.org/pim/libkgapi" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=5d06d1c4712991cfb7c51ff0f36d22a1d9078e38a9ea4552cd31cc6ad04173ed +checksum=94e05f3a289b2a3db3d7119ea95063dcba0636a4ce148ea9913eeaf5051b0a9f do_check() { : From 4944d84e595917549d954bbd084c750b56be090d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:26 +0200 Subject: [PATCH 2192/2369] libkipi5: update to 22.04.1. --- srcpkgs/libkipi5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template index 9355ee5134c..32fb835efab 100644 --- a/srcpkgs/libkipi5/template +++ b/srcpkgs/libkipi5/template @@ -1,6 +1,6 @@ # Template file for 'libkipi5' pkgname=libkipi5 -version=21.12.3 +version=22.04.1 revision=1 wrksrc="libkipi-${version}" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/graphics/libkipi" distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz" -checksum=ec21153b3237c4f8a0bb9ce58498ae92d7e7d0362167772bace872d94ce45370 +checksum=ef15b74fed59d10dd584e452925027d927eeb7b738569089cb8da21b1e9c9afd conflicts="libkipi" libkipi5-devel_package() { From 7798303721ed10ca4605fabdd88034a0c054bad0 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:27 +0200 Subject: [PATCH 2193/2369] libkleo: update to 22.04.1. --- srcpkgs/libkleo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template index 0fcab492f09..a2d797c5107 100644 --- a/srcpkgs/libkleo/template +++ b/srcpkgs/libkleo/template @@ -1,6 +1,6 @@ # Template file for 'libkleo' pkgname=libkleo -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz" -checksum=f47c65970564a0aeeabaa90714023d9f1f9737297900b68fbf5a81d8281201a7 +checksum=96d6058bab59c4b807548443d20dfc950f0a916c02aa84a96bf46ea2ecfe1807 libkleo-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From 6c440921897d8ebcdbd552fe7bdfed133cea6f76 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:28 +0200 Subject: [PATCH 2194/2369] libkomparediff2: update to 22.04.1. --- srcpkgs/libkomparediff2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template index 5f3b036be59..fcf4ae52ffd 100644 --- a/srcpkgs/libkomparediff2/template +++ b/srcpkgs/libkomparediff2/template @@ -1,6 +1,6 @@ # Template file for 'libkomparediff2' pkgname=libkomparediff2 -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake" @@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://www.kde.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkomparediff2" distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz" -checksum=9c9ff478d4e31cc0b0dc980238956d92f683e6ff55dc1c6b67e3212c7e7e0711 +checksum=e404db3115a2a669edd3010dcfd2b45b140481c8b98be9df08fae11d8a0ce33f libkomparediff2-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 9acfc222af11d44515eb0f11f39ca83be2e410b3 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:29 +0200 Subject: [PATCH 2195/2369] libksane: update to 22.04.1. --- srcpkgs/libksane/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libksane/template b/srcpkgs/libksane/template index b3978c67217..42205caeb79 100644 --- a/srcpkgs/libksane/template +++ b/srcpkgs/libksane/template @@ -1,6 +1,6 @@ # Template file for 'libksane' pkgname=libksane -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools" @@ -11,7 +11,7 @@ license="LGPL-2.1-or-later" homepage="https://kde.org/applications/graphics" changelog="https://kde.org/announcements/changelogs/gear/${version}/#libksane" distfiles="${KDE_SITE}/release-service/${version}/src/libksane-${version}.tar.xz" -checksum=ef8b823a11de933023061641627ab94b802d745ce5310c97469840ed09122232 +checksum=bb755d27682b0a0f4b23af8267165822bf5cad09c03cf24429d8f8b23b226480 libksane-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 996485c67f8670ce2b063457d0ba43db40b12abe Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:31 +0200 Subject: [PATCH 2196/2369] libksieve: update to 22.04.1. --- srcpkgs/libksieve/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template index cc0665cfda2..eaa9b59f997 100644 --- a/srcpkgs/libksieve/template +++ b/srcpkgs/libksieve/template @@ -1,6 +1,6 @@ # Template file for 'libksieve' pkgname=libksieve -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz" -checksum=6d1faf32d2ae9e90b71590f77acc85fa77d2a4ae38088549257675e30b6329d2 +checksum=3dffbb22fcae637c6c458dfea69cd2ae840a79d9dc72ba4af6b2dfda0b8fd71b libksieve-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From 044bacfbc0150a950539fc0984217c5c43278af3 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:32 +0200 Subject: [PATCH 2197/2369] libktorrent: update to 22.04.1. --- srcpkgs/libktorrent/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template index b238683af76..787e5a7c40e 100644 --- a/srcpkgs/libktorrent/template +++ b/srcpkgs/libktorrent/template @@ -1,6 +1,6 @@ # Template file for 'libktorrent' pkgname=libktorrent -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake python3 doxygen" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://apps.kde.org/en/ktorrent" distfiles="${KDE_SITE}/release-service/${version}/src/libktorrent-${version}.tar.xz" -checksum=80cef9619c0ea9079f6ad351f9fdd81d363d40eeb32f4cef7a83e995a8322745 +checksum=57dd46edc9e10127bca69104b0288bdfa5f1dab261f89d8fa4b2161ab7e7ddca if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kcoreaddons" From f27a76b1cc013b213f29a08699e4b01e77b240fa Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:34 +0200 Subject: [PATCH 2198/2369] mailcommon: update to 22.04.1. --- srcpkgs/mailcommon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template index 55ac94f2da0..b5267dbffa1 100644 --- a/srcpkgs/mailcommon/template +++ b/srcpkgs/mailcommon/template @@ -1,6 +1,6 @@ # Template file for 'mailcommon' pkgname=mailcommon -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake @@ -12,7 +12,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz" -checksum=4e8dcb2ece18dfca8e219838d85d8e402cb353e6a2ca8fa9d79bbcb4e1fc28fe +checksum=5ac134dc7d4ff1c03fd192ff1f709a9839187a7bdd66b6ef033909730d95da75 mailcommon-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedpends}" From 4d962bda62e5d4fcee23110af5bc9d14117c19fc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:35 +0200 Subject: [PATCH 2199/2369] mailimporter: update to 22.04.1. --- srcpkgs/mailimporter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template index 77c51b937fa..5161c5cc317 100644 --- a/srcpkgs/mailimporter/template +++ b/srcpkgs/mailimporter/template @@ -1,6 +1,6 @@ # Template file for 'mailimporter' pkgname=mailimporter -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3 @@ -11,7 +11,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz" -checksum=53dbab7697658d38dbbf6e7f31fbe97a88fcad1ca3a77cb540ce04d7fe4f9951 +checksum=866c77c85dbae71f7c6a3bac43d8fd19f1865155955a936660f7ba14d7a3f39d mailimporter-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 3a8b811747119c7714120ff2c0ceeab3737a013c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:44 +0200 Subject: [PATCH 2200/2369] marble5: update to 22.04.1. --- srcpkgs/marble5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template index 841cb976ad1..702f8bfb99a 100644 --- a/srcpkgs/marble5/template +++ b/srcpkgs/marble5/template @@ -1,6 +1,6 @@ # Template file for 'marble5' pkgname=marble5 -version=22.04.0 +version=22.04.1 revision=1 wrksrc="marble-${version}" build_style=cmake @@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, GFDL-1.2-only" homepage="https://marble.kde.org" changelog="https://kde.org/announcements/changelogs/gear/${version}/#marble" distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz" -checksum=eb39219936b387dae4743638fe8ac5cf7f5654f4b4aff06a7c7b67e177799962 +checksum=359b14486376c387e990eb4836b058495e03a69791bbafd560f1034af0b9b857 pre_configure() { vsed -i CMakeLists.txt -e 's/-Wcast-align//' From 63f3f0e798cc6d3ef76d528d0cf02b22624c03df Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:47 +0200 Subject: [PATCH 2201/2369] messagelib: update to 22.04.1. --- srcpkgs/messagelib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template index f0ed61466d5..7e9a45f1d13 100644 --- a/srcpkgs/messagelib/template +++ b/srcpkgs/messagelib/template @@ -1,6 +1,6 @@ # Template file for 'messagelib' pkgname=messagelib -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 @@ -14,7 +14,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz" -checksum=5c57b5d7fcabaf8030f609e1458bc8d0ad436901a5ef45cff83a470cd5b43077 +checksum=a8029e5c87b67980952850c84a92a80604b8bf98159096576acfbafdfc2ddf46 #TODO: fix build without qca-qt5 From 32e3df69abd05de8b0b23b3ad83c5745ca6107c1 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:49 +0200 Subject: [PATCH 2202/2369] okular: update to 22.04.1. --- common/shlibs | 2 +- srcpkgs/okular/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index ee2395bc2b0..8f5670e2148 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1777,7 +1777,7 @@ libspiro.so.1 libspiro-20190731_1 libopenjp2.so.7 libopenjpeg2-2.1.0_1 libcln.so.6 cln-1.3.3_1 libchm.so.0 libchmlib-0.40_1 -libOkular5Core.so.9 libokular-18.04.1_1 +libOkular5Core.so.10 libokular-22.04.1_1 libmnl.so.0 libmnl-1.0.3_1 libnftnl.so.11 libnftnl-1.1.2_1 libfcgi.so.0 fcgi-2.4.0_2 diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template index 0933595722c..fba4e72d0f8 100644 --- a/srcpkgs/okular/template +++ b/srcpkgs/okular/template @@ -1,6 +1,6 @@ # Template file for 'okular' pkgname=okular -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons @@ -16,7 +16,7 @@ maintainer="John " license="GPL-2.0-only" homepage="https://kde.org/applications/en/graphics/org.kde.okular" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=63314864b1975b16ffadcce7c19b2ee4ae5477739639cfac165d4eac71fb9914 +checksum=cee20b2df2828728e9208406c9dec7a96b33a10eaac7b26c35788009e077163f do_check() { cd build From ffd1495b3a95d3cd30e0f4b3973a4bc844275a64 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:51 +0200 Subject: [PATCH 2203/2369] palapeli: update to 22.04.1. --- srcpkgs/palapeli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/palapeli/template b/srcpkgs/palapeli/template index 8debf3cedc2..bc4908e81a6 100644 --- a/srcpkgs/palapeli/template +++ b/srcpkgs/palapeli/template @@ -1,6 +1,6 @@ # Template file for 'palapeli' pkgname=palapeli -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/games/palapeli" changelog="https://kde.org/announcements/changelogs/gear/${version}/#palapeli" distfiles="${KDE_SITE}/release-service/${version}/src/palapeli-${version}.tar.xz" -checksum=0f55a6f34867b6e10df956061df25c9211181111e92cd91d2ca5eb84287ed11c +checksum=ba116943e9f42983ca71104ae637526655759f0900d9deed281029021e060da9 From b1b50131f659e69b6f1fe6102079bf85f65fb823 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:52 +0200 Subject: [PATCH 2204/2369] partitionmanager: update to 22.04.1. --- srcpkgs/partitionmanager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/partitionmanager/template b/srcpkgs/partitionmanager/template index 335ea8f8f4f..81b9559cd8e 100644 --- a/srcpkgs/partitionmanager/template +++ b/srcpkgs/partitionmanager/template @@ -1,6 +1,6 @@ # Template file for 'partitionmanager' pkgname=partitionmanager -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ license="GPL-3.0-or-later" homepage="https://kde.org/applications/system/org.kde.partitionmanager" changelog="https://kde.org/announcements/changelogs/gear/${version}/#partitionmanager" distfiles="${KDE_SITE}/release-service/${version}/src/partitionmanager-${version}.tar.xz" -checksum=37c0b3e4c8252bd743e9540c219adb3d595704e042e2c7f63c8b3dbbf41e1374 +checksum=5620d9a193ddd5675d4ca3d01a4632f2d5ed9fc9870d50e7c394adf5fda6d722 if [ -n "$CROSS_BUILD" ]; then configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" From a5674638f0069f01a36ad3a978ff0f8fffd235e5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:54 +0200 Subject: [PATCH 2205/2369] pim-data-exporter: update to 22.04.1. --- srcpkgs/pim-data-exporter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template index 2f83487e979..7a55eb8f98e 100644 --- a/srcpkgs/pim-data-exporter/template +++ b/srcpkgs/pim-data-exporter/template @@ -1,6 +1,6 @@ # Template file for 'pim-data-exporter' pkgname=pim-data-exporter -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake @@ -12,4 +12,4 @@ maintainer="John " license="GPL-2.0-or-later" homepage="https://kontact.kde.org/" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=b8e0cfaec06eeb26af7d08d3b0932fa3721ec8b83761e84a604fea4fd6d29c61 +checksum=71bde8eb1fde57087a20c63c38b4d774f93f580b7f3a356196b3fb77f0da6b96 From 7d36203683290d24e8b3b1ce1ff0eb3a683c84b9 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:55 +0200 Subject: [PATCH 2206/2369] pimcommon: update to 22.04.1. --- srcpkgs/pimcommon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template index 30ba3411e0e..f8cd8e62ec0 100644 --- a/srcpkgs/pimcommon/template +++ b/srcpkgs/pimcommon/template @@ -1,6 +1,6 @@ # Template file for 'pimcommon' pkgname=pimcommon -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt @@ -13,7 +13,7 @@ maintainer="John " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://community.kde.org/KDE_PIM" distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz" -checksum=27148d059cb6d55d523ec594e66c6a5ef4d475d75ad8eff9a3e7884c01082dcc +checksum=2a94cdd9e4340a9ed0a793191b87bd50502683b5480db3dae9f360298fb48106 pimcommon-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From 44239de5bdcc561247af160e16ee2c65e07f3efc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:56 +0200 Subject: [PATCH 2207/2369] print-manager: update to 22.04.1. --- srcpkgs/print-manager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/print-manager/template b/srcpkgs/print-manager/template index 8a86ae55f9d..a534cb9f281 100644 --- a/srcpkgs/print-manager/template +++ b/srcpkgs/print-manager/template @@ -1,6 +1,6 @@ # Template file for 'print-manager' pkgname=print-manager -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools @@ -12,7 +12,7 @@ license="GPL-2.0-or-later" homepage="https://kde.org/applications/en/print-manager" changelog="https://kde.org/announcements/changelogs/gear/${version}/#print-manager" distfiles="${KDE_SITE}/release-service/${version}/src/print-manager-${version}.tar.xz" -checksum=0b6dd52a7f1b1aabd95202b4cce227dba719fb51187506072a75479876d93be1 +checksum=f49c063ce442070f386fb1bb480a0c8450184f6c83274205155cff0f6e72b879 if [ "$CROSS_BUILD" ]; then configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake" From 106ad7417719a93ca132df735d731b087af8c30c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:58 +0200 Subject: [PATCH 2208/2369] signon-kwallet-extension: update to 22.04.1. --- srcpkgs/signon-kwallet-extension/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template index 4361bac6029..0adf1226c20 100644 --- a/srcpkgs/signon-kwallet-extension/template +++ b/srcpkgs/signon-kwallet-extension/template @@ -1,6 +1,6 @@ # Template file for 'signon-kwallet-extension' pkgname=signon-kwallet-extension -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake" @@ -11,4 +11,4 @@ license="GPL-2.0-only" homepage="https://cgit.kde.org/signon-kwallet-extension.git/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension" distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz" -checksum=33d19b1b758a21e568ce508cc168e568e34716f148cd83e214fb8a3f3194d2e8 +checksum=2cecc13cf9316f0697542894f0995ee3bde358ee503c153e0a9072e3df1bd08e From 269d34f7e6fadd8c7a1e587b70c22b62cdac87b0 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:21:59 +0200 Subject: [PATCH 2209/2369] skanlite: update to 22.04.1. --- srcpkgs/skanlite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skanlite/template b/srcpkgs/skanlite/template index 1051d91a494..d90d0b902f0 100644 --- a/srcpkgs/skanlite/template +++ b/srcpkgs/skanlite/template @@ -1,6 +1,6 @@ # Template file for 'skanlite' pkgname=skanlite -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -12,7 +12,7 @@ license="GPL-2.0-or-later" homepage="https://www.kde.org/applications/graphics/skanlite" changelog="https://kde.org/announcements/changelogs/gear/${version}/#skanlite" distfiles="${KDE_SITE}/release-service/${version}/src/skanlite-${version}.tar.xz" -checksum=77e09cee9f57e8bda4905d358ecf296528df8ad73c93f722c6ec689d65abbc19 +checksum=69f7fe0850459c5f81767b4d3ba4d60ffcb3e495d9a2eaf1461bb95b56f013c8 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake" From e2756f97653b97cd27829fe48cce680fe0c7c34b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:22:01 +0200 Subject: [PATCH 2210/2369] spectacle: update to 22.04.1. --- srcpkgs/spectacle/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template index ed5805b3279..a5a0344ad34 100644 --- a/srcpkgs/spectacle/template +++ b/srcpkgs/spectacle/template @@ -1,6 +1,6 @@ # Template file for 'spectacle' pkgname=spectacle -version=21.12.3 +version=22.04.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -14,4 +14,4 @@ maintainer="John " license="LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://kde.org/applications/en/utilities/org.kde.spectacle" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=5b0ffca9ea43f5ffebd5c2d12090f0d81a9014742a20b1b806594e6a848dbd94 +checksum=335bc9ab70966d23bdd09614c373d73cf0d8ee09788b22637d5717919e443884 From 090af783993184b0fe1519230fd78e921515bc0c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:22:02 +0200 Subject: [PATCH 2211/2369] svgpart: update to 22.04.1. --- srcpkgs/svgpart/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template index a0b9d95a6ce..a1d9cc612e3 100644 --- a/srcpkgs/svgpart/template +++ b/srcpkgs/svgpart/template @@ -1,6 +1,6 @@ # Template file for 'svgpart' pkgname=svgpart -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake" @@ -11,4 +11,4 @@ license="GPL-2.0-or-later" homepage="https://cgit.kde.org/svgpart.git" changelog="https://kde.org/announcements/changelogs/gear/${version}/#svgpart" distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz" -checksum=923bda29e6610fb4dfd2b4f98e14045271c099ab1ed3988d52fefdc0b408df9a +checksum=5e5b9314e06798177a3b4ada63236cfc6b65e229153b83b69a8c2699a6b8689c From 4f78e5282b8c3369fb9fe8330012fe3e6c515317 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:22:04 +0200 Subject: [PATCH 2212/2369] umbrello: update to 22.04.1. --- srcpkgs/umbrello/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template index da275716122..d06ffb89864 100644 --- a/srcpkgs/umbrello/template +++ b/srcpkgs/umbrello/template @@ -1,6 +1,6 @@ # Template file for 'umbrello' pkgname=umbrello -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake" @@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later" homepage="https://umbrello.kde.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#umbrello" distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz" -checksum=f4f681daedbefdeb0e6b0da0fd718c20031491d3b088e0523ff5bbfab3de72d8 +checksum=bf2d65a6a1d08f695b3ca29c902e4fc52917870cd3d161b3a478e77b021f5306 python_version=2 pre_configure() { From d729fa0f0af82cf7a2c27b6669a9f95f57cc3209 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:22:06 +0200 Subject: [PATCH 2213/2369] yakuake: update to 22.04.1. --- srcpkgs/yakuake/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template index dd56e9afefb..1b8ba024c85 100644 --- a/srcpkgs/yakuake/template +++ b/srcpkgs/yakuake/template @@ -1,10 +1,10 @@ # Template file for 'yakuake' pkgname=yakuake -version=22.04.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext" -makedepends="knewstuff-devel knotifyconfig-devel kparts-devel" +makedepends="knewstuff-devel knotifyconfig-devel kparts-devel kwayland-devel" depends="konsole" short_desc="Drop-down terminal emulator based on KDE konsole technology" maintainer="Piotr Wójcik " @@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only" homepage="https://kde.org/applications/system/org.kde.yakuake" changelog="https://kde.org/announcements/changelogs/gear/${version}/#yakuake" distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz" -checksum=b7f96b48fd5baa75dd8fe53c8886f8cb0628f6a77a33232dc5bf06f45f6b2006 +checksum=53389837706aa62d56d3965bb846b435fc15a3083e3756c75a25aa86ee65c1b0 From 4ff4a857598d64d5018890ded62dec49f00a6503 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 01:51:47 +0200 Subject: [PATCH 2214/2369] plasma-wayland-protocols: update to 1.7.0. --- srcpkgs/plasma-wayland-protocols/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-wayland-protocols/template b/srcpkgs/plasma-wayland-protocols/template index 2d8978e4a14..ec9540317fa 100644 --- a/srcpkgs/plasma-wayland-protocols/template +++ b/srcpkgs/plasma-wayland-protocols/template @@ -1,6 +1,6 @@ # Template file for 'plasma-wayland-protocols' pkgname=plasma-wayland-protocols -version=1.6.0 +version=1.7.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules" @@ -9,7 +9,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/libraries/plasma-wayland-protocols" distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=b74ffac969ef067e47180e748a67a3a1816b7157ff4ea620ed4432f59b70f01f +checksum=084e2685caa61d94c6fe86dce006b22474d7bb4b34c4cb96bd763b97e305fad6 post_install() { vsed -e '/NOT CMAKE_SIZEOF_VOID_P STREQUAL/,+5d' \ From 27ef7b64eca6551b0506c0feca8766fd9fe68cc0 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 15 May 2022 11:27:35 +0200 Subject: [PATCH 2215/2369] calligra: rebuild against libokular-22.04.1 --- srcpkgs/calligra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index 89d0b1648e9..7c1411bf3da 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=6 +revision=7 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" From 11966f89835ef57b1b9189e6c5907e5aafdb2aed Mon Sep 17 00:00:00 2001 From: John Date: Mon, 16 May 2022 07:51:09 +0200 Subject: [PATCH 2216/2369] dolphin: update to 21.04.1. --- srcpkgs/dolphin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template index 70df61b65c4..2cfd8607589 100644 --- a/srcpkgs/dolphin/template +++ b/srcpkgs/dolphin/template @@ -1,6 +1,6 @@ # Template file for 'dolphin' pkgname=dolphin -version=21.12.3 +version=21.04.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ license="GPL-2.0-or-later, GFDL-1.2-or-later" homepage="https://kde.org/applications/en/system/org.kde.dolphin" changelog="https://kde.org/announcements/changelogs/gear/${version}/#dolphin" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=5812238be9a4ee204e864cd30166285af599c6478eb9ce53cf9a552091c2b654 +checksum=292377aca0454189186d4046ed69785d7fda672270362c3b538a001c9daa826e if [ "$CROSS_BUILD" ]; then LDFLAGS=" -Wl,-rpath-link,../bin" From 2023e1d91b164199415c126c2caecd4fed1176c6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 16 May 2022 12:56:18 +0200 Subject: [PATCH 2217/2369] New package: bzip3-1.1.3 --- srcpkgs/bzip3-devel | 1 + srcpkgs/bzip3/template | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 120000 srcpkgs/bzip3-devel create mode 100644 srcpkgs/bzip3/template diff --git a/srcpkgs/bzip3-devel b/srcpkgs/bzip3-devel new file mode 120000 index 00000000000..c336c0baa42 --- /dev/null +++ b/srcpkgs/bzip3-devel @@ -0,0 +1 @@ +bzip3 \ No newline at end of file diff --git a/srcpkgs/bzip3/template b/srcpkgs/bzip3/template new file mode 100644 index 00000000000..b7de15d1c2e --- /dev/null +++ b/srcpkgs/bzip3/template @@ -0,0 +1,22 @@ +# Template file for 'bzip3' +pkgname=bzip3 +version=1.1.3 +revision=1 +build_style=gnu-configure +short_desc="Better and stronger spiritual successor to bzip2" +maintainer="Leah Neukirchen " +license="LGPL-3.0-or-later" +homepage="https://github.com/kspalaiologos/bzip3" +#changelog="" +distfiles="https://github.com/kspalaiologos/bzip3/releases/download/${version}/bzip3-${version}.tar.xz" +checksum=9ee90e5b07a81e581515a89e263917f1738d8d28dbec05b3ded4524c79977c3c + +bzip3-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/*.a + vmove usr/lib/*.so + } +} From c92c8b04137d41ca4e956c10028c761bf1ee677a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 16 May 2022 14:20:12 +0200 Subject: [PATCH 2218/2369] zsh: update to 5.9. --- srcpkgs/zsh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template index 1a1d9d9a475..44550da3b66 100644 --- a/srcpkgs/zsh/template +++ b/srcpkgs/zsh/template @@ -1,6 +1,6 @@ # Template file for 'zsh' pkgname=zsh -version=5.8.1 +version=5.9 revision=1 build_style=gnu-configure make_build_target="all info" @@ -22,7 +22,7 @@ maintainer="Leah Neukirchen " license="MIT, GPL-3.0-or-later" homepage="http://www.zsh.org" distfiles="http://www.zsh.org/pub/zsh-${version}.tar.xz" -checksum=b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 +checksum=9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5 register_shell="/bin/zsh /usr/bin/zsh" lib32disabled=yes conf_files="/etc/zsh/*" From ea2329388e08d27ab952ff78fc1055609d9c4e0c Mon Sep 17 00:00:00 2001 From: Johannes Daniel Nuemm Date: Fri, 18 Mar 2022 15:16:53 +0100 Subject: [PATCH 2219/2369] firefox-esr: update to 91.9.0. --- srcpkgs/firefox-esr/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index a3d95e10b2c..e259184e024 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n". # pkgname=firefox-esr -version=91.6.0 +version=91.9.0 revision=1 wrksrc="firefox-${version}" build_helper="rust" @@ -13,7 +13,7 @@ license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz https://github.com/chmeeedalf/gecko-dev/files/7729086/esrppcjit.tar.gz" -checksum="7e802832152c39588b9a5c8392e90c1b00036bf948fa4a97a7af0d1435ba09a1 +checksum="b4beea934c2ff67d93539c0a4a563f7c5fb8e2d231b05f082b1d8a73ee54ba9c 5e926a8be5d6d4949c3bc3eb98e2103692eaa26a98928db432b1d44b535f7241" lib32disabled=yes From d387511deda51f650baa9417764e45676d5dceb4 Mon Sep 17 00:00:00 2001 From: Johannes Daniel Nuemm Date: Fri, 18 Mar 2022 20:32:13 +0100 Subject: [PATCH 2220/2369] firefox-esr-i18n: update to 91.9.0. --- srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++--------------- 1 file changed, 94 insertions(+), 94 deletions(-) diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template index 6abafa19b37..ff444f584a2 100644 --- a/srcpkgs/firefox-esr-i18n/template +++ b/srcpkgs/firefox-esr-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-esr-i18n' pkgname=firefox-esr-i18n -version=91.6.0 +version=91.9.0 revision=1 build_style=meta short_desc="Firefox ESR language packs" @@ -135,96 +135,96 @@ _pkgtmpl() { } } -checksum="26e349c4fce1e45bc461211fc99777e896e452649972e99bec1bd07c4d902f42 - 076463b82bb48b0a7f4ab030af3d0123a73140e3d01d01e9ddd61bc43ce642da - c54688e23c96524c24ecd3ba896186003f6395f265283d8df0d6e0680f03e57f - e442e5194859b2aa6ed2b931827974f2b325f7d2b496ca483d6a6d6e03fdcc3e - 5c8761c72e7e260d69f3d0d9e5af87faa9c4c64d5bf936cdb18af59154070d3e - 831c20161bf4d27448eeff447b0777cc9d9444e00e692f5612d25eca4d63ff16 - aae556cecfbb89918644b8a0a5d6517e89c22a2a6d1f81bea50d15d3d84b46ef - 672a064959a60a99863552368c2547171e0a19a1d2a8e367e7bf510ada4f4de1 - fbc1b076abcf18184239cbde2e668d5437aa973ab2d610db7eff7af5e9c38ce1 - e041427003cb3cdcae0c01d0cfed0b30ed5e382a7e03d497ee3bee5ee689d090 - 395ee2ce266d96188d91a4580608326e877a3aef7c547b2af25ee42ac8338840 - ad334efd5ae9b95bdf9bc3738769535a06d8953864d67b187b8fd9d64c19f351 - 50213a9f6c2f32ffce964ada97c335d2aaf6bc022fe0ce2de27cb5b81ca1f5f9 - 0e37238869cf1746cde69b1dd0440b31a771bdaa47f6ddb844e960c64379f93a - 7f6c48b5e89d3eb60920251c2988870f6e33e9fef36e48f44c35cf4b0a8851e8 - 959de89d58feb1e90ea2c12d02b44de9854a4deaa292d70068de6692a9398e31 - fd197b8191eabd69d1ecf1033e5a19d5420334eb3d6cf085a7fcc734a7f5f59d - 684dbe393b4b01a7195dbfa1b5adb7bff308b88efc7ca92a1e0717d1e9082f3e - badcd1fb341fd10d63398d765f75cf86029cf99549ab86eaa1f946d958e215b8 - 2cb08b847596e919a159eebb71d16731176156402f4282a0d7f3ea304bd038a1 - a06b9980e16492776e6dd2bb7323b362172e428a6e9309280dbce3d61bbd8dfd - 5591a3f1b44af4d2aecbeba96ca40e02eeb368139c1ca060fdc2f8d1db490e36 - d95ebbf6ef473a7985346826bae396f49f1b0658d2bea3e608a6f86df017eb3f - 54f512380853e88bfe8586135d6e1e5284bfa0765e2785971ba40129ee92c4e4 - 30c98ea5192bd5d0aefea9f93a2565ddce0534df4311fe27451e847232a978b5 - 6ef84347128571d9129ca238cdd88ee07cd4a05ea6c031c55a9499fb053af66e - 4c30f6dd5fc7bf48032f04fe9433f717981a4bf2d2048c5e2cbae7b77f987f71 - 07139a074668572406604b6fc89d6426e0bbe653c6057b1f17b4ebd53f3127ad - 2da9a5038bca016401e2c827a00812fc15fdcbfbc24e37b29b3a47fcaeeafad0 - 4a01835e6c6c7d8a298f54ab68c5c5d5815eec83bd651ce638697cf4f3b4af13 - 62db35ed290f007b5bebed9157d5dce24eb9cfaef6c7984444e2e5bbd57ef8b9 - c6c0a855a5d0356a8c576503be0500a311b81c5889e6d2eea9e3427bba39c8f6 - dcf7413fd9784a141720c0b5200fc46e33cf62b6e7189b2e2283052a4ce1c05f - 6e6c2abb5f57095c416402a25d2be8dfac6c43713d3a7c34e4ef5854e49eea9b - 9b9eb4f38ea40993890be5152f58221ff6a91742fad48e491f3d5610ab7a2258 - a6eb93ac5d2f6e3d06d3181794e6fb75ff99d9efafd0787813d2c072a684cc53 - d4ee6c181affa0404321fdd40b59b25b35aab10a87016ff262b0e8c9d69dd943 - b268a39f6182b32f9a122e0f50103ea8442b380a28476356ea235413120ffd91 - af308bc769012d9a909635daa79eac5bd11f8e55ffc78e4d6508dc51787c2adf - 6031a2ebf4000f14cacb9f44faa6eb623d08d1ba7313bba71c95eef4f626562d - 1195b4574c1c2b2c97742518187a3bca8acad0ee8c681efc9b90a068541a8f47 - d98320c38922ddb2984739726027bfb9de1a293c9c23a3b2405ab6eac1dd76b4 - ea5664de8b25e2b71276c3e21ea653b17969a8e514c791e439b2778975719e31 - 98ffbee7305778a0c76bb87e13b035b35fdd2c327dea9680b59cdb6151afc39c - f75cf5a40464f6a4d68cfd5359cba5a26b3af9dc98d58329c41815eaf09ef96d - 43b2f23ec429350eb43e55b6bb86450caa6bbc225e238252d748c201b6047435 - b4da39d2d04f63f6976ec152eff73db33917d22d6cee8f9796fa3e412f343369 - 17df7e3aa5a7820783781dcd3cff7ac67c6928e8dd24cda12f863dc0f244b9cb - d5a5ec172b7f7b419d959312ee4f7188fd8c9d375930efba9587d0044b8ce3e4 - b25d34adb7b3c2e766da82602d5333534d71f73a7e2ef7289672f57f572a0cb5 - 7aeb7c6f0bc2703333d9725b9d6c46402945d387c089ac5df547cb57792f4238 - 3efa8cd779922500be67ff2649b48094273a4f6f2b971a25f6b686381578610f - 4cfb95c8e62d9585ee11f5c0abd1198a8608347f4df1713c79372ba421b8f822 - e223b9d0b43fa8be974cfe09dccf881eb8b380229397cc0db2365b907dbb9602 - 30a6ef94763f5a7da8b0eba094d6689dc3dec4f5f0109145df4a081bfaa3d275 - 0a6b335ca4adfd53d7a7a3895df34b58fff7516388c52066492b717d9cb22a76 - 6350b5513131aa60858463bc0b34028b1ed965d1cb101ae77cab6b6e82b4ea8a - 8e5d38a1bcc687b7bf838a8551ed01d6f8364d6e6d525989d354c19ab8fa5e13 - 576fcdf1610c839b19ac67d62908a246603755c714295b4597f57dd21f9998fa - b689df1c96b238807a23be81e7bf3c90e8dfce93a000bcad6f62ba6b68c81947 - 48d49f4823c0416d17a8ef7ceade4b6308c1c9e1d64fd3ae73ca08bcb8b0de21 - 88268b81d50bea3189a738569e21360799aaf3235241aa7a7066b4a90c6bcda5 - 8973c7be7aace97d90c57651298254d484d57a88f9703ce96b3044206f0832f1 - f9e31af49fecb071f5b8fc818d1916c2b58e64a7d02507150dff176733573fea - c3be99b059b88534930fc795bde952318dd766caa82354c43201fa4892c311ac - 56e3718d4b5a8bf70b5857433cb97f228663728636cd6edd3e4e59e59a7efd19 - cc77ab370e68487e6909bf3fcebb17bdd200c3bcc19a32a36e2c72d1417e463b - f0be0fe4dfc36bd95675643d37494747437bf250b82a65832dd6b11bc4e99490 - 05578860c05cb4a688fdec57f5720aa641d556257dc3c46b7530c31f57f4d174 - 66c3085c1d0929d3478da66fc383b2c45bf474233802f07010ad952255c38a93 - d0cb932951b4b088e5aaf2fa4115c51f2ada1661a958324b3e0e7be4912db7fa - 53733713343dbbde77ec44c98ef1904377eb6bb75f0d66e5e0b2f18ce3bc93ba - 0137da4588097a1e662c3cafe77d4e0ca0fe554ab342615629d8157f0f217b4e - 09649a9fbb2f034c8ae7c9444278b0906dd831616abc886fe3b7032045711eef - 37a6b6168082978d9503a6c58b0ce62799f7f070b70e19a7661ca4f794e0e86b - 86dbc3b1c659489f9563dd15e85e94357f7ceefc828bcd333345936f3dc7f2bc - eb710163923480c1bad315b3e4eaa61f1aaab3e30f659081291b52a0e2621093 - ad7924c0a473ed3c3a89c51ebf0d09b9def9cf2ec6f38db10598266fadcd6b56 - 1f2ce18e0f9033b8a84c30b3ca1d2d771d35658995344cd8e6b8fca09fd6048e - 5b96b615350f84a44873125a6d1abdfe76dfa3df820c4f4aebcfd36f3d2d0c67 - f74dd9356810f9d3a1dca90d53e534dc0541a7a56c3e877e5234c0f12c39f7e0 - 0d260486d46c6e352a309860364c904f1687156f24a4ec474ad04acf7c800e5b - 50aef56fa7faced30ecc1fc370d52c5d54c6e73708ce5705d70f38d0920946dc - aee885b8a055800c2cce6e3b0ee4f604a016818d828d88fb249011e127853691 - 39ec3fc095961fca458bb81c5586255cf8a5c20716770d1d9cf3bbdd1bfb485b - 1e556da079a2ef106e24a039bbc510969447223799619af075c7205191700435 - 9f15c26f67c5d9d2fb0d339cbfe9c6cabb859e8675a4e3c4c797fda64b7478a7 - 6a10daecf2d1fd23592cf2ff832120688a78ccd86d9e9510090ad2d3a40628f1 - a7f287d37ec3651d68a56f3b2a9d2a22ceeb76aacef95f14bcba91ad95e9ce75 - 8974f735c60699521430d7c0bc41ad4badc15d96c0eab810bcc8a547793f17e8 - e34c02a6c1bd51bc34b36f332346fcbbeb41e7d7c6b3a4928f5864a7c89ff153 - e0f79891a14e3d811685bc4ba88803affc01ff0348cbf596fb270dc4e0f1eaa6 - 45a9ec86fe0a9ae4ecf81f1dc320353d5ba3b1a50a1eec42b4fc32e8ae2257b3" +checksum="2bc70d0cbda5bf23e166c13eb3500904135211f3931e7f47ddeb1fb45f5bbcae + 6919cb6c47fe39afb7a49414241f31590c935565f972f82c0d0c7038fba26563 + 2877b443f701a73cee387e631b8f28f42c750851a2150710334bb82015c45427 + 6660890b4ce3629b061475532f3295e72a1b7624bd937b3bcaf83fe794f9b390 + 887ea64a54ef264a3f35612b9e3e0b9fd40b8fd6ee0a7fa9782888406fdb43f7 + 148c555c47a0c47cc9683e6f469a8dc29a4efb2b869296b89f6f9b84077b98de + 8fc6459c9de31065fbfe9e64b36dda9f0355e624f8c3d2377d25794dfdf97674 + 81d64dda58ea8602352c324284b0d6e28ef40e697f19357c6b6a73aee8c6e85d + 8008231903f276c3bdeac6fd720c33c7c9617cd866791f4132b87ba2b94967ac + 1fd22e04b47ccdfbce50f2c0ad312473e9fbeeed14316345ebf8702a2e0c0f9a + 27f4f5d115c0ae796ac348da5162bc3861204e3ce50414035f2d480dcfd0668f + 02d1e040d0c8e84abacf617ec41b6e128a15c1b88eb038a432da2b8fd3c194bd + ebf2d34382902b810ab46374df7e31e893520fe9751415d5fe63fec4fc775bb2 + 993c6f8da2a00f801421e1dbd8981b67e26c4f01356c6a62177d2987c0b15cbe + c490d94b7595090ecd238cc1c8c84a3bfc2450ef2393bd95d954488f314f34b0 + 530a1b09162dad6ff7fea360d232f628f1f67751e2cd21783207fc77c057464d + cdb58015b09a861f4b1c02d7fc9823d87974c3f4b13abd8e7c76bd249c61581b + 59c0ab8f08edaa9e430a5988fb1890cd3cd5a7dfa785303c8776fb6f38192efe + 37e221b2ccb512ead4445b2345a6527a3358075e011a58658158954f052784da + 580dc1641d96072ee44800af8c553eab82f158e36a0f13f795a7a51f1bb762ec + 9570ab68c643e612aa10818633b3d93607581d0d97ea764e0213f0b1e5769d4d + d2fd517a39874e8f8fb37458450db6ab496cfa1bc2baf0f71e883296bfbdde27 + 2616aaf1722723003d91aab4e69b4381412f810a439feff4ef2a146e22d9f960 + 21a06c320fb80e4e45b02ce8f084bcc8900764dd137e2ca4c8b7929c89e0c3d5 + 59a6e10dedc26f6ebd7755477015d7b3e956ab34f29fd3954f12f7a4f5ee345d + eefd5a4d637fc86281cdbd43a06e07fbb76f8a01e9bdaff181daba5bd7cf46cc + fb50ad15895d27e30c54f1cc2fe848405a5c10917d3d73c71b82e1e93d658c8a + c04680483e96c0c8a77f07b18333b02b8dec4807de332ab77ec3a6446a866dfd + b38c3d132e74034d2659172f374b4eb6261b2346a705988823a9af56f906e155 + a94238d8a7ed68b6170c49a07d8d1cc06d8c3a30b5b4746095d559856f30773d + 324bb76b3c95fe645796ec43962497ebb03b80b4a068e778b684fcf7a307bef0 + 0f0df750b7e54edc132133d53d7dd9fd78fb828578d79d97097afc98b8de538a + e77a14ff78e90944d14439d1bb9ca5bd116a6cf71b5bf14e16d3cb593ff35b70 + 143995923b153cbf6cc3a8d846afda70601c13ede25ef8b193db80fd9f1896e9 + 446132041fe6f31bd5413735ca9813e86595ce35ed5fe499aae164775ba0f987 + 0d5798050376c4b7aafc2bb78692056abcd1f441fc131591180e11647c276872 + b2e4c9aa9452bd1af2e7fdade9752aa6019f28a2e4599bafbe9da9e9e1d5f01a + cdda19d8b15cf46d6c2141434969d7599ebbfb60b62b29940f52a79fd8cf072f + b6095ac9de172e6df5bc586afe934c327fd5602ed18aa1fed0d8ddb1387c7df9 + 75fe7ab4377e3c212b256c3391fdff1a609d91cb58c14fd6cae453869fb334df + 46706eef7e7bb90fc055b002f627286c2de43ddd5a0caf2b9c06d032ad7d85d5 + 203ca7b2bb45eb5cee5b1eeb9d24e25520379e7af1ff4aabd09ab25c5b3f3d8a + 2c643a1d8696037b047cc06ee0886e4696db55b4c8cacb69ce52066c35680bd9 + b7309661250a56ed8a42619699efc8c9f8a388506ae3c5b38e5680d7c7d50f51 + 0572d0fc5e88798a0f944e5e60e0c95365241f474ae201a85a0077d083812620 + d52085185911557948c94e7f4f45e6ce50ad104f3031ba32e62d58b6b581df93 + 5ea6410c8a42f3e558a3b73993e185778a3f91fcefe37dfb32881b884d9a7328 + 67ff089e58616e50df99730c33bfa90071beff2c3715d5bcdc218a602346c8e3 + 753cf07925bfe1c3b5fd6f2947a18b8f826d514d5c9b0d7f2d357fd033b66192 + ab291fd924c16b7fe51dbfc06519bc9b1d02182bfa0dbd9523638c285615cc77 + 9d31e9a493077b8c0409969e4d53102239f472467510b9dcdb7a227fdb6277a7 + c9dc5c95b109c895c3cf0fc0f0eb46385634637bce107e000ba42a2f9b7907fe + 6b08f873fe1f9dc7d468b710b2dd8f3fe49138c3cdb4b4594a579d0379977271 + ad3510d8b699dc71356f622f2e7b9c2dec12096fcf9741dfdfeec03d9382e0e0 + 5d2afd46ea725d43357c0c9ac6d4d4db89aa9f0c49a4e1e9fc1c124390ea6e20 + 9ca197bb00e23df520199bbbb49fe66d09e5d5741e7acbd4e93da0a642140ed6 + 633879681627dcd34759732ceb40cf6b7f803690cd73ae7bcab39459993cc78c + f8830dbd04e1248220fcc7e6eba6e7903bc36dc097a4360279847fc8148df7fa + 2828ad3e3563ad3e4652ed19eedef1d3c96c12c295bdc1a6057302bd590da00a + 763cf455f806bb30eed4c8b25c3bbfdd500959b8fd0d26713f0c19b2a8429589 + 2d84d2806ecaa9520f6d6575b6bf3f11e9431066dd133dd28882cd4b4bed3aa4 + a70ace7c4803934c4207347a24910a4f7406b79936aa6289c2d078c174f95a1a + d1f0df1831f0fe552ee3b58d83740ee95dce560ecb5a595185dfbd7a11c9838d + 0d08b1365d603534d73fb756bd139a913c4b4042c9f40de545db56eb37dbe7d1 + 79a49173ea82db7b36c019545adc2faafb07d6db31da1a100c7cbc61ca2c2ea8 + 66fa26fed2113b1cb173170939a0f5376a61af168fd35fcce055078fabdb3288 + 4b321e39baa8cebbf32ed9e53aa77c562445b9ee2504896272ed2da093f07e26 + be1a45a7ea2f23addb28a767cb9a6a9a54cc8d8809d6ebf28a41a03d2d09ded8 + fda6f1000b7a14b4e3200ae00597aaf0e5a0e769a1ba5af9c3b9f841e1adf534 + 7f907551000f435586a43acc215eadf994c590fe454eef6f843949efbeb1b3e6 + b7e58ea0c7c347e747f03531dfcdf13a2a70e2d08caaa704e4d8d0a9c139cb86 + 8b6b6274781bfb5869bf81c0366b768e10b8642139910490adbe92658546115c + a70c758f52467b8f04bbda20d1cfdae79ae99a860b54e1b463d7005f267656b3 + b0177a28695c8e2297fbda2f9fe7ccca9142fa2933d08ecfa607019f3a07e7f9 + 23cb3211b6c66beccb8619606e62011a3aaa4a082b49abbe507d6d9ce081d6a5 + 3af4c4f8ee80740aafbeffeec8a6a2ed3f091bd4d149f687a302e1d027bdeb9f + 467139c240ef5cdb8f522e04b05a1f87f82f0788ab65ee3b135b72b201f06050 + 841fa5f1b1d810061c2f014bd942f626d30d27b35d07bc7712a323cbfbbb133b + 35ca0a96504d16ad7b542f457b137432737c49dbd972aea4188bb1be950d47e1 + f837ac7a86a79db85a79b0d1acaac49fe9c18ca15072bd0dd88c70aa9d00c9ac + 07d40bfdf5ef1cb91b757f1d05679b18428edaa06aa6ede3eb259e596e08fa2b + 96c4523ea1d5285174ecf1ec1a5ef09daa3adcf60ecd8d2a196f741ad80461cd + f94199bb442b47cd8a5abd08a443d8b5ff21d73fd9a98eb93757ab3639ed1bd0 + 2d09a80290021506b292326b7869d2818d17dac54f6cfa8aa3896dc044f76d90 + 2fe0a1871ecb3f834ba677de34b5d991e1686681b4f7b4fbf4f03df26afe4768 + 79bba3d52f9d3a8326b706e6289767e6aab2f6216e050557c787ed7bf395384f + 14aae95adc96b8b68f0e3d71a20407fca89c9256a6475517a54026683aae2bfc + af5477c70b190fa3b94eea570b1b8c52a2bac739ecfa37272f39d917ce5cad05 + a60b318f6597cadad59728434d665a053f5ac80322e0b532416650443eca8f22 + 428a8e350f67cf25413e59c97a069fa47a8f814e8073c4a82ba3ea0440d1f2ec + 87582b34d4c374b6d828e03282d2afe63513769abf0d4cc0b7f8da83f1510a03 + 139c2d899969839508c0c05ca0b8d572a2f35d86a6b313ea023855cb9a77ad8b + b80cb04dc34f815e86dbb82d42338bef4c7cdac6a5e21969f39b594e707c7c99" From 506157517d589048cd355ef81bda490439df5254 Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Mon, 16 May 2022 17:37:45 +0700 Subject: [PATCH 2221/2369] dolphin: fix typo version --- srcpkgs/dolphin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template index 2cfd8607589..dca07303974 100644 --- a/srcpkgs/dolphin/template +++ b/srcpkgs/dolphin/template @@ -1,6 +1,6 @@ # Template file for 'dolphin' pkgname=dolphin -version=21.04.1 +version=22.04.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -15,7 +15,7 @@ license="GPL-2.0-or-later, GFDL-1.2-or-later" homepage="https://kde.org/applications/en/system/org.kde.dolphin" changelog="https://kde.org/announcements/changelogs/gear/${version}/#dolphin" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=292377aca0454189186d4046ed69785d7fda672270362c3b538a001c9daa826e +checksum=9cf51ac21ffc3d12a919e99cca80f3bb14741eed2a3af54b4499332ccd979a7b if [ "$CROSS_BUILD" ]; then LDFLAGS=" -Wl,-rpath-link,../bin" From 950151c57286b7becc46cd1584a446c5199db033 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 16 May 2022 10:26:50 -0400 Subject: [PATCH 2222/2369] build-style/python3-pep517.sh: improve default wheel selection When naming wheels, hyphens are converted to underscores in package names. Recognizing this in the build style eliminates manual definition of `make_install_target` in several templates. --- common/build-style/python3-pep517.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh index a733a521fb3..62cfac7d67d 100644 --- a/common/build-style/python3-pep517.sh +++ b/common/build-style/python3-pep517.sh @@ -23,7 +23,11 @@ do_check() { do_install() { # As with do_build, no need to accommodate cross compilation here - : ${make_install_target:=${pkgname#python3-}-${version}-*-*-*.whl} + if [ -z "${make_install_target}" ]; then + # Default wheel name normalizes hyphens to underscores + local wheelbase="${pkgname#python3-}" + make_install_target="${wheelbase//-/_}-${version}-*-*-*.whl" + fi # If do_build was overridden, make sure the TMPDIR exists mkdir -p build From 6fad0e8f0ae3b62511d1ca8c67d74026881aee67 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 16 May 2022 10:30:06 -0400 Subject: [PATCH 2223/2369] python3-more-itertools: fix build, use PEP-517 --- srcpkgs/python3-more-itertools/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template index 914d46f0a69..2ab2b760ec3 100644 --- a/srcpkgs/python3-more-itertools/template +++ b/srcpkgs/python3-more-itertools/template @@ -1,10 +1,10 @@ # Template file for 'python3-more-itertools' pkgname=python3-more-itertools version=8.13.0 -revision=1 +revision=2 wrksrc="more-itertools-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools" +build_style=python3-pep517 +hostmakedepends="python3-flit_core" depends="python3" checkdepends="python3-pytest" short_desc="More Python3 routines for operating on itertables" From aeb10e2e8135ec39d8ea98964bec0ef71a2e7c7a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 16 May 2022 10:34:25 -0400 Subject: [PATCH 2224/2369] python3-ansible-compat: fix build --- srcpkgs/python3-ansible-compat/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template index 919455b7e64..5b5b64154f3 100644 --- a/srcpkgs/python3-ansible-compat/template +++ b/srcpkgs/python3-ansible-compat/template @@ -1,12 +1,11 @@ # Template file for 'python3-ansible-compat' pkgname=python3-ansible-compat version=2.0.2 -revision=1 +revision=2 wrksrc="${pkgname/python3-/}-${version}" build_style=python3-pep517 -make_install_target="ansible_compat-${version}-py3-none-any.whl" -hostmakedepends="python3-wheel python3-toml" -depends="python3-subprocess-tee" +hostmakedepends="python3-wheel python3-setuptools_scm" +depends="python3-subprocess-tee python3-yaml" short_desc="Python package for working with various version of ansible" maintainer="Jan Christian Grünhage " license="MIT" @@ -15,8 +14,7 @@ distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.t checksum=c651995dc323ef145bab857fee6540febc881fb71b7feafe8163d49e273163a5 post_patch() { - # scm versioning is broken in this release - vsed -e "/name =/a version = ${version}" -i setup.cfg + vsed -e "/setuptools_scm_git_archive/d" -i pyproject.toml } post_install() { From c31f9aff14ca10d1b69feeebf0289ca31aa544c6 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 16 May 2022 10:34:25 -0400 Subject: [PATCH 2225/2369] python3-ansible-lint: fix build --- srcpkgs/python3-ansible-lint/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template index 00d8dc40f6a..7cded1c6032 100644 --- a/srcpkgs/python3-ansible-lint/template +++ b/srcpkgs/python3-ansible-lint/template @@ -1,11 +1,10 @@ # Template file for 'python3-ansible-lint' pkgname=python3-ansible-lint version=6.0.2 -revision=1 +revision=2 wrksrc="${pkgname/python3-/}-${version}" build_style=python3-pep517 -make_install_target="ansible_lint-${version}-py3-none-any.whl" -hostmakedepends="python3-wheel python3-toml" +hostmakedepends="python3-wheel python3-setuptools_scm" depends="ansible-core python3-yamllint python3-six python3-yaml python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch python3-ansible-compat" @@ -26,6 +25,5 @@ checksum=b539bc22d13e6de0cc2e25758e1d28b2bc01561a414ae37ceda3708b5a2a79ed make_check=no post_patch() { - # scm versioning is broken in this release - vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg + vsed -e "/setuptools_scm_git_archive/d" -i pyproject.toml } From a8cb41b005c8628ab9de44a79be7efb7ddb3c5f4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 16 May 2022 10:34:25 -0400 Subject: [PATCH 2226/2369] python3-matrix-common: remove unnecessary make_install_target --- srcpkgs/python3-matrix-common/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/python3-matrix-common/template b/srcpkgs/python3-matrix-common/template index c9f7a2d5c8e..b216a122778 100644 --- a/srcpkgs/python3-matrix-common/template +++ b/srcpkgs/python3-matrix-common/template @@ -4,7 +4,6 @@ version=1.1.0 revision=1 wrksrc="matrix-python-common-${version}" build_style=python3-pep517 -make_install_target="matrix_common-${version}-*-*-*.whl" hostmakedepends="python3-setuptools python3-wheel" depends="python3-attrs" short_desc="Common code for Synapse, Sydent and Sygnal" From 37d9bcf2f94f36418d1aa61ebbe846d00269d7f2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 16 May 2022 10:34:25 -0400 Subject: [PATCH 2227/2369] python3-msoffcrypto-tool: remove unnecessary make_install_target --- srcpkgs/python3-msoffcrypto-tool/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/python3-msoffcrypto-tool/template b/srcpkgs/python3-msoffcrypto-tool/template index 10672ed0924..fa80ef34324 100644 --- a/srcpkgs/python3-msoffcrypto-tool/template +++ b/srcpkgs/python3-msoffcrypto-tool/template @@ -4,7 +4,6 @@ version=5.0.0 revision=2 wrksrc="msoffcrypto-tool-${version}" build_style=python3-pep517 -make_install_target="msoffcrypto_tool-${version}-*-*-*.whl" hostmakedepends="python3-poetry-core" depends="python3-setuptools python3-olefile python3-cryptography" checkdepends="python3-pytest $depends" From abe94be670296df12253471179e88335044b65c0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 16 May 2022 10:34:25 -0400 Subject: [PATCH 2228/2369] python3-subprocess-tee: fix build --- srcpkgs/python3-subprocess-tee/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-subprocess-tee/template b/srcpkgs/python3-subprocess-tee/template index 39a0233dad7..e14060d2bff 100644 --- a/srcpkgs/python3-subprocess-tee/template +++ b/srcpkgs/python3-subprocess-tee/template @@ -4,8 +4,7 @@ version=0.3.5 revision=1 wrksrc="${pkgname/python3-/}-${version}" build_style=python3-pep517 -make_install_target="subprocess_tee-${version}-py3-none-any.whl" -hostmakedepends="python3-wheel python3-toml" +hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3" short_desc="Replacement for subprocess.run capturing output while still printing it" maintainer="Jan Christian Grünhage " @@ -17,8 +16,7 @@ checksum=ff5cced589a4b8ac973276ca1ba21bb6e3de600cde11a69947ff51f696efd577 make_check=no post_patch() { - # scm versioning is broken in this release - vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg + vsed -e "/setuptools_scm_git_archive/d" -i pyproject.toml } post_install() { From 27c893f7aa1d325c48e097c1ef5d537d6df5a798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 16 May 2022 21:15:24 +0200 Subject: [PATCH 2229/2369] qtcreator: update to 7.0.1. --- srcpkgs/qtcreator/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template index 912c6c00c4c..a616a42d5e4 100644 --- a/srcpkgs/qtcreator/template +++ b/srcpkgs/qtcreator/template @@ -1,6 +1,6 @@ # Template file for 'qtcreator' pkgname=qtcreator -version=7.0.0 +version=7.0.1 revision=1 wrksrc="qt-creator-opensource-src-${version}" build_style=cmake @@ -18,7 +18,7 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0" homepage="https://wiki.qt.io/Category:Tools::QtCreator" changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md" distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz" -checksum=d39a05e48bb961cfab61135a5ee5503fc4d381c74000b910f36bf0cea37736d9 +checksum=da78f293829851e32f6bf25540791697606809e47a32ca8439561fcbab96b22e replaces="qtcreator-data>=0" python_version=3 From 6181051cf562e4ccf63d3cf55b8fca5a8d274dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 16 May 2022 21:15:25 +0200 Subject: [PATCH 2230/2369] diffoscope: update to 211. --- srcpkgs/diffoscope/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template index 9ce203fb8ff..e4eb386165e 100644 --- a/srcpkgs/diffoscope/template +++ b/srcpkgs/diffoscope/template @@ -1,6 +1,6 @@ # Template file for 'diffoscope' pkgname=diffoscope -version=209 +version=211 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -14,4 +14,4 @@ license="GPL-3.0-or-later" homepage="https://diffoscope.org/" changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog" distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz" -checksum=e845a0b6cd56c116fee670ae8497512489504dc911201bd77b7d65b8550618f6 +checksum=8e75f3acb181096632e43935ba7a85304703ac54739810b4523919188367ec03 From ca048fb416ed3688e432062e2088d321cdca0689 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sun, 15 May 2022 19:14:45 +0300 Subject: [PATCH 2231/2369] supertux2: update to 0.6.3. --- srcpkgs/supertux2/patches/locale.patch | 36 -------------------------- srcpkgs/supertux2/template | 8 +++--- 2 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/supertux2/patches/locale.patch diff --git a/srcpkgs/supertux2/patches/locale.patch b/srcpkgs/supertux2/patches/locale.patch deleted file mode 100644 index ffe38ae8a26..00000000000 --- a/srcpkgs/supertux2/patches/locale.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 4380f504fbd51aa9ef7eb222b0bced481402fa7d -Author: Érico Rolim -Date: Wed Dec 9 16:22:22 2020 -0300 - - supertux/main: add try-catch for locale initialization. - - Fixes #1564. - -diff --git src/supertux/main.cpp src/supertux/main.cpp -index ad5e3fde6..c33627e18 100644 ---- a/src/supertux/main.cpp -+++ b/src/supertux/main.cpp -@@ -563,10 +563,19 @@ Main::run(int argc, char** argv) - _wfreopen(w_errpath.c_str(), L"a", stderr); - #endif - -- // Create and install global locale -- std::locale::global(boost::locale::generator().generate("")); -- // Make boost.filesystem use it -- boost::filesystem::path::imbue(std::locale()); -+ // Create and install global locale - this can fail on some setups: -+ // - with bad LANG values -+ // - targets where libstdc++ uses its generic locales code (https://gcc.gnu.org/legacy-ml/libstdc++/2003-02/msg00345.html) -+ try -+ { -+ std::locale::global(boost::locale::generator().generate("")); -+ // Make boost.filesystem use it -+ boost::filesystem::path::imbue(std::locale()); -+ } -+ catch(const std::runtime_error& err) -+ { -+ std::cout << "Warning: " << err.what() << std::endl; -+ } - - int result = 0; - diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template index 4c39b458dad..56057f5837d 100644 --- a/srcpkgs/supertux2/template +++ b/srcpkgs/supertux2/template @@ -1,7 +1,7 @@ # Template file for 'supertux2' pkgname=supertux2 -version=0.6.2 -revision=3 +version=0.6.3 +revision=1 wrksrc="SuperTux-v${version}-Source" build_style=cmake configure_args=" @@ -12,13 +12,13 @@ configure_args=" make_cmd=make hostmakedepends="pkg-config" makedepends="SDL2_image-devel boost-devel glew-devel libcurl-devel - libopenal-devel libraqm-devel physfs-devel" + libopenal-devel libraqm-devel physfs-devel glm" short_desc="Side-scrolling platform game, milestone 2" maintainer="beefcurtains " license="GPL-3.0-or-later, GPL-2.0-or-later, CC-BY-SA-3.0, CC-BY-SA-4.0, CC-BY-3.0" homepage="https://supertux.github.io/" distfiles="https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz" -checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598 +checksum=f7940e6009c40226eb34ebab8ffb0e3a894892d891a07b35d0e5762dd41c79f6 replaces="supertux2-data>=0" export CMAKE_GENERATOR="Unix Makefiles" From 64331bfcba09b5cb687067f071730c1dc88742e3 Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Wed, 16 Feb 2022 16:58:21 +0100 Subject: [PATCH 2232/2369] lowdown: update to 0.11.2. --- common/shlibs | 1 + srcpkgs/lowdown/template | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8f5670e2148..7f3e1458f7a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4169,3 +4169,4 @@ libMatrix.so root-6.24.06_1 libThread.so root-6.24.06_1 libTMVA.so root-6.24.06_1 libMathCore.so root-6.24.06_1 +liblowdown.so lowdown-0.11.2_1 diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template index c76c46601e4..3ead485924f 100644 --- a/srcpkgs/lowdown/template +++ b/srcpkgs/lowdown/template @@ -1,9 +1,10 @@ # Template file for 'lowdown' pkgname=lowdown -version=0.9.2 +version=0.11.2 revision=1 build_style=configure configure_args="PREFIX=/usr MANDIR=/usr/share/man" +make_install_target="install install_shared install_static" make_check_target="regress" hostmakedepends="which" short_desc="Simple markdown translator" @@ -12,7 +13,8 @@ license="ISC" homepage="https://kristaps.bsd.lv/lowdown/" changelog="https://kristaps.bsd.lv/lowdown/archive.html" distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz" -checksum=5c355d1db2071916b1ad6e789208de664be3781bd17dd8b6b09b1707a283a988 +checksum=6e5cfec293afc24968c0ddd8deb4f57389adba6a8b7bcb221d34c1a44aeef3eb +shlib_provides="liblowdown.so" post_install() { vlicense LICENSE.md From 73c6e2094f738d85e533cc42f9d744331166072a Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Sun, 8 May 2022 22:42:27 +0200 Subject: [PATCH 2233/2369] json-c++: update to 3.10.5. --- srcpkgs/json-c++/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template index 97f0457e88e..018ef8e1ff7 100644 --- a/srcpkgs/json-c++/template +++ b/srcpkgs/json-c++/template @@ -1,7 +1,7 @@ # Template file for 'json-c++' pkgname=json-c++ -version=3.9.1 -revision=2 +version=3.10.5 +revision=1 wrksrc="json-${version}" build_style=cmake configure_args="-DJSON_MultipleHeaders=ON" @@ -11,12 +11,12 @@ maintainer="Érico Nogueira " license="MIT" homepage="https://github.com/nlohmann/json" distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz" -checksum=4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b +checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 +# tests only work in git repository +make_check=no -if [ -z "$XBPS_CHECK_PKGS" ]; then - configure_args+=" -DBUILD_TESTING=OFF" -fi post_install() { + vdoc README.md vlicense LICENSE.MIT } From 480a086ebe8f87fcc496ab8be81a9ee188149237 Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Sun, 8 May 2022 14:26:54 +0200 Subject: [PATCH 2234/2369] nix: update to 2.8.0. --- srcpkgs/nix/template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 6e481b3760a..9afcb75a7a6 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,22 +1,28 @@ # Template file for 'nix' pkgname=nix -version=2.3.12 +version=2.8.0 revision=1 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh" -hostmakedepends="curl pkg-config flex tar xz" +hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook" makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel liblzma-devel openssl-devel libsodium-devel sqlite-devel - libseccomp-devel editline-devel" + libseccomp-devel editline-devel jq-devel libarchive-devel libcpuid-devel + gtest-devel lowdown-devel json-c++" depends="curl tar xz" short_desc="Purely functional package manager" maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="https://nixos.org/nix/" changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes" -distfiles="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz" -checksum=213a7d49c461079b32361e4d008d248d7f68e34d2cc9347f3a8ff9029f9afb5d +distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz" +checksum=91a7f2bcdde3263927d842f04a345ed77319148c700e2c8be01498724e6808c0 +disable_parallel_build=yes + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" musl-legacy-compat" +fi CXXFLAGS="-Wno-deprecated-declarations" @@ -47,13 +53,7 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then fi pre_configure() { - if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - echo "libexpr_LDFLAGS += -latomic" >> src/libexpr/local.mk - echo "libutil_LDFLAGS += -latomic" >> src/libutil/local.mk - echo "libstore_LDFLAGS += -latomic" >> src/libstore/local.mk - fi - sed -i '/^CFLAGS=/d;/^CXXFLAGS=/d' configure - echo "GLOBAL_LDFLAGS += $LDFLAGS" >>mk/lib.mk + ./bootstrap.sh } post_install() { From 0763ffbad8a4f83c6ddb3b8613157c200f660956 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 17 May 2022 11:42:47 -0400 Subject: [PATCH 2235/2369] .github/workflows/build.yaml: switch to ubuntu-latest --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 177944e1c03..c36ff666d4c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,7 +14,7 @@ jobs: # Lint changed templates. xlint: name: Lint templates - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest env: PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin' @@ -34,7 +34,7 @@ jobs: # Build changed packages. build: name: Build packages - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')" container: From 290d86ca285ec83a634b631673230def8df6e50a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 17 May 2022 12:41:17 -0400 Subject: [PATCH 2236/2369] .github/workflows/build.yaml: auto-cancel in-progress workflows --- .github/workflows/build.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c36ff666d4c..4ad0e0822ad 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,6 +10,10 @@ on: paths: - 'srcpkgs/**' +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: # Lint changed templates. xlint: From d8339127dc05e7029386c09aa2062fb88624b18e Mon Sep 17 00:00:00 2001 From: Piraty Date: Tue, 10 May 2022 00:10:27 +0200 Subject: [PATCH 2237/2369] open-vm-tools: update to 12.0.0. disable new containerinfo plugin for now, as it fails during configure when crosscompiling (AC_CHECK_FILE) and requires work on containerd template anyway. it may become a build option later add vmware-vmblock-fuse service as reported by @tranzystorek-io. Closes: #37067 --- .../files/vmware-vmblock-fuse/run | 6 +++++ .../patches/0001-recognize-Void.patch | 18 ++++++------- ...2-Fix-subdir-objects-configure-error.patch | 27 ------------------- srcpkgs/open-vm-tools/template | 21 ++++++++------- 4 files changed, 25 insertions(+), 47 deletions(-) create mode 100644 srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run delete mode 100644 srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch diff --git a/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run b/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run new file mode 100644 index 00000000000..b0a5cc121b9 --- /dev/null +++ b/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run @@ -0,0 +1,6 @@ +#!/bin/sh + +set -e + +[ -d /run/vmblock-fuse ] || mkdir -p /run/vmblock-fuse +exec vmware-vmblock-fuse -d -f -o subtype=vmware-vmblock,default_permissions,allow_other /run/vmblock-fuse diff --git a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch index 87a145a2bec..ad6d37b130a 100644 --- a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch +++ b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch @@ -11,15 +11,13 @@ #define STR_OS_YELLOW_DOG "Yellow Dog" #define STR_OS_ECOMSTATION "eComStation" -diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c -index 6ac15412..ea898e24 100644 --- a/open-vm-tools/lib/misc/hostinfoPosix.c +++ b/open-vm-tools/lib/misc/hostinfoPosix.c -@@ -1259,6 +1259,7 @@ static const ShortNameSet shortNameArray[] = { - {"united linux", STR_OS_UNITEDLINUX, HostinfoGenericSetShortName}, - {"va linux", STR_OS_VALINUX, HostinfoGenericSetShortName}, - {"vmware photon", STR_OS_PHOTON, HostinfoGenericSetShortName}, -+{"void", STR_OS_VOID, HostinfoGenericSetShortName}, - {"yellow dog", STR_OS_YELLOW_DOG, HostinfoGenericSetShortName}, - {NULL, NULL, NULL} // MUST BE LAST - }; +@@ -1288,6 +1288,7 @@ + { "ubuntu", STR_OS_UBUNTU, HostinfoGenericSetShortName }, + { "ultra penguin", STR_OS_ULTRAPENGUIN, HostinfoGenericSetShortName }, + { "united linux", STR_OS_UNITEDLINUX, HostinfoGenericSetShortName }, ++{ "void linux", STR_OS_VOID, HostinfoGenericSetShortName }, + { "va linux", STR_OS_VALINUX, HostinfoGenericSetShortName }, + { "vmware photon", STR_OS_PHOTON, HostinfoGenericSetShortName }, + { "yellow dog", STR_OS_YELLOW_DOG, HostinfoGenericSetShortName }, diff --git a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch b/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch deleted file mode 100644 index 775a78d303e..00000000000 --- a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch +++ /dev/null @@ -1,27 +0,0 @@ -#src: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/open-vm-tools/open-vm-tools?id=6642ae94227f7c3c91c1a58f00f99aeb9eb2393f -#upstream: no - -From cf1284fda8fb22a2b27cb2ce7962f166166e74c3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 13 Jun 2018 23:48:04 -0700 -Subject: [PATCH] Fix subdir objects configure error - -Fix build on musl while here - -Signed-off-by: Khem Raj ---- - open-vm-tools/configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 71e684bb..b76a7966 100644 ---- a/open-vm-tools/configure.ac -+++ b/open-vm-tools/configure.ac -@@ -303,6 +303,7 @@ AC_ARG_ENABLE( - [], - [enable_resolutionkms="auto"]) - -+AM_INIT_AUTOMAKE([subdir-objects]) - AM_INIT_AUTOMAKE - - ### diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template index 27fcfbbb0b6..fb05a6a9a65 100644 --- a/srcpkgs/open-vm-tools/template +++ b/srcpkgs/open-vm-tools/template @@ -1,25 +1,25 @@ # Template file for 'open-vm-tools' pkgname=open-vm-tools -version=11.3.0 +version=12.0.0 revision=1 archs="x86_64* i686* aarch64*" wrksrc="open-vm-tools-stable-${version}" build_wrksrc="open-vm-tools" build_style=gnu-configure configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d - --without-xmlsecurity --without-kernel-modules + --without-xmlsecurity --without-kernel-modules --disable-containerinfo $(vopt_with x11 x) $(vopt_with pam)" hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto" makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel') - $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')" + $(vopt_if x11 'gdk-pixbuf-xlib-devel gtkmm-devel libXtst-devel xmlsec1-devel')" short_desc="Open source implementation of VMware Tools" maintainer="Piraty " license="GPL-2.0-only, LGPL-2.1-only" homepage="https://github.com/vmware/open-vm-tools" changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog" distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz" -checksum=588f1b6252c36bc55581aa3451a47880290f38ef46aad493710bcf4ce3c7635e +checksum=244d224dc503f2c9350899a61fef418f23dc0520e8e30dce10863ea2dc81f047 build_options="pam x11" build_options_default="pam x11" @@ -33,16 +33,17 @@ pre_configure() { } post_install() { - # Get rid of unwanted symlinks - rm ${DESTDIR}/sbin/mount.vmhgfs - rm -r ${DESTDIR}/sbin - # If X11 enabled, copy extra files if [ "$build_option_x11" ]; then vmkdir /etc/xdg/autostart vinstall vmware-user-suid-wrapper/vmware-user.desktop 0644 /etc/xdg/autostart/ vbin scripts/common/vmware-xdg-detect-de - chmod 07755 ${DESTDIR}/usr/bin/vmware-user-suid-wrapper + chmod 4755 "${DESTDIR}/usr/bin/vmware-user-suid-wrapper" fi - # Install service + + if [ ! "$build_option_pam" ]; then + rm -rf "${DESTDIR}/etc/pam.d/vmtoolsd" + fi + vsv vmtoolsd + vsv vmware-vmblock-fuse } From 9608411dbb4c46516b57d59389a81580a2280b94 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 14 May 2022 09:26:27 -0400 Subject: [PATCH 2238/2369] python3-pytest: update to 7.1.2. --- .../patches/man-remove-sphinx-deps.patch | 17 +++++++++++--- srcpkgs/python3-pytest/template | 22 +++++++++---------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch b/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch index f3345d6e0a3..3a3bea50b9a 100644 --- a/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch +++ b/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch @@ -1,7 +1,8 @@ -we don't need all the dependencies for generating the manpage, avoids needing 4 new packages +Avoid adding four new packages that aren't necessary for the manual page, +and fix the path to the manual source to allow it to be generated. --- a/doc/en/conf.py +++ b/doc/en/conf.py -@@ -45,15 +45,11 @@ +@@ -65,16 +65,12 @@ # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = [ @@ -9,6 +10,7 @@ we don't need all the dependencies for generating the manpage, avoids needing 4 - "pygments_pytest", "sphinx.ext.autodoc", "sphinx.ext.autosummary", + "sphinx.ext.extlinks", "sphinx.ext.intersphinx", "sphinx.ext.todo", "sphinx.ext.viewcode", @@ -16,4 +18,13 @@ we don't need all the dependencies for generating the manpage, avoids needing 4 - "sphinxcontrib_trio", ] - # Add any paths that contain templates here, relative to this directory. + # Building PDF docs on readthedocs requires inkscape for svg to pdf +@@ -316,7 +320,7 @@ + + # One entry per manual page. List of tuples + # (source start file, name, description, authors, manual section). +-man_pages = [("usage", "pytest", "pytest usage", ["holger krekel at merlinux eu"], 1)] ++man_pages = [("how-to/usage", "pytest", "pytest usage", ["holger krekel at merlinux eu"], 1)] + + + # -- Options for Epub output --------------------------------------------------- diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template index 8c907f54b14..f0bf2feddb3 100644 --- a/srcpkgs/python3-pytest/template +++ b/srcpkgs/python3-pytest/template @@ -1,12 +1,12 @@ # Template file for 'python3-pytest' pkgname=python3-pytest -version=6.2.5 -revision=3 +version=7.1.2 +revision=1 wrksrc="pytest-${version}" build_style=python3-module -hostmakedepends="python3-setuptools_scm python3-Sphinx" -depends="python3-py python3-packaging python3-attrs python3-pluggy - python3-iniconfig python3-toml python3-setuptools" +_common_deps="python3-attrs python3-iniconfig python3-py python3-pluggy" +hostmakedepends="python3-setuptools_scm python3-wheel python3-Sphinx ${_common_deps}" +depends="python3-packaging python3-tomli ${_common_deps}" checkdepends="$depends python3-argcomplete python3-hypothesis python3-mock python3-nose python3-requests python3-parsing python3-xmlschema" short_desc="Simple powerful testing with Python 3" @@ -15,7 +15,7 @@ license="MIT" homepage="https://docs.pytest.org/en/latest/" changelog="https://docs.pytest.org/en/latest/changelog.html" distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz" -checksum=131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89 +checksum=a06a0425453864a270bc45e71f783330a7428defb4230fb5e6a731fde06ecd45 alternatives=" pytest:pytest:/usr/bin/pytest3 pytest:py.test:/usr/bin/py.test3" @@ -26,16 +26,16 @@ post_patch() { rm testing/test_entry_points.py } -do_check() { - PYTHONPATH=$(pwd)/build/lib python3 -m pytest \ - -k 'not test_color_yes and not test_code_highlight' -} - post_build() { PYTHONPATH=$(pwd)/build/lib/ make -C doc/en man vman doc/en/_build/man/pytest.1 } +do_check() { + PYTHONPATH="${PWD}/build/lib" python3 -m pytest \ + -k 'not test_color_yes and not test_code_highlight' +} + post_install() { mv ${DESTDIR}/usr/bin/pytest ${DESTDIR}/usr/bin/pytest3 mv ${DESTDIR}/usr/bin/py.test ${DESTDIR}/usr/bin/py.test3 From 6b1660fd7593345569213214a1337fdf2dadfd51 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 14 May 2022 09:32:37 -0400 Subject: [PATCH 2239/2369] python3-pytest-httpbin: update to 1.0.2. --- srcpkgs/python3-pytest-httpbin/template | 10 ++++++++-- srcpkgs/python3-pytest-httpbin/update | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/python3-pytest-httpbin/update diff --git a/srcpkgs/python3-pytest-httpbin/template b/srcpkgs/python3-pytest-httpbin/template index 7521d9bae52..b9cc464dae0 100644 --- a/srcpkgs/python3-pytest-httpbin/template +++ b/srcpkgs/python3-pytest-httpbin/template @@ -1,6 +1,6 @@ # Template file for 'python3-pytest-httpbin' pkgname=python3-pytest-httpbin -version=1.0.1 +version=1.0.2 revision=1 wrksrc="pytest-httpbin-${version}" build_style=python3-module @@ -11,5 +11,11 @@ maintainer="Michal Vasilek " license="MIT" homepage="https://github.com/kevin1024/pytest-httpbin" distfiles="${PYPI_SITE}/p/pytest-httpbin/pytest-httpbin-${version}.tar.gz" -checksum=9f73320f97d33cc20bc8a08cb945372948de51402559e87e74e92c56b48da0d7 +checksum=52c9d3f75f8f43f1488b5a0be321eeca3cc5f0fae0c85445ece66bd53c95fe0e make_check=no # cycle: needs python3-requests which has this package in checkdepends + +post_install() { + # Extract license from README + sed -ne '/^## License/,$ p' README.md > LICENSE + vlicense LICENSE +} diff --git a/srcpkgs/python3-pytest-httpbin/update b/srcpkgs/python3-pytest-httpbin/update new file mode 100644 index 00000000000..e299d00ea67 --- /dev/null +++ b/srcpkgs/python3-pytest-httpbin/update @@ -0,0 +1 @@ +ignore="*rc*" From bf3cc537f728b298298314bdb42c48977f6b1ec1 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 14 May 2022 09:33:07 -0400 Subject: [PATCH 2240/2369] python3-pytest-flake8: update to 1.1.1. --- srcpkgs/python3-pytest-flake8/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pytest-flake8/template b/srcpkgs/python3-pytest-flake8/template index e5d81277ac9..4dc49b26c25 100644 --- a/srcpkgs/python3-pytest-flake8/template +++ b/srcpkgs/python3-pytest-flake8/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-flake8' pkgname=python3-pytest-flake8 -version=1.0.7 -revision=2 +version=1.1.1 +revision=1 wrksrc=pytest-flake8-${version} build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,7 +13,7 @@ license="BSD-3-Clause" homepage="https://pypi.org/project/pytest-flake8/" changelog="https://raw.githubusercontent.com/tholo/pytest-flake8/master/CHANGELOG" distfiles="${PYPI_SITE}/p/pytest-flake8/pytest-flake8-${version}.tar.gz" -checksum=f0259761a903563f33d6f099914afef339c085085e643bee8343eb323b32dd6b +checksum=ba4f243de3cb4c2486ed9e70752c80dd4b636f7ccb27d4eba763c35ed0cd316e post_install() { vlicense LICENSE From 489ef18b5215ba29b456a46c8827efe6b6138608 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 14 May 2022 09:33:25 -0400 Subject: [PATCH 2241/2369] python3-pytest-cov: update to 3.0.0. --- srcpkgs/python3-pytest-cov/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pytest-cov/template b/srcpkgs/python3-pytest-cov/template index fcf45557bbf..a1f03a67012 100644 --- a/srcpkgs/python3-pytest-cov/template +++ b/srcpkgs/python3-pytest-cov/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-cov' pkgname=python3-pytest-cov -version=2.12.1 -revision=2 +version=3.0.0 +revision=1 wrksrc="pytest-cov-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -14,7 +14,7 @@ license="MIT" homepage="https://pytest-cov.readthedocs.io/en/latest/" changelog="https://raw.githubusercontent.com/pytest-dev/pytest-cov/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/p/pytest-cov/pytest-cov-${version}.tar.gz" -checksum=261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7 +checksum=e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470 make_check=no # requires unpackaged xdist, fields, process_tests post_install() { From 32898211711643ef874bb3e21ed6db21c4e5bf79 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 14 May 2022 11:09:06 -0400 Subject: [PATCH 2242/2369] python3-pytest-httpserver: update to 1.0.4. --- srcpkgs/python3-pytest-httpserver/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template index d3742bf696d..8238f5d82c8 100644 --- a/srcpkgs/python3-pytest-httpserver/template +++ b/srcpkgs/python3-pytest-httpserver/template @@ -1,10 +1,10 @@ # Template file for 'python3-pytest-httpserver' pkgname=python3-pytest-httpserver -version=1.0.2 +version=1.0.4 revision=1 wrksrc=pytest-httpserver-${version} -build_style=python3-module -hostmakedepends="python3-setuptools" +build_style=python3-pep517 +hostmakedepends="python3-poetry-core" depends="python3-pytest python3-Werkzeug" short_desc="HTTP server for pytest" maintainer="mobinmob " @@ -12,7 +12,7 @@ license="MIT" homepage="https://www.github.com/csernazs/pytest-httpserver" changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst" distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz" -checksum=4917bf3a70ae34816ad34b42039e020d9c0da37349e1cc562fb534799dcf202d +checksum=164ec7aa21b776d441bdb2fddb85b92a8a0a0cd7ad5d1d5210430d23b2624a4d post_install() { vlicense LICENSE From 567f0c60cc8826e1d2e4fbafdba052a0469f4074 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 14 May 2022 11:09:29 -0400 Subject: [PATCH 2243/2369] python3-pytest-subtests: update to 0.7.0. --- srcpkgs/python3-pytest-subtests/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pytest-subtests/template b/srcpkgs/python3-pytest-subtests/template index a743f0264f9..2589e678c0c 100644 --- a/srcpkgs/python3-pytest-subtests/template +++ b/srcpkgs/python3-pytest-subtests/template @@ -1,6 +1,6 @@ # Template file for 'python3-pytest-subtests' pkgname=python3-pytest-subtests -version=0.6.0 +version=0.7.0 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="MIT" homepage="https://github.com/pytest-dev/pytest-subtests" distfiles="${PYPI_SITE}/p/pytest-subtests/pytest-subtests-${version}.tar.gz" -checksum=3ebd306a8dcf75133f1742f288c82f36426ebcf8a132d4ee89782d20e84fc13a +checksum=95c44c77e3fbede9848bb88ca90b384815fcba8090ef9a9f55659ab163b1681c post_install() { vlicense LICENSE From 7aab6d01d3def30899246efae91460e8c05fc4bc Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 14 May 2022 11:32:52 -0400 Subject: [PATCH 2244/2369] python3-pytest-asyncio: update to 0.18.3. --- srcpkgs/python3-pytest-asyncio/template | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template index 8c1dbdaf20c..850b48bc683 100644 --- a/srcpkgs/python3-pytest-asyncio/template +++ b/srcpkgs/python3-pytest-asyncio/template @@ -1,14 +1,23 @@ # Template file for 'python3-pytest-asyncio' pkgname=python3-pytest-asyncio -version=0.14.0 -revision=2 +version=0.18.3 +revision=1 wrksrc="pytest-asyncio-${version}" build_style=python3-module -hostmakedepends="python3-setuptools" +hostmakedepends="python3-setuptools_scm" depends="python3-pytest" +checkdepends="$depends python3-hypothesis" short_desc="Pytest support for asyncio" maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/pytest-dev/pytest-asyncio" distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest-asyncio-${version}.tar.gz" -checksum=9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700 +checksum=7659bdb0a9eb9c6e3ef992eef11a2b3e69697800ad02fb06374a210d85b29f91 + +do_check() { + local skiptests="test_auto_mode_cmdline or \ + test_strict_mode_ignores_trio_fixtures or \ + test_unused_port_fixture or test_unused_port_factory_fixture" + + PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest -k "not (${skiptests})" +} From d57ba17b9825862fb3ac9da36217b2fde2b570b6 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 14 May 2022 11:34:22 -0400 Subject: [PATCH 2245/2369] python3-pytest-mock: update to 3.7.0. --- srcpkgs/python3-pytest-mock/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template index 56d4cda8dc3..3cbfc61e835 100644 --- a/srcpkgs/python3-pytest-mock/template +++ b/srcpkgs/python3-pytest-mock/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-mock' pkgname=python3-pytest-mock -version=3.5.1 -revision=2 +version=3.7.0 +revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/pytest-dev/pytest-mock/" distfiles="${PYPI_SITE}/p/pytest-mock/pytest-mock-${version}.tar.gz" -checksum=a1e2aba6af9560d313c642dae7e00a2a12b022b80301d9d7fc8ec6858e1dd9fc +checksum=5112bd92cc9f186ee96e1a92efc84969ea494939c3aead39c50f421c4cc69534 # pytest-mock requires pytest-mock to be installed so it'll always fail during # packaging From 8d51c52304e24114e29b3dd3481ba2723b322160 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 14 May 2022 14:23:28 -0400 Subject: [PATCH 2246/2369] python3-pytest-fixture-config: update to 1.7.0. --- .../patches/no_setuptools_git.patch | 11 +++++++++++ srcpkgs/python3-pytest-fixture-config/template | 14 ++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch diff --git a/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch b/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch new file mode 100644 index 00000000000..f3455685738 --- /dev/null +++ b/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch @@ -0,0 +1,11 @@ +Void doesn't package setuptools-git, and there's no need to start now. + +--- a/common_setup.py ++++ b/common_setup.py +@@ -72,6 +72,5 @@ + license='MIT license', + platforms=['unix', 'linux'], + cmdclass={'test': PyTest, 'egg_info': EggInfo}, +- setup_requires=['setuptools-git'], + include_package_data=True + ) diff --git a/srcpkgs/python3-pytest-fixture-config/template b/srcpkgs/python3-pytest-fixture-config/template index 3c22c9f0fb4..73f654bd6d3 100644 --- a/srcpkgs/python3-pytest-fixture-config/template +++ b/srcpkgs/python3-pytest-fixture-config/template @@ -1,26 +1,20 @@ # Template file for 'python3-pytest-fixture-config' pkgname=python3-pytest-fixture-config _pkgname=${pkgname#*-} -version=1.3.0 -revision=6 +version=1.7.0 +revision=1 wrksrc="${_pkgname}-${version}" build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pytest" -checkdepends="python3-pytest" +checkdepends="python3-six $depends" short_desc="Fixture configuration utils for py.test (Python3)" maintainer="Orphaned " license="MIT" homepage="https://github.com/manahl/pytest-plugins" distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz" -checksum=1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08 +checksum=41a17417721f6862ce6b40e3280fddd8e1659b2c306ec46b237d7021fec5218e -pre_build() { - sed -i '/setup_requires/d' common_setup.py -} -do_check() { - python3 setup.py test -} post_install() { vlicense LICENSE } From 619257bf84f308ead5da26ed67a677166484354b Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 14 May 2022 14:25:19 -0400 Subject: [PATCH 2247/2369] python3-pytest-timeout: update to 2.1.0. --- srcpkgs/python3-pytest-timeout/template | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/srcpkgs/python3-pytest-timeout/template b/srcpkgs/python3-pytest-timeout/template index a3ebcf843ff..450c90447f8 100644 --- a/srcpkgs/python3-pytest-timeout/template +++ b/srcpkgs/python3-pytest-timeout/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-timeout' pkgname=python3-pytest-timeout -version=1.4.2 -revision=2 +version=2.1.0 +revision=1 wrksrc="pytest-timeout-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,14 +12,10 @@ maintainer="Tim Sandquist " license="MIT" homepage="https://github.com/pytest-dev/pytest-timeout/" distfiles="${PYPI_SITE}/p/pytest-timeout/pytest-timeout-${version}.tar.gz" -checksum=20b3113cf6e4e80ce2d403b6fb56e9e1b871b510259206d40ff8d609f48bda76 +checksum=c07ca07404c612f8abbe22294b23c368e2e5104b521c1790195561f37e1ac3d9 +# Tests require package to be installed +make_check=no post_install() { vlicense LICENSE } - -# adding do_check since the tests depend on this package -do_check() { - python setup.py install - pytest -} From 0111dd5ec509dba3862dc454f3e631d91a848c65 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 14 May 2022 14:41:23 -0400 Subject: [PATCH 2248/2369] python3-pytest-aiohttp: update to 1.0.4. --- srcpkgs/python3-pytest-aiohttp/template | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-pytest-aiohttp/template b/srcpkgs/python3-pytest-aiohttp/template index 0d88edc7edc..3ea362b3e30 100644 --- a/srcpkgs/python3-pytest-aiohttp/template +++ b/srcpkgs/python3-pytest-aiohttp/template @@ -1,15 +1,17 @@ # Template file for 'python3-pytest-aiohttp' pkgname=python3-pytest-aiohttp -version=0.3.0 -revision=2 +version=1.0.4 +revision=1 wrksrc="pytest-aiohttp-${version}" build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-pytest" +hostmakedepends="python3-setuptools_scm python3-wheel" +depends="python3-pytest python3-aiohttp python3-pytest-asyncio" +checkdepends="$depends" short_desc="Pytest plugin for aiohttp support" maintainer="Tim Sandquist " license="Apache-2.0" homepage="https://github.com/aio-libs/pytest-aiohttp/" distfiles="${PYPI_SITE}/p/pytest-aiohttp/pytest-aiohttp-${version}.tar.gz" -checksum=c929854339637977375838703b62fef63528598bc0a9d451639eba95f4aaa44f -make_check=no # No tests available +checksum=39ff3a0d15484c01d1436cbedad575c6eafbf0f57cdf76fb94994c97b5b8c5a4 +# Tests require package be installed (but they succeed in that case) +make_check=no From daac1e0248c421e1acc880168637c8857951a8dd Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 14 May 2022 14:44:29 -0400 Subject: [PATCH 2249/2369] python3-hypercorn: fix tests --- srcpkgs/python3-hypercorn/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template index 137b2c74a72..2133a767d49 100644 --- a/srcpkgs/python3-hypercorn/template +++ b/srcpkgs/python3-hypercorn/template @@ -8,7 +8,7 @@ make_install_target="Hypercorn-${version}-*-*-*.whl" hostmakedepends="python3-poetry-core" depends="python3-h11 python3-h2 python3-priority python3-toml python3-typing_extensions python3-wsproto" -checkdepends="python3-pytest-asyncio $depends" +checkdepends="python3-pytest-asyncio python3-tomli $depends" short_desc="Python ASGI server based on hyper and inspired by gunicorn" maintainer="Andrew J. Hesford " license="MIT" From 64ddb074e99ab83a3207354e9e4cfc50ef321521 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 17 May 2022 09:59:13 -0500 Subject: [PATCH 2250/2369] jc: update to 1.19.0. --- srcpkgs/jc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template index 24a52a65f65..e6716a3d016 100644 --- a/srcpkgs/jc/template +++ b/srcpkgs/jc/template @@ -1,6 +1,6 @@ # Template file for 'jc' pkgname=jc -version=1.18.8 +version=1.19.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,4 +11,4 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/kellyjonbrazil/jc" distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" -checksum=a2cb40099cec38961477fbbbe14a8c3f41c9d3998e4cc402d9ae3d21171ff924 +checksum=2ab2c467191af4f1c1c56264430619e05b772caa8396a13740f7d82d232d532c From 06619a98d3e9c0f29e94ba4a4725cb2d8e8977a9 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 17 May 2022 10:02:22 -0500 Subject: [PATCH 2251/2369] pcsclite: update to 1.9.7. --- srcpkgs/pcsclite/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template index 263094827b9..84fdc8d85dd 100644 --- a/srcpkgs/pcsclite/template +++ b/srcpkgs/pcsclite/template @@ -1,11 +1,11 @@ # Template file for 'pcsclite' pkgname=pcsclite -version=1.9.5 +version=1.9.7 revision=1 wrksrc="pcsc-lite-upstream-${version}" build_style=gnu-configure configure_args="--enable-libudev --disable-libsystemd" -hostmakedepends="intltool pkg-config python3" +hostmakedepends="intltool pkg-config python3 flex" makedepends="eudev-libudev-devel libusb-devel python3-devel" depends="python3" short_desc="Middleware to access a smart card using SCard API (PC/SC)" @@ -13,7 +13,7 @@ maintainer="Andrew Benson " license="BSD-2-Clause, GPL-3.0-or-later" homepage="https://salsa.debian.org/debian/pcsc-lite" distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz" -checksum=cbd7ca9cd6323e0e8d0d99c89a1429b9392809c16d607d9180e37d9474321b0f +checksum=902ab0b3d8de6fd477ad6c130dc7d315daacf9a14fffbb4380d356e10e6cfe35 post_install() { vsv pcscd From 7373da859867fd8f79f5d7c67e2fc819e3dbc20d Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 17 May 2022 10:06:55 -0500 Subject: [PATCH 2252/2369] delta: update to 0.13.0. --- srcpkgs/delta/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template index dd9809f3f7e..c2b99cff7dc 100644 --- a/srcpkgs/delta/template +++ b/srcpkgs/delta/template @@ -1,6 +1,6 @@ # Template file for 'delta' pkgname=delta -version=0.12.1 +version=0.13.0 revision=1 build_style=cargo checkdepends="git" @@ -9,7 +9,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/dandavison/delta" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=1b97998841305909638008bd9fa3fca597907cb23830046fd2e610632cdabba3 +checksum=5a0ba70a094a7884beb6f1efd4d155861e4b3e3584c452cabbce1607f8eb0f30 post_patch() { # fixes an indexmap error when cross compiling From c8086f1fd96efdf8aa223e4ff6188e29439227ee Mon Sep 17 00:00:00 2001 From: runrin Date: Wed, 2 Mar 2022 19:25:59 -0800 Subject: [PATCH 2253/2369] New package: xorg-docs-1.7.1 Closes: #35938 [via git-merge-pr] --- srcpkgs/xorg-docs/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/xorg-docs/template diff --git a/srcpkgs/xorg-docs/template b/srcpkgs/xorg-docs/template new file mode 100644 index 00000000000..44e9b3c42e5 --- /dev/null +++ b/srcpkgs/xorg-docs/template @@ -0,0 +1,15 @@ +# Template file for 'xorg-docs' +pkgname=xorg-docs +version=1.7.1 +revision=1 +build_style=gnu-configure +short_desc="Misc docs for the X Window System that don't fit into other packages" +maintainer="runrin " +license="MIT, BSD-3-Clause" +homepage="www.x.org" +distfiles="${XORG_SITE}/doc/${pkgname}-${version}.tar.bz2" +checksum=24b8677c3462c10465cf50d40576d76682acd5835526093a575865b2aa242c4b + +post_install() { + vlicense general/License.xml +} From 646fb65b1cc6d7916a20a5ae74a69f9dcf3186a2 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Sun, 24 Apr 2022 10:39:19 +0200 Subject: [PATCH 2254/2369] New package: skanpage-22.04.1 --- srcpkgs/skanpage/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/skanpage/template diff --git a/srcpkgs/skanpage/template b/srcpkgs/skanpage/template new file mode 100644 index 00000000000..0d54fc871fd --- /dev/null +++ b/srcpkgs/skanpage/template @@ -0,0 +1,15 @@ +# Template file for 'skanpage' +pkgname=skanpage +version=22.04.1 +revision=1 +build_style=cmake +hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons" +makedepends="qt5-devel libksane-devel kcoreaddons-devel ki18n-devel kirigami2-devel kcrash-devel kconfig-devel purpose-devel" +depends="kirigami2>=5.26.0 qt5-quickcontrols2" +short_desc="Multi-page scanning application" +maintainer="Enrico Belleri " +license="GPL-2.0-or-later" +homepage="https://apps.kde.org/skanpage" +changelog="https://kde.org/announcements/changelogs/gear/${version}/#skanpage" +distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" +checksum=3032c39dff68fae0ed2057e336ca9e9c10eafffbffe561ae9b5566850a1c7cf0 From d0a3da2ad5cd8fdb9608b3391824d9c9207e021f Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Wed, 18 May 2022 09:10:43 +0200 Subject: [PATCH 2255/2369] falkon: update to 22.04.1. --- .../falkon/patches/verticaltabsplugin-qfile.patch | 10 ---------- srcpkgs/falkon/template | 15 +++++++++++---- 2 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/falkon/patches/verticaltabsplugin-qfile.patch diff --git a/srcpkgs/falkon/patches/verticaltabsplugin-qfile.patch b/srcpkgs/falkon/patches/verticaltabsplugin-qfile.patch deleted file mode 100644 index 6b4d2813d48..00000000000 --- a/srcpkgs/falkon/patches/verticaltabsplugin-qfile.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp 2019-03-19 19:06:45.000000000 +0100 -+++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp 2020-04-04 16:13:30.073076918 +0200 -@@ -30,6 +30,7 @@ - #include "../config.h" - #include "desktopfile.h" - -+#include - #include - - VerticalTabsPlugin::VerticalTabsPlugin() diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template index 608d85cbc9a..8a83798c69b 100644 --- a/srcpkgs/falkon/template +++ b/srcpkgs/falkon/template @@ -1,6 +1,6 @@ # Template file for 'falkon' pkgname=falkon -version=3.2.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext pkg-config @@ -10,15 +10,22 @@ makedepends="qt5-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-webengine-devel qt5-location-devel qt5-x11extras-devel qt5-tools-devel $(vopt_if kde 'kwallet-devel kio-devel purpose-devel' 'ki18n-devel xcb-util-devel')" depends="qt5-plugin-sqlite" +checkdepends="dbus" short_desc="Cross-platform Qt Web Browser" maintainer="Helmut Pozimski " license="GPL-3.0-or-later" -homepage="https://github.com/KDE/falkon" -distfiles="${KDE_SITE}/falkon/${version}/falkon-${version}.tar.xz" -checksum=f4ff925b7572b6e035424face86d05ca2df66723061bc57f2b1615c2c09012aa +homepage="https://www.falkon.org" +distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" +checksum=7499780c449e5a0decf96b9f8faa78b6cb5d9a95f74f12cb944e240bc21dc224 LDFLAGS="-Wl,--no-fatal-warnings" build_options="kde" desc_option_kde="KDE integration" build_options_default="kde" + +do_check() { + cd build + # Exclude tests which fail with SIGTRAP + dbus-run-session ctest -E "falkon-(webview|webtab|tabmodel|qml-qml(historyapi|cookiesapi|tabsapi|windowsapi))test" --output-on-failure --force-new-ctest-process +} From 40a00a7263d0701da225515d01788e1224fa7c69 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Wed, 18 May 2022 00:36:56 +0200 Subject: [PATCH 2256/2369] kalendar: update to 22.04.1. --- srcpkgs/kalendar/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kalendar/template b/srcpkgs/kalendar/template index 6ab59681780..ee5bba90777 100644 --- a/srcpkgs/kalendar/template +++ b/srcpkgs/kalendar/template @@ -1,6 +1,6 @@ # Template file for 'kalendar' pkgname=kalendar -version=1.0.0 +version=22.04.1 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake @@ -11,14 +11,14 @@ makedepends="qt5-devel qt5-declarative-devel qt5-quickcontrols2-devel kcontacts-devel kitemmodels-devel kxmlgui-devel knotifications-devel kiconthemes-devel kservice-devel akonadi5-devel akonadi-contacts-devel calendarsupport-devel eventviews-devel qqc2-desktop-style-devel kio-devel" -depends="qqc2-desktop-style kdepim-runtime qt5-location kirigami2" +depends="qqc2-desktop-style kdepim-runtime qt5-location kirigami2>=5.26.0" checkdepends="dbus kdepim-runtime" short_desc="Calendar application using Akonadi" maintainer="Michal Vasilek " license="GPL-3.0-or-later" homepage="https://invent.kde.org/pim/kalendar" -distfiles="${KDE_SITE}/kalendar/kalendar-${version}.tar.xz" -checksum=ca4e840dc17a4e39111f5fb16bfcab29e34a10b9c840d22b81c52890f0c9fae0 +distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" +checksum=56436e5e66b2e9d58d49ae7307fe166f2d9821465fb3574bead90962a3b161ee do_check() { cd build From 43bb1990c348bd1d8177714ff054f2d415ff0354 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 17 May 2022 13:03:40 +0200 Subject: [PATCH 2257/2369] pysolfc: update to 2.16.0. --- srcpkgs/pysolfc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pysolfc/template b/srcpkgs/pysolfc/template index 83b617b3714..f8d619cb838 100644 --- a/srcpkgs/pysolfc/template +++ b/srcpkgs/pysolfc/template @@ -1,6 +1,6 @@ # Template file for 'pysolfc' pkgname=pysolfc -version=2.14.1 +version=2.16.0 revision=1 wrksrc="PySolFC-${pkgname}-${version}" build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="http://pysolfc.sourceforge.net/" distfiles="https://github.com/shlomif/PySolFC/archive/${pkgname}-${version}.tar.gz" -checksum=7b517baeb9e84c710e60a72e2706e64c7e4b796b9b0ab018b3899b9b03c19766 +checksum=ae34d9ac089bb7ac99209a81bd987180b6f756f25132765a56d3bd6debdb7a44 post_build() { make mo rules From ca26668faa11a316fb9a90bb8f11cb6c0cc4a83f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 17 May 2022 13:07:26 +0200 Subject: [PATCH 2258/2369] babashka: update to 0.8.2. --- srcpkgs/babashka/template | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template index a8fbeff23b0..bf7ae12d591 100644 --- a/srcpkgs/babashka/template +++ b/srcpkgs/babashka/template @@ -1,6 +1,6 @@ # Template file for 'babashka' pkgname=babashka -version=0.8.1 +version=0.8.2 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=2af989d0eb80741b026fd2355442033b05a3b181 +_sci_commit=972f8d55f59102607908f1f1ab30e598bddaa67e _babashka_curl_commit=8a27e6060a739c7580cc89ba2bfddf48881e7178 -_babashka_nrepl_commit=d3fce67198b042707f01d841c032f841cc57ab7f +_babashka_nrepl_commit=156ef6bfa59ba4a14ba6c69d1681fd7c2988a36d _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712 -_process_commit=1eebafc696e9bac7538c296d5a7c1fde977ad523 -_pods_commit=e075b13bfe3666a73f82c12817bdf5f1d6c692e3 -_deps_clj_commit=c948c2f5c1e240c0e0ea4201877695f729ee309e -_fs_commit=dc73460e63ff10c701c353227f2689b3d7c33a43 +_process_commit=59bff35cb6f4609f772dd932207ddd031c88559c +_pods_commit=c2d6ba847c53b1f6b7986b166a8a4d7dda97db83 +_deps_clj_commit=bac835661adbcd06b07ce2c408bb3e4911a48c28 +_fs_commit=98b48d4671cd75dd4dd70d72c2cc03b21e2e8132 _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="e7084426aa86f79684e66b1ee112da26f2b9e05b259d7d19acbb1a7c8d380338 - 0d8c40688df17c3441a1a6c1005dc11538ed841fc74fa12396d6057fdf88a5e2 +checksum="905cc1cd03204e40c4328bffe70193eea1158c314d7ce377646cc17538092bd4 + c97919f3f03903ff250b4fc40bd1d66c348bdb068cdf8dd183ca1afcb6a2a8fd d8e57bc67f237a5cfea90a6c38f9e303c1591250624087e348600af72e8910fa - b56a06bf113bcd85084d48f595541447014308860d9c45efcde5b02e859c934c + b2880431f2c9aeed1af280d25fa65e91eddb540c6bac3ef478b1a8d62c4bb87a 9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b - 09ea197a0381a1f5be268da5c1470646bef01eef85add16541e32e0bb2da5d1f - 4aca4c1e15576309f33352bbed9dd9e7f0af5eca9f725dd8593ae1cb32cae8c3 - af8a90dba22d980e536a901b833ccf38816c8944b72b32c10d3134869eced4e2 - af930f686933ef74b0d857abb0f763d6fe0d5b0452a4c13e5b10207288feae86 + 0b28750b998bcc38b2f8a81933ea5a04d8fb9ffc63531b538a7a42d5986e5486 + 17fd2b3d497a0d4e83ba40fba00b215bbe54b9c23c3d75243db15e7c44b1ca11 + 35e9e4ef7d391f99defce2def8e122cb84bd8abbd0ee20910a81046222366f38 + 0c06f555b53c0b61af528a1c0a309e329e01327c0536518d2aaaf19b0f24f23d bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709" nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio" From 051b43612e7cbd59ee9adc801ccb40ce6c4ced25 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 18 May 2022 15:42:10 +0200 Subject: [PATCH 2259/2369] stress-ng: update to 0.14.01. --- srcpkgs/stress-ng/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template index 986b096bf1c..9e77372a180 100644 --- a/srcpkgs/stress-ng/template +++ b/srcpkgs/stress-ng/template @@ -1,6 +1,6 @@ # Template file for 'stress-ng' pkgname=stress-ng -version=0.14.00 +version=0.14.01 revision=1 build_style=gnu-makefile make_use_env=1 @@ -9,4 +9,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/ColinIanKing/stress-ng/" distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz" -checksum=d0cc53073e0c2499e15044fbd5a0df0176521575ea13fba01f67834b9e07d19d +checksum=cd4795166867eb4dba7cc11f246660d444b414afdb4033401ef5545a8e00776e From 63ef07383909e3e75499bfa2d8caa56ec570d591 Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Mon, 16 May 2022 09:58:40 +0200 Subject: [PATCH 2260/2369] New package: qtxdg-tools-3.9.1 --- srcpkgs/qtxdg-tools-devel | 1 + srcpkgs/qtxdg-tools/template | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 120000 srcpkgs/qtxdg-tools-devel create mode 100644 srcpkgs/qtxdg-tools/template diff --git a/srcpkgs/qtxdg-tools-devel b/srcpkgs/qtxdg-tools-devel new file mode 120000 index 00000000000..66307f33bcd --- /dev/null +++ b/srcpkgs/qtxdg-tools-devel @@ -0,0 +1 @@ +qtxdg-tools \ No newline at end of file diff --git a/srcpkgs/qtxdg-tools/template b/srcpkgs/qtxdg-tools/template new file mode 100644 index 00000000000..bb1e7422dc4 --- /dev/null +++ b/srcpkgs/qtxdg-tools/template @@ -0,0 +1,22 @@ +# Template file for 'qtxdg-tools' +pkgname=qtxdg-tools +version=3.9.1 +revision=1 +build_style=cmake +hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools" +makedepends="libqtxdg-devel" +short_desc="User tools for libqtxg" +maintainer="Enrico Belleri " +license="LGPL-2.1-or-later" +homepage="http://www.lxqt.org" +changelog="https://github.com/lxqt/qtxdg-tools/raw/master/CHANGELOG" +distfiles="https://github.com/lxqt/qtxdg-tools/archive/${version}.tar.gz" +checksum=8e11ba499a0025532ab41dadecb635a23f928a56a9c95c404f043832456fa1e9 + +qtxdg-tools-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/share/cmake + } +} From 65d8866a3f37b3c44efb64be71752babc70aa68d Mon Sep 17 00:00:00 2001 From: Enrico Belleri Date: Mon, 16 May 2022 11:58:24 +0200 Subject: [PATCH 2261/2369] lxqt-session: update to 1.1.1. --- srcpkgs/lxqt-session/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxqt-session/template b/srcpkgs/lxqt-session/template index 3b30d410cc3..e995b447818 100644 --- a/srcpkgs/lxqt-session/template +++ b/srcpkgs/lxqt-session/template @@ -1,16 +1,16 @@ # Template file for 'lxqt-session' pkgname=lxqt-session -version=1.1.0 +version=1.1.1 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools xdg-user-dirs perl" -makedepends="kwindowsystem-devel liblxqt-devel procps-ng-devel" -depends="xdg-user-dirs" +makedepends="kwindowsystem-devel liblxqt-devel procps-ng-devel qtxdg-tools-devel" +depends="xdg-user-dirs qtxdg-tools" short_desc="LXQt session handler" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="https://lxqt-project.org" distfiles="https://github.com/lxqt/lxqt-session/archive/${version}.tar.gz" -checksum=6ff41d1c95464fe7b00d3b5493f259323ecad61ae72865cf251ad5db9ae68e4e +checksum=e8f33783de445f4bb83cd62b8496148820ad42dd625fa7ea4973ace1b91fd896 replaces="lxqt-common>=0" From c588e321d26116d77cc5bc753b0724cd1694bb1b Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 18 May 2022 17:44:35 +0200 Subject: [PATCH 2262/2369] kdenlive: remove opencv dependency on ppc32 --- srcpkgs/kdenlive/template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template index 1cc4793c923..f0b39ab8750 100644 --- a/srcpkgs/kdenlive/template +++ b/srcpkgs/kdenlive/template @@ -10,7 +10,7 @@ makedepends=" kdeclarative-devel kfilemetadata5-devel knewstuff-devel knotifyconfig-devel kplotting-devel mlt7-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel v4l-utils-devel ksolid-devel qt5-quickcontrols2-devel qt5-networkauth-devel" -depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit opencv qt5-quickcontrols" +depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols" checkdepends="$depends" short_desc="Non-linear video editor" maintainer="Orphaned " @@ -21,5 +21,11 @@ checksum=ae879041f18ee89b3fef2dc85cbb6899bf184c433b234d0c2145085767952a4e # FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails make_check=extended +case "$XBPS_TARGET_MACHINE" in + ppc64*) depends+=" opencv";; + ppc*) ;; + *) depends+=" opencv";; +esac + # needed for mlt to work on musl CXXFLAGS="-DHAVE_LOCALE_H=1" From a71ca281f1cba0e94c8a0b16fe6b0059d90023f1 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 18 May 2022 17:46:52 +0200 Subject: [PATCH 2263/2369] linux5.4: update to 5.4.195. --- 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 8c274c1b365..dc99ee2e416 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.193 +version=5.4.195 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=0d16d343956d311e3f4ab3f032fd626d8e6b67c0db94edd32f561407d374f2a0 +checksum=f22f5b9df60f8d59988f9d48bb2f39cb5d7ec435ca4296abe352e8063140031d python_version=3 nodebug=yes # -dbg package is generated below manually From 814c5a60aae404de46dc9c3cfa55a47b512c6d8e Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 18 May 2022 17:50:48 +0200 Subject: [PATCH 2264/2369] linux4.19: update to 4.19.244. --- 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 0b504065d4b..bcb9e238305 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.242 +version=4.19.244 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=59bcfd094ec26b03ca506199224cff53c13325e62d22bd4e31ef4ccafe7265a2 +checksum=e97cd816aa0e7523b756ae5a5ee351b8989fed20720e2b783629786bb63025bd python_version=3 nodebug=yes # -dbg package is generated below manually From e392f1ba3a5e073e832b2129d86168706b5c3767 Mon Sep 17 00:00:00 2001 From: Jason Manley Date: Mon, 16 May 2022 16:14:16 -0500 Subject: [PATCH 2265/2369] New package: q5go-2.13 --- srcpkgs/q5go/patches/qgo.desktop.patch | 18 ++++++++++++++++++ srcpkgs/q5go/template | 20 ++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 srcpkgs/q5go/patches/qgo.desktop.patch create mode 100644 srcpkgs/q5go/template diff --git a/srcpkgs/q5go/patches/qgo.desktop.patch b/srcpkgs/q5go/patches/qgo.desktop.patch new file mode 100644 index 00000000000..f74d79da566 --- /dev/null +++ b/srcpkgs/q5go/patches/qgo.desktop.patch @@ -0,0 +1,18 @@ +--- a/templates/qgo.desktop 2022-04-27 13:03:23.000000000 -0500 ++++ b/templates/qgo.desktop 2022-05-16 18:26:45.485870905 -0500 +@@ -1,10 +1,10 @@ + [Desktop Entry] + Encoding=UTF-8 +-Comment=qgo +-Exec=qgo +-Icon=/usr/share/qGo/pics/Bowl.png +-MimeType=text/plain;text/sfg;Application +-Name=qgo ++Comment=q5go ++Exec=q5go ++Icon=/usr/share/q5go/pics/Bowl.ico ++MimeType=application/x-go-sgf; ++Name=q5go + GenericName=Go + Name[fr]=qgo + GenericName[ar]=?? diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template new file mode 100644 index 00000000000..aff9ab94fb0 --- /dev/null +++ b/srcpkgs/q5go/template @@ -0,0 +1,20 @@ +# Template file for 'q5go' +pkgname=q5go +version=2.1.3 +revision=1 +wrksrc="q5Go-${pkgname}-${version}" +build_style=qmake +configure_args="src/q5go.pro" +hostmakedepends="qt5-qmake qt5-host-tools" +makedepends="qt5-multimedia-devel qt5-svg-devel" +short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo" +maintainer="Jason Manley " +license="GPL-3.0-or-later" +homepage="https://github.com/bernds/q5Go" +distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz" +checksum=bffab6641acedf20b73f3429c60ef560942ffea27527aaa3a9a9c722b41f0791 + +post_install() { + qmake -install qinstall "${wrksrc}/src/images/Bowl.ico" "${DESTDIR}/usr/share/q5go/pics/Bowl.ico" + qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop" +} From c559951b15b312c0e142d5efb7c285c816697c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Wed, 18 May 2022 20:57:08 +0200 Subject: [PATCH 2266/2369] yt-dlp: update to 2022.05.18. --- srcpkgs/yt-dlp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template index 95c9db3e951..5d3ffe3a0a8 100644 --- a/srcpkgs/yt-dlp/template +++ b/srcpkgs/yt-dlp/template @@ -1,6 +1,6 @@ # Template file for 'yt-dlp' pkgname=yt-dlp -version=2022.04.08 +version=2022.05.18 revision=1 wrksrc="$pkgname" build_style=python3-module @@ -13,7 +13,7 @@ license="Unlicense" homepage="https://github.com/yt-dlp/yt-dlp" changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md" distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz" -checksum=a9ea3753977dd82f051f0674fbdc3eb5ff49a67246f4bd3cac5745702828d1db +checksum=59a0e89d79018070844c6301f7848594b746ca4857e7da14a5e6938a24e63172 do_check() { PYTHON=/usr/bin/python3 make offlinetest From 51c4b1859ab0d07f84a9e90018225ec67c9b9c6f Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 18 May 2022 22:39:52 +0200 Subject: [PATCH 2267/2369] nix: drop libcpuid dependency on non-x86 --- srcpkgs/nix/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 9afcb75a7a6..da3fea0347a 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -8,7 +8,7 @@ configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh" hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook" makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel liblzma-devel openssl-devel libsodium-devel sqlite-devel - libseccomp-devel editline-devel jq-devel libarchive-devel libcpuid-devel + libseccomp-devel editline-devel jq-devel libarchive-devel gtest-devel lowdown-devel json-c++" depends="curl tar xz" short_desc="Purely functional package manager" @@ -24,6 +24,10 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" fi +case "$XBPS_TARGET_MACHINE" in + x86_64*|i686*) makedepends+=" libcpuid-devel";; +esac + CXXFLAGS="-Wno-deprecated-declarations" # Default configuration file. From 970c092597705f4262b03defd05dad6e4562c792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 18 May 2022 21:43:23 -0300 Subject: [PATCH 2268/2369] nix: mark nocross. Commit 51c4b1859ab0d07f84a9e90018225ec67c9b9c6f removed the libcpuid dependency, which enabled the build for ARM archs, despite the package not having been tested there. The current template is not ready for cross compilation. The build initially failed with: LD /usr/lib32/libnixstore.so [cc-wrapper] ignoring -L/usr/lib32 /usr/lib/gcc/armv7l-linux-musleabihf/10.2.1/../../../../armv7l-linux-musleabihf/bin/ld: cannot find -lnixutil because the libinixutil.so file was located in /usr/lib32 of the masterdir, which should never have happened. Bypassing that error also leads us to: LD /usr/lib32/libnixexpr.so /usr/lib/gcc/armv7l-linux-musleabihf/10.2.1/../../../../armv7l-linux-musleabihf/bin/ld: cannot find -latomic_ops meaning the build requires further fixes for armv*, probably beyond cross compilation. Still add jq to hostmakedepends, since the build requires the jq binary as well. --- srcpkgs/nix/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index da3fea0347a..b6352688454 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh" -hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook" +hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq" makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel liblzma-devel openssl-devel libsodium-devel sqlite-devel libseccomp-devel editline-devel jq-devel libarchive-devel @@ -19,6 +19,7 @@ changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#s distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz" checksum=91a7f2bcdde3263927d842f04a345ed77319148c700e2c8be01498724e6808c0 disable_parallel_build=yes +nocross="cross build populates /usr/lib32 with libraries and tries to link against them" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" From 294bc2887f606690e55cde017a1c3631cad094a2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 19 May 2022 13:13:29 +0200 Subject: [PATCH 2269/2369] linux5.10: update to 5.10.117. --- 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 c5bd16c1ade..d6d6fdf4a23 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.115 +version=5.10.117 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=f5e417b32f89318b6d0a230109a592ffd68997817463dc4692fa49ec7fe42f71 +checksum=703ef7112cdf889950dd864ba482d04bd87d83d3df3a98ab8d4ba8a7ab1ddcc7 python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR. From 84f5030981e7364212658dc349b58b497cf59536 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 19 May 2022 13:17:00 +0200 Subject: [PATCH 2270/2369] linux5.15: update to 5.15.41. --- 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 9f2e16a7392..ff7429d861a 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.39 +version=5.15.41 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 - b773d0ca695b0dbe1254f13396ae71120cb1e662fa89a698b29d828ba13a4b73" + e9066a8ced8c704b9ca7eb413e3744f458cf0dfd73b2fc0deb24ab1fad71622a" skip_extraction="patch-${version}.xz" python_version=3 From 95dd299d6ea8ee9e6c19f5af858cd720d1a8d17e Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 19 May 2022 16:05:01 +0200 Subject: [PATCH 2271/2369] libffado: update to 2.4.5. --- srcpkgs/libffado/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template index 59c5fee7614..c8590ec1d06 100644 --- a/srcpkgs/libffado/template +++ b/srcpkgs/libffado/template @@ -1,7 +1,7 @@ # Template file for 'libffado' pkgname=libffado -version=2.4.4 -revision=4 +version=2.4.5 +revision=1 build_style=scons make_build_args="PREFIX=/usr MANDIR=/usr/share/man UDEVDIR=/usr/lib/udev/rules.d CUSTOM_ENV=1 BUILD_TESTS=0 @@ -19,7 +19,7 @@ maintainer="Duncaen " license="GPL-2.0-only, GPL-3.0-only" homepage="http://www.ffado.org" distfiles="http://www.ffado.org/files/libffado-${version}.tgz" -checksum=a47178cdc8c0c91e91edbaabe23d19ca12a752cbcf81c27314adb27cc00d60f0 +checksum=59599bdde897dbc9533b0d2a282099193725030c3ab100737a1dbe673166af96 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone" ;; From fabd2836fa2b2d5f3459b3d9e12bec64563b6901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Thu, 19 May 2022 16:26:36 +0200 Subject: [PATCH 2272/2369] croc: update to 9.5.6. --- srcpkgs/croc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template index 5683587f735..2a0795951d1 100644 --- a/srcpkgs/croc/template +++ b/srcpkgs/croc/template @@ -1,6 +1,6 @@ # Template file for 'croc' pkgname=croc -version=9.5.5 +version=9.5.6 revision=1 build_style=go go_import_path=github.com/schollz/croc/v${version%%.*} @@ -9,7 +9,7 @@ maintainer="Benjamín Albiñana " license="MIT" homepage="https://github.com/schollz/croc" distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz" -checksum=221ebf034e05ef8c06b2e2290dfb83c6f8b4b3f8a9168d6d826b87ed3c62d51a +checksum=c03c7b9daf2ba841d373d9c43abb68dc27ab1d7e01bbadead771918d499dea9e post_install() { vlicense LICENSE From 73a6398395acd1c6580897f20396c230aa52d840 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Tue, 17 May 2022 17:34:07 +0200 Subject: [PATCH 2273/2369] foot: update to 1.12.1. --- srcpkgs/foot/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template index e1c373c43c2..d139879a539 100644 --- a/srcpkgs/foot/template +++ b/srcpkgs/foot/template @@ -1,6 +1,6 @@ # Template file for 'foot' pkgname=foot -version=1.11.0 +version=1.12.1 revision=1 wrksrc=$pkgname build_style=meson @@ -15,7 +15,8 @@ license="MIT" homepage="https://codeberg.org/dnkl/foot" changelog="https://codeberg.org/dnkl/foot/src/branch/master/CHANGELOG.md" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=2b4f737eb4d266224e5dd0126168c6d770b0139d4b572078baf158d2f7166e4e +checksum=14e307ac89454b682bb9f1bc644043779f4462df656034fcc4c1e72b18fbffdd +conf_files="/etc/xdg/foot/foot.ini" post_install() { rm -f ${DESTDIR}/usr/share/doc/foot/LICENSE From b1b3c4dcfd908777b3ddf065e175d086ebebc8f9 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Mon, 16 May 2022 12:20:37 +0200 Subject: [PATCH 2274/2369] ncurses: patch out foot terminfo We instead provide the upstream foot terminfo definitions in the foot-terminfo package. The upstream definitions have a few non-standard capabilities not present in the ncurses versions. --- srcpkgs/ncurses/patches/remove-foot.patch | 64 +++++++++++++++++++++++ srcpkgs/ncurses/template | 2 +- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ncurses/patches/remove-foot.patch diff --git a/srcpkgs/ncurses/patches/remove-foot.patch b/srcpkgs/ncurses/patches/remove-foot.patch new file mode 100644 index 00000000000..0328c5c4dad --- /dev/null +++ b/srcpkgs/ncurses/patches/remove-foot.patch @@ -0,0 +1,64 @@ +diff -ruN ncurses-6.3_orig/misc/terminfo.src ncurses-6.3/misc/terminfo.src +--- ncurses-6.3_orig/misc/terminfo.src 2022-05-17 17:22:53.886017351 +0200 ++++ ncurses-6.3/misc/terminfo.src 2022-05-17 17:23:31.941720306 +0200 +@@ -7627,60 +7627,6 @@ + + ######## WAYLAND CLIENTS + +-#### Foot +-# https://codeberg.org/dnkl/foot/ +-# Version 1.8.2 +-# +-# This identifies as a VT220 with 4=sixel and 22=color, however: +-# tack: +-# bell does not work +-# status-line does not work because foot does not set the window title +-# sends escape when meta key is used, whether or not smm/rmm enabled +-# vttest: +-# wrap-test fails +-# no application-mode for numeric keypad (unless private mode 1035 is set) +-# no NRCS +-# no VT52 +-# no SRM +-# protected areas do not work +-# SU/SD work, SL/SR do not +-# DECRPM responds, but not the corresponding ANSI reports. +-# otherwise few reports, except cursor-position and mouse and some dtterm +-# VT520 cursor-movement works, except for left/right margins +-# supports xterm/DECSCUSR, though default case in vttest does not blink +-# Send: <27> [ 0 <32> q +-# Text: The cursor should be a blinking rectangle +-# partial support for xterm mouse any-event mode and button-event mode: +-# + does not report focus-in/focus-out +-# + does not report buttons 6/7 +-# alternate-screen works +-foot|foot terminal emulator, +- oc=\E]104\E\\, use=xterm+256color2, use=foot+base, +- +-foot-direct|foot with direct color indexing, +- use=xterm+direct, use=foot+base, +- +-foot+base|foot base fragment, +- am, bce, bw, hs, mir, msgr, npc, xenl, AX, XT, +- cols#80, it#8, lines#24, +- acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +- bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, +- cub1=^H, cud1=\n, dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, +- el1=\E[1K, flash=\E]555\E\\, ind=\n, invis=\E[8m, +- is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z, +- oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=\E(B, +- rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, +- rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, +- sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%; +- %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, +- sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=, +- smso=\E[7m, smul=\E[4m, E3=\E[3J, use=att610+cvis, +- use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+local, +- use=ansi+idc, use=ansi+idl, use=ansi+rca2, use=ansi+rep, +- use=ansi+tabs, use=ecma+index, use=ecma+italics, +- use=ecma+strikeout, use=xterm+alt+title, +- use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2, +- + ######## WEB CLIENTS + + #### DomTerm diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template index 5366c77a6a0..8386760db22 100644 --- a/srcpkgs/ncurses/template +++ b/srcpkgs/ncurses/template @@ -1,7 +1,7 @@ # Template file for 'ncurses' pkgname=ncurses version=6.3 -revision=1 +revision=2 bootstrap=yes configure_args="--enable-big-core" short_desc="System V Release 4.0 curses emulation library" From 2be9a6d2ba379b1f13a8a6294a39fecdc26ec01e Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Tue, 17 May 2022 18:02:36 +0200 Subject: [PATCH 2275/2369] fbterm: use terminfo from ncurses-term ncurses now provides this terminfo, which causes a file conflict. --- srcpkgs/fbterm/template | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/fbterm/template b/srcpkgs/fbterm/template index f97ecc509dc..9a413d3d71e 100644 --- a/srcpkgs/fbterm/template +++ b/srcpkgs/fbterm/template @@ -1,20 +1,16 @@ # Template file for 'fbterm' pkgname=fbterm version=1.7.0 -revision=6 +revision=7 wrksrc="${pkgname}-${version%.*}" build_style=gnu-configure configure_args="--enable-gpm" hostmakedepends="pkg-config" makedepends="fontconfig-devel gpm-devel" +depends="ncurses-term" short_desc="Fast frame buffer based terminal emulator" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/izmntuk/fbterm" distfiles="https://github.com/izmntuk/${pkgname}/archive/v${version%.*}.tar.gz" checksum=68e9742b23d6f143d809a5930f5f22c7e55d7c14a4ab2c8a842e0b5c27b1f863 - -post_configure() { - sed -i "s,tic,& -o $DESTDIR/usr/share/terminfo," terminfo/Makefile - vmkdir usr/share/terminfo -} From e991ee8c77e6516af6f873ee0dc261770a7e1fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Thu, 19 May 2022 19:41:29 +0200 Subject: [PATCH 2276/2369] python3-PyICU: update to 2.9. --- srcpkgs/python3-PyICU/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template index 4920d3c2b7a..0fcede6988d 100644 --- a/srcpkgs/python3-PyICU/template +++ b/srcpkgs/python3-PyICU/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyICU' pkgname=python3-PyICU -version=2.8 -revision=2 +version=2.9 +revision=1 wrksrc="pyicu-v${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -14,7 +14,7 @@ license="MIT" homepage="https://pypi.org/project/PyICU/" changelog="https://gitlab.pyicu.org/main/pyicu/-/raw/main/CHANGES" distfiles="https://gitlab.pyicu.org/main/pyicu/-/archive/v${version}/pyicu-v${version}.tar.bz2" -checksum=93d76cfa07f88fa572ab06971e0757522651f5e2f008883d1d63b66d0b27a5ee +checksum=85bce6410b207f21b3158f7ad35925f03ac6ed44f7ffb64f53e6d2c05cdd3257 post_install() { vlicense LICENSE From ff643771fdd5f34707fe1d84bfca4934962d9185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Thu, 19 May 2022 19:41:30 +0200 Subject: [PATCH 2277/2369] python3-PyPDF2: update to 1.27.12. --- srcpkgs/python3-PyPDF2/template | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-PyPDF2/template b/srcpkgs/python3-PyPDF2/template index 98a0a64176e..8f09921ac3f 100644 --- a/srcpkgs/python3-PyPDF2/template +++ b/srcpkgs/python3-PyPDF2/template @@ -1,17 +1,27 @@ # Template file for 'python3-PyPDF2' pkgname=python3-PyPDF2 -version=1.26.0 -revision=4 -wrksrc="PyPDF2-${version}" +version=1.27.12 +revision=1 +_sample_files_gitrev=41b5cd4f774f8fbd8ac42d93b9962f0376352a15 +create_wrksrc=yes +build_wrksrc="PyPDF2-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3" -short_desc="PDF toolkit" +depends="python3-Pillow" +checkdepends="python3-pytest ${depends}" +short_desc="PDF library for splitting, merging, cropping, and transforming pages" maintainer="Piotr Wójcik " license="BSD-3-Clause" -homepage="http://mstamy2.github.com/PyPDF2" -distfiles="${PYPI_SITE}/P/PyPDF2/PyPDF2-${version}.tar.gz" -checksum=e28f902f2f0a1603ea95ebe21dff311ef09be3d0f0ef29a3e44a932729564385 +homepage="https://pypdf2.readthedocs.io/en/latest/" +changelog="https://raw.githubusercontent.com/py-pdf/PyPDF2/main/CHANGELOG" +distfiles="${PYPI_SITE}/P/PyPDF2/PyPDF2-${version}.tar.gz + https://github.com/py-pdf/sample-files/archive/${_sample_files_gitrev}.tar.gz" +checksum="20929fad10a3b4890862f65f3a46f563cfdf53132faae5193b54e18658467a60 + dc2fb112e800400c7891bcff9d48dc8cae5e8ecf6c5058a2ecea2de09d241e78" + +post_extract() { + mv sample-files-${_sample_files_gitrev} ${build_wrksrc}/sample-files +} post_install() { vlicense LICENSE From 7a553dd4ecdb18287367e0e773b09eaeff0e92c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Thu, 19 May 2022 19:41:31 +0200 Subject: [PATCH 2278/2369] python3-filelock: update to 3.7.0. --- srcpkgs/python3-filelock/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-filelock/template b/srcpkgs/python3-filelock/template index c3a7d8d74e4..ff639a0f136 100644 --- a/srcpkgs/python3-filelock/template +++ b/srcpkgs/python3-filelock/template @@ -1,7 +1,7 @@ # Template file for 'python3-filelock' pkgname=python3-filelock -version=3.4.2 -revision=2 +version=3.7.0 +revision=1 wrksrc="filelock-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -9,6 +9,7 @@ depends="python3" short_desc="Platform independent file lock" maintainer="Piotr Wójcik " license="Unlicense" -homepage="https://filelock.readthedocs.io/en/latest/" +homepage="https://py-filelock.readthedocs.io/en/latest/" +changelog="https://raw.githubusercontent.com/tox-dev/py-filelock/main/docs/changelog.rst" distfiles="${PYPI_SITE}/f/filelock/filelock-${version}.tar.gz" -checksum=38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80 +checksum=b795f1b42a61bbf8ec7113c341dad679d772567b936fbd1bf43c9a238e673e20 From a499f5fcff736c4ec9b784787327ab2f20af6c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Thu, 19 May 2022 19:41:32 +0200 Subject: [PATCH 2279/2369] python3-virtualenv: update to 20.14.1. --- srcpkgs/python3-virtualenv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template index 3f2d7cd84be..ca41cbf2079 100644 --- a/srcpkgs/python3-virtualenv/template +++ b/srcpkgs/python3-virtualenv/template @@ -1,6 +1,6 @@ # Template file for 'python3-virtualenv' pkgname=python3-virtualenv -version=20.13.0 +version=20.14.1 revision=1 wrksrc="virtualenv-${version}" build_style=python3-module @@ -13,7 +13,7 @@ license="MIT" homepage="https://virtualenv.pypa.io/" changelog="https://virtualenv.pypa.io/en/latest/changelog.html" distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz" -checksum=d8458cf8d59d0ea495ad9b34c2599487f8a7772d796f9910858376d1600dd2dd +checksum=ef589a79795589aada0c1c5b319486797c03b67ac3984c48c669c0e4f50df3a5 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3" do_check() { From 93519ccda146eb101473d86549b48bac24e78c88 Mon Sep 17 00:00:00 2001 From: Jose G Perez Taveras Date: Tue, 17 May 2022 11:58:41 -0400 Subject: [PATCH 2280/2369] font-iosevka: update to 15.3.1. --- 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 47928911536..bfde8e7c10c 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.3.0 +version=15.3.1 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 - 0ebdabed87473163055f2fbe6927e210c9259a94efdeac3ed54976bb0873ce0c - dc08f215c57fd3e3d9f4a69a600a2a0d92bd56bac47e6099c47374e7cee0b7ae" + 553b3e1da4a35396993a755b952b573ec466c4f47a6b4efa07e0636cd65b2600 + e67d51a5a7a40f0cd267f0503af32c9892aee53a131e7c836ed7138ca664dffe" font_dirs="/usr/share/fonts/TTF" From 7de506a198cd7ac9bf021dd4ed82481bfb084ce9 Mon Sep 17 00:00:00 2001 From: Imran Khan Date: Tue, 17 May 2022 14:26:59 +0000 Subject: [PATCH 2281/2369] txr: update to 275. --- srcpkgs/txr/template | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template index 68af47b7e69..45224582c37 100644 --- a/srcpkgs/txr/template +++ b/srcpkgs/txr/template @@ -1,6 +1,6 @@ # Template file for 'txr' pkgname=txr -version=272 +version=275 revision=1 archs="x86_64* i686* aarch64* arm* ppc64* mips*" build_style=configure @@ -13,7 +13,7 @@ license="BSD-2-Clause" homepage="http://www.nongnu.org/txr/" changelog="http://www.kylheku.com/cgit/txr/tree/RELNOTES" distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz2" -checksum=b3c2a82198dc97633aa40ced6fff6fec39c78a905b06dc08e7b74176bda03543 +checksum=1e6ca44f2879178f4205ad70ee8fc757a4392ecc75424c5ed0904741d1b1541e nopie=yes if [ "$CROSS_BUILD" ]; then @@ -27,8 +27,13 @@ pre_configure() { } pre_check() { - # UDP server/client test for IPv6 fails in github CI - vsed -i -e 's/,\*maybe-ipv6//' tests/014/dgram-stream.tl + if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then + # IPv6 not supported in github CI + vsed -i -e 's/,\*maybe-ipv6//' tests/014/dgram-stream.tl + + # Removing tests that fail when run as root + rm tests/019/load-search.tl + fi } post_install() { From fb251163906b8f71caeb3a63ac67097d1ec6cd9f Mon Sep 17 00:00:00 2001 From: Jose G Perez Taveras Date: Tue, 17 May 2022 12:14:57 -0400 Subject: [PATCH 2282/2369] acme.sh: update to 3.0.4. --- srcpkgs/acme.sh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/acme.sh/template b/srcpkgs/acme.sh/template index 92092c41e3b..a2002b8a655 100644 --- a/srcpkgs/acme.sh/template +++ b/srcpkgs/acme.sh/template @@ -1,13 +1,13 @@ # Template file for 'acme.sh' pkgname=acme.sh -version=3.0.2 +version=3.0.4 revision=1 short_desc="Pure Unix shell script implementing ACME client protocol" maintainer="Wesley Chan " license="GPL-3.0-or-later" homepage="https://github.com/acmesh-official/acme.sh" distfiles="https://github.com/acmesh-official/acme.sh/archive/refs/tags/${version}.tar.gz" -checksum=d6cda672697fe02cfa2a61bf74ec1b472aa797b03baead6deec625158965cee0 +checksum=c2855836a6db5766474c860fa54fa2f9f378ab334856b0cf0d07512866b808bb do_install() { vmkdir usr/share/acme.sh/deploy From f134c0484c1fc5ad3775b7e717a827bffcb6927d Mon Sep 17 00:00:00 2001 From: teldra Date: Wed, 18 May 2022 12:57:38 +0200 Subject: [PATCH 2283/2369] geonkick: update to 2.9.1. --- srcpkgs/geonkick/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/geonkick/template b/srcpkgs/geonkick/template index af8ea0fa819..5f73484a3fb 100644 --- a/srcpkgs/geonkick/template +++ b/srcpkgs/geonkick/template @@ -1,6 +1,6 @@ # Template file for 'geonkick' pkgname=geonkick -version=2.9.0 +version=2.9.1 revision=1 build_style=cmake hostmakedepends="pkg-config tar xz" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/free-sm/geonkick" 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=54968894e3fab1ad1b7a92e12cdb5041ca39a22842c8e815a443f50cbcc4dc5b +checksum=30ee2a36a26cabb9af8f458bb12d7b0358b4d6abec67ab5f8df696390b5699b4 if [ ${CROSS_BUILD} ]; then configure_args+=" -DGKICK_ARCHITECTURE=$XBPS_TARGET_MACHINE" From bfda85dacefb4be2ce93d2635402a20736b3bedc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Thu, 19 May 2022 20:56:42 +0200 Subject: [PATCH 2284/2369] common/do-patch: handle spaces in patch filename --- common/hooks/do-patch/00-patches.sh | 20 +++++++++---------- ...e-test.patch => 21.08.1 online test.patch} | 0 2 files changed, 10 insertions(+), 10 deletions(-) rename srcpkgs/libkcddb/patches/{21.08.1--online-test.patch => 21.08.1 online test.patch} (100%) diff --git a/common/hooks/do-patch/00-patches.sh b/common/hooks/do-patch/00-patches.sh index 64659dc3028..c75209f931e 100644 --- a/common/hooks/do-patch/00-patches.sh +++ b/common/hooks/do-patch/00-patches.sh @@ -6,23 +6,23 @@ _process_patch() { _args="-Np1" _patch=${i##*/} - if [ -f $PATCHESDIR/${_patch}.args ]; then - _args=$(<$PATCHESDIR/${_patch}.args) + if [ -f "$PATCHESDIR/${_patch}.args" ]; then + _args=$(<"$PATCHESDIR/${_patch}.args") elif [ -n "$patch_args" ]; then _args=$patch_args fi - cp -f $i "$wrksrc" + cp -f "$i" "$wrksrc" # Try to guess if its a compressed patch. - if [[ $f =~ .gz$ ]]; then + if [[ $i =~ .gz$ ]]; then gunzip "$wrksrc/${_patch}" _patch=${_patch%%.gz} - elif [[ $f =~ .bz2$ ]]; then + elif [[ $i =~ .bz2$ ]]; then bunzip2 "$wrksrc/${_patch}" _patch=${_patch%%.bz2} - elif [[ $f =~ .diff$ ]]; then + elif [[ $i =~ .diff$ ]]; then : - elif [[ $f =~ .patch$ ]]; then + elif [[ $i =~ .patch$ ]]; then : else msg_warn "$pkgver: unknown patch type: $i.\n" @@ -31,7 +31,7 @@ _process_patch() { cd "$wrksrc" msg_normal "$pkgver: patching: ${_patch}.\n" - patch -s ${_args} <${_patch} 2>/dev/null + patch -s ${_args} <"${_patch}" 2>/dev/null } hook() { @@ -44,11 +44,11 @@ hook() { done < $PATCHESDIR/series else for f in $PATCHESDIR/*; do - [ ! -f $f ] && continue + [ ! -f "$f" ] && continue if [[ $f =~ ^.*.args$ ]]; then continue fi - _process_patch $f + _process_patch "$f" done fi } diff --git a/srcpkgs/libkcddb/patches/21.08.1--online-test.patch b/srcpkgs/libkcddb/patches/21.08.1 online test.patch similarity index 100% rename from srcpkgs/libkcddb/patches/21.08.1--online-test.patch rename to srcpkgs/libkcddb/patches/21.08.1 online test.patch From 1fde2c6b1fd8d3712d9f3026a50820e80fa4d7f3 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Tue, 17 May 2022 20:52:32 -0400 Subject: [PATCH 2285/2369] New package: act-0.2.26 --- srcpkgs/act/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/act/template diff --git a/srcpkgs/act/template b/srcpkgs/act/template new file mode 100644 index 00000000000..98df6d25f16 --- /dev/null +++ b/srcpkgs/act/template @@ -0,0 +1,17 @@ +# Template file for 'act' +pkgname=act +version=0.2.26 +revision=1 +build_style=go +go_import_path="github.com/nektos/act" +go_ldflags="-X main.version=${version}" +short_desc="Run your GitHub Actions locally" +maintainer="0x5c " +license="MIT" +homepage="https://github.com/nektos/act" +distfiles="https://github.com/nektos/act/archive/refs/tags/v${version}.tar.gz" +checksum=73d75205293bd18e4f529ef1aa47da79fcd7eda2413b790816f4ca63b7aa02ce + +post_install() { + vlicense LICENSE +} From fc924df2d22e35e506aea513427cefd39046edc1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 20 May 2022 00:10:09 -0400 Subject: [PATCH 2286/2369] chezmoi: update to 2.16.0. --- srcpkgs/chezmoi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 119bcf35e55..582f2943461 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,6 +1,6 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.15.4 +version=2.16.0 revision=1 build_style=go go_import_path="github.com/twpayne/chezmoi/v2" @@ -11,7 +11,7 @@ maintainer="classabbyamp " license="MIT" homepage="https://chezmoi.io/" distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz" -checksum=879ce990f1655124af7e3bbf95dd3fb79453f8c1047d6f4ad5af30d86a674843 +checksum=da1900b065c1b247ffc70a48c6dd066f3b770ccbc16b3caeaf949a9fe0357b53 pre_build() { local _date From 836f831ec8267bf69159546130a6042a1acea612 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 20 May 2022 11:33:25 -0500 Subject: [PATCH 2287/2369] ffuf: update to 1.5.0. --- srcpkgs/ffuf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template index 26f03774991..0b697718c45 100644 --- a/srcpkgs/ffuf/template +++ b/srcpkgs/ffuf/template @@ -1,6 +1,6 @@ # Template file for 'ffuf' pkgname=ffuf -version=1.4.1 +version=1.5.0 revision=1 build_style=go go_import_path="github.com/ffuf/ffuf" @@ -9,7 +9,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/ffuf/ffuf" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=89b4bd4b3bbad7402d9c81d0d9f21b679c80d0a19bb9a190e45e395736058889 +checksum=70dc411c014c826f9c8a7b021e01d5bc50e2cba17e0dcc4df3e2e2574ad12073 post_install() { vlicense LICENSE From c10edda3574e7ad809dfd63f4ebd72b51429de01 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 15 May 2022 13:33:57 +0200 Subject: [PATCH 2288/2369] topgrade: update to 9.0.0 --- srcpkgs/topgrade/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template index f560ee84573..cf802bb5a86 100644 --- a/srcpkgs/topgrade/template +++ b/srcpkgs/topgrade/template @@ -1,6 +1,6 @@ # Template file for 'topgrade' pkgname=topgrade -version=8.3.0 +version=9.0.0 revision=1 build_style=cargo short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else" @@ -8,7 +8,7 @@ maintainer="jcgruenhage " license="GPL-3.0-only" homepage="https://github.com/r-darwish/topgrade" distfiles="https://github.com/r-darwish/topgrade/archive/v${version}.tar.gz" -checksum=a818cbdc64aafe77a589299d5717988fd5e5403af0998a9945b9d17a5b6f499b +checksum=71277152555cfaf1359884a5d094ba841b9b6fc679337871b87476ec5a11c168 post_install() { vman topgrade.8 From 5fb8475c22c4e80bd57fc7ea09868f2fa99818de Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 17 May 2022 23:27:50 +0200 Subject: [PATCH 2289/2369] hyperfine: update to 1.14.0 --- srcpkgs/hyperfine/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/hyperfine/template b/srcpkgs/hyperfine/template index 7b28a293a96..f93002ddf70 100644 --- a/srcpkgs/hyperfine/template +++ b/srcpkgs/hyperfine/template @@ -1,6 +1,6 @@ # Template file for 'hyperfine' pkgname=hyperfine -version=1.13.0 +version=1.14.0 revision=1 build_style=cargo short_desc="Command-line benchmarking tool" @@ -9,14 +9,14 @@ license="MIT, Apache-2.0" homepage="https://github.com/sharkdp/hyperfine" changelog="https://raw.githubusercontent.com/sharkdp/hyperfine/master/CHANGELOG.md" distfiles="https://github.com/sharkdp/hyperfine/archive/refs/tags/v${version}.tar.gz" -checksum=6e57c8e51962dd24a283ab46dde6fe306da772f4ef9bad86f8c89ac3a499c87e +checksum=59018c22242dd2ad2bd5fb4a34c0524948b7921d02aa79419ccec4c1ffd3da14 post_install() { vlicense LICENSE-MIT vman doc/hyperfine.1 cd "target/${RUST_TARGET}/release/build/hyperfine-"*/out - vinstall hyperfine.bash 644 usr/share/bash-completion/completions hyperfine - vinstall hyperfine.fish 644 usr/share/fish/vendor_completions.d - vinstall _hyperfine 644 usr/share/zsh/site-functions + vcompletion hyperfine.bash bash + vcompletion hyperfine.fish fish + vcompletion _hyperfine zsh } From 3ff4dcaccfe0ecdd2b3ff0b87a42d82e2e5aa0fa Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Thu, 19 May 2022 19:09:31 -0400 Subject: [PATCH 2290/2369] castor: update to 0.9.0 --- srcpkgs/castor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template index 851aad586a5..0683f6da98c 100644 --- a/srcpkgs/castor/template +++ b/srcpkgs/castor/template @@ -1,6 +1,6 @@ # Template file for 'castor' pkgname=castor -version=0.8.18 +version=0.9.0 revision=1 build_style=cargo hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Zach Dykstra " license="MIT" homepage="https://git.sr.ht/~julienxx/castor" distfiles="https://git.sr.ht/~julienxx/castor/archive/${version}.tar.gz" -checksum=02ea3d8c6a3b705ca54e489cb67bf5149261222c352696afe374843ff3bc06bb +checksum=ed57c92a88e8ebe8db286daad9677ffb99287d164d3193d17f8134bb77de5ae1 post_install() { make PREFIX=/usr DESTDIR="${DESTDIR}" copy-data From 40550e9c09b88d1c8f1fae2809e916447fb3de5c Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Thu, 19 May 2022 19:53:02 +0200 Subject: [PATCH 2291/2369] fcft: update to 3.1.2. --- srcpkgs/fcft/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template index f30290d5915..8d8b4313a55 100644 --- a/srcpkgs/fcft/template +++ b/srcpkgs/fcft/template @@ -1,6 +1,6 @@ # Template file for 'fcft' pkgname=fcft -version=3.0.1 +version=3.1.2 revision=1 wrksrc=$pkgname build_style=meson @@ -15,7 +15,7 @@ maintainer="Isaac Freund " license="MIT" homepage="https://codeberg.org/dnkl/fcft" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=0d9b9f3add24aef5efcf42a32e8ad0e50060e1441a491e04fff3d79a36a526ea +checksum=f571afe693d3fa11fe36e97c7a2ecbbf9313755ee31c1ec3dcc648796b8e6db0 build_options="textshaping" build_options_default="textshaping" From 01966f9c6ffbd51edeeae18e787d9a3ddef0837a Mon Sep 17 00:00:00 2001 From: Mate GABRI Date: Fri, 20 May 2022 21:24:49 +1000 Subject: [PATCH 2292/2369] kops: update to 1.23.2 --- srcpkgs/kops/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template index 4ba82a05a2a..f3e6ec5f4b0 100644 --- a/srcpkgs/kops/template +++ b/srcpkgs/kops/template @@ -1,6 +1,6 @@ # Template file for 'kops' pkgname=kops -version=1.23.0 +version=1.23.2 revision=1 archs="x86_64*" build_wrksrc=src/k8s.io/kops From a20b2a60ba837a3c085780303d08aa264cdbfabd Mon Sep 17 00:00:00 2001 From: teldra Date: Fri, 20 May 2022 10:25:21 +0200 Subject: [PATCH 2293/2369] py3status: update to 3.44. --- srcpkgs/py3status/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template index a84b6bc296b..edbe7e0b40d 100644 --- a/srcpkgs/py3status/template +++ b/srcpkgs/py3status/template @@ -1,6 +1,6 @@ # Template file for 'py3status' pkgname=py3status -version=3.42 +version=3.44 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=bf7dd6cb65e88c3b0cf570a8df08c8ca30b655c88c7ba5b29fbfbf86a0737e27 +checksum=3afc200780c090253987e47d9e43fede4e24ebba47192de9961f79c05cedc998 post_install() { vlicense LICENSE From 2332cb0a17223a1e598befce782b0877a5a44070 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 21 May 2022 09:01:09 +0200 Subject: [PATCH 2294/2369] hugo: update to 0.99.1. --- srcpkgs/hugo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index 477c90d6639..30ece176ab9 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,6 +1,6 @@ # Template file for 'hugo' pkgname=hugo -version=0.94.2 +version=0.99.1 revision=1 build_style=go go_import_path="github.com/gohugoio/hugo" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://gohugo.io" distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz" -checksum=315bc0d22977e84ba25125b1d23333648e36194a46a4d6ae4f4c6c683dc8979c +checksum=487e5e3fe63176f554344822c30375c9d948fcc7c669424f7557e9089f695c3d post_install() { vdoc README.md From 847c87f129fd0ae65c02d144e3d93974d0e992e4 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 21 May 2022 09:08:14 +0200 Subject: [PATCH 2295/2369] iio-sensor-proxy: update to 3.3. --- srcpkgs/iio-sensor-proxy/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template index ebd13471e6f..203fda432c3 100644 --- a/srcpkgs/iio-sensor-proxy/template +++ b/srcpkgs/iio-sensor-proxy/template @@ -1,7 +1,7 @@ # Template file for 'iio-sensor-proxy' pkgname=iio-sensor-proxy -version=3.1 -revision=2 +version=3.3 +revision=1 build_style=meson configure_args="-Dsystemdsystemunitdir=false" hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool" @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="GPL-3.0-or-later" homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy" distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f +checksum=3f761f3603b3c5b76125f96a48d4001c24f368b6021ba1e06414cac6a5d17c44 do_check() { dbus-run-session ninja -C build test From 3cb08f217367fecbcaf722907621ab0186217538 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 21 May 2022 09:09:09 +0200 Subject: [PATCH 2296/2369] yoshimi: update to 2.2.0. --- srcpkgs/yoshimi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template index 836ef01167f..5b075d6036e 100644 --- a/srcpkgs/yoshimi/template +++ b/srcpkgs/yoshimi/template @@ -1,6 +1,6 @@ # Template file for 'yoshimi' pkgname=yoshimi -version=2.1.2.2 +version=2.2.0 revision=1 build_wrksrc=src build_style=cmake @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later" homepage="https://yoshimi.github.io/" distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz" -checksum=194c552d5b57883dee2c8bc9f37cc3743787541a8c3fe56afc556f24324a4576 +checksum=4d447357bfeaddcfa40e393f0fc81f1d5381f36cb1f7999c36ee0c5736af239e case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone";; From 495f520f4dc0bcd3374405829919ad6a27442399 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 13 May 2022 20:14:46 +0200 Subject: [PATCH 2297/2369] lua53: update to 5.3.6. --- srcpkgs/lua53/template | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/srcpkgs/lua53/template b/srcpkgs/lua53/template index 7a923690a56..4f9aaa99113 100644 --- a/srcpkgs/lua53/template +++ b/srcpkgs/lua53/template @@ -1,7 +1,7 @@ # Template file for 'lua53' pkgname=lua53 -version=5.3.5 -revision=7 +version=5.3.6 +revision=1 wrksrc=lua-${version} makedepends="readline-devel" short_desc="Powerful, fast, lightweight, embeddable scripting language (5.3.x)" @@ -9,7 +9,7 @@ maintainer="q66 " license="MIT" homepage="https://www.lua.org" distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz" -checksum=0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac +checksum=fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60 alternatives=" lua:lua:/usr/bin/lua5.3 @@ -18,11 +18,6 @@ alternatives=" lua:luac.1:/usr/share/man/man1/luac5.3.1 " -pre_build() { - # 5.3.5 has 5.3.4 in the Makefile - vsed "s/^R= \$V.4/R= \$V.5/" -i Makefile -} - do_build() { sed -i src/Makefile -r \ -e '/^LUA_(SO|A|T)=/ s;lua;lua5.3;' \ From 3bf3937e325b27f8a86481997a9ea31cdb10669a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 13 May 2022 20:14:48 +0200 Subject: [PATCH 2298/2369] lua54: update to 5.4.4. --- srcpkgs/lua54/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lua54/template b/srcpkgs/lua54/template index 1abbe11246f..c6713f81bcc 100644 --- a/srcpkgs/lua54/template +++ b/srcpkgs/lua54/template @@ -1,7 +1,7 @@ # Template file for 'lua54' pkgname=lua54 -version=5.4.3 -revision=2 +version=5.4.4 +revision=1 wrksrc=lua-${version} makedepends="readline-devel" short_desc="Powerful, fast, lightweight, embeddable scripting language (5.4.x)" @@ -9,7 +9,7 @@ maintainer="q66 " license="MIT" homepage="https://www.lua.org" distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz" -checksum=f8612276169e3bfcbcfb8f226195bfc6e466fe13042f1076cbde92b7ec96bbfb +checksum=164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61 alternatives=" lua:lua:/usr/bin/lua5.4 From d0eabbe986e7ac14583109fc56d37db0cf1e08e7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 15 May 2022 09:30:59 +0200 Subject: [PATCH 2299/2369] vala: update to 0.56.1. --- srcpkgs/vala/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index 51b0dd9c836..14d09193d09 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -1,7 +1,7 @@ # Template file for 'vala' pkgname=vala # Should be kept in sync with 'valadoc' (shared distfiles) -version=0.56.0 +version=0.56.1 revision=1 build_style=gnu-configure configure_args="--disable-valadoc" @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Vala" changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040 +checksum=c518b81dfdda82d1cdf586b3f9b2323162cb96bd3cb5a2c03650cea025d91fb9 shlib_provides="libvalaccodegen.so" make_check=extended From dbde046498debb69a5d84197cbeccad541b9e7eb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 15 May 2022 09:31:00 +0200 Subject: [PATCH 2300/2369] valadoc: update to 0.56.1. --- srcpkgs/valadoc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template index 416fee531d3..6ea65ef96f0 100644 --- a/srcpkgs/valadoc/template +++ b/srcpkgs/valadoc/template @@ -1,7 +1,7 @@ # Template file for 'valadoc' pkgname=valadoc # Should be kept in sync with 'vala' (shared distfiles) -version=0.56.0 +version=0.56.1 revision=1 wrksrc="vala-${version}" build_style=gnu-configure @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Vala" changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040 +checksum=c518b81dfdda82d1cdf586b3f9b2323162cb96bd3cb5a2c03650cea025d91fb9 pre_configure() { autoreconf -if From afb7004ab04950729d66f6b1239f46d807c84953 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Wed, 13 Apr 2022 14:43:18 +0300 Subject: [PATCH 2301/2369] swaybg: update to 1.1.1. --- srcpkgs/swaybg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template index d7d2d92e609..dad5bb60876 100644 --- a/srcpkgs/swaybg/template +++ b/srcpkgs/swaybg/template @@ -1,6 +1,6 @@ # Template file for 'swaybg' pkgname=swaybg -version=1.1 +version=1.1.1 revision=1 build_style=meson hostmakedepends="pkg-config wayland-devel scdoc git" @@ -10,7 +10,7 @@ maintainer="Derriick " license="MIT" homepage="https://swaywm.org" distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz" -checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1 +checksum=71cc8fc2cb7ae5ad3af772ab286b0b42f1c7cb17bea131e78c2d40a2fb8e6c59 post_install() { vlicense LICENSE From bf7179275d5496daf9e62c27be844876297d4ef0 Mon Sep 17 00:00:00 2001 From: Omar Zeghouani Date: Tue, 8 Mar 2022 11:32:28 +0000 Subject: [PATCH 2302/2369] swaylock: update to 1.6. --- srcpkgs/swaylock/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/swaylock/template b/srcpkgs/swaylock/template index ea7556286cb..5908bfe376a 100644 --- a/srcpkgs/swaylock/template +++ b/srcpkgs/swaylock/template @@ -1,6 +1,6 @@ # Template file for 'swaylock' pkgname=swaylock -version=1.5 +version=1.6 revision=1 build_style=meson conf_files="/etc/pam.d/swaylock" @@ -12,7 +12,7 @@ maintainer="Derriick " license="MIT" homepage="https://swaywm.org" distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz" -checksum=37b9c70e5698e8872b0b964a7454ecdb0f1a9e06b686eecf2b6c54f7f64a3f42 +checksum=b9181e15d8166bba3a29dabb392cfe94568e4ceb358d388a812cd28c3f61bbe3 post_install() { vlicense LICENSE From e4d0b185498b2b0995602008e207186298e0dd99 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 21 May 2022 17:58:39 +0400 Subject: [PATCH 2303/2369] osinfo-db: update to 20220516. --- srcpkgs/osinfo-db/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template index 0e691fee16c..40d6db98537 100644 --- a/srcpkgs/osinfo-db/template +++ b/srcpkgs/osinfo-db/template @@ -1,6 +1,6 @@ # Template file for 'osinfo-db' pkgname=osinfo-db -version=20220214 +version=20220516 revision=1 build_style=fetch hostmakedepends="osinfo-db-tools" @@ -9,7 +9,7 @@ maintainer="skmpz " license="GPL-2.0-or-later" homepage="https://libosinfo.org" distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz" -checksum=13e6c900eb8200f1660f8a1ed775ececd5a01fdb24bfb6eee1ce65dd7bcfd3a9 +checksum=d60f69d8afc9dcc53d76a2fb68d54c26d1fdc3a822b95c1801de58c3c66cda6d skip_extraction="${pkgname}-${version}.tar.xz" do_install() { From de482217770aecc91ac63619135f90f36d3b4b8f Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 21 May 2022 17:04:05 +0300 Subject: [PATCH 2304/2369] snapper: update to 0.10.2. --- common/shlibs | 2 +- srcpkgs/snapper/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7f3e1458f7a..05810966465 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1437,7 +1437,7 @@ libgfrpc.so.0 libglusterfs-8.3_2 libgfxdr.so.0 libglusterfs-8.3_2 libgfapi.so.0 libglusterfs-8.3_2 libglusterd.so.0 libglusterfs-8.3_2 -libsnapper.so.5 libsnapper-0.4.1_1 +libsnapper.so.6 libsnapper-0.10.2_1 libtsm.so.3 libtsm-3_1 libxine.so.2 libxine-1.2.4_1 libjbig2dec.so.0 libjbig2dec-0.11_1 diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 4e481e6ab99..bc7bbe5cf84 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,6 +1,6 @@ # Template file for 'snapper' pkgname=snapper -version=0.9.1 +version=0.10.2 revision=1 build_style=gnu-configure configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d" @@ -17,7 +17,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="http://snapper.io" distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz" -checksum=8150d8de439836f39d6dd530a0837ba02effbc28b9d2ce8791fda66087565352 +checksum=85cfecebe5c5023abce8cb7f985be59e5a5159d2f8dd637f3cca46c17124d7aa lib32disabled=yes if [ "$XBPS_TARGET_LIBC" = musl ] From 7133bb33e89ced57e3802a7a67363c4a077167ee Mon Sep 17 00:00:00 2001 From: Urs Schulz Date: Fri, 20 May 2022 12:53:43 +0200 Subject: [PATCH 2305/2369] nix: update to 2.8.1. --- srcpkgs/nix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index b6352688454..bb585b6d7d5 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,6 +1,6 @@ # Template file for 'nix' pkgname=nix -version=2.8.0 +version=2.8.1 revision=1 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. @@ -17,7 +17,7 @@ license="LGPL-2.1-or-later" homepage="https://nixos.org/nix/" changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes" distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz" -checksum=91a7f2bcdde3263927d842f04a345ed77319148c700e2c8be01498724e6808c0 +checksum=6f19455775523fca4ae4096e6a6fc493f577198b968811f7fa77eb1fa5213b43 disable_parallel_build=yes nocross="cross build populates /usr/lib32 with libraries and tries to link against them" From 74bee372b39b84646b82649e640b41cc5ab97471 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Fri, 13 May 2022 07:00:42 +0200 Subject: [PATCH 2306/2369] python3-libtmux: update to version 0.11.0 Signed-off-by: Alexander Egorenkov --- srcpkgs/python3-libtmux/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-libtmux/template b/srcpkgs/python3-libtmux/template index 0e7f610e0d6..e4f3736977d 100644 --- a/srcpkgs/python3-libtmux/template +++ b/srcpkgs/python3-libtmux/template @@ -1,6 +1,6 @@ # Template file for 'python3-libtmux' pkgname=python3-libtmux -version=0.10.3 +version=0.11.0 revision=1 wrksrc="libtmux-${version}" build_style=python3-module @@ -11,7 +11,7 @@ maintainer="Alexander Egorenkov " license="MIT" homepage="https://github.com/tmux-python/libtmux" distfiles="${PYPI_SITE}/l/libtmux/libtmux-${version}.tar.gz" -checksum=c7fbd837f0a9e4d33a157523e4ca6ef95e80256842e094ffd766c3dbd78d1957 +checksum=d82cf391097eb69d784d889d482bb99284b984aa6225276a3dc1af8c1460dd3c # Disable check which uses pip to pull external python packages make_check=no From 20c6c5a1bb6e35738d88f8951b8de2fcf07aff73 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Fri, 13 May 2022 07:01:09 +0200 Subject: [PATCH 2307/2369] python3-tmuxp: update to version 1.10.1 Signed-off-by: Alexander Egorenkov --- srcpkgs/python3-tmuxp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-tmuxp/template b/srcpkgs/python3-tmuxp/template index 07a81064e70..22725c04b3d 100644 --- a/srcpkgs/python3-tmuxp/template +++ b/srcpkgs/python3-tmuxp/template @@ -1,6 +1,6 @@ # Template file for 'python3-tmuxp' pkgname=python3-tmuxp -version=1.9.4 +version=1.10.1 revision=1 wrksrc="tmuxp-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Alexander Egorenkov " license="MIT" homepage="https://github.com/tmux-python/tmuxp/" distfiles="${PYPI_SITE}/t/tmuxp/tmuxp-${version}.tar.gz" -checksum=4d7e748d58972736438b6d1299798808048e3e4649300abe6e46d285938b1b0e +checksum=7ac9556d3a92cedf703846532e5ae8004f1c37731d686a54b046fa01f38b7c92 conflicts="python-tmuxp>=0" do_check() { From 2e6480703cadc15fb61029212218b4d75f882920 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sat, 14 May 2022 14:01:12 +0530 Subject: [PATCH 2308/2369] ddcci-dkms: update to 0.4.2, fix update-check --- srcpkgs/ddcci-dkms/template | 11 ++++++----- srcpkgs/ddcci-dkms/update | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/ddcci-dkms/update diff --git a/srcpkgs/ddcci-dkms/template b/srcpkgs/ddcci-dkms/template index 958e1c63c6e..ec8e3fcd2b7 100644 --- a/srcpkgs/ddcci-dkms/template +++ b/srcpkgs/ddcci-dkms/template @@ -1,20 +1,21 @@ # Template file for 'ddcci-dkms' pkgname=ddcci-dkms -version=0.4.1 +version=0.4.2 revision=1 wrksrc="ddcci-driver-linux-v${version}" -makedepends="linux-headers kmod" depends="dkms" short_desc="Pair of Linux kernel drivers for DDC/CI monitors (DKMS)" -maintainer="Iskander Zemmouri " +maintainer="Subhaditya Nath " license="GPL-2.0-or-later" homepage="https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/" distfiles="https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/archive/v${version}/ddcci-driver-linux-v${version}.tar.gz" -checksum=518859ebb0e553a333e8b19a2eccff0f48af1b5b91469678dfb74f1b4357893b +checksum=ae70c6049c9020ce0557f3ccf3a3982be760c007410eb0441c668f30116edabd dkms_modules="ddcci ${version}" do_install() { + vdoc README.md + rm LICENSE README.md + vmkdir usr/src/ddcci-${version} vcopy "*" usr/src/ddcci-${version} - vdoc "README.md" } diff --git a/srcpkgs/ddcci-dkms/update b/srcpkgs/ddcci-dkms/update new file mode 100644 index 00000000000..c0a70d9179b --- /dev/null +++ b/srcpkgs/ddcci-dkms/update @@ -0,0 +1 @@ +pkgname=ddcci-driver-linux From f8c8f088985cb9e0b884c4445bdf5c2f872a3fc3 Mon Sep 17 00:00:00 2001 From: teldra Date: Fri, 20 May 2022 10:12:25 +0200 Subject: [PATCH 2309/2369] gparted: update to 1.4.0. --- .../gparted/patches/fix_musl_basename.patch | 58 +++++++++++++++++++ srcpkgs/gparted/template | 4 +- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gparted/patches/fix_musl_basename.patch diff --git a/srcpkgs/gparted/patches/fix_musl_basename.patch b/srcpkgs/gparted/patches/fix_musl_basename.patch new file mode 100644 index 00000000000..607580d8177 --- /dev/null +++ b/srcpkgs/gparted/patches/fix_musl_basename.patch @@ -0,0 +1,58 @@ +From 45c00927b72319f00855c7feaf4dcf109b3e4414 Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Fri, 8 Apr 2022 08:58:46 +0000 +Subject: [PATCH] Use POSIX basename() in BCache_Info.cc (!99) + +Musl libc [1][2] doesn't implement the GNU variant of basename() [3][4], +obtained via #include . Therefore GParted fails to build on +such distributions: + + fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/recipe-sysroot-native=-fvisibility-inlines-hidden -c -o ../../gparted-1.4.0/src/BCache_Info.cc:52:33: + + error: use of undeclared identifier 'basename'; did you mean 'g_basename'? + return "/dev/" + Glib::ustring(basename(buf)); + ^~~~~~~~ + g_basename + +Fix by using the POSIX implementation of basename() [5] instead, +obtained via #include , which musl libc does implement [6]. +Note that the POSIX implementation of basename() is allowed to modify +the string passed to it. This is okay because +BCache_Info::get_bcache_device() is using a modifiable local character +buffer. + +[1] musl libc + https://musl.libc.org/ +[2] Projects using musl + https://wiki.musl-libc.org/projects-using-musl.html +[3] The GNU C Library, 5.10 Finding Tokens in a String + https://www.gnu.org/software/libc/manual/html_node/Finding-Tokens-in-a-String.html +[4] basename(3) - Linux manual page + https://man7.org/linux/man-pages/man3/basename.3.html +[5] POSIX basename() + https://pubs.opengroup.org/onlinepubs/009695399/functions/basename.html +[6] musl source, basename.c + http://git.musl-libc.org/cgit/musl/tree/src/misc/basename.c + +Closes !99 - Fix undeclared identifier 'basename' build failure with + musl libc +--- + src/BCache_Info.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/BCache_Info.cc b/src/BCache_Info.cc +index 129a5178..aecc9ef1 100644 +--- a/src/BCache_Info.cc ++++ b/src/BCache_Info.cc +@@ -17,7 +17,7 @@ + + #include "BCache_Info.h" + +-#include // GNU version of basename() ++#include // POSIX version of basename() + #include + #include + #include +-- +GitLab + diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template index db6d5981008..d671afacf5b 100644 --- a/srcpkgs/gparted/template +++ b/srcpkgs/gparted/template @@ -1,6 +1,6 @@ # Template file for 'gparted' pkgname=gparted -version=1.3.1 +version=1.4.0 revision=1 build_style=gnu-configure configure_args="--enable-libparted-dmraid" @@ -13,7 +13,7 @@ maintainer="teldra " license="GPL-2.0-or-later" homepage="https://gparted.sourceforge.io" distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz" -checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109 +checksum=e5293a792e53fdbeba29c4a834113cd9603d0d639330da931a468bf3687887be # Some tests are known to fail since 1.1.0 # This disables these: From 0a86c644260f44f914fdf76f7b266d8edbc813ab Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 21 May 2022 17:52:04 +0300 Subject: [PATCH 2310/2369] mercurial: update to 6.1.2. --- srcpkgs/mercurial/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template index 26795f34512..e4681712a49 100644 --- a/srcpkgs/mercurial/template +++ b/srcpkgs/mercurial/template @@ -1,6 +1,6 @@ # Template file for 'mercurial' pkgname=mercurial -version=6.1 +version=6.1.2 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=86f98645e4565a9256991dcde22b77b8e7d22ca6fbb60c1f4cdbd8469a38cc1f +checksum=a52810fc01409828c4974d0bc2cbb5c80e948d5b584cfb1a7699623e924a2f2a pre_check() { if [ "$XBPS_TARGET_LIBC" = musl ]; then From eb3df314192ddb5814c8b10a4fbee1082fc99052 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 21 May 2022 18:13:42 +0300 Subject: [PATCH 2311/2369] geany-plugins: update to 1.38.0. --- srcpkgs/geany-plugins/patches/pr-1053.patch | 40 --------------------- srcpkgs/geany-plugins/template | 4 +-- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 srcpkgs/geany-plugins/patches/pr-1053.patch diff --git a/srcpkgs/geany-plugins/patches/pr-1053.patch b/srcpkgs/geany-plugins/patches/pr-1053.patch deleted file mode 100644 index 7731b62abcd..00000000000 --- a/srcpkgs/geany-plugins/patches/pr-1053.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ad50d3ed2ddfe11cd07954786b96725602fb4ddd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alexander=20F=2E=20R=C3=B8dseth?= -Date: Tue, 5 Jan 2021 12:57:27 +0100 -Subject: [PATCH] Use stdbool.h istead of redefining bool - -Redefining bool causes errors when used together with ie. GCC 10.2.0 ---- - pretty-printer/src/PrettyPrinter.h | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/pretty-printer/src/PrettyPrinter.h b/pretty-printer/src/PrettyPrinter.h -index 268986e95..4200db612 100644 ---- a/pretty-printer/src/PrettyPrinter.h -+++ b/pretty-printer/src/PrettyPrinter.h -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_GLIB - #include -@@ -52,15 +53,13 @@ - #define TRUE !(FALSE) - #endif - --typedef unsigned int bool; -- - /*========================================== STRUCTURES =======================================================*/ - - /** - * The PrettyPrintingOptions struct allows the programmer to tell the - * PrettyPrinter how it must format the XML output. - */ --typedef struct -+typedef struct - { - const char* newLineChars; /* char used to generate a new line (generally \r\n) */ - char indentChar; /* char used for indentation */ - diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template index 8038f5f3704..af278577101 100644 --- a/srcpkgs/geany-plugins/template +++ b/srcpkgs/geany-plugins/template @@ -1,6 +1,6 @@ # Template file for 'geany-plugins' pkgname=geany-plugins -version=1.37.0 +version=1.38.0 revision=1 build_style=gnu-configure configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp @@ -16,7 +16,7 @@ license="GPL-2.0-or-later" homepage="http://plugins.geany.org" changelog="https://raw.githubusercontent.com/geany/geany-plugins/master/NEWS" distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz" -checksum=14df1dda3760eedd3a28daba0788f3bee5b83ae31f042c57a78c20f37a77eb28 +checksum=86d2fe05290136d020b0d22f849a1aaa74b83cb49b767ae2dc19aaedcdf3d469 pre_configure() { NOCONFIGURE=1 ./autogen.sh From e839b80bf3d8be24f48bc063095572a48e02ce93 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Sat, 21 May 2022 10:42:57 -0400 Subject: [PATCH 2312/2369] NetworkManager: update to 1.38.0 --- srcpkgs/NetworkManager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 5502f41159d..d3ba80c8165 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,6 +1,6 @@ # Template file for 'NetworkManager' pkgname=NetworkManager -version=1.36.2 +version=1.38.0 revision=1 build_style=meson build_helper="gir qemu" @@ -35,7 +35,7 @@ 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=ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab +checksum=82a4cf07ddfeb0816787b67c0f5058ae6c50d6259c0b0541a24e35156062b2ef # TODO: Some tests require network namespaces to run. make_check=extended lib32disabled=yes From af4e3d9638217188801038b757025b61852b0252 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Wed, 11 May 2022 07:18:13 -0500 Subject: [PATCH 2313/2369] gns3-server: update to 2.2.32. --- .../gns3-server/patches/requirements.patch | 22 ------------------- srcpkgs/gns3-server/template | 15 ++++++++----- 2 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 srcpkgs/gns3-server/patches/requirements.patch diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch deleted file mode 100644 index 27cd2441e53..00000000000 --- a/srcpkgs/gns3-server/patches/requirements.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt ---- a/requirements.txt -+++ b/requirements.txt -@@ -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.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 -+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 c45f0a8f8b8..9b8660a4317 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -1,11 +1,11 @@ # Template file for 'gns3-server' pkgname=gns3-server -version=2.2.31 -revision=2 +version=2.2.32 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl - python3-Jinja2 python3-psutil python3-aiofiles +depends="python3-setuptools python3-jsonschema python3-aiohttp python3-aiohttp-cors + python3-yarl python3-Jinja2 python3-psutil python3-aiofiles python3-py-cpuinfo python3-distro python3-async-timeout dynamips" checkdepends="${depends} python3-pytest python3-flake8 python3-pytest-timeout python3-pytest-aiohttp" short_desc="Graphical Network Simulator 3 - Server" @@ -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=10a530866a156cea6b544be9b557f61ca0baa7e58c3064d79a1d523b70301edc +checksum=9e208622f91fdca217964e9b93121d85b1415f7d26ba106be035a079beb21519 # The source archive contains statically linked artifacts for x86_64 # glibc, since this is the only architecture supported by upstream, we @@ -23,3 +23,8 @@ checksum=10a530866a156cea6b544be9b557f61ca0baa7e58c3064d79a1d523b70301edc # for gns3. For more information, see this ticket: # https://github.com/GNS3/gns3-server/issues/970 archs="x86_64" + +post_patch() { + # comment out requirements since versions are usually out of sync with Void packages + vsed -e 's|^|#|' -i requirements.txt +} From c2c9366ba0abfdeeecc8f55876915c6b17f81d60 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Wed, 11 May 2022 07:18:17 -0500 Subject: [PATCH 2314/2369] gns3-gui: update to 2.2.32. --- srcpkgs/gns3-gui/patches/requirements.patch | 14 -------------- srcpkgs/gns3-gui/template | 12 +++++++++--- 2 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/gns3-gui/patches/requirements.patch diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch deleted file mode 100644 index 6cf6d68d94c..00000000000 --- a/srcpkgs/gns3-gui/patches/requirements.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,6 +1,5 @@ --jsonschema==3.2.0 -+jsonschema>=3.2.0 --sentry-sdk==1.5.4 --psutil==5.9.0 -+psutil>=5.9.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 348325010d7..b5d09ed345d 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=2 +version=2.2.32 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-psutil python3-jsonschema @@ -14,7 +14,13 @@ 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=7b6f041f88a63dc44e33680ea489556abc7d96d1c3d4bb5d85dd15b15db6d036 +checksum=a43f51567ac69db894d2ac6e41edf1549bc992ddf98979e1576c59b08571d943 + + +post_patch() { + # comment out requirements since versions are usually out of sync with Void packages + vsed -e 's|^|#|' -i requirements.txt +} post_install() { vinstall gns3-gui.desktop 644 usr/share/applications From f259f63f16a9c6893a932dc30a2f9d9e3db41693 Mon Sep 17 00:00:00 2001 From: Mat Boehlke Date: Tue, 17 May 2022 21:11:22 -0500 Subject: [PATCH 2315/2369] recutils: update to 1.9. --- srcpkgs/recutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/recutils/template b/srcpkgs/recutils/template index 3e71312c4e2..0e34d8190fd 100644 --- a/srcpkgs/recutils/template +++ b/srcpkgs/recutils/template @@ -1,6 +1,6 @@ # Template file for 'recutils' pkgname=recutils -version=1.8 +version=1.9 revision=1 build_style=gnu-configure configure_args="--with-bash-headers --disable-rpath" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/recutils/" distfiles="${GNU_SITE}/recutils/recutils-${version}.tar.gz" -checksum=df8eae69593fdba53e264cbf4b2307dfb82120c09b6fab23e2dad51a89a5b193 +checksum=6301592b0020c14b456757ef5d434d49f6027b8e5f3a499d13362f205c486e0e librec1_package() { short_desc+=" - rec1 library" From b3b2cdb72385e4cac102913d4c64e97b12ebf1e5 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Thu, 28 Apr 2022 22:04:43 +0530 Subject: [PATCH 2316/2369] lsof: update to 4.95.0, fix man page, adopt Development has moved to a GitHub repo, so download release tarballs from there. --- srcpkgs/lsof/patches/fix-tests.patch | 16 +++++++++++ srcpkgs/lsof/patches/lsof.8.patch | 23 +++++++++++++++ srcpkgs/lsof/template | 43 ++++++++++++++-------------- 3 files changed, 60 insertions(+), 22 deletions(-) create mode 100644 srcpkgs/lsof/patches/fix-tests.patch create mode 100644 srcpkgs/lsof/patches/lsof.8.patch diff --git a/srcpkgs/lsof/patches/fix-tests.patch b/srcpkgs/lsof/patches/fix-tests.patch new file mode 100644 index 00000000000..bd9fa284d19 --- /dev/null +++ b/srcpkgs/lsof/patches/fix-tests.patch @@ -0,0 +1,16 @@ +This patch eliminates the need to modify /etc/hosts + +--- a/tests/LTsock.c ++++ b/tests/LTsock.c +@@ -255,10 +255,7 @@ main(argc, argv) + * Get the host name and its IP address. Convert the IP address to dotted + * ASCII form. + */ +- if (gethostname(hnm, sizeof(hnm) - 1)) { +- cem = "ERROR!!! can't get this host's name"; +- goto print_errno; +- } ++ strncpy(hnm, "localhost", sizeof(hnm) - 1); + hnm[sizeof(hnm) - 1] = '\0'; + if (!(hp = gethostbyname(hnm))) { + (void) snprintf(buf, bufl - 1, "ERROR!!! can't get IP address for %s", diff --git a/srcpkgs/lsof/patches/lsof.8.patch b/srcpkgs/lsof/patches/lsof.8.patch new file mode 100644 index 00000000000..ecb21013512 --- /dev/null +++ b/srcpkgs/lsof/patches/lsof.8.patch @@ -0,0 +1,23 @@ +--- a/lsof.8 ++++ b/lsof.8 +@@ -1,7 +1,7 @@ + .so ./version + .TH LSOF 8 Revision-\*(VN +-\" Register )P is used neither by this file nor any groff macro. However, +-\" some versions of nroff require it. ++.\" Register )P is used neither by this file nor any groff macro. However, ++.\" some versions of nroff require it. + .if !\n(.g \{\ + . if !\n()P .nr )P 1v + .\} +@@ -967,8 +967,8 @@ where: + .br + applies to all IP versions. + .br +- \fIprotocol\fP is a protocol name \- \fBTCP\fP, \fBUDP\fP +-.br or \fBUDPLITE\fP. ++ \fIprotocol\fP is a protocol name \- \fBTCP\fP, \fBUDP\fP or \fBUDPLITE\fP. ++.br + .br + \fIhostname\fP is an Internet host name. Unless a + .br diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template index 2c13c23beed..0151fb4a9e8 100644 --- a/srcpkgs/lsof/template +++ b/srcpkgs/lsof/template @@ -1,46 +1,45 @@ # Template file for 'lsof' pkgname=lsof -version=4.94.0 +version=4.95.0 revision=1 +wrksrc="${pkgname}_${version}.linux" build_style=configure configure_script="./Configure" configure_args="-n linux" -hostmakedepends="perl which" +make_check_target="all" +make_check_args="-C tests" +hostmakedepends="perl" short_desc="LiSt Open Files" -maintainer="Orphaned " +maintainer="Subhaditya Nath " license="custom:lsof" -homepage="https://people.freebsd.org/~abe/" -distfiles="https://fossies.org/linux/misc/lsof-${version}.tar.gz" -checksum=a9865eeb581c3abaac7426962ddb112ecfd86a5ae93086eb4581ce100f8fa8f4 +homepage="https://github.com/lsof-org/lsof" +changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST" +distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof_${version}.linux.tar.bz2" +checksum=e9faa0fbcc48638c1d1f143e93573ac43b65e76646150f83e24bd8c18786303c + +post_extract() { + # See: https://github.com/lsof-org/lsof/issues/61 + # The TestDB was meant for storing known-good configurations, and + # skipping tests if the current system configuration exists in the + # TestDB. But we don't want that. + rm tests/CkTestDB + ln -s /bin/true tests/CkTestDB +} pre_configure() { export LSOF_CC="$CC" export LSOF_CFGF="$CFLAGS" export LSOF_CFGL="$LDFLAGS" export LSOF_INCLUDE="${XBPS_CROSS_BASE}/usr/include" + export LSOF_MAKE="$(command -v make)" vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \ -i dialects/linux/machine.h } -pre_check() { - # test resolves hostname - cp /etc/hosts ./hosts - printf '# +++ xbps-src +++ required for lsof tests\n127.0.0.100 %s\n' "$(hostname)" >> /etc/hosts - # write current config to test db - cd tests && ./Add2TestDB -} -do_check() { - make -C tests -} -post_check() { - # cleanup polluted hosts file - mv ./hosts /etc/hosts -} - do_install() { vbin lsof - vman Lsof.8 lsof.8 + vman lsof.8 # extract license from readme sed -n 00README -e '/^License/,/\*\/$/p' > License From 57ad252c6bc80521d552a3ee8d4e26b4926901a6 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sun, 22 May 2022 08:56:26 +0200 Subject: [PATCH 2317/2369] wine: update to 7.9. --- srcpkgs/wine/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 6fa72d3b0d6..e7ab2a160f6 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=7.8 +version=7.9 revision=1 _pkgver=${version/r/-r} create_wrksrc=yes @@ -13,8 +13,8 @@ license="LGPL-2.1-or-later" homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz" -checksum="8f76e9c96b50f2ac8e24e5deedfa3e0d9596a5706709226f65a94c6a160019b8 - 2561142889a700534b1d710d000cd6d819b9ed23c55b0f66b5af878b4a29a587" +checksum="d0c3cdcb25f7f0a667f3cf1548d58355060e95bb49a17936f6326d6b10cbb95c + 38e0011aba31e48195666a7911e9069c9d95866f5d20c5fa4f96309913487d0f" build_options="mingw staging xshm" build_options_default="mingw xshm" From 7021555821993ecd3ae1eea6a1c9e005260d8bdb Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sun, 22 May 2022 08:58:41 +0200 Subject: [PATCH 2318/2369] linux5.4: broken on aarch64 for now --- srcpkgs/linux5.4/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template index dc99ee2e416..fb7bd487f12 100644 --- a/srcpkgs/linux5.4/template +++ b/srcpkgs/linux5.4/template @@ -25,6 +25,11 @@ _kernver="${version}_${revision}" triggers="kernel-hooks" kernel_hooks_version="${_kernver}" +case "$XBPS_TARGET_MACHINE" in + aarch64*) broken="https://build.voidlinux.org/builders/aarch64_builder/builds/37218/steps/shell_3/logs/stdio";; +esac + + # These files could be modified when an external module is built. mutable_files=" /usr/lib/modules/${_kernver}/modules.builtin.bin From b26e7e8eeaf6596281e0ad5a378264895a1978ea Mon Sep 17 00:00:00 2001 From: Martin Dimov Date: Mon, 9 May 2022 18:29:26 +0300 Subject: [PATCH 2319/2369] python3-chardet: fix split with python2 pkg, revbump Fix depends. Drop alternatives (wrong and also obsolete). Add conflict with the python2 version of the pkgs (as it still exist in the official bin repos) to ensure that there won't be any issues. --- srcpkgs/python3-chardet/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-chardet/template b/srcpkgs/python3-chardet/template index bc5dfe6ee5e..e4e30c7b894 100644 --- a/srcpkgs/python3-chardet/template +++ b/srcpkgs/python3-chardet/template @@ -1,11 +1,11 @@ # Template file for 'python3-chardet' pkgname=python3-chardet version=4.0.0 -revision=3 +revision=4 wrksrc="chardet-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-setuptools" +depends="python3" checkdepends="python3-pytest" short_desc="Universal encoding detector" maintainer="Alessio Sergi " @@ -13,4 +13,4 @@ license="LGPL-2.1-only" homepage="https://github.com/chardet/chardet" distfiles="${PYPI_SITE}/c/chardet/chardet-${version}.tar.gz" checksum=0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa -alternatives="chardet:chardetect:/usr/bin/chardetect2" +conflicts="python-chardet" From 610e812c187e58d6a1c43ce7d0195070f51100c1 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Mar 2022 20:47:03 +0100 Subject: [PATCH 2320/2369] python3-jaraco.classes: update to 3.2.1. --- srcpkgs/python3-jaraco.classes/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/python3-jaraco.classes/template b/srcpkgs/python3-jaraco.classes/template index 1c0f76247a6..bcfad68459e 100644 --- a/srcpkgs/python3-jaraco.classes/template +++ b/srcpkgs/python3-jaraco.classes/template @@ -1,20 +1,19 @@ # Template file for 'python3-jaraco.classes' pkgname=python3-jaraco.classes -version=3.1.0 -revision=4 +version=3.2.1 +revision=1 wrksrc="jaraco.classes-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools_scm" -depends="python3-jaraco python3-more-itertools" +build_style=python3-pep517 +hostmakedepends="python3-wheel python3-setuptools_scm" +depends="python3-more-itertools" short_desc="Utility functions for Python class constructs (Python3)" maintainer="bra1nwave " license="MIT" homepage="https://github.com/jaraco/jaraco.classes" changelog="https://raw.githubusercontent.com/jaraco/jaraco.classes/master/CHANGES.rst" distfiles="${PYPI_SITE}/j/jaraco.classes/jaraco.classes-${version}.tar.gz" -checksum=c38698ff8ef932eb33d91c0e8fc192ad7c44ecee03f7f585afd4f35aeaef7aab +checksum=ed54b728af1937dc16b7236fbaf34ba561ba1ace572b03fffa5486ed363ecf34 post_install() { - rm -r ${DESTDIR}/${py3_sitelib}/jaraco/__init__.py vlicense LICENSE } From c783ee8ae600bb8d88fed4bc25961966fba1d97b Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Mar 2022 20:47:07 +0100 Subject: [PATCH 2321/2369] python3-jaraco.collections: update to 3.5.1. --- srcpkgs/python3-jaraco.collections/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/python3-jaraco.collections/template b/srcpkgs/python3-jaraco.collections/template index b82e8908866..c7d643a4f92 100644 --- a/srcpkgs/python3-jaraco.collections/template +++ b/srcpkgs/python3-jaraco.collections/template @@ -1,20 +1,19 @@ # Template file for 'python3-jaraco.collections' pkgname=python3-jaraco.collections -version=3.0.0 -revision=4 +version=3.5.1 +revision=1 wrksrc="jaraco.collections-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools_scm" -depends="python3-jaraco.classes python3-jaraco.text python3-six" +build_style=python3-pep517 +hostmakedepends="python3-wheel python3-setuptools_scm" +depends="python3-jaraco.classes python3-jaraco.text" short_desc="Collection of objects similar to stdlib by jaraco (Python3)" maintainer="bra1nwave " license="MIT" homepage="https://github.com/jaraco/jaraco.collections" changelog="https://raw.githubusercontent.com/jaraco/jaraco.collections/master/CHANGES.rst" distfiles="${PYPI_SITE}/j/jaraco.collections/jaraco.collections-${version}.tar.gz" -checksum=be570ef4f2e7290b757449395238fa63d70a9255574624e73c5ff9f1ee554721 +checksum=b04f00bd4b3c4fc4ba5fe1baf8042c0efd192b13e386830ea23fff77bb69dc88 post_install() { - rm -r ${DESTDIR}/${py3_sitelib}/jaraco/__init__.py vlicense LICENSE } From 2a8b7f52480aa0046f6fefe4bb44c908f26b608a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Mar 2022 20:47:11 +0100 Subject: [PATCH 2322/2369] python3-jaraco.functools: update to 3.5.0. --- srcpkgs/python3-jaraco.functools/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-jaraco.functools/template b/srcpkgs/python3-jaraco.functools/template index 543cd11ec3b..da6c540ba7a 100644 --- a/srcpkgs/python3-jaraco.functools/template +++ b/srcpkgs/python3-jaraco.functools/template @@ -1,12 +1,12 @@ # Template file for 'python3-jaraco.functools' pkgname=python3-jaraco.functools -version=3.3.0 -revision=2 +version=3.5.0 +revision=1 wrksrc="jaraco.functools-${version}" -build_style=python3-module +build_style=python3-pep517 make_check_args="--override-ini='addopts=--doctest-modules'" -hostmakedepends="python3-setuptools_scm python3-more-itertools" -depends="python3-more-itertools python3-jaraco" +hostmakedepends="python3-wheel python3-setuptools_scm" +depends="python3-more-itertools" checkdepends="${depends} python3-pytest python3-jaraco.classes" short_desc="Functools like those found in stdlib (Python3)" maintainer="bra1nwave " @@ -14,7 +14,7 @@ license="MIT" homepage="https://github.com/jaraco/jaraco.functools" changelog="https://raw.githubusercontent.com/jaraco/jaraco.functools/master/CHANGES.rst" distfiles="${PYPI_SITE}/j/jaraco.functools/jaraco.functools-${version}.tar.gz" -checksum=bfcf7da71e2a0e980189b0744b59dba6c1dcf66dcd7a30f8a4413e478046b314 +checksum=31e0e93d1027592b7b0bec6ad468db850338981ebee76ba5e212e235f4c7dda0 post_install() { vlicense LICENSE From 91c898a12547e79c9d66340e81c2cc70295cd0ad Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Mar 2022 21:16:37 +0100 Subject: [PATCH 2323/2369] New package: python3-jaraco.context-4.1.1 --- srcpkgs/python3-jaraco.context/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/python3-jaraco.context/template diff --git a/srcpkgs/python3-jaraco.context/template b/srcpkgs/python3-jaraco.context/template new file mode 100644 index 00000000000..dcd72f5723d --- /dev/null +++ b/srcpkgs/python3-jaraco.context/template @@ -0,0 +1,18 @@ +# Template file for 'python3-jaraco.context' +pkgname=python3-jaraco.context +version=4.1.1 +revision=1 +wrksrc="jaraco.context-${version}" +build_style=python3-pep517 +hostmakedepends="python3-wheel python3-setuptools_scm" +short_desc="Context managers by jaraco" +maintainer="Orphaned " +license="MIT" +homepage="https://github.com/jaraco/jaraco.context" +changelog="https://raw.githubusercontent.com/jaraco/jaraco.context/master/CHANGES.rst" +distfiles="${PYPI_SITE}/j/jaraco.context/jaraco.context-${version}.tar.gz" +checksum=f0d4d82ffbbbff680384eba48a32a3167f12a91a30a7db56fd97b87e73a87241 + +post_install() { + vlicense LICENSE +} From 450c7872be71268ae28107e5609ca27bf999c6b5 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Mar 2022 20:47:16 +0100 Subject: [PATCH 2324/2369] python3-jaraco.text: update to 3.7.0. --- srcpkgs/python3-jaraco.text/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/python3-jaraco.text/template b/srcpkgs/python3-jaraco.text/template index bc551cdabe7..cba91bbe623 100644 --- a/srcpkgs/python3-jaraco.text/template +++ b/srcpkgs/python3-jaraco.text/template @@ -1,20 +1,20 @@ # Template file for 'python3-jaraco.text' pkgname=python3-jaraco.text -version=3.2.0 -revision=4 +version=3.7.0 +revision=1 wrksrc="jaraco.text-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools_scm" -depends="python3-jaraco.functools python3-six" +build_style=python3-pep517 +hostmakedepends="python3-wheel python3-setuptools_scm" +depends="python3-jaraco.functools python3-six python3-jaraco.context" +checkdepends="$depends python3-pytest" short_desc="Module for text manipulation (Python3)" maintainer="bra1nwave " license="MIT" homepage="https://github.com/jaraco/jaraco.text" changelog="https://raw.githubusercontent.com/jaraco/jaraco.text/master/CHANGES.rst" distfiles="${PYPI_SITE}/j/jaraco.text/jaraco.text-${version}.tar.gz" -checksum=e5078b1126cc0f166c7859aa75103a56c0d0f39ebcafc21695615472e0f810ec +checksum=a7f9cc1b44a5f3096a216cbd130b650c7a6b2c9f8005b000ae97f329239a7c00 post_install() { - rm -r ${DESTDIR}/${py3_sitelib}/jaraco/__init__.py vlicense LICENSE } From dba4722448dd54a4e8e951a9d5225968ff33e5c7 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Mar 2022 20:47:29 +0100 Subject: [PATCH 2325/2369] python3-tempora: update to 5.0.1. --- srcpkgs/python3-tempora/template | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-tempora/template b/srcpkgs/python3-tempora/template index 2b9efced6fd..3fb249bf2b1 100644 --- a/srcpkgs/python3-tempora/template +++ b/srcpkgs/python3-tempora/template @@ -1,19 +1,18 @@ # Template file for 'python3-tempora' pkgname=python3-tempora -version=4.1.1 -revision=2 +version=5.0.1 +revision=1 wrksrc="tempora-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools_scm" -depends="python3-setuptools python3-six python3-pytz" -checkdepends="python3-pytest python3-freezegun - python3-jaraco python3-jaraco.functools $depends" +build_style=python3-pep517 +hostmakedepends="python3-wheel python3-setuptools_scm" +depends="python3-setuptools python3-pytz python3-jaraco.functools" +checkdepends="python3-pytest python3-freezegun $depends" short_desc="Objects and routines pertaining to date and time (Python3)" maintainer="Orphaned " license="MIT" homepage="https://github.com/jaraco/tempora" distfiles="${PYPI_SITE}/t/tempora/tempora-${version}.tar.gz" -checksum=c54da0f05405f04eb67abbb1dff4448fd91428b58cb00f0f645ea36f6a927950 +checksum=cba0f197a64883bf3e73657efbc0324d5bf17179e7769b1385b4d75d26cd9127 alternatives="tempora:calc-prorate:/usr/bin/calc-prorate3" do_check() { From 83d872c78f91cd7767dded4a07268c46c354d1e2 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Mar 2022 20:47:24 +0100 Subject: [PATCH 2326/2369] python3-portend: update to 3.1.0. --- srcpkgs/python3-portend/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-portend/template b/srcpkgs/python3-portend/template index 5766db04cbe..882e1c74927 100644 --- a/srcpkgs/python3-portend/template +++ b/srcpkgs/python3-portend/template @@ -1,11 +1,11 @@ # Template file for 'python3-portend' pkgname=python3-portend -version=2.7.1 -revision=2 +version=3.1.0 +revision=1 wrksrc="portend-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools_scm" -depends="python3-tempora python3-jaraco.functools" +build_style=python3-pep517 +hostmakedepends="python3-wheel python3-setuptools_scm" +depends="python3-tempora" checkdepends="python3-pytest $depends" short_desc="TCP port monitoring utilities (Python3)" maintainer="Orphaned " @@ -13,7 +13,8 @@ license="MIT" homepage="https://github.com/jaraco/portend" changelog="https://github.com/jaraco/portend/blob/master/CHANGES.rst" distfiles="${PYPI_SITE}/p/portend/portend-${version}.tar.gz" -checksum=986ed9a278e64a87b5b5f4c21e61c25bebdce9919a92238d9c14c37a7416482b +checksum=239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4 +make_check=ci-skip # test_portend.py .F.....F.F. and hangs post_install() { vlicense LICENSE From 2361a029a6f0eded865f9036fe90cdabb2bbee22 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 23 Mar 2022 22:21:35 +0100 Subject: [PATCH 2327/2369] python3-zipp: remove python3-jaraco from checkdepends --- srcpkgs/python3-zipp/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/python3-zipp/template b/srcpkgs/python3-zipp/template index ab7b82af884..3ee5592a36d 100644 --- a/srcpkgs/python3-zipp/template +++ b/srcpkgs/python3-zipp/template @@ -6,7 +6,6 @@ wrksrc="zipp-${version}" build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3" -checkdepends="python3-jaraco" short_desc="Pathlib-compatible Zipfile object wrapper (Python 3)" maintainer="Lorem " license="MIT" From 98db245dc07f3b4cc5adbef4d1fcf69722a0f203 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 4 May 2022 13:52:19 +0200 Subject: [PATCH 2328/2369] python3-jaraco: remove package --- srcpkgs/python3-jaraco/template | 17 ----------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 srcpkgs/python3-jaraco/template diff --git a/srcpkgs/python3-jaraco/template b/srcpkgs/python3-jaraco/template deleted file mode 100644 index ce4eca455d0..00000000000 --- a/srcpkgs/python3-jaraco/template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'python3-jaraco' -pkgname=python3-jaraco -version=1.0 -revision=4 -create_wrksrc=yes -depends="python3" -short_desc="Namespace package declaration for jaraco (Python3)" -maintainer="bra1nwave " -license="Public Domain" -homepage="https://www.voidlinux.org/" - -do_install() { - vmkdir ${py3_sitelib}/jaraco - cat > ${DESTDIR}/${py3_sitelib}/jaraco/__init__.py <<-EOF - __path__ = __import__('pkgutil').extend_path(__path__, __name__) - EOF -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 0923c53cfc0..65516dfa921 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -334,6 +334,7 @@ replaces=" python3-docker-pycreds<=0.4.0_4 python3-grako<=3.99.9_7 python3-idna-ssl<=1.1.0_3 + python3-jaraco<=1.0_4 python3-jsonrpc-server<=0.4.0_2 python3-keepalive<=0.5_6 python3-pgpdump<=1.5_10 From 00b8dcf48e7ac52cd8fbd7736cb75847e1cbc161 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 22 May 2022 19:39:37 +0200 Subject: [PATCH 2329/2369] MangoHud: update to 0.6.7.1. closes #33625 --- srcpkgs/MangoHud/template | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template index b99c7710afa..c537a031789 100644 --- a/srcpkgs/MangoHud/template +++ b/srcpkgs/MangoHud/template @@ -1,19 +1,21 @@ # Template file for 'MangoHud' pkgname=MangoHud -version=0.6.5 +version=0.6.7.1 +_version="${version%.*}-${version##*.}" revision=1 -wrksrc="MangoHud-v${version}" +wrksrc="MangoHud-v${_version}" build_style=meson configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled - -Dwith_nvml=disabled" + -Dwith_nvml=disabled -Duse_system_spdlog=enabled" hostmakedepends="Vulkan-Headers python3-Mako glslang pkg-config" -makedepends="libglvnd-devel dbus-devel vulkan-loader Vulkan-Headers" +makedepends="libglvnd-devel dbus-devel vulkan-loader Vulkan-Headers + spdlog" short_desc="Vulkan and OpenGL overlay for monitoring FPS, temperatures and more" maintainer="John " license="MIT" homepage="https://github.com/flightlessmango/MangoHud" -distfiles="https://github.com/flightlessmango/MangoHud/releases/download/v${version}/MangoHud-v${version}-Source-DFSG.tar.xz" -checksum=e4aff5f6e58140c1a818d3127076e703141aac50fa908e01d03268b2d3b65a0b +distfiles="https://github.com/flightlessmango/MangoHud/releases/download/v${_version}/MangoHud-v${_version}-Source-DFSG.tar.xz" +checksum=220abdc563e39727527b63ace9f7b8b1de0a53d4cf79b8bbed5794dbbf8db77a post_patch() { if [ "$XBPS_TARGET_LIBC" = "musl" ]; then From 380a57a06375a3c9880ca27796821d075d1db554 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 22 May 2022 17:48:30 +0200 Subject: [PATCH 2330/2369] libtls: update to 3.5.3. --- srcpkgs/libtls/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template index 4fa641e0082..a957e7bb7d4 100644 --- a/srcpkgs/libtls/template +++ b/srcpkgs/libtls/template @@ -1,6 +1,6 @@ # Template file for 'libtls' pkgname=libtls -version=3.5.2 +version=3.5.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=56feab8e21c3fa6549f8b7d7511658b8e98518162838a795314732654adf3e5f +checksum=3ab5e5eaef69ce20c6b170ee64d785b42235f48f2e62b095fca5d7b6672b8b28 _lssl_asm_ver="1.2.0" replaces="libtls20>0" From d9863d3454372ba1e83d6370ba9ba40c099cafdf Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 21 May 2022 14:47:38 -0400 Subject: [PATCH 2331/2369] httpie: update to 3.2.1, adopt. --- srcpkgs/httpie/template | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/httpie/template b/srcpkgs/httpie/template index 86a86bfde07..7cd6474db6b 100644 --- a/srcpkgs/httpie/template +++ b/srcpkgs/httpie/template @@ -1,22 +1,26 @@ # Template file for 'httpie' pkgname=httpie -version=2.6.0 +version=3.2.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-requests python3-requests-toolbelt - python3-Pygments python3-pysocks python3-defusedxml - python3-charset-normalizer" + python3-Pygments python3-pysocks python3-defusedxml python3-charset-normalizer + python3-multidict python3-rich" short_desc="Modern, user-friendly command-line HTTP client for the API era" -maintainer="Mickaël Schoentgen " +maintainer="classabbyamp " license="BSD-3-Clause" homepage="https://httpie.io/" changelog="https://raw.githubusercontent.com/httpie/httpie/master/CHANGELOG.md" distfiles="https://github.com/httpie/httpie/archive/${version}.tar.gz" -checksum=3bcd9a8cb2b11299da12d3af36c095c6d4b665e41c395898a07f1ae4d99fc14a -make_check=no # needs pytest_httpbin which is not packaged +checksum=803e1624e005c2f7002802a77ebc687b05375aca76af42639f844405328633eb +# requires pytest-lazy-fixture (not packaged), many tests fail +make_check=no post_install() { + for page in http https httpie; do + vman extras/man/$page.1 + done vcompletion extras/httpie-completion.bash bash http vcompletion extras/httpie-completion.fish fish http vlicense LICENSE From f34afac9cc1c368fd41fc609637a49a15516201f Mon Sep 17 00:00:00 2001 From: dkwo Date: Sun, 22 May 2022 20:11:14 +0200 Subject: [PATCH 2332/2369] mutt: update to 2.2.5 --- srcpkgs/mutt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index ba747971293..1f554a64cb6 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -1,6 +1,6 @@ # Template file for 'mutt' pkgname=mutt -version=2.2.4 +version=2.2.5 revision=1 build_style=gnu-configure configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache @@ -18,7 +18,7 @@ license="GPL-2.0-or-later" homepage="http://www.mutt.org" changelog="http://mutt.org/relnotes/${version%.*}" distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz" -checksum=b82776bebff0e10820a33fa1e7eafa5cba4ab3a011b08e83b66ed62d75c6e060 +checksum=ff8b781159794adcca126b551d5e419174b7b38a582a159bfe4e13451a757e47 post_install() { # provided by mime-types From a46c737fdd1ea39c6ea9f8fd520d0715f2d03b5c Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 23 May 2022 09:42:51 -0500 Subject: [PATCH 2333/2369] python3-httpcore: update to 0.15.0. --- srcpkgs/python3-httpcore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-httpcore/template b/srcpkgs/python3-httpcore/template index 99d7b420fe7..5491bf7c0cd 100644 --- a/srcpkgs/python3-httpcore/template +++ b/srcpkgs/python3-httpcore/template @@ -1,6 +1,6 @@ # Template file for 'python3-httpcore' pkgname=python3-httpcore -version=0.14.7 +version=0.15.0 revision=1 wrksrc="httpcore-$version" build_style=python3-module @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://www.encode.io/httpcore/" changelog="https://raw.githubusercontent.com/encode/httpcore/master/CHANGELOG.md" distfiles="https://github.com/encode/httpcore/archive/refs/tags/$version.tar.gz" -checksum=7f5736b3d1a2382d3b137c8f77d19229f3742789447ef1c1a55bb95918c02277 +checksum=e5458b6342fb6a0cdd58b86c1336516b90ad8879dedc24a9667f9fdf7b4081ea make_check=no # at least trustme python module is not packaged post_install() { From 81190465f5b571c750fa964321a959abc032e7b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 23 May 2022 22:54:54 +0200 Subject: [PATCH 2334/2369] hunspell-pl_PL: update to 20220501. --- srcpkgs/hunspell-pl_PL/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template index 4935419acc4..db94240d6e7 100644 --- a/srcpkgs/hunspell-pl_PL/template +++ b/srcpkgs/hunspell-pl_PL/template @@ -1,18 +1,17 @@ # Template file for 'hunspell-pl_PL' pkgname=hunspell-pl_PL -version=20211201 +version=20220501 revision=1 create_wrksrc=yes -hostmakedepends="unzip" short_desc="Polish dictionary for hunspell" maintainer="m-cz " license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0" homepage="https://sjp.pl/slownik/ort/" distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip" -checksum=254c9c4a32cc991d58d1667b6d5e504d44be50a546fe2d04251a674ed12a1a64 +checksum=fd715b1facddfd680b8779f6f671a6763a0bf3b31f6e5909d52926ac27f7f1c7 post_extract() { - unzip pl_PL.zip + bsdtar -xf pl_PL.zip } do_install() { From dd6ead0f489e5c5b12f1816c7fc746f53b6d9af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 23 May 2022 23:16:41 +0200 Subject: [PATCH 2335/2369] python3-xxhash: update to 3.0.0. --- srcpkgs/python3-xxhash/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-xxhash/template b/srcpkgs/python3-xxhash/template index f7a847b4b54..dace598ee1a 100644 --- a/srcpkgs/python3-xxhash/template +++ b/srcpkgs/python3-xxhash/template @@ -1,7 +1,7 @@ # Template file for 'python3-xxhash' pkgname=python3-xxhash -version=2.0.2 -revision=2 +version=3.0.0 +revision=1 wrksrc="xxhash-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,8 +11,9 @@ short_desc="Python binding for xxHash" maintainer="Piotr Wójcik " license="BSD-2-Clause" homepage="https://github.com/ifduyue/python-xxhash" +changelog="https://raw.githubusercontent.com/ifduyue/python-xxhash/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/x/xxhash/xxhash-${version}.tar.gz" -checksum=b7bead8cf6210eadf9cecf356e17af794f57c0939a3d420a00d87ea652f87b49 +checksum=30b2d97aaf11fb122023f6b44ebb97c6955e9e00d7461a96415ca030b5ceb9c7 pre_build() { export XXHASH_LINK_SO=1 From febee1b5cc2d9480a16eecc8ac12472678b83d21 Mon Sep 17 00:00:00 2001 From: Gerardo Di iorio Date: Sun, 17 Apr 2022 00:30:51 +0200 Subject: [PATCH 2336/2369] hcloud: update to 1.29.5. --- srcpkgs/hcloud/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template index 87d1f564ee1..18fd46f72bf 100644 --- a/srcpkgs/hcloud/template +++ b/srcpkgs/hcloud/template @@ -1,6 +1,6 @@ # Template file for 'hcloud' pkgname=hcloud -version=1.29.0 +version=1.29.5 revision=1 wrksrc="cli-${version}" build_style=go @@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio " license="MIT" homepage="https://github.com/hetznercloud/cli" distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz" -checksum=ea8b08702f7285d5e886fc8797287ac05747eb66ad1d77d041725f9cf6c88893 +checksum=8a8a0a8ee86eaae329090657f236c8f736c5c67209fedf5047977f8ef8c2afb8 post_install() { vlicense LICENSE From 69ba12336074bc45b64a6c314cf17fb58355a031 Mon Sep 17 00:00:00 2001 From: Gerardo Di iorio Date: Tue, 24 May 2022 08:52:46 +0200 Subject: [PATCH 2337/2369] pgmetrics: update to 1.13.0. --- srcpkgs/pgmetrics/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template index 944110d782c..9d9da6a8092 100644 --- a/srcpkgs/pgmetrics/template +++ b/srcpkgs/pgmetrics/template @@ -1,6 +1,6 @@ # Template file for 'pgmetrics' pkgname=pgmetrics -version=1.12.0 +version=1.13.0 revision=1 build_style=go go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics" @@ -9,7 +9,7 @@ maintainer="Gerardo Di iorio " license="Apache-2.0" homepage="https://pgmetrics.io" distfiles="https://github.com/rapidloop/pgmetrics/archive/refs/tags/v${version}.tar.gz" -checksum=82f2527b4754f3b96282d14de7ddbd98fa7030ede193361062b6a83f51c68acf +checksum=892c1aa621b99d4961d59b89ff1756d4be5d1f83278d90e065cf68ae1016b900 post_install() { vdoc README.md From 1313e5dec4925cf899fa4c956e330d43dc35b1ae Mon Sep 17 00:00:00 2001 From: Gerardo Di iorio Date: Fri, 18 Feb 2022 21:25:36 +0100 Subject: [PATCH 2338/2369] rest-server: update to 0.11.0. --- srcpkgs/rest-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rest-server/template b/srcpkgs/rest-server/template index 4c0bab74ea8..1c58a815ad8 100644 --- a/srcpkgs/rest-server/template +++ b/srcpkgs/rest-server/template @@ -1,6 +1,6 @@ # Template file for 'rest-server' pkgname=rest-server -version=0.10.0 +version=0.11.0 revision=1 build_style=go go_import_path="github.com/restic/rest-server" @@ -10,7 +10,7 @@ maintainer="Gerardo Di Iorio " license="BSD-2-Clause" homepage="https://github.com/restic/rest-server" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=d109cf9e9c3f36c9c8eb6d4a2bd530c5dfcd62b11687d93034e2edc0fdecf479 +checksum=cd9b35ad2224244207a967ebbc78d84f4298d725e95c1fa9341ed95a350ea68f system_accounts="_restserver" _restserver_homedir="/var/lib/rest-server" _restserver_descr="Rest Server Daemon User" From ade7010557d6130d6eb849771f8f1da93b5fd321 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Tue, 24 May 2022 06:18:43 +0200 Subject: [PATCH 2339/2369] praat: update to 6.2.13 --- srcpkgs/praat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template index c40c093208e..3760e14bfe4 100644 --- a/srcpkgs/praat/template +++ b/srcpkgs/praat/template @@ -1,6 +1,6 @@ # Template file for 'praat' pkgname=praat -version=6.2.12 +version=6.2.13 revision=1 create_wrksrc=yes hostmakedepends="pkg-config" @@ -13,7 +13,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=b6f1e09ffc8d0c89e3a892d997af0766a49f7d863cdeae857a9b5ea7f95f5650 +checksum=6f97434bbc3c3605da15157a448d1a9f40d80251b6327ba0c271a89ff11ba312 # 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 From aa1f20430438a717655ff0192b6577814f81cbec Mon Sep 17 00:00:00 2001 From: dashslash Date: Sun, 22 May 2022 17:47:27 -0500 Subject: [PATCH 2340/2369] i2pd: update to 2.42.0. --- srcpkgs/i2pd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template index 2b92177b48a..777b5dd896c 100644 --- a/srcpkgs/i2pd/template +++ b/srcpkgs/i2pd/template @@ -1,6 +1,6 @@ # Template file for 'i2pd' pkgname=i2pd -version=2.40.0 +version=2.42.0 revision=1 build_style=gnu-makefile make_build_args="USE_UPNP=yes" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://i2pd.website/" changelog="https://raw.githubusercontent.com/PurpleI2P/i2pd/openssl/ChangeLog" distfiles="https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz" -checksum=4443f484ad40753e892170a26c8ee8126e8338bf416d04eab0c55c1c94a4e193 +checksum=6b91b4c92f788502d4322b69a21c7bf90a4014bc37fd7b406b58d2be4860b409 conf_files=" /etc/i2pd/i2pd.conf From ef6fd0a9cbb71e496d81cce9b320441f99d87d37 Mon Sep 17 00:00:00 2001 From: dkwo Date: Tue, 17 May 2022 16:51:28 +0200 Subject: [PATCH 2341/2369] vim: update to 8.2.4969 --- srcpkgs/vim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index f5ff0d9066a..707a2cc372c 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -1,6 +1,6 @@ # Template file for 'vim' pkgname=vim -version=8.2.4609 +version=8.2.4969 revision=1 hostmakedepends="gettext glib-devel pkg-config" makedepends="acl-devel ncurses-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=a9b150ed68cf41931e1af2f9fe8b958cf36ed1a14d00378ac8cebf7d8617afb1 +checksum=68034c433787f2a65afb69fd725eeefe24914c48c19ce210810eeacafd111107 python_version=3 build_options="x11 gtk3 huge" From 1b8fe548750c70d068214b159041b0ce3c97e1d0 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Tue, 17 May 2022 09:53:21 +0200 Subject: [PATCH 2342/2369] slack-desktop: update to 4.26.1 Closes: #37162 [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 ae1b738b622..6ab5acf7014 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.25.0 +version=4.26.1 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=e88160a02ca489f0d54afca5bba1aeb17c886b6458eadcad73bffd959c85422c +checksum=c13fa42fa7f63afbcffb315dd4c2bb626f98d680be86483543f7db78bd63835b restricted=yes repository="nonfree" nopie=yes From a5c0066306033a27c0c084dd3b2652b4a7b97807 Mon Sep 17 00:00:00 2001 From: Jason Manley Date: Mon, 16 May 2022 20:06:55 -0500 Subject: [PATCH 2343/2369] google-earth-pro: update to 7.3.4.8642. Closes: #37161 [via git-merge-pr] --- srcpkgs/google-earth-pro/template | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template index a61b78e8f86..496a7cae0a9 100644 --- a/srcpkgs/google-earth-pro/template +++ b/srcpkgs/google-earth-pro/template @@ -1,19 +1,18 @@ # Template file for 'google-earth-pro' pkgname=google-earth-pro -version=7.3.4.8248 +version=7.3.4.8642 revision=1 archs="x86_64" depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1 - hicolor-icon-theme libSM libXi libXrender libcups libproxy nss" + hicolor-icon-theme libSM libXi libXrender libcups libproxy nss qt5-script qt5-sensors qt5-webkit" short_desc="Explore the far reaches of the world" maintainer="Jason Manley " license="custom:Google" homepage="https://www.google.com/earth/index.html" distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb" -checksum=cdf406c0574564b2b1c2bdcfd731c45ae6358d1f69969895ccd4ea6344bc6add +checksum=f1db3df1c5c10e337f5e8ef89edf18dad787ee550a1299269ecd5e7f8ecb8af7 repository=nonfree restricted=yes - nostrip=yes post_fetch() { @@ -43,14 +42,13 @@ do_install() { usr/share/icons/hicolor/${i}x${i}/apps ${pkgname}.png done - for i in ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Google-Terms-of-Service.html \ - ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Google-Earth-Additional-Terms-of-Service.html \ - ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \ - ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Google-Privacy-Policy.html; do + for i in ${XBPS_BUILDDIR}/Google-Terms-of-Service.html \ + ${XBPS_BUILDDIR}/Google-Earth-Additional-Terms-of-Service.html \ + ${XBPS_BUILDDIR}/Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \ + ${XBPS_BUILDDIR}/Google-Privacy-Policy.html; do vlicense ${i} done - # Fix Search sed -i '/googleearth-bin/s/^/LC_NUMERIC=en_US.UTF-8 /' \ ${DESTDIR}/opt/google/earth/pro/googleearth } From fa42ea478c7648d8072564289b8e6be5051be504 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 24 May 2022 08:58:05 -0500 Subject: [PATCH 2344/2369] jadx: update to 1.4.0. --- srcpkgs/jadx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template index dba5153c996..99227577b86 100644 --- a/srcpkgs/jadx/template +++ b/srcpkgs/jadx/template @@ -1,6 +1,6 @@ # Template file for 'jadx' pkgname=jadx -version=1.3.5 +version=1.4.0 revision=1 hostmakedepends="openjdk8 gradle" short_desc="Decompiler for Dalvik bytecode" @@ -8,7 +8,7 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://github.com/skylot/jadx" distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz" -checksum=ed556c32b87f6f6cc1ef6ea35bc6881da1a6ad538bb81f9dad1c16969435ea24 +checksum=c2880eb3315071790a7c6b155e7d340563cdae41005f1de859f6942134c557e1 do_build() { gradle copyArtifacts From 19fcbabc8fbbcce2f7e45985f7c9de08348d5141 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 24 May 2022 11:33:01 -0500 Subject: [PATCH 2345/2369] python3-rich: update to 12.4.3. --- srcpkgs/python3-rich/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template index 377a8915332..978c891550a 100644 --- a/srcpkgs/python3-rich/template +++ b/srcpkgs/python3-rich/template @@ -1,6 +1,6 @@ # Template file for 'python3-rich' pkgname=python3-rich -version=12.4.1 +version=12.4.3 revision=1 wrksrc="rich-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Andrew Benson " license="MIT" homepage="https://github.com/willmcgugan/rich" distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz" -checksum=d239001c0fb7de985e21ec9a4bb542b5150350330bbc1849f835b9cbc8923b91 +checksum=e7550ca19aec51b216ae4c34bfce82e94a0c79bdbf95cafbf42f343d0fb3f45a make_check=extended # some checks only work on windows post_install() { From 0501e705763a55f1fddea75a0fab5978bc7dcb63 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 24 May 2022 11:33:35 -0500 Subject: [PATCH 2346/2369] python3-httpx: update to 0.23.0. --- srcpkgs/python3-httpx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-httpx/template b/srcpkgs/python3-httpx/template index a940099d2eb..4d158e58bd1 100644 --- a/srcpkgs/python3-httpx/template +++ b/srcpkgs/python3-httpx/template @@ -1,6 +1,6 @@ # Template file for 'python3-httpx' pkgname=python3-httpx -version=0.22.0 +version=0.23.0 revision=1 wrksrc="httpx-${version}" build_style=python3-module @@ -14,7 +14,7 @@ license="BSD-3-Clause" homepage="https://www.python-httpx.org" changelog="https://raw.githubusercontent.com/encode/httpx/master/CHANGELOG.md" distfiles="${PYPI_SITE}/h/httpx/httpx-${version}.tar.gz" -checksum=d8e778f76d9bbd46af49e7f062467e3157a5a3d2ae4876a4bbfd8a51ed9c9cb4 +checksum=f28eac771ec9eb4866d3fb4ab65abd42d38c424739e80c08d8d20570de60b0ef # the pypi tarball doesn't contain tests # the tests need unpackaged dependencies trustme and uvicorn make_check=no From eaa234ea62292737744cd3100a81a425e5295caa Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 24 May 2022 21:15:43 +0300 Subject: [PATCH 2347/2369] libass: update to 0.16.0. --- srcpkgs/libass/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libass/template b/srcpkgs/libass/template index 5aa7953b7be..ddb888f587e 100644 --- a/srcpkgs/libass/template +++ b/srcpkgs/libass/template @@ -1,6 +1,6 @@ # Template file for 'libass' pkgname=libass -version=0.15.2 +version=0.16.0 revision=1 build_style=gnu-configure hostmakedepends="automake libtool yasm pkg-config" @@ -9,8 +9,9 @@ short_desc="Portable library for SSA/ASS subtitles rendering" maintainer="Orphaned " license="MIT" homepage="https://github.com/libass/libass/" +changelog="https://raw.githubusercontent.com/libass/libass/master/Changelog" distfiles="https://github.com/libass/libass/archive/${version}.tar.gz" -checksum=f96b7ce35f2b0bf430eb71c4c9dd5d8f0abf52499e08490d346608c837c98299 +checksum=246091cf034b097dbe362c72170e6996f8d2c19ffe664ce6768ec44eb9ca5c1c pre_configure() { autoreconf -fi From 5202dcc4e7c4919a9c28974bd6edcdbcde026886 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 24 May 2022 16:08:28 +0200 Subject: [PATCH 2348/2369] github-cli: update to 2.11.3 --- srcpkgs/github-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template index 86b6ad53bdf..b8063486e1e 100644 --- a/srcpkgs/github-cli/template +++ b/srcpkgs/github-cli/template @@ -1,6 +1,6 @@ # Template file for 'github-cli' pkgname=github-cli -version=2.10.1 +version=2.11.3 revision=1 wrksrc="cli-${version}" build_style=go @@ -13,7 +13,7 @@ license="MIT" homepage="https://cli.github.com" changelog="https://github.com/cli/cli/releases" distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz" -checksum=a94ba6a731ad558f7937d0ac46ff8034b56214ec9e24a9ad70296331b1bb12ed +checksum=1a4a90b1893dac022c1cfb298ebb52f66a8f93b353eafcf7bbfb43c8c0b46dfa pre_build() { local _date From dd0aa886db4637c3927e67a17e4e35e33bc63c7b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 23 May 2022 14:05:29 +0200 Subject: [PATCH 2349/2369] perl-LWP: update to 6.66. --- srcpkgs/perl-LWP/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template index f61f2d0f0cb..60ac31bba84 100644 --- a/srcpkgs/perl-LWP/template +++ b/srcpkgs/perl-LWP/template @@ -1,6 +1,6 @@ # Template file for 'perl-LWP' pkgname=perl-LWP -version=6.65 +version=6.66 revision=1 wrksrc="libwww-perl-${version}" build_style=perl-module @@ -17,4 +17,4 @@ maintainer="Leah Neukirchen " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/libwww-perl" distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz" -checksum=ae048023d275e1d6ad72882fa8b818f6e16d18d9cbda1f6f8e4012b93d4c834c +checksum=f0aa415f49b0538689ab9a8230b05abdc92982431d8721ab65990f78c1419c53 From 0867f4b601508ab6fe5bfe7790b4b7b88c5a9d52 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 23 May 2022 14:06:30 +0200 Subject: [PATCH 2350/2369] perl-Pod-Parser: update to 1.65. --- srcpkgs/perl-Pod-Parser/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Pod-Parser/template b/srcpkgs/perl-Pod-Parser/template index 3d9c7c6ec96..354e04556ce 100644 --- a/srcpkgs/perl-Pod-Parser/template +++ b/srcpkgs/perl-Pod-Parser/template @@ -1,6 +1,6 @@ # Template file for 'perl-Pod-Parser' pkgname=perl-Pod-Parser -version=1.63 +version=1.65 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -12,4 +12,4 @@ maintainer="Leah Neukirchen " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Pod-Parser" distfiles="${CPAN_SITE}/Pod/${pkgname/perl-/}-${version}.tar.gz" -checksum=dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd +checksum=3ba7bdec659416a51fe2a7e59f0883e9c6a3b21bc9d001042c1d6a32d401b28a From 5f3d8572ce0bb8be8deca2c68847cd20668f3ce1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 25 May 2022 17:51:17 +0200 Subject: [PATCH 2351/2369] python3-drgn: update to 0.0.19. --- srcpkgs/python3-drgn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-drgn/template b/srcpkgs/python3-drgn/template index 26d8715d464..0c8ff7a9e13 100644 --- a/srcpkgs/python3-drgn/template +++ b/srcpkgs/python3-drgn/template @@ -1,6 +1,6 @@ # Template file for 'python3-drgn' pkgname=python3-drgn -version=0.0.18 +version=0.0.19 revision=1 wrksrc="drgn-${version}" build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="https://github.com/osandov/drgn/" distfiles="https://github.com/osandov/drgn/archive/refs/tags/v${version}.tar.gz" -checksum=78ccda96ba77f453174e462ee77fda1c86188c81ee3f02d307a83a778df9f1fd +checksum=5ed9049f5a257c342eb8fb8e2c7276b1baf1e9109ff0d9677a0990990c7afa4d pre_build() { if [ "$CROSS_BUILD" ]; then From 54982cc7025e7e95f5f8e0d4c716cbcaaec9cb58 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 08:29:42 -0400 Subject: [PATCH 2352/2369] cpp-utilities: update to 5.15.0. --- srcpkgs/cpp-utilities/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template index e4b44dd0baf..efe40f3cc2c 100644 --- a/srcpkgs/cpp-utilities/template +++ b/srcpkgs/cpp-utilities/template @@ -1,6 +1,6 @@ # Template file for 'cpp-utilities' pkgname=cpp-utilities -version=5.14.0 +version=5.15.0 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" @@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/cpp-utilities" distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz" -checksum=7a173bb2355a9b5fef17d3fe6795f026f58afe63b1295f8567c042422e2cde0e +checksum=b1572516717225c40d5b2ebb76b6152e740be287cb264e8ffc6340205e18bd02 cpp-utilities-devel_package() { short_desc+=" - development files" From e539611b602db7425ba98a9654eacdd841b59f53 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:11:20 -0400 Subject: [PATCH 2353/2369] maturin: update to 0.12.17. --- srcpkgs/maturin/patches/add-ppc-tier3.patch | 24 ++++++++++----------- srcpkgs/maturin/template | 11 +++------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch index b19d2ada15e..a0a0111a9d7 100644 --- a/srcpkgs/maturin/patches/add-ppc-tier3.patch +++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch @@ -1,15 +1,3 @@ -diff -u a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -71,7 +71,7 @@ - "--message-format=json", - ] - -- if platform.machine() in ("ppc64le", "ppc64", "powerpc") or ( -+ if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc") or ( - sys.platform == "win32" and platform.machine() == "ARM64" - ): - cargo_args.extend( diff -u a/src/auditwheel/policy.rs b/src/auditwheel/policy.rs --- a/src/auditwheel/policy.rs +++ b/src/auditwheel/policy.rs @@ -90,3 +78,15 @@ diff -u a/src/target.rs.orig b/src/target.rs Arch::X86 => 32, Arch::X86_64 => 64, Arch::S390X => 64, +diff -u a/setup.py b/setup.py +--- a/setup.py ++++ b/setup.py +@@ -46,7 +46,7 @@ + version = tomllib.load(fp)["package"]["version"] + + cargo_args = [] +-if platform.machine() in ("ppc64le", "ppc64", "powerpc") or ( ++if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc") or ( + sys.platform == "win32" and platform.machine() == "ARM64" + ): + cargo_args.extend(["--no-default-features", "--features=upload,log,human-panic"]) diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index fa332fc4282..4b729f29e8b 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -1,13 +1,13 @@ # Template file for 'maturin' pkgname=maturin -version=0.12.15 +version=0.12.17 revision=1 build_style=cargo build_helper=qemu # Disable the 'rustls' feature, which leads to bad platform compatibility # The list of enabled features should be reconciled with each new release configure_args="--no-default-features --features log,upload,human-panic" -hostmakedepends="python3-setuptools python3-tomli" +hostmakedepends="python3-setuptools-rust python3-tomli" makedepends="openssl-devel" depends="python3-tomli" short_desc="Build and publish crates as python packages" @@ -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="aa640e1620dc466778cd48f0c9cefe08a9ade265c7f0582b005c25e9f1518be4 +checksum="99a138c070455053a29a2dbcfeec7e28cc5d370691f02ea07467b2cd636fce3f 30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e" # Tests use unstable features and fail to build make_check=no @@ -28,11 +28,6 @@ post_extract() { echo "target-lexicon = { path = './target-lexicon' }" >> Cargo.toml } -post_patch() { - # setup.py is broken, just use it for the pure python part - vsed -e 's/cmdclass.*/packages=["maturin"],/' -i setup.py -} - post_build() { # python package is pure; the cross environment is not relevant python3 setup.py build From eb35f42772f2dad644dfd8f29b0784aea47749fb Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:14:31 -0400 Subject: [PATCH 2354/2369] python3-adblock: fix tests --- srcpkgs/python3-adblock/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template index 8d5e4842b1c..0b14ed31bef 100644 --- a/srcpkgs/python3-adblock/template +++ b/srcpkgs/python3-adblock/template @@ -9,7 +9,7 @@ build_helper="rust" hostmakedepends="maturin pkg-config cargo openssl-devel" makedepends="openssl-devel python3-devel" depends="python3" -checkdepends="python3-pytest" +checkdepends="python3-pytest python3-toml" short_desc="Brave's adblock library in Python" maintainer="Andrew J. Hesford " license="Apache-2.0, MIT" From c9dae469c848dccd7161dd397261c0288b9981a5 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:14:49 -0400 Subject: [PATCH 2355/2369] opencl2-headers: update to 2022.05.18. --- srcpkgs/opencl2-headers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opencl2-headers/template b/srcpkgs/opencl2-headers/template index e435639adf7..5d704f40a4a 100644 --- a/srcpkgs/opencl2-headers/template +++ b/srcpkgs/opencl2-headers/template @@ -1,6 +1,6 @@ # Template file for 'opencl2-headers' pkgname=opencl2-headers -version=2022.01.04 +version=2022.05.18 revision=1 wrksrc="OpenCL-Headers-${version}" short_desc="OpenCL 2.2 (Open Computing Language) header files" @@ -8,7 +8,7 @@ maintainer="Andrew J. Hesford " license="Apache-2.0" homepage="https://github.com/KhronosGroup/OpenCL-Headers" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=6e716e2b13fc8d363b40a165ca75021b102f9328e2b38f8054d7db5884de29c9 +checksum=88a1177853b279eaf574e2aafad26a84be1a6f615ab1b00c20d5af2ace95c42e provides="opencl-headers-${version}_${revision}" replaces="opencl-headers>=0" From 13d9e90808870863fd4512e6ec1684b4d1924884 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:16:30 -0400 Subject: [PATCH 2356/2369] python-Cython: update to 0.29.30. --- srcpkgs/python-Cython/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template index 068333f55f6..aa4b81ec8bc 100644 --- a/srcpkgs/python-Cython/template +++ b/srcpkgs/python-Cython/template @@ -1,6 +1,6 @@ # Template file for 'python-Cython' pkgname=python-Cython -version=0.29.28 +version=0.29.30 revision=1 wrksrc="Cython-${version}" build_style=python-module @@ -13,7 +13,7 @@ license="Apache-2.0" homepage="https://cython.org/" changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst" distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz" -checksum=d6fac2342802c30e51426828fe084ff4deb1b3387367cf98976bb2e64b6f8e45 +checksum=2235b62da8fe6fa8b99422c8e583f2fb95e143867d337b5c75e4b9a1a865f9e3 # Tests are flaky make_check=no From 8fe4f3a6575ed8356a24cee4fa2e7bf2a77c5612 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:17:38 -0400 Subject: [PATCH 2357/2369] python3-Pillow: update to 9.1.1. --- srcpkgs/python3-Pillow/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template index f0df1881e24..4162a513421 100644 --- a/srcpkgs/python3-Pillow/template +++ b/srcpkgs/python3-Pillow/template @@ -1,6 +1,6 @@ # Template file for 'python3-Pillow' pkgname=python3-Pillow -version=9.1.0 +version=9.1.1 revision=1 wrksrc="Pillow-${version}" build_style=python3-module @@ -15,7 +15,7 @@ license="custom:PIL" homepage="https://python-pillow.org" changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst" distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz" -checksum=f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97 +checksum=7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0 post_install() { vlicense LICENSE From a5ce22a2433a2d6b023774bd8f3ed6fddf3645c5 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:18:06 -0400 Subject: [PATCH 2358/2369] python3-bokeh: update to 2.4.3. --- srcpkgs/python3-bokeh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template index 0564e75a261..c4063f6bfc1 100644 --- a/srcpkgs/python3-bokeh/template +++ b/srcpkgs/python3-bokeh/template @@ -1,6 +1,6 @@ # Template file for 'python3-bokeh' pkgname=python3-bokeh -version=2.4.2 +version=2.4.3 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-module @@ -13,7 +13,7 @@ license="BSD-3-Clause" homepage="https://bokeh.org" changelog="https://raw.githubusercontent.com/bokeh/bokeh/main/CHANGELOG" distfiles="${PYPI_SITE}/b/bokeh/bokeh-${version}.tar.gz" -checksum=f0a4b53364ed3b7eb936c5cb1a4f4132369e394c7ae0a8ef420459410958033d +checksum=ef33801161af379665ab7a34684f2209861e3aefd5c803a21fbbb99d94874b03 # Tests have unpackaged dependencies and require fetching data; skipping make_check=no From 23edc3281f18573c670bee5218b1a3ddb3b485f6 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:19:18 -0400 Subject: [PATCH 2359/2369] python3-imageio: update to 2.19.2. --- srcpkgs/python3-imageio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template index 6966116f3b8..ac3b3c62f56 100644 --- a/srcpkgs/python3-imageio/template +++ b/srcpkgs/python3-imageio/template @@ -1,6 +1,6 @@ # Template file for 'python3-imageio' pkgname=python3-imageio -version=2.19.1 +version=2.19.2 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford " license="BSD-2-Clause" homepage="https://github.com/imageio/imageio" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=1c8ee257e71c544e663e824a6082bfbc080d1c673a7230487acc3f99112d9135 +checksum=68e0e6bf03494fc5d7fd390a994bb522ef76dd0f66397f579df34c6f9422a7de post_install() { vlicense LICENSE From 8be69595dca8a74799a9c28542fcdd669d4345da Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:20:38 -0400 Subject: [PATCH 2360/2369] python3-numpy: update to 1.22.4. --- srcpkgs/python3-numpy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template index 957551b64d9..d608731bd7b 100644 --- a/srcpkgs/python3-numpy/template +++ b/srcpkgs/python3-numpy/template @@ -1,6 +1,6 @@ # Template file for 'python3-numpy' pkgname=python3-numpy -version=1.22.3 +version=1.22.4 revision=1 wrksrc="numpy-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://www.numpy.org/" distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz" -checksum=c8f3ec591e3f17b939220f2b9eabb4c5e2db330f8af62c0a3aeee8a4d1a6c0db +checksum=5ff695f4f389830c93bc7f899d97255a09200fc6c69ccee72bfb4435ce317134 alternatives="numpy:f2py:/usr/bin/f2py3" # Tests do not function propery in a build directory make_check="no" From 9d7232b3abac40bf510dbef4869cdd45b460599b Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:37:23 -0400 Subject: [PATCH 2361/2369] python3-scipy: update to 1.8.1. --- srcpkgs/python3-scipy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template index 170f20a1455..25702178dea 100644 --- a/srcpkgs/python3-scipy/template +++ b/srcpkgs/python3-scipy/template @@ -1,6 +1,6 @@ # Template file for 'python3-scipy' pkgname=python3-scipy -version=1.8.0 +version=1.8.1 revision=1 wrksrc="scipy-${version}" build_style=python3-module @@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://scipy.org/scipylib/" distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz" -checksum=91548576a0096324ccff0e49f7ff94be6d19d71242a455c4160e2c61b9abbcb8 +checksum=0140dd24d14ce194fdb3df496c2190f0896ca84ac98bf5d69c3b3fb7bde1a1e9 build_options="openblas" From c9d24a56e9c454be0f991783ec0e72e36621350b Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:37:41 -0400 Subject: [PATCH 2362/2369] python3-pip: update to 22.1.1. --- srcpkgs/python3-pip/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template index 2f0080bc1eb..ee766dbaf91 100644 --- a/srcpkgs/python3-pip/template +++ b/srcpkgs/python3-pip/template @@ -1,6 +1,6 @@ # Template file for 'python3-pip' pkgname=python3-pip -version=22.1 +version=22.1.1 revision=1 wrksrc="pip-${version}" build_style=python3-module @@ -12,7 +12,7 @@ license="MIT" homepage="https://pip.pypa.io/" changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst" distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz" -checksum=2debf847016cfe643fa1512e2d781d3ca9e5c878ba0652583842d50cc2bcc605 +checksum=8dfb15d8a1c3d3085a4cbe11f29e19527dfaf2ba99354326fd62cec013eaee81 # Tests have unpackaged dependencies make_check=no From 1dbbdf3f17d7140860c0faba1ce8f4b03c7d3634 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:38:58 -0400 Subject: [PATCH 2363/2369] python3-pyzmq: update to 23.0.0. --- srcpkgs/python3-pyzmq/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template index c12b5879043..36e85e5b95b 100644 --- a/srcpkgs/python3-pyzmq/template +++ b/srcpkgs/python3-pyzmq/template @@ -1,11 +1,11 @@ # Template file for 'python3-pyzmq' pkgname=python3-pyzmq -version=22.3.0 -revision=2 +version=23.0.0 +revision=1 wrksrc="pyzmq-${version}" build_style=python3-module make_build_args="--zmq=${XBPS_CROSS_BASE}/usr" -hostmakedepends="python3-setuptools" +hostmakedepends="python3-setuptools python3-packaging" makedepends="zeromq-devel python3-devel" depends="python3" checkdepends="python3-pytest" @@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause" homepage="https://pyzmq.readthedocs.io/" changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html" distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz" -checksum=8eddc033e716f8c91c6a2112f0a8ebc5e00532b4a6ae1eb0ccc48e027f9c671c +checksum=a45f5c0477d12df05ef2e2922b49b7c0ae9d0f4ff9b6bb0d666558df0ef37122 pre_build() { cat > setup.cfg <<-EOF From 96bb8d19f32d442f3cc4bd97e1e79078455b66c1 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:39:19 -0400 Subject: [PATCH 2364/2369] python3-pytools: update to 2022.1.9. --- srcpkgs/python3-pytools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template index f019ed70383..9018f685387 100644 --- a/srcpkgs/python3-pytools/template +++ b/srcpkgs/python3-pytools/template @@ -1,6 +1,6 @@ # Template file for 'python3-pytools' pkgname=python3-pytools -version=2022.1.7 +version=2022.1.9 revision=1 wrksrc=${pkgname#*-}-${version} build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="X11" homepage="https://pypi.org/project/pytools" distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz" -checksum=9083e8b6e617560eebb7e0c22c01545b1599eb1c048fe72ca2796f22c040a317 +checksum=3393d25029982080e3fb94c47bf627a1e553ccd174fe2edef6c1c5ec723918ff post_install() { vlicense LICENSE From 138088ead11b80ad939def86065722da5ad8abf9 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:40:18 -0400 Subject: [PATCH 2365/2369] python3-pyopencl: update to 2022.1.5. --- srcpkgs/python3-pyopencl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template index ccd4812bcfe..905b7400df0 100644 --- a/srcpkgs/python3-pyopencl/template +++ b/srcpkgs/python3-pyopencl/template @@ -1,6 +1,6 @@ # Template file for 'python3-pyopencl' pkgname=python3-pyopencl -version=2022.1.3 +version=2022.1.5 revision=1 wrksrc=${pkgname#*-}-${version} build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="X11, Apache-2.0, BSD-3-Clause" homepage="https://mathema.tician.de/software/pyopencl" distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz" -checksum=18386938b54855696460b4b19a210300f241a28eb3255748be5f279aef664d6d +checksum=c58f05b050ae4ac3b0584d97738ae7ac4381e611567b9d67fe7cf4210c0a7b62 # Tests require a working OpenCL platform make_check=no From 14bc2f98f1144d5a9a8576addc1c7359ed55a871 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:40:36 -0400 Subject: [PATCH 2366/2369] python3-ultrajson: update to 5.3.0. --- srcpkgs/python3-ultrajson/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template index e7b0dd021f5..5cf771ad59d 100644 --- a/srcpkgs/python3-ultrajson/template +++ b/srcpkgs/python3-ultrajson/template @@ -1,6 +1,6 @@ # Template file for 'python3-ultrajson' pkgname=python3-ultrajson -version=5.2.0 +version=5.3.0 revision=1 wrksrc="ujson-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://github.com/ultrajson/ultrajson" distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz" -checksum=163191b88842d874e081707d35de2e205e0e396e70fd068d1038879bca8b17ad +checksum=ab938777b3ac0372231ee654a7f6a13787e587b1ca268d8aa7e6fb6846e477d0 export UJSON_BUILD_NO_STRIP=1 From f3e3cfc33f8e10a19ca2314acfdeaf1630f8ef24 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:41:07 -0400 Subject: [PATCH 2367/2369] tageditor: update to 3.7.2. --- srcpkgs/tageditor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template index a97acf3a24c..5e1fe1435f4 100644 --- a/srcpkgs/tageditor/template +++ b/srcpkgs/tageditor/template @@ -1,6 +1,6 @@ # Template file for 'tageditor' pkgname=tageditor -version=3.7.1 +version=3.7.2 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/tageditor" distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz" -checksum=df567627b91114da23664d4194f2fd2392cc24da7e59bd71e1e86f7638e2a5fb +checksum=cf79b42b03dfc3efeba01781c816dd47aff66df9c0fe8aa773bad2d3f1ca0738 build_options="qt webengine webkit script" build_options_default="qt" From 8838b7f2214c706cdc8c2a387252316ce7b05315 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:41:20 -0400 Subject: [PATCH 2368/2369] tagparser: update to 11.2.1. --- srcpkgs/tagparser/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template index 37fb00fc2c0..6849cc50347 100644 --- a/srcpkgs/tagparser/template +++ b/srcpkgs/tagparser/template @@ -1,6 +1,6 @@ # Template file for 'tagparser' pkgname=tagparser -version=11.2.0 +version=11.2.1 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-only" homepage="https://github.com/Martchus/tagparser" distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz" -checksum=8f1ed6b15ec70f90d918c2c31f4ebbbca900cc8f35be76127d777316eb783f16 +checksum=daa881d2416bdcfac5c086b5e8ce780103477cf6bc11e71d75798f5ba5422c65 tagparser-devel_package() { short_desc+=" - development files" From 86fa56c677217217b3edc265b9fcdf6194004f55 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 25 May 2022 13:41:43 -0400 Subject: [PATCH 2369/2369] vkQuake: update to 1.13.1. --- srcpkgs/vkQuake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template index 8c0174565c7..1ca876fe692 100644 --- a/srcpkgs/vkQuake/template +++ b/srcpkgs/vkQuake/template @@ -1,6 +1,6 @@ # Template file for 'vkQuake' pkgname=vkQuake -version=1.13.0 +version=1.13.1 revision=1 build_wrksrc="Quake" build_style=gnu-makefile @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="GPL-2.0-or-later" homepage="https://github.com/Novum/vkQuake" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=baeab4fbea17bb41064b56a7e6e745f2856634c88d57ad86de97990399c24b3b +checksum=ceb9ee46135309f7caf94267539cae70b47ef8edf104e3901b89d3aee7b0b874 do_install() { vbin vkquake