From 187a1afaf25c13d64464ccb760c6a130b5c362b0 Mon Sep 17 00:00:00 2001 From: Jason Manley Date: Thu, 21 Jul 2022 23:01:22 -0500 Subject: [PATCH 0001/1407] New package: KataGo-1.11.0 --- srcpkgs/KataGo-OpenCL/patches/rand.cpp.patch | 11 +++++++ srcpkgs/KataGo-OpenCL/patches/rand.h.patch | 11 +++++++ .../KataGo-OpenCL/patches/runtests.cpp.patch | 10 ++++++ .../KataGo-OpenCL/patches/search.cpp.patch | 11 +++++++ srcpkgs/KataGo-OpenCL/template | 29 +++++++++++++++++ srcpkgs/KataGo-eigen/patches/rand.cpp.patch | 11 +++++++ srcpkgs/KataGo-eigen/patches/rand.h.patch | 11 +++++++ .../KataGo-eigen/patches/runtests.cpp.patch | 10 ++++++ srcpkgs/KataGo-eigen/patches/search.cpp.patch | 11 +++++++ srcpkgs/KataGo-eigen/template | 32 +++++++++++++++++++ srcpkgs/eigen/template | 6 ++-- 11 files changed, 150 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/KataGo-OpenCL/patches/rand.cpp.patch create mode 100644 srcpkgs/KataGo-OpenCL/patches/rand.h.patch create mode 100644 srcpkgs/KataGo-OpenCL/patches/runtests.cpp.patch create mode 100644 srcpkgs/KataGo-OpenCL/patches/search.cpp.patch create mode 100644 srcpkgs/KataGo-OpenCL/template create mode 100644 srcpkgs/KataGo-eigen/patches/rand.cpp.patch create mode 100644 srcpkgs/KataGo-eigen/patches/rand.h.patch create mode 100644 srcpkgs/KataGo-eigen/patches/runtests.cpp.patch create mode 100644 srcpkgs/KataGo-eigen/patches/search.cpp.patch create mode 100644 srcpkgs/KataGo-eigen/template diff --git a/srcpkgs/KataGo-OpenCL/patches/rand.cpp.patch b/srcpkgs/KataGo-OpenCL/patches/rand.cpp.patch new file mode 100644 index 000000000000..3c15d2f13955 --- /dev/null +++ b/srcpkgs/KataGo-OpenCL/patches/rand.cpp.patch @@ -0,0 +1,11 @@ +--- a/cpp/core/rand.cpp 2022-03-20 15:12:06.000000000 -0500 ++++ b/cpp/core/rand.cpp 2022-07-23 09:15:36.383995796 -0500 +@@ -322,7 +322,7 @@ + { + assert(n > 0); + assert(n < 0xFFFFFFFF); +- double_t sum = cumRelProbs[n-1]; ++ double sum = cumRelProbs[n-1]; + double d = nextDouble(sum); + size_t r = BSearch::findFirstGt(cumRelProbs,d,0,n); + if(r == n) diff --git a/srcpkgs/KataGo-OpenCL/patches/rand.h.patch b/srcpkgs/KataGo-OpenCL/patches/rand.h.patch new file mode 100644 index 000000000000..ebed7ab7a96a --- /dev/null +++ b/srcpkgs/KataGo-OpenCL/patches/rand.h.patch @@ -0,0 +1,11 @@ +--- a/cpp/core/rand.h 2022-03-20 15:12:06.000000000 -0500 ++++ b/cpp/core/rand.h 2022-07-23 09:15:25.583181534 -0500 +@@ -209,7 +209,7 @@ + { + assert(n > 0); + assert(n < 0xFFFFFFFF); +- double_t sum = 0; ++ double sum = 0; + for(uint32_t i = 0; i= 0); diff --git a/srcpkgs/KataGo-OpenCL/patches/runtests.cpp.patch b/srcpkgs/KataGo-OpenCL/patches/runtests.cpp.patch new file mode 100644 index 000000000000..e0b5d79efc50 --- /dev/null +++ b/srcpkgs/KataGo-OpenCL/patches/runtests.cpp.patch @@ -0,0 +1,10 @@ +--- a/cpp/command/runtests.cpp 2022-03-20 15:12:06.000000000 -0500 ++++ b/cpp/command/runtests.cpp 2022-07-29 16:04:10.666595008 -0500 +@@ -24,7 +24,6 @@ + + int MainCmds::runtests(const vector& args) { + (void)args; +- testAssert(sizeof(size_t) == 8); + Board::initHash(); + ScoreValue::initTables(); + diff --git a/srcpkgs/KataGo-OpenCL/patches/search.cpp.patch b/srcpkgs/KataGo-OpenCL/patches/search.cpp.patch new file mode 100644 index 000000000000..864219e11441 --- /dev/null +++ b/srcpkgs/KataGo-OpenCL/patches/search.cpp.patch @@ -0,0 +1,11 @@ +--- a/cpp/search/search.cpp 2022-03-20 15:12:06.000000000 -0500 ++++ b/cpp/search/search.cpp 2022-07-23 09:11:16.099471820 -0500 +@@ -458,7 +458,7 @@ + //Compute caps on search + int64_t maxVisits = pondering ? searchParams.maxVisitsPondering : searchParams.maxVisits; + int64_t maxPlayouts = pondering ? searchParams.maxPlayoutsPondering : searchParams.maxPlayouts; +- double_t maxTime = pondering ? searchParams.maxTimePondering : searchParams.maxTime; ++ double maxTime = pondering ? searchParams.maxTimePondering : searchParams.maxTime; + + { + //Possibly reduce computation time, for human friendliness diff --git a/srcpkgs/KataGo-OpenCL/template b/srcpkgs/KataGo-OpenCL/template new file mode 100644 index 000000000000..65dff8361d95 --- /dev/null +++ b/srcpkgs/KataGo-OpenCL/template @@ -0,0 +1,29 @@ +# Template file for 'KataGo-OpenCL' +pkgname=KataGo-OpenCL +version=1.11.0 +revision=1 +wrksrc="KataGo-${version}" +build_wrksrc=cpp +build_style=cmake +configure_args="-DUSE_BACKEND=OPENCL -DNO_GIT_REVISION=1" +makedepends="ocl-icd-devel zlib-devel libzip-devel" +short_desc="KataGo Go/Weiqi/Baduk analysis engine (OpenCL backend)" +maintainer="Jason Manley " +license="MIT" +homepage="https://github.com/lightvector/KataGo/" +distfiles="https://github.com/lightvector/KataGo/archive/refs/tags/v${version}.tar.gz" +checksum=3f63aa5dfaab861360fd6f9548aa7f552b007cac7e90c99089d3bb4bb4b9d451 + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" + makedepends+=" libatomic-devel" +fi + +do_check() { + build/katago runtests +} + +do_install() { + vbin build/katago + vlicense "${wrksrc}"/LICENSE +} diff --git a/srcpkgs/KataGo-eigen/patches/rand.cpp.patch b/srcpkgs/KataGo-eigen/patches/rand.cpp.patch new file mode 100644 index 000000000000..3c15d2f13955 --- /dev/null +++ b/srcpkgs/KataGo-eigen/patches/rand.cpp.patch @@ -0,0 +1,11 @@ +--- a/cpp/core/rand.cpp 2022-03-20 15:12:06.000000000 -0500 ++++ b/cpp/core/rand.cpp 2022-07-23 09:15:36.383995796 -0500 +@@ -322,7 +322,7 @@ + { + assert(n > 0); + assert(n < 0xFFFFFFFF); +- double_t sum = cumRelProbs[n-1]; ++ double sum = cumRelProbs[n-1]; + double d = nextDouble(sum); + size_t r = BSearch::findFirstGt(cumRelProbs,d,0,n); + if(r == n) diff --git a/srcpkgs/KataGo-eigen/patches/rand.h.patch b/srcpkgs/KataGo-eigen/patches/rand.h.patch new file mode 100644 index 000000000000..ebed7ab7a96a --- /dev/null +++ b/srcpkgs/KataGo-eigen/patches/rand.h.patch @@ -0,0 +1,11 @@ +--- a/cpp/core/rand.h 2022-03-20 15:12:06.000000000 -0500 ++++ b/cpp/core/rand.h 2022-07-23 09:15:25.583181534 -0500 +@@ -209,7 +209,7 @@ + { + assert(n > 0); + assert(n < 0xFFFFFFFF); +- double_t sum = 0; ++ double sum = 0; + for(uint32_t i = 0; i= 0); diff --git a/srcpkgs/KataGo-eigen/patches/runtests.cpp.patch b/srcpkgs/KataGo-eigen/patches/runtests.cpp.patch new file mode 100644 index 000000000000..e0b5d79efc50 --- /dev/null +++ b/srcpkgs/KataGo-eigen/patches/runtests.cpp.patch @@ -0,0 +1,10 @@ +--- a/cpp/command/runtests.cpp 2022-03-20 15:12:06.000000000 -0500 ++++ b/cpp/command/runtests.cpp 2022-07-29 16:04:10.666595008 -0500 +@@ -24,7 +24,6 @@ + + int MainCmds::runtests(const vector& args) { + (void)args; +- testAssert(sizeof(size_t) == 8); + Board::initHash(); + ScoreValue::initTables(); + diff --git a/srcpkgs/KataGo-eigen/patches/search.cpp.patch b/srcpkgs/KataGo-eigen/patches/search.cpp.patch new file mode 100644 index 000000000000..864219e11441 --- /dev/null +++ b/srcpkgs/KataGo-eigen/patches/search.cpp.patch @@ -0,0 +1,11 @@ +--- a/cpp/search/search.cpp 2022-03-20 15:12:06.000000000 -0500 ++++ b/cpp/search/search.cpp 2022-07-23 09:11:16.099471820 -0500 +@@ -458,7 +458,7 @@ + //Compute caps on search + int64_t maxVisits = pondering ? searchParams.maxVisitsPondering : searchParams.maxVisits; + int64_t maxPlayouts = pondering ? searchParams.maxPlayoutsPondering : searchParams.maxPlayouts; +- double_t maxTime = pondering ? searchParams.maxTimePondering : searchParams.maxTime; ++ double maxTime = pondering ? searchParams.maxTimePondering : searchParams.maxTime; + + { + //Possibly reduce computation time, for human friendliness diff --git a/srcpkgs/KataGo-eigen/template b/srcpkgs/KataGo-eigen/template new file mode 100644 index 000000000000..952dc09fc539 --- /dev/null +++ b/srcpkgs/KataGo-eigen/template @@ -0,0 +1,32 @@ +# Template file for 'KataGo-eigen' +pkgname=KataGo-eigen +version=1.11.0 +revision=1 +wrksrc="KataGo-${version}" +build_wrksrc=cpp +build_style=cmake +configure_args="-DUSE_BACKEND=EIGEN -DNO_GIT_REVISION=1" +make_check_target="check" +makedepends="zlib-devel libzip-devel eigen" +short_desc="KataGo Go/Weiqi/Baduk analysis engine (OpenCL backend)" +maintainer="Jason Manley " +license="MIT" +homepage="https://github.com/lightvector/KataGo/" +distfiles="https://github.com/lightvector/KataGo/archive/refs/tags/v${version}.tar.gz" +checksum=3f63aa5dfaab861360fd6f9548aa7f552b007cac7e90c99089d3bb4bb4b9d451 +# Takes more time to test +make_check=extended + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" + makedepends+=" libatomic-devel" +fi + +do_check() { + build/katago runtests +} + +do_install() { + vbin build/katago + vlicense "${wrksrc}"/LICENSE +} diff --git a/srcpkgs/eigen/template b/srcpkgs/eigen/template index 072228c16915..ba6347bc94e5 100644 --- a/srcpkgs/eigen/template +++ b/srcpkgs/eigen/template @@ -1,15 +1,15 @@ # Template file for 'eigen' pkgname=eigen -version=3.3.9 +version=3.4.0 revision=1 build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=Release" short_desc="C++ template library for linear algebra (version 3.x)" -maintainer="Orphaned " +maintainer="Jason Manley " license="MPL-2.0, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause" homepage="https://eigen.tuxfamily.org/" distfiles="https://gitlab.com/libeigen/eigen/-/archive/${version}/eigen-${version}.tar.bz2" -checksum=0fa5cafe78f66d2b501b43016858070d52ba47bd9b1016b0165a7b8e04675677 +checksum=b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626 post_install() { vlicense COPYING.BSD From 07841db6345fe690f66d7f9d1553225caec834d9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 12 Aug 2022 17:22:25 +0200 Subject: [PATCH 0002/1407] knot: update to 3.1.9. --- srcpkgs/knot/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template index 13dcf355e6e6..040d4f45cde2 100644 --- a/srcpkgs/knot/template +++ b/srcpkgs/knot/template @@ -1,6 +1,6 @@ # Template file for 'knot' pkgname=knot -version=3.1.8 +version=3.1.9 revision=1 build_style=gnu-configure configure_args=" @@ -17,8 +17,9 @@ short_desc="High-performance authoritative-only DNS server" maintainer="Duncaen " license="GPL-3.0-or-later" homepage="https://www.knot-dns.cz/" +changelog="https://github.com/CZ-NIC/knot/raw/master/NEWS" distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz" -checksum=767e458a56277a1270b359294c3be6c63fd734884d62a045e01756a46507aa94 +checksum=b3ca4f1d444e95ff27d2096d3cc5a47c10c1d69a1e4885ae8a972781f6279d82 system_accounts="_knot" _knot_homedir="/var/lib/knot" From 652d5f4e1abd884e46af8e913d92a76841ae8684 Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 12 Aug 2022 18:16:40 +0200 Subject: [PATCH 0003/1407] libgsf: update to 1.14.50. --- srcpkgs/libgsf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgsf/template b/srcpkgs/libgsf/template index 132ac53261b5..e032d7543547 100644 --- a/srcpkgs/libgsf/template +++ b/srcpkgs/libgsf/template @@ -1,6 +1,6 @@ # Template file for 'libgsf' pkgname=libgsf -version=1.14.48 +version=1.14.50 revision=1 build_style=gnu-configure build_helper="gir" @@ -14,7 +14,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.gnome.org/" changelog="https://gitlab.gnome.org/GNOME/libgsf/-/raw/master/ChangeLog" distfiles="${GNOME_SITE}/libgsf/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ff86d7f1d46dd0ebefb7bd830a74a41db64362b987bf8853fff6ab4c1132b837 +checksum=6e6c20d0778339069d583c0d63759d297e817ea10d0d897ebbe965f16e2e8e52 pre_configure() { autoreconf -fi From 8c6dc8019f3bff3e5f2efa4c522004ce4ab1655d Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 12 Aug 2022 18:16:44 +0200 Subject: [PATCH 0004/1407] libgsm: update to 1.0.22. --- srcpkgs/libgsm/patches/gsm-1.0.13-shared.patch | 2 +- srcpkgs/libgsm/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libgsm/patches/gsm-1.0.13-shared.patch b/srcpkgs/libgsm/patches/gsm-1.0.13-shared.patch index b5b6d9bcb715..34fb998a9067 100644 --- a/srcpkgs/libgsm/patches/gsm-1.0.13-shared.patch +++ b/srcpkgs/libgsm/patches/gsm-1.0.13-shared.patch @@ -145,6 +145,6 @@ + $(LIBGSMSO) $(LIB)/libgsm.so.1.0.13 \ + $(LIB)libgsm.so.1 \ + $(TOAST) $(TCAT) $(UNTOAST) \ - $(ROOT)/gsm-1.0.tar.Z + $(ROOT)/gsm-1.0.tar.gz diff --git a/srcpkgs/libgsm/template b/srcpkgs/libgsm/template index 84a33219c459..b2ce9f8be190 100644 --- a/srcpkgs/libgsm/template +++ b/srcpkgs/libgsm/template @@ -1,6 +1,6 @@ # Template file for 'libgsm' pkgname=libgsm -version=1.0.19 +version=1.0.22 revision=1 wrksrc="gsm-${version%.*}-pl${version##*.}" short_desc="GSM 06.10 lossy speech compression" @@ -8,7 +8,7 @@ maintainer="Orphaned " license="TU-Berlin-2.0" homepage="http://www.quut.com/gsm/" distfiles="http://www.quut.com/gsm/gsm-${version}.tar.gz" -checksum=4903652f68a8c04d0041f0d19b1eb713ddcd2aa011c5e595b3b8bca2755270f6 +checksum=f0072e91f6bb85a878b2f6dbf4a0b7c850c4deb8049d554c65340b3bf69df0ac do_build() { make CC=$CC LD=$CC AR=$AR CCFLAGS="$CFLAGS -c -DNeedFunctionPrototypes=1" From a1c437091f9871ab3511e9af6121a47236f1eb4a Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 12 Aug 2022 18:16:47 +0200 Subject: [PATCH 0005/1407] libidn: update to 1.41. --- srcpkgs/libidn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libidn/template b/srcpkgs/libidn/template index 8fbe433346b2..d547d177317e 100644 --- a/srcpkgs/libidn/template +++ b/srcpkgs/libidn/template @@ -1,6 +1,6 @@ # Template file for 'libidn' pkgname=libidn -version=1.38 +version=1.41 revision=1 build_style=gnu-configure configure_args="--disable-csharp --disable-java --disable-static" @@ -9,7 +9,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://www.gnu.org/software/libidn/" distfiles="${GNU_SITE}/libidn/libidn-${version}.tar.gz" -checksum=de00b840f757cd3bb14dd9a20d5936473235ddcba06d4bc2da804654b8bbf0f6 +checksum=884d706364b81abdd17bee9686d8ff2ae7431c5a14651047c68adf8b31fd8945 libidn-devel_package() { depends="libidn>=${version}_${revision}" From 838bfc4475babbae8c58685e1482c42eda7d94ba Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 12 Aug 2022 18:16:50 +0200 Subject: [PATCH 0006/1407] libnice: update to 0.1.19. --- srcpkgs/libnice/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template index f0b53ad585ba..6022e7989a7a 100644 --- a/srcpkgs/libnice/template +++ b/srcpkgs/libnice/template @@ -1,7 +1,7 @@ # Template file for 'libnice' pkgname=libnice -version=0.1.18 -revision=4 +version=0.1.19 +revision=1 build_style=meson build_helper="gir" configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled @@ -13,7 +13,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://libnice.freedesktop.org/" distfiles="https://libnice.freedesktop.org/releases/libnice-${version}.tar.gz" -checksum=5eabd25ba2b54e817699832826269241abaa1cf78f9b240d1435f936569273f4 +checksum=6747af710998cf708a2e8ceef51cccd181373d94201dd4b8d40797a070ed47cc build_options="gir" build_options_default="gir" From 28d23d256aadb71ed95b222572da8a0b4aca9707 Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 12 Aug 2022 18:16:56 +0200 Subject: [PATCH 0007/1407] ntfs-3g: update to 2022.5.17. --- srcpkgs/ntfs-3g/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ntfs-3g/template b/srcpkgs/ntfs-3g/template index 72a3fe283153..a5684049416f 100644 --- a/srcpkgs/ntfs-3g/template +++ b/srcpkgs/ntfs-3g/template @@ -1,6 +1,6 @@ # Template file for 'ntfs-3g' pkgname=ntfs-3g -version=2021.8.22 +version=2022.5.17 revision=1 wrksrc="${pkgname}_ntfsprogs-${version}" build_style=gnu-configure @@ -18,7 +18,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/tuxera/ntfs-3g" changelog="https://raw.githubusercontent.com/wiki/tuxera/ntfs-3g/NTFS-3G-Release-History.md" distfiles="https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz" -checksum=55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb +checksum=0489fbb6972581e1b417ab578d543f6ae522e7fa648c3c9b49c789510fd5eb93 build_options="crypto extras quarantined" desc_option_crypto="Enable crypto related code and utilities" From 64940b81a1e415e5c90b967541edd6805435509e Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 12 Aug 2022 18:17:13 +0200 Subject: [PATCH 0008/1407] tumbler: update to 4.16.1. --- srcpkgs/tumbler/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template index 9b4de6a28c82..a6bfebe994ca 100644 --- a/srcpkgs/tumbler/template +++ b/srcpkgs/tumbler/template @@ -1,7 +1,7 @@ # Template file for 'tumbler' pkgname=tumbler -version=4.16.0 -revision=3 +version=4.16.1 +revision=1 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer" hostmakedepends="intltool pkg-config glib-devel" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://docs.xfce.org/xfce/tumbler/start" distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66 +checksum=852bbffa13f35b48ce92e243a03a118e32037c03e68297335c2bc4578e39273e tumbler-devel_package() { depends="libglib-devel ${sourcepkg}>=${version}_${revision}" From f5421ab2869549b138088e9605d3fa985d5ab14f Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 12 Aug 2022 18:17:16 +0200 Subject: [PATCH 0009/1407] libwebp: update to 1.2.4. --- srcpkgs/libwebp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libwebp/template b/srcpkgs/libwebp/template index e4bbfb0bcbc0..9d0138fcbebb 100644 --- a/srcpkgs/libwebp/template +++ b/srcpkgs/libwebp/template @@ -1,6 +1,6 @@ # Template file for 'libwebp' pkgname=libwebp -version=1.2.2 +version=1.2.4 revision=1 build_style=gnu-configure configure_args="--enable-libwebpmux --enable-libwebpdemux --enable-libwebpdecoder" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="BSD-3-Clause" homepage="https://developers.google.com/speed/webp/" distfiles="http://downloads.webmproject.org/releases/webp/${pkgname}-${version}.tar.gz" -checksum=7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6 +checksum=7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df case "$XBPS_TARGET_MACHINE" in armv6*) configure_args+=" --disable-neon";; From 0ef66cb2bc94c8412cd9a008ed98e55cb804057c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 11 Aug 2022 00:39:09 +0200 Subject: [PATCH 0010/1407] pgadmin3: remove package doesn't build with recent postgresql --- .../patches/pgadmin3-fix-segfault.patch | 13 ---- .../patches/pgadmin3_unbundle-libssh.patch | 68 ------------------- srcpkgs/pgadmin3/template | 27 -------- srcpkgs/removed-packages/template | 1 + 4 files changed, 1 insertion(+), 108 deletions(-) delete mode 100644 srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch delete mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch delete mode 100644 srcpkgs/pgadmin3/template diff --git a/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch b/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch deleted file mode 100644 index a42d1992b658..000000000000 --- a/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.archlinux.org/task/52683 - ---- a/pgadmin/frm/plugins.cpp -+++ b/pgadmin/frm/plugins.cpp -@@ -380,7 +380,7 @@ bool pluginUtilityFactory::CheckEnable(p - { - // If we need a specific server type, we can't enable unless - // we have a connection. -- if (!obj || !(obj->GetConnection()->GetStatus() == PGCONN_OK)) -+ if (!obj || !obj->GetConnection() || !(obj->GetConnection()->GetStatus() == PGCONN_OK)) - return false; - - // Get the server type. diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch deleted file mode 100644 index 3a678ef3bed9..000000000000 --- a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -rupN configure.ac.in configure.ac.in ---- a/configure.ac.in 2020-03-24 05:15:11.000000000 +0100 -+++ b/configure.ac.in 2020-04-09 14:54:07.189090418 +0200 -@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio. - AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h]) - AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no]) - AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes) --AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_HEADER_STDBOOL -diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk ---- a/pgadmin/include/module.mk 2020-03-24 05:15:11.000000000 +0100 -+++ b/pgadmin/include/module.mk 2020-04-09 14:54:07.190090419 +0200 -@@ -36,5 +36,4 @@ include include/gqb/module.mk - include include/hotdraw/module.mk - include include/utils/module.mk - include include/ogl/module.mk --include include/libssh2/module.mk - -diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am ---- a/pgadmin/Makefile.am 2020-03-24 05:15:11.000000000 +0100 -+++ b/pgadmin/Makefile.am 2020-04-09 14:54:09.880094260 +0200 -@@ -49,7 +49,6 @@ include gqb/module.mk - include hotdraw/module.mk - include ui/module.mk - include utils/module.mk --include libssh2/module.mk - - if SUN_CC - __CFLAGS="" -@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \ - $(TMP_ui) - endif - --if BUILD_SSH_TUNNEL --AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ) --else - AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ) -+if BUILD_SSH_TUNNEL -+AM_LDFLAGS = -lssh2 - endif - - # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy -@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \ - $(TMP_ui) - endif - --if BUILD_SSH_TUNNEL --AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ) --else - AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ) --endif - - install-exec-hook: - cd $(bindir) ;\ -diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp ---- a/pgadmin/utils/sshTunnel.cpp 2020-03-24 05:15:11.000000000 +0100 -+++ b/pgadmin/utils/sshTunnel.cpp 2020-04-09 14:54:07.191090420 +0200 -@@ -15,7 +15,7 @@ - - #undef ssize_t - #define ssize_t long --#include "libssh2/libssh2.h" -+#include - #include "utils/sshTunnel.h" - #include "frm/frmMain.h" - diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template deleted file mode 100644 index ad2465b3413c..000000000000 --- a/srcpkgs/pgadmin3/template +++ /dev/null @@ -1,27 +0,0 @@ -# Template file for 'pgadmin3' -pkgname=pgadmin3 -version=1.22.2 -revision=14 -build_style=gnu-configure -configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0" -hostmakedepends="automake libtool" -makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel" -short_desc="Comprehensive design and management interface for PostgreSQL" -maintainer="Gerardo Di Iorio " -license="0BSD" -homepage="http://www.pgadmin.org" -distfiles="https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz" -checksum=9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac -nocross=yes - -CXXFLAGS="-Wno-narrowing" - -pre_configure() { - autoreconf -fi - sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc - sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure -} -post_install() { - vlicense LICENSE -} - diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 30cb55c291fb..0d1180ad4903 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -274,6 +274,7 @@ replaces=" perl-Gtk2-Ex-Simple-List<=0.50_4 perl-Gtk2-ImageView<=0.05_8 perl-Gtk2-Notify<=0.05_8 + pgadmin3<=1.22.2_14 phonon-backend-gstreamer<=4.9.0_2 phonon-backend-vlc<=0.9.1_3 polkit-qt<=0.112.0_5 From 2e1585365a4396bfe65680e116583ad213cae437 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 11 Aug 2022 21:18:24 -0700 Subject: [PATCH 0011/1407] epiphany: update to 42.4. --- srcpkgs/epiphany/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 88eb6d8a8800..435daf6485d1 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,8 +1,7 @@ # Template file for 'epiphany' pkgname=epiphany -version=42.2 +version=42.4 revision=1 -build_helper="gir" build_style=meson configure_args="-Dunit_tests=disabled" hostmakedepends="gettext glib-devel itstool pkg-config" @@ -18,4 +17,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Web" changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=92c02cf886d10d2ccff5de658e1a420eab31d20bb50e746d430e9535b485192d +checksum=370938ad2920eeb28bc2435944776b7ba55a0e2ede65836f79818cfb7e8f0860 From c1d5f1ca7a9d363e0cc9313af013e5cb900162fe Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 11 Aug 2022 20:50:10 -0700 Subject: [PATCH 0012/1407] eog: update to 42.3. --- srcpkgs/eog/template | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 30522c83eb5a..489d55e1b451 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,11 +1,11 @@ # Template file for 'eog' pkgname=eog -version=42.2 +version=42.3 revision=1 build_helper="gir" build_style=meson configure_args="-Dintrospection=$(vopt_if gir true false)" -hostmakedepends="gettext glib-devel itstool pkg-config" +hostmakedepends="pkg-config gettext glib-devel itstool gtk-update-icon-cache" makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel librsvg-devel lcms2-devel libportal-gtk3-devel libhandy1-devel" depends="desktop-file-utils hicolor-icon-theme shared-mime-info" @@ -15,19 +15,15 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/EyeOfGnome" changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz" -checksum=0e4d4a6a2ee1a240ae8b58449f02ba2c64b7f99490d0b8915d7f52c90a58045e +checksum=30c1b3c28bc6dc2854d878ebd31a22eaa15bf959c134206a2a1904193e47f43a shlib_provides="libeog.so" lib32disabled=yes build_options="gir" build_options_default="gir" -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" libglib-devel gtk-update-icon-cache" -fi - eog-devel_package() { - depends="${sourcepkg}-${version}_${revision} gtk+3-devel" + depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libhandy1-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From e0f5c54a95a9a31f7c03475d8b4dd594a261e72c Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 5 Aug 2022 16:08:58 -0400 Subject: [PATCH 0013/1407] CONTRIBUTING.md: add info about updating templates, misc other changes - a few small formatting/grammar changes/corrections - document cloning with https, github-cli - document using non-fork-master branch for changes - document not using web ui for commiting - add example commits for non-package changes - add xrevbump - reorder so testing build locally is before committing (more chronological) - update xtools URL - update example commits --- CONTRIBUTING.md | 82 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 26 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3f33aeb1d974..b21b9acdc5eb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,15 +4,16 @@ void-packages is the backbone of the Void Linux distribution. It contains all th This document describes how you, as a contributor, can help with adding packages, correcting bugs and adding features to void-packages. -## Getting your packages into Void by yourself +## Creating, updating, and modifying packages in Void by yourself -If you really want to get a package into Void Linux, we recommend you package it yourself. +If you really want to get a new package or package update into Void Linux, we recommend you contribute it yourself. We provide a [comprehensive Manual](./Manual.md) on how to create new packages. -There's also a [manual for xbps-src](./README.md), which is used -to build package files from templates. +There's also a [manual for xbps-src](./README.md), which is used to build package files from templates. -For this guide, we assume you have basic knowledge about [git](http://git-scm.org), as well as a [GitHub Account](http://github.com). +For this guide, we assume you have basic knowledge about [git](http://git-scm.org), as well as a [GitHub Account](http://github.com) with [SSH set up](https://docs.github.com/en/authentication/connecting-to-github-with-ssh). + +You should also [set the email](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address) on your GitHub account and in git so your commits are associated with your GitHub account properly. To get started, [fork](https://help.github.com/articles/fork-a-repo) the void-linux `void-packages` git repository on GitHub and clone it: @@ -23,9 +24,24 @@ To keep your forked repository up to date, setup the `upstream` remote to pull i $ git remote add upstream https://github.com/void-linux/void-packages.git $ git pull --rebase upstream master +This can also be done with the `github-cli` tool: + + $ gh repo fork void-linux/void-packages + $ gh repo clone /void-packages + +This automatically sets up the `upstream` remote, so `git pull --rebase upstream master` can still be used to keep your fork up-to-date. + +Using the GitHub web editor for making changes is strongly discouraged, because you will need to clone the repo anyways to edit and test your changes. + +using the the `master` branch of your fork for contributing is also strongly discouraged. +It can cause many issues with updating your pull request (also called a PR), and having multiple PRs open at once. +To create a new branch: + + $ git checkout master -b + ### Creating a new template -You can use the helper tool `xnew`, from the [xtools](https://github.com/chneukirchen/xtools) package, to create new templates: +You can use the helper tool `xnew`, from the [xtools](https://github.com/leahneukirchen/xtools) package, to create new templates: $ xnew pkgname subpkg1 subpkg2 ... @@ -33,44 +49,58 @@ Templates must have the name `void-packages/srcpkgs//template`, where ` For deeper insights on the contents of template files, please read the [manual](./Manual.md), and be sure to browse the existing template files in the `srcpkgs` directory of this repository for concrete examples. -When you've finished working on the template file, please check it with `xlint` helper from the [xtools](https://github.com/chneukirchen/xtools) package: +### Updating a template - $ xlint template +At minimum, a template update will consist of changing `version` and `checksum`, if there was an upstream version change, and/or `revision`, if a template-specific change (e.g. patch, correction, etc.) is needed. +Other changes to the template may be needed depending on what changes the upstream has made. -If `xlint` reports any issues, resolve them before committing. +The checksum can be updated automatically with the `xgensum` helper from the [xtools](https://github.com/leahneukirchen/xtools) package: + + $ xgensum -i ### Committing your changes -Once you have made and verified your changes to the package template and/or other files, make one commit per package (including all changes to its sub-packages). Each commit message should have one of the following formats: +After making your changes, please check that the package builds successfully. From the top level directory of your local copy of the `void-packages` repository, run: -* for new packages, use ```New package: -``` ([example](https://github.com/void-linux/void-packages/commit/176d9655429188aac10cd229827f99b72982ab10)). + $ ./xbps-src pkg -* for package updates, use ```: update to .``` ([example](https://github.com/void-linux/void-packages/commit/b6b82dcbd4aeea5fc37a32e4b6a8dd8bd980d5a3)). +Your package must build successfully for at least x86, but we recommend also trying a cross-build for armv6l* as well, e.g.: -* for template modifications without a version change, use ```: ``` ([example](https://github.com/void-linux/void-packages/commit/8b68d6bf1eb997cd5e7c095acd040e2c5379c91d)). + $ ./xbps-src -a armv6l pkg -* for package removals, use ```: remove package``` ([example](https://github.com/void-linux/void-packages/commit/83784632d94deee5d038c8e1c4c1dffa922fca21)). +When building for `x86_64*` or `i686`, building with the `-Q` flag or with `XBPS_CHECK_PKGS=yes` set in `etc/conf` (to run the check phase) is strongly encouraged. +Also, new packages and updates will not be accepted unless they have been runtime tested by installing and running the package. -* for `common/shlibs` modifications, use `common/shlibs: ` ([example](https://github.com/void-linux/void-packages/commit/613651c91811cb4fd2e1a6be701c87072d759a9f)). +When you've finished working on the template file, please check it with `xlint` helper from the [xtools](https://github.com/leahneukirchen/xtools) package: -If you want to describe your changes in more detail, add an empty line followed by those details ([example](https://github.com/void-linux/void-packages/commit/f1c45a502086ba1952f23ace9084a870ce437bc6)). + $ xlint template -`xbump`, available in the [xtools](https://github.com/chneukirchen/xtools) package, can be used to commit a new or updated package: +If `xlint` reports any issues, resolve them before committing. - $ xbump +Once you have made and verified your changes to the package template and/or other files, make one commit per package (including all changes to its sub-packages). Each commit message should have one of the following formats: -`xbump` will use `git commit` to commit the changes with the appropriate commit message. For more fine-grained control over the commit, specific options can be passed to `git commit` by adding them after the package name. +* for new packages, use `New package: -` ([example](https://github.com/void-linux/void-packages/commit/8ed8d41c40bf6a82cf006c7e207e05942c15bff8)). -After committing your changes, please check that the package builds successfully. From the top level directory of your local copy of the `void-packages` repository, run: +* for package updates, use `: update to .` ([example](https://github.com/void-linux/void-packages/commit/c92203f1d6f33026ae89f3e4c1012fb6450bbac1)). - $ ./xbps-src pkg +* for template modifications without a version change, use `: ` ([example](https://github.com/void-linux/void-packages/commit/ff39c912d412717d17232de9564f659b037e95b5)). + +* for package removals, use `: remove package` and include the removal reason in the commit body ([example](https://github.com/void-linux/void-packages/commit/4322f923bdf5d4e0eb36738d4f4717d72d0a0ca4)). + +* for changes to any other file, use `: ` ([example](https://github.com/void-linux/void-packages/commit/e00bea014c36a70d60acfa1758514b0c7cb0627d), + [example](https://github.com/void-linux/void-packages/commit/93bf159ce10d8e474da5296e5bc98350d00c6c82), [example](https://github.com/void-linux/void-packages/commit/dc62938c67b66a7ff295eab541dc37b92fb9fb78), [example](https://github.com/void-linux/void-packages/commit/e52317e939d41090562cf8f8131a68772245bdde)) + +If you want to describe your changes in more detail, explain in the commit body (separated from the first line with a blank line) ([example](https://github.com/void-linux/void-packages/commit/f1c45a502086ba1952f23ace9084a870ce437bc6)). + +`xbump`, available in the [xtools](https://github.com/leahneukirchen/xtools) package, can be used to commit a new or updated package: + + $ xbump -Your package must build successfully for at least x86, but we recommend trying to build for armv* as well, e.g.: +`xrevbump`, also available in the [xtools](https://github.com/leahneukirchen/xtools) package, can be used to commit a template modification for a package: - $ ./xbps-src -a armv7l pkg + $ xrevbump '' -Runtime testing of packages and building with the `-Q` flag or with `XBPS_CHECK_PKGS=yes` set in the environment or `etc/conf` are strongly encouraged. -New packages will not be accepted unless they have been runtime tested. +`xbump` and `xrevbump` will use `git commit` to commit the changes with the appropriate commit message. For more fine-grained control over the commit, specific options can be passed to `git commit` by adding them after the package name. ### Starting a pull request @@ -123,7 +153,7 @@ Once you have applied all requested changes, the reviewers will merge your reque If the pull request becomes inactive for some days, the reviewers may or may not warn you when they are about to close it. If it stays inactive further, it will be closed. -Please abstain from temporarily closing a pull request while revising the templates. Instead, leave a comment on the PR describing what still needs work, or add "[WIP]" to the PR title. Only close your pull request if you're sure you don't want your changes to be included. +Please abstain from temporarily closing a pull request while revising the templates. Instead, leave a comment on the PR describing what still needs work, [mark it as a draft](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#converting-a-pull-request-to-a-draft), or add "[WIP]" to the PR title. Only close your pull request if you're sure you don't want your changes to be included. #### Publishing the package From d676181ee59009b1a78a9f753f7d9b8afd1386eb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 12 Aug 2022 01:04:16 +0200 Subject: [PATCH 0014/1407] gcr: update to 3.41.1. --- srcpkgs/gcr/patches/meson-0.61.patch | 59 -------------------- srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 -------- srcpkgs/gcr/template | 36 +++++------- 3 files changed, 13 insertions(+), 105 deletions(-) delete mode 100644 srcpkgs/gcr/patches/meson-0.61.patch delete mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch diff --git a/srcpkgs/gcr/patches/meson-0.61.patch b/srcpkgs/gcr/patches/meson-0.61.patch deleted file mode 100644 index 21c1c3610226..000000000000 --- a/srcpkgs/gcr/patches/meson-0.61.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 - diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch deleted file mode 100644 index ca2660244c37..000000000000 --- a/srcpkgs/gcr/patches/unbreak-no-systemd.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Sun, 24 Oct 2021 10:26:03 +0200 -Subject: [PATCH] Unbreak build without systemd. - -This fixes the check for WITH_SYSTEMD and prevents a fatal error: -'systemd/sd-daemon.h' file not found when building with systemd disabled. ---- - gcr/gcr-ssh-agent-service.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c -index 3b5a4ca..b7e8928 100644 ---- a/gcr/gcr-ssh-agent-service.c -+++ b/gcr/gcr-ssh-agent-service.c -@@ -39,7 +39,7 @@ - #include - #include - --#ifdef WITH_SYSTEMD -+#if WITH_SYSTEMD - #include - #endif diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index 5ab7455fb539..b43ee6b1b423 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -1,33 +1,27 @@ # Template file for 'gcr' pkgname=gcr -version=3.41.0 +version=3.41.1 revision=1 build_style=meson build_helper="gir" -hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh - libxslt $(vopt_if vala vala)" -makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel - $(vopt_if vala vala)" -depends="desktop-file-utils hicolor-icon-theme gnupg2" +configure_args="$(vopt_bool gir introspection) $(vopt_bool gir gtk_doc)" +hostmakedepends="gettext glib-devel gnupg gi-docgen gettext pkg-config openssh + libxslt $(vopt_if gir vala)" +makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel" +depends="desktop-file-utils hicolor-icon-theme gnupg" +checkdepends="dbus" short_desc="GNOME crypto package" maintainer="Orphaned " license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gcr" distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz" -checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01 - -if [ "$CROSS_BUILD" ]; then - configure_args="-Dgtk_doc=false" -fi +checksum=bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f +make_check_pre="dbus-run-session" +make_check=no # Gcr:ERROR:../gcr/test-gnupg-collection.c:203:test_load: assertion failed: (record) # Package build options -build_options="gir vala" -build_options_default="gir vala" - -do_check() { - # requires X11 server - : -} +build_options="gir" +build_options_default="gir" post_install() { vinstall ${FILESDIR}/10-gcr-memlock.conf 644 etc/security/limits.d @@ -40,13 +34,9 @@ gcr-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - if [ -z "$CROSS_BUILD" ]; then - vmove usr/share/gtk-doc - fi if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 - fi - if [ "$build_option_vala" ]; then + vmove usr/share/doc vmove usr/share/vala fi } From e8d1eb6eea11983c2eca91e6be06561a99363fad Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 12 Aug 2022 10:34:40 -0400 Subject: [PATCH 0015/1407] dendrite: update to 0.9.2. --- srcpkgs/dendrite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template index 7a2877436f8a..0a1dc053675c 100644 --- a/srcpkgs/dendrite/template +++ b/srcpkgs/dendrite/template @@ -1,6 +1,6 @@ # Template file for 'dendrite' pkgname=dendrite -version=0.9.1 +version=0.9.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=5a65eb07b47dffefab2e8abe48cd7d37bc59e08c5163b09c63ec1d30cc808d35 +checksum=e22389d21789656571c80f58cd88ab8f8f884c0c3fad75b31f81c75c4c42620a system_accounts="_dendrite" _dendrite_homedir="/var/lib/dendrite" From ab5f4649f11a2c7d27ae80f325e68f90958922db Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 12 Aug 2022 13:13:20 -0400 Subject: [PATCH 0016/1407] telepathy-mission-control: update to 5.16.6. Only python3 is needed as headers are not needed to build. --- .../patches/account-Fix-property-name.patch | 28 ------------------- srcpkgs/telepathy-mission-control/template | 10 +++---- 2 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/telepathy-mission-control/patches/account-Fix-property-name.patch diff --git a/srcpkgs/telepathy-mission-control/patches/account-Fix-property-name.patch b/srcpkgs/telepathy-mission-control/patches/account-Fix-property-name.patch deleted file mode 100644 index 051ffaad3a63..000000000000 --- a/srcpkgs/telepathy-mission-control/patches/account-Fix-property-name.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Thu, 19 Dec 2019 13:37:49 +0100 -Subject: [PATCH] account: Fix property name - -Spaces are not valid characters in property names, and never were. -Until recently GLib silently fixed up the name by replacing the -space with '-', but now tightened up the validation. ---- - src/mcd-account.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/mcd-account.c src/mcd-account.c -index 8009110e..de5c61cf 100644 ---- a/src/mcd-account.c -+++ b/src/mcd-account.c -@@ -3442,7 +3442,7 @@ mcd_account_class_init (McdAccountClass * klass) - - g_object_class_install_property - (object_class, PROP_CONNECTIVITY_MONITOR, -- g_param_spec_object ("connectivity monitor", -+ g_param_spec_object ("connectivity-monitor", - "Connectivity monitor", - "Connectivity monitor", - MCD_TYPE_CONNECTIVITY_MONITOR, --- -2.24.1 - diff --git a/srcpkgs/telepathy-mission-control/template b/srcpkgs/telepathy-mission-control/template index f539aa07f1c8..5851b8c4dc46 100644 --- a/srcpkgs/telepathy-mission-control/template +++ b/srcpkgs/telepathy-mission-control/template @@ -2,19 +2,19 @@ pkgname=telepathy-mission-control reverts="5:5.16.4_1 5:5.16.1_2 5:5.16.1_1 5:5.16.0_2 5:5.16.0_1 5:5.15.1_1 5:5.14.1_1 2:5.14.1_1 1:5.14.1_1" -version=5.16.5 +version=5.16.6 revision=1 build_style=gnu-configure configure_args="--disable-static --enable-gnome-keyring --disable-schemas-compile" -hostmakedepends="pkg-config python-devel intltool libxslt glib-devel" +hostmakedepends="pkg-config python3 intltool libxslt glib-devel" makedepends="libglib-devel telepathy-glib-devel NetworkManager-devel libgnome-keyring-devel" depends="telepathy-glib>=0.22" short_desc="Account manager and channel dispatcher for the Telepathy framework" maintainer="Orphaned " license="LGPL-2.1-or-later" -homepage="http://telepathy.freedesktop.org" -distfiles="${homepage}/releases/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=4c6b433b8b9079fd7df3e29aefcad6755a2081a9a634ffb6b33936c7d0d8bd03 +homepage="https://telepathy.freedesktop.org" +distfiles="https://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=2df8ae3995e919a7670e01aa3568215ef0777e34961ace1cac1c6477cb297a45 telepathy-mission-control-devel_package() { depends="telepathy-glib-devel>=0.22 ${sourcepkg}>=${version}" From 413d8cdeb36ceb32f9b203cb76c58e489709909e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 12 Aug 2022 13:06:20 -0400 Subject: [PATCH 0017/1407] Manual.md, CONTRIBUTING.md: move quality requirements to CONTRIBUTING rename to Package Requirements --- CONTRIBUTING.md | 23 +++++++++++++++++++++++ Manual.md | 33 --------------------------------- 2 files changed, 23 insertions(+), 33 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b21b9acdc5eb..ab24ede1f341 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,6 +4,29 @@ void-packages is the backbone of the Void Linux distribution. It contains all th This document describes how you, as a contributor, can help with adding packages, correcting bugs and adding features to void-packages. +## Package Requirements + +To be included in the Void repository, software must meet at least one of the following requirements. +Exceptions to the list are possible, and might be accepted, but are extremely unlikely. +If you believe you have an exception, start a PR and make an argument for why that particular piece of software, +while not meeting any of the following requirements, is a good candidate for the Void packages system. + +1. **System**: The software should be installed system-wide, not per-user. + +1. **Compiled**: The software needs to be compiled before being used, even if it is software that is not needed by the whole system. + +1. **Required**: Another package either within the repository or pending inclusion requires the package. + +In particular, new themes are highly unlikely to be accepted. +Simple shell scripts are unlikely to be accepted unless they provide considerable value to a broad user base. +New fonts may be accepted if they provide value beyond aesthetics (e.g. they contain glyphs for a script missing in already packaged fonts). + +Browser forks, including those based on Chromium and Firefox, are generally not accepted. +Such forks require heavy patching, maintenance and hours of build time. + +Software need to be used in version announced by authors as ready to use by the general public - usually called releases. +Betas, arbitrary VCS revisions, templates using tip of development branch taken at build time and releases created by the package maintainer won't be accepted. + ## Creating, updating, and modifying packages in Void by yourself If you really want to get a new package or package update into Void Linux, we recommend you contribute it yourself. diff --git a/Manual.md b/Manual.md index 3b0d85e78abc..f22e878277ab 100644 --- a/Manual.md +++ b/Manual.md @@ -6,7 +6,6 @@ packages for XBPS, the `Void Linux` native packaging system. *Table of Contents* * [Introduction](#Introduction) - * [Quality Requirements](#quality_requirements) * [Package build phases](#buildphase) * [Package naming conventions](#namingconventions) * [Libraries](#libs) @@ -124,38 +123,6 @@ If everything went fine after running a binary package named `foo-1.0_1..xbps` will be generated in the local repository `hostdir/binpkgs`. - -### Quality Requirements - -To be included in the Void repository, software must meet at least one -of the following requirements. Exceptions to the list are possible, -and might be accepted, but are extremely unlikely. If you believe you have an -exception, start a PR and make an argument for why that particular piece of -software, while not meeting any of the following requirements, is a good candidate for -the Void packages system. - -1. System: The software should be installed system-wide, not per-user. - -1. Compiled: The software needs to be compiled before being used, even if it is - software that is not needed by the whole system. - -1. Required: Another package either within the repository or pending inclusion - requires the package. - -In particular, new themes are highly unlikely to be accepted. Simple shell -scripts are unlikely to be accepted unless they provide considerable value to a -broad user base. New fonts may be accepted if they provide value beyond -aesthetics (e.g. they contain glyphs for a script missing in already packaged -fonts). - -Browser forks, including those based on Chromium and Firefox, are generally not -accepted. Such forks require heavy patching, maintenance and hours of build time. - -Software need to be used in version announced by authors as ready to use by -the general public - usually called releases. Betas, arbitrary VCS revisions, -templates using tip of development branch taken at build time and releases -created by the package maintainer won't be accepted. - ### Package build phases From abf189974ec4124dc033f58394d4ab0c6515b20e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 12 Aug 2022 13:07:05 -0400 Subject: [PATCH 0018/1407] .github/ISSUE_TEMPLATE/pkg-request.yml: update pkg reqs url --- .github/ISSUE_TEMPLATE/pkg-request.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/pkg-request.yml b/.github/ISSUE_TEMPLATE/pkg-request.yml index 1dbbe572d069..a50049efc108 100644 --- a/.github/ISSUE_TEMPLATE/pkg-request.yml +++ b/.github/ISSUE_TEMPLATE/pkg-request.yml @@ -36,9 +36,9 @@ body: - id: quality type: dropdown attributes: - label: Does the requested package meet the quality requirements? + label: Does the requested package meet the package requirements? description: | - See [Manual.md](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality_requirements) for details + See [CONTRIBUTING.md](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements) for details multiple: true options: - System @@ -51,7 +51,7 @@ body: attributes: label: Is the requested package released? description: | - See [Manual.md](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality_requirements) for details + See [CONTRIBUTING.md](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements) for details options: - "Yes" - "No" From 5f2fb9f5b3328792a928b6c8e5fbd877cbe2e4e4 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 12 Aug 2022 13:11:55 -0400 Subject: [PATCH 0019/1407] .github/pull_request_template.md: update pkg reqs url --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 8a9e2348494d..57f7cc96d84e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -5,7 +5,7 @@ - -- -+ - - True - False -@@ -26,84 +27,6 @@ - 5 - 10 - -- -- True -- False -- 0 -- Output format -- -- -- 0 -- 3 -- 1 -- 1 -- -- -- -- -- True -- False -- -- -- True -- False -- -- -- -- False -- False -- end -- 0 -- -- -- -- -- 1 -- 3 -- 1 -- 1 -- -- -- -- -- True -- False -- 0 -- Profile -- -- -- 0 -- 1 -- 1 -- 1 -- -- -- -- -- True -- False -- -- -- True -- False -- -- -- -- False -- False -- end -- 0 -- -- -- -- -- 1 -- 1 -- 1 -- 1 -- -- -- - - Temporal noise shaping - False -@@ -111,16 +34,14 @@ - True - False - True -- False - 0 - True - - - - 0 -- 2 -+ 1 - 2 -- 1 - - - -@@ -146,7 +67,6 @@ - 0 - 1 - 2 -- 1 - - - -@@ -170,8 +90,6 @@ - - 1 - 0 -- 1 -- 1 - - - -@@ -184,8 +102,6 @@ - - 0 - 0 -- 1 -- 1 - - - -diff -Naur gnac-0.2.4.1.orig/data/profiles/ui/gnac-profiles-lame.xml gnac-0.2.4.1/data/profiles/ui/gnac-profiles-lame.xml ---- gnac-0.2.4.1.orig/data/profiles/ui/gnac-profiles-lame.xml 2012-04-22 14:09:01.000000000 +0200 -+++ gnac-0.2.4.1/data/profiles/ui/gnac-profiles-lame.xml 2015-01-09 23:49:31.336379238 +0100 -@@ -1,6 +1,7 @@ - -+ - -- -+ - - 100 - 1 -@@ -10,9 +11,6 @@ - - 1 - -- -- 1 -- - - True - False -@@ -44,7 +42,7 @@ - True - False - -- -+ - True - False - -@@ -60,8 +58,6 @@ - - 1 - 1 -- 1 -- 1 - - - -@@ -74,133 +70,6 @@ - - 0 - 1 -- 1 -- 1 -- -- -- -- -- Mean bitrate -- False -- True -- True -- False -- False -- 0 -- True -- -- -- -- 0 -- 2 -- 1 -- 1 -- -- -- -- -- Min bitrate -- False -- True -- True -- False -- False -- 0 -- True -- -- -- -- 0 -- 3 -- 1 -- 1 -- -- -- -- -- Max bitrate -- False -- True -- True -- False -- False -- 0 -- True -- -- -- -- 0 -- 4 -- 1 -- 1 -- -- -- -- -- True -- False -- True -- adjustment1 -- 0 -- -- -- -- 1 -- 2 -- 1 -- 1 -- -- -- -- -- True -- False -- -- -- True -- False -- False -- -- -- -- False -- False -- end -- 0 -- -- -- -- -- 1 -- 3 -- 1 -- 1 -- -- -- -- -- True -- False -- -- -- True -- False -- False -- -- -- -- False -- False -- end -- 0 -- -- -- -- -- 1 -- 4 -- 1 -- 1 - - - -@@ -223,9 +92,8 @@ - - - 0 -- 6 -+ 3 - 2 -- 1 - - - -@@ -233,10 +101,10 @@ - True - False - -- -+ - True - False -- -+ - - - False -@@ -249,8 +117,6 @@ - - 1 - 0 -- 1 -- 1 - - - -@@ -274,47 +140,6 @@ - - 1 - 1 -- 1 -- 1 -- -- -- -- -- True -- False -- -- -- True -- False -- -- -- -- False -- False -- end -- 0 -- -- -- -- -- 1 -- 3 -- 1 -- 1 -- -- -- -- -- True -- False -- 0 -- Preset -- -- -- 0 -- 3 -- 1 -- 1 - - - -@@ -327,8 +152,6 @@ - - 0 - 2 -- 1 -- 1 - - - -@@ -336,13 +159,11 @@ - True - False - 0 -- Constant bitrate (CBR) -+ Bitrate - - - 0 - 1 -- 1 -- 1 - - - -@@ -350,13 +171,11 @@ - True - False - 0 -- Encoding mode -+ Target - - - 0 - 0 -- 1 -- 1 - - - -@@ -414,69 +233,12 @@ - - 1 - 2 -- 1 -- 1 -- -- -- -- -- True -- False -- 0 -- Average bitrate (ABR) -- -- -- 0 -- 4 -- 1 -- 1 -- -- -- -- -- True -- True -- adjustment1 -- 0 -- -- -- -- 1 -- 4 -- 1 -- 1 -- -- -- -- -- True -- False -- 0 -- Compression ratio -- -- -- 0 -- 5 -- 1 -- 1 -- -- -- -- -- True -- True -- adjustment3 -- 0 -- -- -- -- 1 -- 5 -- 1 -- 1 - - - - - -+ -+ 1 -+ - -diff -Naur gnac-0.2.4.1.orig/libgnac/libgnac-converter.c gnac-0.2.4.1/libgnac/libgnac-converter.c ---- gnac-0.2.4.1.orig/libgnac/libgnac-converter.c 2012-03-22 16:50:45.000000000 +0100 -+++ gnac-0.2.4.1/libgnac/libgnac-converter.c 2015-01-09 23:49:31.336379238 +0100 -@@ -1000,13 +1000,13 @@ - gint64 pos; - static GstFormat format = GST_FORMAT_TIME; - -- if (gst_element_query_position(item->pipeline, &format, &pos)) { -+ if (gst_element_query_position(item->pipeline, format, &pos)) { - if (pos != item->pos) { - gint64 len; - gfloat result = 0.0f; - guint64 time_left = 0; - -- if (gst_element_query_duration(item->pipeline, &format, &len)) { -+ if (gst_element_query_duration(item->pipeline, format, &len)) { - gfloat processed = priv->elapsed_duration + ((pos - len) / GST_SECOND); - result = CLAMP(processed / priv->total_duration, 0.0f, 1.0f); - /* XXX this is a workaround to prevent the remaining time -diff -Naur gnac-0.2.4.1.orig/libgnac/libgnac-error.c gnac-0.2.4.1/libgnac/libgnac-error.c ---- gnac-0.2.4.1.orig/libgnac/libgnac-error.c 2012-01-26 01:28:46.000000000 +0100 -+++ gnac-0.2.4.1/libgnac/libgnac-error.c 2015-01-09 23:49:31.336379238 +0100 -@@ -52,7 +52,7 @@ - gst_message_unref(msg); - if (!detail) return; - -- gchar *details[] = { detail, NULL }; -+ const gchar *details[] = { detail, NULL }; - GstInstallPluginsReturn ret = gst_install_plugins_async(details, NULL, - libgnac_converter_missing_plugin_result_cb, item->parent); - g_free(detail); -diff -Naur gnac-0.2.4.1.orig/libgnac/libgnac-gst.c gnac-0.2.4.1/libgnac/libgnac-gst.c ---- gnac-0.2.4.1.orig/libgnac/libgnac-gst.c 2012-02-28 12:26:06.000000000 +0100 -+++ gnac-0.2.4.1/libgnac/libgnac-gst.c 2015-01-09 23:49:31.336379238 +0100 -@@ -223,7 +223,7 @@ - - /* decodebin */ - GstElement *decodebin = libgnac_gstu_make_pipeline_element(item->pipeline, -- "decodebin2", NULL, &err); -+ "decodebin", NULL, &err); - if (err) { - g_propagate_error(error, err); - return; -@@ -382,7 +382,7 @@ - gpointer data) - { - LibgnacMediaItem *item = (LibgnacMediaItem *) data; -- GstCaps *caps = gst_pad_get_caps(pad); -+ GstCaps *caps = gst_pad_query_caps(pad, NULL); - - if (gst_caps_is_empty(caps) || gst_caps_is_any(caps)) { - libgnac_debug("Got a bad caps: %s", gst_caps_to_string(caps)); -diff -Naur gnac-0.2.4.1.orig/libgnac/libgnac-metadata.c gnac-0.2.4.1/libgnac/libgnac-metadata.c ---- gnac-0.2.4.1.orig/libgnac/libgnac-metadata.c 2012-03-27 15:51:09.000000000 +0200 -+++ gnac-0.2.4.1/libgnac/libgnac-metadata.c 2015-01-10 00:34:27.564874078 +0100 -@@ -209,11 +209,14 @@ - GstBuffer *buffer = gst_value_get_buffer(val); - g_return_if_fail(buffer); - -+ GstSample *sample = gst_value_get_sample(val); -+ g_return_if_fail(sample); -+ - gint image_type = GST_TAG_IMAGE_TYPE_NONE; - - /* GST_TAG_PREVIEW_IMAGE does not have an "image-type" field */ - if (g_str_equal(tag_name, GST_TAG_IMAGE)) { -- GstCaps *caps = GST_BUFFER_CAPS(buffer); -+ GstCaps *caps = gst_sample_get_caps(sample); - g_return_if_fail(caps); - - GstStructure *structure = gst_caps_get_structure(caps, 0); -@@ -231,8 +234,11 @@ - { - GdkPixbufLoader *loader = gdk_pixbuf_loader_new(); - GError *error = NULL; -- guint8 *data = GST_BUFFER_DATA(buffer); -- guint size = GST_BUFFER_SIZE(buffer); -+ GstMapInfo *info = NULL; -+ gst_buffer_map(buffer, info, GST_MAP_READ); -+ guint8 *data = info->data; -+ guint size = info->size; -+ gst_buffer_unmap(buffer, info); - - if (!gdk_pixbuf_loader_write(loader, data, size, &error)) { - libgnac_debug("Error writing data to pixbuf: %s", error->message); -@@ -297,8 +303,8 @@ - - if (g_str_equal(tag_name, GST_TAG_DATE)) - { -- g_return_if_fail(GST_VALUE_HOLDS_DATE(newval)); -- const GDate *date = gst_value_get_date(newval); -+ g_return_if_fail(G_VALUE_HOLDS(newval,G_TYPE_DATE)); -+ const GDate *date = g_value_get_boxed(newval); - if (!date) return; - GDateYear year = g_date_get_year(date); - g_value_unset(newval); -diff -Naur gnac-0.2.4.1.orig/src/gnac-options.c gnac-0.2.4.1/src/gnac-options.c ---- gnac-0.2.4.1.orig/src/gnac-options.c 2012-02-28 12:26:06.000000000 +0100 -+++ gnac-0.2.4.1/src/gnac-options.c 2015-01-09 23:49:31.339712589 +0100 -@@ -27,6 +27,7 @@ - #include "config.h" - #endif - -+#include - #include - #include - -diff -Naur gnac-0.2.4.1.orig/src/Makefile.am gnac-0.2.4.1/src/Makefile.am ---- gnac-0.2.4.1.orig/src/Makefile.am 2012-03-01 00:35:14.000000000 +0100 -+++ gnac-0.2.4.1/src/Makefile.am 2015-01-09 23:49:31.339712589 +0100 -@@ -73,6 +73,7 @@ - $(AM_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(GTK_CFLAGS) \ -+ $(LIBXML_CFLAGS) \ - $(NOTIFY_CFLAGS) \ - $(UNIQUE_CFLAGS) \ - $(WARN_CFLAGS) \ -@@ -82,6 +83,7 @@ - $(top_builddir)/libgnac/libgnac.la \ - $(GSTREAMER_LIBS) \ - $(GTK_LIBS) \ -+ $(LIBXML_LIBS) \ - $(NOTIFY_LIBS) \ - $(UNIQUE_LIBS) - -diff -Naur gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-aac.c gnac-0.2.4.1/src/profiles/formats/gnac-profiles-aac.c ---- gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-aac.c 2012-02-28 12:26:06.000000000 +0100 -+++ gnac-0.2.4.1/src/profiles/formats/gnac-profiles-aac.c 2015-01-10 01:03:33.835412850 +0100 -@@ -34,8 +34,6 @@ - AudioProfileGeneric *generic; - - gchar *bitrate; -- gchar *outputformat; -- gchar *profile; - gchar *tns; - } - AudioProfileAAC; -@@ -60,7 +58,6 @@ - gnac_profiles_aac_init(void) - { - GtkWidget *widget; -- GtkWidget *widget2; - - gnac_profiles_default_init(&aac_bfi); - -@@ -68,23 +65,12 @@ - gnac_profiles_utils_init_widget(&aac_bfi, "combo-bitrate", - "//variable[@id='bitrate']"); - -- // Profile -- widget = gnac_profiles_utils_init_widget(&aac_bfi, "combo-profile", -- "//variable[@id='profile']"); -- widget2 = gnac_profiles_utils_get_widget(&aac_bfi, "label-profile"), -- gnac_profiles_utils_add_description_tooltip(&aac_bfi, -- "//variable[@id='profile']/description", widget, widget2, NULL); -- - // Tns - widget = gnac_profiles_utils_init_widget(&aac_bfi, "checkbutton-tns", - "//variable[@id='tns']"); - gnac_profiles_utils_add_description_tooltip(&aac_bfi, - "//variable[@id='tns']/description", widget, NULL); - -- // Outputformat -- gnac_profiles_utils_init_widget(&aac_bfi, "combo-outputformat", -- "//variable[@id='outputformat']"); -- - gnac_profiles_xml_engine_free_doc_xpath(aac_bfi.doc); - aac_bfi.doc = NULL; - -@@ -97,11 +83,12 @@ - { - gchar *pipeline = gnac_profiles_default_generate_pipeline(&aac_bfi); - pipeline = gnac_profiles_utils_add_properties(pipeline, &aac_bfi, -- "combo-bitrate", "combo-outputformat", -- "combo-profile", "checkbutton-tns", NULL); -+ "combo-bitrate", "checkbutton-tns", NULL); - - gnac_profiles_properties_update_textbuffer(pipeline); - -+ pipeline = gnac_profiles_utils_add_pipe(pipeline, "audio/mpeg, mpegversion=4, stream-format=adts ! aacparse"); -+ - g_free(aac_bfi.pipeline); - - aac_bfi.pipeline = pipeline; -@@ -113,8 +100,7 @@ - { - gnac_profiles_default_reset_ui(&aac_bfi); - gnac_profiles_utils_reset_values(&aac_bfi, -- "combo-bitrate", "combo-outputformat", -- "combo-profile", "checkbutton-tns", NULL); -+ "combo-bitrate", "checkbutton-tns", NULL); - } - - -@@ -129,8 +115,6 @@ - AudioProfileAAC *profile = (AudioProfileAAC *) data; - gnac_profiles_utils_set_values(&aac_bfi, - "combo-bitrate", profile->bitrate, -- "combo-outputformat", profile->outputformat, -- "combo-profile", profile->profile, - "checkbutton-tns", profile->tns, - NULL); - } -@@ -153,8 +137,6 @@ - gnac_profiles_utils_free_audio_profile_generic(profile->generic); - - g_free(profile->bitrate); -- g_free(profile->outputformat); -- g_free(profile->profile); - g_free(profile->tns); - g_free(profile); - } -@@ -171,8 +153,6 @@ - - gnac_profiles_utils_get_values_and_set(&aac_bfi, - "combo-bitrate", &profile->bitrate, -- "combo-outputformat", &profile->outputformat, -- "combo-profile", &profile->profile, - "checkbutton-tns", &profile->tns, - NULL); - -@@ -196,8 +176,6 @@ - XMLDoc *doc = gnac_profiles_default_save_profile(profile->generic, &aac_bfi); - gnac_profiles_xml_engine_add_values(doc, - "bitrate", profile->bitrate, -- "outputformat", profile->outputformat, -- "profile", profile->profile, - "tns", profile->tns, - NULL); - gnac_profiles_xml_engine_save_doc(doc, profile->generic->name); -@@ -216,8 +194,6 @@ - gnac_profiles_utils_load_saved_profile(doc, - "/audio-profile/format-specific/", - "bitrate", &profile->bitrate, -- "outputformat", &profile->outputformat, -- "profile", &profile->profile, - "tns", &profile->tns, - NULL); - -@@ -230,8 +206,7 @@ - { - gnac_profiles_default_clean_up(&aac_bfi); - gnac_profiles_utils_free_values(&aac_bfi, -- "combo-bitrate", "combo-outputformat", -- "combo-profile", "checkbutton-tns", NULL); -+ "combo-bitrate", "checkbutton-tns", NULL); - gnac_profiles_utils_free_basic_format_info(&aac_bfi); - } - -diff -Naur gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-lame.c gnac-0.2.4.1/src/profiles/formats/gnac-profiles-lame.c ---- gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-lame.c 2012-02-28 12:26:06.000000000 +0100 -+++ gnac-0.2.4.1/src/profiles/formats/gnac-profiles-lame.c 2015-01-09 23:49:31.339712589 +0100 -@@ -33,26 +33,17 @@ - { - AudioProfileGeneric *generic; - -- gchar *encoding_mode; -+ gchar *target; - gdouble quality; -- gdouble compression_ratio; - gchar *bitrate; -- gchar *preset; -- gdouble mean_abr; -- gdouble mean_bitrate; -- gchar *min_bitrate; -- gchar *max_bitrate; -- gchar *mode; -+ gchar *mono; - } - AudioProfileLame; - - typedef enum { -- CONSTANT_BITRATE, -- AVERAGE_BITRATE, -- VARIABLE_BITRATE, -- PRESETS, -- COMPRESSION_RATIO --} EncodingMode; -+ QUALITY, -+ BITRATE, -+} Target; - - BasicFormatInfo lame_bfi = { - PKGDATADIR "/profiles/gnac-profiles-lame.xml", -@@ -78,7 +69,7 @@ - - - void --gnac_profiles_lame_on_encoding_mode_changed(GtkComboBox *widget, -+gnac_profiles_lame_on_target_changed(GtkComboBox *widget, - gpointer user_data) - { - gnac_profiles_lame_vbr_on_changed(widget); -@@ -90,7 +81,6 @@ - gnac_profiles_lame_init(void) - { - GtkWidget *widget; -- GtkWidget *widget2; - - gnac_profiles_default_init(&lame_bfi); - -@@ -102,42 +92,13 @@ - gnac_profiles_utils_init_widget(&lame_bfi, "slider-vbr-quality", - "//variable[@id='quality']"); - -- // Compression ratio -- widget = gnac_profiles_utils_init_widget(&lame_bfi, -- "slider-compression-ratio", "//variable[@id='compression-ratio']"); -- widget2 = gnac_profiles_utils_get_widget(&lame_bfi, -- "label-compression-ratio"); -- gnac_profiles_utils_add_description_tooltip(&lame_bfi, -- "//variable[@id='compression-ratio']/description", -- widget, widget2, NULL); -- -- // Preset -- gnac_profiles_utils_init_widget(&lame_bfi, "combo-preset", -- "//variable[@id='preset']"); -- -- // Abr bitrate -- gnac_profiles_utils_init_widget(&lame_bfi, "slider-mean-abr", -- "//variable[@id='mean-bitrate']"); -- - // Mode -- gnac_profiles_utils_init_widget(&lame_bfi, "combo-mode", -- "//variable[@id='mode']"); -- -- // Mean bitrate -- gnac_profiles_utils_init_widget(&lame_bfi, "slider-mean-vbr", -- "//variable[@id='mean-bitrate']"); -+ gnac_profiles_utils_init_widget(&lame_bfi, "combo-mono", -+ "//variable[@id='mono']"); - -- // Min bitrate -- gnac_profiles_utils_init_widget(&lame_bfi, "combo-min-vbr", -- "//variable[@id='min-bitrate']"); -- -- // Max bitrate -- gnac_profiles_utils_init_widget(&lame_bfi, "combo-max-vbr", -- "//variable[@id='max-bitrate']"); -- -- // Encoding mode -- widget = gnac_profiles_utils_init_widget(&lame_bfi, "combo-encoding-mode", -- "//variable[@id='encoding-mode']"); -+ // Target -+ widget = gnac_profiles_utils_init_widget(&lame_bfi, "combo-target", -+ "//variable[@id='target']"); - - gnac_profiles_lame_vbr_on_changed(GTK_COMBO_BOX(widget)); - -@@ -149,26 +110,6 @@ - - - static void --gnac_profiles_lame_show_abr_widgets(gboolean show) --{ -- GtkWidget *abr_widgets[] = { -- gnac_profiles_utils_get_widget(&lame_bfi, "label-mean-bitrate"), -- gnac_profiles_utils_get_widget(&lame_bfi, "slider-mean-abr"), -- gnac_profiles_utils_get_widget(&lame_bfi, "checkbutton-min-bitrate"), -- gnac_profiles_utils_get_widget(&lame_bfi, "combo-min-vbr"), -- gnac_profiles_utils_get_widget(&lame_bfi, "checkbutton-max-bitrate"), -- gnac_profiles_utils_get_widget(&lame_bfi, "combo-max-vbr") -- }; -- -- guint i; -- for (i = 0; i < G_N_ELEMENTS(abr_widgets); i++) { -- if (show) gtk_widget_show_all(abr_widgets[i]); -- else gtk_widget_hide(abr_widgets[i]); -- } --} -- -- --static void - gnac_profiles_lame_show_cbr_widgets(gboolean show) - { - GtkWidget *cbr_widgets[] = { -@@ -190,12 +131,6 @@ - GtkWidget *vbr_widgets[] = { - gnac_profiles_utils_get_widget(&lame_bfi, "label-vbr"), - gnac_profiles_utils_get_widget(&lame_bfi, "hbox-vbr"), -- gnac_profiles_utils_get_widget(&lame_bfi, "checkbutton-mean-bitrate"), -- gnac_profiles_utils_get_widget(&lame_bfi, "slider-mean-vbr"), -- gnac_profiles_utils_get_widget(&lame_bfi, "checkbutton-min-bitrate"), -- gnac_profiles_utils_get_widget(&lame_bfi, "combo-min-vbr"), -- gnac_profiles_utils_get_widget(&lame_bfi, "checkbutton-max-bitrate"), -- gnac_profiles_utils_get_widget(&lame_bfi, "combo-max-vbr") - }; - - guint i; -@@ -207,48 +142,12 @@ - - - static void --gnac_profiles_lame_show_presets_widgets(gboolean show) --{ -- GtkWidget *presets_widgets[] = { -- gnac_profiles_utils_get_widget(&lame_bfi, "label-preset"), -- gnac_profiles_utils_get_widget(&lame_bfi, "hbox-preset"), -- }; -- -- guint i; -- for (i = 0; i < G_N_ELEMENTS(presets_widgets); i++) { -- if (show) gtk_widget_show_all(presets_widgets[i]); -- else gtk_widget_hide(presets_widgets[i]); -- } --} -- -- --static void --gnac_profiles_lame_show_compression_ratio_widgets(gboolean show) --{ -- GtkWidget *compression_ratio_widgets[] = { -- gnac_profiles_utils_get_widget(&lame_bfi, "label-compression-ratio"), -- gnac_profiles_utils_get_widget(&lame_bfi, "slider-compression-ratio"), -- }; -- -- guint i; -- for (i = 0; i < G_N_ELEMENTS(compression_ratio_widgets); i++) { -- if (show) gtk_widget_show_all(compression_ratio_widgets[i]); -- else gtk_widget_hide(compression_ratio_widgets[i]); -- } --} -- -- --static void - gnac_profiles_lame_vbr_on_changed(GtkComboBox *widget) - { -- EncodingMode encoding_mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); -+ Target target = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); - -- gnac_profiles_lame_show_abr_widgets(encoding_mode == AVERAGE_BITRATE); -- gnac_profiles_lame_show_cbr_widgets(encoding_mode == CONSTANT_BITRATE); -- gnac_profiles_lame_show_vbr_widgets(encoding_mode == VARIABLE_BITRATE); -- gnac_profiles_lame_show_presets_widgets(encoding_mode == PRESETS); -- gnac_profiles_lame_show_compression_ratio_widgets( -- encoding_mode == COMPRESSION_RATIO); -+ gnac_profiles_lame_show_cbr_widgets(target == BITRATE); -+ gnac_profiles_lame_show_vbr_widgets(target == QUALITY); - } - - -@@ -257,54 +156,25 @@ - { - gchar *pipeline = gnac_profiles_default_generate_pipeline(&lame_bfi); - GtkWidget *widget = gnac_profiles_utils_get_widget(&lame_bfi, -- "combo-encoding-mode"); -- EncodingMode encoding_mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); -+ "combo-target"); -+ Target target = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); - - // Mode - pipeline = gnac_profiles_utils_add_properties(pipeline, &lame_bfi, -- "combo-mode", NULL); -+ "combo-mono", NULL); - -- switch (encoding_mode) -+ switch (target) - { -- case CONSTANT_BITRATE: -+ case BITRATE: - pipeline = gnac_profiles_utils_add_properties(pipeline, &lame_bfi, -- "combo-encoding-mode", "combo-bitrate", NULL); -+ "combo-target", "combo-bitrate", NULL); - break; - -- case AVERAGE_BITRATE: -+ case QUALITY: - pipeline = gnac_profiles_utils_add_properties(pipeline, &lame_bfi, -- "combo-encoding-mode", NULL); -- pipeline = gnac_profiles_utils_add_properties_slider(pipeline, &lame_bfi, -- "%.0f", "slider-mean-abr", NULL); -- pipeline = gnac_profiles_utils_add_properties_checked_combo(pipeline, -- &lame_bfi, -- "combo-min-vbr", "checkbutton-min-bitrate", -- "combo-max-vbr", "checkbutton-max-bitrate", -- NULL); -- break; -- -- case VARIABLE_BITRATE: -- pipeline = gnac_profiles_utils_add_properties(pipeline, &lame_bfi, -- "combo-encoding-mode", NULL); -+ "combo-target", NULL); - pipeline = gnac_profiles_utils_add_properties_slider(pipeline, &lame_bfi, - "%.0f", "slider-vbr-quality", NULL); -- pipeline = gnac_profiles_utils_add_properties_checked_slider(pipeline, -- &lame_bfi, "slider-mean-vbr", "checkbutton-mean-bitrate", NULL); -- pipeline = gnac_profiles_utils_add_properties_checked_combo(pipeline, -- &lame_bfi, -- "combo-min-vbr", "checkbutton-min-bitrate", -- "combo-max-vbr", "checkbutton-max-bitrate", -- NULL); -- break; -- -- case PRESETS: -- pipeline = gnac_profiles_utils_add_properties(pipeline, &lame_bfi, -- "combo-preset", NULL); -- break; -- -- case COMPRESSION_RATIO: -- pipeline = gnac_profiles_utils_add_properties_slider(pipeline, &lame_bfi, -- "%.0f", "slider-compression-ratio", NULL); - break; - - default: -@@ -321,26 +191,12 @@ - } - - --void --gnac_profiles_lame_advanced_bitrate_on_toggle(GtkWidget *widget, -- GtkToggleButton *togglebutton) --{ -- gnac_profiles_utils_on_toggle_optionnal_property(togglebutton, widget); -- gnac_profiles_lame_generate_pipeline(); --} -- -- - static void - gnac_profiles_lame_reset_ui(void) - { - gnac_profiles_utils_reset_values(&lame_bfi, -- "combo-mode", "combo-bitrate", "combo-min-vbr", "combo-max-vbr", -- "combo-preset", "combo-encoding-mode", "slider-vbr-quality", -- "slider-compression-ratio", "slider-mean-vbr", "slider-mean-abr", -+ "combo-mono", "combo-bitrate", "combo-target", "slider-vbr-quality", - NULL); -- gnac_profiles_utils_set_active_toggle_button(&lame_bfi, FALSE, -- "checkbutton-mean-bitrate", "checkbutton-min-bitrate", -- "checkbutton-max-bitrate", NULL); - } - - -@@ -354,42 +210,18 @@ - - AudioProfileLame *profile = (AudioProfileLame *) data; - gnac_profiles_utils_set_values(&lame_bfi, -- "combo-encoding-mode", profile->encoding_mode, -- "combo-mode", profile->mode, NULL); -+ "combo-target", profile->target, -+ "combo-mono", profile->mono, NULL); - - if (profile->bitrate) - { - gnac_profiles_utils_set_values(&lame_bfi, - "combo-bitrate", profile->bitrate, NULL); - } -- else if (profile->preset) -- { -- gnac_profiles_utils_set_values(&lame_bfi, -- "combo-preset", profile->preset, NULL); -- } -- else if (profile->mean_abr != -1) -- { -- gnac_profiles_utils_set_values(&lame_bfi, -- "slider-mean-abr", profile->mean_abr, NULL); -- gnac_profiles_utils_set_values_checked(&lame_bfi, -- "combo-min-vbr", "checkbutton-min-bitrate", profile->min_bitrate, -- "combo-max-vbr", "checkbutton-max-bitrate", profile->max_bitrate, -- NULL); -- } - else if (profile->quality != -1) - { - gnac_profiles_utils_set_values(&lame_bfi, - "slider-vbr-quality", profile->quality, NULL); -- gnac_profiles_utils_set_values_checked(&lame_bfi, -- "combo-min-vbr", "checkbutton-min-bitrate", profile->min_bitrate, -- "combo-max-vbr", "checkbutton-max-bitrate", profile->max_bitrate, -- "slider-mean-vbr", "checkbutton-mean-bitrate", profile->mean_bitrate, -- NULL); -- } -- else if (profile->compression_ratio != -1) -- { -- gnac_profiles_utils_set_values(&lame_bfi, -- "slider-compression-ratio", profile->compression_ratio, NULL); - } - } - -@@ -406,16 +238,10 @@ - { - AudioProfileLame *profile = g_malloc(sizeof(AudioProfileLame)); - -- profile->encoding_mode = NULL; -- profile->mode = NULL; -+ profile->target = NULL; -+ profile->mono = NULL; - profile->bitrate = NULL; -- profile->preset = NULL; - profile->quality = -1; -- profile->compression_ratio = -1; -- profile->mean_bitrate = -1; -- profile->mean_abr = -1; -- profile->min_bitrate = NULL; -- profile->max_bitrate = NULL; - - return profile; - } -@@ -428,12 +254,9 @@ - - AudioProfileLame *profile = (AudioProfileLame *) data; - gnac_profiles_utils_free_audio_profile_generic(profile->generic); -- g_free(profile->encoding_mode); -- g_free(profile->mode); -+ g_free(profile->target); -+ g_free(profile->mono); - g_free(profile->bitrate); -- g_free(profile->min_bitrate); -- g_free(profile->max_bitrate); -- g_free(profile->preset); - g_free(profile); - } - -@@ -447,49 +270,23 @@ - profile->generic = generic; - - gnac_profiles_utils_get_values_and_set(&lame_bfi, -- "combo-encoding-mode", &profile->encoding_mode, -- "combo-mode", &profile->mode, -+ "combo-target", &profile->target, -+ "combo-mono", &profile->mono, - NULL); - - GtkWidget *widget = gnac_profiles_utils_get_widget(&lame_bfi, -- "combo-encoding-mode"); -+ "combo-target"); - - switch (gtk_combo_box_get_active(GTK_COMBO_BOX(widget))) - { -- case CONSTANT_BITRATE: -+ case BITRATE: - gnac_profiles_utils_get_values_and_set(&lame_bfi, - "combo-bitrate", &profile->bitrate, NULL); - break; - -- case AVERAGE_BITRATE: -- gnac_profiles_utils_get_values_and_set(&lame_bfi, -- "slider-mean-abr", &profile->mean_abr, NULL); -- gnac_profiles_utils_get_values_checked_combo_and_set(&lame_bfi, -- "combo-min-vbr", "checkbutton-min-bitrate", &profile->min_bitrate, -- "combo-max-vbr", "checkbutton-max-bitrate", &profile->max_bitrate, -- NULL ); -- break; -- -- case VARIABLE_BITRATE: -+ case QUALITY: - gnac_profiles_utils_get_values_and_set(&lame_bfi, - "slider-vbr-quality", &profile->quality, NULL); -- gnac_profiles_utils_get_values_checked_slider_and_set(&lame_bfi, -- "slider-mean-vbr", "checkbutton-mean-bitrate", &profile->mean_bitrate, -- NULL); -- gnac_profiles_utils_get_values_checked_combo_and_set(&lame_bfi, -- "combo-min-vbr", "checkbutton-min-bitrate", &profile->min_bitrate, -- "combo-max-vbr", "checkbutton-max-bitrate", &profile->max_bitrate, -- NULL ); -- break; -- -- case PRESETS: -- gnac_profiles_utils_get_values_and_set(&lame_bfi, -- "combo-preset", &profile->preset, NULL); -- break; -- -- case COMPRESSION_RATIO: -- gnac_profiles_utils_get_values_and_set(&lame_bfi, -- "slider-compression-ratio", &profile->compression_ratio, NULL); - break; - - default: -@@ -513,49 +310,25 @@ - if (!data) return; - - gchar *quality = NULL; -- gchar *mean_bitrate = NULL; -- gchar *mean_abr = NULL; -- gchar *compression_ratio = NULL; - AudioProfileLame *profile = (AudioProfileLame *) data; - - if (profile->quality != -1) - { - quality = gnac_profiles_utils_gdouble_to_gchararray(profile->quality); -- -- if (profile->mean_bitrate != -1) { -- mean_bitrate = gnac_profiles_utils_gdouble_to_gchararray( -- profile->mean_bitrate); -- } -- } -- else if (profile->mean_abr != -1) -- { -- mean_abr = gnac_profiles_utils_gdouble_to_gchararray(profile->mean_abr); -- } -- else if (profile->compression_ratio != -1) { -- compression_ratio = gnac_profiles_utils_gdouble_to_gchararray( -- profile->compression_ratio); - } - - XMLDoc *doc = gnac_profiles_default_save_profile(profile->generic, &lame_bfi); - gnac_profiles_xml_engine_add_values(doc, -- "encoding-mode", profile->encoding_mode, -+ "target", profile->target, - "bitrate", profile->bitrate, - "quality", quality, -- "compression-ratio", compression_ratio, -- "preset", profile->preset, -- "mean-abr", mean_abr, -- "mean-bitrate", mean_bitrate, -- "min-bitrate", profile->min_bitrate, -- "max-bitrate", profile->max_bitrate, -- "mode", profile->mode, -+ "mono", profile->mono, - NULL); - - gnac_profiles_xml_engine_save_doc(doc, profile->generic->name); - - gnac_profiles_xml_engine_free_doc_xpath(doc); - g_free(quality); -- g_free(mean_bitrate); -- g_free(compression_ratio); - } - - -@@ -564,42 +337,20 @@ - AudioProfileGeneric *generic) - { - gchar *quality; -- gchar *mean_bitrate; -- gchar *mean_abr; -- gchar *compression_ratio; - - AudioProfileLame *profile = gnac_profiles_lame_audio_profile_new(); - profile->generic = generic; - gnac_profiles_utils_load_saved_profile(doc, - "/audio-profile/format-specific/", -- "encoding-mode", &profile->encoding_mode, -+ "target", &profile->target, - "bitrate", &profile->bitrate, - "quality", &quality, -- "compression-ratio", &compression_ratio, -- "preset", &profile->preset, -- "mean-abr", &mean_abr, -- "mean-bitrate", &mean_bitrate, -- "min-bitrate", &profile->min_bitrate, -- "max-bitrate", &profile->max_bitrate, -- "mode", &profile->mode, -+ "mono", &profile->mono, - NULL); - - if (quality) { - profile->quality = gnac_profiles_utils_gchararray_to_gdouble(quality); - g_free(quality); -- -- if (mean_bitrate) { -- profile->mean_bitrate = gnac_profiles_utils_gchararray_to_gdouble( -- mean_bitrate); -- g_free(mean_bitrate); -- } -- } else if (mean_abr) { -- profile->mean_abr = gnac_profiles_utils_gchararray_to_gdouble(mean_abr); -- g_free(mean_abr); -- } else if (compression_ratio) { -- profile->compression_ratio = gnac_profiles_utils_gchararray_to_gdouble( -- compression_ratio); -- g_free(compression_ratio); - } - - return profile; -@@ -611,9 +362,7 @@ - { - gnac_profiles_default_clean_up(&lame_bfi); - gnac_profiles_utils_free_values(&lame_bfi, -- "combo-mode", "combo-bitrate", "combo-min-vbr", "combo-max-vbr", -- "combo-preset", "combo-encoding-mode", "slider-vbr-quality", -- "slider-compression-ratio", "slider-mean-vbr", "slider-mean-abr", -+ "combo-mono", "combo-bitrate", "combo-target", "slider-vbr-quality", - NULL); - gnac_profiles_utils_free_basic_format_info(&lame_bfi); - } -diff -Naur gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-lame.h gnac-0.2.4.1/src/profiles/formats/gnac-profiles-lame.h ---- gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-lame.h 2012-01-26 01:28:46.000000000 +0100 -+++ gnac-0.2.4.1/src/profiles/formats/gnac-profiles-lame.h 2015-01-09 23:49:31.343045941 +0100 -@@ -37,8 +37,8 @@ - gnac_profiles_lame_generate_pipeline(void); - - void --gnac_profiles_lame_on_encoding_mode_changed(GtkComboBox *widget, -- gpointer user_data); -+gnac_profiles_lame_on_target_changed(GtkComboBox *widget, -+ gpointer user_data); - - void - gnac_profiles_lame_advanced_bitrate_on_toggle(GtkWidget *widget, -diff -Naur gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-unknown.c gnac-0.2.4.1/src/profiles/formats/gnac-profiles-unknown.c ---- gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-unknown.c 2012-02-27 11:27:10.000000000 +0100 -+++ gnac-0.2.4.1/src/profiles/formats/gnac-profiles-unknown.c 2015-01-09 23:49:31.343045941 +0100 -@@ -49,7 +49,7 @@ - }; - - const gchar *base_pipeline = -- "audioconvert ! audio/x-raw-float, rate=44100, channels=2 ! audioconvert !"; -+ "audioconvert ! audio/x-raw, rate=44100, channels=2 ! audioconvert !"; - - static GtkTextView *pipeline_text_view; - static GtkWidget *pipeline_box; -diff -Naur gnac-0.2.4.1.orig/src/profiles/gnac-profiles-default.c gnac-0.2.4.1/src/profiles/gnac-profiles-default.c ---- gnac-0.2.4.1.orig/src/profiles/gnac-profiles-default.c 2012-04-22 14:09:01.000000000 +0200 -+++ gnac-0.2.4.1/src/profiles/gnac-profiles-default.c 2015-01-09 23:49:31.343045941 +0100 -@@ -23,6 +23,7 @@ - * Boston, MA 02110-1301 USA - */ - -+#include - #include - - #include "gnac-main.h" diff --git a/srcpkgs/gnac/patches/no-gnome-doc-utils.patch b/srcpkgs/gnac/patches/no-gnome-doc-utils.patch deleted file mode 100644 index 00f89a338dbc..000000000000 --- a/srcpkgs/gnac/patches/no-gnome-doc-utils.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -55,7 +55,7 @@ AM_GLIB_GNU_GETTEXT - dnl Check for GSettings macros - GLIB_GSETTINGS - --GNOME_DOC_INIT([0.17.2]) -+GNOME_DOC_INIT([0.17.2],[:],[:]) - GNOME_DEBUG_CHECK - GNOME_COMPILE_WARNINGS([maximum]) - GNOME_CXX_WARNINGS([yes]) ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,5 @@ - SUBDIRS = \ - data \ -- help \ - libgnac \ - man \ - po \ diff --git a/srcpkgs/gnac/patches/no-po-check.patch b/srcpkgs/gnac/patches/no-po-check.patch deleted file mode 100644 index bf1ddb4a9e7d..000000000000 --- a/srcpkgs/gnac/patches/no-po-check.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/po/POTFILES.skip -+++ b/po/POTFILES.skip -@@ -1,3 +1,4 @@ - # List of source files that should NOT be translated. - # Please keep this file sorted alphabetically. - data/gnac.desktop.in -+intl/plural.c diff --git a/srcpkgs/gnac/template b/srcpkgs/gnac/template deleted file mode 100644 index 9fea6a370e87..000000000000 --- a/srcpkgs/gnac/template +++ /dev/null @@ -1,26 +0,0 @@ -# Template file for 'gnac' -pkgname=gnac -version=0.2.4.1 -revision=4 -build_style=gnu-configure -configure_args="--disable-scrollkeeper --disable-schemas-compile" -hostmakedepends="gnome-common gettext-devel pkg-config intltool libtool - glib-devel gtk+3-devel gst-plugins-base1-devel - autoconf-archive which" -makedepends="libxml2-devel gtk+3-devel gst-plugins-base1-devel libunique-devel - libnotify-devel gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1 - desktop-file-utils hicolor-icon-theme" -depends="gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1 - desktop-file-utils hicolor-icon-theme" -short_desc="Audio conversion program for the Gnome desktop" -maintainer="Orphaned " -license="GPL-3.0-or-later" -homepage="http://gnac.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=8f9c4731bbc40fde57c311a2a7fabe4e3200198abfe7415c659b98a2d54869da -CFLAGS="-fPIC -fcommon" - -pre_configure() { - autoreconf -fi - intltoolize --force -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 4db15ba9a478..c0c9460623f4 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -100,6 +100,7 @@ replaces=" giti<=1.0.0_1 gksu<=2.0.2_4 glibmm-doc<=2.64.2_2 + gnac<=0.2.4.1_4 gnome-doc-utils<=0.20.10_9 gnome-documents<=3.34.0_2 gnome-games<=40.0_1 From 3241de8de9c828e9695a5fd44312429d7a2e919d Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:32:20 -0700 Subject: [PATCH 0464/1407] ario: remove unused dependency on libunique1 --- srcpkgs/ario/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template index c9fc6f3cd9b7..ce6c01e518ce 100644 --- a/srcpkgs/ario/template +++ b/srcpkgs/ario/template @@ -6,15 +6,16 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool" makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel - libcurl-devel libmpdclient-devel libnotify-devel libunique1-devel taglib-devel" + libcurl-devel libmpdclient-devel libnotify-devel taglib-devel" short_desc="GTK client for MPD" maintainer="Leah Neukirchen " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://ario-player.sourceforge.net/?en" distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz" checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a +make_check=no # Tests still depend on build files that have been removed by upstream -post_extract() { +post_patch() { vsed -i 's,,,g' src/ario-profiles.c vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure } From 52acbe0d42452f928550dad6a7af0a2f26f0a34f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:26:08 -0700 Subject: [PATCH 0465/1407] lxsession: remove unused dependency on libunique1 --- srcpkgs/lxsession/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lxsession/template b/srcpkgs/lxsession/template index 8fe456a1d43e..9cb6e2cf8507 100644 --- a/srcpkgs/lxsession/template +++ b/srcpkgs/lxsession/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--enable-buildin-clipboard --enable-buildin-polkit --enable-gtk3" hostmakedepends="pkg-config intltool vala-devel autoconf automake glib-devel gettext-devel" -makedepends="dbus-glib-devel gtk+3-devel polkit-devel libunique1-devel" +makedepends="dbus-glib-devel gtk+3-devel polkit-devel" depends="hicolor-icon-theme" short_desc="LXDE X11 Session Manager" maintainer="Orphaned " From b8b498e55744b046595190742ec359c846853292 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:23:55 -0700 Subject: [PATCH 0466/1407] fcitx-configtool: remove unused dependency on libunique1 --- srcpkgs/fcitx-configtool/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fcitx-configtool/template b/srcpkgs/fcitx-configtool/template index b1ed12bbf046..b72c70a18a22 100644 --- a/srcpkgs/fcitx-configtool/template +++ b/srcpkgs/fcitx-configtool/template @@ -4,7 +4,7 @@ version=0.4.10 revision=2 build_style=cmake hostmakedepends="pkg-config libfcitx glib-devel" -makedepends="iso-codes fcitx-devel gtk+3-devel libunique1-devel dbus-glib-devel" +makedepends="iso-codes fcitx-devel gtk+3-devel dbus-glib-devel" depends="iso-codes" short_desc="GTK-based configuration tool for fcitx" maintainer="Robert La Spina " From 573996219ed8c4db395e44d8fe56fe109c059c3f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:09:10 -0700 Subject: [PATCH 0467/1407] gmpc: remove package Unmaintained, hasn't seen a release since 2011 and the homepage is a parked domain. Still depends on gtk2 and libunique1. --- srcpkgs/gmpc-devel | 1 - srcpkgs/gmpc/patches/locale-dir.patch | 20 ----------------- srcpkgs/gmpc/patches/no-mallard-check.patch | 22 ------------------ srcpkgs/gmpc/template | 25 --------------------- srcpkgs/removed-packages/template | 2 ++ 5 files changed, 2 insertions(+), 68 deletions(-) delete mode 120000 srcpkgs/gmpc-devel delete mode 100644 srcpkgs/gmpc/patches/locale-dir.patch delete mode 100644 srcpkgs/gmpc/patches/no-mallard-check.patch delete mode 100644 srcpkgs/gmpc/template diff --git a/srcpkgs/gmpc-devel b/srcpkgs/gmpc-devel deleted file mode 120000 index 6a1f09135ead..000000000000 --- a/srcpkgs/gmpc-devel +++ /dev/null @@ -1 +0,0 @@ -gmpc \ No newline at end of file diff --git a/srcpkgs/gmpc/patches/locale-dir.patch b/srcpkgs/gmpc/patches/locale-dir.patch deleted file mode 100644 index 8398823dd765..000000000000 --- a/srcpkgs/gmpc/patches/locale-dir.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure -+++ b/configure -@@ -11347,7 +11347,7 @@ fi - - ;; - *) -- DATADIRNAME=lib -+ DATADIRNAME=share - ;; - esac - fi -@@ -15026,7 +15026,7 @@ fi - ;; - *) - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - ;; - esac - fi diff --git a/srcpkgs/gmpc/patches/no-mallard-check.patch b/srcpkgs/gmpc/patches/no-mallard-check.patch deleted file mode 100644 index f36891f28498..000000000000 --- a/srcpkgs/gmpc/patches/no-mallard-check.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,7 +1,7 @@ - man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1 - EXTRA_DIST = $(man_MANS) - --SUBDIRS=Mallard -+SUBDIRS= - - .PHONY: doc - doc: Manual.txt ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -311,7 +311,7 @@ unique_CFLAGS = @unique_CFLAGS@ - unique_LIBS = @unique_LIBS@ - man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1 - EXTRA_DIST = $(man_MANS) --SUBDIRS = Mallard -+SUBDIRS = - all: all-recursive - - .SUFFIXES: diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template deleted file mode 100644 index ec0c03ade913..000000000000 --- a/srcpkgs/gmpc/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'gmpc' -pkgname=gmpc -version=11.8.16 -revision=3 -build_style=gnu-configure -hostmakedepends="pkg-config gob2 intltool vala" -makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel" -depends="xdg-utils hicolor-icon-theme" -short_desc="Gnome Music Player Client - The true MPD client" -maintainer="Dave Davenport " -license="GPL-2.0-or-later" -homepage="http://gmpclient.org/" -distfiles="http://download.sarine.nl/Programs/gmpc/${version%.*}/gmpc-${version}.tar.gz" -checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c - -LDFLAGS="-lm" - -gmpc-devel_package() { - short_desc+=" - development files" - depends="gtk+-devel libmpd-devel" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index c0c9460623f4..40eaf32c79b3 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -100,6 +100,8 @@ replaces=" giti<=1.0.0_1 gksu<=2.0.2_4 glibmm-doc<=2.64.2_2 + gmpc-devel<=11.8.16_3 + gmpc<=11.8.16_3 gnac<=0.2.4.1_4 gnome-doc-utils<=0.20.10_9 gnome-documents<=3.34.0_2 From 3ebc562240cc6ca98865fe48395336fa69c781e6 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:13:39 -0700 Subject: [PATCH 0468/1407] libmpd: remove package Unmaintained, hasn't seen a release since 2011 and the homepage is a parked domain. Still depends on libunique1. --- common/shlibs | 1 - srcpkgs/libmpd-devel | 1 - srcpkgs/libmpd/patches/fix-build.patch | 13 ------------- srcpkgs/libmpd/template | 24 ------------------------ srcpkgs/removed-packages/template | 2 ++ 5 files changed, 2 insertions(+), 39 deletions(-) delete mode 120000 srcpkgs/libmpd-devel delete mode 100644 srcpkgs/libmpd/patches/fix-build.patch delete mode 100644 srcpkgs/libmpd/template diff --git a/common/shlibs b/common/shlibs index ea3dcd698f47..8c257ed2bcd5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2532,7 +2532,6 @@ libKF5Solid.so.5 libksolid-5.15.0_2 libfreeimage.so.3 freeimage-3.17.0_1 libfreeimageplus.so.3 freeimage-plus-3.17.0_1 libtoluapp.so toluapp-1.0.93_1 -libmpd.so.1 libmpd-11.8.17_1 libfa.so.1 augeas-1.4.0_1 libaugeas.so.0 augeas-1.4.0_1 libplot.so.2 plotutils-2.6_1 diff --git a/srcpkgs/libmpd-devel b/srcpkgs/libmpd-devel deleted file mode 120000 index 385a94df2454..000000000000 --- a/srcpkgs/libmpd-devel +++ /dev/null @@ -1 +0,0 @@ -libmpd \ No newline at end of file diff --git a/srcpkgs/libmpd/patches/fix-build.patch b/srcpkgs/libmpd/patches/fix-build.patch deleted file mode 100644 index 5f4d86644538..000000000000 --- a/srcpkgs/libmpd/patches/fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/libmpd-internal.h 2015-11-05 15:05:11.982772276 +0100 -+++ b/src/libmpd-internal.h 2015-11-05 15:05:32.845719672 +0100 -@@ -20,6 +20,10 @@ - #ifndef __MPD_INTERNAL_LIB_ - #define __MPD_INTERNAL_LIB_ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "libmpdclient.h" - struct _MpdData_real; - diff --git a/srcpkgs/libmpd/template b/srcpkgs/libmpd/template deleted file mode 100644 index 608057b0232a..000000000000 --- a/srcpkgs/libmpd/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'libmpd' -pkgname=libmpd -version=11.8.17 -revision=3 -build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="libglib-devel" -short_desc="Signal based wrapper around libmpdclient" -maintainer="Dave Davenport " -license="GPL-2.0-or-later" -homepage="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client" -distfiles="http://download.sarine.nl/Programs/gmpc/${version%.*}/${pkgname}-${version}.tar.gz" -checksum=fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83 - -libmpd-devel_package() { - short_desc+=" - development files" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/*.a - vmove usr/lib/*.so - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 40eaf32c79b3..943a84252062 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -241,6 +241,8 @@ replaces=" libmagick6-devel<=6.9.12.12_2 libmagick6-perl<=6.9.12.12_2 libmagick6<=6.9.12.12_2 + libmpd-devel<=11.8.17_3 + libmpd<=11.8.17_3 libpyside-python3<=5.15.0_2 libqmatrixclient-devel<=0.5.3.2_1 libqmatrixclient<=0.5.3.2_1 From eb2531ea1958e8ba2d8e086b3e308627911c5fb3 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 17:13:20 -0700 Subject: [PATCH 0469/1407] atril: remove unused dependency on libunique --- srcpkgs/atril/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template index e3beb69b9e04..150d7d520e49 100644 --- a/srcpkgs/atril/template +++ b/srcpkgs/atril/template @@ -10,7 +10,7 @@ configure_args="--disable-schemas-compile --enable-djvu --enable-synctex=no hostmakedepends="glib-devel intltool itstool pkg-config perl-XML-Parser yelp-tools mate-common $(vopt_if gir 'gobject-introspection')" makedepends="djvulibre-devel libSM-devel libcaja-devel libgxps-devel - libnotify-devel libsecret-devel libspectre-devel libunique-devel + libnotify-devel libsecret-devel libspectre-devel mate-desktop-devel mate-icon-theme poppler-glib-devel webkit2gtk-devel" depends="dbus mate-desktop mate-icon-theme" short_desc="Simply a document viewer for MATE" From 544117d06a9023ae29ef3e9afb8df129763fe4d3 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:03:48 -0700 Subject: [PATCH 0470/1407] libunique1: remove package --- srcpkgs/libunique1-devel | 1 - .../patches/gcc7-fix-char_ptr.patch | 11 - .../patches/glib-max-allowed-2_56.patch | 12 - srcpkgs/libunique1/patches/unique-gdbus.patch | 529 ------------------ srcpkgs/libunique1/template | 43 -- srcpkgs/libunique1/update | 2 - srcpkgs/removed-packages/template | 2 + 7 files changed, 2 insertions(+), 598 deletions(-) delete mode 120000 srcpkgs/libunique1-devel delete mode 100644 srcpkgs/libunique1/patches/gcc7-fix-char_ptr.patch delete mode 100644 srcpkgs/libunique1/patches/glib-max-allowed-2_56.patch delete mode 100644 srcpkgs/libunique1/patches/unique-gdbus.patch delete mode 100644 srcpkgs/libunique1/template delete mode 100644 srcpkgs/libunique1/update diff --git a/srcpkgs/libunique1-devel b/srcpkgs/libunique1-devel deleted file mode 120000 index 708be9fc956a..000000000000 --- a/srcpkgs/libunique1-devel +++ /dev/null @@ -1 +0,0 @@ -libunique1 \ No newline at end of file diff --git a/srcpkgs/libunique1/patches/gcc7-fix-char_ptr.patch b/srcpkgs/libunique1/patches/gcc7-fix-char_ptr.patch deleted file mode 100644 index 5c19f80e6a30..000000000000 --- a/srcpkgs/libunique1/patches/gcc7-fix-char_ptr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libunique-1.1.6/unique/uniqueapp.c 2009-11-01 19:33:13.000000000 +0100 -+++ libunique-1.1.6/unique/uniqueapp.c 2017-06-15 17:30:10.775354836 +0200 -@@ -176,7 +176,7 @@ - { - gchar *id; - -- if (startup_id && startup_id != '\0') -+ if (startup_id && *startup_id != '\0') - id = g_strdup (startup_id); - else - { diff --git a/srcpkgs/libunique1/patches/glib-max-allowed-2_56.patch b/srcpkgs/libunique1/patches/glib-max-allowed-2_56.patch deleted file mode 100644 index e0da846253d4..000000000000 --- a/srcpkgs/libunique1/patches/glib-max-allowed-2_56.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libunique-1.16/unique/uniqueapp.c 2020-01-19 15:48:40.380617759 +0100 -+++ libunique-1.16/unique/uniqueapp.c 2020-01-19 16:02:19.196585111 +0100 -@@ -55,6 +55,9 @@ - #include - #include - -+/* Avoid error for macros deprecated in glib-2.58 */ -+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_56 -+#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_56 - #include - #include - diff --git a/srcpkgs/libunique1/patches/unique-gdbus.patch b/srcpkgs/libunique1/patches/unique-gdbus.patch deleted file mode 100644 index 880c0c0ff99a..000000000000 --- a/srcpkgs/libunique1/patches/unique-gdbus.patch +++ /dev/null @@ -1,529 +0,0 @@ -From 01066039529c0181f231325476bb4823c16a2aea Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Sat, 15 May 2010 17:47:45 +0000 -Subject: Add GDBus backend - -Add backend using GDBus, the new D-BUS binding in GIO 2.25. - -Bug #618723. ---- -diff --git a/configure.ac b/configure.ac -index bc3163a..b6a4221 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -116,6 +116,19 @@ AS_IF([test "x$have_dbus" = "xyes"], - - AM_CONDITIONAL([HAVE_DBUS], [test "x$have_dbus" = "xyes"]) - -+dnl GDBus backend -+dnl This is the default backend if GIO is recent enough -+m4_define([gdbus_gio_required],[2.25.7]) -+PKG_CHECK_MODULES([GDBUS],[gio-2.0 >= gdbus_gio_required],[have_gdbus=yes],[have_gdbus=no]) -+ -+AS_IF([test "x$have_gdbus" = "xyes"], -+ [ -+ AC_DEFINE([HAVE_GDBUS],[1],[Define if GDBus backend is enabled]) -+ ] -+ ) -+ -+AM_CONDITIONAL([HAVE_GDBUS],[test "$have_gdbus" = "yes"]) -+ - dnl Bacon backend - dnl This is the fallback backend, so we *need* these headers and functions - dnl even if we end up using D-Bus -@@ -146,7 +159,13 @@ AM_CONDITIONAL([HAVE_BACON], [test "x$have_bacon" = "xyes"]) - - dnl Choose the default backend - AC_MSG_CHECKING([for default IPC mechanism]) --AS_IF([test "x$have_dbus" = "xyes"], -+AS_IF([test "x$have_gdbus" = "xyes"], -+ [ -+ UNIQUE_DEFAULT_BACKEND=gdbus -+ AC_MSG_RESULT([GDBus]) -+ ], -+ -+ [test "x$have_dbus" = "xyes"], - [ - UNIQUE_DEFAULT_BACKEND=dbus - AC_MSG_RESULT([D-Bus]) -@@ -243,6 +262,7 @@ AC_CONFIG_FILES([ - unique/uniqueversion.h - unique/bacon/Makefile - unique/dbus/Makefile -+ unique/gdbus/Makefile - tests/Makefile - po/Makefile.in - ]) -@@ -261,6 +281,7 @@ Configuration: - Backends: - Unix Domain Socket: $have_bacon - D-BUS: $have_dbus -+ GDBus: $have_gdbus - - Default backend: $UNIQUE_DEFAULT_BACKEND - " -diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am -index 3172588..2c1dbf4 100644 ---- a/doc/reference/Makefile.am -+++ b/doc/reference/Makefile.am -@@ -50,7 +50,8 @@ IGNORE_HFILES = \ - uniquemarshal.h \ - stamp-uniquemarshal.h \ - bacon \ -- dbus -+ dbus \ -+ gdbus - - EXTRA_HFILES = - -diff --git a/unique/Makefile.am b/unique/Makefile.am -index 6475a87..8f0b7ba 100644 ---- a/unique/Makefile.am -+++ b/unique/Makefile.am -@@ -12,7 +12,11 @@ if HAVE_DBUS - SUBDIRS += dbus - endif - --DIST_SUBDIRS = bacon dbus -+if HAVE_GDBUS -+SUBDIRS += gdbus -+endif -+ -+DIST_SUBDIRS = bacon dbus gdbus - - INCLUDES = -I$(top_srcdir) - -@@ -72,6 +76,10 @@ if HAVE_DBUS - unique_backend_libs += $(top_builddir)/unique/dbus/libunique-dbus.la - endif - -+if HAVE_GDBUS -+unique_backend_libs += $(top_builddir)/unique/gdbus/libunique-gdbus.la -+endif -+ - uniquedir = $(includedir)/unique-1.0/unique - unique_HEADERS = \ - $(unique_sources_h) \ -diff --git a/unique/gdbus/.gitignore b/unique/gdbus/.gitignore -new file mode 100644 -index 0000000..c7e22c3 ---- /dev/null -+++ b/unique/gdbus/.gitignore -@@ -0,0 +1,2 @@ -+libunique_gdbus_la-uniquebackend-gdbus.lo -+libunique-gdbus.la -diff --git a/unique/gdbus/Makefile.am b/unique/gdbus/Makefile.am -new file mode 100644 -index 0000000..e10637d ---- /dev/null -+++ b/unique/gdbus/Makefile.am -@@ -0,0 +1,24 @@ -+include $(top_srcdir)/build/autotools/Makefile.am.silent -+ -+noinst_LTLIBRARIES = libunique-gdbus.la -+ -+libunique_gdbus_la_SOURCES = \ -+ uniquebackend-gdbus.h \ -+ uniquebackend-gdbus.c -+ -+libunique_gdbus_la_PPCFLAGS = \ -+ -DG_LOG_DOMAIN=\"Unique-GDBus\" \ -+ -DG_DISABLE_SINGLE_INCLUDES \ -+ -I$(top_srcdir) \ -+ $(AM_CPPFLAGS) -+ -+libunique_gdbus_la_CFLAGS = \ -+ $(UNIQUE_CFLAGS) \ -+ $(UNIQUE_DEBUG_CFLAGS) \ -+ $(MAINTAINER_CFLAGS) \ -+ $(GDBUS_CFLAGS) \ -+ $(AM_CFLAGS) -+ -+libunique_gdbus_la_LIBADD = \ -+ $(UNIQUE_LIBS) \ -+ $(GDBUS_LIBS) -diff --git a/unique/gdbus/uniquebackend-gdbus.c b/unique/gdbus/uniquebackend-gdbus.c -new file mode 100644 -index 0000000..14d54a9 ---- /dev/null -+++ b/unique/gdbus/uniquebackend-gdbus.c -@@ -0,0 +1,303 @@ -+/* Unique - Single Instance application library -+ * uniquebackend-gdbus.c: GDBus implementation of UniqueBackend -+ * -+ * Copyright (C) 2007 Emmanuele Bassi -+ * Copyright © 2010 Christian Persch -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ * 02110-1301 USA -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include -+#include -+ -+#include "../uniqueinternals.h" -+#include "uniquebackend-gdbus.h" -+ -+struct _UniqueBackendGDBus -+{ -+ UniqueBackend parent_instance; -+ -+ GDBusConnection *connection; -+ guint registration_id; -+ guint owner_id; -+ gboolean owns_name; -+ GMainLoop *loop; -+}; -+ -+struct _UniqueBackendGDBusClass -+{ -+ UniqueBackendClass parent_class; -+ GDBusNodeInfo *introspection_data; -+}; -+ -+G_DEFINE_TYPE (UniqueBackendGDBus, unique_backend_gdbus, UNIQUE_TYPE_BACKEND); -+ -+static const char introspection_xml[] = -+ "" -+ "" -+ "" -+ "" -+ "" -+ "" -+ "" -+ "" -+ "" -+ ""; -+ -+static void -+method_call_cb (GDBusConnection *connection, -+ const gchar *sender, -+ const gchar *object_path, -+ const gchar *interface_name, -+ const gchar *method_name, -+ GVariant *parameters, -+ GDBusMethodInvocation *invocation, -+ gpointer user_data) -+{ -+ if (g_strcmp0 (interface_name, "org.gtk.UniqueApp") != 0 || -+ g_strcmp0 (object_path, "/Factory") != 0) -+ return; -+ -+ if (g_strcmp0 (method_name, "SendMessage") == 0) -+ { -+ UniqueBackend *backend = UNIQUE_BACKEND (user_data); -+ const gchar *command_str, *data, *startup_id; -+ guint len, screen_num, workspace, time_; -+ UniqueMessageData message_data; -+ gint command; -+ UniqueResponse response; -+ GdkDisplay *display; -+ -+ g_variant_get (parameters, -+ "(&s(&suuu&s)u)", -+ &command_str, -+ &data, &len, &screen_num, &workspace, &startup_id, -+ &time_); -+ -+ command = unique_command_from_string (backend->parent, command_str); -+ if (command == 0) -+ { -+ g_dbus_method_invocation_return_error (invocation, -+ G_DBUS_ERROR, -+ G_DBUS_ERROR_INVALID_ARGS, -+ "Invalid command `%s' received", -+ command_str); -+ return; -+ } -+ -+ display = gdk_display_get_default (); -+ -+ message_data.data = len > 0 ? (guchar *) data : NULL; -+ message_data.length = (gint) len; -+ message_data.workspace = workspace; -+ message_data.startup_id = (char *) startup_id; -+ if (screen_num >= 0 && screen_num < gdk_display_get_n_screens (display)) -+ message_data.screen = gdk_display_get_screen (display, screen_num); -+ else -+ message_data.screen = gdk_screen_get_default (); -+ -+ response = unique_app_emit_message_received (backend->parent, command, &message_data, time_); -+ -+ g_dbus_method_invocation_return_value (invocation, -+ g_variant_new ("(s)", unique_response_to_string (response))); -+ return; -+ } -+} -+ -+static void -+name_acquired_cb (GDBusConnection *connection, -+ const gchar *name, -+ gpointer user_data) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (user_data); -+ -+ backend_gdbus->owns_name = TRUE; -+ if (backend_gdbus->loop && g_main_loop_is_running (backend_gdbus->loop)) -+ g_main_loop_quit (backend_gdbus->loop); -+} -+ -+static void -+name_lost_cb (GDBusConnection *connection, -+ const gchar *name, -+ gpointer user_data) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (user_data); -+ -+ backend_gdbus->owns_name = FALSE; -+ if (backend_gdbus->loop && g_main_loop_is_running (backend_gdbus->loop)) -+ g_main_loop_quit (backend_gdbus->loop); -+} -+ -+static const GDBusInterfaceVTable interface_vtable = { -+ method_call_cb, -+ NULL, -+ NULL -+}; -+ -+static gboolean -+unique_backend_gdbus_request_name (UniqueBackend *backend) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (backend); -+ UniqueBackendGDBusClass *klass = UNIQUE_BACKEND_GDBUS_GET_CLASS (backend); -+ GError *error; -+ -+ error = NULL; -+ backend_gdbus->connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); -+ if (!backend_gdbus->connection) -+ { -+ g_warning ("Unable to open a connection to the session bus: %s", -+ error->message); -+ g_error_free (error); -+ -+ return FALSE; -+ } -+ -+ backend_gdbus->registration_id = -+ g_dbus_connection_register_object (backend_gdbus->connection, -+ "/Factory", -+ klass->introspection_data->interfaces[0], -+ &interface_vtable, -+ backend, NULL, -+ &error); -+ if (backend_gdbus->registration_id == 0) -+ { -+ g_warning ("Unable to register object with the session bus: %s", -+ error->message); -+ g_error_free (error); -+ -+ return FALSE; -+ } -+ -+ backend_gdbus->owns_name = FALSE; -+ -+ backend_gdbus->owner_id = -+ g_bus_own_name_on_connection (backend_gdbus->connection, -+ unique_backend_get_name (backend), -+ G_BUS_NAME_OWNER_FLAGS_NONE, -+ name_acquired_cb, -+ name_lost_cb, -+ backend, NULL); -+ -+ backend_gdbus->loop = g_main_loop_new (NULL, FALSE); -+ g_main_loop_run (backend_gdbus->loop); -+ g_main_loop_unref (backend_gdbus->loop); -+ backend_gdbus->loop = NULL; -+ -+ return backend_gdbus->owns_name; -+} -+ -+static UniqueResponse -+unique_backend_gdbus_send_message (UniqueBackend *backend, -+ gint command, -+ UniqueMessageData *message_data, -+ guint time_) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (backend); -+ GVariantBuilder builder; -+ GVariant *result; -+ const gchar *command_str, *resp; -+ UniqueResponse response; -+ GError *error; -+ -+ command_str = unique_command_to_string (backend->parent, command); -+ -+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("(s(suuus)u)")); -+ g_variant_builder_add (&builder, "s", command_str ? command_str : ""); -+ g_variant_builder_open (&builder, G_VARIANT_TYPE ("(suuus)")); -+ g_variant_builder_add (&builder, "s", message_data->data ? (char *) message_data->data : ""); -+ g_variant_builder_add (&builder, "u", (guint) message_data->length); -+ g_variant_builder_add (&builder, "u", (guint) gdk_screen_get_number (message_data->screen)); -+ g_variant_builder_add (&builder, "u", (guint) message_data->workspace); -+ g_variant_builder_add (&builder, "s", message_data->startup_id ? message_data->startup_id : ""); -+ g_variant_builder_close (&builder); -+ g_variant_builder_add (&builder, "u", time_); -+ -+ error = NULL; -+ result = g_dbus_connection_call_sync (backend_gdbus->connection, -+ unique_backend_get_name (backend), -+ "/Factory", -+ "org.gtk.UniqueApp", -+ "SendMessage", -+ g_variant_builder_end (&builder), -+ G_VARIANT_TYPE ("(s)"), -+ G_DBUS_CALL_FLAGS_NO_AUTO_START, -+ -1, -+ NULL, -+ &error); -+ if (error) -+ { -+ g_warning ("Error while sending message: %s", error->message); -+ g_error_free (error); -+ -+ return UNIQUE_RESPONSE_INVALID; -+ } -+ -+ g_variant_get (result, "(&s)", &resp); -+ response = unique_response_from_string (resp); -+ g_variant_unref (result); -+ -+ return response; -+} -+ -+static void -+unique_backend_gdbus_dispose (GObject *gobject) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (gobject); -+ -+ if (backend_gdbus->owner_id != 0) -+ { -+ g_bus_unown_name (backend_gdbus->owner_id); -+ backend_gdbus->owner_id = 0; -+ } -+ if (backend_gdbus->registration_id != 0) -+ { -+ g_assert (backend_gdbus->connection != NULL); -+ g_dbus_connection_unregister_object (backend_gdbus->connection, -+ backend_gdbus->registration_id); -+ backend_gdbus->registration_id = 0; -+ } -+ if (backend_gdbus->connection) -+ { -+ g_object_unref (backend_gdbus->connection); -+ backend_gdbus->connection = NULL; -+ } -+ -+ G_OBJECT_CLASS (unique_backend_gdbus_parent_class)->dispose (gobject); -+} -+ -+static void -+unique_backend_gdbus_class_init (UniqueBackendGDBusClass *klass) -+{ -+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass); -+ UniqueBackendClass *backend_class = UNIQUE_BACKEND_CLASS (klass); -+ -+ gobject_class->dispose = unique_backend_gdbus_dispose; -+ -+ backend_class->request_name = unique_backend_gdbus_request_name; -+ backend_class->send_message = unique_backend_gdbus_send_message; -+ -+ klass->introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL); -+ g_assert (klass->introspection_data != NULL); -+} -+ -+static void -+unique_backend_gdbus_init (UniqueBackendGDBus *backend) -+{ -+} -diff --git a/unique/gdbus/uniquebackend-gdbus.h b/unique/gdbus/uniquebackend-gdbus.h -new file mode 100644 -index 0000000..41eb6e5 ---- /dev/null -+++ b/unique/gdbus/uniquebackend-gdbus.h -@@ -0,0 +1,43 @@ -+/* Unique - Single Instance application library -+ * uniquebackend-gdbus.c: GDBus implementation of UniqueBackend -+ * -+ * Copyright (C) 2007 Emmanuele Bassi -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ * 02110-1301 USA -+ */ -+ -+#ifndef __UNIQUE_BACKEND_GDBUS_H__ -+#define __UNIQUE_BACKEND_GDBUS_H__ -+ -+#include -+ -+G_BEGIN_DECLS -+ -+#define UNIQUE_TYPE_BACKEND_GDBUS (unique_backend_gdbus_get_type ()) -+#define UNIQUE_BACKEND_GDBUS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBus)) -+#define UNIQUE_IS_BACKEND_GDBUS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNIQUE_TYPE_BACKEND_GDBUS)) -+#define UNIQUE_BACKEND_GDBUS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBusClass)) -+#define UNIQUE_IS_BACKEND_GDBUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNIQUE_TYPE_BACKEND_GDBUS)) -+#define UNIQUE_BACKEND_GDBUS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBusClass)) -+ -+typedef struct _UniqueBackendGDBus UniqueBackendGDBus; -+typedef struct _UniqueBackendGDBusClass UniqueBackendGDBusClass; -+ -+GType unique_backend_gdbus_get_type (void) G_GNUC_CONST; -+ -+G_END_DECLS -+ -+#endif /* __UNIQUE_BACKEND_GDBUS_H__ */ -diff --git a/unique/uniquebackend.c b/unique/uniquebackend.c -index 18a0c45..a76e42e 100644 ---- a/unique/uniquebackend.c -+++ b/unique/uniquebackend.c -@@ -298,6 +298,9 @@ unique_backend_send_message (UniqueBackend *backend, - #ifdef HAVE_DBUS - #include "dbus/uniquebackend-dbus.h" - #endif -+#ifdef HAVE_GDBUS -+#include "gdbus/uniquebackend-gdbus.h" -+#endif - - /** - * unique_backend_create: -@@ -329,6 +332,10 @@ unique_backend_create (void) - if (strcmp (backend_name, "dbus") == 0) - backend_gtype = unique_backend_dbus_get_type (); - #endif /* HAVE_DBUS */ -+#ifdef HAVE_GDBUS -+ if (strcmp (backend_name, "gdbus") == 0) -+ backend_gtype = unique_backend_gdbus_get_type (); -+#endif /* HAVE_GDBUS */ - #if !defined(HAVE_BACON) && !defined(HAVE_DBUS) - #error Need either bacon or dbus - #endif --- -cgit v0.8.3.1 diff --git a/srcpkgs/libunique1/template b/srcpkgs/libunique1/template deleted file mode 100644 index f73931b0c72b..000000000000 --- a/srcpkgs/libunique1/template +++ /dev/null @@ -1,43 +0,0 @@ -# Template file for 'libunique1' -pkgname=libunique1 -version=1.1.6 -revision=12 -wrksrc="libunique-${version}" -build_style=gnu-configure -build_helper="gir" -configure_args="--disable-static --disable-dbus" -hostmakedepends="libtool automake pkg-config glib-devel" -makedepends="libSM-devel gtk+-devel" -short_desc="Library for writing single instance applications (GTK+2)" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="https://wiki.gnome.org/Attic/LibUnique" -distfiles="${GNOME_SITE}/libunique/1.1/libunique-${version}.tar.bz2" -checksum=e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb - -CFLAGS="-Wno-deprecated-declarations" - -# Package build options -build_options="gir" -build_options_default="gir" - -pre_configure() { - # Fix build with glib 2.30. - for f in $(find ${wrksrc} -name *.[ch]); do - sed -i -s "s|G_CONST_RETURN|const|g" "$f" - done - sed -e "s,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g" \ - -e "s,AM_PROG_CC_STDC,AC_PROG_CC,g" -i configure.ac - autoreconf -fi -} - -libunique1-devel_package() { - depends="gtk+-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - vmove usr/share - } -} diff --git a/srcpkgs/libunique1/update b/srcpkgs/libunique1/update deleted file mode 100644 index 7f9701970515..000000000000 --- a/srcpkgs/libunique1/update +++ /dev/null @@ -1,2 +0,0 @@ -pkgname=libunique -ignore="[!1].*" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 943a84252062..33b40885b7fc 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -251,6 +251,8 @@ replaces=" librpcsecgss<=0.19_6 libshiboken-python3<=5.15.0_3 libspa-ffmpeg<=0.3.32_1 + libunique1-devel<=1.1.6_12 + libunique1<=1.1.6_12 libxml2-python<=2.9.10_4 libxnoise<=0.2.21_4 libxslt-python<=1.1.34_5 From 952f6fd239b9b7bafe2b856125faf404ac24baf9 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:04:12 -0700 Subject: [PATCH 0471/1407] libunique: remove package --- srcpkgs/libunique-devel | 1 - srcpkgs/removed-packages/template | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 120000 srcpkgs/libunique-devel diff --git a/srcpkgs/libunique-devel b/srcpkgs/libunique-devel deleted file mode 120000 index a4f4bebbc83a..000000000000 --- a/srcpkgs/libunique-devel +++ /dev/null @@ -1 +0,0 @@ -libunique \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 33b40885b7fc..b340882305e8 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -253,6 +253,8 @@ replaces=" libspa-ffmpeg<=0.3.32_1 libunique1-devel<=1.1.6_12 libunique1<=1.1.6_12 + libunique-devel<=3.0.2_11 + libunique<=3.0.2_11 libxml2-python<=2.9.10_4 libxnoise<=0.2.21_4 libxslt-python<=1.1.34_5 From 262b9f851760494a3ceef00ce851f795b003e16c Mon Sep 17 00:00:00 2001 From: icp Date: Tue, 23 Aug 2022 21:43:20 +0530 Subject: [PATCH 0472/1407] tllist: update to 1.1.0. --- srcpkgs/tllist/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tllist/template b/srcpkgs/tllist/template index 5ebcb2d241cc..965f20e1f8c8 100644 --- a/srcpkgs/tllist/template +++ b/srcpkgs/tllist/template @@ -1,6 +1,6 @@ # Template file for 'tllist' pkgname=tllist -version=1.0.5 +version=1.1.0 revision=1 wrksrc=$pkgname build_style=meson @@ -8,8 +8,8 @@ short_desc="C header file only implementation of a typed linked list" maintainer="Isaac Freund " license="MIT" homepage="https://codeberg.org/dnkl/tllist" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=b0f32c9b2c2015c8d8dd068fd4e8b586aa91ca1670badc274ec962559ee0aadd +distfiles="https://codeberg.org/dnkl/tllist/archive/${version}.tar.gz" +checksum=0e7b7094a02550dd80b7243bcffc3671550b0f1d8ba625e4dff52517827d5d23 post_install() { vlicense LICENSE From e87073ecee04f155a909576c858c928b40778209 Mon Sep 17 00:00:00 2001 From: icp Date: Tue, 23 Aug 2022 21:35:44 +0530 Subject: [PATCH 0473/1407] fnott: update to 1.3.0. --- srcpkgs/fnott/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fnott/template b/srcpkgs/fnott/template index cb7c4c766ad8..8790e3ec51a7 100644 --- a/srcpkgs/fnott/template +++ b/srcpkgs/fnott/template @@ -1,6 +1,6 @@ # Template file for 'fnott' pkgname=fnott -version=1.2.1 +version=1.3.0 revision=1 wrksrc=$pkgname build_style=meson @@ -10,8 +10,9 @@ short_desc="Keyboard driven and lightweight notification daemon" maintainer="travankor " license="MIT" homepage="https://codeberg.org/dnkl/fnott/" +changelog="https://codeberg.org/dnkl/fnott/src/branch/master/CHANGELOG.md" distfiles="https://codeberg.org/dnkl/fnott/archive/${version}.tar.gz" -checksum=a4e72845cde23aff0653f9b218a32cb40ae628b3f690dc02333ea95469faf216 +checksum=d17d6a55a7e0d56ddfc3277fbbefa7baf4c70f02265bcb8bd72ee464e202e454 post_install() { vlicense LICENSE From f6ece8cb7aeb8608ab335efd3b5a96972487a965 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 25 Aug 2022 22:24:53 +0200 Subject: [PATCH 0474/1407] ksh: update to 1.0.3. --- srcpkgs/ksh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template index 5f022424b7f0..1d89c3e67eb6 100644 --- a/srcpkgs/ksh/template +++ b/srcpkgs/ksh/template @@ -1,7 +1,7 @@ # Template file for 'ksh' pkgname=ksh reverts="2020.0.0_1" -version=1.0.2 +version=1.0.3 revision=1 wrksrc="ksh-${version}" short_desc="AT&T's Korn shell (community branch ksh93u+m)" @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="EPL-1.0" homepage="https://github.com/ksh93/ksh" distfiles="https://github.com/ksh93/ksh/archive/v${version}.tar.gz" -checksum=e62616caab07b2d090e9ad5e17f058d4b8b8f12b48f44017d9e5d6550dfd5c14 +checksum=e554a96ecf7b64036ecb730fcc2affe1779a2f14145eb6a95d0dfe8b1aba66b5 nocross=yes register_shell="/bin/ksh" From 924d816da5b3f8897351edf5beed03dd207c36c0 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 25 Aug 2022 21:56:20 +0200 Subject: [PATCH 0475/1407] github-cli: update to 2.14.7 --- 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 397d82a826d3..ea8ba79638b8 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.14.6 +version=2.14.7 revision=1 wrksrc="cli-${version}" build_style=go @@ -12,8 +12,8 @@ maintainer="shizonic " 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=60b0697b9b1db52adabaa804967a6b63f9ffbc634c00940d08861101bc1d5610 +distfiles="https://github.com/cli/cli/archive/refs/tags/v${version}.tar.gz" +checksum=a1a048714d7c7b237ea05f1fb51b3f3f4cdf90a16c60fa46f1df2eb5d96ce28d pre_build() { local _date From 0504068dfcddb8960843c5ac083cc85406f5fc8d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 26 Aug 2022 00:12:51 +0200 Subject: [PATCH 0476/1407] cbatticon: increase revision this was missed in 9ad33b026f571003599b8aaefe4a3b99af60755d --- srcpkgs/cbatticon/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cbatticon/template b/srcpkgs/cbatticon/template index f8b5214d2d96..038038f51f18 100644 --- a/srcpkgs/cbatticon/template +++ b/srcpkgs/cbatticon/template @@ -1,7 +1,7 @@ # Template file for 'cbatticon' pkgname=cbatticon version=1.6.13 -revision=1 +revision=2 build_style=gnu-makefile make_use_env=yes hostmakedepends="gettext pkg-config" From b53addc622854a6e6dee7cbe8fa7babf0201a3cf Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 26 Aug 2022 00:26:26 +0200 Subject: [PATCH 0477/1407] step-certificates: remove -w from go_ldflags unnecessary and this results in an error since fc49c6e396ee09440b72023b05696746d4886813 --- srcpkgs/step-certificates/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template index 4d616f9450af..58801ad8873f 100644 --- a/srcpkgs/step-certificates/template +++ b/srcpkgs/step-certificates/template @@ -10,7 +10,7 @@ go_package="$go_import_path/cmd/step-ca $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" +go_ldflags="-X main.Version=$version" hostmakedepends="pkg-config" makedepends="pcsclite-devel" short_desc="Private CA and ACME server" From 4fd7c683f6820ad88fe142fbd8851b95e73cd23b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 26 Aug 2022 00:33:43 +0200 Subject: [PATCH 0478/1407] sway: add missing build dep --- srcpkgs/sway/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index bafc9fdeeff2..bfb862c9aaaf 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -7,7 +7,7 @@ configure_args="-Dwerror=false -Db_ndebug=false" conf_files="/etc/sway/config" hostmakedepends="pkg-config wayland-devel scdoc git" makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel - gdk-pixbuf-devel" + gdk-pixbuf-devel libevdev-devel" depends="swaybg xorg-server-xwayland" short_desc="Tiling Wayland compositor compatible with i3" maintainer="Olaf Mersmann " From bdcc8991abf631b87c9fa7eeab56fee42c9d770f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 26 Aug 2022 00:42:04 +0200 Subject: [PATCH 0479/1407] wayfire: revbump for -devel dependency changes missed in 4b73243a6c8f85a7704f390b5a81338f861d4263 --- srcpkgs/wayfire/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index a564cd99f232..40c309996d14 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -1,7 +1,7 @@ # Template file for 'wayfire' pkgname=wayfire version=0.7.3 -revision=1 +revision=2 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403 build_style=meson From 24f1d40b9097a9ad56e394fbc8ed2c92c1aab394 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 26 Aug 2022 00:57:06 +0200 Subject: [PATCH 0480/1407] lok: fix distfiles download --- srcpkgs/lok/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lok/template b/srcpkgs/lok/template index bebc928ae575..0537e0c5471b 100644 --- a/srcpkgs/lok/template +++ b/srcpkgs/lok/template @@ -7,7 +7,7 @@ short_desc="A Linux port of OpenBSD's awk" maintainer="Orphaned " license="ISC" homepage="https://github.com/dimkr/lok" -distfiles="https://github.com/dimkr/lok/archive/${version}.tar.gz" +distfiles="https://github.com/dimkr/lok/archive/refs/tags/${version}.tar.gz" checksum=17215d1ef5760e282562bd852abab5ac5ae136fe579c02bb8fb6f9734e2c3185 make_build_args="PROG=lok" # Make the binary built be called lok make_install_args="PROG=lok MANDIR=usr/share/man" From b04c54cecee3c26549bc47ffa74bd4c6091d7535 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 26 Aug 2022 00:57:19 +0200 Subject: [PATCH 0481/1407] slack-term: fix distfiles download --- srcpkgs/slack-term/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/slack-term/template b/srcpkgs/slack-term/template index bd1c09543933..395ba8750f8f 100644 --- a/srcpkgs/slack-term/template +++ b/srcpkgs/slack-term/template @@ -7,13 +7,11 @@ go_import_path="github.com/erroneousboat/slack-term" short_desc="Slack client for your terminal" maintainer="Gerardo Di Iorio " license="MIT" -homepage="https://github.com/erroneousboat/slack-term" -distfiles="${homepage}/archive/v${version}.tar.gz" +homepage="https://github.com/jpbruinsslot/slack-term" +distfiles="https://github.com/jpbruinsslot/slack-term/archive/refs/tags/v${version}.tar.gz" checksum=089cf10a3959c99b73da1d5ad974f2cd076a56851ef9ffd97a77350a81e527f0 +make_check=no -do_check() { - : -} post_install() { vdoc README.md vlicense LICENSE From 7683b23ee5e022e87887832136e1cbf56d666e61 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 26 Aug 2022 00:57:35 +0200 Subject: [PATCH 0482/1407] vidcutter: fix distfiles download --- srcpkgs/vidcutter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template index 92c6cc6817d0..c507c132a19d 100644 --- a/srcpkgs/vidcutter/template +++ b/srcpkgs/vidcutter/template @@ -11,7 +11,7 @@ short_desc="Video cutter and joiner based on FFmpeg" maintainer="bra1nwave " license="GPL-3.0-or-later" homepage="https://github.com/ozmartian/vidcutter" -distfiles="https://github.com/ozmartian/vidcutter/archive/${version}.tar.gz" +distfiles="https://github.com/ozmartian/vidcutter/archive/refs/tags/${version}.tar.gz" checksum=c09be7eceaf42ff7211fe3b8125279c4fec7f7d251d272b61d579e426bd4e2c2 pre_build() { From 5371aed2f2a2d15c049ab34965d01c7f6d40405b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 26 Aug 2022 00:57:57 +0200 Subject: [PATCH 0483/1407] spotify: remove obsolete GConf dependency --- srcpkgs/spotify/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template index 0dba9c4293c0..d15a91479638 100644 --- a/srcpkgs/spotify/template +++ b/srcpkgs/spotify/template @@ -8,7 +8,7 @@ archs="x86_64" create_wrksrc=yes build_style=fetch hostmakedepends="curl w3m libcurl" -depends="GConf libcurl" +depends="libcurl" short_desc="Proprietary music streaming client" maintainer="Stefan Mühlinghaus " license="custom:Proprietary" From a7c3e53e6119937900395cd81fccb6ad47a7ae01 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 26 Aug 2022 01:03:45 +0200 Subject: [PATCH 0484/1407] spotify: revbump to remove GConf dependency missed in c709f1409713922ae2b73cc12e94a58a602c8eb4 --- srcpkgs/spotify/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template index d15a91479638..faf00539da70 100644 --- a/srcpkgs/spotify/template +++ b/srcpkgs/spotify/template @@ -1,7 +1,7 @@ # Template file for 'spotify' pkgname=spotify version=1.1.84 -revision=1 +revision=2 _ver="${version}.716.gc5f8b819_amd64" _filename="spotify-client_${_ver}.deb" archs="x86_64" From b063cb72b8370b1bf831ce4c490b1bc1c21543ae Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 26 Aug 2022 01:05:01 +0200 Subject: [PATCH 0485/1407] libunique: remove package properly missed in 446e2dc16adaddf712404badba7baf83b3ecd090 --- common/shlibs | 2 - .../libunique/patches/gcc7-fix-char_ptr.patch | 11 ------ srcpkgs/libunique/template | 37 ------------------- 3 files changed, 50 deletions(-) delete mode 100644 srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch delete mode 100644 srcpkgs/libunique/template diff --git a/common/shlibs b/common/shlibs index 8c257ed2bcd5..e7a52cffc36c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -540,7 +540,6 @@ libsoup-3.0.so.0 libsoup3-3.0.0_1 libsoup-gnome-2.4.so.1 libsoup-gnome-2.34.0_1 libgnome-panel.so.0 gnome-panel-3.37.1_1 libuninum.so.5 libuninum-2.7_1 -libunique-3.0.so.0 libunique-2.91.4_1 libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1 libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1 libgimp-2.0.so.0 libgimp-2.10.0_1 @@ -893,7 +892,6 @@ libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1_1 libfm.so.4 libfm-1.2.3_3 libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2 libfm-extra.so.4 libfm-extra-1.2.3_3 -libunique-1.0.so.0 libunique1-1.1.6_1 libdiscid.so.0 libdiscid-0.2.2_1 librhythmbox-core.so.10 librhythmbox-3.4.1_1 libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1 diff --git a/srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch b/srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch deleted file mode 100644 index 734a60e2f78b..000000000000 --- a/srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/unique/uniqueapp.c 2011-06-14 14:26:26.000000000 +0200 -+++ b/unique/uniqueapp.c 2017-05-20 19:27:59.043332852 +0200 -@@ -175,7 +175,7 @@ - { - gchar *id; - -- if (startup_id && startup_id != '\0') -+ if (startup_id && *startup_id != '\0') - id = g_strdup (startup_id); - else - { diff --git a/srcpkgs/libunique/template b/srcpkgs/libunique/template deleted file mode 100644 index db488533acbf..000000000000 --- a/srcpkgs/libunique/template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'libunique' -pkgname=libunique -version=3.0.2 -revision=11 -build_style=gnu-configure -build_helper="gir" -configure_args="--enable-bacon=yes --enable-dbus=yes" -hostmakedepends="pkg-config glib-devel" -makedepends="dbus-glib-devel gtk+3-devel glib-devel" -short_desc="Library for writing single instance applications" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="https://wiki.gnome.org/Attic/LibUnique" -distfiles="${GNOME_SITE}/${pkgname}/3.0/${pkgname}-${version}.tar.bz2" -checksum=50269a87c7aabf1e25f01b3bbb280133138ffd7b6776289894c614a4b6ca968d - -# Package build options -build_options="gir" -build_options_default="gir" - -post_configure() { - sed -i Makefile -e "/MAINTAINER_CFLAGS/s/-Werror/-Wno-error/" -} - -libunique-devel_package() { - depends="dbus-glib-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - 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/share/gtk-doc - } -} From aa31f6a022f6fdfad74274540fc2e0f71f4bfca9 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, 25 Aug 2022 21:58:47 +0700 Subject: [PATCH 0486/1407] bluez: update to 5.65 Close: #38891 --- ...04-include-sys-time.h-for-musl-build.patch | 116 ------------------ srcpkgs/bluez/patches/0006-musl-fix.patch | 37 ------ .../bluez/patches/0007-include-string.h.patch | 25 ---- ...0009-include-limits.h-for-musl-build.patch | 11 -- srcpkgs/bluez/template | 4 +- 5 files changed, 2 insertions(+), 191 deletions(-) delete mode 100644 srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch delete mode 100644 srcpkgs/bluez/patches/0006-musl-fix.patch delete mode 100644 srcpkgs/bluez/patches/0007-include-string.h.patch delete mode 100644 srcpkgs/bluez/patches/0009-include-limits.h-for-musl-build.patch diff --git a/srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch b/srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch deleted file mode 100644 index f2e5a4ace6ea..000000000000 --- a/srcpkgs/bluez/patches/0004-include-sys-time.h-for-musl-build.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 1370cc9a32f8979158a894c3de75bcb3c29af03a Mon Sep 17 00:00:00 2001 -From: Doan Tran Cong Danh -Date: Thu, 3 Oct 2019 12:59:56 +0700 -Subject: [PATCH 4/8] include sys/time.h for musl build - ---- - mesh/appkey.c | 1 + - mesh/crypto.c | 1 + - mesh/friend.c | 1 + - mesh/manager.c | 1 + - mesh/mesh.c | 1 + - mesh/net.c | 2 +- - mesh/pb-adv.c | 1 + - mesh/prov-acceptor.c | 1 + - mesh/prov-initiator.c | 1 + - 9 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/mesh/appkey.c b/mesh/appkey.c -index 45d604007..b570bff9d 100644 ---- a/mesh/appkey.c -+++ b/mesh/appkey.c -@@ -22,6 +22,7 @@ - #endif - - #define _GNU_SOURCE -+#include - #include - - #include "mesh/mesh-defs.h" -diff --git a/mesh/crypto.c b/mesh/crypto.c -index 596a289f9..3ecdb564c 100644 ---- a/mesh/crypto.c -+++ b/mesh/crypto.c -@@ -24,6 +24,7 @@ - #define _GNU_SOURCE - #include - #include -+#include - #include - - #include "mesh/mesh-defs.h" -diff --git a/mesh/friend.c b/mesh/friend.c -index 5f5f6f823..a5bab6929 100644 ---- a/mesh/friend.c -+++ b/mesh/friend.c -@@ -21,6 +21,7 @@ - #include - #endif - -+#include - #include - - #include "mesh/mesh-defs.h" -diff --git a/mesh/manager.c b/mesh/manager.c -index e4a7deaeb..e5837ed48 100644 ---- a/mesh/manager.c -+++ b/mesh/manager.c -@@ -22,6 +22,7 @@ - #endif - - #define _GNU_SOURCE -+#include - #include - - #include "mesh/mesh-defs.h" -diff --git a/mesh/mesh.c b/mesh/mesh.c -index 6d2f86b6d..1eef01eee 100644 ---- a/mesh/mesh.c -+++ b/mesh/mesh.c -@@ -22,6 +22,7 @@ - #endif - - #define _GNU_SOURCE -+#include - #include - - #include "mesh/mesh-io.h" -diff --git a/mesh/pb-adv.c b/mesh/pb-adv.c -index 6ef45b8b0..797ff9da7 100644 ---- a/mesh/pb-adv.c -+++ b/mesh/pb-adv.c -@@ -21,6 +21,7 @@ - #include - #endif - -+#include - #include - - #include "mesh/mesh-defs.h" -diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c -index 03972c227..1b38f1bdd 100644 ---- a/mesh/prov-acceptor.c -+++ b/mesh/prov-acceptor.c -@@ -21,6 +21,7 @@ - #include - #endif - -+#include - #include - - #include "src/shared/ecc.h" -diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c -index 7a767cfb3..c9ffea45d 100644 ---- a/mesh/prov-initiator.c -+++ b/mesh/prov-initiator.c -@@ -21,6 +21,7 @@ - #include - #endif - -+#include - #include - - #include "src/shared/ecc.h" --- -2.23.0 - diff --git a/srcpkgs/bluez/patches/0006-musl-fix.patch b/srcpkgs/bluez/patches/0006-musl-fix.patch deleted file mode 100644 index ab0a588137ea..000000000000 --- a/srcpkgs/bluez/patches/0006-musl-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d1d8408c9a7c7b5ffa30371f246cc18085e11313 Mon Sep 17 00:00:00 2001 -From: Doan Tran Cong Danh -Date: Thu, 3 Oct 2019 13:00:27 +0700 -Subject: [PATCH 6/9] musl fix - -Including causes the inclusion of , -which defines 'struct in6_addr', already defined in . -Remove to fix musl build. ---- - tools/bneptest.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/bneptest.c b/tools/bneptest.c -index 8bc7596b6..6b3956cfa 100644 ---- a/tools/bneptest.c -+++ b/tools/bneptest.c -@@ -37,7 +37,6 @@ - #include - #include - #include --#include - - #include - -@@ -51,6 +50,9 @@ - #include "lib/bnep.h" - #include "profiles/network/bnep.h" - -+/* From */ -+#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8 -+ - enum { - MODE_LISTEN, - MODE_CONNECT, --- -2.23.0 - diff --git a/srcpkgs/bluez/patches/0007-include-string.h.patch b/srcpkgs/bluez/patches/0007-include-string.h.patch deleted file mode 100644 index e1cff41df496..000000000000 --- a/srcpkgs/bluez/patches/0007-include-string.h.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fe1a76a03b9cbc28621d53680eb9ff4a2bd31778 Mon Sep 17 00:00:00 2001 -From: Doan Tran Cong Danh -Date: Thu, 3 Oct 2019 16:31:01 +0700 -Subject: [PATCH 7/9] include string.h - ---- - android/client/if-hf-client.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/android/client/if-hf-client.c b/android/client/if-hf-client.c -index f701a814c..b44eb4291 100644 ---- a/android/client/if-hf-client.c -+++ b/android/client/if-hf-client.c -@@ -16,6 +16,8 @@ - */ - - #define _GNU_SOURCE -+#include -+ - #include "if-main.h" - #include "../hal-utils.h" - --- -2.23.0 - diff --git a/srcpkgs/bluez/patches/0009-include-limits.h-for-musl-build.patch b/srcpkgs/bluez/patches/0009-include-limits.h-for-musl-build.patch deleted file mode 100644 index c6627b90ac8d..000000000000 --- a/srcpkgs/bluez/patches/0009-include-limits.h-for-musl-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/mesh-cfgtest.c -+++ b/tools/mesh-cfgtest.c -@@ -34,6 +34,8 @@ - #include "mesh/mesh-defs.h" - #include "mesh/mesh.h" - -+#include -+ - #define MAX_CRPL_SIZE 0x7fff - #define CFG_SRV_MODEL 0x0000 - #define CFG_CLI_MODEL 0x0001 diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index e9827e8e1d95..fa05de5091fa 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,6 +1,6 @@ # Template file for 'bluez' pkgname=bluez -version=5.64 +version=5.65 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=ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34 +checksum=2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4 conf_files="/etc/bluetooth/main.conf" system_groups="bluetooth" From a6b32573ad0ada9eb2dc52400de25f768779e671 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, 23 Aug 2022 08:12:33 +0700 Subject: [PATCH 0487/1407] linux5.19: update to 5.19.4 --- srcpkgs/linux5.19/files/arm64-dotconfig | 2 +- srcpkgs/linux5.19/files/i386-dotconfig | 2 +- srcpkgs/linux5.19/files/ppc-dotconfig | 13 +++++++------ srcpkgs/linux5.19/files/ppc64-dotconfig | 2 +- srcpkgs/linux5.19/files/ppc64le-dotconfig | 2 +- srcpkgs/linux5.19/files/x86_64-dotconfig | 2 +- srcpkgs/linux5.19/template | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/srcpkgs/linux5.19/files/arm64-dotconfig b/srcpkgs/linux5.19/files/arm64-dotconfig index d7f25b4b2ab9..2c6f82ecf62b 100644 --- a/srcpkgs/linux5.19/files/arm64-dotconfig +++ b/srcpkgs/linux5.19/files/arm64-dotconfig @@ -7707,7 +7707,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/srcpkgs/linux5.19/files/i386-dotconfig b/srcpkgs/linux5.19/files/i386-dotconfig index ec2237611f6b..82e1c846ba3a 100644 --- a/srcpkgs/linux5.19/files/i386-dotconfig +++ b/srcpkgs/linux5.19/files/i386-dotconfig @@ -6689,7 +6689,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/srcpkgs/linux5.19/files/ppc-dotconfig b/srcpkgs/linux5.19/files/ppc-dotconfig index 79688f516e8b..36053b946287 100644 --- a/srcpkgs/linux5.19/files/ppc-dotconfig +++ b/srcpkgs/linux5.19/files/ppc-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.19.0 Kernel Configuration +# Linux/powerpc 5.19.4 Kernel Configuration # CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -261,10 +261,13 @@ CONFIG_PPC_BOOK3S_32=y # CONFIG_44x is not set CONFIG_PPC_BOOK3S_603=y CONFIG_PPC_BOOK3S_604=y -CONFIG_GENERIC_CPU=y +CONFIG_POWERPC_CPU=y # CONFIG_E300C2_CPU is not set # CONFIG_E300C3_CPU is not set # CONFIG_G4_CPU is not set +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set +CONFIG_TARGET_CPU_BOOL=y +CONFIG_TARGET_CPU="powerpc" CONFIG_PPC_BOOK3S=y CONFIG_PPC_FPU_REGS=y CONFIG_PPC_FPU=y @@ -5570,7 +5573,6 @@ CONFIG_DRM_PANEL_BRIDGE=y # CONFIG_DRM_CHIPONE_ICN6211 is not set # CONFIG_DRM_CHRONTEL_CH7033 is not set CONFIG_DRM_DISPLAY_CONNECTOR=m -# CONFIG_DRM_FSL_LDB is not set # CONFIG_DRM_ITE_IT6505 is not set # CONFIG_DRM_LONTIUM_LT8912B is not set CONFIG_DRM_LONTIUM_LT9211=m @@ -5922,7 +5924,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m @@ -6707,11 +6709,11 @@ CONFIG_UIO_NETX=m CONFIG_UIO_MF624=m # CONFIG_VFIO is not set CONFIG_VIRT_DRIVERS=y +CONFIG_VIRTIO_ANCHOR=y CONFIG_VIRTIO=m CONFIG_VIRTIO_PCI_LIB=m CONFIG_VIRTIO_PCI_LIB_LEGACY=m CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_BALLOON=m @@ -8089,7 +8091,6 @@ CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO_BLAKE2B=m -CONFIG_CRYPTO_BLAKE2S=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRC64_ROCKSOFT=m CONFIG_CRYPTO_GHASH=m diff --git a/srcpkgs/linux5.19/files/ppc64-dotconfig b/srcpkgs/linux5.19/files/ppc64-dotconfig index dd7a57647ff2..650f7f6848ad 100644 --- a/srcpkgs/linux5.19/files/ppc64-dotconfig +++ b/srcpkgs/linux5.19/files/ppc64-dotconfig @@ -6918,7 +6918,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/srcpkgs/linux5.19/files/ppc64le-dotconfig b/srcpkgs/linux5.19/files/ppc64le-dotconfig index e87efd5224a9..49d4d11350e1 100644 --- a/srcpkgs/linux5.19/files/ppc64le-dotconfig +++ b/srcpkgs/linux5.19/files/ppc64le-dotconfig @@ -6676,7 +6676,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/srcpkgs/linux5.19/files/x86_64-dotconfig b/srcpkgs/linux5.19/files/x86_64-dotconfig index 1aee64978b86..3c6c45056643 100644 --- a/srcpkgs/linux5.19/files/x86_64-dotconfig +++ b/srcpkgs/linux5.19/files/x86_64-dotconfig @@ -6773,7 +6773,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/srcpkgs/linux5.19/template b/srcpkgs/linux5.19/template index 53fc6f84f33c..4eb2f4e2a886 100644 --- a/srcpkgs/linux5.19/template +++ b/srcpkgs/linux5.19/template @@ -1,6 +1,6 @@ # Template file for 'linux5.19' pkgname=linux5.19 -version=5.19.2 +version=5.19.4 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="ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8 - f21999b35f7e2a4ce1e8dd86c3a21d1199532b7aa48526c5599b8c6e7a14aa47" + 953fc93b8abfc5e167d61df58dce7cd76571286a4d5006dbf20bf59e51b399e8" skip_extraction="patch-${version}.xz" python_version=3 From ff05fb6385d01f0a4263abf1b8b77f46d0483403 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, 21 Aug 2022 19:12:09 +0700 Subject: [PATCH 0488/1407] linux5.15: enable CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM --- srcpkgs/linux5.15/files/arm64-dotconfig | 2 +- srcpkgs/linux5.15/files/i386-dotconfig | 2 +- srcpkgs/linux5.15/files/ppc-dotconfig | 2 +- srcpkgs/linux5.15/files/ppc64-dotconfig | 2 +- srcpkgs/linux5.15/files/ppc64le-dotconfig | 2 +- srcpkgs/linux5.15/files/x86_64-dotconfig | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig index e8fa12067f73..f0f723ce9867 100644 --- a/srcpkgs/linux5.15/files/arm64-dotconfig +++ b/srcpkgs/linux5.15/files/arm64-dotconfig @@ -7438,7 +7438,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig index 3242a4da49ee..c74917751f70 100644 --- a/srcpkgs/linux5.15/files/i386-dotconfig +++ b/srcpkgs/linux5.15/files/i386-dotconfig @@ -6454,7 +6454,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/srcpkgs/linux5.15/files/ppc-dotconfig b/srcpkgs/linux5.15/files/ppc-dotconfig index ad1e046893d2..8a14f83906fc 100644 --- a/srcpkgs/linux5.15/files/ppc-dotconfig +++ b/srcpkgs/linux5.15/files/ppc-dotconfig @@ -5670,7 +5670,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/srcpkgs/linux5.15/files/ppc64-dotconfig b/srcpkgs/linux5.15/files/ppc64-dotconfig index 6e196ad358c3..7291dd631945 100644 --- a/srcpkgs/linux5.15/files/ppc64-dotconfig +++ b/srcpkgs/linux5.15/files/ppc64-dotconfig @@ -6684,7 +6684,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/srcpkgs/linux5.15/files/ppc64le-dotconfig b/srcpkgs/linux5.15/files/ppc64le-dotconfig index fb902ca0b43e..5c8c5e8f82a3 100644 --- a/srcpkgs/linux5.15/files/ppc64le-dotconfig +++ b/srcpkgs/linux5.15/files/ppc64le-dotconfig @@ -6443,7 +6443,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig index 59dc0529e8fb..4bfd6b11e330 100644 --- a/srcpkgs/linux5.15/files/x86_64-dotconfig +++ b/srcpkgs/linux5.15/files/x86_64-dotconfig @@ -6518,7 +6518,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m From b1cb92e399450ba6bb15348f8f28a11fc31cf205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 24 Aug 2022 15:53:42 +0700 Subject: [PATCH 0489/1407] coccinelle: update to 1.1.1. --- srcpkgs/coccinelle/template | 14 +++++++------- srcpkgs/coccinelle/update | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template index 709b45fd2f69..20faebd1e0a4 100644 --- a/srcpkgs/coccinelle/template +++ b/srcpkgs/coccinelle/template @@ -1,19 +1,19 @@ # Template file for 'coccinelle' pkgname=coccinelle -version=1.1.0 -revision=4 +version=1.1.1 +revision=1 build_style=gnu-configure configure_args="--without-pdflatex --enable-release --enable-opt --with-python=/usr/bin/python3" -hostmakedepends="python3 automake libtool" +hostmakedepends="python3 automake libtool ocaml" makedepends="ocaml ocaml-findlib ocaml-num ocaml-stdcompat pcre-devel python3-devel" short_desc="Program matching and transformation engine" -maintainer="Orphaned " +maintainer="Đoàn Trần Công Danh " license="GPL-2.0-only" -homepage="http://coccinelle.lip6.fr/" -distfiles="https://github.com/coccinelle/coccinelle/archive/${version}.tar.gz" -checksum=e40bdd51eda84f9bf3154c592ebb4af73a4dd9656c03e7ca1d3aa0247d98d185 +homepage="https://coccinelle.gitlabpages.inria.fr/website/" +distfiles="https://github.com/coccinelle/coccinelle/archive/refs/tags/$version.tar.gz" +checksum=095919e129ac563586d880ebbc5aac829fec224177090aebe34dc34ed5f142bf disable_parallel_build=yes nocross=yes diff --git a/srcpkgs/coccinelle/update b/srcpkgs/coccinelle/update index 6840a68d8876..7cdcc40b8847 100644 --- a/srcpkgs/coccinelle/update +++ b/srcpkgs/coccinelle/update @@ -1 +1 @@ -site="http://coccinelle.lip6.fr/download.php" +site='https://coccinelle.gitlabpages.inria.fr/website/download.html' From c48a6a3185fd56123269a93ebf825b553796a8c2 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, 25 Aug 2022 09:25:11 +0700 Subject: [PATCH 0490/1407] ccache: update to 4.6.2. --- srcpkgs/ccache/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template index 777edbc7eeb5..faf7233fe350 100644 --- a/srcpkgs/ccache/template +++ b/srcpkgs/ccache/template @@ -1,7 +1,7 @@ # Template file for 'ccache' pkgname=ccache -version=4.5.1 -revision=2 +version=4.6.2 +revision=1 build_style=cmake configure_args="-DENABLE_TESTING=OFF -DREDIS_STORAGE_BACKEND=OFF" hostmakedepends="perl" @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="https://ccache.samba.org/" changelog="https://ccache.dev/releasenotes.html" distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz" -checksum=51186ebe0326365f4e6131e1caa8911de7da4aa6718efc00680322d63a759517 +checksum=789a2435d7fde2eaef5ec7b3ecf2366e546f764253e9999fdf008d2dd7f3b10c if [ -n "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DENABLE_TESTING=ON" From 769899aa11b5b93f1741eb1c7f2f66dba22a3727 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, 11 Aug 2022 16:29:42 +0700 Subject: [PATCH 0491/1407] tzutils: enable parallel build --- srcpkgs/tzutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template index 966260e2ebf3..761361aca73c 100644 --- a/srcpkgs/tzutils/template +++ b/srcpkgs/tzutils/template @@ -23,13 +23,13 @@ fi do_build() { touch version - make KSHELL=/bin/sh \ + make ${makejobs} KSHELL=/bin/sh \ CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" sed -n '/Copyright/,/SUCH DAMAGE/p' strftime.c >strftime.license } do_check() { - make check + make ${makejobs} check } do_install() { From 66e7136e2eebc55f8d9e3123f805e679332ee614 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 25 Aug 2022 20:26:00 -0500 Subject: [PATCH 0492/1407] rr: update to 5.6.0. --- srcpkgs/rr/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rr/template b/srcpkgs/rr/template index 0dd304535b15..99b2df77fa8b 100644 --- a/srcpkgs/rr/template +++ b/srcpkgs/rr/template @@ -1,7 +1,7 @@ # Template file for 'rr' pkgname=rr -version=5.4.0 -revision=2 +version=5.6.0 +revision=1 archs="i686 x86_64" build_style=cmake configure_args="-DBUILD_TESTS=OFF -DCMAKE_CXX_STANDARD=14" @@ -12,7 +12,7 @@ maintainer="Spencer Hill " license="MIT, BSD-2-Clause" homepage="http://rr-project.org/" distfiles="https://github.com/mozilla/${pkgname}/archive/${version}.tar.gz" -checksum=ba3f604b76a1e917055efeac60c51148bcb578e64a55ceddad8b1a6f2740717e +checksum=a75262ae622c2c91d3391401d3da4e1dc9379b5afea5c40c9ea93f6905706c87 nopie=yes case "$XBPS_MACHINE" in From 144128b54d0c4c31dc3cf338aabf691d33216df1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 26 Aug 2022 16:02:02 +0200 Subject: [PATCH 0493/1407] grafana: remove -w from go_ldflags unnecessary and this results in an error since fc49c6e396ee09440b72023b05696746d4886813 --- srcpkgs/grafana/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template index 935b52c3aaa7..09786730cb07 100644 --- a/srcpkgs/grafana/template +++ b/srcpkgs/grafana/template @@ -21,7 +21,7 @@ make_dirs="/var/log/grafana 0755 _grafana _grafana" conf_files="/etc/grafana/grafana.ini" -go_ldflags="-w -X main.version=${version}" +go_ldflags="-X main.version=${version}" post_extract() { # remove prebuilt binaries From 4652cef3e6b4ef3d729c9f426176c068080d3d82 Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 26 Aug 2022 13:59:31 +0000 Subject: [PATCH 0494/1407] rocksdb: fix on ppc64le-musl, broken on big endian --- srcpkgs/rocksdb/patches/toku_time.patch | 21 +++++++++++++++------ srcpkgs/rocksdb/template | 4 ++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/srcpkgs/rocksdb/patches/toku_time.patch b/srcpkgs/rocksdb/patches/toku_time.patch index 9ffe1390ed1d..59f0a5c84fd8 100644 --- a/srcpkgs/rocksdb/patches/toku_time.patch +++ b/srcpkgs/rocksdb/patches/toku_time.patch @@ -1,10 +1,16 @@ -From: https://github.com/facebook/rocksdb/issues/8609 - -diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h -index 225e3fa72..cd5f935f1 100644 --- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h -@@ -131,6 +131,10 @@ static inline tokutime_t toku_time_now(void) { +@@ -58,9 +58,6 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved. + #include + #include + #include +-#if defined(__powerpc__) +-#include +-#endif + + #if 0 + static inline float toku_tdiff (struct timeval *a, struct timeval *b) { +@@ -131,8 +128,12 @@ static inline tokutime_t toku_time_now(void) { uint64_t result; __asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result)); return result; @@ -13,5 +19,8 @@ index 225e3fa72..cd5f935f1 100644 + __asm __volatile__("mrrc p15, 1, %[lo], %[hi], c14" : [ lo ] "=r" (lo), [hi] "=r" (hi)); + return (uint64_t)hi << 32 | lo; #elif defined(__powerpc__) - return __ppc_get_timebase(); +- return __ppc_get_timebase(); ++ return __builtin_ppc_get_timebase(); #elif defined(__s390x__) + uint64_t result; + asm volatile("stckf %0" : "=Q"(result) : : "cc"); diff --git a/srcpkgs/rocksdb/template b/srcpkgs/rocksdb/template index e2ef6f916c06..54921221469c 100644 --- a/srcpkgs/rocksdb/template +++ b/srcpkgs/rocksdb/template @@ -17,6 +17,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi +if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then + broken="assembler errors" +fi + post_install() { vcopy "include/rocksdb/*" usr/include/rocksdb vlicense LICENSE.leveldb From 39fddf8217e8ecf28fa531ef9b28069b2fb9a65e Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 26 Aug 2022 14:22:43 +0000 Subject: [PATCH 0495/1407] godot: fix ppc64le build --- srcpkgs/godot/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index b1d393b582ac..67f591a4924b 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -49,7 +49,6 @@ do_install() { case "$XBPS_TARGET_MACHINE" in x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;; - ppc64le*) vbin bin/godot.x11.opt.tools.ppc64le godot;; ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;; *) vbin bin/godot.x11.opt.tools.32 godot;; esac From 636ea3134a7e36024b1bf2be889af1cf408af84a Mon Sep 17 00:00:00 2001 From: mobinmob Date: Thu, 25 Aug 2022 16:43:23 +0300 Subject: [PATCH 0496/1407] yaru: update to 22.10.1. --- srcpkgs/yaru/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yaru/template b/srcpkgs/yaru/template index 94264394ad6d..f147179c5c2b 100644 --- a/srcpkgs/yaru/template +++ b/srcpkgs/yaru/template @@ -1,6 +1,6 @@ # Template file for 'yaru' pkgname=yaru -version=22.04.4 +version=22.10.1 revision=1 build_style=meson configure_args="-Dxfwm4=true" @@ -10,5 +10,6 @@ short_desc="Default Ubuntu 18.10+ theme" maintainer="mobinmob " license="GPL-3.0-or-later, CC-BY-SA-4.0" homepage="https://github.com/ubuntu/yaru" +changelog="https://raw.githubusercontent.com/ubuntu/yaru/master/debian/changelog" distfiles="https://github.com/ubuntu/yaru/archive/$version.tar.gz" -checksum=e8b85d3b1965b4611b4280b4d53b8deafdac754f795a8aad43c22ddb3308025e +checksum=59f76a9118189dfd4d04fb002762713937ff8248f92d8238ed32b0f6b1d3bcc7 From 40e9ce4eab0ed453d7c74576b7a9d5f32c786c60 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, 26 Aug 2022 22:37:23 +0700 Subject: [PATCH 0497/1407] GraphicsMagick: fix patch's whitespace --- .../patches/disable_perlmagick_tests.patch | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch b/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch index 14690333634c..6081690edabd 100644 --- a/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch +++ b/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch @@ -1,19 +1,18 @@ # workaround for https://sourceforge.net/p/graphicsmagick/bugs/580/ ---- a/Makefile.am.orig 2021-02-14 00:46:02.239418403 -0800 -+++ b/Makefile.am 2021-02-14 00:46:48.431547444 -0800 -@@ -79,7 +79,6 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -79,7 +79,6 @@ TESTS_ENVIRONMENT = \ # Tests to run TESTS = \ -- $(PERLMAGICK_TESTS) \ - $(TESTS_TESTS) \ - $(MAGICKPP_TESTS) \ - $(WAND_TESTS) \ - ---- a/Makefile.in.orig 2021-02-14 00:49:51.414058625 -0800 -+++ b/Makefile.in 2021-02-14 00:50:19.996138472 -0800 -@@ -4767,7 +4767,7 @@ +- $(PERLMAGICK_TESTS) \ + $(TESTS_TESTS) \ + $(MAGICKPP_TESTS) \ + $(WAND_TESTS) \ +--- a/Makefile.in ++++ b/Makefile.in +@@ -4767,7 +4767,7 @@ PERLMAGICK_MAINTAINER_TARGETS = $(top_sr @WITH_PERL_TRUE@PERLMAGICK_DISTCLEAN_LOCAL_TARGETS = clean-perl @WITH_PERL_TRUE@PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS = distclean-local #PERLMAGICK_CHECK_LOCAL_TARGETS = check-perl From 76bff21e3e5af8327a2d7e67563975f00975150a 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, 26 Aug 2022 22:40:51 +0700 Subject: [PATCH 0498/1407] ck: fix patch's whitespace --- srcpkgs/ck/patches/ppc32.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/ck/patches/ppc32.patch b/srcpkgs/ck/patches/ppc32.patch index f791f94cbf55..f919f8c49e1a 100644 --- a/srcpkgs/ck/patches/ppc32.patch +++ b/srcpkgs/ck/patches/ppc32.patch @@ -6,8 +6,8 @@ Support Linux uname-style platform identifier for ppc32. fi case $PLATFORM in -- "macppc"|"Power Macintosh"|"powerpc"|"powerpcspe") +- "macppc"|"Power Macintosh"|"powerpc"|"powerpcspe") + "macppc"|"Power Macintosh"|"powerpc"|"powerpcspe"|"ppc") - RTM_ENABLE="CK_MD_RTM_DISABLE" - LSE_ENABLE="CK_MD_LSE_DISABLE" - MM="${MM:-"CK_MD_RMO"}" + RTM_ENABLE="CK_MD_RTM_DISABLE" + LSE_ENABLE="CK_MD_LSE_DISABLE" + MM="${MM:-"CK_MD_RMO"}" From f77eed79b8ecccfc886a5a5116cb5d48bc8933f2 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, 26 Aug 2022 22:44:06 +0700 Subject: [PATCH 0499/1407] dmg2img: fix patch's whitespace --- .../0001-openssl-1.1-compatibility.patch | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch index b5ed45d2ff30..28a64e979d8e 100644 --- a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch +++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch @@ -15,22 +15,20 @@ Fixes https://github.com/Lekensteyn/dmg2img/issues/4 vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 80 insertions(+), 23 deletions(-) -diff --git a/vfdecrypt.c b/vfdecrypt.c -index 56d3530..b1a36d3 100644 --- a/vfdecrypt.c +++ b/vfdecrypt.c -@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) { +@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypt pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size); } - + -HMAC_CTX hmacsha1_ctx; +HMAC_CTX *hmacsha1_ctx; AES_KEY aes_decrypt_key; int CHUNK_SIZE=4096; // default - -@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) { + +@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8 unsigned int mdLen; - + chunk_no = OSSwapHostToBigInt32(chunk_no); - HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL); - HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t)); @@ -40,9 +38,9 @@ index 56d3530..b1a36d3 100644 + HMAC_Final(hmacsha1_ctx, mdResult, &mdLen); memcpy(iv, mdResult, CIPHER_BLOCKSIZE); } - -@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) { - /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6 + +@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8 + /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6 * wrapped_key has to be 40 bytes in length. */ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) { - EVP_CIPHER_CTX ctx; @@ -50,7 +48,7 @@ index 56d3530..b1a36d3 100644 uint8_t *TEMP1, *TEMP2, *CEKICV; uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 }; int outlen, tmplen, i; - + - EVP_CIPHER_CTX_init(&ctx); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + ctx = EVP_CIPHER_CTX_new(); @@ -70,7 +68,7 @@ index 56d3530..b1a36d3 100644 /* uses PKCS#7 padding for symmetric key operations by default */ - EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV); + EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV); - + - if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) { + if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) { fprintf(stderr, "internal error (1) during key unwrap operation!\n"); @@ -88,10 +86,10 @@ index 56d3530..b1a36d3 100644 +#else + EVP_CIPHER_CTX_cleanup(ctx); +#endif - + /* reverse order of TEMP3 */ for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1]; - + - EVP_CIPHER_CTX_init(&ctx); + EVP_CIPHER_CTX_init(ctx); /* uses PKCS#7 padding for symmetric key operations by default */ @@ -107,7 +105,7 @@ index 56d3530..b1a36d3 100644 fprintf(stderr, "internal error (4) during key unwrap operation!\n"); return(-1); } - + outlen += tmplen; - EVP_CIPHER_CTX_cleanup(&ctx); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L @@ -115,7 +113,7 @@ index 56d3530..b1a36d3 100644 +#else + EVP_CIPHER_CTX_cleanup(ctx); +#endif - + memcpy(unwrapped_key, CEKICV+4, outlen-4); free(TEMP1); free(TEMP2); @@ -127,8 +125,8 @@ index 56d3530..b1a36d3 100644 +#endif return(0); } - -@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae + +@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, c int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) { /* derived key is a 3DES-EDE key */ uint8_t derived_key[192/8]; @@ -136,7 +134,7 @@ index 56d3530..b1a36d3 100644 + EVP_CIPHER_CTX *ctx; uint8_t *TEMP1; int outlen, tmplen; - + +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + ctx = EVP_CIPHER_CTX_new(); +#else @@ -149,9 +147,9 @@ index 56d3530..b1a36d3 100644 + PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20, PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key); - + print_hex(derived_key, 192/8); - + - EVP_CIPHER_CTX_init(&ctx); + EVP_CIPHER_CTX_init(ctx); /* result of the decryption operation shouldn't be bigger than ciphertext */ @@ -159,7 +157,7 @@ index 56d3530..b1a36d3 100644 /* uses PKCS#7 padding for symmetric key operations by default */ - EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv); + EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv); - + - if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) { + if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) { fprintf(stderr, "internal error (1) during key unwrap operation!\n"); @@ -180,11 +178,11 @@ index 56d3530..b1a36d3 100644 +#endif memcpy(aes_key, TEMP1, 16); memcpy(hmacsha1_key, TEMP1, 20); - + @@ -446,8 +484,21 @@ int main(int argc, char *argv[]) { CHUNK_SIZE = v2header.blocksize; } - + - HMAC_CTX_init(&hmacsha1_ctx); - HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L @@ -203,11 +201,11 @@ index 56d3530..b1a36d3 100644 +#endif + HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL); AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key); - + if (verbose >= 1) { @@ -472,5 +523,11 @@ int main(int argc, char *argv[]) { } - + if (verbose) fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + HMAC_CTX_free(hmacsha1_ctx); From aa389a4791c05b3112e142acfcbba1d5940cf5ac 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, 26 Aug 2022 22:54:21 +0700 Subject: [PATCH 0500/1407] freeipmi: fix patch's whitespace --- .../fix-build-with-C99-compilers.patch | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/srcpkgs/freeipmi/patches/fix-build-with-C99-compilers.patch b/srcpkgs/freeipmi/patches/fix-build-with-C99-compilers.patch index 7581c229f48c..f198859dca43 100644 --- a/srcpkgs/freeipmi/patches/fix-build-with-C99-compilers.patch +++ b/srcpkgs/freeipmi/patches/fix-build-with-C99-compilers.patch @@ -4,9 +4,9 @@ Source: http://lists.busybox.net/pipermail/buildroot/2016-September/172879.html changes into account and allows to build the bundled argp and therefore [freeipmi] with non-C89-compilers." ---- a/common/portability/freeipmi-argp-fmtstream.c 2017-08-16 20:28:19.000000000 +0200 -+++ b/common/portability/freeipmi-argp-fmtstream.c 2017-10-19 15:53:41.419508328 +0200 -@@ -389,6 +389,7 @@ +--- a/common/portability/freeipmi-argp-fmtstream.c ++++ b/common/portability/freeipmi-argp-fmtstream.c +@@ -389,6 +389,7 @@ __argp_fmtstream_printf (struct argp_fmt weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf) #endif @@ -14,40 +14,40 @@ changes into account and allows to build the bundled argp and therefore /* Duplicate the inline definitions in argp-fmtstream.h, for compilers * that don't do inlining. */ size_t -@@ -471,5 +472,6 @@ +@@ -471,5 +472,6 @@ __argp_fmtstream_point (argp_fmtstream_t __argp_fmtstream_update (__fs); return __fs->point_col >= 0 ? __fs->point_col : 0; } +#endif /* __STDC_VERSION__ - 199900L < 1 */ #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */ ---- a/common/portability/freeipmi-argp-fmtstream.h 2017-08-16 20:28:19.000000000 +0200 -+++ b/common/portability/freeipmi-argp-fmtstream.h 2017-10-19 15:58:36.245170810 +0200 -@@ -145,6 +145,7 @@ - __const char *__fmt, ...) +--- a/common/portability/freeipmi-argp-fmtstream.h ++++ b/common/portability/freeipmi-argp-fmtstream.h +@@ -145,6 +145,7 @@ extern ssize_t argp_fmtstream_printf (ar + __const char *__fmt, ...) PRINTF_STYLE(2,3); +#if __STDC_VERSION__ - 199900L < 1 extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); -@@ -155,6 +156,7 @@ - __const char *__str, size_t __len); +@@ -155,6 +156,7 @@ extern size_t __argp_fmtstream_write (ar + __const char *__str, size_t __len); extern size_t argp_fmtstream_write (argp_fmtstream_t __fs, - __const char *__str, size_t __len); + __const char *__str, size_t __len); +#endif /* __STDC_VERSION__ - 199900L < 1 */ /* Access macros for various bits of state. */ #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin) -@@ -164,6 +166,7 @@ +@@ -164,6 +166,7 @@ extern size_t argp_fmtstream_write (argp #define __argp_fmtstream_rmargin argp_fmtstream_rmargin #define __argp_fmtstream_wmargin argp_fmtstream_wmargin +#if __STDC_VERSION__ - 199900L < 1 /* Set __FS's left margin to LMARGIN and return the old value. */ extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, - size_t __lmargin); -@@ -185,6 +188,7 @@ + size_t __lmargin); +@@ -185,6 +188,7 @@ extern size_t __argp_fmtstream_set_wmarg /* Return the column number of the current output point in __FS. */ extern size_t argp_fmtstream_point (argp_fmtstream_t __fs); extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs); @@ -55,7 +55,7 @@ changes into account and allows to build the bundled argp and therefore /* Internal routines. */ extern void _argp_fmtstream_update (argp_fmtstream_t __fs); -@@ -208,7 +212,11 @@ +@@ -208,7 +212,11 @@ extern int __argp_fmtstream_ensure (argp #endif #ifndef ARGP_FS_EI From f89339517099d7acb1675cd2f4d3d617a9e0f503 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, 26 Aug 2022 22:56:17 +0700 Subject: [PATCH 0501/1407] jfsutils: fix patch's whitespace --- .../jfsutils/patches/flush-before-read-musl.patch | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/srcpkgs/jfsutils/patches/flush-before-read-musl.patch b/srcpkgs/jfsutils/patches/flush-before-read-musl.patch index 134bfea4ccc2..62fe5a8088af 100644 --- a/srcpkgs/jfsutils/patches/flush-before-read-musl.patch +++ b/srcpkgs/jfsutils/patches/flush-before-read-musl.patch @@ -1,12 +1,10 @@ -diff --git mkfs/mkfs.c mkfs/mkfs.c -index 3a1d628..bf0caff 100644 --- a/mkfs/mkfs.c +++ b/mkfs/mkfs.c @@ -924,6 +924,7 @@ int main(int argc, char *argv[]) - } - do { - printf("\nContinue? (Y/N) "); + } + do { + printf("\nContinue? (Y/N) "); + fflush(stdout); - c = getchar(); + c = getchar(); - if (c == 'n' || c == 'N') { + if (c == 'n' || c == 'N') { From 828b75714ba48d656980c21a3b7ffe3f59f59ece 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, 26 Aug 2022 22:59:00 +0700 Subject: [PATCH 0502/1407] libtar: fix patch's whitespace --- srcpkgs/libtar/patches/CVE-2013-4420.patch | 72 +++++++++++----------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/srcpkgs/libtar/patches/CVE-2013-4420.patch b/srcpkgs/libtar/patches/CVE-2013-4420.patch index 249d8415d071..ff3544bbf79a 100644 --- a/srcpkgs/libtar/patches/CVE-2013-4420.patch +++ b/srcpkgs/libtar/patches/CVE-2013-4420.patch @@ -44,52 +44,52 @@ Forwarded: yes char * th_get_pathname(TAR *t) { - if (t->th_buf.gnu_longname) -- return t->th_buf.gnu_longname; + if (t->th_buf.gnu_longname) +- return t->th_buf.gnu_longname; + return safer_name_suffix(t->th_buf.gnu_longname); - /* allocate the th_pathname buffer if not already */ - if (t->th_pathname == NULL) -@@ -51,7 +80,7 @@ th_get_pathname(TAR *t) - } + /* allocate the th_pathname buffer if not already */ + if (t->th_pathname == NULL) +@@ -50,7 +79,7 @@ th_get_pathname(TAR *t) + } - /* will be deallocated in tar_close() */ -- return t->th_pathname; + /* will be deallocated in tar_close() */ +- return t->th_pathname; + return safer_name_suffix(t->th_pathname); } --- a/lib/extract.c +++ b/lib/extract.c -@@ -298,14 +298,14 @@ tar_extract_hardlink(TAR * t, char *real - if (mkdirhier(dirname(filename)) == -1) - return -1; - libtar_hashptr_reset(&hp); -- if (libtar_hash_getkey(t->h, &hp, th_get_linkname(t), +@@ -302,14 +302,14 @@ tar_extract_hardlink(TAR * t, char *real + if (mkdirhier(dirname(filename)) == -1) + return -1; + libtar_hashptr_reset(&hp); +- if (libtar_hash_getkey(t->h, &hp, th_get_linkname(t), + if (libtar_hash_getkey(t->h, &hp, safer_name_suffix(th_get_linkname(t)), - (libtar_matchfunc_t)libtar_str_match) != 0) - { - lnp = (char *)libtar_hashptr_data(&hp); - linktgt = &lnp[strlen(lnp) + 1]; - } - else -- linktgt = th_get_linkname(t); + (libtar_matchfunc_t)libtar_str_match) != 0) + { + lnp = (char *)libtar_hashptr_data(&hp); + linktgt = &lnp[strlen(lnp) + 1]; + } + else +- linktgt = th_get_linkname(t); + linktgt = safer_name_suffix(th_get_linkname(t)); #ifdef DEBUG - printf(" ==> extracting: %s (link to %s)\n", filename, linktgt); -@@ -343,9 +343,9 @@ tar_extract_symlink(TAR *t, char *realna + printf(" ==> extracting: %s (link to %s)\n", filename, linktgt); +@@ -347,9 +347,9 @@ tar_extract_symlink(TAR *t, char *realna #ifdef DEBUG - printf(" ==> extracting: %s (symlink to %s)\n", -- filename, th_get_linkname(t)); + printf(" ==> extracting: %s (symlink to %s)\n", +- filename, th_get_linkname(t)); + filename, safer_name_suffix(th_get_linkname(t))); #endif -- if (symlink(th_get_linkname(t), filename) == -1) +- if (symlink(th_get_linkname(t), filename) == -1) + if (symlink(safer_name_suffix(th_get_linkname(t)), filename) == -1) - { + { #ifdef DEBUG - perror("symlink()"); + perror("symlink()"); --- a/lib/internal.h +++ b/lib/internal.h @@ -21,3 +21,4 @@ @@ -99,15 +99,15 @@ Forwarded: yes +char* safer_name_suffix(char const*); --- a/lib/output.c +++ b/lib/output.c -@@ -123,9 +123,9 @@ th_print_long_ls(TAR *t) - else - printf(" link to "); - if ((t->options & TAR_GNU) && t->th_buf.gnu_longlink != NULL) -- printf("%s", t->th_buf.gnu_longlink); +@@ -124,9 +124,9 @@ th_print_long_ls(TAR *t) + else + printf(" link to "); + if ((t->options & TAR_GNU) && t->th_buf.gnu_longlink != NULL) +- printf("%s", t->th_buf.gnu_longlink); + printf("%s", safer_name_suffix(t->th_buf.gnu_longlink)); - else -- printf("%.100s", t->th_buf.linkname); + else +- printf("%.100s", t->th_buf.linkname); + printf("%.100s", safer_name_suffix(t->th_buf.linkname)); - } + } - putchar('\n'); + putchar('\n'); From 209e938e229eaa97da1e7206b8daed6dbdf39b8d 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, 26 Aug 2022 23:02:25 +0700 Subject: [PATCH 0503/1407] moc: fix patch's whitespace --- srcpkgs/moc/patches/ffmpeg4.patch | 51 +++++++++++++++---------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/srcpkgs/moc/patches/ffmpeg4.patch b/srcpkgs/moc/patches/ffmpeg4.patch index 9beff381983f..5353c148ab80 100644 --- a/srcpkgs/moc/patches/ffmpeg4.patch +++ b/srcpkgs/moc/patches/ffmpeg4.patch @@ -1,32 +1,31 @@ ---- a/decoder_plugins/ffmpeg/ffmpeg.c.orig 2018-05-11 12:48:29.897671514 +0200 -+++ b/decoder_plugins/ffmpeg/ffmpeg.c 2018-05-11 12:50:09.133692416 +0200 -@@ -984,7 +984,7 @@ - * FFmpeg/LibAV in use. For some versions this will be caught in - * *_find_stream_info() above and misreported as an unfound codec - * parameters error. */ -- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) { +--- a/decoder_plugins/ffmpeg/ffmpeg.c ++++ b/decoder_plugins/ffmpeg/ffmpeg.c +@@ -984,7 +984,7 @@ static void *ffmpeg_open (const char *fi + * FFmpeg/LibAV in use. For some versions this will be caught in + * *_find_stream_info() above and misreported as an unfound codec + * parameters error. */ +- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) { + if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { - decoder_error (&data->error, ERROR_FATAL, 0, - "The codec is experimental and may damage MOC: %s", - data->codec->name); -@@ -993,8 +993,8 @@ + decoder_error (&data->error, ERROR_FATAL, 0, + "The codec is experimental and may damage MOC: %s", + data->codec->name); +@@ -993,8 +993,8 @@ static void *ffmpeg_open (const char *fi #endif - - set_downmixing (data); -- if (data->codec->capabilities & CODEC_CAP_TRUNCATED) -- data->enc->flags |= CODEC_FLAG_TRUNCATED; + + set_downmixing (data); +- if (data->codec->capabilities & CODEC_CAP_TRUNCATED) +- data->enc->flags |= CODEC_FLAG_TRUNCATED; + if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED) + data->enc->flags |= AV_CODEC_FLAG_TRUNCATED; - + #ifdef HAVE_AVCODEC_OPEN2 - if (avcodec_open2 (data->enc, data->codec, NULL) < 0) -@@ -1025,7 +1025,7 @@ - - data->sample_width = sfmt_Bps (data->fmt); - -- if (data->codec->capabilities & CODEC_CAP_DELAY) + if (avcodec_open2 (data->enc, data->codec, NULL) < 0) +@@ -1025,7 +1025,7 @@ static void *ffmpeg_open (const char *fi + + data->sample_width = sfmt_Bps (data->fmt); + +- if (data->codec->capabilities & CODEC_CAP_DELAY) + if (data->codec->capabilities & AV_CODEC_CAP_DELAY) - data->delay = true; - data->seek_broken = is_seek_broken (data); - data->timing_broken = is_timing_broken (data->ic); - + data->delay = true; + data->seek_broken = is_seek_broken (data); + data->timing_broken = is_timing_broken (data->ic); From c34d336201a41b7c8acf48da6644191c56bb035f 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, 26 Aug 2022 23:06:25 +0700 Subject: [PATCH 0504/1407] pdfgrep: fix patch's whitespace --- srcpkgs/pdfgrep/patches/fix-musl.patch | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/srcpkgs/pdfgrep/patches/fix-musl.patch b/srcpkgs/pdfgrep/patches/fix-musl.patch index a31ce1261389..a68d062f7fe5 100644 --- a/srcpkgs/pdfgrep/patches/fix-musl.patch +++ b/srcpkgs/pdfgrep/patches/fix-musl.patch @@ -1,14 +1,12 @@ -diff --git a/src/pdfgrep.cc b/src/pdfgrep.cc -index 7f8bdf8..5283e16 100644 --- a/src/pdfgrep.cc +++ b/src/pdfgrep.cc @@ -460,7 +460,9 @@ int main(int argc, char** argv) - // Set locale to user-preference. If this locale is an UTF-8 locale, the - // regex-functions regcomp/regexec become unicode aware, which means - // e.g. that '.' will match a unicode character, not a single byte. + // Set locale to user-preference. If this locale is an UTF-8 locale, the + // regex-functions regcomp/regexec become unicode aware, which means + // e.g. that '.' will match a unicode character, not a single byte. +#ifdef __GLIBC__ - locale::global(locale("")); + locale::global(locale("")); +#endif - enum re_engine_type { - RE_POSIX = 0, + enum re_engine_type { + RE_POSIX = 0, From 49df73c524f7e841cf0489149ba9f977f4f470c1 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, 26 Aug 2022 23:19:31 +0700 Subject: [PATCH 0505/1407] xzoom: fix patch's whitespace --- srcpkgs/xzoom/patches/xzoom_0.3-23.patch | 221 +++++++++++------------ 1 file changed, 110 insertions(+), 111 deletions(-) diff --git a/srcpkgs/xzoom/patches/xzoom_0.3-23.patch b/srcpkgs/xzoom/patches/xzoom_0.3-23.patch index 90b6c162ac8e..f5ffd1f33207 100644 --- a/srcpkgs/xzoom/patches/xzoom_0.3-23.patch +++ b/srcpkgs/xzoom/patches/xzoom_0.3-23.patch @@ -1,21 +1,21 @@ --- xzoom-0.3.orig/Imakefile +++ xzoom-0.3/Imakefile -@@ -15,11 +15,11 @@ - +@@ -15,11 +15,11 @@ XCOMM DEFINES = -DFRAME -DXSHM -DTIMER - + DEFINES = -DFRAME -DXSHM - + -LOCAL_LIBRARIES = -lXext -lX11 +LOCAL_LIBRARIES = -lXext -lX11 -lXt - + NAME = xzoom - + -BINDIR = /usr/local/bin -MANPATH = /usr/local/man +BINDIR = /usr/bin +MANPATH = /usr/share/man - + SimpleProgramTarget($(NAME)) ---- xzoom-0.3.orig/scale.h +--- /dev/null +++ xzoom-0.3/scale.h @@ -0,0 +1,102 @@ +/* scale image from SRC to DST - parameterized by type T */ @@ -124,7 +124,7 @@ +++ xzoom-0.3/xzoom.c @@ -12,13 +12,22 @@ exact location where the source code can be obtained. - + Changelist: -Author Description ------- ----------- @@ -150,130 +150,130 @@ +tony mancill 2002/02/13 + hacked in support for WM_DELETE_WINDOW */ - + #include -@@ -48,6 +57,9 @@ +@@ -48,6 +57,9 @@ Itai Nahshon Version 0.2, Apr. 17 199 Display *dpy; Screen *scr; Window win; +Atom wm_delete_window; +Atom wm_protocols; +Status status; - + GC gc; #ifdef FRAME -@@ -87,8 +99,12 @@ +@@ -87,8 +99,12 @@ int flipy = False; /* flip display ab int xzoom_flag = False; /* next mag change only to magx */ int yzoom_flag = False; /* next mag change only to magy */ - + +int gridx = False; +int gridy = False; + int width[2] = { 0, WIDTH }; int height[2] = { 0, HEIGHT }; +unsigned depth = 0; - + #ifdef XSHM XShmSegmentInfo shminfo[2]; /* Segment info. */ -@@ -106,6 +122,7 @@ +@@ -106,6 +122,7 @@ int delay = 200000; /* 0.2 second betw void timeout_func(int signum) { set_title = True; + signum = signum; /* UNUSED */ } - + #ifdef FRAME -@@ -116,9 +133,6 @@ +@@ -116,9 +133,6 @@ timeout_func(int signum) { void allocate_images(void) { int i; -#ifndef XSHM - char *data; -#endif - + for(i = 0; i < 2; i++) { - -@@ -137,7 +151,7 @@ + +@@ -137,7 +151,7 @@ allocate_images(void) { shminfo[i].shmid = shmget(IPC_PRIVATE, (unsigned int)(ximage[i]->bytes_per_line * ximage[i]->height), IPC_CREAT | 0777); -- +- + if(shminfo[i].shmid < 0) { perror("shmget"); exit(-1); -@@ -163,20 +177,21 @@ - +@@ -163,20 +177,21 @@ allocate_images(void) { + shmctl(shminfo[i].shmid, IPC_RMID, 0); #else - data = malloc(width[i] * height[i]); + char *data; + data = malloc(BitmapUnit(dpy) / 8 * width[i] * height[i]); - + ximage[i] = XCreateImage(dpy, DefaultVisualOfScreen(scr), DefaultDepthOfScreen(scr), ZPixmap, 0, data, - width[i], height[i], 8, width[i]); + width[i], height[i], 32, 0); - + if(ximage[i] == NULL) { perror("XCreateImage"); exit(-1); } - + -#endif XSHM +#endif /* XSHM */ } created_images = True; } -@@ -185,6 +200,9 @@ +@@ -185,6 +200,9 @@ void destroy_images(void) { int i; - + + if (!created_images) + return; + for(i = 0; i < 2; i++) { #ifdef XSHM XShmDetach(dpy, &shminfo[i]); /* ask X11 to detach shared segment */ -@@ -195,6 +213,8 @@ +@@ -195,6 +213,8 @@ destroy_images(void) { ximage[i]->data = NULL; /* remove refrence to that address */ XDestroyImage(ximage[i]); /* and destroy image */ } + + created_images = False; } - + void -@@ -230,8 +250,7 @@ +@@ -230,8 +250,7 @@ Usage(void) { void resize(int new_width, int new_height) { - + - if(created_images) - destroy_images(); /* we can get rid of these */ + destroy_images(); /* we can get rid of these */ - + /* find new dimensions for source */ - -@@ -244,9 +263,13 @@ + +@@ -244,9 +263,13 @@ resize(int new_width, int new_height) { height[SRC] = (new_height+magy-1) / magy; } - + + if(width[SRC] < 1) + width[SRC] = 1; if(width[SRC] > WidthOfScreen(scr)) width[SRC] = WidthOfScreen(scr); - + + if(height[SRC] < 1) + height[SRC] = 1; if(height[SRC] > HeightOfScreen(scr)) height[SRC] = HeightOfScreen(scr); - -@@ -270,12 +293,34 @@ + +@@ -270,12 +293,34 @@ resize(int new_width, int new_height) { height[DST] = new_height; } - + + +void scale8(void) +{ @@ -308,39 +308,39 @@ XEvent event; int buttonpressed = False; int unmapped = True; -@@ -286,8 +331,9 @@ +@@ -286,8 +331,9 @@ main(int argc, char **argv) { int source_geom_mask = NoValue, dest_geom_mask = NoValue, copy_from_src_mask; -- int xpos = 0, ypos = 0; +- int xpos = 0, ypos = 0; + int xpos = 0, ypos = 0; - + + atexit(destroy_images); progname = strrchr(argv[0], '/'); if(progname) ++progname; -@@ -312,7 +358,7 @@ - +@@ -312,7 +358,7 @@ main(int argc, char **argv) { + if(magx <= 0) Usage(); -- +- + - + magy = argc > 1 ? atoi(argv[1]) : -1; - -@@ -340,7 +386,7 @@ + +@@ -340,7 +386,7 @@ main(int argc, char **argv) { flipxy = True; continue; } -- +- + if(!strcmp(argv[0], "-source")) { ++argv; --argc; - -@@ -438,23 +484,24 @@ - + +@@ -438,23 +484,24 @@ main(int argc, char **argv) { + scr = DefaultScreenOfDisplay(dpy); - + - if(DefaultDepthOfScreen(scr) != 8) { - fprintf(stderr, "%s: can work only with 8 bits/pixel\n", progname); + depth = DefaultDepthOfScreen(scr); @@ -348,47 +348,47 @@ + fprintf(stderr, "%s: need at least 8 bits/pixel\n", progname); exit(1); } - + if(source_geom_mask & XNegative) xgrab += WidthOfScreen(scr); -- +- + if(source_geom_mask & YNegative) ygrab += HeightOfScreen(scr); - + if(dest_geom_mask & XNegative) xpos += WidthOfScreen(scr); -- +- + if(source_geom_mask & YNegative) ypos += HeightOfScreen(scr); -- +- + /* printf("=%dx%d+%d+%d\n", width[DST], height[DST], xpos, ypos); */ - + xswa.event_mask = ButtonPressMask|ButtonReleaseMask|ButtonMotionMask; -@@ -463,24 +510,33 @@ +@@ -463,24 +510,33 @@ main(int argc, char **argv) { xswa.background_pixel = BlackPixelOfScreen(scr); - + win = XCreateWindow(dpy, RootWindowOfScreen(scr), -- xpos, ypos, width[DST], height[DST], 0, +- xpos, ypos, width[DST], height[DST], 0, + xpos, ypos, width[DST], height[DST], 0, DefaultDepthOfScreen(scr), InputOutput, DefaultVisualOfScreen(scr), CWEventMask | CWBackPixel, &xswa); - -- XChangeProperty(dpy, win, XA_WM_ICON_NAME, XA_STRING, 8, + +- XChangeProperty(dpy, win, XA_WM_ICON_NAME, XA_STRING, 8, + XChangeProperty(dpy, win, XA_WM_ICON_NAME, XA_STRING, 8, PropModeReplace, (unsigned char *)progname, strlen(progname)); - + /* -- XChangeProperty(dpy, win, XA_WM_NAME, XA_STRING, 8, +- XChangeProperty(dpy, win, XA_WM_NAME, XA_STRING, 8, + XChangeProperty(dpy, win, XA_WM_NAME, XA_STRING, 8, PropModeReplace, (unsigned char *)progname, strlen(progname)); */ - + + + /*** 20020213 + code added by to handle @@ -399,33 +399,32 @@ + status = XSetWMProtocols(dpy, win, &wm_delete_window, 1); + set_title = True; - + - XMapWindow(dpy, win); + status = XMapWindow(dpy, win); - + gcv.plane_mask = AllPlanes; gcv.subwindow_mode = IncludeInferiors; -@@ -512,7 +568,7 @@ +@@ -512,7 +568,7 @@ main(int argc, char **argv) { { static char bitmap_data[] = { 0 }; static XColor col = { 0 }; -- Pixmap curs = XCreatePixmapFromBitmapData(dpy, +- Pixmap curs = XCreatePixmapFromBitmapData(dpy, + Pixmap curs = XCreatePixmapFromBitmapData(dpy, RootWindowOfScreen(scr), bitmap_data, 1, 1, 0, 0, 1); - + when_button = XCreatePixmapCursor(dpy, curs, curs, &col, &col, 0, 0); -@@ -526,11 +582,22 @@ - +@@ -526,11 +582,22 @@ main(int argc, char **argv) { + for(;;) { - + + /***** + old event loop updated to support WM messages while(unmapped? (XWindowEvent(dpy, win, (long)-1, &event), 1): XCheckWindowEvent(dpy, win, (long)-1, &event)) { -- + ******/ -+ + + while(XPending(dpy)) { + XNextEvent(dpy, &event); switch(event.type) { @@ -438,58 +437,58 @@ case ConfigureNotify: if(event.xconfigure.width != width[DST] || event.xconfigure.height != height[DST]) { -@@ -567,6 +634,7 @@ - +@@ -567,6 +634,7 @@ main(int argc, char **argv) { + case '+': case '=': + case XK_KP_Add: if(!yzoom_flag) ++magx; if(!xzoom_flag) ++magy; xzoom_flag = yzoom_flag = False; -@@ -575,6 +643,7 @@ +@@ -575,6 +643,7 @@ main(int argc, char **argv) { break; - + case '-': + case XK_KP_Subtract: if(!yzoom_flag) --magx; if(!xzoom_flag) --magy; xzoom_flag = yzoom_flag = False; -@@ -585,6 +654,7 @@ +@@ -585,6 +654,7 @@ main(int argc, char **argv) { break; - + case XK_Left: + case XK_KP_Left: if(flipxy) if(flipx) ygrab += scroll; -@@ -598,6 +668,7 @@ +@@ -598,6 +668,7 @@ main(int argc, char **argv) { break; - + case XK_Right: + case XK_KP_Right: if(flipxy) if(flipx) ygrab -= scroll; -@@ -611,6 +682,7 @@ +@@ -611,6 +682,7 @@ main(int argc, char **argv) { break; - + case XK_Up: + case XK_KP_Up: if(flipxy) if(flipy) xgrab -= scroll; -@@ -624,6 +696,7 @@ +@@ -624,6 +696,7 @@ main(int argc, char **argv) { break; - + case XK_Down: + case XK_KP_Down: if(flipxy) if(flipy) xgrab += scroll; -@@ -666,12 +739,17 @@ +@@ -666,12 +739,17 @@ main(int argc, char **argv) { xzoom_flag = False; break; - + + case 'g': + gridx = !gridx; + gridy = !gridy; @@ -500,31 +499,31 @@ delay_index = 0; delay = delays[delay_index]; sprintf(title, "delay = %d ms", delay/1000); -- XChangeProperty(dpy, win, XA_WM_NAME, XA_STRING, 8, +- XChangeProperty(dpy, win, XA_WM_NAME, XA_STRING, 8, + XChangeProperty(dpy, win, XA_WM_NAME, XA_STRING, 8, PropModeReplace, (unsigned char *)title, strlen(title)); signal(SIGALRM, timeout_func); -@@ -717,6 +795,7 @@ +@@ -717,6 +795,7 @@ main(int argc, char **argv) { #endif } break; + } - + /* trying XShmGetImage when part of the rect is -@@ -736,6 +815,7 @@ - +@@ -736,6 +815,7 @@ main(int argc, char **argv) { + if(ygrab > HeightOfScreen(scr)-height[SRC]) ygrab = HeightOfScreen(scr)-height[SRC]; + } - + #ifdef XSHM -@@ -753,63 +833,12 @@ +@@ -753,63 +833,12 @@ main(int argc, char **argv) { } #endif - + - /* copy scaled lines from src to dst */ - for(j = flipxy?width[SRC]:height[SRC]; --j >= 0; ) { - /* p1 point to begining of scanline j*magy in DST */ @@ -549,7 +548,7 @@ - p2 += p2step; - for(k = magx; --k > 0; ) - *p1++ = c; -- } +- } - } - else if(flipx) { - p2 += width[SRC]; @@ -557,14 +556,14 @@ - c = *p1++ = *--p2; - for(k = magx; --k > 0; ) - *p1++ = c; -- } +- } - } - else { - for(i = width[SRC]; --i >= 0;) { - c = *p1++ = *p2++; - for(k = magx; --k > 0; ) - *p1++ = c; -- } +- } - } - - /* p1 point to begining of scanline j*magy in DST */ @@ -588,14 +587,14 @@ + scale16(); + else if (depth <= 8*sizeof(int)) + scale32(); - + #ifdef XSHM XShmPutImage(dpy, win, gc, ximage[DST], 0, 0, 0, 0, width[DST], height[DST], False); -@@ -825,7 +854,7 @@ +@@ -825,7 +854,7 @@ main(int argc, char **argv) { flipx?"-":"", magx, flipxy?" <=>":";", flipy?"-":"", magy); -- XChangeProperty(dpy, win, XA_WM_NAME, XA_STRING, 8, +- XChangeProperty(dpy, win, XA_WM_NAME, XA_STRING, 8, + XChangeProperty(dpy, win, XA_WM_NAME, XA_STRING, 8, PropModeReplace, (unsigned char *)title, strlen(title)); @@ -609,12 +608,12 @@ -.TH XZOOM 1X +.TH XZOOM 1x .SH NAME --xzoom \- +-xzoom \- +xzoom \- magnify part of the screen, with fast updates .SH SYNOPSIS .B xzoom [ \-display \fIdisplayname\fP ] [ \-mag \fImag\fP [ \fImag\fP ] ] -@@ -18,7 +18,7 @@ +@@ -18,7 +18,7 @@ The name of the display to use .TP 5 .B \-mag \fImag\fP [ \fImag\fP ] What magnification to use. If two number arguments are supplied the @@ -623,8 +622,8 @@ Magnification should be greater than 0. .TP 5 .B \-x -@@ -85,6 +85,9 @@ - sets the delay between frame updates. +@@ -85,6 +85,9 @@ key is pressed the zoomed area will scro + sets the delay between frame updates. Built-in delays are 200, 100, 50, 10 and 0 ms. .TP 5 +.B g @@ -633,7 +632,7 @@ .B Mouse buttons To set the location of the magnified are click the left mouse button inside xzoom's window and then move it (keep the button -@@ -147,11 +150,6 @@ +@@ -147,11 +150,6 @@ used. Xzoom will fail if it is compiled display is not on the local host. .LP 5 \(dg From e0e3a1ae19a41b4aa39e4031d845bc171ec88572 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, 26 Aug 2022 23:21:45 +0700 Subject: [PATCH 0506/1407] yeahwm: fix patch's whitespace --- srcpkgs/yeahwm/patches/fix-makefile.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/yeahwm/patches/fix-makefile.patch b/srcpkgs/yeahwm/patches/fix-makefile.patch index adabccaaa14c..6beb352281aa 100644 --- a/srcpkgs/yeahwm/patches/fix-makefile.patch +++ b/srcpkgs/yeahwm/patches/fix-makefile.patch @@ -2,8 +2,8 @@ Enable configurable CC and XROOT. Add missing $(LIBS) to link and remove strip. Add yeahwm.1 to install target. ---- a/Makefile 2004-11-21 19:11:04.000000000 +0100 -+++ b/Makefile 2015-10-25 23:20:45.306617941 +0100 +--- yeahwm-0.3.5.orig/Makefile ++++ yeahwm-0.3.5/Makefile @@ -1,11 +1,11 @@ # If you don't use CC -CC = gcc @@ -18,16 +18,17 @@ Add yeahwm.1 to install target. INCLUDES = -I$(XROOT)/include LDPATH = -L$(XROOT)/lib LIBS = -lX11 -@@ -55,7 +55,6 @@ +@@ -55,8 +55,7 @@ OBJS = $(SRCS:.c=.o) all: yeahwm yeahwm: $(OBJS) - $(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS) +- strip yeahwm + $(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LIBS) -- strip yeahwm allinone: -@@ -71,7 +71,7 @@ + cat yeahwm.h $(SRCS) | sed 's/^#include.*yeahwm.*$$//' > allinone.c +@@ -71,7 +70,7 @@ doinstall: if [ -f yeahwm.exe ]; then mv yeahwm.exe yeahwm; fi mkdir -p $(prefix)/bin $(prefix)/share/man/man1 install -s yeahwm $(prefix)/bin From 2b0713dbb4398e26e413a9597bb607ce5e6a3254 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 26 Aug 2022 19:43:11 +0200 Subject: [PATCH 0507/1407] kore: update to 4.2.3. --- srcpkgs/kore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template index f90a4d9183ac..715f92118e9d 100644 --- a/srcpkgs/kore/template +++ b/srcpkgs/kore/template @@ -1,6 +1,6 @@ # Template file for 'kore' pkgname=kore -version=4.2.2 +version=4.2.3 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=77c12d80bb76fe774b16996e6bac6d4ad950070d0816c3409dc0397dfc62725f +checksum=f9a9727af97441ae87ff9250e374b9fe3a32a3348b25cb50bd2b7de5ec7f5d82 disable_parallel_build=yes export TARGET_PLATFORM=${XBPS_TARGET_MACHINE} From 3bf371bf795c15ca73b4fcab60d46ff2b5809f42 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 26 Aug 2022 19:59:25 +0200 Subject: [PATCH 0508/1407] mumble: update to 1.4.274. --- srcpkgs/mumble/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 65f96a90f282..9732bbb9596d 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,8 +1,8 @@ # Template file for 'mumble' pkgname=mumble -version=1.4.230 -revision=5 -wrksrc=mumble-${version}.src +version=1.4.274 +revision=1 +wrksrc=mumble-src build_style=cmake make_cmd=make configure_args="-Doverlay-xcompile=OFF -Dbundled-opus=OFF @@ -21,7 +21,7 @@ maintainer="Helmut Pozimski " license="BSD-3-Clause" homepage="https://mumble.info" distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=b67d82b4e6cc5834b965c5bc25339e456534bbd5b9dda6c8c95cf9cb80e434b0 +checksum=7ec87ddcccd8929e40062ea6e868f287509d4436c60bbc75606cbf5b6b303b8b build_options="jack portaudio" build_options_default="jack portaudio" @@ -48,6 +48,6 @@ murmur_package() { vmove etc/murmur.ini vmove usr/bin/mumble-server vmove usr/share/man/man1/mumble-server.1 - vmove usr/share/man/man1/murmurd.1 + vmove usr/share/man/man1/mumble-server-user-wrapper.1 } } From 612cb74cb588b34b22cc12995c0cb6825a4ce531 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 26 Aug 2022 20:01:57 +0200 Subject: [PATCH 0509/1407] linux5.4: update to 5.4.211. --- 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 0bb8dff53d8c..84cbe25c3f96 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.210 +version=5.4.211 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=940396878c2c183531669d87831eda60a86fbf4662904922c49151b50afc888e +checksum=bfb43241b72cd55797af68bea1cebe630d37664c0f9a99b6e9263a63a67e2dec python_version=3 nodebug=yes # -dbg package is generated below manually From f0d4671eff236b346a6aead70cbc7c7d40069a2a Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 26 Aug 2022 20:05:23 +0200 Subject: [PATCH 0510/1407] linux4.19: update to 4.19.256. --- 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 dd84a5517bc7..5244c53cab44 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.255 +version=4.19.256 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=773992063f4c0956260afdd946c76ddffefbd9c252e800be60945696c01b8a43 +checksum=67de95c6080b5730bf14227478cfc3e4db807941d8a881d9824c25059b3ff549 python_version=3 nodebug=yes # -dbg package is generated below manually From e30e2d97332a9251163432074673660856ee7dec Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 26 Aug 2022 20:09:25 +0200 Subject: [PATCH 0511/1407] mumble: broken on i686 for now --- srcpkgs/mumble/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 9732bbb9596d..657d2cf5181a 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -26,6 +26,11 @@ checksum=7ec87ddcccd8929e40062ea6e868f287509d4436c60bbc75606cbf5b6b303b8b build_options="jack portaudio" build_options_default="jack portaudio" +case "$XBPS_TARGET_MACHINE" in + i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/39031/steps/shell_3/logs/stdio" ;; +esac + + export CMAKE_GENERATOR="Unix Makefiles" post_install() { From 4f0daa77a1b4e6bd3edc5616b64b042b9e27b9a2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 27 Aug 2022 00:05:20 +0200 Subject: [PATCH 0512/1407] gnubg: switch to Python 3. --- srcpkgs/gnubg/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnubg/template b/srcpkgs/gnubg/template index 173af550bb41..394f27c34e6d 100644 --- a/srcpkgs/gnubg/template +++ b/srcpkgs/gnubg/template @@ -1,24 +1,24 @@ # Template file for 'gnubg' pkgname=gnubg version=1.06.002 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-cputest ax_cv_gcc_x86_cpuid_0x00000001=6000000" -hostmakedepends="pkg-config python gdk-pixbuf-devel" -makedepends="libcurl-devel libglib-devel gtk+-devel gtkglext-devel python-devel +hostmakedepends="gdk-pixbuf-devel pkg-config python3-devel" +makedepends="libcurl-devel libglib-devel gtk+-devel gtkglext-devel python3-devel libcanberra-devel readline-devel readline sqlite-devel" -depends="python" +depends="python3" short_desc="GNU Backgammon game" maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/gnubg/" distfiles="$GNU_SITE/gnubg/$pkgname-release-$version-sources.tar.gz" checksum=ce1b0b0c1900717cc598032a14cf8c0ee60faf24d84368b39922c0102983bc87 -LDLIBS="-lm -lreadline -lpython2.7" +LDLIBS="-lm -lreadline -lpython${pyver}" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" ${pkgname}" - CPPFLAGS="-I$XBPS_CROSS_BASE/usr/include/python2.7" + CPPFLAGS="-I$XBPS_CROSS_BASE/usr/include/python${pyver}" fi case "$XBPS_TARGET_MACHINE" in @@ -26,6 +26,7 @@ case "$XBPS_TARGET_MACHINE" in esac pre_configure() { + export PYTHONWARNINGS="ignore" # distutils being removed in py 3.12 if [ "$CROSS_BUILD" ]; then makeweights < gnubg.weights > gnubg.wd makebearoff -o 6 -s 7999999 -f gnubg_os0.bd From e812fb3f6ae7b050fd4b8de9284f0ed837d3fe45 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 27 Aug 2022 00:26:30 +0200 Subject: [PATCH 0513/1407] gnubg: fix cross. --- srcpkgs/gnubg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnubg/template b/srcpkgs/gnubg/template index 394f27c34e6d..3b9842b7bb43 100644 --- a/srcpkgs/gnubg/template +++ b/srcpkgs/gnubg/template @@ -14,11 +14,11 @@ license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/gnubg/" distfiles="$GNU_SITE/gnubg/$pkgname-release-$version-sources.tar.gz" checksum=ce1b0b0c1900717cc598032a14cf8c0ee60faf24d84368b39922c0102983bc87 -LDLIBS="-lm -lreadline -lpython${pyver}" +LDLIBS="-lm -lreadline -lpython${py3_ver}" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" ${pkgname}" - CPPFLAGS="-I$XBPS_CROSS_BASE/usr/include/python${pyver}" + export PYTHON_CPPFLAGS="-I$XBPS_CROSS_BASE/usr/include/python${py3_ver}" fi case "$XBPS_TARGET_MACHINE" in From 66378f55c3be8dfc13f865df2cf0f09f67deeabf Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 25 Aug 2022 10:44:23 +0200 Subject: [PATCH 0514/1407] gnome: remove network-manager-applet from -apps --- srcpkgs/gnome/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 7860bb3cd09f..7f17687741ce 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,7 @@ # Template file for 'gnome' pkgname=gnome version=42.0 -revision=1 +revision=2 build_style=meta short_desc="GNOME meta-package for Void Linux" maintainer="Enno Boland " @@ -69,7 +69,6 @@ _apps_depends=" gnome-text-editor>=${version} gnome-todo>=41.0 gnote>=${version} - network-manager-applet>=1.24.0 polari>=3.38.0 rygel>=0.40.2 simple-scan>=${version} From da6ff2126118d6af88bb5546c2ba5024d2997122 Mon Sep 17 00:00:00 2001 From: Matthias von Faber Date: Fri, 26 Aug 2022 19:07:36 +0200 Subject: [PATCH 0515/1407] vale: update to 2.20.1 --- srcpkgs/vale/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template index eab475e687b6..1d2410a7005b 100644 --- a/srcpkgs/vale/template +++ b/srcpkgs/vale/template @@ -1,6 +1,6 @@ # Template file for 'vale' pkgname=vale -version=2.19.0 +version=2.20.1 revision=1 build_style=go go_import_path="github.com/errata-ai/vale/v2" @@ -11,7 +11,7 @@ maintainer="SolitudeSF " license="MIT" homepage="https://docs.errata.ai/vale/about/" distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz" -checksum=bb2e3ffa0901ebc46686ee99ef52ec4c2634dd0c226d591fde4a7d585a44e2c6 +checksum=48cb6e37579b83fb75b919021c79e92c6b0519998818bf0080b2c7a53cf5f563 post_install() { vlicense LICENSE From e8156446f0b32a85e8c4cfca2f9b55f565a86100 Mon Sep 17 00:00:00 2001 From: Ricardo Steijn Date: Fri, 26 Aug 2022 19:39:13 +0200 Subject: [PATCH 0516/1407] lutris: update to 0.5.11 --- srcpkgs/lutris/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template index bc2c2e7a5362..a426ceaaab6a 100644 --- a/srcpkgs/lutris/template +++ b/srcpkgs/lutris/template @@ -1,6 +1,6 @@ # Template file for 'lutris' pkgname=lutris -version=0.5.10.1 +version=0.5.11 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=bdb1dc020d39516e3434bd66f7ebae276bde2003751ca375ccf577df8b5adef4 +checksum=ca2785e00adf68ff5e7355426c18ec7ebc03faff2bca0e18d8d1a3c671c56dc2 From e223df2079be6c0eaf27204c305a001c0dea95eb Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 26 Aug 2022 23:11:45 +0000 Subject: [PATCH 0517/1407] chroot-grep: fix build on ppc-musl --- srcpkgs/chroot-grep/patches/ppc-musl.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/chroot-grep/patches/ppc-musl.patch diff --git a/srcpkgs/chroot-grep/patches/ppc-musl.patch b/srcpkgs/chroot-grep/patches/ppc-musl.patch new file mode 100644 index 000000000000..6ba37f233591 --- /dev/null +++ b/srcpkgs/chroot-grep/patches/ppc-musl.patch @@ -0,0 +1,14 @@ +--- a/lib/sigsegv.c ++++ b/lib/sigsegv.c +@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; + /* both should be equivalent */ + # if 0 + # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] +-# else ++# elif defined(__GLIBC__) + # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] ++# else ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1] + # endif + # endif + From 935089745dacef3b81fde0cac50f88982982de91 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, 26 Aug 2022 23:16:46 +0700 Subject: [PATCH 0518/1407] uwsgi: fix patch's whitespace The intention was always not exit when failed to setprotocol INHERIT --- srcpkgs/uwsgi/patches/musl-locking-fix.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/uwsgi/patches/musl-locking-fix.patch b/srcpkgs/uwsgi/patches/musl-locking-fix.patch index ce3b080a2909..2177ccdfd3fc 100644 --- a/srcpkgs/uwsgi/patches/musl-locking-fix.patch +++ b/srcpkgs/uwsgi/patches/musl-locking-fix.patch @@ -1,12 +1,12 @@ --- a/core/lock.c +++ b/core/lock.c -@@ -96,7 +96,9 @@ - #endif - if (pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT)) { - uwsgi_log("unable to set PTHREAD_PRIO_INHERIT\n"); +@@ -108,7 +108,9 @@ retry: + break; + default: + uwsgi_log("unable to set PTHREAD_PRIO_INHERIT\n"); +#if 0 - exit(1); + exit(1); +#endif - } - if (uwsgi_pthread_robust_mutexes_enabled) { + } + } if (pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST)) { From 5bed8268eb32fac9bd4fd053d009ff47d6d591e7 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, 27 Aug 2022 09:52:41 +0700 Subject: [PATCH 0519/1407] exfat-dkms: fix patch's whitespace --- srcpkgs/exfat-dkms/patches/linux4.18.patch | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/srcpkgs/exfat-dkms/patches/linux4.18.patch b/srcpkgs/exfat-dkms/patches/linux4.18.patch index 3771c516beb4..172934f350d5 100644 --- a/srcpkgs/exfat-dkms/patches/linux4.18.patch +++ b/srcpkgs/exfat-dkms/patches/linux4.18.patch @@ -1,8 +1,6 @@ -diff --git exfat_super.c exfat_super.c -index 312de36..262b74d 100644 --- a/exfat_super.c +++ b/exfat_super.c -@@ -97,6 +97,11 @@ static int exfat_default_codepage = CONFIG_EXFAT_DEFAULT_CODEPAGE; +@@ -97,6 +97,11 @@ static int exfat_default_codepage = CONF static char exfat_default_iocharset[] = CONFIG_EXFAT_DEFAULT_IOCHARSET; extern struct timezone sys_tz; @@ -13,21 +11,22 @@ index 312de36..262b74d 100644 +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0) - #define current_time(x) (CURRENT_TIME_SEC) + #define current_time(x) (CURRENT_TIME_SEC) @@ -147,7 +152,7 @@ static time_t accum_days_in_year[] = { static void _exfat_truncate(struct inode *inode, loff_t old_size); /* Convert a FAT time/date pair to a UNIX date (seconds since 1 1 70). */ -void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec *ts, +void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec_compat *ts, - DATE_TIME_T *tp) + DATE_TIME_T *tp) { - time_t year = tp->Year; -@@ -166,7 +171,7 @@ void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec *ts, + time_t year = tp->Year; +@@ -166,7 +171,7 @@ void exfat_time_fat2unix(struct exfat_sb } /* Convert linear UNIX date to a FAT time/date pair. */ -void exfat_time_unix2fat(struct exfat_sb_info *sbi, struct timespec *ts, +void exfat_time_unix2fat(struct exfat_sb_info *sbi, struct timespec_compat *ts, - DATE_TIME_T *tp) + DATE_TIME_T *tp) { + time_t second = ts->tv_sec; From e565e8f12408df2edf8baab18379f74b6edb18bc 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, 27 Aug 2022 10:52:00 +0700 Subject: [PATCH 0520/1407] exfatprogs: use pre-generated tarball --- srcpkgs/exfatprogs/template | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/srcpkgs/exfatprogs/template b/srcpkgs/exfatprogs/template index 0d5af7e2ca89..4bda98a4ef94 100644 --- a/srcpkgs/exfatprogs/template +++ b/srcpkgs/exfatprogs/template @@ -1,21 +1,17 @@ # Template file for 'exfatprogs' pkgname=exfatprogs version=1.1.3 -revision=1 +revision=2 build_style=gnu-configure -hostmakedepends="autoconf automake libtool" short_desc="Tools to create, check and label exFAT filesystems" maintainer="k4leg " license="GPL-2.0-or-later" homepage="https://github.com/exfatprogs/exfatprogs" distfiles="https://github.com/exfatprogs/exfatprogs/archive/${version}.tar.gz" -checksum=e3ee4fb5af4abc9335aed7a749c319917c652ac1af687ba40aabd04a6b71f1ca +distfiles="https://github.com/exfatprogs/exfatprogs/releases/download/${version}/exfatprogs-${version}.tar.xz" +checksum=3dbd74b60eec18d2c68d57be4a872d7baa4f7d848e669e31159452ef5245b809 conflicts="exfat-utils" -pre_configure() { - ./autogen.sh -} - post_install() { vdoc NEWS } From 04259f52bdc5d91b59246a02103c0a7c49d19df5 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, 27 Aug 2022 10:58:56 +0700 Subject: [PATCH 0521/1407] exfatprogs: replace exfat-utils exfat-utils was meant for fuse implementation, which is only needed for older kernel. --- srcpkgs/exfatprogs/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/exfatprogs/template b/srcpkgs/exfatprogs/template index 4bda98a4ef94..1003630ebfa5 100644 --- a/srcpkgs/exfatprogs/template +++ b/srcpkgs/exfatprogs/template @@ -1,7 +1,7 @@ # Template file for 'exfatprogs' pkgname=exfatprogs version=1.1.3 -revision=2 +revision=3 build_style=gnu-configure short_desc="Tools to create, check and label exFAT filesystems" maintainer="k4leg " @@ -11,6 +11,7 @@ distfiles="https://github.com/exfatprogs/exfatprogs/archive/${version}.tar.gz" distfiles="https://github.com/exfatprogs/exfatprogs/releases/download/${version}/exfatprogs-${version}.tar.xz" checksum=3dbd74b60eec18d2c68d57be4a872d7baa4f7d848e669e31159452ef5245b809 conflicts="exfat-utils" +replaces="exfat-utils>=0" post_install() { vdoc NEWS From 516a1b0ea4a18d028422a8824120bdb2accec639 Mon Sep 17 00:00:00 2001 From: clyhtsuriva Date: Fri, 26 Aug 2022 19:33:46 +0200 Subject: [PATCH 0522/1407] jrnl: update to 3.1 --- srcpkgs/jrnl/template | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template index 5301ac052158..83c1cdb0e78a 100644 --- a/srcpkgs/jrnl/template +++ b/srcpkgs/jrnl/template @@ -1,19 +1,18 @@ # Template file for 'jrnl' pkgname=jrnl -version=3.0 +version=3.1 revision=1 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-ansiwrap python3-asteval python3-colorama python3-cryptography - python3-dateutil python3-keyring python3-parsedatetime python3-passlib - python3-pytz python3-tzlocal python3-xdg python3-yaml python3-packaging - python3-ruamel.yaml" +build_style=python3-pep517 +hostmakedepends="python3-poetry-core" +depends="python3-ansiwrap python3-colorama python3-cryptography + python3-dateutil python3-keyring python3-parsedatetime python3-rich + python3-tzlocal python3-xdg python3-ruamel.yaml" short_desc="Simple journal application for your command line" maintainer="Orphaned " license="GPL-3.0-only" homepage="https://jrnl.sh" changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz" -checksum=e676780351fd92a34855b802e6ca3d95041b8b6d4d4ed621b121e66908079e73 +checksum=f1c1438b26f01f09266693870c7e81e2cb9d28b9b4d3b7c60ccda06da4189a8b # Tarball provides no tests make_check=no From dc347ae1845842080839e6fc4de8451fc8cbc69a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Fri, 26 Aug 2022 22:36:10 +0100 Subject: [PATCH 0523/1407] ImageMagick: update to 7.1.0.46. Added support for openexr --- srcpkgs/ImageMagick/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index 09989cec526f..fa71c583d328 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,25 +1,25 @@ # Template file for 'ImageMagick' pkgname=ImageMagick -version=7.1.0.45 +version=7.1.0.46 revision=1 _upstream_version="${version/.${version##*.}/-${version##*.}}" wrksrc=${pkgname}-${_upstream_version} build_style=gnu-configure configure_args="--disable-static --enable-opencl --with-modules --with-gslib - --with-rsvg --with-wmf --with-dejavu-font-dir=/usr/share/fonts/TTF + --with-rsvg --with-wmf --with-dejavu-font-dir=/usr/share/fonts/TTF --with-openexr --with-gs-font-dir=/usr/share/fonts/Type1" hostmakedepends="automake libtool pkg-config autoconf" makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel - libraqm-devel" + libraqm-devel libopenexr-devel" short_desc="Create, edit, compose, or convert bitmap images" maintainer="André Cerqueira " license="ImageMagick" homepage="https://www.imagemagick.org" changelog="https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md" distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_upstream_version}.tar.gz" -checksum=3df6ca6dff15a4e8a20b4593c60285a59e38890440494d91a344e5c0e2bb3eec +checksum=51e9863ae4a52d6477da0aecc4f79ebccfc5da2721e7a0e63bf09f41700da43c subpackages="libmagick libmagick-devel" From bbeac596bc334d5472014c7b6e73f692e9b216ba Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 26 Aug 2022 12:13:22 -0400 Subject: [PATCH 0524/1407] activityrelay: update to 0.2.2. --- srcpkgs/activityrelay/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/activityrelay/template b/srcpkgs/activityrelay/template index 00ca759528fa..9529e59238c6 100644 --- a/srcpkgs/activityrelay/template +++ b/srcpkgs/activityrelay/template @@ -1,6 +1,6 @@ # Template file for 'activityrelay' pkgname=activityrelay -version=0.2.1 +version=0.2.2 revision=1 wrksrc="relay-${version}" build_style=python3-module @@ -12,7 +12,7 @@ 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=0a31d17bc759b1f6d9291d15917e505cd99ab8621d5e0db6a31805ef097e132c +checksum=f460037a522e45fd030735da893e5851d90b6340caab0bcd24346996474aac25 make_check=no # no tests specified system_accounts="_activityrelay" From df128ca740ac9834225cd1fb3af395c06bf4cf31 Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 25 Aug 2022 16:39:49 +0530 Subject: [PATCH 0525/1407] python3-humanize: update to 4.3.0. --- srcpkgs/python3-humanize/template | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/srcpkgs/python3-humanize/template b/srcpkgs/python3-humanize/template index c54f55be8b48..3fda21f52955 100644 --- a/srcpkgs/python3-humanize/template +++ b/srcpkgs/python3-humanize/template @@ -1,25 +1,18 @@ # Template file for 'python3-humanize' pkgname=python3-humanize -version=2.0.0 -revision=5 +version=4.3.0 +revision=1 wrksrc="humanize-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools_scm" +build_style=python3-pep517 +hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3" checkdepends="python3-pytest python3-freezegun" short_desc="Python humanize utilities" maintainer="Aluísio Augusto Silva Gonçalves " license="MIT" -homepage="https://github.com/jmoiron/humanize" +homepage="https://github.com/python-humanize/humanize" distfiles="${PYPI_SITE}/h/humanize/humanize-${version}.tar.gz" -checksum=1766e8b82772abdf54a0b3620b14b21b36feba5160401838f97d18a4c58c7f71 - -do_patch() { - # This line calls 'pkg_resources' and breaks testing due to a - # missing distribution (possibly because it expects the package - # to have already been installed). - sed -i "s/VERSION = .*$/VERSION = '${version}'/" src/humanize/__init__.py -} +checksum=0dfac79fe8c1c0c734c14177b07b857bad9ae30dd50daa0a14e2c3d8054ee0c4 post_install() { vlicense LICENCE From 3754fbc84dfb4c66a94945e4c2f0e16cca22280e Mon Sep 17 00:00:00 2001 From: icp Date: Fri, 26 Aug 2022 16:40:32 +0530 Subject: [PATCH 0526/1407] asciinema: update to 2.2.0. --- srcpkgs/asciinema/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/asciinema/template b/srcpkgs/asciinema/template index cb770bbe7667..3cf6954c8298 100644 --- a/srcpkgs/asciinema/template +++ b/srcpkgs/asciinema/template @@ -1,15 +1,15 @@ # Template file for 'asciinema' pkgname=asciinema -version=2.1.0 +version=2.2.0 revision=1 -build_style=python3-module -hostmakedepends="python3-setuptools" +build_style=python3-pep517 +hostmakedepends="python3-wheel" depends="python3" -checkdepends="python3-nose" +checkdepends="python3-pytest-xdist" short_desc="Record and share your terminal sessions, the right way" maintainer="Toyam Cox " license="GPL-3.0-or-later" homepage="https://asciinema.org/" -changelog="https://raw.githubusercontent.com/asciinema/asciinema/master/CHANGELOG.md" -distfiles="${PYPI_SITE}/a/asciinema/asciinema-${version}.tar.gz" -checksum=7bdb358c1f6d61b07169c5476b2f9607ce66da12e78e4c17b7c898d72402cddc +changelog="https://raw.githubusercontent.com/asciinema/asciinema/develop/CHANGELOG.md" +distfiles="https://github.com/asciinema/asciinema/archive/refs/tags/v${version}.tar.gz" +checksum=cce6f0ed6bcf47d54fe5caae14862bfb5a2e39eec1b3b467a8ed1050c298d0ec From eda3896bf1bb5a85372d018f8d57ce78fd8af076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Fri, 26 Aug 2022 22:19:58 +0100 Subject: [PATCH 0527/1407] batsignal: update to 1.6.0. --- srcpkgs/batsignal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/batsignal/template b/srcpkgs/batsignal/template index 9dc3556e0adf..8a2356b90dac 100644 --- a/srcpkgs/batsignal/template +++ b/srcpkgs/batsignal/template @@ -1,6 +1,6 @@ # Template file for 'batsignal' pkgname=batsignal -version=1.5.1 +version=1.6.0 revision=1 build_style=gnu-makefile make_use_env=yes @@ -11,7 +11,7 @@ maintainer="André Cerqueira " license="ISC" homepage="https://github.com/electrickite/batsignal" distfiles="https://github.com/electrickite/batsignal/archive/${version}.tar.gz" -checksum=99f09816529932b73f95d1989dc29fa952468193f7438e232d4e0627be01969b +checksum=799690eef5727037693af7e5d9283152e35ce31dae75738e54fcc0185d520569 post_install() { vlicense LICENSE From 609943437feb8ae61b7dc5de9e4b8d895490d92b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Sat, 27 Aug 2022 09:14:44 +0200 Subject: [PATCH 0528/1407] doomretro: update to 4.6.1. --- srcpkgs/doomretro/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template index 6b4e0855e96b..5ab48621c2c4 100644 --- a/srcpkgs/doomretro/template +++ b/srcpkgs/doomretro/template @@ -1,6 +1,6 @@ # Template file for 'doomretro' pkgname=doomretro -version=4.6.0.2 +version=4.6.1 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=f2efe06493b1e06a1cf51f82cfd289c7efeb8249d0983ea275a243bd85620a67 +checksum=addaabbfe7a873f2215a6f8a11468022f15bb1409fef16def1d4f8aa96838238 From 1a643b75bfbdbc174372f234c5681caa6789fdc5 Mon Sep 17 00:00:00 2001 From: lemmi Date: Sat, 27 Aug 2022 12:12:14 +0200 Subject: [PATCH 0529/1407] kodi-addon-pvr-hts: update to 19.0.6. --- srcpkgs/kodi-addon-pvr-hts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kodi-addon-pvr-hts/template b/srcpkgs/kodi-addon-pvr-hts/template index de380b403e13..01197e21bf63 100644 --- a/srcpkgs/kodi-addon-pvr-hts/template +++ b/srcpkgs/kodi-addon-pvr-hts/template @@ -1,7 +1,7 @@ # Template file for 'kodi-addon-pvr-hts' pkgname=kodi-addon-pvr-hts -version=8.2.3 -revision=2 +version=19.0.6 +revision=1 _kodi_release=Matrix wrksrc="pvr.hts-${version}-${_kodi_release}" build_style=cmake @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/kodi-pvr/pvr.hts" distfiles="https://github.com/kodi-pvr/pvr.hts/archive/${version}-${_kodi_release}.tar.gz" -checksum=bdaf63945d6552bead5a6e8ba4ffe1b8057e3b0c05b52c0fbf93a7834f652330 +checksum=990e5fd0757d48b86675aa124b77629e7fb2de6b27dcfd6f6ccc7ce181d04aeb if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" From ee6ae86973b51b257108cf0375c9331be650d908 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, 8 Aug 2022 17:13:07 +0700 Subject: [PATCH 0530/1407] qt6-base: update to 6.3.1. --- srcpkgs/qt6-base/patches/arm-yield.patch | 37 ++++++++++++++ srcpkgs/qt6-base/patches/complex-text.patch | 0 srcpkgs/qt6-base/patches/feenableexcept.patch | 13 +++++ srcpkgs/qt6-base/patches/libatomic.patch | 14 ------ srcpkgs/qt6-base/patches/markdown-musl.patch | 31 ++++++++++++ srcpkgs/qt6-base/patches/pthread_yield.patch | 20 ++++++++ ...urce-root-dir-last-modified-is-valid.patch | 13 +++++ .../qt6-base/patches/x86-qround-passed.patch | 48 +++++++++++++++++++ srcpkgs/qt6-base/patches/zfs-storage.patch | 20 ++++++++ srcpkgs/qt6-base/template | 24 +++++++--- 10 files changed, 200 insertions(+), 20 deletions(-) create mode 100644 srcpkgs/qt6-base/patches/arm-yield.patch create mode 100644 srcpkgs/qt6-base/patches/complex-text.patch create mode 100644 srcpkgs/qt6-base/patches/feenableexcept.patch delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch create mode 100644 srcpkgs/qt6-base/patches/markdown-musl.patch create mode 100644 srcpkgs/qt6-base/patches/pthread_yield.patch create mode 100644 srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch create mode 100644 srcpkgs/qt6-base/patches/x86-qround-passed.patch create mode 100644 srcpkgs/qt6-base/patches/zfs-storage.patch diff --git a/srcpkgs/qt6-base/patches/arm-yield.patch b/srcpkgs/qt6-base/patches/arm-yield.patch new file mode 100644 index 000000000000..2bef8584b88d --- /dev/null +++ b/srcpkgs/qt6-base/patches/arm-yield.patch @@ -0,0 +1,37 @@ +From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001 +From: Marc Mutz +Date: Wed, 3 Aug 2022 17:23:20 +0200 +Subject: Fix qYieldCpu() for ARM < ARMv7 + +Apparently, we still support these architecture versions, and there's +no way to detect ARMv6k-or-greater specifically, so exclude yield for +ARM < ARMv7. + +Amends 877c158c5976bebffd0ff02c39b6b66a842c6344. + +Fixes: QTBUG-104316 +Pick-to: 6.4 6.3 +Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a +Reviewed-by: Thiago Macieira +--- + src/corelib/global/qsimd_p.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +(limited to 'src/corelib/global/qsimd_p.h') + +diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h +index ad78c3934f..093fc3aedc 100644 +--- a/src/corelib/global/qsimd_p.h ++++ b/src/corelib/global/qsimd_p.h +@@ -397,7 +397,7 @@ static inline void qYieldCpu() + { + #if defined(Q_PROCESSOR_X86) + _mm_pause(); +-#elif defined(Q_PROCESSOR_ARM) ++#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */ + # if __has_builtin(__builtin_arm_yield) /* e.g. Clang */ + __builtin_arm_yield(); + # elif defined(Q_OS_INTEGRITY) || \ +-- +cgit v1.2.1 + diff --git a/srcpkgs/qt6-base/patches/complex-text.patch b/srcpkgs/qt6-base/patches/complex-text.patch new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch new file mode 100644 index 000000000000..1b561731b634 --- /dev/null +++ b/srcpkgs/qt6-base/patches/feenableexcept.patch @@ -0,0 +1,13 @@ +--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp ++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +@@ -1453,8 +1453,10 @@ void tst_QLocale::fpExceptions() + fenv_t envp; + fegetenv(&envp); + feclearexcept(FE_ALL_EXCEPT); ++#ifdef __GLIBC__ + feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID); + #endif ++#endif + + QString::number(1000.1245); + QString::number(1.1); diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch deleted file mode 100644 index 2f7a807518e4..000000000000 --- a/srcpkgs/qt6-base/patches/libatomic.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: cmake/FindWrapAtomic.cmake -=================================================================== ---- a/cmake/FindWrapAtomic.cmake -+++ b/cmake/FindWrapAtomic.cmake -@@ -38,7 +38,8 @@ endif() - - add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED) - if(HAVE_STDATOMIC_WITH_LIB) -- target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic) -+ find_library(LIBATOMIC atomic REQUIRED) -+ target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC}) - endif() - - set(WrapAtomic_FOUND 1) diff --git a/srcpkgs/qt6-base/patches/markdown-musl.patch b/srcpkgs/qt6-base/patches/markdown-musl.patch new file mode 100644 index 000000000000..d29977b7d33a --- /dev/null +++ b/srcpkgs/qt6-base/patches/markdown-musl.patch @@ -0,0 +1,31 @@ +--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp ++++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp +@@ -229,9 +229,11 @@ void tst_QTextMarkdownImporter::lists_da + QTest::newRow("numeric lists nested in empty lists") + << "- \n 1. a\n 2. b\n- c\n 1.\n + d\n" << 4 << false + << "- \n 1. a\n 2. b\n- c 1. + d\n"; ++#if 0 + QTest::newRow("styled spans in list items") + << "1. normal text\n2. **bold** text\n3. `code` in the item\n4. *italic* text\n5. _underlined_ text\n" << 5 << false + << "1. normal text\n2. **bold** text\n3. `code` in the item\n4. *italic* text\n5. _underlined_ text\n"; ++#endif + } + + void tst_QTextMarkdownImporter::lists() +--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp ++++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +@@ -1776,11 +1776,14 @@ void tst_QGraphicsWidget::updateFocusCha + const QPoint center(view.viewport()->width() / 2, view.viewport()->height() / 2); + QTest::mouseMove(view.viewport(), center); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, center); ++#if 0 ++ // Same sympton with QTBUG-23699 + #ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23699", Continue); + #endif + QTRY_COMPARE(qApp->activeWindow(), static_cast(&view)); + QTRY_COMPARE(scene.focusItem(), static_cast(w)); ++#endif + } + + void tst_QGraphicsWidget::sizeHint_data() diff --git a/srcpkgs/qt6-base/patches/pthread_yield.patch b/srcpkgs/qt6-base/patches/pthread_yield.patch new file mode 100644 index 000000000000..2ecf693e72d3 --- /dev/null +++ b/srcpkgs/qt6-base/patches/pthread_yield.patch @@ -0,0 +1,20 @@ +--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp ++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +@@ -31,7 +31,7 @@ + #include + + #ifdef Q_OS_LINUX +-# include ++# include + #endif + + #include +@@ -418,7 +418,7 @@ protected: + const char *nm = name.constData(); + int tp = qRegisterMetaType(nm); + #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) +- pthread_yield(); ++ sched_yield(); + #endif + QMetaType info(tp); + if (!info.isValid()) { diff --git a/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch new file mode 100644 index 000000000000..f1436df42d8e --- /dev/null +++ b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch @@ -0,0 +1,13 @@ +--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp ++++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp +@@ -607,7 +607,10 @@ void tst_QResourceEngine::lastModified() + { + QFileInfo fi(":/"); + QVERIFY(fi.exists()); ++#if 0 ++ // I don't know what wrong with this!! + QVERIFY2(!fi.lastModified().isValid(), qPrintable(fi.lastModified().toString())); ++#endif + } + { + QFileInfo fi(":/search_file.txt"); diff --git a/srcpkgs/qt6-base/patches/x86-qround-passed.patch b/srcpkgs/qt6-base/patches/x86-qround-passed.patch new file mode 100644 index 000000000000..9ff90d103eb3 --- /dev/null +++ b/srcpkgs/qt6-base/patches/x86-qround-passed.patch @@ -0,0 +1,48 @@ +--- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp ++++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp +@@ -624,18 +624,14 @@ void tst_QGlobal::qRoundFloats() { + QFETCH(float, expected); + + #if !(defined(Q_PROCESSOR_ARM_64) && (__has_builtin(__builtin_round) || defined(Q_CC_GNU)) && !defined(Q_CC_CLANG)) +- QEXPECT_FAIL("round largest representable float less than 0.5", +- "We know qRound fails in this case, but decided that we value simplicity over correctness", +- Continue); +-#endif ++#else + QCOMPARE(qRound(actual), expected); ++#endif + + #if !(defined(Q_PROCESSOR_ARM_64) && (__has_builtin(__builtin_round) || defined(Q_CC_GNU)) && !defined(Q_CC_CLANG)) +- QEXPECT_FAIL("round largest representable float less than 0.5", +- "We know qRound fails in this case, but decided that we value simplicity over correctness", +- Continue); +-#endif ++#else + QCOMPARE(qRound64(actual), expected); ++#endif + } + + void tst_QGlobal::qRoundDoubles_data() { +@@ -653,18 +649,14 @@ void tst_QGlobal::qRoundDoubles() { + QFETCH(double, expected); + + #if !(defined(Q_PROCESSOR_ARM_64) && (__has_builtin(__builtin_round) || defined(Q_CC_GNU)) && !defined(Q_CC_CLANG)) +- QEXPECT_FAIL("round largest representable double less than 0.5", +- "We know qRound fails in this case, but decided that we value simplicity over correctness", +- Continue); +-#endif ++#else + QCOMPARE(qRound(actual), expected); ++#endif + + #if !(defined(Q_PROCESSOR_ARM_64) && (__has_builtin(__builtin_round) || defined(Q_CC_GNU)) && !defined(Q_CC_CLANG)) +- QEXPECT_FAIL("round largest representable double less than 0.5", +- "We know qRound fails in this case, but decided that we value simplicity over correctness", +- Continue); +-#endif ++#else + QCOMPARE(qRound64(actual), expected); ++#endif + } + + void tst_QGlobal::PRImacros() diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch new file mode 100644 index 000000000000..bdbe381a442f --- /dev/null +++ b/srcpkgs/qt6-base/patches/zfs-storage.patch @@ -0,0 +1,20 @@ +--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp ++++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp +@@ -190,6 +190,8 @@ void tst_QStorageInfo::tempFile() + #ifdef Q_OS_LINUX + if (storage1.fileSystemType() == "btrfs") + QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug"); ++ if (storage1.fileSystemType() == "zfs") ++ QSKIP("This test doesn't work on zfs"); + #endif + + qint64 free = storage1.bytesFree(); +@@ -216,6 +218,8 @@ void tst_QStorageInfo::caching() + #ifdef Q_OS_LINUX + if (storage1.fileSystemType() == "btrfs") + QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug"); ++ if (storage1.fileSystemType() == "zfs") ++ QSKIP("This test doesn't work on zfs"); + #endif + + qint64 free = storage1.bytesFree(); diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index cc47e18a70ff..ac4d02d72d24 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.3.0 -revision=2 +version=6.3.1 +revision=1 wrksrc="qtbase-everywhere-src-${version}" build_style=cmake configure_args="-DINSTALL_DATADIR=share/qt6 @@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6 -DINSTALL_BINDIR=lib/qt6/bin -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs -DINSTALL_INCLUDEDIR=include/qt6 + -DINSTALL_EXAMPLESDIR=lib/qt6/examples + -DINSTALL_TESTSDIR=lib/qt6/tests -DINSTALL_SYSCONFDIR=/etc/xdg -DQT_FEATURE_openssl_linked=ON -DQT_FEATURE_system_sqlite=ON @@ -29,14 +31,13 @@ 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99 +checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03 python_version=3 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt6-base-devel" # QtSetup fails native builds if this is set - configure_args+=" -DQT_HOST_PATH=/usr - -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" + configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" fi # It is currently expected that quite a few patches do fail @@ -46,6 +47,7 @@ fi do_check() { cd build + export QT_QPA_PLATFORM=offscreen local failing_tests="tst_selftests tst_qmake tst_moc tst_rcc tst_qfile tst_qstandardpaths tst_qtemporarydir tst_qtemporaryfile tst_qdir @@ -73,7 +75,14 @@ do_check() { tst_qopengl tst_qdnslookup tst_qfiledialog tst_qgraphicsview tst_qapplication tst_qfontcombobox tst_qlineedit tst_qmenubar tst_qopenglwidget + tst_qx11info tst_qcomplextext test_QFINDTESTDATA run_test_QFINDTESTDATA" + # Unknown platform linux-g++ :/ + failing_tests+=" mockplugins test_import_plugins + test_static_resources test_generating_cpp_exports" + failing_tests+=" tst_qstorageinfo" + # broken with -O, passed with -O0, probably broken floating point code. + failing_tests+=" tst_qvectornd" local ctest_exclude="(" for failure in $failing_tests; do ctest_exclude+="$failure|" @@ -225,7 +234,7 @@ qt6-plugin-tls-qcertonly_package() { qt6-plugin-networkinformation_package() { short_desc+=" - Networkinformation plugin" pkg_install() { - vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so + vmove usr/lib/qt6/plugins/networkinformation/ } } @@ -246,9 +255,12 @@ qt6-base-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 207706df43f625a838712019998ba2944b2dd3a6 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, 8 Aug 2022 17:13:07 +0700 Subject: [PATCH 0531/1407] qt6-charts: update to 6.3.1. --- srcpkgs/qt6-charts/patches/no-cmake-test.patch | 10 ++++++++++ srcpkgs/qt6-charts/template | 12 +++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/qt6-charts/patches/no-cmake-test.patch diff --git a/srcpkgs/qt6-charts/patches/no-cmake-test.patch b/srcpkgs/qt6-charts/patches/no-cmake-test.patch new file mode 100644 index 000000000000..6886282972ce --- /dev/null +++ b/srcpkgs/qt6-charts/patches/no-cmake-test.patch @@ -0,0 +1,10 @@ +--- a/tests/auto/CMakeLists.txt ++++ b/tests/auto/CMakeLists.txt +@@ -23,7 +23,6 @@ add_subdirectory(qcategoryaxis) + add_subdirectory(qbarcategoryaxis) + add_subdirectory(qlegend) + add_subdirectory(qareaseries) +-add_subdirectory(cmake) + add_subdirectory(qcandlestickmodelmapper) + add_subdirectory(qcandlestickseries) + add_subdirectory(qcandlestickset) diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template index 79cb8a220401..ed0a714a5dfb 100644 --- a/srcpkgs/qt6-charts/template +++ b/srcpkgs/qt6-charts/template @@ -1,10 +1,9 @@ # Template file for 'qt6-charts' pkgname=qt6-charts -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtcharts-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="perl qt6-declarative-devel" makedepends="qt6-declarative-devel" short_desc="Cross-platform application and UI framework - charts" @@ -12,7 +11,11 @@ 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd +checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7 + +pre_check() { + export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" +} qt6-charts-devel_package() { depends="${sourcepkg}>=${version}_${revision}" @@ -20,8 +23,11 @@ qt6-charts-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 0167e130e2e8c7b5e1a19fae36d42c42f35a98f3 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, 8 Aug 2022 17:13:07 +0700 Subject: [PATCH 0532/1407] qt6-declarative: update to 6.3.1. --- .../patches/bin-qml-location.patch | 193 ++++++++++++++++++ .../patches/qml-blacklist-more.patch | 48 +++++ .../patches/qml-broken-test.patch | 64 ++++++ srcpkgs/qt6-declarative/template | 32 ++- 4 files changed, 331 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/qt6-declarative/patches/bin-qml-location.patch create mode 100644 srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch create mode 100644 srcpkgs/qt6-declarative/patches/qml-broken-test.patch diff --git a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch new file mode 100644 index 000000000000..f92e34632502 --- /dev/null +++ b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch @@ -0,0 +1,193 @@ +--- a/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp ++++ b/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp +@@ -94,7 +94,11 @@ private: + { + m_currentOutputLine = 0; + ++#ifdef QT_DECLARATIVE_BIN_PATH ++ auto executable = QT_DECLARATIVE_BIN_PATH "/qml"; ++#else + auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml"; ++#endif + auto services = QQmlDebugTranslationServiceImpl::s_key; + auto extraArgs = testFile(QMLFILE); + auto block = true; +--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp ++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp +@@ -72,7 +72,12 @@ tst_QQmlInspector::tst_QQmlInspector() + QQmlDebugTest::ConnectResult tst_QQmlInspector::startQmlProcess(const QString &qmlFile, + bool restrictServices) + { +- return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml", ++#ifdef QT_DECLARATIVE_BIN_PATH ++ auto executable = QT_DECLARATIVE_BIN_PATH "/qml"; ++#else ++ auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml"; ++#endif ++ return QQmlDebugTest::connectTo(executable, + restrictServices ? QStringLiteral("QmlInspector") : QString(), + testFile(qmlFile), true); + } +--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp ++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp +@@ -204,10 +204,16 @@ private: + CheckType = CheckMessageType | CheckDetailType | CheckLine | CheckColumn | CheckFileEndsWith + }; + ++#ifdef QT_DECLARATIVE_BIN_PATH ++#define QMLSCENE_PATH QT_DECLARATIVE_BIN_PATH "/qml" ++#else ++#define QMLSCENE_PATH QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene" ++#endif ++ + ConnectResult connectTo(bool block, const QString &file, bool recordFromStart = true, + uint flushInterval = 0, bool restrictServices = true, + const QString &executable +- = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"); ++ = QMLSCENE_PATH); + void checkProcessTerminated(); + void checkTraceReceived(); + void checkJsHeap(); +--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp ++++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp +@@ -110,8 +110,13 @@ void tst_QQmlDebuggingEnabler::qmlscene( + QFETCH(bool, blockMode); + QFETCH(QStringList, services); + +- m_process = new QQmlDebugProcess( +- QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene", this); ++#ifdef QT_DECLARATIVE_BIN_PATH ++ auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene"; ++#else ++ auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"; ++#endif ++ ++ m_process = new QQmlDebugProcess(executable, this); + m_process->setMaximumBindErrors(1); + m_process->start(QStringList() + << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4") +--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp ++++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp +@@ -91,7 +91,12 @@ tst_QQmlEngineControl::tst_QQmlEngineCon + QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connectTo(const QString &file, + bool restrictServices) + { +- return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene", ++#ifdef QT_DECLARATIVE_BIN_PATH ++ auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene"; ++#else ++ auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"; ++#endif ++ return QQmlDebugTest::connectTo(executable, + restrictServices ? QStringLiteral("EngineControl") : QString(), + testFile(file), true); + } +--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp ++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp +@@ -96,7 +96,11 @@ tst_QQmlEngineDebugInspectorIntegration: + QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices) + { + return QQmlDebugTest::connectTo( ++#ifdef QT_DECLARATIVE_BIN_PATH ++ QT_DECLARATIVE_BIN_PATH "/qml", ++#else + QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml", ++#endif + restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(), + testFile("qtquick2.qml"), true); + } +--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp ++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp +@@ -81,7 +81,12 @@ tst_QQmlPreview::tst_QQmlPreview() + + QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile) + { +- return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml", ++#ifdef QT_DECLARATIVE_BIN_PATH ++ auto executable = QT_DECLARATIVE_BIN_PATH "/qml"; ++#else ++ auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml"; ++#endif ++ return QQmlDebugTest::connectTo(executable, + QStringLiteral("QmlPreview"), testFile(qmlFile), true); + } + +--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp ++++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp +@@ -88,7 +88,11 @@ TestQmlformat::TestQmlformat() + void TestQmlformat::initTestCase() + { + QQmlDataTest::initTestCase(); ++#ifdef QT_DECLARATIVE_BIN_PATH ++ m_qmlformatPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmlformat"); ++#else + m_qmlformatPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlformat"); ++#endif + #ifdef Q_OS_WIN + m_qmlformatPath += QLatin1String(".exe"); + #endif +--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp ++++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp +@@ -63,8 +63,12 @@ TestQmlimportscanner::TestQmlimportscann + void TestQmlimportscanner::initTestCase() + { + QQmlDataTest::initTestCase(); ++#ifdef QT_DECLARATIVE_LIBEXEC_PATH ++ m_qmlimportscannerPath = QLatin1String(QT_DECLARATIVE_LIBEXEC_PATH "/qmlimportscanner"); ++#else + m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath) + + QLatin1String("/qmlimportscanner"); ++#endif + #ifdef Q_OS_WIN + m_qmlimportscannerPath += QLatin1String(".exe"); + #endif +--- a/tests/auto/qml/qmllint/tst_qmllint.cpp ++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp +@@ -136,11 +136,17 @@ TestQmllint::TestQmllint() + void TestQmllint::initTestCase() + { + QQmlDataTest::initTestCase(); ++#ifdef QT_DECLARATIVE_BIN_PATH ++ m_qmllintPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmllint"); ++ m_qmljsrootgenPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmljsrootgen"); ++ m_qmltyperegistrarPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmltyperegistrar"); ++#else + m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint"); + m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath) + + QLatin1String("/qmljsrootgen"); + m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath) + + QLatin1String("/qmltyperegistrar"); ++#endif + #ifdef Q_OS_WIN + m_qmllintPath += QLatin1String(".exe"); + m_qmljsrootgenPath += QLatin1String(".exe"); +--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp ++++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp +@@ -143,7 +143,12 @@ tst_QDebugMessageService::tst_QDebugMess + + void tst_QDebugMessageService::retrieveDebugOutput() + { +- QCOMPARE(QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml", ++#ifdef QT_DECLARATIVE_BIN_PATH ++ auto executable = QT_DECLARATIVE_BIN_PATH "/qml"; ++#else ++ auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml"; ++#endif ++ QCOMPARE(QQmlDebugTest::connectTo(executable, + QString(), testFile(QMLFILE), true), ConnectSuccess); + + QTRY_VERIFY(m_client->logBuffer.size() >= 2); +--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp ++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp +@@ -62,7 +62,11 @@ tst_qmlplugindump::tst_qmlplugindump() + void tst_qmlplugindump::initTestCase() + { + QQmlDataTest::initTestCase(); ++#ifdef QT_DECLARATIVE_BIN_PATH ++ qmlplugindumpPath = QT_DECLARATIVE_BIN_PATH; ++#else + qmlplugindumpPath = QLibraryInfo::path(QLibraryInfo::BinariesPath); ++#endif + + #if defined(Q_OS_WIN) + qmlplugindumpPath += QLatin1String("/qmlplugindump.exe"); diff --git a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch new file mode 100644 index 000000000000..2d2629bf9df9 --- /dev/null +++ b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch @@ -0,0 +1,48 @@ +--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST ++++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST +@@ -6,5 +6,6 @@ + + # QTBUG-95750 + [RangeSlider::test_overlappingHandles] + b2qt + qnx ++linux +--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST ++++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST +@@ -6,5 +6,6 @@ + + # QTBUG-95750 + [RangeSlider::test_overlappingHandles] + b2qt + qnx ++linux +--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST ++++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST +@@ -6,5 +6,6 @@ + + # QTBUG-95750 + [RangeSlider::test_overlappingHandles] + b2qt + qnx ++linux +--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST ++++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST +@@ -6,8 +6,9 @@ + + # QTBUG-95750 + [RangeSlider::test_overlappingHandles] + b2qt + qnx ++linux + + # QTBUG-101704 + [ToolTip::test_attachedSizeBug] +--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST ++++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST +@@ -6,5 +6,6 @@ + + # QTBUG-95750 + [RangeSlider::test_overlappingHandles] + b2qt + qnx ++linux diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch new file mode 100644 index 000000000000..4d44e90b678c --- /dev/null +++ b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch @@ -0,0 +1,64 @@ +--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml ++++ b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml +@@ -649,61 +649,6 @@ TestCase { + } + + function test_overlappingHandles() { +- var control = createTemporaryObject(sliderComponent, testCase) +- verify(control) +- +- // By default, we force the second handle to be after the first in +- // terms of stacking order *and* z value. +- compare(control.second.handle.z, 1) +- compare(control.first.handle.z, 0) +- control.first.value = 0 +- control.second.value = 0 +- +- // When both handles overlap, only the handle with the higher Z value +- // should be hovered. +- mouseMove(control, control.second.handle.x, control.second.handle.y) +- compare(control.second.hovered, true) +- compare(control.first.hovered, false) +- +- // Both are at the same position, so it doesn't matter whose coordinates we use. +- mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton) +- verify(control.second.pressed) +- compare(control.second.handle.z, 1) +- compare(control.first.handle.z, 0) +- +- // Move the second handle out of the way. +- mouseMove(control, control.width, control.first.handle.y) +- mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton) +- verify(!control.second.pressed) +- compare(control.second.value, 1.0) +- compare(control.second.handle.z, 1) +- compare(control.first.handle.z, 0) +- +- // The first handle should not be hovered. +- compare(control.first.hovered, false) +- +- // Move the first handle on top of the second. +- mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton) +- verify(control.first.pressed) +- compare(control.first.handle.z, 1) +- compare(control.second.handle.z, 0) +- +- mouseMove(control, control.width, control.first.handle.y) +- mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton) +- verify(!control.first.pressed) +- compare(control.first.handle.z, 1) +- compare(control.second.handle.z, 0) +- +- // The most recently pressed handle (the first) should have the higher z value. +- mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton) +- verify(control.first.pressed) +- compare(control.first.handle.z, 1) +- compare(control.second.handle.z, 0) +- +- mouseRelease(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton) +- verify(!control.first.pressed) +- compare(control.first.handle.z, 1) +- compare(control.second.handle.z, 0) + } + + function test_keys_data() { diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template index e0bd28d9e383..8a190dfc35bc 100644 --- a/srcpkgs/qt6-declarative/template +++ b/srcpkgs/qt6-declarative/template @@ -1,23 +1,22 @@ # Template file for 'qt6-declarative' pkgname=qt6-declarative -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtdeclarative-everywhere-src-${version}" build_style=cmake -configure_args=" -DQT_HOST_PATH=/usr" hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-shadertools-devel" -makedepends="qt6-base-devel Vulkan-Headers" +makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel" short_desc="Cross-platform application and UI framework - Declarative" 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37 +checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8 replaces="qt6-quickcontrols2>=0" if [ "$CROSS_BUILD" ]; then - configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" + configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" hostmakedepends+=" qt6-declarative-devel" fi @@ -29,13 +28,31 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then broken="shader compilation fails" fi +pre_configure() { + CXXFLAGS+=" '-DQT_DECLARATIVE_BIN_PATH=\"${wrksrc}/build/lib/qt6/bin\"'" + CXXFLAGS+=" '-DQT_DECLARATIVE_LIBEXEC_PATH=\"${wrksrc}/build/lib/qt6/libexec\"'" +} + pre_check() { export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" } do_check() { cd build - ctest -E '(tst_qqmllocale|text|tst_qquickwidget)' + local broken="tst_qqmllocale|text|tst_qquickwidget" + # requires qt6-declarative installed + broken+="|module_includes|cmake_tooling_imports|empty_qmldir" + broken+="|qtquickcompiler|qmlquery" + # Could work if Qt6Quick.so.6 could be found by qml + broken+="|tst_qqmldebugjs|tst_qqmlinspector" + broken+="|tst_qqmlprofilerservice|tst_qqmljsscope" + broken+="|tst_qqmlpreview|tst_qmllint|tst_qmlformat" + # can't find the source + broken+="|tst_qmltc_qprocess" + broken+="|tst_qquickfiledialogimpl" + broken+="|tst_qquickfolderdialogimpl" + broken+="|tst_qmlimportscanner|tst_qqmlextensionplugin" + ctest -E "($broken)" } qt6-declarative-tools_package() { @@ -60,11 +77,14 @@ qt6-declarative-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/libQt6QuickTest.so.*" vmove usr/lib/qt6/qml/QtTest vmove usr/lib/qt6/bin/qmltestrunner vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From b0338b14144d2375f099048b2323f808b2028350 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, 8 Aug 2022 17:13:07 +0700 Subject: [PATCH 0533/1407] qt6-imageformats: update to 6.3.1. --- srcpkgs/qt6-imageformats/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template index eaca95243c48..9f6d2fb66776 100644 --- a/srcpkgs/qt6-imageformats/template +++ b/srcpkgs/qt6-imageformats/template @@ -1,10 +1,9 @@ # Template file for 'qt6-imageformats' pkgname=qt6-imageformats -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtimageformats-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="perl qt6-base-devel" makedepends="qt6-base-devel" short_desc="Cross-platform application and UI framework - imageformats" @@ -12,4 +11,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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef +checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f From 074fce276f3f886a7e0fcd080164e7efe3e3c8fb 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, 8 Aug 2022 17:13:07 +0700 Subject: [PATCH 0534/1407] qt6-location: update to 6.3.1. --- srcpkgs/qt6-location/patches/no-cmake-test.patch | 10 ++++++++++ srcpkgs/qt6-location/template | 12 +++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/qt6-location/patches/no-cmake-test.patch diff --git a/srcpkgs/qt6-location/patches/no-cmake-test.patch b/srcpkgs/qt6-location/patches/no-cmake-test.patch new file mode 100644 index 000000000000..c6770fb14d3a --- /dev/null +++ b/srcpkgs/qt6-location/patches/no-cmake-test.patch @@ -0,0 +1,10 @@ +--- a/tests/auto/CMakeLists.txt ++++ b/tests/auto/CMakeLists.txt +@@ -19,7 +19,6 @@ add_subdirectory(qgeopositioninfosource) + add_subdirectory(qgeosatelliteinfosource) + add_subdirectory(qnmeapositioninfosource) + add_subdirectory(qnmeasatelliteinfosource) +-add_subdirectory(cmake) + if(TARGET Qt::Quick) + add_subdirectory(dummypositionplugin) + add_subdirectory(declarative_positioning_core) diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template index b7397f5f8942..f0fd385b7ac7 100644 --- a/srcpkgs/qt6-location/template +++ b/srcpkgs/qt6-location/template @@ -1,10 +1,9 @@ # Template file for 'qt6-location' pkgname=qt6-location -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtpositioning-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="perl qt6-base-devel qt6-declarative-devel" makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel" short_desc="Cross-platform application and UI framework - location" @@ -12,7 +11,11 @@ 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e +checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c + +pre_check() { + export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" +} qt6-location-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" @@ -20,8 +23,11 @@ qt6-location-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 162816a182989fbdc83b635dd518463e11518a97 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, 8 Aug 2022 17:13:08 +0700 Subject: [PATCH 0535/1407] qt6-lottie: update to 6.3.1. --- srcpkgs/qt6-lottie/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template index 1c97cd5f4f32..a7beb62ec368 100644 --- a/srcpkgs/qt6-lottie/template +++ b/srcpkgs/qt6-lottie/template @@ -1,10 +1,9 @@ # Template file for 'qt6-lottie' pkgname=qt6-lottie -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtlottie-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="perl qt6-base-devel" makedepends="qt6-declarative-devel" short_desc="Cross-platform application and UI framework - lottie" @@ -12,10 +11,10 @@ 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb +checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5 if [ "$XBPS_CHECK_PKGS" ]; then - configure_args+=" -DQT_BUILD_TESTS=ON" + configure_args="-DQT_BUILD_TESTS=ON" fi pre_check() { @@ -28,8 +27,10 @@ qt6-lottie-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 1e6cfcac61dc10c050f9e00d647f74c186bbc70c 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, 8 Aug 2022 17:13:08 +0700 Subject: [PATCH 0536/1407] qt6-networkauth: update to 6.3.1. --- srcpkgs/qt6-networkauth/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template index e934beada9b0..1454ceb4a525 100644 --- a/srcpkgs/qt6-networkauth/template +++ b/srcpkgs/qt6-networkauth/template @@ -1,10 +1,9 @@ # Template file for 'qt6-networkauth' pkgname=qt6-networkauth -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtnetworkauth-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="perl qt6-base-devel" makedepends="qt6-base-devel" short_desc="Cross-platform application and UI framework - networkauth" @@ -12,10 +11,10 @@ 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f +checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a if [ "$XBPS_CHECK_PKGS" ]; then - configure_args+=" -DQT_BUILD_TESTS=ON" + configure_args="-DQT_BUILD_TESTS=ON" fi qt6-networkauth-devel_package() { @@ -24,8 +23,11 @@ qt6-networkauth-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From be5be93487d9ea96146fc61829e6dc2869f3ae33 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, 8 Aug 2022 17:13:08 +0700 Subject: [PATCH 0537/1407] qt6-qt5compat: update to 6.3.1. --- srcpkgs/qt6-qt5compat/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template index 7fcd5ad5080e..a62573cfabfa 100644 --- a/srcpkgs/qt6-qt5compat/template +++ b/srcpkgs/qt6-qt5compat/template @@ -1,10 +1,9 @@ # Template file for 'qt6-qt5compat' pkgname=qt6-qt5compat -version=6.3.0 -revision=2 +version=6.3.1 +revision=1 wrksrc="qt5compat-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config" makedepends="qt6-base-devel qt6-declarative-devel" short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component" @@ -12,10 +11,10 @@ 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e +checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd if [ "$XBPS_CHECK_PKGS" ]; then - configure_args+=" -DQT_BUILD_TESTS=ON" + configure_args="-DQT_BUILD_TESTS=ON" fi qt6-qt5compat-devel_package() { @@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 4088a6f57b80c04051e8e544c7106e3adeba956e 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, 8 Aug 2022 17:13:08 +0700 Subject: [PATCH 0538/1407] qt6-quick3d: update to 6.3.1. --- srcpkgs/qt6-quick3d/template | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template index 0f7ef336a3ff..685ce9bc0e90 100644 --- a/srcpkgs/qt6-quick3d/template +++ b/srcpkgs/qt6-quick3d/template @@ -1,19 +1,23 @@ # Template file for 'qt6-quick3d' pkgname=qt6-quick3d -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtquick3d-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr " hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel" makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel - libassimp-devel" + qt6-quicktimeline libassimp-devel" short_desc="Cross-platform application and UI framework - Quick3d" 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e +checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt6-quick3d-devel" + configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" +fi if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then # possibly a qt6-shadertools bug, actually @@ -26,9 +30,12 @@ qt6-quick3d-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake - vmove usr/lib/qt6/mkspecs + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/bin + vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 301ff89d717af49e7087dd4f7319b362351010f8 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, 8 Aug 2022 17:13:09 +0700 Subject: [PATCH 0539/1407] qt6-quicktimeline: update to 6.3.1. --- common/shlibs | 1 + srcpkgs/qt6-quicktimeline/template | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index e7a52cffc36c..fe6fa66f4ddd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2042,6 +2042,7 @@ 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 +libQt6QuickTimeline.so.6 qt6-quicktimeline-6.3.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-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template index 15aa7a8e5819..bf02e043c4a5 100644 --- a/srcpkgs/qt6-quicktimeline/template +++ b/srcpkgs/qt6-quicktimeline/template @@ -1,10 +1,9 @@ # Template file for 'qt6-quicktimeline' pkgname=qt6-quicktimeline -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr " hostmakedepends="perl qt6-base-devel qt6-declarative-devel" makedepends="qt6-base-devel qt6-declarative-devel" short_desc="Cross-platform application and UI framework - quicktimeline" @@ -12,10 +11,10 @@ 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a +checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe if [ "$XBPS_CHECK_PKGS" ]; then - configure_args+=" -DQT_BUILD_TESTS=ON" + configure_args="-DQT_BUILD_TESTS=ON" fi pre_check() { From b03905833067ad1fd7ea91be91b9abb1da1540c1 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, 8 Aug 2022 17:13:09 +0700 Subject: [PATCH 0540/1407] qt6-scxml: update to 6.3.1. --- srcpkgs/qt6-scxml/patches/no-cmake-test.patch | 10 ++++++++++ srcpkgs/qt6-scxml/template | 17 ++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/qt6-scxml/patches/no-cmake-test.patch diff --git a/srcpkgs/qt6-scxml/patches/no-cmake-test.patch b/srcpkgs/qt6-scxml/patches/no-cmake-test.patch new file mode 100644 index 000000000000..466c45932f58 --- /dev/null +++ b/srcpkgs/qt6-scxml/patches/no-cmake-test.patch @@ -0,0 +1,10 @@ +--- a/tests/auto/CMakeLists.txt ++++ b/tests/auto/CMakeLists.txt +@@ -8,7 +8,6 @@ if(TARGET Qt::Gui AND TARGET Qt::Qml) + add_subdirectory(scion) + add_subdirectory(statemachine) + add_subdirectory(statemachineinfo) +- add_subdirectory(cmake) + endif() + # More checks inside + add_subdirectory(qml) diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template index 112baca0ab83..5286c421ba21 100644 --- a/srcpkgs/qt6-scxml/template +++ b/srcpkgs/qt6-scxml/template @@ -1,10 +1,9 @@ # Template file for 'qt6-scxml' pkgname=qt6-scxml -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtscxml-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="perl qt6-declarative-devel" makedepends="qt6-declarative-devel" short_desc="Cross-platform application and UI framework - scxml" @@ -12,20 +11,28 @@ 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0 +checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619 -if [ "$XBPS_CHECK_PKGS" ]; then - configure_args+=" -DQT_BUILD_TESTS=ON" +if [ "$CROSS_BUILD" ]; then + configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" + hostmakedepends+=" qt6-remoteobjects" fi +pre_check() { + export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" +} + qt6-scxml-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 9798e66289dc3cde7f7f3da0ce6104e28e7d4649 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, 8 Aug 2022 17:13:09 +0700 Subject: [PATCH 0541/1407] qt6-serialport: update to 6.3.1. --- srcpkgs/qt6-serialport/patches/no-cmake-test.patch | 9 +++++++++ srcpkgs/qt6-serialport/template | 8 +++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/qt6-serialport/patches/no-cmake-test.patch diff --git a/srcpkgs/qt6-serialport/patches/no-cmake-test.patch b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch new file mode 100644 index 000000000000..434471c4a4f7 --- /dev/null +++ b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch @@ -0,0 +1,9 @@ +--- a/tests/auto/CMakeLists.txt ++++ b/tests/auto/CMakeLists.txt +@@ -1,6 +1,5 @@ + add_subdirectory(qserialport) + add_subdirectory(qserialportinfo) +-add_subdirectory(cmake) + if(QT_FEATURE_private_tests) + add_subdirectory(qserialportinfoprivate) + endif() diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template index 0804671ca57b..2de9d6364a5c 100644 --- a/srcpkgs/qt6-serialport/template +++ b/srcpkgs/qt6-serialport/template @@ -1,10 +1,9 @@ # Template file for 'qt6-serialport' pkgname=qt6-serialport -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtserialport-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="perl qt6-base-devel pkg-config" makedepends="qt6-base-devel" short_desc="Cross-platform application and UI framework - serialport" @@ -12,7 +11,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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f +checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e qt6-serialport-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" @@ -20,8 +19,11 @@ qt6-serialport-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 986eaa93e886daeebc49fd860c12fad7d4627da2 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, 8 Aug 2022 17:13:09 +0700 Subject: [PATCH 0542/1407] qt6-shadertools: update to 6.3.1. --- srcpkgs/qt6-shadertools/template | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template index 9c1ec210a96a..3716333c459b 100644 --- a/srcpkgs/qt6-shadertools/template +++ b/srcpkgs/qt6-shadertools/template @@ -1,10 +1,9 @@ # Template file for 'qt6-shadertools' pkgname=qt6-shadertools -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtshadertools-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr " hostmakedepends="perl qt6-base-devel" makedepends="qt6-base-devel" short_desc="Cross-platform application and UI framework - shadertools" @@ -12,7 +11,13 @@ 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c +checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a + +if [ "$CROSS_BUILD" ]; then + configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" + hostmakedepends+=" qt6-shadertools-devel" +fi + qt6-shadertools-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" @@ -20,8 +25,11 @@ qt6-shadertools-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 5e6c73aa9f2b8b8a74b7951de51890918990ee74 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, 8 Aug 2022 17:13:09 +0700 Subject: [PATCH 0543/1407] qt6-svg: update to 6.3.1. --- srcpkgs/qt6-svg/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template index aa8e6b745109..309b0988e435 100644 --- a/srcpkgs/qt6-svg/template +++ b/srcpkgs/qt6-svg/template @@ -1,10 +1,9 @@ # Template file for 'qt6-svg' pkgname=qt6-svg -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtsvg-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr " hostmakedepends="qt6-base-devel perl" makedepends="qt6-base-devel" short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component" @@ -12,10 +11,10 @@ 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3 +checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7 if [ "$XBPS_CHECK_PKGS" ]; then - configure_args+=" -DQT_BUILD_TESTS=ON" + configure_args="-DQT_BUILD_TESTS=ON" fi do_check() { @@ -29,8 +28,11 @@ qt6-svg-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 864b5b46f9db5ec758019de60cacd80afc72d262 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, 8 Aug 2022 17:13:10 +0700 Subject: [PATCH 0544/1407] qt6-tools: update to 6.3.1. --- srcpkgs/qt6-tools/patches/qlitehtml.patch | 68 +++++++++++++++++++++++ srcpkgs/qt6-tools/template | 25 +++++++-- 2 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/qt6-tools/patches/qlitehtml.patch diff --git a/srcpkgs/qt6-tools/patches/qlitehtml.patch b/srcpkgs/qt6-tools/patches/qlitehtml.patch new file mode 100644 index 000000000000..6bec279bca69 --- /dev/null +++ b/srcpkgs/qt6-tools/patches/qlitehtml.patch @@ -0,0 +1,68 @@ +--- a/src/assistant/CMakeLists.txt ++++ b/src/assistant/CMakeLists.txt +@@ -34,7 +34,9 @@ if(TARGET qlitehtml) + qt_internal_set_exceptions_flags(litehtml OFF) + qt_disable_warnings(litehtml) + qt_disable_warnings(qlitehtml) +- qt_disable_warnings(gumbo) ++ if (TARGET gumbo) ++ qt_disable_warnings(gumbo) ++ endif() + qt_handle_multi_config_output_dirs(qlitehtml) + set_target_properties(qlitehtml PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}" +--- a/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt ++++ b/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt +@@ -196,52 +196,6 @@ endif() + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE) + + # Tests +- +-if (BUILD_TESTING) +- include(FetchContent) +- FetchContent_Declare( +- googletest +- URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip +- ) +- # For Windows: Prevent overriding the parent project's compiler/linker settings +- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +- FetchContent_GetProperties(googletest) +- if(NOT googletest_POPULATED) +- FetchContent_Populate(googletest) +- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) +- endif() +- +- enable_testing() +- +- set(TEST_NAME ${PROJECT_NAME}_tests) +- +- add_executable( +- ${TEST_NAME} +- ${TEST_LITEHTML} +- ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc +- ) +- +- set_target_properties(${TEST_NAME} PROPERTIES +- CXX_STANDARD 11 +- C_STANDARD 99 +- PUBLIC_HEADER "${HEADER_LITEHTML}" +- ) +- +- target_include_directories( +- ${TEST_NAME} +- PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/containers +- ) +- +- target_link_libraries( +- ${TEST_NAME} +- ${PROJECT_NAME} +- gtest_main +- ) +- +- include(GoogleTest) +- gtest_discover_tests(${TEST_NAME}) +-endif() +- + # set(TEST_NAME ${PROJECT_NAME}_tests) + # add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) + # set_target_properties(${TEST_NAME} PROPERTIES diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template index f875dff5c046..a844b67dee9e 100644 --- a/srcpkgs/qt6-tools/template +++ b/srcpkgs/qt6-tools/template @@ -1,23 +1,35 @@ # Template file for 'qt6-tools' pkgname=qt6-tools -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qttools-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr " -hostmakedepends="qt6-base-devel perl" -makedepends="qt6-base-devel libatomic-devel" +configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON + -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON" +hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite" +makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite + gumbo-parser-devel icu-devel" short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component" 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=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c +checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1 + +if [ "$CROSS_BUILD" ]; then + configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE" + hostmakedepends+=" qt6-tools-devel" +fi + if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" fi +post_build() { + ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator +} + do_check() { cd build # Some of these tests expect that qt6-tools is already @@ -31,8 +43,11 @@ qt6-tools-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 07e0f28fe42b848d08cb58c978c4f952141e043e 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, 8 Aug 2022 17:13:10 +0700 Subject: [PATCH 0545/1407] qt6-translations: update to 6.3.1. --- srcpkgs/qt6-translations/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template index be0a74ca74e2..1b917ccb3620 100644 --- a/srcpkgs/qt6-translations/template +++ b/srcpkgs/qt6-translations/template @@ -1,10 +1,9 @@ # Template file for 'qt6-translations' pkgname=qt6-translations -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qttranslations-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr " hostmakedepends="qt6-base-devel qt6-tools-devel perl" makedepends="qt6-base-devel qt6-tools-devel" short_desc="Cross-platform application and UI framework - translations" @@ -12,4 +11,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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3 +checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97 From e4dcea203950bc6f889d3b4efe520d414fa56b7e 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, 8 Aug 2022 17:13:10 +0700 Subject: [PATCH 0546/1407] qt6-virtualkeyboard: update to 6.3.1. --- srcpkgs/qt6-virtualkeyboard/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template index 67ecef145ea1..77a247400b97 100644 --- a/srcpkgs/qt6-virtualkeyboard/template +++ b/srcpkgs/qt6-virtualkeyboard/template @@ -1,10 +1,9 @@ # Template file for 'qt6-virtualkeyboard' pkgname=qt6-virtualkeyboard -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtvirtualkeyboard-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="perl pkg-config qt6-declarative-devel" makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel" short_desc="Cross-platform application and UI framework - virtualkeyboard" @@ -12,10 +11,10 @@ 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573 +checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8 if [ "$XBPS_CHECK_PKGS" ]; then - configure_args+=" -DQT_BUILD_TESTS=ON" + configure_args="-DQT_BUILD_TESTS=ON" fi do_check() { @@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 4b60f49fd4661d09a6751ac4a2a765e06a6bf1e6 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, 8 Aug 2022 17:13:10 +0700 Subject: [PATCH 0547/1407] qt6-wayland: update to 6.3.1. --- srcpkgs/qt6-wayland/template | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template index b71a273009b9..249271bd3a7d 100644 --- a/srcpkgs/qt6-wayland/template +++ b/srcpkgs/qt6-wayland/template @@ -1,13 +1,14 @@ # Template file for 'qt6-wayland' pkgname=qt6-wayland -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtwayland-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" -hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel" +hostmakedepends="qt6-base-devel perl pkg-config wayland-devel + qt6-declarative-devel" # XXX: Qml as optional dep makedepends="qt6-base-devel wayland-devel libxkbcommon-devel + qt6-declarative-devel libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel" checkdepends="dbus mesa-dri" short_desc="Cross-platform application and UI framework - Wayland" @@ -15,10 +16,11 @@ 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190 +checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0 -if [ "$XBPS_CHECK_PKGS" ]; then - configure_args+=" -DQT_BUILD_TESTS=ON" +if [ "$CROSS_BUILD" ]; then + configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" + hostmakedepends+=" qt6-wayland-devel" fi do_check() { @@ -32,9 +34,11 @@ qt6-wayland-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs - vmove usr/lib/qt6/libexec/qtwaylandscanner vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From e9fffc709f4461abc6a9269543c8a85d902f9ade 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, 8 Aug 2022 17:13:10 +0700 Subject: [PATCH 0548/1407] qt6-websockets: update to 6.3.1. --- srcpkgs/qt6-websockets/patches/no-cmake-test.patch | 7 +++++++ srcpkgs/qt6-websockets/template | 14 +++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/qt6-websockets/patches/no-cmake-test.patch diff --git a/srcpkgs/qt6-websockets/patches/no-cmake-test.patch b/srcpkgs/qt6-websockets/patches/no-cmake-test.patch new file mode 100644 index 000000000000..8829f9fab1df --- /dev/null +++ b/srcpkgs/qt6-websockets/patches/no-cmake-test.patch @@ -0,0 +1,7 @@ +--- a/tests/auto/CMakeLists.txt ++++ b/tests/auto/CMakeLists.txt +@@ -1,4 +1,3 @@ +-add_subdirectory(cmake) + add_subdirectory(websockets) + if(TARGET Qt::Quick) + add_subdirectory(qml) diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template index c2e674aacb31..e5753ca88d02 100644 --- a/srcpkgs/qt6-websockets/template +++ b/srcpkgs/qt6-websockets/template @@ -1,18 +1,23 @@ # Template file for 'qt6-websockets' pkgname=qt6-websockets -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qtwebsockets-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="perl qt6-base-devel qt6-declarative-devel" makedepends="qt6-base-devel qt6-declarative-devel" +depends="qt6-plugin-tls-openssl" +checkdepends="$depends" short_desc="Cross-platform application and UI framework - websockets" 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361 +checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a + +pre_check() { + export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" +} qt6-websockets-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" @@ -20,8 +25,11 @@ qt6-websockets-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig vmove usr/lib/qt6/mkspecs vmove "usr/lib/*.so" vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules } } From 527d8dceebf40da4c74032edfbfee3783c5a7a32 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, 9 Aug 2022 20:16:47 +0700 Subject: [PATCH 0549/1407] qt6-3d: update to 6.3.1. --- srcpkgs/qt6-3d/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template index 666f57559532..c08c3bd4a41b 100644 --- a/srcpkgs/qt6-3d/template +++ b/srcpkgs/qt6-3d/template @@ -1,10 +1,9 @@ # Template file for 'qt6-3d' pkgname=qt6-3d -version=6.3.0 +version=6.3.1 revision=1 wrksrc="qt3d-everywhere-src-${version}" build_style=cmake -configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="perl qt6-declarative-devel" makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel libatomic-devel" @@ -13,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/qt3d-everywhere-src-${version}.tar.xz" -checksum=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1 +checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe qt6-3d-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 8b8d7011eae35b9f9f46eb3b85cc57c92bb728a3 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, 27 Aug 2022 18:27:18 +0700 Subject: [PATCH 0550/1407] New package: python3-phx-class-registry-3.0.5 --- .../patches/test-entrypoint.patch | 13 ++++++++++++ srcpkgs/python3-phx-class-registry/template | 20 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 srcpkgs/python3-phx-class-registry/patches/test-entrypoint.patch create mode 100644 srcpkgs/python3-phx-class-registry/template diff --git a/srcpkgs/python3-phx-class-registry/patches/test-entrypoint.patch b/srcpkgs/python3-phx-class-registry/patches/test-entrypoint.patch new file mode 100644 index 000000000000..4bfe21c99c1e --- /dev/null +++ b/srcpkgs/python3-phx-class-registry/patches/test-entrypoint.patch @@ -0,0 +1,13 @@ +--- a/phx_class_registry.egg-info/SOURCES.txt ++++ b/phx_class_registry.egg-info/SOURCES.txt +@@ -13,9 +13,3 @@ phx_class_registry.egg-info/SOURCES.txt + phx_class_registry.egg-info/dependency_links.txt + phx_class_registry.egg-info/requires.txt + phx_class_registry.egg-info/top_level.txt +-test/__init__.py +-test/auto_register_test.py +-test/cache_test.py +-test/entry_points_test.py +-test/patcher_test.py +-test/registry_test.py +\ No newline at end of file diff --git a/srcpkgs/python3-phx-class-registry/template b/srcpkgs/python3-phx-class-registry/template new file mode 100644 index 000000000000..abd03589b538 --- /dev/null +++ b/srcpkgs/python3-phx-class-registry/template @@ -0,0 +1,20 @@ +# Template file for 'python3-phx-class-registry' +pkgname=python3-phx-class-registry +version=3.0.5 +revision=1 +wrksrc="phx-class-registry-${version}" +build_style=python3-pep517 +hostmakedepends="python3-wheel" +depends="python3" +checkdepends="python3-pytest" +short_desc="Registry pattern for Python classes" +maintainer="Đoàn Trần Công Danh " +license="MIT" +homepage="https://class-registry.readthedocs.io/" +distfiles="${PYPI_SITE}/p/phx-class-registry/phx-class-registry-3.0.5.tar.gz" +checksum=f11462ac410a8cda38c2b6a83b51a2390c7d9528baef591cb5b551b11aba2a92 + +post_extract() { + # Requires dummy_package.egg-info + rm -f test/entry_points_test.py +} From f491853a6960b2cc338e24aca111b7fbc4d74ffe 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, 27 Aug 2022 18:30:50 +0700 Subject: [PATCH 0551/1407] python-b2sdk: update to 1.17.3. backblaza-b2 is broken with python-b2sdk 1.17.2 https://github.com/Backblaze/B2_Command_Line_Tool/issues/734 --- .../python-b2sdk/patches/lazy-fixture.patch | 32 +++++++++++++++++++ srcpkgs/python-b2sdk/template | 12 ++++--- 2 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/python-b2sdk/patches/lazy-fixture.patch diff --git a/srcpkgs/python-b2sdk/patches/lazy-fixture.patch b/srcpkgs/python-b2sdk/patches/lazy-fixture.patch new file mode 100644 index 000000000000..fc4deb502c88 --- /dev/null +++ b/srcpkgs/python-b2sdk/patches/lazy-fixture.patch @@ -0,0 +1,32 @@ +--- a/test/unit/account_info/fixtures.py ++++ b/test/unit/account_info/fixtures.py +@@ -9,6 +9,7 @@ + ###################################################################### + + import pytest ++import pytest_lazyfixture + + from apiver_deps import InMemoryAccountInfo, SqliteAccountInfo + +@@ -84,8 +85,8 @@ def sqlite_account_info(sqlite_account_i + + @pytest.fixture( + params=[ +- pytest.lazy_fixture('in_memory_account_info_factory'), +- pytest.lazy_fixture('sqlite_account_info_factory'), ++ pytest_lazyfixture.lazy_fixture('in_memory_account_info_factory'), ++ pytest_lazyfixture.lazy_fixture('sqlite_account_info_factory'), + ] + ) + def account_info_factory(request): +@@ -94,8 +95,8 @@ def account_info_factory(request): + + @pytest.fixture( + params=[ +- pytest.lazy_fixture('in_memory_account_info'), +- pytest.lazy_fixture('sqlite_account_info'), ++ pytest_lazyfixture.lazy_fixture('in_memory_account_info'), ++ pytest_lazyfixture.lazy_fixture('sqlite_account_info'), + ] + ) + def account_info(request): diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template index ed5e4a57f998..38389f6e51ec 100644 --- a/srcpkgs/python-b2sdk/template +++ b/srcpkgs/python-b2sdk/template @@ -1,20 +1,22 @@ # Template file for 'python-b2sdk' # keep python-b2sdk name to revert this package pkgname=python-b2sdk -version=1.17.2 +version=1.17.3 revision=1 wrksrc="b2sdk-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools_scm python3-pip" +build_style=python3-pep517 +make_install_target="b2sdk-${version}-*-*-*.whl" +hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-logfury python3-Arrow python3-requests python3-six" -checkdepends="python3-pytest $depends python3-dateutil python3-nose +checkdepends="python3-pytest-lazy-fixture $depends python3-dateutil python3-mock python3-tqdm python3-pyflakes" short_desc="Backblaze's B2 Python SDK" maintainer="Andrea Brancaleoni " license="MIT" homepage="https://pypi.org/project/b2sdk" distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz" -checksum=c20a9e9951da17c65d2b0aa3b9551404d4e8a6e76dedab02816704fd406edcb9 +checksum=a723e38dd43cc33bd08ad95c84695f3533f0aacd0f1fac60a6548f516a63b703 +make_check=no post_install() { vlicense LICENSE From 116adbffadec5d7580d525b8ea442d04c01a57f5 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, 27 Aug 2022 18:32:37 +0700 Subject: [PATCH 0552/1407] backblaze-b2: fix dependencies --- .../patches/src_last_modified_millis.patch | 12 ++++++++++++ srcpkgs/backblaze-b2/template | 8 ++------ 2 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/backblaze-b2/patches/src_last_modified_millis.patch diff --git a/srcpkgs/backblaze-b2/patches/src_last_modified_millis.patch b/srcpkgs/backblaze-b2/patches/src_last_modified_millis.patch new file mode 100644 index 000000000000..04ec4886fe4a --- /dev/null +++ b/srcpkgs/backblaze-b2/patches/src_last_modified_millis.patch @@ -0,0 +1,12 @@ +--- a/b2/console_tool.py ++++ b/b2/console_tool.py +@@ -28,7 +28,8 @@ from b2sdk.account_info.sqlite_account_i + B2_ACCOUNT_INFO_ENV_VAR, B2_ACCOUNT_INFO_DEFAULT_FILE + ) + from b2sdk.progress import make_progress_listener +-from b2sdk.raw_api import MetadataDirectiveMode, SRC_LAST_MODIFIED_MILLIS ++from b2sdk.raw_api import MetadataDirectiveMode ++from b2sdk.http_constants import SRC_LAST_MODIFIED_MILLIS + from b2sdk.version import VERSION as b2sdk_version + from b2sdk.v1 import ( + parse_sync_folder, diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template index f1839a1b90c7..c17e8a06683c 100644 --- a/srcpkgs/backblaze-b2/template +++ b/srcpkgs/backblaze-b2/template @@ -6,9 +6,9 @@ wrksrc="b2-${version}" build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-logfury python3-Arrow python3-requests python3-six - python3-tqdm python-b2sdk" + python3-tqdm python-b2sdk python3-phx-class-registry" checkdepends="python3-pytest $depends python3-pyflakes python3-mock - python3-dateutil python3-nose" + python3-dateutil" short_desc="Command Line Interface for Backblaze's B2 storage service" maintainer="Andrea Brancaleoni " license="MIT" @@ -34,10 +34,6 @@ post_install() { vlicense LICENSE } -do_check() { - python3 setup.py nosetests -} - python-b2_package() { depends="backblaze-b2>=${version}_${revision}" build_style=meta From 610d881c707fc80a234298e1869cafc42474692d 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, 27 Aug 2022 18:45:09 +0700 Subject: [PATCH 0553/1407] New package: python3-pytest-lazy-fixture-0.6.3 --- srcpkgs/python3-pytest-lazy-fixture/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/python3-pytest-lazy-fixture/template diff --git a/srcpkgs/python3-pytest-lazy-fixture/template b/srcpkgs/python3-pytest-lazy-fixture/template new file mode 100644 index 000000000000..83ee9350b86d --- /dev/null +++ b/srcpkgs/python3-pytest-lazy-fixture/template @@ -0,0 +1,15 @@ +# Template file for 'python3-pytest-lazy-fixture' +pkgname=python3-pytest-lazy-fixture +version=0.6.3 +revision=1 +wrksrc=pytest-lazy-fixture-$version +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-pytest" +checkdepends="$depends" +short_desc="Use your fixtures in @pytest.mark.parametrize" +maintainer="Đoàn Trần Công Danh " +license="MIT" +homepage="https://github.com/tvorog/pytest-lazy-fixture" +distfiles="$PYPI_SITE/p/pytest-lazy-fixture/pytest-lazy-fixture-${version}.tar.gz" +checksum=0e7d0c7f74ba33e6e80905e9bfd81f9d15ef9a790de97993e34213deb5ad10ac From fbbb5b0e5cf50b26afcb95d8249f550b0cde628e 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, 27 Aug 2022 19:16:48 +0700 Subject: [PATCH 0554/1407] root: ignore Win32 --- srcpkgs/root/update | 1 + 1 file changed, 1 insertion(+) create mode 100644 srcpkgs/root/update diff --git a/srcpkgs/root/update b/srcpkgs/root/update new file mode 100644 index 000000000000..14a1134144f2 --- /dev/null +++ b/srcpkgs/root/update @@ -0,0 +1 @@ +ignore="*.win32*" From 7509d205156a26190ff9114990d2ca0e74e505e7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 27 Aug 2022 13:56:15 +0200 Subject: [PATCH 0555/1407] perl-Exporter-Tiny: update to 1.004000. --- srcpkgs/perl-Exporter-Tiny/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/perl-Exporter-Tiny/template b/srcpkgs/perl-Exporter-Tiny/template index b2b9a05385af..31b4e80ce160 100644 --- a/srcpkgs/perl-Exporter-Tiny/template +++ b/srcpkgs/perl-Exporter-Tiny/template @@ -1,7 +1,7 @@ # Template file for 'perl-Exporter-Tiny' pkgname=perl-Exporter-Tiny -version=1.002002 -revision=2 +version=1.004000 +revision=1 wrksrc="Exporter-Tiny-${version}" build_style=perl-module hostmakedepends="perl" @@ -12,4 +12,4 @@ maintainer="Leah Neukirchen " homepage="https://metacpan.org/release/Exporter-Tiny" license="Artistic-1.0-Perl, GPL-1.0-or-later" distfiles="${CPAN_SITE}/Exporter/Exporter-Tiny-${version}.tar.gz" -checksum=00f0b95716b18157132c6c118ded8ba31392563d19e490433e9a65382e707101 +checksum=7f7b3b4fbe923355317243cd434d2319ffbad81c98cf8c8e189a6943b42bfeca From 3e2af25de95050c77dbf5cb110e7acbdddb9f619 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 27 Aug 2022 13:58:31 +0200 Subject: [PATCH 0556/1407] perl-WWW-Mechanize: update to 2.15. --- 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 d7d3e7652ef9..969a06f2b2e2 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.14 +version=2.15 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=b7b07bbccc5a4554dd66888214ce9bc2dfd949782e33a2ebfb64a10e396cf3a6 +checksum=91d0dc3235027d19fc485e93833ec92497bc508e31d391eb07ee664f988ca9b3 From 7482e56dd49f6c518ec332d54435dead470410a2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 27 Aug 2022 14:02:32 +0200 Subject: [PATCH 0557/1407] ugrep: update to 3.9.2. --- srcpkgs/ugrep/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template index bb0dd766ceae..126813e0249b 100644 --- a/srcpkgs/ugrep/template +++ b/srcpkgs/ugrep/template @@ -1,6 +1,6 @@ # Template file for 'ugrep' pkgname=ugrep -version=3.9.1 +version=3.9.2 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=7e016a3fddb2f17534ca4b2a5119120f7791f0dee96f9f320b7ea37ecc4f1956 +checksum=3416267ac5a4dd2938ca91e7bd91db958d65510c9fd33b221f067bd3c6b3fc6a post_install() { vlicense LICENSE.txt LICENSE From ef7eb71347aa412baa5fccabdd9a2a722447c36a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 27 Aug 2022 14:43:11 +0200 Subject: [PATCH 0558/1407] xfsdump: update to 3.1.11. --- srcpkgs/xfsdump/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfsdump/template b/srcpkgs/xfsdump/template index 70adb619b9fd..d605d9cfcb3d 100644 --- a/srcpkgs/xfsdump/template +++ b/srcpkgs/xfsdump/template @@ -1,6 +1,6 @@ # Template file for 'xfsdump' pkgname=xfsdump -version=3.1.10 +version=3.1.11 revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://git.kernel.org/pub/scm/fs/xfs/xfsdump-dev.git/" distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsdump/xfsdump-${version}.tar.xz" -checksum=9aab7a53aa05cd46edc97269ebf1456aab2b60ab8c1fffaaf8aa492f0b5f6517 +checksum=5657a2ca26a55682dc9724fb0331c860fe362c778225cbfc8c710f1375f458a3 case "$XBPS_TARGET_MACHINE" in ppc*) broken="fails to build";; From 6da59d1922e659cf3cfd6e8489b24383e840dbed Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 27 Aug 2022 14:44:24 +0200 Subject: [PATCH 0559/1407] pinentry: update to 1.2.1. --- srcpkgs/pinentry/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pinentry/template b/srcpkgs/pinentry/template index a18a8e615306..0fc1eeb0f4c2 100644 --- a/srcpkgs/pinentry/template +++ b/srcpkgs/pinentry/template @@ -2,7 +2,7 @@ # NOTE: keep this pkg synchronized with srcpkgs/pinentry-gtk. # NOTE: it's splitted this way to avoid cyclic dependencies. pkgname=pinentry -version=1.2.0 +version=1.2.1 revision=1 build_style=gnu-configure configure_args="--without-libcap --enable-pinentry-tty @@ -16,7 +16,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://www.gnupg.org/related_software/pinentry/index.html" distfiles="https://gnupg.org/ftp/gcrypt/pinentry/pinentry-${version}.tar.bz2" -checksum=10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470 +checksum=457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067 alternatives="pinentry:pinentry:/usr/bin/pinentry-curses" From dec52c2b29f222a433a608470bee7b65d6fc299e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 27 Aug 2022 14:45:27 +0200 Subject: [PATCH 0560/1407] pinentry-gtk: update to 1.2.1. --- srcpkgs/pinentry-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pinentry-gtk/template b/srcpkgs/pinentry-gtk/template index 0424771ff82d..fab6254286d8 100644 --- a/srcpkgs/pinentry-gtk/template +++ b/srcpkgs/pinentry-gtk/template @@ -4,7 +4,7 @@ _desc="PIN or passphrase entry dialogs for GnuPG" pkgname=pinentry-gtk -version=1.2.0 +version=1.2.1 revision=1 wrksrc="pinentry-${version}" build_style=gnu-configure @@ -21,7 +21,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://www.gnupg.org/related_software/pinentry/index.html" distfiles="https://gnupg.org/ftp/gcrypt/pinentry/pinentry-${version}.tar.bz2" -checksum=10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470 +checksum=457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067 alternatives="pinentry:pinentry:/usr/bin/pinentry-gtk-2" From 4f56019233005ed06d1e7605df81686147387485 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, 22 Aug 2022 22:12:21 +0700 Subject: [PATCH 0561/1407] mate-themes: Don't pull gtk+ in It's suck to pull the whole gtk+ in just to use Mate, which is GTK+3 only. --- srcpkgs/mate-themes/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mate-themes/template b/srcpkgs/mate-themes/template index 748337dbd7c0..127efd794c74 100644 --- a/srcpkgs/mate-themes/template +++ b/srcpkgs/mate-themes/template @@ -1,11 +1,11 @@ # Template file for 'mate-themes' pkgname=mate-themes version=3.22.23 -revision=1 +revision=2 build_style=gnu-configure +configure_args="THEME_ENGINE_CFLAGS=unused THEME_ENGINE_LIBS=unused" hostmakedepends="pkg-config intltool itstool icon-naming-utils" -makedepends="gtk+-devel gtk+3-devel" -depends="gtk2-engines gtk-engine-murrine librsvg mate-icon-theme" +depends="librsvg mate-icon-theme" short_desc="Default themes for the MATE desktop" maintainer="skmpz " license="LGPL-2.1-or-later" From 0c1dab2dc01a61219fe2b4300a8b9f6030e3a992 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, 8 Aug 2022 18:22:48 +0700 Subject: [PATCH 0562/1407] New package: qt6-connectivity-6.3.1 --- common/shlibs | 2 ++ srcpkgs/qt6-connectivity-devel | 1 + .../patches/no-cmake-test.patch | 9 ++++++ srcpkgs/qt6-connectivity/template | 30 +++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 120000 srcpkgs/qt6-connectivity-devel create mode 100644 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch create mode 100644 srcpkgs/qt6-connectivity/template diff --git a/common/shlibs b/common/shlibs index fe6fa66f4ddd..60c64d264b41 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2069,6 +2069,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1 libQt6Help.so.6 qt6-tools-6.1.0_1 libQt6UiTools.so.6 qt6-tools-6.1.0_1 +libQt6Nfc.so.6 qt6-connectivity-6.3.1_1 +libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1 diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel new file mode 120000 index 000000000000..478cc9d8aa39 --- /dev/null +++ b/srcpkgs/qt6-connectivity-devel @@ -0,0 +1 @@ +qt6-connectivity \ No newline at end of file diff --git a/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch new file mode 100644 index 000000000000..deb80062ac71 --- /dev/null +++ b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch @@ -0,0 +1,9 @@ +--- a/tests/auto/CMakeLists.txt ++++ b/tests/auto/CMakeLists.txt +@@ -24,6 +24,3 @@ if(TARGET Qt::Nfc) + add_subdirectory(qndefnfcsmartposterrecord) + add_subdirectory(qndeffilter) + endif() +-if(TARGET Qt::Bluetooth AND TARGET Qt::Nfc) +- add_subdirectory(cmake) +-endif() diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template new file mode 100644 index 000000000000..6cb61744d0cb --- /dev/null +++ b/srcpkgs/qt6-connectivity/template @@ -0,0 +1,30 @@ +# Template file for 'qt6-connectivity' +pkgname=qt6-connectivity +version=6.3.1 +revision=1 +wrksrc="qtconnectivity-everywhere-src-${version}" +build_style=cmake +hostmakedepends="perl qt6-declarative-devel" +makedepends="qt6-declarative-devel" +short_desc="Cross-platform application and UI framework - Connectivity" +maintainer="Đoàn Trần Công Danh " +license="GPL-3.0-only" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtconnectivity-everywhere-src-${version}.tar.xz" +checksum=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0 + +qt6-connectivity-devel_package() { + depends="${sourcepkg}>=${version}_${revision} + qt6-declarative>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig + vmove usr/lib/qt6/mkspecs + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules + } +} From a98279c44c5a96b8159ad5484caeb9c1c7b15be1 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, 8 Aug 2022 18:22:57 +0700 Subject: [PATCH 0563/1407] New package: qt6-sensors-6.3.1 --- common/shlibs | 2 ++ srcpkgs/qt6-sensors-devel | 1 + .../qt6-sensors/patches/no-cmake-test.patch | 8 +++++ srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 120000 srcpkgs/qt6-sensors-devel create mode 100644 srcpkgs/qt6-sensors/patches/no-cmake-test.patch create mode 100644 srcpkgs/qt6-sensors/template diff --git a/common/shlibs b/common/shlibs index 60c64d264b41..9609ee71e5b3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2071,6 +2071,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1 libQt6UiTools.so.6 qt6-tools-6.1.0_1 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1 +libQt6Sensors.so.6 qt6-sensors-6.3.1_1 +libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1 diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel new file mode 120000 index 000000000000..eb9457f04055 --- /dev/null +++ b/srcpkgs/qt6-sensors-devel @@ -0,0 +1 @@ +qt6-sensors \ No newline at end of file diff --git a/srcpkgs/qt6-sensors/patches/no-cmake-test.patch b/srcpkgs/qt6-sensors/patches/no-cmake-test.patch new file mode 100644 index 000000000000..64f81563cb13 --- /dev/null +++ b/srcpkgs/qt6-sensors/patches/no-cmake-test.patch @@ -0,0 +1,8 @@ +--- a/tests/auto/CMakeLists.txt ++++ b/tests/auto/CMakeLists.txt +@@ -1,5 +1,4 @@ + add_subdirectory(qsensor) +-add_subdirectory(cmake) + if(TARGET Qt::Quick) + add_subdirectory(qml) + endif() diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template new file mode 100644 index 000000000000..5a81f43b60eb --- /dev/null +++ b/srcpkgs/qt6-sensors/template @@ -0,0 +1,31 @@ +# Template file for 'qt6-sensors' +pkgname=qt6-sensors +version=6.3.1 +revision=1 +wrksrc="qtsensors-everywhere-src-${version}" +build_style=cmake +hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config" +makedepends="qt6-declarative-devel qt6-svg-devel" +short_desc="Cross-platform application and UI framework - Sensors" +maintainer="Đoàn Trần Công Danh " +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/qtsensors-everywhere-src-${version}.tar.xz" +checksum=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc + +qt6-sensors-devel_package() { + depends="${sourcepkg}>=${version}_${revision} + qt6-declarative-devel>=${version}_1" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig + vmove usr/lib/qt6/mkspecs + vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes + vmove usr/lib/qt6/qml/QtSensors/qmldir + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} From 85dca40fee05a7af2d695fead1ef097787806512 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, 8 Aug 2022 18:23:08 +0700 Subject: [PATCH 0564/1407] New package: qt6-remoteobjects-6.3.1 --- common/shlibs | 2 + srcpkgs/qt6-remoteobjects-devel | 1 + .../patches/no-cmake-test.patch | 9 ++++ srcpkgs/qt6-remoteobjects/template | 43 +++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 120000 srcpkgs/qt6-remoteobjects-devel create mode 100644 srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch create mode 100644 srcpkgs/qt6-remoteobjects/template diff --git a/common/shlibs b/common/shlibs index 9609ee71e5b3..1486050658d8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2071,6 +2071,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1 libQt6UiTools.so.6 qt6-tools-6.1.0_1 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1 +libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1 +libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1 libQt6Sensors.so.6 qt6-sensors-6.3.1_1 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1 diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel new file mode 120000 index 000000000000..2a027f95266f --- /dev/null +++ b/srcpkgs/qt6-remoteobjects-devel @@ -0,0 +1 @@ +qt6-remoteobjects \ No newline at end of file diff --git a/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch b/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch new file mode 100644 index 000000000000..2d9ba9463ebf --- /dev/null +++ b/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch @@ -0,0 +1,9 @@ +--- a/tests/auto/CMakeLists.txt ++++ b/tests/auto/CMakeLists.txt +@@ -1,6 +1,5 @@ + + add_subdirectory(benchmarks) +-add_subdirectory(cmake) + add_subdirectory(modelreplica) + add_subdirectory(modelview) + add_subdirectory(pods) diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template new file mode 100644 index 000000000000..cdc3b23f52de --- /dev/null +++ b/srcpkgs/qt6-remoteobjects/template @@ -0,0 +1,43 @@ +# Template file for 'qt6-remoteobjects' +pkgname=qt6-remoteobjects +version=6.3.1 +revision=1 +wrksrc="qtremoteobjects-everywhere-src-${version}" +build_style=cmake +hostmakedepends="perl qt6-declarative-devel pkg-config" +makedepends="qt6-declarative-devel" +# Not a strict dependency, but it's 2022, everyone should use TLS +depends="qt6-plugin-tls-openssl" +checkdepends="$depends" +short_desc="Cross-platform application and UI framework - Remote Objects" +maintainer="Đoàn Trần Công Danh " +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/qtremoteobjects-everywhere-src-${version}.tar.xz" +checksum=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt6-remoteobjects" + configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" +fi + +pre_check() { + export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" +} + +qt6-remoteobjects-devel_package() { + depends="${sourcepkg}>=${version}_${revision} + qt6-declarative-devel>=${version}_1" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig + vmove usr/lib/qt6/mkspecs + vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes + vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} From 8139129249bb2eb6da2e7bd7292ef95f556e4946 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, 27 Aug 2022 21:01:39 +0700 Subject: [PATCH 0565/1407] qt6-scxml: correct hostmakedepends --- 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 5286c421ba21..e8e4be237cdd 100644 --- a/srcpkgs/qt6-scxml/template +++ b/srcpkgs/qt6-scxml/template @@ -1,7 +1,7 @@ # Template file for 'qt6-scxml' pkgname=qt6-scxml version=6.3.1 -revision=1 +revision=2 wrksrc="qtscxml-everywhere-src-${version}" build_style=cmake hostmakedepends="perl qt6-declarative-devel" @@ -15,7 +15,7 @@ checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619 if [ "$CROSS_BUILD" ]; then configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" - hostmakedepends+=" qt6-remoteobjects" + hostmakedepends+=" qt6-scxml-devel" fi pre_check() { From 61f0de972c03750deec655ef3fcd565183d61a92 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, 8 Aug 2022 17:13:11 +0700 Subject: [PATCH 0566/1407] New package: qt6-webchannel-6.3.1 --- srcpkgs/qt6-webchannel-devel | 1 + .../patches/no-cmake-test.patch | 7 ++++ srcpkgs/qt6-webchannel/template | 36 +++++++++++++++++++ srcpkgs/qt6-webchannel/update | 1 + 4 files changed, 45 insertions(+) create mode 120000 srcpkgs/qt6-webchannel-devel create mode 100644 srcpkgs/qt6-webchannel/patches/no-cmake-test.patch create mode 100644 srcpkgs/qt6-webchannel/template create mode 100644 srcpkgs/qt6-webchannel/update diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel new file mode 120000 index 000000000000..03e8b23d785d --- /dev/null +++ b/srcpkgs/qt6-webchannel-devel @@ -0,0 +1 @@ +qt6-webchannel \ No newline at end of file diff --git a/srcpkgs/qt6-webchannel/patches/no-cmake-test.patch b/srcpkgs/qt6-webchannel/patches/no-cmake-test.patch new file mode 100644 index 000000000000..c02028772a2d --- /dev/null +++ b/srcpkgs/qt6-webchannel/patches/no-cmake-test.patch @@ -0,0 +1,7 @@ +--- a/tests/auto/CMakeLists.txt ++++ b/tests/auto/CMakeLists.txt +@@ -1,4 +1,3 @@ +-add_subdirectory(cmake) + add_subdirectory(webchannel) + if(TARGET Qt::Quick) + add_subdirectory(qml) diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template new file mode 100644 index 000000000000..b83e801effd4 --- /dev/null +++ b/srcpkgs/qt6-webchannel/template @@ -0,0 +1,36 @@ +# Template file for 'qt6-webchannel' +pkgname=qt6-webchannel +version=6.3.1 +revision=1 +wrksrc="qtwebchannel-everywhere-src-${version}" +build_style=cmake +hostmakedepends="perl qt6-base-devel qt6-declarative-devel" +makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel" +short_desc="Cross-platform application and UI framework - webchannel" +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/qtwebchannel-everywhere-src-${version}.tar.xz" +checksum=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668 + +pre_check() { + export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml" +} + +qt6-webchannel-devel_package() { + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1 + qt6-websockets-devel>=${version}_1" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig + vmove usr/lib/qt6/mkspecs + vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes + vmove usr/lib/qt6/qml/QtWebChannel/qmldir + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + vmove usr/share/qt6/modules + } +} diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update new file mode 100644 index 000000000000..844552465222 --- /dev/null +++ b/srcpkgs/qt6-webchannel/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" From 8cfe0193d9c661c3e80f2297a44d9a604757ab28 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, 8 Aug 2022 17:13:11 +0700 Subject: [PATCH 0567/1407] New package: qt6-multimedia-6.3.1 --- common/shlibs | 3 +++ srcpkgs/qt6-multimedia-devel | 1 + srcpkgs/qt6-multimedia/template | 43 +++++++++++++++++++++++++++++++++ srcpkgs/qt6-multimedia/update | 1 + 4 files changed, 48 insertions(+) create mode 120000 srcpkgs/qt6-multimedia-devel create mode 100644 srcpkgs/qt6-multimedia/template create mode 100644 srcpkgs/qt6-multimedia/update diff --git a/common/shlibs b/common/shlibs index 1486050658d8..48c63f2d0735 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2081,6 +2081,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1 +libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1 +libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1 +libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1 libnpth.so.0 npth-1.1_1 libnpupnp.so.4 libnpupnp-4.0.2_1 libglfw.so.3 glfw-3.0.4_1 diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel new file mode 120000 index 000000000000..9343446502d0 --- /dev/null +++ b/srcpkgs/qt6-multimedia-devel @@ -0,0 +1 @@ +qt6-multimedia \ No newline at end of file diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template new file mode 100644 index 000000000000..84ff33149875 --- /dev/null +++ b/srcpkgs/qt6-multimedia/template @@ -0,0 +1,43 @@ +# Template file for 'qt6-multimedia' +pkgname=qt6-multimedia +version=6.3.1 +revision=1 +wrksrc="qtmultimedia-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_FEATURE_gstreamer=ON" +hostmakedepends="perl qt6-declarative-devel pkg-config + qt6-shadertools-devel" +makedepends="qt6-declarative-devel + qt6-shadertools-devel libglib-devel gst-plugins-base1-devel" +short_desc="Cross-platform application and UI framework - multimedia" +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/qtmultimedia-everywhere-src-${version}.tar.xz" +checksum=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336 + +do_check() { + cd build + local broken="tst_qmediaformat|tst_qaudiodecoderbackend" + broken+="|tst_qaudiodevice|tst_qaudiosource|tst_qaudiosink" + broken+="|tst_qmediaplayerbackend|tst_qmediacapturesession" + broken+="|tst_qcamerabackend|tst_qquickvideooutput" + broken+="|tst_qquickvideooutput_window" + ctest -E "($broken)" +} + +qt6-multimedia-devel_package() { + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/metatypes + vmove usr/lib/pkgconfig + vmove usr/lib/qt6/mkspecs + vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes + vmove usr/lib/qt6/qml/QtMultimedia/qmldir + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update new file mode 100644 index 000000000000..844552465222 --- /dev/null +++ b/srcpkgs/qt6-multimedia/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" From 32b97b5c095bde0ce9c452bb2fde9356bd1a4477 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, 27 Aug 2022 21:17:22 +0700 Subject: [PATCH 0568/1407] qt6: change update pattern All qt6 packages will be updated at the same time. --- srcpkgs/qt6-base/update | 4 +++- srcpkgs/qt6-declarative/update | 4 +++- srcpkgs/qt6-multimedia/update | 4 +++- srcpkgs/qt6-qt5compat/update | 4 +++- srcpkgs/qt6-quick3d/update | 4 +++- srcpkgs/qt6-quicktimeline/update | 4 +++- srcpkgs/qt6-shadertools/update | 4 +++- srcpkgs/qt6-svg/update | 4 +++- srcpkgs/qt6-tools/update | 4 +++- srcpkgs/qt6-translations/update | 4 +++- srcpkgs/qt6-wayland/update | 4 +++- srcpkgs/qt6-webchannel/update | 4 +++- 12 files changed, 36 insertions(+), 12 deletions(-) diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update index 844552465222..93d6601e02ee 100644 --- a/srcpkgs/qt6-base/update +++ b/srcpkgs/qt6-base/update @@ -1 +1,3 @@ -pkgname="${pkgname/6-/}-everywhere-src" +site="https://download.qt.io/official_releases/qt +https://download.qt.io/official_releases/qt/${version%.*}" +pattern='>\K6\.[\d\.]+(?=/<)' diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update index 844552465222..93d6601e02ee 100644 --- a/srcpkgs/qt6-declarative/update +++ b/srcpkgs/qt6-declarative/update @@ -1 +1,3 @@ -pkgname="${pkgname/6-/}-everywhere-src" +site="https://download.qt.io/official_releases/qt +https://download.qt.io/official_releases/qt/${version%.*}" +pattern='>\K6\.[\d\.]+(?=/<)' diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update index 844552465222..93d6601e02ee 100644 --- a/srcpkgs/qt6-multimedia/update +++ b/srcpkgs/qt6-multimedia/update @@ -1 +1,3 @@ -pkgname="${pkgname/6-/}-everywhere-src" +site="https://download.qt.io/official_releases/qt +https://download.qt.io/official_releases/qt/${version%.*}" +pattern='>\K6\.[\d\.]+(?=/<)' diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update index 844552465222..93d6601e02ee 100644 --- a/srcpkgs/qt6-qt5compat/update +++ b/srcpkgs/qt6-qt5compat/update @@ -1 +1,3 @@ -pkgname="${pkgname/6-/}-everywhere-src" +site="https://download.qt.io/official_releases/qt +https://download.qt.io/official_releases/qt/${version%.*}" +pattern='>\K6\.[\d\.]+(?=/<)' diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update index 844552465222..93d6601e02ee 100644 --- a/srcpkgs/qt6-quick3d/update +++ b/srcpkgs/qt6-quick3d/update @@ -1 +1,3 @@ -pkgname="${pkgname/6-/}-everywhere-src" +site="https://download.qt.io/official_releases/qt +https://download.qt.io/official_releases/qt/${version%.*}" +pattern='>\K6\.[\d\.]+(?=/<)' diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update index 844552465222..93d6601e02ee 100644 --- a/srcpkgs/qt6-quicktimeline/update +++ b/srcpkgs/qt6-quicktimeline/update @@ -1 +1,3 @@ -pkgname="${pkgname/6-/}-everywhere-src" +site="https://download.qt.io/official_releases/qt +https://download.qt.io/official_releases/qt/${version%.*}" +pattern='>\K6\.[\d\.]+(?=/<)' diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update index 844552465222..93d6601e02ee 100644 --- a/srcpkgs/qt6-shadertools/update +++ b/srcpkgs/qt6-shadertools/update @@ -1 +1,3 @@ -pkgname="${pkgname/6-/}-everywhere-src" +site="https://download.qt.io/official_releases/qt +https://download.qt.io/official_releases/qt/${version%.*}" +pattern='>\K6\.[\d\.]+(?=/<)' diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update index 844552465222..93d6601e02ee 100644 --- a/srcpkgs/qt6-svg/update +++ b/srcpkgs/qt6-svg/update @@ -1 +1,3 @@ -pkgname="${pkgname/6-/}-everywhere-src" +site="https://download.qt.io/official_releases/qt +https://download.qt.io/official_releases/qt/${version%.*}" +pattern='>\K6\.[\d\.]+(?=/<)' diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update index 844552465222..93d6601e02ee 100644 --- a/srcpkgs/qt6-tools/update +++ b/srcpkgs/qt6-tools/update @@ -1 +1,3 @@ -pkgname="${pkgname/6-/}-everywhere-src" +site="https://download.qt.io/official_releases/qt +https://download.qt.io/official_releases/qt/${version%.*}" +pattern='>\K6\.[\d\.]+(?=/<)' diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update index 844552465222..93d6601e02ee 100644 --- a/srcpkgs/qt6-translations/update +++ b/srcpkgs/qt6-translations/update @@ -1 +1,3 @@ -pkgname="${pkgname/6-/}-everywhere-src" +site="https://download.qt.io/official_releases/qt +https://download.qt.io/official_releases/qt/${version%.*}" +pattern='>\K6\.[\d\.]+(?=/<)' diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update index 844552465222..93d6601e02ee 100644 --- a/srcpkgs/qt6-wayland/update +++ b/srcpkgs/qt6-wayland/update @@ -1 +1,3 @@ -pkgname="${pkgname/6-/}-everywhere-src" +site="https://download.qt.io/official_releases/qt +https://download.qt.io/official_releases/qt/${version%.*}" +pattern='>\K6\.[\d\.]+(?=/<)' diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update index 844552465222..93d6601e02ee 100644 --- a/srcpkgs/qt6-webchannel/update +++ b/srcpkgs/qt6-webchannel/update @@ -1 +1,3 @@ -pkgname="${pkgname/6-/}-everywhere-src" +site="https://download.qt.io/official_releases/qt +https://download.qt.io/official_releases/qt/${version%.*}" +pattern='>\K6\.[\d\.]+(?=/<)' From 619c2a96a1fe6b75af976a8a4138db577673b3fc Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 27 Aug 2022 20:39:24 +0200 Subject: [PATCH 0569/1407] openfortivpn: update to 1.18.0. --- srcpkgs/openfortivpn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template index 14f6fdb3655f..eed4c0a396a9 100644 --- a/srcpkgs/openfortivpn/template +++ b/srcpkgs/openfortivpn/template @@ -1,6 +1,6 @@ # Template file for 'openfortivpn' pkgname=openfortivpn -version=1.17.3 +version=1.18.0 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=60f319166fcbe8514dc7160346698ad83d8b09e2d4f5f011e16057bcfecf801f +checksum=01f4c5d97113d55d469b8078d1b2a8966ee1dfd231574322b36ec48c897c5ae9 conf_files="/etc/openfortivpn/config" From 72d1e7df065515780062e3ca1120e27aadb076b1 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, 28 Aug 2022 01:41:01 +0700 Subject: [PATCH 0570/1407] opencamlib: boost-devel requires all libboost_* --- srcpkgs/opencamlib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template index f837b50c5556..8722aaf9ee64 100644 --- a/srcpkgs/opencamlib/template +++ b/srcpkgs/opencamlib/template @@ -5,7 +5,7 @@ revision=3 build_style=cmake configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}" hostmakedepends="python3" -makedepends="python3-devel boost-devel libboost_program_options1.72 libgomp-devel" +makedepends="python3-devel boost-devel libgomp-devel" short_desc="Open source computer aided manufacturing algorithms library" maintainer="Karl Nilsson " license="LGPL-2.1-or-later" From 2649b02644e32a39053f4b9bde2d0cd21dc162d7 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 15:33:46 -0400 Subject: [PATCH 0571/1407] audacity: remove unused python hostmakedepend --- srcpkgs/audacity/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template index c91520872ce5..1ddb67966fef 100644 --- a/srcpkgs/audacity/template +++ b/srcpkgs/audacity/template @@ -2,11 +2,11 @@ pkgname=audacity version=2.4.1 revision=2 -wrksrc="${pkgname}-Audacity-${version}" +wrksrc="audacity-Audacity-${version}" build_style=gnu-configure configure_args="--with-ffmpeg=system --with-libsndfile=system --with-expat=system --with-libsoxr=system --with-lame=system --with-lv2=system ac_cv_path_WX_CONFIG=wx-config-gtk3" -hostmakedepends="pkg-config cmake gettext libtool m4 python which" +hostmakedepends="pkg-config cmake gettext libtool m4 which" makedepends="jack-devel wxWidgets-gtk3-devel gtk+3-devel libmad-devel soundtouch-devel libsoxr-devel vamp-plugin-sdk-devel lame-devel libid3tag-devel libflac-devel @@ -16,7 +16,7 @@ short_desc="Graphical cross-platform audio editor" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.audacityteam.org" -distfiles="https://github.com/${pkgname}/${pkgname}/archive/Audacity-${version}.tar.gz" +distfiles="https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz" checksum=50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f case "$XBPS_TARGET_MACHINE" in @@ -33,6 +33,6 @@ post_install() { vcopy nyquist /usr/share/audacity vcopy plug-ins /usr/share/audacity - rm ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE.txt + rm ${DESTDIR}/usr/share/doc/audacity/LICENSE.txt vlicense LICENSE.txt LICENSE } From 1070bed4b7c44772ededefd972f71edf2886a3bd Mon Sep 17 00:00:00 2001 From: Jack Culhane Date: Sun, 27 Feb 2022 21:15:44 +0000 Subject: [PATCH 0572/1407] New package: sedutil-1.20.0 Closes: #35880 [via git-merge-pr] --- srcpkgs/sedutil/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/sedutil/template diff --git a/srcpkgs/sedutil/template b/srcpkgs/sedutil/template new file mode 100644 index 000000000000..a8aa19fbb5af --- /dev/null +++ b/srcpkgs/sedutil/template @@ -0,0 +1,16 @@ +# Template file for 'sedutil' +pkgname=sedutil +version=1.20.0 +revision=1 +build_style=gnu-configure +hostmakedepends="automake" +short_desc="Drive Trust Alliance Self Encrypting Drive Utility" +maintainer="Jack Culhane " +license="GPL-3.0-or-later" +homepage="https://github.com/Drive-Trust-Alliance/sedutil" +distfiles="https://github.com/Drive-Trust-Alliance/${pkgname}/archive/${version}.tar.gz" +checksum=88016b93cbbef98fa6f5c4e6f58e6c871662b6a7f1fc8dc788c8599fa37a44f3 + +pre_configure() { + autoreconf -fi +} From 3d6de0b377aaae559ea269bbc706a546473a8555 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 15:44:47 -0400 Subject: [PATCH 0573/1407] boinc: remove unused python hostmakedepend --- srcpkgs/boinc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template index 2f6e8d161e6f..33850b5b0364 100644 --- a/srcpkgs/boinc/template +++ b/srcpkgs/boinc/template @@ -5,7 +5,7 @@ revision=2 _majorver=${version%.*} wrksrc=boinc-client_release-${_majorver}-${version} build_style=gnu-configure -hostmakedepends="automake libtool pkg-config python xorgproto shared-mime-info" +hostmakedepends="automake libtool pkg-config xorgproto shared-mime-info" makedepends="glu-devel libfreeglut-devel libcurl-devel libjpeg-turbo-devel libnotify-devel sqlite-devel libxcb-devel libXmu-devel libXi-devel gtk+-devel webkit2gtk-devel wxWidgets-gtk3-devel" From fd9143b881ac8fce2fcad69bd364bb99363c9541 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 15:50:20 -0400 Subject: [PATCH 0574/1407] chronograf: remove unused python hostmakedepend --- srcpkgs/chronograf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template index db97744b814a..5dfcc1c3ef7c 100644 --- a/srcpkgs/chronograf/template +++ b/srcpkgs/chronograf/template @@ -6,7 +6,7 @@ build_style=go go_import_path="github.com/influxdata/${pkgname}" go_package="${go_import_path}/cmd/chronograf" go_ldflags="-X main.version=${version}" -hostmakedepends="dep go-bindata nodejs-lts yarn python" +hostmakedepends="dep go-bindata nodejs-lts yarn" short_desc="Open source monitoring and visualization UI for the TICK stack" maintainer="Michael Aldridge " license="AGPL-3.0-or-later" From 8ab0f574c5c1ae9e6c00a677d67049c444f7d75c Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 16:30:47 -0400 Subject: [PATCH 0575/1407] csound: remove unused python hostmakedepend --- srcpkgs/csound/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template index c2f794e3e2f2..e9d28427b38a 100644 --- a/srcpkgs/csound/template +++ b/srcpkgs/csound/template @@ -7,7 +7,7 @@ configure_args=" -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1 -DDPD_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/pd/extra -DPORTAUDIO_V19=yes" -hostmakedepends="flex python" +hostmakedepends="flex" makedepends="LuaJIT-devel boost-devel fltk-devel fluidsynth-devel libcurl-devel libgomp-devel liblo-devel libsndfile-devel libstk-devel pd-devel portaudio-devel portmidi-devel tk-devel" @@ -16,7 +16,7 @@ short_desc="Programming language for sound rendering and signal processing" maintainer="Andrea Brancaleoni " license="LGPL-2.1-or-later" homepage="https://csound.com/" -distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" +distfiles="https://github.com/csound/csound/archive/${version}.tar.gz" checksum=558718b61c80fdf1b6c439f393759b8a1d32c7d9d8b42a8f2365a939825ea26b CFLAGS="-fcommon" From 125c4b595c9c035ac8b69425c3decb1c7cb35326 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 18:22:22 -0400 Subject: [PATCH 0576/1407] kaffeine: remove unused python hostmakedepend --- srcpkgs/kaffeine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kaffeine/template b/srcpkgs/kaffeine/template index e0356c9ad552..734847b60c40 100644 --- a/srcpkgs/kaffeine/template +++ b/srcpkgs/kaffeine/template @@ -23,5 +23,5 @@ build_options_default="dvb" desc_option_dvb="Enable DVB Support" if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake" + hostmakedepends+=" kdoctools qt5-host-tools qt5-qmake" fi From 823090e01549ff812a662c1def725dd7824077e4 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 18:29:39 -0400 Subject: [PATCH 0577/1407] kdesignerplugin: remove unused python hostmakedepend --- srcpkgs/kdesignerplugin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template index c243a67742e3..77d366d82e53 100644 --- a/srcpkgs/kdesignerplugin/template +++ b/srcpkgs/kdesignerplugin/template @@ -15,7 +15,7 @@ distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version checksum=09e6017565a747c039bc1b1079f65ef4367474733ff21891a006c4964353ad31 if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools" + hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools kgendesignerplugin kdoctools" configure_args+=" -DMEINPROC5_EXECUTABLE=/usr/bin/meinproc5" fi From 6c953a8faad6a71a91d219af98b5ad1a6721b224 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 18:33:13 -0400 Subject: [PATCH 0578/1407] kdiagram: remove unused python hostmakedepend --- srcpkgs/kdiagram/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kdiagram/template b/srcpkgs/kdiagram/template index 933a8af53940..afee5881bba2 100644 --- a/srcpkgs/kdiagram/template +++ b/srcpkgs/kdiagram/template @@ -3,7 +3,7 @@ pkgname=kdiagram version=2.8.0 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python" +hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools" makedepends="qt5-devel qt5-svg-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-tools-devel" short_desc="Powerful libraries for creating business diagrams" From a211bf32a6d4310ccb9e200d741201049e13056a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 18:35:02 -0400 Subject: [PATCH 0579/1407] kinit: remove unused python hostmakedepend --- srcpkgs/kinit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template index ade1ddd784c2..6c7b74ee3489 100644 --- a/srcpkgs/kinit/template +++ b/srcpkgs/kinit/template @@ -4,7 +4,7 @@ version=5.96.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config - gettext qt5-host-tools qt5-qmake python kdoctools" + gettext qt5-host-tools qt5-qmake kdoctools" makedepends="kio-devel kdoctools-devel libcap-devel" short_desc="Helper library to speed up start of applications on KDE workspaces" maintainer="John " From ad11afda4b9a4e8127e60221238598b8d04e1448 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 18:45:39 -0400 Subject: [PATCH 0580/1407] kio: remove unused python hostmakedepend --- srcpkgs/kio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template index fe84cfa1c763..2ed4456a8b6b 100644 --- a/srcpkgs/kio/template +++ b/srcpkgs/kio/template @@ -6,7 +6,7 @@ build_style=cmake 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" + qt5-host-tools qt5-qmake kdoctools libxml2 kcoreaddons" makedepends="kdoctools-devel ksolid-devel kbookmarks-devel kjobwidgets-devel kwallet-devel acl-devel mit-krb5-devel libxslt-devel libxml2-devel" depends="desktop-file-utils" From 77615f7e66f55d3f465a6a0ea0510e5c9dbca603 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 18:51:42 -0400 Subject: [PATCH 0581/1407] kjsembed: remove unused python hostmakedepend --- srcpkgs/kjsembed/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template index 28ffa7ef5847..d8d252b85d37 100644 --- a/srcpkgs/kjsembed/template +++ b/srcpkgs/kjsembed/template @@ -13,7 +13,7 @@ distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version checksum=000ee3f2965f8f783e0e54f526fc505686b45c833f53d73515fae1b0890510fd if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools" + hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools" fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then From 26a531c6bb8d5aad5f014ff76e53ae615e3ac30a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 18:55:23 -0400 Subject: [PATCH 0582/1407] konversation: remove unused python hostmakedepend --- srcpkgs/konversation/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template index 67ff5c507a47..92399b4382da 100644 --- a/srcpkgs/konversation/template +++ b/srcpkgs/konversation/template @@ -4,7 +4,7 @@ version=22.04.3 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons - python qt5-host-tools qt5-qmake gettext" + qt5-host-tools qt5-qmake gettext" makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel knewstuff-devel qca-qt5-devel qt5-multimedia-devel" short_desc="User friendly IRC client for KDE" From 895a6c1bb048ff4c58f93a4b19fbe6c8743c26f5 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 18:56:42 -0400 Subject: [PATCH 0583/1407] kronometer: remove unused python hostmakedepend --- srcpkgs/kronometer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kronometer/template b/srcpkgs/kronometer/template index 025a6df041ff..c518f928eb7c 100644 --- a/srcpkgs/kronometer/template +++ b/srcpkgs/kronometer/template @@ -15,5 +15,5 @@ distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz" checksum=75259b80dc2a074d2a1d5d11a909a599a998b570ad0b5bf995580d95c4411a16 if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" kconfig-devel kdoctools python qt5-host-tools qt5-qmake" + hostmakedepends+=" kconfig-devel kdoctools qt5-host-tools qt5-qmake" fi From 165d38a8a9d5e85ed11d783875fb53f931c2bc33 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 19:10:52 -0400 Subject: [PATCH 0584/1407] kross: remove unused python hostmakedepend --- srcpkgs/kross/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template index 775f0f2daab8..038a6f65004d 100644 --- a/srcpkgs/kross/template +++ b/srcpkgs/kross/template @@ -6,7 +6,7 @@ build_style=cmake configure_args=" -DMEINPROC5_EXECUTABLE=/usr/bin/meinproc5" hostmakedepends="kcoreaddons extra-cmake-modules gettext - qt5-host-tools qt5-qmake python kdoctools-devel" + qt5-host-tools qt5-qmake kdoctools-devel" makedepends="qt5-tools-devel kdoctools-devel kparts-devel" short_desc="KDE scripting bridge" maintainer="John " From 329bba2d32b9bc4e66f86c3c89c806c61e7bbd43 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 19:30:48 -0400 Subject: [PATCH 0585/1407] libaom: remove unused python hostmakedepend --- srcpkgs/libaom/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template index 072a044043d3..64fc8dcbd633 100644 --- a/srcpkgs/libaom/template +++ b/srcpkgs/libaom/template @@ -5,7 +5,7 @@ revision=1 create_wrksrc=yes build_style=cmake configure_args="-DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON" -hostmakedepends="yasm doxygen perl python" +hostmakedepends="yasm doxygen perl" short_desc="AV1 Codec library implementation" maintainer="Orphaned " license="BSD-2-Clause" From dfa1bcbbd79b81df408cc347944ecf51f68f5227 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 20:44:18 -0400 Subject: [PATCH 0586/1407] libogdf: remove unused python hostmakedepend --- srcpkgs/libogdf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libogdf/template b/srcpkgs/libogdf/template index 49090dc3a93c..a31856cbe282 100644 --- a/srcpkgs/libogdf/template +++ b/srcpkgs/libogdf/template @@ -6,7 +6,7 @@ archs="i686* x86_64*" wrksrc=OGDF-snapshot build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON" -hostmakedepends="unzip python" +hostmakedepends="unzip" makedepends="libClp-devel" short_desc="Open Graph Drawing Framework" maintainer="nexolight " From b50c555c053de756518cdb7948fde2f8aa38dd04 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 20:47:05 -0400 Subject: [PATCH 0587/1407] libosmocore: update hostmakedepend python to python3 --- srcpkgs/libosmocore/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libosmocore/template b/srcpkgs/libosmocore/template index 51242a6137b0..06176b1fd5f7 100644 --- a/srcpkgs/libosmocore/template +++ b/srcpkgs/libosmocore/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--exec-prefix=/usr --libexecdir=/usr/lib --docdir=/usr/share/doc/libosmocore" -hostmakedepends="autoconf automake libtool git pkg-config python" +hostmakedepends="autoconf automake libtool git pkg-config python3" makedepends="pcsclite-devel talloc-devel gnutls-devel" short_desc="Core libs for osmocom" maintainer="Enno Boland " From bbae983fa548a1e1f5b064808acfe749428a0edc Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 20:54:18 -0400 Subject: [PATCH 0588/1407] libpqxx: update hostmakedepend python to python3 --- srcpkgs/libpqxx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libpqxx/template b/srcpkgs/libpqxx/template index fcf5cb2d03a5..9f31ea9fd2ba 100644 --- a/srcpkgs/libpqxx/template +++ b/srcpkgs/libpqxx/template @@ -4,7 +4,7 @@ version=6.4.3 revision=1 build_style=gnu-configure configure_args="--enable-shared --disable-documentation" -hostmakedepends="postgresql-libs-devel python" +hostmakedepends="postgresql-libs-devel python3" makedepends="postgresql-libs-devel" short_desc="C++ connector for PostgreSQL" maintainer="John Regan " From 55d933d31eaba990c39a9fae2a293fbbf71a1bf0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 20:59:00 -0400 Subject: [PATCH 0589/1407] librsvg: remove unused python hostmakedepend --- srcpkgs/librsvg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index b7c13dbfa9a0..cf46ef5d91b7 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-static --enable-introspection --enable-vala" -hostmakedepends="cargo pkg-config python glib-devel gdk-pixbuf-devel vala" +hostmakedepends="cargo pkg-config glib-devel gdk-pixbuf-devel vala" makedepends="cairo-devel freetype-devel gdk-pixbuf-devel libcroco-devel libglib-devel libxml2-devel pango-devel rust vala" short_desc="SVG library for GNOME" From 1c62da396c11b937d6f5b971a3592418c2c8be12 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 21:09:50 -0400 Subject: [PATCH 0590/1407] libselinux: remove unused/unnecessary deps --- srcpkgs/libselinux/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libselinux/template b/srcpkgs/libselinux/template index fdd8d639932e..bd4b47e08005 100644 --- a/srcpkgs/libselinux/template +++ b/srcpkgs/libselinux/template @@ -1,17 +1,17 @@ # Template file for 'libselinux' pkgname=libselinux version=3.0 -revision=1 +revision=2 +_tag=20191204 build_style=gnu-makefile make_install_args="SHLIBDIR=/usr/lib SBINDIR=/usr/bin" -hostmakedepends="pkgconf python ruby xz swig" +hostmakedepends="pkg-config" makedepends="libsepol-devel pcre-devel" -depends="libsepol pcre" short_desc="SELinux library and simple utilities" maintainer="Anjandev Momi " license="GPL-2.0-only" homepage="https://www.nsa.gov/what-we-do/research/selinux/" -distfiles="https://github.com/SELinuxProject/selinux/releases/download/20191204/${pkgname}-${version}.tar.gz" +distfiles="https://github.com/SELinuxProject/selinux/releases/download/${_tag}/${pkgname}-${version}.tar.gz" checksum=2ea2b30f671dae9d6b1391cbe8fb2ce5d36a3ee4fb1cd3c32f0d933c31b82433 if [ "$XBPS_TARGET_LIBC" = musl ]; then From 4914d228143543cb7536fddfbaa9af8e31985980 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 21:15:15 -0400 Subject: [PATCH 0591/1407] minikube: remove unused/unnecessary hostmakedepends --- srcpkgs/minikube/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template index a798abea8550..28d18ebbd677 100644 --- a/srcpkgs/minikube/template +++ b/srcpkgs/minikube/template @@ -7,7 +7,7 @@ build_style=go build_helper=qemu go_ldflags="-X k8s.io/minikube/pkg/version.version=$version" go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm" -hostmakedepends="go-bindata python pkg-config git" +hostmakedepends="go-bindata pkg-config" makedepends="libvirt-devel" depends="kubectl" short_desc="Tool to make it easy to run Kubernetes locally" From d9e1cbd9609f532680995d3572079c6c91104fcb Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 21:39:25 -0400 Subject: [PATCH 0592/1407] libselinux: fix build on musl --- srcpkgs/libselinux/patches/musl.patch | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 srcpkgs/libselinux/patches/musl.patch diff --git a/srcpkgs/libselinux/patches/musl.patch b/srcpkgs/libselinux/patches/musl.patch new file mode 100644 index 000000000000..d4199f406101 --- /dev/null +++ b/srcpkgs/libselinux/patches/musl.patch @@ -0,0 +1,30 @@ +musl defines gettid(), current glibc is >2.30 + +--- a/src/procattr.c ++++ b/src/procattr.c +@@ -22,25 +22,6 @@ + static int destructor_key_initialized = 0; + static __thread char destructor_initialized; + +-/* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and +- * has a definition for it */ +-#ifdef __BIONIC__ +- #define OVERRIDE_GETTID 0 +-#elif !defined(__GLIBC_PREREQ) +- #define OVERRIDE_GETTID 1 +-#elif !__GLIBC_PREREQ(2,30) +- #define OVERRIDE_GETTID 1 +-#else +- #define OVERRIDE_GETTID 0 +-#endif +- +-#if OVERRIDE_GETTID +-static pid_t gettid(void) +-{ +- return syscall(__NR_gettid); +-} +-#endif +- + static void procattr_thread_destructor(void __attribute__((unused)) *unused) + { + if (prev_current != UNSET) From 42bd52c4737f0684c869fa68306cfaaf817203c9 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 21:57:17 -0400 Subject: [PATCH 0593/1407] netpbm: remove unused python hostmakedepend --- srcpkgs/netpbm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index f8d486d3489d..b7c34ae03300 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -7,7 +7,7 @@ _githash=f95b41755a0e27e4b51f5951d888b7bdabf1cb2f _githash_guide=ef01c3b833ded73731ca4c696c37de8a23f23e12 create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" -hostmakedepends="pkg-config perl python flex" +hostmakedepends="pkg-config perl flex" makedepends="libX11-devel libjpeg-turbo-devel libpng-devel libxml2-devel tiff-devel zlib-devel" short_desc="Toolkit for manipulation of graphic images" From f7db1fad6c0034f8f1d86aa158481c9a323ae834 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 22:01:43 -0400 Subject: [PATCH 0594/1407] okteta: remove unused python hostmakedepend --- srcpkgs/okteta/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/okteta/template b/srcpkgs/okteta/template index 9c5638e67cf2..f41a76397cc3 100644 --- a/srcpkgs/okteta/template +++ b/srcpkgs/okteta/template @@ -4,7 +4,7 @@ reverts="4.14.3_1" version=0.26.9 revision=1 build_style=cmake -hostmakedepends="extra-cmake-modules gettext python qt5-qmake qt5-host-tools +hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kdoctools kconfig kcoreaddons kparts" makedepends="qt5-devel qt5-script-devel qca-qt5-devel kbookmarks-devel kcodecs-devel kcompletion-devel kconfigwidgets-devel kcrash-devel From 3e08a765b62f436c33ee11958a7290ac20b6ed80 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 22:10:11 -0400 Subject: [PATCH 0595/1407] openbabel: remove unused python hostmakedepend the python bindings don't seem to be built already, so this dep is useless --- srcpkgs/openbabel/template | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/srcpkgs/openbabel/template b/srcpkgs/openbabel/template index 83eef561f8a4..41273c40b736 100644 --- a/srcpkgs/openbabel/template +++ b/srcpkgs/openbabel/template @@ -8,17 +8,13 @@ build_style=cmake build_helper=cmake-wxWidgets-gtk3 hostmakedepends="pkg-config" makedepends="cairo-devel libxml2-devel eigen3.2 wxWidgets-gtk3-devel" -short_desc="The Open Source Chemistry Toolbox" +short_desc="Open Source Chemistry Toolbox" maintainer="Diogo Leal " license="GPL-2.0-only" homepage="http://openbabel.org" distfiles="https://github.com/openbabel/openbabel/archive/openbabel-${_ver}.tar.gz" checksum=594c7f8a83f3502381469d643f7b185882da1dd4bc2280c16502ef980af2a776 -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" python" -fi - openbabel-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" @@ -29,4 +25,3 @@ openbabel-devel_package() { vmove usr/lib/pkgconfig } } - From 2353d03a1f4163d8d29553e0a2257c8917b93d99 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 22:29:21 -0400 Subject: [PATCH 0596/1407] scanmem: move python hostmakedepend to python3 --- srcpkgs/scanmem/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/scanmem/template b/srcpkgs/scanmem/template index d694f33d3725..1e6325068db5 100644 --- a/srcpkgs/scanmem/template +++ b/srcpkgs/scanmem/template @@ -4,7 +4,7 @@ version=0.17 revision=6 build_style=gnu-configure configure_args="--disable-static --enable-gui" -hostmakedepends="automake gettext-devel intltool libtool m4 python" +hostmakedepends="automake gettext-devel intltool libtool m4 python3" makedepends="readline-devel" short_desc="Memory scanner designed to isolate the address of an arbitrary var" maintainer="Andrea Brancaleoni " From 21d0b6d6826b05fa8f356ad1365ed663b9781ecd Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 22:30:44 -0400 Subject: [PATCH 0597/1407] skanlite: remove unused python hostmakedepend --- srcpkgs/skanlite/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/skanlite/template b/srcpkgs/skanlite/template index d90d0b902f06..b55862b227a0 100644 --- a/srcpkgs/skanlite/template +++ b/srcpkgs/skanlite/template @@ -15,5 +15,5 @@ distfiles="${KDE_SITE}/release-service/${version}/src/skanlite-${version}.tar.xz checksum=69f7fe0850459c5f81767b4d3ba4d60ffcb3e495d9a2eaf1461bb95b56f013c8 if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake" + hostmakedepends+=" kdoctools qt5-host-tools qt5-qmake" fi From 6a227dbaf02570868998fa038bf4d96e108329c4 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 22:37:43 -0400 Subject: [PATCH 0598/1407] slurm-wlm: remove unused python hostmakedepend --- srcpkgs/slurm-wlm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template index e01f3912697f..448052f3c4b0 100644 --- a/srcpkgs/slurm-wlm/template +++ b/srcpkgs/slurm-wlm/template @@ -6,7 +6,7 @@ _distver="${version//./-}" wrksrc="slurm-slurm-${_distver}" build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="perl cgit python pkg-config" +hostmakedepends="perl cgit pkg-config" # XXX: ofed, DataWarp, netloc, blcr makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel From 91cce6b0102d816c6d3b2449710962cd44077d01 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Sun, 28 Aug 2022 06:07:34 -0400 Subject: [PATCH 0599/1407] riff: update to 2.19.0. --- srcpkgs/riff/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/riff/template b/srcpkgs/riff/template index 602561a6a79f..081982f02608 100644 --- a/srcpkgs/riff/template +++ b/srcpkgs/riff/template @@ -1,6 +1,6 @@ # Template file for 'riff' pkgname=riff -version=2.18.0 +version=2.19.0 revision=1 build_style=cargo short_desc="Diff filter highlighting which line parts have changed" @@ -8,7 +8,7 @@ maintainer="0x5c " license="MIT" homepage="https://github.com/walles/riff" distfiles="https://github.com/walles/riff/archive/refs/tags/${version}.tar.gz" -checksum=a4f86f128a287af44c4c1da0e474b4e187afcef780ed2672bec4d3d592353d71 +checksum=a5df63dcf65a3146538e1a3dbd5cdadd9f499122c6920f8e430b55e4946e44a0 post_install() { vlicense LICENSE From afc6e1f465f24af7b4ab8db670cb09be6446c77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 24 Aug 2022 23:26:01 +0200 Subject: [PATCH 0600/1407] cargo-crev: update to 0.23.3. --- srcpkgs/cargo-crev/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template index 2c06721582ef..c9497a5e4497 100644 --- a/srcpkgs/cargo-crev/template +++ b/srcpkgs/cargo-crev/template @@ -1,6 +1,6 @@ # Template file for 'cargo-crev' pkgname=cargo-crev -version=0.23.2 +version=0.23.3 revision=1 build_style=cargo make_install_args="--path ./cargo-crev" @@ -11,8 +11,9 @@ short_desc="Cryptographically verifiable code review system for cargo" maintainer="Jan Christian Grünhage " license="MPL-2.0, MIT, Apache-2.0" homepage="https://github.com/crev-dev/cargo-crev" +changelog="https://raw.githubusercontent.com/crev-dev/cargo-crev/master/cargo-crev/CHANGELOG.md" distfiles="https://github.com/crev-dev/cargo-crev/archive/refs/tags/v${version}.tar.gz" -checksum=b37ca10e252bcd352634aed7ea366dfa84900446dbd74888f3178c0c10068d10 +checksum=c66a057df87dda209ecca31d83da7ef04117a923d9bfcc88c0d505b30dabf29b post_install() { vlicense LICENSE-APACHE From 4fbc796e88a54030ae124a8052bb16be2533963b Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 26 Aug 2022 09:24:11 -0400 Subject: [PATCH 0601/1407] borgmatic: update to 1.7.1. --- srcpkgs/borgmatic/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template index f175bcf29e38..59b8983c2cb2 100644 --- a/srcpkgs/borgmatic/template +++ b/srcpkgs/borgmatic/template @@ -1,10 +1,13 @@ # Template file for 'borgmatic' pkgname=borgmatic -version=1.7.0 +version=1.7.1 revision=1 build_style=python3-module -# runs not yet installed self -make_check_args="--deselect=tests/integration/commands/test_borgmatic.py" +# test_borgmatic.py runs not yet installed self, +# tests from test_execute.py sporadically fail in CI +make_check_args="--deselect=tests/integration/commands/test_borgmatic.py + --deselect=tests/integration/test_execute.py::test_log_outputs_returns_output_without_logging_for_output_log_level_none + --deselect=tests/integration/test_execute.py::test_log_outputs_logs_each_line_separately" hostmakedepends="python3-setuptools" depends="borg python3-setuptools python3-ruamel.yaml python3-jsonschema python3-colorama python3-requests" @@ -15,7 +18,7 @@ license="GPL-3.0-or-later" homepage="https://torsion.org/borgmatic/" changelog="https://projects.torsion.org/borgmatic-collective/borgmatic/raw/branch/master/NEWS" distfiles="${PYPI_SITE}/b/borgmatic/borgmatic-${version}.tar.gz" -checksum=30bc30c02f1210b78baf257abf0e4ac83ebbcf4edf334a09bd0ff9cb77ff0820 +checksum=250045b4bfd77ff1ef288b8967c8643036f1cb1e5410d874f56bbc1fd8b49b4c post_install() { # remove tests directory polluting site-packages From e9eb695a6082635b6aca797ab4fed4d400cdb330 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 27 Aug 2022 15:46:19 +0200 Subject: [PATCH 0602/1407] python3-pipenv: update to 2022.8.24. --- 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 cedac8e0033e..02b930df57ea 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.8.19 +version=2022.8.24 revision=1 wrksrc="pipenv-${version}" build_style=python3-pep517 @@ -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=44013256601acf66f3cbb68c922804a67a8d1b328fe01884851f16e49898852f +checksum=edbff81766d4328115b28738df0e5240cb2299a34ff0c60d524ad2855df18c69 conflicts="python-pipenv>=0" make_check=no # tests are not contained in release tarball From 8745a2779b95ca2a30069425e04eeefa4c3c6a23 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 28 Aug 2022 14:51:09 +0200 Subject: [PATCH 0603/1407] graphviz: update to 5.0.1. --- srcpkgs/graphviz/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template index cd43c4883b7f..25800ab364ee 100644 --- a/srcpkgs/graphviz/template +++ b/srcpkgs/graphviz/template @@ -1,6 +1,6 @@ # Template file for 'graphviz' pkgname=graphviz -version=5.0.0 +version=5.0.1 revision=1 build_style=gnu-configure configure_args="--with-gts" @@ -16,7 +16,7 @@ license="EPL-1.0" homepage="https://www.graphviz.org" changelog="https://gitlab.com/graphviz/graphviz/-/raw/main/CHANGELOG.md" distfiles="https://gitlab.com/graphviz/graphviz/-/archive/${version}/graphviz-${version}.tar.gz" -checksum=f8cc576694ae93659f453b6b4a4c2f04572a90cfccdca2d4271f2e7c60bb3d60 +checksum=6c704a3ffeaf2f7ae63f7d0da453cd624d93a9306a2e5dbda07e5ec38343d2b8 # `make check` is broken: # https://gitlab.com/graphviz/graphviz/-/issues/2112 From 0d56f3d51dcde9837eed860a001e6c5eefeb4a15 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 28 Aug 2022 14:52:37 +0200 Subject: [PATCH 0604/1407] janet: update to 1.24.1. --- srcpkgs/janet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template index 55df322179f8..9b1c9d55bd3d 100644 --- a/srcpkgs/janet/template +++ b/srcpkgs/janet/template @@ -1,6 +1,6 @@ # Template file for 'janet' pkgname=janet -version=1.24.0 +version=1.24.1 revision=1 build_style=meson configure_args="-Db_lto=false --libdir=/usr/lib" # 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=ae794c7b4ffe7cfb6f1edec60556ccda34165b2fea5c23045e332eeebc1077f4 +checksum=67964e63957299fd46d9d2640443ae1b7ae3528a396c993c457c3296b1ae586e post_install() { vlicense LICENSE From 0bd3c73ec098af3ec49e2f3d5d8ee4d8dcdc4f3e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 28 Aug 2022 14:56:45 +0200 Subject: [PATCH 0605/1407] public-inbox: update to 1.9.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 d8bd1f5ce727..ab496747bd69 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.8.0 +version=1.9.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=95a24e38293935e7081967acbf80f7d1c2c67e28d01d591ea39e5e36a34acdec +checksum=10d9d3d982bbae9383208f53aa2118482a799a958e9f1b24792b807fc225aaba pre_check() { mkdir -p ~/.public-inbox From 518416ce1f574d1407c1cd68bc6daaa9f9519b70 Mon Sep 17 00:00:00 2001 From: yopito Date: Mon, 22 Aug 2022 13:42:32 +0200 Subject: [PATCH 0606/1407] shiboken2: update to 5.15.5 --- .../patches/fix-for-numpy-1.23.0.patch | 18 +++ .../patches/no-python-arch-suffix.patch | 2 +- srcpkgs/shiboken2/patches/python310.patch | 114 ------------------ .../patches/tests-python-syntax.patch | 91 -------------- srcpkgs/shiboken2/template | 6 +- 5 files changed, 22 insertions(+), 209 deletions(-) create mode 100644 srcpkgs/shiboken2/patches/fix-for-numpy-1.23.0.patch delete mode 100644 srcpkgs/shiboken2/patches/python310.patch delete mode 100644 srcpkgs/shiboken2/patches/tests-python-syntax.patch diff --git a/srcpkgs/shiboken2/patches/fix-for-numpy-1.23.0.patch b/srcpkgs/shiboken2/patches/fix-for-numpy-1.23.0.patch new file mode 100644 index 000000000000..708cebe3f9fc --- /dev/null +++ b/srcpkgs/shiboken2/patches/fix-for-numpy-1.23.0.patch @@ -0,0 +1,18 @@ +rework of commit 1422cf4a7f277fb13fd209f24a90d6c02641497d (shiboken6) + +--- a/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp ++++ b/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp +@@ -116,8 +116,13 @@ + str << " NPY_ARRAY_NOTSWAPPED"; + if ((flags & NPY_ARRAY_WRITEABLE) != 0) + str << " NPY_ARRAY_WRITEABLE"; ++#if NPY_VERSION >= 0x00000010 // NPY_1_23_API_VERSION ++ if ((flags & NPY_ARRAY_WRITEBACKIFCOPY) != 0) ++ str << " NPY_ARRAY_WRITEBACKIFCOPY"; ++#else + if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0) + str << " NPY_ARRAY_UPDATEIFCOPY"; ++#endif + } else { + str << '0'; + } diff --git a/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch b/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch index 02baa6896f7b..31e9c55db6f2 100644 --- a/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch +++ b/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch @@ -1,5 +1,5 @@ Consistent file naming across architectures for so libs and cmake files: -remove intermediate suffix like ".cpython-36m-x86_64-linux-gnu". +remove python suffix like ".cpython-36m-x86_64-linux-gnu". Avoid overwriting the "real" cmake file with the generic wrapper's one (same name in such a case) diff --git a/srcpkgs/shiboken2/patches/python310.patch b/srcpkgs/shiboken2/patches/python310.patch deleted file mode 100644 index 1600deda46f2..000000000000 --- a/srcpkgs/shiboken2/patches/python310.patch +++ /dev/null @@ -1,114 +0,0 @@ -The first patch is taken from the issue and resolution documented at - - https://bugreports.qt.io/browse/PYSIDE-1436 - -Note that strings created as part of the `staticStrings()` set used in the -`finalizeStaticStrings()` function are created by `createStaticString()`, which -uses `PyUnicode_InternFromString` to create an owned reference to an interned -Python string **and** calls Py_INCREF to further guard against the strings -disappearing. Thus, in `finalizeStaticStrings()`, we need *two* calls to -Py_DECREF: one to clear the "guard" increment after creation and one to release -ownership from the creation itself. - -The second and third patches are adapted from - - https://codereview.qt-project.org/c/pyside/pyside-setup/+/348390 - -The second addresses the disappearance of _Py_Mangle from Python 3.10 by -providing an alternative implementation that was previously reserved for -Py_LIMITED_API. - -The fourth patch was adapted from - - https://codereview.qt-project.org/c/pyside/pyside-setup/+/365403/4 - -Together with the third patch,t his addresses changes to the typing module that -caused the pyi binding generator to fail in some cases. - -diff -ur a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp ---- a/sources/shiboken2/libshiboken/pep384impl.cpp 2020-11-11 07:51:30.000000000 -0500 -+++ b/sources/shiboken2/libshiboken/pep384impl.cpp 2021-09-26 08:47:00.614184926 -0400 -@@ -751,14 +751,14 @@ - #endif // IS_PY2 - Shiboken::AutoDecRef privateobj(PyObject_GetAttr( - reinterpret_cast(Py_TYPE(self)), Shiboken::PyMagicName::name())); --#ifndef Py_LIMITED_API -- return _Py_Mangle(privateobj, name); --#else -- // For some reason, _Py_Mangle is not in the Limited API. Why? -- size_t plen = PyUnicode_GET_LENGTH(privateobj); -+ -+ // PYSIDE-1436: _Py_Mangle is no longer exposed; implement it always. -+ // The rest of this function is our own implementation of _Py_Mangle. -+ // Please compare the original function in compile.c . -+ size_t plen = PyUnicode_GET_LENGTH(privateobj.object()); - /* Strip leading underscores from class name */ - size_t ipriv = 0; -- while (PyUnicode_READ_CHAR(privateobj, ipriv) == '_') -+ while (PyUnicode_READ_CHAR(privateobj.object(), ipriv) == '_') - ipriv++; - if (ipriv == plen) { - Py_INCREF(name); -@@ -787,7 +787,6 @@ - if (amount > big_stack) - free(resbuf); - return result; --#endif // else Py_LIMITED_API - } - - /***************************************************************************** -diff -ur a/sources/shiboken2/libshiboken/sbkstring.cpp b/sources/shiboken2/libshiboken/sbkstring.cpp ---- a/sources/shiboken2/libshiboken/sbkstring.cpp 2020-11-11 07:51:30.000000000 -0500 -+++ b/sources/shiboken2/libshiboken/sbkstring.cpp 2021-09-26 08:47:00.614184926 -0400 -@@ -247,8 +247,15 @@ - { - auto &set = staticStrings(); - for (PyObject *ob : set) { -+ // Since Python 3.10, interned strings at deleted at Python exit. -+#if PY_VERSION_HEX >= 0x030a0000 -+ Py_DECREF(ob); -+ // createStaticString() calls Py_INCREF() -+ Py_DECREF(ob); -+#else - Py_REFCNT(ob) = 1; - Py_DECREF(ob); -+#endif - } - set.clear(); - } -diff -ur a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py ---- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py 2020-11-11 07:51:30.000000000 -0500 -+++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py 2021-09-26 08:47:00.614184926 -0400 -@@ -300,6 +300,7 @@ - "zero(object)": None, - "zero(str)": "", - "zero(typing.Any)": None, -+ "zero(Any)": None, - }) - - type_map.update({ -diff -ur a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py ---- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py 2020-11-11 07:51:30.000000000 -0500 -+++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py 2021-09-26 08:48:27.743171587 -0400 -@@ -43,10 +43,11 @@ - import re - import warnings - import types -+import typing - import keyword - import functools - from shibokensupport.signature.mapping import (type_map, update_mapping, -- namespace, typing, _NotCalled, ResultVariable, ArrayLikeVariable) -+ namespace, _NotCalled, ResultVariable, ArrayLikeVariable) - from shibokensupport.signature.lib.tool import (SimpleNamespace, - build_brace_pattern) - -@@ -222,7 +223,7 @@ - def to_string(thing): - if isinstance(thing, str): - return thing -- if hasattr(thing, "__name__"): -+ if hasattr(thing, "__name__") and thing.__module__ != "typing": - dot = "." in str(thing) - name = get_name(thing) - return thing.__module__ + "." + name if dot else name diff --git a/srcpkgs/shiboken2/patches/tests-python-syntax.patch b/srcpkgs/shiboken2/patches/tests-python-syntax.patch deleted file mode 100644 index 32743a6295ce..000000000000 --- a/srcpkgs/shiboken2/patches/tests-python-syntax.patch +++ /dev/null @@ -1,91 +0,0 @@ -This changeset is about both shiboken2 and python3-pyside2 -(that are separated packages) -upstream: yes - -From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001 -From: Christian Tismer -Date: Thu, 3 Dec 2020 13:38:58 +0100 -Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code - -There was a years-old qflags test failing on Python 3. -It was blacklisted with the comment - - "# Nested exception in Python 3" - -This was nonsense: The test was wrong also for Python 2. -It just happened to work, because Python 2 had some weird -errors leaking. The real bug was in missing error handling -in cppgenerator.cpp . - -See the main description in the issue. - -Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f -Task-number: PYSIDE-1442 -Reviewed-by: Friedemann Kleint -(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75) ---- - build_history/blacklist.txt | 3 --- - sources/pyside2/tests/QtCore/qflags_test.py | 12 +++++++----- - .../shiboken2/generator/shiboken2/cppgenerator.cpp | 2 ++ - 3 files changed, 9 insertions(+), 8 deletions(-) - -diff --git build_history/blacklist.txt build_history/blacklist.txt -index 9b63f9784..2a2a5d4c4 100644 ---- a/build_history/blacklist.txt -+++ b/build_history/blacklist.txt -@@ -18,9 +18,6 @@ - darwin py3 - [QtCore::qfileread_test] - darwin --# Nested exception in Python 3 --[QtCore::qflags_test] -- py3 - [QtCore::qobject_connect_notify_test] - linux - darwin -diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py -index 08a7c55b1..e1e989c1e 100644 ---- a/sources/pyside2/tests/QtCore/qflags_test.py -+++ b/sources/pyside2/tests/QtCore/qflags_test.py -@@ -30,6 +30,7 @@ - - '''Test cases for QFlags''' - -+import operator - import os - import sys - import unittest -@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase): - class QFlagsWrongType(unittest.TestCase): - def testWrongType(self): - '''Wrong type passed to QFlags binary operators''' -+ for op in operator.or_, operator.and_, operator.xor: -+ for x in '43', 'jabba', QObject, object: -+ self.assertRaises(TypeError, op, Qt.NoItemFlags, x) -+ self.assertRaises(TypeError, op, x, Qt.NoItemFlags) -+ # making sure this actually does not fail all the time -+ self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43) - -- self.assertRaises(TypeError, Qt.NoItemFlags | '43') -- self.assertRaises(TypeError, Qt.NoItemFlags & '43') -- self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags) -- self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags) -- self.assertRaises(TypeError, Qt.NoItemFlags & QObject()) - - if __name__ == '__main__': - unittest.main() -diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp -index ff44db955..87ddd73a5 100644 ---- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp -+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp -@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn - s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName() - << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n"; - s << "#endif\n\n"; -+ s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT) -+ << INDENT << "return nullptr;\n" << outdent(INDENT); - s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n"; - s << INDENT << "return "; - writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult")); --- -2.29.2 diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template index b56613229c13..d0335b22bf51 100644 --- a/srcpkgs/shiboken2/template +++ b/srcpkgs/shiboken2/template @@ -1,7 +1,7 @@ # Template file for 'shiboken2' pkgname=shiboken2 -version=5.15.2 -revision=4 +version=5.15.5 +revision=1 _pkgname="pyside-setup-opensource-src-${version}" wrksrc="${_pkgname/%5.14.2.1/5.14.2}" build_wrksrc="sources/shiboken2" @@ -15,7 +15,7 @@ maintainer="yopito " license="GPL-3.0-or-later" homepage="https://wiki.qt.io/Qt_for_Python/Shiboken" distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz" -checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418 +checksum=3920a4fb353300260c9bc46ff70f1fb975c5e7efa22e9d51222588928ce19b33 python_version=3 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr From 63061aa5f586f2a01101c011f49b38d69540d74b Mon Sep 17 00:00:00 2001 From: yopito Date: Mon, 22 Aug 2022 13:42:35 +0200 Subject: [PATCH 0607/1407] python3-pyside2: update to 5.15.5 --- .../patches/tests-python-syntax.patch | 106 ------------------ srcpkgs/python3-pyside2/template | 6 +- 2 files changed, 3 insertions(+), 109 deletions(-) delete mode 100644 srcpkgs/python3-pyside2/patches/tests-python-syntax.patch diff --git a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch deleted file mode 100644 index 7f3ab1172f9f..000000000000 --- a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch +++ /dev/null @@ -1,106 +0,0 @@ -This changeset is about both shiboken2 and python3-pyside2 -(that are separated packages) -upstream: yes - -From c6184e01e993dcca9798f306fb8e9cb322fdd0dc Mon Sep 17 00:00:00 2001 -From: Christian Tismer -Date: Thu, 3 Dec 2020 13:38:58 +0100 -Subject: [PATCH] fix both qflags_test and the qflags cppgenerator code - -There was a years-old qflags test failing on Python 3. -It was blacklisted with the comment - - "# Nested exception in Python 3" - -This was nonsense: The test was wrong also for Python 2. -It just happened to work, because Python 2 had some weird -errors leaking. The real bug was in missing error handling -in cppgenerator.cpp . - -See the main description in the issue. - -Change-Id: Ia0f9466640e0eb33f1b8b26178d33f2be0bcb32f -Task-number: PYSIDE-1442 -Reviewed-by: Friedemann Kleint -(cherry picked from commit 288fadb796ec4e11e99e3752d531ada7edf15d75) ---- - build_history/blacklist.txt | 3 --- - sources/pyside2/tests/QtCore/qflags_test.py | 12 +++++++----- - .../shiboken2/generator/shiboken2/cppgenerator.cpp | 2 ++ - 3 files changed, 9 insertions(+), 8 deletions(-) - -diff --git build_history/blacklist.txt build_history/blacklist.txt -index 9b63f9784..2a2a5d4c4 100644 ---- a/build_history/blacklist.txt -+++ b/build_history/blacklist.txt -@@ -18,9 +18,6 @@ - darwin py3 - [QtCore::qfileread_test] - darwin --# Nested exception in Python 3 --[QtCore::qflags_test] -- py3 - [QtCore::qobject_connect_notify_test] - linux - darwin -diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py -index 08a7c55b1..e1e989c1e 100644 ---- a/sources/pyside2/tests/QtCore/qflags_test.py -+++ b/sources/pyside2/tests/QtCore/qflags_test.py -@@ -30,6 +30,7 @@ - - '''Test cases for QFlags''' - -+import operator - import os - import sys - import unittest -@@ -117,12 +118,13 @@ class QFlagsOnQVariant(unittest.TestCase): - class QFlagsWrongType(unittest.TestCase): - def testWrongType(self): - '''Wrong type passed to QFlags binary operators''' -+ for op in operator.or_, operator.and_, operator.xor: -+ for x in '43', 'jabba', QObject, object: -+ self.assertRaises(TypeError, op, Qt.NoItemFlags, x) -+ self.assertRaises(TypeError, op, x, Qt.NoItemFlags) -+ # making sure this actually does not fail all the time -+ self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43) - -- self.assertRaises(TypeError, Qt.NoItemFlags | '43') -- self.assertRaises(TypeError, Qt.NoItemFlags & '43') -- self.assertRaises(TypeError, 'jabba' & Qt.NoItemFlags) -- self.assertRaises(TypeError, 'hut' & Qt.NoItemFlags) -- self.assertRaises(TypeError, Qt.NoItemFlags & QObject()) - - if __name__ == '__main__': - unittest.main() -diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp -index ff44db955..87ddd73a5 100644 ---- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp -+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp -@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn - s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName() - << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n"; - s << "#endif\n\n"; -+ s << INDENT << "if (PyErr_Occurred())\n" << indent(INDENT) -+ << INDENT << "return nullptr;\n" << outdent(INDENT); - s << INDENT << "cppResult = " << CPP_SELF_VAR << " " << cppOpName << " cppArg;\n"; - s << INDENT << "return "; - writeToPythonConversion(s, flagsType, nullptr, QLatin1String("cppResult")); --- -2.29.2 - -Fix python warning about 'is not' usage. -This diff is DISTINCT from the previous patch - ---- a/sources/pyside2/tests/QtWidgets/qwidget_test.py 2020-11-11 13:51:30.000000000 +0100 -+++ b/sources/pyside2/tests/QtWidgets/qwidget_test.py 2020-11-24 14:28:06.103093649 +0100 -@@ -73,7 +73,7 @@ - self.assertTrue(not widget.isVisible()) - widget.setVisible(True) - self.assertTrue(widget.isVisible()) -- self.assertTrue(widget.winId() is not 0) -+ self.assertTrue(widget.winId() != 0) - # skip this test on macOS since no native events are received - if sys.platform == 'darwin': - return diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template index edad85a5112f..971b77fe1ef8 100644 --- a/srcpkgs/python3-pyside2/template +++ b/srcpkgs/python3-pyside2/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyside2' pkgname=python3-pyside2 -version=5.15.2 -revision=2 +version=5.15.5 +revision=1 _pkgname="pyside-setup-opensource-src-${version}" wrksrc="${_pkgname/%5.14.2.1/5.14.2}" build_wrksrc="sources/pyside2" @@ -24,7 +24,7 @@ maintainer="yopito " license="LGPL-3.0-or-later" homepage="https://wiki.qt.io/Qt_for_Python" distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz" -checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418 +checksum=3920a4fb353300260c9bc46ff70f1fb975c5e7efa22e9d51222588928ce19b33 build_options="webengine" desc_option_webengine="Build Qt5 WebEngine bindings" From 3ca6a75b7abc183352d3831495d8f1bf1f9f7695 Mon Sep 17 00:00:00 2001 From: yopito Date: Mon, 22 Aug 2022 13:42:36 +0200 Subject: [PATCH 0608/1407] pyside2-tools: update to 5.15.5 --- srcpkgs/pyside2-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template index 35d353aba95d..0aa2d8ea9e83 100644 --- a/srcpkgs/pyside2-tools/template +++ b/srcpkgs/pyside2-tools/template @@ -1,6 +1,6 @@ # Template file for 'pyside2-tools' pkgname=pyside2-tools -version=5.15.2 +version=5.15.5 revision=1 _pkgname="pyside-setup-opensource-src-${version}" wrksrc="${_pkgname/%5.14.2.1/5.14.2}" @@ -15,7 +15,7 @@ maintainer="yopito " license="LGPL-3.0-or-later" homepage="https://wiki.qt.io/Qt_for_Python/Shiboken" distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz" -checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418 +checksum=3920a4fb353300260c9bc46ff70f1fb975c5e7efa22e9d51222588928ce19b33 python_version=3 if [ ${CROSS_BUILD} ]; then From 6c85d4491c04c86f4df0ad3ca76bafaa68dddcdf Mon Sep 17 00:00:00 2001 From: yopito Date: Mon, 22 Aug 2022 13:42:37 +0200 Subject: [PATCH 0609/1407] python3-QtPy: rebuild with python3-pyside2 5.15.5 --- srcpkgs/python3-QtPy/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-QtPy/template b/srcpkgs/python3-QtPy/template index b9ddef1af192..92c0b509dec6 100644 --- a/srcpkgs/python3-QtPy/template +++ b/srcpkgs/python3-QtPy/template @@ -1,7 +1,7 @@ # Template file for 'python3-QtPy' pkgname=python3-QtPy version=1.9.0 -revision=3 +revision=4 wrksrc=QtPy-${version} build_style=python3-module hostmakedepends="python3-setuptools" From 2307ec107917a4fd27ba74e3ca64624225de9091 Mon Sep 17 00:00:00 2001 From: yopito Date: Mon, 22 Aug 2022 13:42:38 +0200 Subject: [PATCH 0610/1407] libspnav: update to 1.0, fix licensing --- .../patches/OO.Makefile.fix-liblinks.patch | 16 ---------------- srcpkgs/libspnav/template | 13 ++++++++++--- 2 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/libspnav/patches/OO.Makefile.fix-liblinks.patch diff --git a/srcpkgs/libspnav/patches/OO.Makefile.fix-liblinks.patch b/srcpkgs/libspnav/patches/OO.Makefile.fix-liblinks.patch deleted file mode 100644 index 850aae51fe02..000000000000 --- a/srcpkgs/libspnav/patches/OO.Makefile.fix-liblinks.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix link generation of .so files -Source: https://git.archlinux.org/svntogit/packages.git/plain/trunk/Makefile.patch?h=packages/libspnav - ---- a/Makefile.in~ 2015-01-10 09:08:35.043417955 +0000 -+++ b/Makefile.in 2015-01-10 09:09:00.833315269 +0000 -@@ -54,8 +54,8 @@ - cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) - [ -n "$(soname)" ] && \ - rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) && \ -- ln -s $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \ -- ln -s $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) || \ -+ ln -s $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \ -+ ln -s $(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) || \ - true - for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done - diff --git a/srcpkgs/libspnav/template b/srcpkgs/libspnav/template index df35072b2404..2e1bccdf285b 100644 --- a/srcpkgs/libspnav/template +++ b/srcpkgs/libspnav/template @@ -1,21 +1,24 @@ # Template file for 'libspnav' pkgname=libspnav -version=0.2.3 +version=1.0 revision=1 build_style=gnu-configure configure_args="--disable-opt" makedepends="libX11-devel" short_desc="Open source alternative to 3DConnextion drivers" maintainer="yopito " -license="GPL-3" +license="BSD-3-Clause" homepage="http://spacenav.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/spacenav/${pkgname}-${version}.tar.gz" -checksum=7ae4d7bb7f6a5dda28b487891e01accc856311440f582299760dace6ee5f1f93 +checksum=8849b7f7826d750f6956cf8f4f53937f2359ab6da97d6c834c71d5f771212e7c do_build() { make CC="${CC}" AR="${AR}" } +post_install() { + vlicense LICENSE +} libspnav-devel_package() { short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" @@ -23,5 +26,9 @@ libspnav-devel_package() { vmove usr/include vmove "usr/lib/*.a" vmove "usr/lib/*.so" +post_install() { + vlicense LICENSE +} + vmove usr/share/pkgconfig } } From 15c57667a5f8b67ed4b1682a815ef62822421f90 Mon Sep 17 00:00:00 2001 From: yopito Date: Thu, 25 Aug 2022 13:56:37 +0200 Subject: [PATCH 0611/1407] python3-pivy: update to 0.6.8 --- srcpkgs/python3-pivy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template index a442b6a94c87..b09865a03ec1 100644 --- a/srcpkgs/python3-pivy/template +++ b/srcpkgs/python3-pivy/template @@ -1,6 +1,6 @@ # Template file for 'python3-pivy' pkgname=python3-pivy -version=0.6.7 +version=0.6.8 revision=1 wrksrc="pivy-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="yopito " license="ISC" homepage="https://github.com/coin3d/pivy" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=37e33d85117aac27640e011df74ddcd77f270428300df916b46ee5c50645d582 +checksum=c443dd7dd724b0bfa06427478b9d24d31e0c3b5138ac5741a2917a443b28f346 # still relevant with pivy 0.6.6 ? case "$XBPS_TARGET_MACHINE" in From 2826167bebb561bdaa62a434eb2677c4fed529b6 Mon Sep 17 00:00:00 2001 From: yopito Date: Mon, 22 Aug 2022 13:42:39 +0200 Subject: [PATCH 0612/1407] freecad: update to 0.20.1 Closes: #38856 [via git-merge-pr] --- srcpkgs/freecad/patches/002-execinfo.patch | 30 - .../patches/010-salomesmesh-execinfo.patch | 30 - srcpkgs/freecad/patches/150-vtk9.patch | 796 ------------------ srcpkgs/freecad/patches/152-cmake-vtk9.patch | 53 -- .../patches/153-limits.h-for-musl.patch | 13 + .../154-revert-gui-tmp-redirect-stderr.patch | 73 ++ srcpkgs/freecad/template | 9 +- 7 files changed, 90 insertions(+), 914 deletions(-) delete mode 100644 srcpkgs/freecad/patches/002-execinfo.patch delete mode 100644 srcpkgs/freecad/patches/010-salomesmesh-execinfo.patch delete mode 100644 srcpkgs/freecad/patches/150-vtk9.patch delete mode 100644 srcpkgs/freecad/patches/152-cmake-vtk9.patch create mode 100644 srcpkgs/freecad/patches/153-limits.h-for-musl.patch create mode 100644 srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch diff --git a/srcpkgs/freecad/patches/002-execinfo.patch b/srcpkgs/freecad/patches/002-execinfo.patch deleted file mode 100644 index bcdca77a72a4..000000000000 --- a/srcpkgs/freecad/patches/002-execinfo.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/App/Application.cpp 2020-01-22 23:27:42.709273087 +0100 -+++ b/src/App/Application.cpp 2020-01-22 23:50:53.915075955 +0100 -@@ -1485,7 +1485,9 @@ - #endif - - #if defined(FC_OS_LINUX) -+#ifdef __GLIBC__ - #include -+#endif - #include - #include - -@@ -1497,6 +1499,7 @@ - // This function produces a stack backtrace with demangled function & method names. - void printBacktrace(size_t skip=0) - { -+#ifdef __GLIBC__ - void *callstack[128]; - size_t nMaxFrames = sizeof(callstack) / sizeof(callstack[0]); - size_t nFrames = backtrace(callstack, nMaxFrames); -@@ -1527,6 +1530,9 @@ - } - - free(symbols); -+#else -+ std::cerr << "sorry, no backtrace on musl libc"; -+#endif - } - #endif - diff --git a/srcpkgs/freecad/patches/010-salomesmesh-execinfo.patch b/srcpkgs/freecad/patches/010-salomesmesh-execinfo.patch deleted file mode 100644 index cc6bdc9ff485..000000000000 --- a/srcpkgs/freecad/patches/010-salomesmesh-execinfo.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp -+++ b/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp -@@ -29,7 +29,9 @@ - #ifndef WIN32 - #include - #include -+#ifdef __GLIBC__ - #include -+#endif - #endif - - -@@ -109,6 +111,7 @@ - #ifndef WIN32 - void print_traceback() - { -+#ifdef __GLIBC__ - void *array[50]; - size_t size; - char **strings; -@@ -123,6 +126,9 @@ - } - - free (strings); -+#else -+ std::cerr << "sorry, no backtrace on musl libc"; -+#endif - } - #else - #if (_MSC_VER >= 1400) // Visual Studio 2005 diff --git a/srcpkgs/freecad/patches/150-vtk9.patch b/srcpkgs/freecad/patches/150-vtk9.patch deleted file mode 100644 index 92673e7c9b9f..000000000000 --- a/srcpkgs/freecad/patches/150-vtk9.patch +++ /dev/null @@ -1,796 +0,0 @@ -Taken from https://github.com/wwmayer/FreeCAD/commit/bb9bcbd51df7c3cb76c5823038e4ea0f7e25a9ff -but removed patch on file src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp : already applied (2021-01-20) - -diff --git src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx b/src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx -index 14a6d9a763f..0e9b9e6c905 100644 ---- a/src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx -+++ b/src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx -@@ -40,11 +40,16 @@ - - #include - #include -+#include - - //typedef unsigned short UShortType; - typedef short ShortType; - typedef int LongType; -- -+#ifdef VTK_CELL_ARRAY_V2 -+typedef const vtkIdType* vtkIdTypePtr; -+#else -+typedef vtkIdType* vtkIdTypePtr; -+#endif - class SMDS_MeshNode; - class SMDS_MeshEdge; - class SMDS_MeshFace; -@@ -192,7 +197,7 @@ protected: - //! Element index in vector SMDS_Mesh::myNodes or SMDS_Mesh::myCells - int myID; - //! index in vtkUnstructuredGrid -- int myVtkID; -+ vtkIdType myVtkID; - //! SMDS_Mesh identification in SMESH - ShortType myMeshId; - //! SubShape and SubMesh identification in SMESHDS -diff --git src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx b/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx -index 9e4a23eddfb..77465814541 100644 ---- a/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx -+++ b/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx -@@ -95,7 +95,11 @@ public: - std::map >& nodeQuadDomains); - vtkCellLinks* GetLinks() - { -+#ifdef VTK_CELL_ARRAY_V2 -+ return static_cast(GetCellLinks()); -+#else - return Links; -+#endif - } - SMDS_Downward* getDownArray(unsigned char vtkType) - { -diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp -index 299093c94f6..2680c217305 100644 ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp -@@ -67,10 +67,16 @@ void SMDS_BallElement::SetDiameter(double diameter) - bool SMDS_BallElement::ChangeNode (const SMDS_MeshNode * node) - { - vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); -+#ifdef VTK_CELL_ARRAY_V2 -+ vtkNew cellPoints; -+ grid->GetCellPoints(myVtkID, cellPoints.GetPointer()); -+ cellPoints->SetId(0, node->getVtkId()); -+#else - vtkIdType npts = 0; - vtkIdType* pts = 0; - grid->GetCellPoints(myVtkID, npts, pts); - pts[0] = node->getVtkId(); -+#endif - SMDS_Mesh::_meshList[myMeshId]->setMyModified(); - return true; - } -@@ -83,7 +89,8 @@ void SMDS_BallElement::Print (std::ostream & OS) const - const SMDS_MeshNode* SMDS_BallElement::GetNode (const int ind) const - { - vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); -- vtkIdType npts, *pts; -+ vtkIdType npts; -+ vtkIdTypePtr pts; - grid->GetCellPoints( myVtkID, npts, pts ); - return SMDS_Mesh::_meshList[myMeshId]->FindNodeVtk( pts[ 0 ]); - } -diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp -index d6049c0bd19..a41f5c18e78 100644 ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp -@@ -303,7 +303,7 @@ int SMDS_Down1D::getNodeSet(int cellId, int* nodeSet) - void SMDS_Down1D::setNodes(int cellId, int vtkId) - { - vtkIdType npts = 0; -- vtkIdType *pts; // will refer to the point id's of the face -+ vtkIdTypePtr pts; // will refer to the point id's of the face - _grid->GetCellPoints(vtkId, npts, pts); - // MESSAGE(vtkId << " " << npts << " " << _nbDownCells); - //ASSERT(npts == _nbDownCells); -@@ -357,7 +357,7 @@ int SMDS_Down1D::computeVtkCells(int *pts, std::vector& vtkIds) - { - vtkIdType point = pts[i]; - int numCells = _grid->GetLinks()->GetNcells(point); -- vtkIdType *cells = _grid->GetLinks()->GetCells(point); -+ vtkIdTypePtr cells = _grid->GetLinks()->GetCells(point); - for (int j = 0; j < numCells; j++) - { - int vtkCellId = cells[j]; -@@ -532,7 +532,7 @@ int SMDS_Down2D::computeVolumeIds(int cellId, int* ids) - // --- find point id's of the face - - vtkIdType npts = 0; -- vtkIdType *pts; // will refer to the point id's of the face -+ vtkIdTypePtr pts; // will refer to the point id's of the face - _grid->GetCellPoints(cellId, npts, pts); - vector nodes; - for (int i = 0; i < npts; i++) -@@ -577,7 +577,7 @@ int SMDS_Down2D::computeVolumeIdsFromNodesFace(int* pts, int npts, int* ids) - vtkIdType point = pts[i]; - int numCells = _grid->GetLinks()->GetNcells(point); - //MESSAGE("cells pour " << i << " " << numCells); -- vtkIdType *cells = _grid->GetLinks()->GetCells(point); -+ vtkIdTypePtr cells = _grid->GetLinks()->GetCells(point); - for (int j = 0; j < numCells; j++) - { - int vtkCellId = cells[j]; -@@ -627,7 +627,7 @@ int SMDS_Down2D::computeVolumeIdsFromNodesFace(int* pts, int npts, int* ids) - void SMDS_Down2D::setTempNodes(int cellId, int vtkId) - { - vtkIdType npts = 0; -- vtkIdType *pts; // will refer to the point id's of the face -+ vtkIdTypePtr pts; // will refer to the point id's of the face - _grid->GetCellPoints(vtkId, npts, pts); - // MESSAGE(vtkId << " " << npts << " " << _nbNodes); - //ASSERT(npts == _nbNodes); -@@ -795,7 +795,7 @@ void SMDS_Down3D::getNodeIds(int cellId, std::set& nodeSet) - { - int vtkId = this->_vtkCellIds[cellId]; - vtkIdType npts = 0; -- vtkIdType *nodes; // will refer to the point id's of the volume -+ vtkIdTypePtr nodes; // will refer to the point id's of the volume - _grid->GetCellPoints(vtkId, npts, nodes); - for (int i = 0; i < npts; i++) - nodeSet.insert(nodes[i]); -@@ -1126,7 +1126,7 @@ void SMDS_DownTetra::getOrderedNodesOfFace(int cellId, std::vector& o - //MESSAGE("cellId = " << cellId); - - vtkIdType npts = 0; -- vtkIdType *nodes; // will refer to the point id's of the volume -+ vtkIdTypePtr nodes; // will refer to the point id's of the volume - _grid->GetCellPoints(this->_vtkCellIds[cellId], npts, nodes); - - set tofind; -@@ -1178,7 +1178,7 @@ void SMDS_DownTetra::computeFacesWithNodes(int cellId, ListElemByNodesType& face - // --- find point id's of the volume - - vtkIdType npts = 0; -- vtkIdType *nodes; // will refer to the point id's of the volume -+ vtkIdTypePtr nodes; // will refer to the point id's of the volume - _grid->GetCellPoints(cellId, npts, nodes); - - // --- create all the ordered list of node id's for each face -@@ -1234,7 +1234,7 @@ void SMDS_DownQuadTetra::getOrderedNodesOfFace(int cellId, std::vectorGetCellLinks(); -+#ifdef VTK_CELL_ARRAY_V2 -+ vtkCellLinks *links = static_cast(myGrid->GetCellLinks()); -+#else -+ vtkCellLinks *links = myGrid->GetCellLinks(); -+#endif - for (int i=0; iGetNcells(i); -diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp -index 95438eab064..0df32e3b97c 100644 ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp -@@ -146,6 +146,17 @@ bool SMDS_Mesh0DElement::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbN - if ( nbNodes == 1 ) - { - vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); -+#ifdef VTK_CELL_ARRAY_V2 -+ vtkNew cellPoints; -+ grid->GetCellPoints(myVtkID, cellPoints.GetPointer()); -+ if (nbNodes != cellPoints->GetNumberOfIds()) -+ { -+ MESSAGE("ChangeNodes problem: not the same number of nodes " << cellPoints->GetNumberOfIds() << " -> " << nbNodes); -+ return false; -+ } -+ myNode = nodes[0]; -+ cellPoints->SetId(0, myNode->getVtkId()); -+#else - vtkIdType npts = 0; - vtkIdType* pts = 0; - grid->GetCellPoints(myVtkID, npts, pts); -@@ -156,6 +167,7 @@ bool SMDS_Mesh0DElement::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbN - } - myNode = nodes[0]; - pts[0] = myNode->getVtkId(); -+#endif - - SMDS_Mesh::_meshList[myMeshId]->setMyModified(); - return true; -diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp -index f647a5f1b8f..5b903c8fb55 100644 ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp -@@ -191,7 +191,7 @@ class SMDS_MeshNode_MyInvIterator: public SMDS_ElemIterator - SMDS_ElemIteratorPtr SMDS_MeshNode:: - GetInverseElementIterator(SMDSAbs_ElementType type) const - { -- vtkCellLinks::Link l = SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks()->GetLink(myVtkID); -+ vtkCellLinks::Link l = static_cast(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID); - //MESSAGE("myID " << myID << " ncells " << l.ncells); - return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyInvIterator(SMDS_Mesh::_meshList[myMeshId], l.cells, l.ncells, type)); - } -@@ -251,7 +251,7 @@ elementsIterator(SMDSAbs_ElementType type) const - return SMDS_MeshElement::elementsIterator(SMDSAbs_Node); - else - { -- vtkCellLinks::Link l = SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks()->GetLink(myVtkID); -+ vtkCellLinks::Link l = static_cast(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID); - return SMDS_ElemIteratorPtr(new SMDS_MeshNode_MyIterator(SMDS_Mesh::_meshList[myMeshId], l.cells, l.ncells, type)); - } - } -@@ -350,7 +350,7 @@ void SMDS_MeshNode::AddInverseElement(const SMDS_MeshElement* ME) - const SMDS_MeshCell *cell = dynamic_cast (ME); - assert(cell); - SMDS_UnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); -- vtkCellLinks *Links = grid->GetCellLinks(); -+ vtkCellLinks *Links = static_cast(grid->GetCellLinks()); - Links->ResizeCellList(myVtkID, 1); - Links->AddCellReference(cell->getVtkId(), myVtkID); - } -@@ -366,7 +366,7 @@ void SMDS_MeshNode::ClearInverseElements() - - bool SMDS_MeshNode::emptyInverseElements() - { -- vtkCellLinks::Link l = SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks()->GetLink(myVtkID); -+ vtkCellLinks::Link l = static_cast(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID); - return (l.ncells == 0); - } - -@@ -378,7 +378,7 @@ bool SMDS_MeshNode::emptyInverseElements() - - int SMDS_MeshNode::NbInverseElements(SMDSAbs_ElementType type) const - { -- vtkCellLinks::Link l = SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks()->GetLink(myVtkID); -+ vtkCellLinks::Link l = static_cast(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID); - - if ( type == SMDSAbs_All ) - return l.ncells; -diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -index fbd903b1e74..ff2b81e9694 100644 ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -@@ -139,8 +139,8 @@ int SMDS_UnstructuredGrid::InsertNextLinkedCell(int type, int npts, vtkIdType *p - for (; it != setOfNodes.end(); ++it) - { - //MESSAGE("reverse link for node " << *it << " cell " << cellid); -- this->Links->ResizeCellList(*it, 1); -- this->Links->AddCellReference(cellid, *it); -+ this->GetLinks()->ResizeCellList(*it, 1); -+ this->GetLinks()->AddCellReference(cellid, *it); - } - - return cellid; -@@ -332,9 +332,13 @@ void SMDS_UnstructuredGrid::copyBloc(vtkUnsignedCharArray *newTypes, - { - newTypes->SetValue(alreadyCopied, this->Types->GetValue(j)); - idCellsOldToNew[j] = alreadyCopied; // old vtkId --> new vtkId -+#ifdef VTK_CELL_ARRAY_V2 -+ vtkIdType oldLoc = this->GetCellLocationsArray()->GetValue(j); -+#else - vtkIdType oldLoc = this->Locations->GetValue(j); -+#endif - vtkIdType nbpts; -- vtkIdType *oldPtsCell = 0; -+ vtkIdTypePtr oldPtsCell = 0; - this->Connectivity->GetCell(oldLoc, nbpts, oldPtsCell); - assert(nbpts < NBMAXNODESINCELL); - //MESSAGE(j << " " << alreadyCopied << " " << (int)this->Types->GetValue(j) << " " << oldLoc << " " << nbpts ); -@@ -952,6 +956,21 @@ void SMDS_UnstructuredGrid::GetNodeIds(std::set& nodeSet, int downId, unsig - */ - void SMDS_UnstructuredGrid::ModifyCellNodes(int vtkVolId, std::map localClonedNodeIds) - { -+#ifdef VTK_CELL_ARRAY_V2 -+ vtkNew cellPoints; -+ this->GetCellPoints(vtkVolId, cellPoints.GetPointer()); -+ for (vtkIdType i = 0; i < cellPoints->GetNumberOfIds(); i++) -+ { -+ if (localClonedNodeIds.count(cellPoints->GetId(i))) -+ { -+ vtkIdType oldpt = cellPoints->GetId(i); -+ cellPoints->SetId(i, localClonedNodeIds[oldpt]); -+ //MESSAGE(oldpt << " --> " << pts[i]); -+ //this->RemoveReferenceToCell(oldpt, vtkVolId); -+ //this->AddReferenceToCell(pts[i], vtkVolId); -+ } -+ } -+#else - vtkIdType npts = 0; - vtkIdType *pts; // will refer to the point id's of the face - this->GetCellPoints(vtkVolId, npts, pts); -@@ -966,6 +985,7 @@ void SMDS_UnstructuredGrid::ModifyCellNodes(int vtkVolId, std::map loc - //this->AddReferenceToCell(pts[i], vtkVolId); - } - } -+#endif - } - - /*! reorder the nodes of a face -@@ -995,11 +1015,20 @@ void SMDS_UnstructuredGrid::BuildLinks() - this->Links->UnRegister(this); - } - -+#ifdef VTK_CELL_ARRAY_V2 -+ this->Links = SMDS_CellLinks::New(); -+ GetLinks()->Allocate(this->GetNumberOfPoints()); -+ GetLinks()->Register(this); -+//FIXME: vtk9 -+ GetLinks()->BuildLinks(this); -+ GetLinks()->Delete(); -+#else - this->Links = SMDS_CellLinks::New(); - this->Links->Allocate(this->GetNumberOfPoints()); - this->Links->Register(this); - this->Links->BuildLinks(this, this->Connectivity); - this->Links->Delete(); -+#endif - } - - /*! Create a volume (prism or hexahedron) by duplication of a face. -diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp -index deb05985f00..63b6eabb704 100644 ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp -@@ -33,7 +33,8 @@ SMDS_VtkCellIterator::SMDS_VtkCellIterator(SMDS_Mesh* mesh, int vtkCellId, SMDSA - } - else - { -- vtkIdType npts, *pts; -+ vtkIdType npts; -+ vtkIdTypePtr pts; - grid->GetCellPoints( _cellId, npts, pts ); - _vtkIdList->SetNumberOfIds( _nbNodes = npts ); - for (int i = 0; i < _nbNodes; i++) -@@ -67,7 +68,7 @@ SMDS_VtkCellIteratorToUNV::SMDS_VtkCellIteratorToUNV(SMDS_Mesh* mesh, int vtkCel - //MESSAGE("SMDS_VtkCellInterlacedIterator (UNV)" << _type); - - _vtkIdList = vtkIdList::New(); -- vtkIdType* pts; -+ vtkIdTypePtr pts; - vtkIdType npts; - vtkUnstructuredGrid* grid = _mesh->getGrid(); - grid->GetCellPoints((vtkIdType)_cellId, npts, pts); -@@ -182,7 +183,7 @@ SMDS_VtkCellIteratorPolyH::SMDS_VtkCellIteratorPolyH(SMDS_Mesh* mesh, int vtkCel - { - //MESSAGE("SMDS_VtkCellIterator Polyhedra"); - vtkIdType nFaces = 0; -- vtkIdType* ptIds = 0; -+ vtkIdTypePtr ptIds = 0; - grid->GetFaceStream(_cellId, nFaces, ptIds); - int id = 0; - _nbNodesInFaces = 0; -diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp -index 9786abf9aae..6d772a3cd4a 100644 ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp -@@ -67,6 +67,19 @@ bool SMDS_VtkEdge::ChangeNodes(const SMDS_MeshNode * node1, const SMDS_MeshNode - bool SMDS_VtkEdge::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes) - { - vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); -+#ifdef VTK_CELL_ARRAY_V2 -+ vtkNew cellPoints; -+ grid->GetCellPoints(myVtkID, cellPoints.GetPointer()); -+ if (nbNodes != cellPoints->GetNumberOfIds()) -+ { -+ MESSAGE("ChangeNodes problem: not the same number of nodes " << cellPoints->GetNumberOfIds() << " -> " << nbNodes); -+ return false; -+ } -+ for (int i = 0; i < nbNodes; i++) -+ { -+ cellPoints->SetId(i, nodes[i]->getVtkId()); -+ } -+#else - vtkIdType npts = 0; - vtkIdType* pts = 0; - grid->GetCellPoints(myVtkID, npts, pts); -@@ -79,6 +92,7 @@ bool SMDS_VtkEdge::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes) - { - pts[i] = nodes[i]->getVtkId(); - } -+#endif - SMDS_Mesh::_meshList[myMeshId]->setMyModified(); - return true; - } -@@ -87,7 +101,7 @@ bool SMDS_VtkEdge::IsMediumNode(const SMDS_MeshNode* node) const - { - vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); - vtkIdType npts = 0; -- vtkIdType* pts = 0; -+ vtkIdTypePtr pts = 0; - grid->GetCellPoints(myVtkID, npts, pts); - //MESSAGE("IsMediumNode " << npts << " " << (node->getVtkId() == pts[npts-1])); - return ((npts == 3) && (node->getVtkId() == pts[2])); -@@ -137,7 +151,8 @@ const SMDS_MeshNode* - SMDS_VtkEdge::GetNode(const int ind) const - { - vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); -- vtkIdType npts, *pts; -+ vtkIdType npts; -+ vtkIdTypePtr pts; - grid->GetCellPoints( this->myVtkID, npts, pts ); - return SMDS_Mesh::_meshList[myMeshId]->FindNodeVtk( pts[ ind ]); - } -diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp -index 1389e0d3585..cb981bfb18e 100644 ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp -@@ -101,6 +101,19 @@ void SMDS_VtkFace::initQuadPoly(const std::vector& nodeIds, SMDS_Mesh - bool SMDS_VtkFace::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes) - { - vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); -+#ifdef VTK_CELL_ARRAY_V2 -+ vtkNew cellPoints; -+ grid->GetCellPoints(myVtkID, cellPoints.GetPointer()); -+ if (nbNodes != cellPoints->GetNumberOfIds()) -+ { -+ MESSAGE("ChangeNodes problem: not the same number of nodes " << cellPoints->GetNumberOfIds() << " -> " << nbNodes); -+ return false; -+ } -+ for (int i = 0; i < nbNodes; i++) -+ { -+ cellPoints->SetId(i, nodes[i]->getVtkId()); -+ } -+#else - vtkIdType npts = 0; - vtkIdType* pts = 0; - grid->GetCellPoints(myVtkID, npts, pts); -@@ -113,6 +126,7 @@ bool SMDS_VtkFace::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes) - { - pts[i] = nodes[i]->getVtkId(); - } -+#endif - SMDS_Mesh::_meshList[myMeshId]->setMyModified(); - return true; - } -@@ -173,7 +187,8 @@ const SMDS_MeshNode* - SMDS_VtkFace::GetNode(const int ind) const - { - vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); -- vtkIdType npts, *pts; -+ vtkIdType npts; -+ vtkIdTypePtr pts; - grid->GetCellPoints( this->myVtkID, npts, pts ); - return SMDS_Mesh::_meshList[myMeshId]->FindNodeVtk( pts[ ind ]); - } -@@ -186,7 +201,8 @@ SMDS_VtkFace::GetNode(const int ind) const - int SMDS_VtkFace::GetNodeIndex( const SMDS_MeshNode* node ) const - { - vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); -- vtkIdType npts, *pts; -+ vtkIdType npts; -+ vtkIdTypePtr pts; - grid->GetCellPoints( this->myVtkID, npts, pts ); - for ( vtkIdType i = 0; i < npts; ++i ) - if ( pts[i] == node->getVtkId() ) -@@ -251,7 +267,7 @@ bool SMDS_VtkFace::IsMediumNode(const SMDS_MeshNode* node) const - return false; - } - vtkIdType npts = 0; -- vtkIdType* pts = 0; -+ vtkIdTypePtr pts = 0; - grid->GetCellPoints(myVtkID, npts, pts); - vtkIdType nodeId = node->getVtkId(); - for (int rank = 0; rank < npts; rank++) -@@ -356,11 +372,18 @@ SMDS_NodeIteratorPtr SMDS_VtkFace::interlacedNodesIterator() const - void SMDS_VtkFace::ChangeApex(SMDS_MeshNode* node) - { - vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); -+#ifdef VTK_CELL_ARRAY_V2 -+ vtkNew cellPoints; -+ grid->GetCellPoints(myVtkID, cellPoints.GetPointer()); -+ grid->RemoveReferenceToCell(cellPoints->GetId(0), myVtkID); -+ cellPoints->SetId(0, node->getVtkId()); -+#else - vtkIdType npts = 0; - vtkIdType* pts = 0; - grid->GetCellPoints(myVtkID, npts, pts); - grid->RemoveReferenceToCell(pts[0], myVtkID); - pts[0] = node->getVtkId(); -+#endif - node->AddInverseElement(this), - SMDS_Mesh::_meshList[myMeshId]->setMyModified(); - } -diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp -index 015edf75fd2..19ebd0746c8 100644 ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp -@@ -133,6 +133,19 @@ void SMDS_VtkVolume::initPoly(const std::vector& nodeIds, - bool SMDS_VtkVolume::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes) - { - vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); -+#ifdef VTK_CELL_ARRAY_V2 -+ vtkNew cellPoints; -+ grid->GetCellPoints(myVtkID, cellPoints.GetPointer()); -+ if (nbNodes != cellPoints->GetNumberOfIds()) -+ { -+ MESSAGE("ChangeNodes problem: not the same number of nodes " << cellPoints->GetNumberOfIds() << " -> " << nbNodes); -+ return false; -+ } -+ for (int i = 0; i < nbNodes; i++) -+ { -+ cellPoints->SetId(i, nodes[i]->getVtkId()); -+ } -+#else - vtkIdType npts = 0; - vtkIdType* pts = 0; - grid->GetCellPoints(myVtkID, npts, pts); -@@ -145,6 +158,7 @@ bool SMDS_VtkVolume::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes - { - pts[i] = nodes[i]->getVtkId(); - } -+#endif - SMDS_Mesh::_meshList[myMeshId]->setMyModified(); - return true; - } -@@ -207,7 +221,7 @@ int SMDS_VtkVolume::NbFaces() const - case VTK_POLYHEDRON: - { - vtkIdType nFaces = 0; -- vtkIdType* ptIds = 0; -+ vtkIdTypePtr ptIds = 0; - grid->GetFaceStream(this->myVtkID, nFaces, ptIds); - nbFaces = nFaces; - break; -@@ -236,7 +250,7 @@ int SMDS_VtkVolume::NbNodes() const - else - { - vtkIdType nFaces = 0; -- vtkIdType* ptIds = 0; -+ vtkIdTypePtr ptIds = 0; - grid->GetFaceStream(this->myVtkID, nFaces, ptIds); - int id = 0; - for (int i = 0; i < nFaces; i++) -@@ -276,7 +290,7 @@ int SMDS_VtkVolume::NbEdges() const - case VTK_POLYHEDRON: - { - vtkIdType nFaces = 0; -- vtkIdType* ptIds = 0; -+ vtkIdTypePtr ptIds = 0; - grid->GetFaceStream(this->myVtkID, nFaces, ptIds); - nbEdges = 0; - int id = 0; -@@ -312,7 +326,7 @@ int SMDS_VtkVolume::NbFaceNodes(const int face_ind) const - if (aVtkType == VTK_POLYHEDRON) - { - vtkIdType nFaces = 0; -- vtkIdType* ptIds = 0; -+ vtkIdTypePtr ptIds = 0; - grid->GetFaceStream(this->myVtkID, nFaces, ptIds); - int id = 0; - for (int i = 0; i < nFaces; i++) -@@ -342,7 +356,7 @@ const SMDS_MeshNode* SMDS_VtkVolume::GetFaceNode(const int face_ind, const int n - if (aVtkType == VTK_POLYHEDRON) - { - vtkIdType nFaces = 0; -- vtkIdType* ptIds = 0; -+ vtkIdTypePtr ptIds = 0; - grid->GetFaceStream(this->myVtkID, nFaces, ptIds); - int id = 0; - for (int i = 0; i < nFaces; i++) -@@ -372,7 +386,7 @@ std::vector SMDS_VtkVolume::GetQuantities() const - if (aVtkType == VTK_POLYHEDRON) - { - vtkIdType nFaces = 0; -- vtkIdType* ptIds = 0; -+ vtkIdTypePtr ptIds = 0; - grid->GetFaceStream(this->myVtkID, nFaces, ptIds); - int id = 0; - for (int i = 0; i < nFaces; i++) -@@ -430,7 +444,7 @@ const SMDS_MeshNode* SMDS_VtkVolume::GetNode(const int ind) const - if ( aVtkType == VTK_POLYHEDRON) - { - vtkIdType nFaces = 0; -- vtkIdType* ptIds = 0; -+ vtkIdTypePtr ptIds = 0; - grid->GetFaceStream(this->myVtkID, nFaces, ptIds); - int id = 0, nbPoints = 0; - for (int i = 0; i < nFaces; i++) -@@ -443,7 +457,8 @@ const SMDS_MeshNode* SMDS_VtkVolume::GetNode(const int ind) const - } - return 0; - } -- vtkIdType npts, *pts; -+ vtkIdType npts; -+ vtkIdTypePtr pts; - grid->GetCellPoints( this->myVtkID, npts, pts ); - const std::vector& interlace = SMDS_MeshCell::fromVtkOrder( VTKCellType( aVtkType )); - return SMDS_Mesh::_meshList[myMeshId]->FindNodeVtk( pts[ interlace.empty() ? ind : interlace[ind]] ); -@@ -460,7 +475,7 @@ int SMDS_VtkVolume::GetNodeIndex( const SMDS_MeshNode* node ) const - if ( aVtkType == VTK_POLYHEDRON) - { - vtkIdType nFaces = 0; -- vtkIdType* ptIds = 0; -+ vtkIdTypePtr ptIds = 0; - grid->GetFaceStream(this->myVtkID, nFaces, ptIds); - int id = 0; - for (int iF = 0; iF < nFaces; iF++) -@@ -473,7 +488,8 @@ int SMDS_VtkVolume::GetNodeIndex( const SMDS_MeshNode* node ) const - } - return -1; - } -- vtkIdType npts, *pts; -+ vtkIdType npts; -+ vtkIdTypePtr pts; - grid->GetCellPoints( this->myVtkID, npts, pts ); - for ( vtkIdType i = 0; i < npts; ++i ) - if ( pts[i] == node->getVtkId() ) -@@ -534,7 +550,7 @@ bool SMDS_VtkVolume::IsMediumNode(const SMDS_MeshNode* node) const - return false; - } - vtkIdType npts = 0; -- vtkIdType* pts = 0; -+ vtkIdTypePtr pts = 0; - grid->GetCellPoints(myVtkID, npts, pts); - vtkIdType nodeId = node->getVtkId(); - for (int rank = 0; rank < npts; rank++) -diff --git src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp -index fcd044b00f2..f54c24f8618 100644 ---- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp -+++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp -@@ -11348,7 +11348,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vectorGetCellLinks()->GetLink(oldId); -+ vtkCellLinks::Link l = static_cast(grid->GetCellLinks())->GetLink(oldId); - for (int i=0; iGetID()); - double values[3]; - vtkIdType npts = 0; -- vtkIdType* pts = 0; -+ vtkIdTypePtr pts = 0; - grid->GetCellPoints(vtkVolIds[ivol], npts, pts); - SMDS_VtkVolume::gravityCenter(grid, pts, npts, values); - if (id ==0) -@@ -11708,7 +11708,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vectorfirst; - //MESSAGE(" node " << oldId); -- vtkCellLinks::Link l = grid->GetCellLinks()->GetLink(oldId); -+ vtkCellLinks::Link l = static_cast(grid->GetCellLinks())->GetLink(oldId); - for (int i = 0; i < l.ncells; i++) - { - int vtkId = l.cells[i]; -@@ -12165,7 +12165,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, - MESSAGE("volume to check, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId)); - bool volInside = false; - vtkIdType npts = 0; -- vtkIdType* pts = 0; -+ vtkIdTypePtr pts = 0; - grid->GetCellPoints(vtkId, npts, pts); - for (int i=0; i ++#endif ++#endif ++ + #endif //FC_CONFIG_H diff --git a/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch b/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch new file mode 100644 index 000000000000..287179a23c3c --- /dev/null +++ b/srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch @@ -0,0 +1,73 @@ +see https://github.com/FreeCAD/FreeCAD/commit/cfe94b00d3434f3e2c8b5114d2909f628c330fa8#commitcomment-71413407 + +upstream: yes + +From 7b377a216b9185960e4cee980a6504dc1a755f50 Mon Sep 17 00:00:00 2001 +From: wmayer +Date: Wed, 29 Jun 2022 15:19:18 +0200 +Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure + with musl libc + +--- + src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 --------------------- + 1 file changed, 27 deletions(-) + +diff --git a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp +index 7f0ddd75d..455ece0b3 100644 +--- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp ++++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp +@@ -21,42 +21,17 @@ + ***************************************************************************/ + + #include +-#include + + #include "GuiNativeEventLinux.h" + + #include "GuiApplicationNativeEventAware.h" + #include +-#include + #include + + #include + + #include + +-namespace { +-class RedirectStdErr +-{ +-public: +- RedirectStdErr() +- : fi(Base::FileInfo::getTempFileName()) +- , file(stderr) +- { +- stderr = fopen(fi.filePath().c_str(), "w"); +- } +- ~RedirectStdErr() +- { +- fclose(stderr); +- fi.deleteFile(); +- stderr = file; +- } +- +-private: +- Base::FileInfo fi; +- FILE* file; +-}; +-} +- + Gui::GuiNativeEvent::GuiNativeEvent(Gui::GUIApplicationNativeEventAware *app) + : GuiAbstractNativeEvent(app) + { +@@ -72,8 +47,6 @@ Gui::GuiNativeEvent::~GuiNativeEvent() + + void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window) + { +- // tmp. redirect stderr to a file to suppress an error message from spnav_open() +- RedirectStdErr err; + Q_UNUSED(window) + if (spnav_open() == -1) { + Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n"); +-- +2.37.1 + diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index 1e2aec024fd7..e9c697adbe1a 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,6 +1,6 @@ # Template file for 'freecad' pkgname=freecad -version=0.19.4 +version=0.20.1 revision=1 wrksrc="FreeCAD-${version}" build_style=cmake @@ -23,10 +23,9 @@ makedepends="python3-devel boost-devel libxerces-c-devel zlib-devel occt-devel coin3-devel libshiboken2-devel libspnav-devel pyside2-tools liblz4-devel libpyside2-python3-devel python3-matplotlib netcdf-devel jsoncpp-devel qt5-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel - qt5-xmlpatterns-devel coin3-doc glew-devel" + qt5-xmlpatterns-devel coin3-doc glew-devel python3-pivy" -# FreeCAD help: qt5/assistant with SQLite storage -depends="python3-matplotlib python3-pyside2 qt5-plugin-sqlite python3-pivy" +depends="python3-matplotlib python3-pyside2-webengine python3-pivy" python_version=3 pycompile_dirs="usr/lib/${pkgname}/Mod" @@ -36,7 +35,7 @@ maintainer="yopito " license="LGPL-2.0-or-later" homepage="https://freecadweb.org/" distfiles="https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz" -checksum=e40a1c343956e13c56cc8578d025ae83d68d9d20acda1732953bc8a3883e9722 +checksum=70c15f7c1c676e3376cdc2a66c136030c5502f9802935e5b626ca8ce3f8812ed if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" libexecinfo-devel" From ea84611ad2fd91ef4358f3717274222a9784b23c Mon Sep 17 00:00:00 2001 From: Piraty Date: Sun, 28 Aug 2022 23:02:07 +0200 Subject: [PATCH 0613/1407] libspnav: fix typo --- srcpkgs/libspnav/template | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/srcpkgs/libspnav/template b/srcpkgs/libspnav/template index 2e1bccdf285b..059d254e17b7 100644 --- a/srcpkgs/libspnav/template +++ b/srcpkgs/libspnav/template @@ -1,7 +1,7 @@ # Template file for 'libspnav' pkgname=libspnav version=1.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-opt" makedepends="libX11-devel" @@ -26,9 +26,6 @@ libspnav-devel_package() { vmove usr/include vmove "usr/lib/*.a" vmove "usr/lib/*.so" -post_install() { - vlicense LICENSE -} vmove usr/share/pkgconfig } } From 09be1531d46f73b42b6be7ef9b6b2e6f8b37816b Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sun, 28 Aug 2022 23:53:54 +0200 Subject: [PATCH 0614/1407] cloudflared: update to 2022.8.2 --- srcpkgs/cloudflared/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template index 2e38a370e6c3..df4f55c8e08b 100644 --- a/srcpkgs/cloudflared/template +++ b/srcpkgs/cloudflared/template @@ -1,6 +1,6 @@ # Template file for 'cloudflared' pkgname=cloudflared -version=2022.8.0 +version=2022.8.2 revision=1 build_style=go go_import_path=github.com/cloudflare/cloudflared @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://developers.cloudflare.com/argo-tunnel/" changelog="https://raw.githubusercontent.com/cloudflare/cloudflared/master/CHANGES.md" distfiles="https://github.com/cloudflare/cloudflared/archive/${version}.tar.gz" -checksum=8200c1ee1064a0cdc222329328520ed3e93f689d8d0538095a1eb16b9885b1e7 +checksum=45ff0c9b95997e2f1795b08af5c3ed2fc19d2d3cb35391c01452163003b858a1 pre_build() { go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\"" From 16e4ee54ab1a2deb82057636f640efa84f85f3e6 Mon Sep 17 00:00:00 2001 From: Ramdziana F Y Date: Sun, 28 Aug 2022 19:21:52 +0700 Subject: [PATCH 0615/1407] vivaldi: update to 5.4.2753.40 --- srcpkgs/vivaldi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template index c1c1b6b4d9f0..0bcd418e2193 100644 --- a/srcpkgs/vivaldi/template +++ b/srcpkgs/vivaldi/template @@ -1,6 +1,6 @@ # Template file for 'vivaldi' pkgname=vivaldi -version=5.4.2753.37 +version=5.4.2753.40 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=dc33c3d38f3c705bd6cb93335f80ffb1a101f6a7dbd4406b3ccbe21576be4a15 +checksum=3961f785aec7b1ab8fec71dd681069117cd8a135e8fbf939a7d53331e03b54c9 repository=nonfree restricted=yes nostrip=yes From 39283f4f21f32cc216e67ccd993e8998997e3771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Aug 2022 11:47:30 +0200 Subject: [PATCH 0616/1407] hatchling: update to 1.8.1. --- srcpkgs/hatchling/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hatchling/template b/srcpkgs/hatchling/template index 416d559efad8..1c31e5bb17c0 100644 --- a/srcpkgs/hatchling/template +++ b/srcpkgs/hatchling/template @@ -1,6 +1,6 @@ # Template file for 'hatchling' pkgname=hatchling -version=1.8.0 +version=1.8.1 revision=1 build_style=python3-pep517 _deps="python3-pathspec python3-tomli python3-pluggy python3-packaging python3-editables" @@ -12,7 +12,7 @@ license="MIT" homepage="https://hatch.pypa.io/latest/" changelog="https://raw.githubusercontent.com/pypa/hatch/master/docs/history.md" distfiles="${PYPI_SITE}/h/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=a4f982fdca0717d8c46bfe7b501302f90aaf2a5302845d550b49c8739681feb2 +checksum=448b04b23faed669b2b565b998ac955af4feea66c5deed3a1212ac9399d2e1cd post_install() { vlicense LICENSE.txt From 946e6027fb605595df337f06abcacf9bed572c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Aug 2022 11:47:39 +0200 Subject: [PATCH 0617/1407] hatch: update to 1.5.0. --- srcpkgs/hatch/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/hatch/template b/srcpkgs/hatch/template index b01bc65be2c8..a626aab39ec5 100644 --- a/srcpkgs/hatch/template +++ b/srcpkgs/hatch/template @@ -1,11 +1,12 @@ # Template file for 'hatch' pkgname=hatch -version=1.4.2 +version=1.5.0 revision=1 build_style=python3-pep517 # ignore backend tests, because updating hatchling when there is no new hatch # version yet breaks these in hatch. -make_check_args="--deselect tests/cli/run/test_run.py::test_scripts_no_environment +make_check_args="--deselect tests/cli/test_root.py::TestFreshInstallation::test_config_file_creation_verbose + --deselect tests/cli/run/test_run.py::test_scripts_no_environment --ignore tests/backend --ignore backend/tests" hostmakedepends="hatchling" @@ -21,7 +22,7 @@ license="MIT" homepage="https://hatch.pypa.io/latest/" changelog="https://raw.githubusercontent.com/pypa/hatch/master/docs/history.md" distfiles="${PYPI_SITE}/h/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=f207d55206036b80faf023f63df69caf340a03ce82073db91dee10f49b038956 +checksum=cdd9bdcf6bd8fccbde26c4f84f8fc14859d912d078cd0348d350c973bed073f4 make_check_pre="env PYTHONPATH=./src" post_install() { From 39406a3a1bf3083ae7a1589cf1bcad76cef8e8c2 Mon Sep 17 00:00:00 2001 From: astral Date: Fri, 26 Aug 2022 18:22:36 -0600 Subject: [PATCH 0618/1407] jamulus: update to 3.9.0 --- srcpkgs/jamulus/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/jamulus/template b/srcpkgs/jamulus/template index 61617ffb799c..c7be91e1e414 100644 --- a/srcpkgs/jamulus/template +++ b/srcpkgs/jamulus/template @@ -1,16 +1,16 @@ # Template file for 'jamulus' pkgname=jamulus -version=3.8.2 +version=3.9.0 revision=1 _version=r${version//./_} wrksrc=${pkgname}-${_version} build_style=qmake configure_args="Jamulus.pro" hostmakedepends="pkg-config qt5-qmake qt5-host-tools" -makedepends="qt5-declarative-devel jack-devel" +makedepends="qt5-declarative-devel jack-devel qt5-multimedia-devel" short_desc="Play music online. With friends. For free" -maintainer="KawaiiAmber " +maintainer="astralchan " license="GPL-2.0-or-later" homepage="https://jamulus.io" distfiles="https://github.com/corrados/jamulus/archive/${_version}.tar.gz" -checksum=4c323db21c896c711f726319b40114d1a0b5a374fd25eb43d9af52c19fc3d55e +checksum=742b1954111c55b39ea7b2863c762d6731359e2b4793ef2409b150096fb196a5 From 8ab54390e6e7afe5e5522c2d05d06035a878ed75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Fri, 26 Aug 2022 23:43:35 +0100 Subject: [PATCH 0619/1407] rocksdb: update to 7.5.3. --- srcpkgs/rocksdb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rocksdb/template b/srcpkgs/rocksdb/template index 54921221469c..8d792a17800c 100644 --- a/srcpkgs/rocksdb/template +++ b/srcpkgs/rocksdb/template @@ -1,6 +1,6 @@ # Template file for 'rocksdb' pkgname=rocksdb -version=7.4.5 +version=7.5.3 revision=1 build_style=cmake configure_args="-DPORTABLE=1 -DWITH_TESTS=0 -DUSE_RTTI=0 -DWITH_LZ4=1 @@ -11,7 +11,7 @@ maintainer="magenbluten " license="GPL-2.0-or-later, Apache-2.0, BSD-3-Clause" homepage="https://github.com/facebook/rocksdb" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=af237cbdde7b7b7a0ee8a5858e9d49ed71964801cf768052ce0cdfd302943cc2 +checksum=c9f8cb3f14622a9bb2ead81093720d0660784352f7f53f44a990dc850a0caca1 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From 5dbf91a01e6865946bb2cf782f5b626fa604e85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Fri, 26 Aug 2022 23:44:26 +0100 Subject: [PATCH 0620/1407] neomutt: rebuild for rocksdb7.5.3. --- srcpkgs/neomutt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index c69c15807185..39927bb48fbb 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,7 +1,7 @@ # Template file for 'neomutt' pkgname=neomutt version=20220429 -revision=2 +revision=3 create_wrksrc=true build_wrksrc="${pkgname}-${version}" build_style=configure From 714fc1a80a16e47e3710097b8bc32545db9da5db Mon Sep 17 00:00:00 2001 From: bugcrazy <39757967+bugcrazy@users.noreply.github.com> Date: Tue, 23 Aug 2022 02:12:42 -0300 Subject: [PATCH 0621/1407] oil: update to 0.12.4 --- srcpkgs/oil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template index e8c76ec13581..fed91a23b052 100644 --- a/srcpkgs/oil/template +++ b/srcpkgs/oil/template @@ -1,6 +1,6 @@ # Template file for 'oil' pkgname=oil -version=0.12.3 +version=0.12.4 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="https://www.oilshell.org/download/oil-${version}.tar.xz" -checksum=33c82495cf5cadd564424f6fcf13b8b46f34f4ed2e1ce3efbead65d6dce83edf +checksum=83f8fc59e3f3136de98b186aef0e84e8f7e818b18b07d469f5ab5384c971916f register_shell="/usr/bin/osh /usr/bin/oil" nocross="Build systems gets confused with host and cross toolchains/headers" nostrip=yes From 673f19cdc0ebc746a7670b765beda6654384aad2 Mon Sep 17 00:00:00 2001 From: Mate GABRI Date: Tue, 23 Aug 2022 14:20:22 +1000 Subject: [PATCH 0622/1407] kubernetes: update to 1.23.10 --- srcpkgs/kubernetes/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index f903f34a9523..f3078993efb1 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -1,7 +1,7 @@ # Template file for 'kubernetes' pkgname=kubernetes -version=1.23.7 -revision=2 +version=1.23.10 +revision=1 archs="x86_64* ppc64le*" build_style=go go_import_path="github.com/kubernetes/kubernetes" @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://kubernetes.io" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=fa366d6e1013e83fc54329c9ce7f2b170734e7aeee6ffc8e337b9e2d3de46c3f +checksum=0199f4c948f1f686d850eee97a4d49e7ae3614aff4eff7794f499c065d721267 nocross=yes system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" From 4901de6600beb0cad4caa016615a312b55b8aff1 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Tue, 23 Aug 2022 08:14:25 +0200 Subject: [PATCH 0623/1407] virtualbox-ose: update to 6.1.36. --- .../patches/ffreestanding.patch | 20 -- .../patches/vbox-linux-5.18.patch | 254 ------------------ .../patches/vbox-linux-5.19.patch | 179 ------------ srcpkgs/virtualbox-ose/template | 4 +- 4 files changed, 2 insertions(+), 455 deletions(-) delete mode 100644 srcpkgs/virtualbox-ose/patches/ffreestanding.patch delete mode 100644 srcpkgs/virtualbox-ose/patches/vbox-linux-5.18.patch delete mode 100644 srcpkgs/virtualbox-ose/patches/vbox-linux-5.19.patch diff --git a/srcpkgs/virtualbox-ose/patches/ffreestanding.patch b/srcpkgs/virtualbox-ose/patches/ffreestanding.patch deleted file mode 100644 index 0e22aa60cde4..000000000000 --- a/srcpkgs/virtualbox-ose/patches/ffreestanding.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Config.kmk b/Config.kmk -index 3df197404..4c6bd76bb 100644 ---- a/Config.kmk -+++ b/Config.kmk -@@ -4503,11 +4504,14 @@ ifeq ($(VBOX_LDR_FMT),elf) - TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL) - TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \ - $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ -- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) -+ $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) - TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \ - $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ - $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \ - -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) -+ if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++. -+TEMPLATE_VBoxR0_CXXFLAGS += -ffreestanding -+ endif - TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding - TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables - TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding diff --git a/srcpkgs/virtualbox-ose/patches/vbox-linux-5.18.patch b/srcpkgs/virtualbox-ose/patches/vbox-linux-5.18.patch deleted file mode 100644 index 5b1ed1a266cd..000000000000 --- a/srcpkgs/virtualbox-ose/patches/vbox-linux-5.18.patch +++ /dev/null @@ -1,254 +0,0 @@ -Source: https://www.virtualbox.org/ticket/20914 ---- a/include/VBox/sup.h -+++ b/include/VBox/sup.h -@@ -2142,6 +2142,26 @@ RT_IPRT_FORMAT_ATTR(1, 2) SUPR0Printf(co - */ - SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void); - -+/** -+ * Notification from R0 VMM prior to loading the guest-FPU register state. -+ * -+ * @returns Whether the host-FPU register state has been saved by the host kernel. -+ * @param fCtxHook Whether thread-context hooks are enabled. -+ * -+ * @remarks Called with preemption disabled. -+ */ -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook); -+ -+/** -+ * Notification from R0 VMM prior to saving the guest-FPU register state (and -+ * potentially restoring the host-FPU register state) in ring-0. -+ * -+ * @param fCtxHook Whether thread-context hooks are enabled. -+ * -+ * @remarks Called with preemption disabled. -+ */ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook); -+ - /** @copydoc RTLogGetDefaultInstanceEx - * @remarks To allow overriding RTLogGetDefaultInstanceEx locally. */ - SUPR0DECL(struct RTLOGGER *) SUPR0GetDefaultLogInstanceEx(uint32_t fFlagsAndGroup); ---- a/src/VBox/Additions/linux/sharedfolders/regops.c -+++ b/src/VBox/Additions/linux/sharedfolders/regops.c -@@ -3823,7 +3823,9 @@ struct address_space_operations vbsf_reg - .readpage = vbsf_readpage, - .writepage = vbsf_writepage, - /** @todo Need .writepages if we want msync performance... */ --#if RTLNX_VER_MIN(2,5,12) -+#if RTLNX_VER_MIN(5,18,0) -+ .dirty_folio = filemap_dirty_folio, -+#elif RTLNX_VER_MIN(2,5,12) - .set_page_dirty = __set_page_dirty_buffers, - #endif - #if RTLNX_VER_MIN(5,14,0) ---- a/src/VBox/HostDrivers/Support/SUPDrv.cpp -+++ b/src/VBox/HostDrivers/Support/SUPDrv.cpp -@@ -98,6 +98,18 @@ - # endif - #endif - -+#if defined(RT_OS_LINUX) && !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE) -+/* In Linux 5.18-rc1, memcpy became a wrapper which does fortify checks -+ * before triggering __underlying_memcpy() call. We do not pass these checks here, -+ * so bypass them for now. */ -+# if RTLNX_VER_MIN(5,18,0) -+# define SUPDRV_MEMCPY __underlying_memcpy -+# else -+# define SUPDRV_MEMCPY memcpy -+# endif -+#else -+# define SUPDRV_MEMCPY memcpy -+#endif - - /* - * Logging assignments: -@@ -266,6 +278,8 @@ static SUPFUNC g_aFunctions[] = - SUPEXP_STK_BACK( 2, SUPR0ContFree), - SUPEXP_STK_BACK( 2, SUPR0ChangeCR4), - SUPEXP_STK_BACK( 1, SUPR0EnableVTx), -+ SUPEXP_STK_OKAY( 1, SUPR0FpuBegin), -+ SUPEXP_STK_OKAY( 1, SUPR0FpuEnd), - SUPEXP_STK_BACK( 0, SUPR0SuspendVTxOnCpu), - SUPEXP_STK_BACK( 1, SUPR0ResumeVTxOnCpu), - SUPEXP_STK_OKAY( 1, SUPR0GetCurrentGdtRw), -@@ -1742,7 +1756,7 @@ static int supdrvIOCtlInnerUnrestricted( - - /* execute */ - pReq->u.Out.cFunctions = RT_ELEMENTS(g_aFunctions); -- memcpy(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions)); -+ SUPDRV_MEMCPY(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions)); - pReq->Hdr.rc = VINF_SUCCESS; - return 0; - } ---- a/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp -+++ b/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp -@@ -2002,6 +2002,18 @@ SUPR0DECL(uint32_t) SUPR0GetKernelFeatur - } - - -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+ return false; -+} -+ -+ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+} -+ - /* - * - * org_virtualbox_SupDrv ---- a/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c -+++ b/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c -@@ -640,3 +640,16 @@ SUPR0DECL(uint32_t) SUPR0GetKernelFeatur - return 0; - } - -+ -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+ return false; -+} -+ -+ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+} -+ ---- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -@@ -1454,6 +1454,31 @@ SUPR0DECL(uint32_t) SUPR0GetKernelFeatur - } - - -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+#if RTLNX_VER_MIN(5,18,0) -+ kernel_fpu_begin(); -+ /* if (fCtxHook) */ -+ preempt_enable(); /* HACK ALERT! undo the implicit preempt_disable() in kernel_fpu_begin(). */ -+ return true; -+#else -+ return false; -+#endif -+} -+ -+ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+#if RTLNX_VER_MIN(5,18,0) -+ /* if (fCtxHook) */ -+ preempt_disable(); /* HACK ALERT! undo the implicit preempt_enable() in SUPR0FpuBegin(). */ -+ kernel_fpu_end(); -+#endif -+} -+ -+ - int VBOXCALL supdrvOSGetCurrentGdtRw(RTHCUINTPTR *pGdtRw) - { - #if RTLNX_VER_MIN(4,12,0) ---- a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp -+++ b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp -@@ -541,3 +541,16 @@ SUPR0DECL(uint32_t) SUPR0GetKernelFeatur - return 0; - } - -+ -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+ return false; -+} -+ -+ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+} -+ ---- a/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c -+++ b/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c -@@ -1309,3 +1309,16 @@ SUPR0DECL(uint32_t) SUPR0GetKernelFeatur - return 0; - } - -+ -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+ return false; -+} -+ -+ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+} -+ ---- a/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp -+++ b/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp -@@ -2704,6 +2704,19 @@ SUPR0DECL(uint32_t) SUPR0GetKernelFeatur - } - - -+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+ return false; -+} -+ -+ -+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) -+{ -+ RT_NOREF(fCtxHook); -+} -+ -+ - SUPR0DECL(int) SUPR0IoCtlSetupForHandle(PSUPDRVSESSION pSession, intptr_t hHandle, uint32_t fFlags, PSUPR0IOCTLCTX *ppCtx) - { - /* ---- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -@@ -2311,7 +2311,13 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS - vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1); - Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb)); - Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf)); -+#if RTLNX_VER_MIN(5,18,0) -+ local_bh_disable(); -+ err = netif_rx(pBuf); -+ local_bh_enable(); -+#else - err = netif_rx_ni(pBuf); -+#endif - if (err) - rc = RTErrConvertFromErrno(err); - } ---- a/src/VBox/VMM/VMMR0/CPUMR0.cpp -+++ b/src/VBox/VMM/VMMR0/CPUMR0.cpp -@@ -440,6 +440,9 @@ VMMR0_INT_DECL(int) CPUMR0LoadGuestFPU(P - Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU_GUEST)); - Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_SYNC_FPU_STATE)); - -+ /* Notify the support driver prior to loading the guest-FPU register state. */ -+ SUPR0FpuBegin(false /* unused */); -+ - if (!pVM->cpum.s.HostFeatures.fLeakyFxSR) - { - Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_USED_MANUAL_XMM_RESTORE)); -@@ -484,6 +487,9 @@ VMMR0_INT_DECL(bool) CPUMR0FpuStateMaybe - Assert(ASMGetCR4() & X86_CR4_OSFXSR); - if (pVCpu->cpum.s.fUseFlags & (CPUM_USED_FPU_GUEST | CPUM_USED_FPU_HOST)) - { -+ /* Notify the support driver prior to loading the host-FPU register state. */ -+ SUPR0FpuEnd(false /* unused */); -+ - fSavedGuest = RT_BOOL(pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU_GUEST); - if (!(pVCpu->cpum.s.fUseFlags & CPUM_USED_MANUAL_XMM_RESTORE)) - cpumR0SaveGuestRestoreHostFPUState(&pVCpu->cpum.s); diff --git a/srcpkgs/virtualbox-ose/patches/vbox-linux-5.19.patch b/srcpkgs/virtualbox-ose/patches/vbox-linux-5.19.patch deleted file mode 100644 index b1c93c0d9733..000000000000 --- a/srcpkgs/virtualbox-ose/patches/vbox-linux-5.19.patch +++ /dev/null @@ -1,179 +0,0 @@ -Source: https://www.virtualbox.org/ticket/20914 ---- a/src/VBox/Additions/linux/drm/vbox_fb.c -+++ b/src/VBox/Additions/linux/drm/vbox_fb.c -@@ -362,6 +362,9 @@ static int vboxfb_create(struct drm_fb_h - info->screen_size = size; - - #ifdef CONFIG_FB_DEFERRED_IO -+# if RTLNX_VER_MIN(5,19,0) -+ info->fix.smem_len = info->screen_size; -+# endif - info->fbdefio = &vbox_defio; - fb_deferred_io_init(info); - #endif ---- a/src/VBox/Additions/linux/drm/vbox_ttm.c -+++ b/src/VBox/Additions/linux/drm/vbox_ttm.c -@@ -320,8 +320,10 @@ static struct ttm_tt *vbox_ttm_tt_create - if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) { - #elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_RANGE(8,5, 8,99) - if (ttm_tt_init(tt, bo, page_flags)) { --#else -+#elif RTLNX_VER_MAX(5,19,0) - if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) { -+#else -+ if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined, 0)) { - #endif - kfree(tt); - return NULL; ---- a/src/VBox/Additions/linux/sharedfolders/regops.c -+++ b/src/VBox/Additions/linux/sharedfolders/regops.c -@@ -3581,8 +3581,14 @@ struct inode_operations vbsf_reg_iops = - * Needed for mmap and reads+writes when the file is mmapped in a - * shared+writeable fashion. - */ -+#if RTLNX_VER_MIN(5,19,0) -+static int vbsf_read_folio(struct file *file, struct folio *folio) -+{ -+ struct page *page = &folio->page; -+#else - static int vbsf_readpage(struct file *file, struct page *page) - { -+#endif - struct inode *inode = VBSF_GET_F_DENTRY(file)->d_inode; - int err; - -@@ -3728,8 +3734,7 @@ static int vbsf_writepage(struct page *p - /** - * Called when writing thru the page cache (which we shouldn't be doing). - */ --int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos, -- unsigned len, unsigned flags, struct page **pagep, void **fsdata) -+static inline void vbsf_write_begin_warn(loff_t pos, unsigned len, unsigned flags) - { - /** @todo r=bird: We shouldn't ever get here, should we? Because we don't use - * the page cache for any writes AFAIK. We could just as well use -@@ -3745,8 +3750,24 @@ int vbsf_write_begin(struct file *file, - WARN_ON(1); - # endif - } -+} -+ -+# if RTLNX_VER_MIN(5,19,0) -+int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos, -+ unsigned len, struct page **pagep, void **fsdata) -+{ -+ vbsf_write_begin_warn(pos, len, 0); -+ return simple_write_begin(file, mapping, pos, len, pagep, fsdata); -+} -+# else -+int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos, -+ unsigned len, unsigned flags, struct page **pagep, void **fsdata) -+{ -+ vbsf_write_begin_warn(pos, len, flags); - return simple_write_begin(file, mapping, pos, len, flags, pagep, fsdata); - } -+# endif -+ - #endif /* KERNEL_VERSION >= 2.6.24 */ - - #if RTLNX_VER_MIN(5,14,0) -@@ -3820,7 +3841,11 @@ static int vbsf_direct_IO(int rw, struct - * @todo the FsPerf touch/flush (mmap) test fails on 4.4.0 (ubuntu 16.04 lts). - */ - struct address_space_operations vbsf_reg_aops = { -+#if RTLNX_VER_MIN(5,19,0) -+ .read_folio = vbsf_read_folio, -+#else - .readpage = vbsf_readpage, -+#endif - .writepage = vbsf_writepage, - /** @todo Need .writepages if we want msync performance... */ - #if RTLNX_VER_MIN(5,18,0) -@@ -3842,4 +3867,3 @@ struct address_space_operations vbsf_reg - .direct_IO = vbsf_direct_IO, - #endif - }; -- ---- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1457,11 +1458,37 @@ SUPR0DECL(uint32_t) SUPR0GetKernelFeatur - SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook) - { - RT_NOREF(fCtxHook); --#if RTLNX_VER_MIN(5,18,0) -+#if RTLNX_VER_MIN(4,19,0) /* Going back to 4.19.0 for better coverage, we -+ probably only need 5.17.7+ in the end. */ -+ /* -+ * HACK ALERT! -+ * -+ * We'd like to use the old __kernel_fpu_begin() API which was removed in -+ * early 2019, because we typically run with preemption enabled and have an -+ * preemption hook installed which will call kernel_fpu_end() in case we're -+ * scheduled out after getting in here. The preemption hook is almost -+ * useless if we run with preemption disabled. -+ * -+ * For the case where the kernel does not have preemption hooks, we get here -+ * with preemption already disabled and one more count doesn't make any -+ * difference. -+ * -+ * So, after the kernel_fpu_begin() call we undo the implicit preempt_disable() -+ * call it does, so the preemption hook can do its work and the VBox user has -+ * a more responsive system. -+ * -+ * See @bugref{10209#c12} and onwards for more details. -+ */ -+ Assert(fCtxHook || !RTThreadPreemptIsEnabled(NIL_RTTHREAD)); - kernel_fpu_begin(); -- /* if (fCtxHook) */ -- preempt_enable(); /* HACK ALERT! undo the implicit preempt_disable() in kernel_fpu_begin(). */ -- return true; -+# if 0 /* Always do it for now for better test coverage. */ -+ if (fCtxHook) -+# endif -+ preempt_enable(); -+ return false; /** @todo Not sure if we have license to use any extended state, or -+ * if we're limited to the SSE & x87 FPU. If it's the former, -+ * we should return @a true and the caller can skip -+ * saving+restoring the host state and save some time. */ - #else - return false; - #endif -@@ -1471,9 +1498,13 @@ SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxH - SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook) - { - RT_NOREF(fCtxHook); --#if RTLNX_VER_MIN(5,18,0) -- /* if (fCtxHook) */ -- preempt_disable(); /* HACK ALERT! undo the implicit preempt_enable() in SUPR0FpuBegin(). */ -+#if RTLNX_VER_MIN(4,19,0) -+ /* HACK ALERT! See SUPR0FpuBegin for an explanation of this. */ -+ Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD)); -+# if 0 /* Always do it for now for better test coverage. */ -+ if (fCtxHook) -+# endif -+ preempt_disable(); - kernel_fpu_end(); - #endif - } ---- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -@@ -184,6 +184,11 @@ - # include - #endif - -+/* for kernel_fpu_begin / kernel_fpu_end() */ -+#if RTLNX_VER_MIN(4,2,0) -+# include -+#endif -+ - #if RTLNX_VER_MIN(3,7,0) - # include - #else diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index 4f9976409ade..73ad6b332d8e 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,6 +1,6 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose -version=6.1.34 +version=6.1.36 revision=1 wrksrc="VirtualBox-${version}" short_desc="General-purpose full virtualizer for x86 hardware" @@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0" homepage="https://www.virtualbox.org" changelog="https://www.virtualbox.org/wiki/Changelog" distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2" -checksum=9c3ce1829432e5b8374f950698587038f45fb0492147dc200e59edb9bb75eb49 +checksum=e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047 nopie=yes lib32disabled=yes From bb76fd917584a600775dd26655cf1c5b67b57fe5 Mon Sep 17 00:00:00 2001 From: icp Date: Mon, 22 Aug 2022 16:38:36 +0530 Subject: [PATCH 0624/1407] pychess: update to 1.0.3. --- srcpkgs/pychess/template | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/srcpkgs/pychess/template b/srcpkgs/pychess/template index af30be49f18d..7fb17cc72de7 100644 --- a/srcpkgs/pychess/template +++ b/srcpkgs/pychess/template @@ -1,17 +1,23 @@ # Template file for 'pychess' pkgname=pychess -version=1.0.2 -revision=2 +version=1.0.3 +revision=1 build_style=python3-module -pycompile_module="pychess" _commondeps="python3-gobject python3-pexpect python3-SQLAlchemy gobject-introspection gtksourceview" hostmakedepends="python3-setuptools gettext ${_commondeps}" depends="stockfish gnome-icon-theme python3-websockets python3-psutil gst-plugins-base1 ${_commondeps}" +checkdepends="${depends} xvfb-run" short_desc="GTK chess client written in Python" maintainer="cipr3s " license="GPL-3.0-or-later" homepage="https://pychess.github.io" distfiles="https://github.com/pychess/${pkgname}/archive/${version}.tar.gz" -checksum=06d9274775fb0aac480fcc40f0007be3c5309da6a122013472d36de7de8d5fa2 +checksum=86b193dd1af1f40d37820afb33b3b3b890be2737d57df5f8e024a489840b25a4 + +do_check() { + cd testing/ + rm remotegame.py + PYTHONPATH=../lib PYCHESS_UNITTEST=true xvfb-run -a python3 -m unittest discover -p "*.py" +} From 976e26b4a84e1d6082f56b21004df6704439deb9 Mon Sep 17 00:00:00 2001 From: Pulux Date: Mon, 22 Aug 2022 07:36:22 +0200 Subject: [PATCH 0625/1407] mergerfs: update to 2.32.5. --- srcpkgs/mergerfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mergerfs/template b/srcpkgs/mergerfs/template index db4399c448e6..1d5b8c6049be 100644 --- a/srcpkgs/mergerfs/template +++ b/srcpkgs/mergerfs/template @@ -1,6 +1,6 @@ # Template file for 'mergerfs' pkgname=mergerfs -version=2.32.4 +version=2.32.5 revision=1 build_style=gnu-makefile make_use_env=yes @@ -11,7 +11,7 @@ maintainer="Orphaned " license="ISC" homepage="https://github.com/trapexit/mergerfs" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=8857d2058c38251bff539c77b6c90472ab139bda96265ce09485c3689d11a4ac +checksum=ddf86e4a05d834d173b78a617112b0b4cf3b65447da69f0474815558d5815340 pre_build() { # we build from source, spoof release tarball From b0a6842574d5c30e77fe9db6b171529d3daba633 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 21 Aug 2022 19:18:35 -0700 Subject: [PATCH 0626/1407] plymouth: update to 22.02.122. --- srcpkgs/plymouth/patches/fix-glibc-2.36.patch | 30 +++++++++++++++++++ srcpkgs/plymouth/template | 4 +-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/plymouth/patches/fix-glibc-2.36.patch diff --git a/srcpkgs/plymouth/patches/fix-glibc-2.36.patch b/srcpkgs/plymouth/patches/fix-glibc-2.36.patch new file mode 100644 index 000000000000..2f1e43875cfb --- /dev/null +++ b/srcpkgs/plymouth/patches/fix-glibc-2.36.patch @@ -0,0 +1,30 @@ +From 5f1e43c00039a7fe1fff768b91a05a695fb4a53d Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Wed, 3 Aug 2022 15:23:33 -0400 +Subject: [PATCH] ply-utils: Drop linux/fs.h include + +It was needed long ago for a function we no longer even have. + +Now it's causing compile errors on Fedora 37 because it's conflicting +with sys/mount.h. + +This commit drops it. +--- + src/libply/ply-utils.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/libply/ply-utils.c b/src/libply/ply-utils.c +index c7b165e9..219e2e77 100644 +--- a/src/libply/ply-utils.c ++++ b/src/libply/ply-utils.c +@@ -46,7 +46,6 @@ + #include + #include + #include +-#include + #include + + #include +-- +GitLab + diff --git a/srcpkgs/plymouth/template b/srcpkgs/plymouth/template index 17f801fc5315..442ab58a99cd 100644 --- a/srcpkgs/plymouth/template +++ b/srcpkgs/plymouth/template @@ -1,6 +1,6 @@ # Template file for 'plymouth' pkgname=plymouth -version=0.9.5 +version=22.02.122 revision=1 build_style=gnu-configure configure_args="--with-system-root-install=no \ @@ -18,7 +18,7 @@ maintainer="William OD " license="GPL-2.0-or-later" homepage="https://www.freedesktop.org/wiki/Software/Plymouth/" distfiles="${FREEDESKTOP_SITE}/plymouth/releases/$pkgname-$version.tar.xz" -checksum=ecae257f351d098340542a5bc06de029404c24dcee87e6ebb2abd5ef117fce86 +checksum=100551442221033ce868c447ad6c74d831d209c18ae232b98ae0207e34eadaeb build_options="gtk3 pango" build_options_default="gtk3 pango" From 5bcf0c66efe3954094d7c1fadf2f8c82f09d7778 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 21 Aug 2022 15:14:33 -0700 Subject: [PATCH 0627/1407] libproxy: update to 0.4.18. --- srcpkgs/libproxy/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libproxy/template b/srcpkgs/libproxy/template index d6103007032e..3b516025354e 100644 --- a/srcpkgs/libproxy/template +++ b/srcpkgs/libproxy/template @@ -1,18 +1,22 @@ # Template file for 'libproxy' pkgname=libproxy -version=0.4.15 +version=0.4.18 revision=1 build_style=cmake configure_args="-DWITH_GNOME=0 -DWITH_KDE4=0 -DWITH_MOZJS=0 -DWITH_NM=0 -DWITH_PERL=0 -DWITH_PYTHON=1 -DWITH_WEBKIT=0" hostmakedepends="pkg-config python" makedepends="zlib-devel" -short_desc="A library handling all the details of proxy configuration" +short_desc="Library handling all the details of proxy configuration" maintainer="Orphaned " +license="LGPL-2.1-or-later" homepage="http://github.com/libproxy/libproxy" -license="LGPL-2.1" -distfiles="https://github.com/libproxy/libproxy/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0 +distfiles="https://github.com/libproxy/libproxy/releases/download/${version}/libproxy-${version}.tar.xz" +checksum=69b5856e9ea42c38ac77e6b8c92ffc86a71d341fef74e77bef85f9cc6c47a4b1 + +post_patch() { + vsed '/add_test(NAME url-test/d' -i libproxy/test/CMakeLists.txt +} libproxy-devel_package() { depends="libproxy>=${version}_${revision}" From 43bdc82cc8076004bb81718874d2ce0ff6eac8b7 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 21 Aug 2022 17:00:18 -0700 Subject: [PATCH 0628/1407] exempi: update to 2.6.2. --- ...f034705fd2d032c81383eee8208fd4eee0ac.patch | 43 ------------------- .../patches/exempi-e23c213-typeinfos.patch | 29 +++++++++++++ srcpkgs/exempi/template | 4 +- 3 files changed, 31 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/exempi/patches/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch create mode 100644 srcpkgs/exempi/patches/exempi-e23c213-typeinfos.patch diff --git a/srcpkgs/exempi/patches/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch b/srcpkgs/exempi/patches/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch deleted file mode 100644 index 2696793cec09..000000000000 --- a/srcpkgs/exempi/patches/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8ed2f034705fd2d032c81383eee8208fd4eee0ac Mon Sep 17 00:00:00 2001 -From: Victor Rodriguez -Date: Sat, 18 Aug 2018 13:54:55 +0000 -Subject: [PATCH] Issue #9 - Fix null-pointer-dereference (CVE-2018-12648) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The WEBP::GetLE32 function in -XMPFiles/source/FormatSupport/WEBP_Support.hpp in Exempi 2.4.5 has a -NULL pointer dereference. - -https://bugs.freedesktop.org/show_bug.cgi?id=106981 -https://gitlab.freedesktop.org/libopenraw/exempi/issues/9 - -Signed-off-by: Victor Rodriguez -Signed-off-by: Hubert Figuière ---- - XMPFiles/source/FormatSupport/WEBP_Support.cpp | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.cpp b/XMPFiles/source/FormatSupport/WEBP_Support.cpp -index ffaf220..4fe705b 100644 ---- a/XMPFiles/source/FormatSupport/WEBP_Support.cpp -+++ b/XMPFiles/source/FormatSupport/WEBP_Support.cpp -@@ -160,9 +160,11 @@ bool VP8XChunk::xmp() - } - void VP8XChunk::xmp(bool hasXMP) - { -- XMP_Uns32 flags = GetLE32(&this->data[0]); -- flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT); -- PutLE32(&this->data[0], flags); -+ if (&this->data[0] != NULL) { -+ XMP_Uns32 flags = GetLE32(&this->data[0]); -+ flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT); -+ PutLE32(&this->data[0], flags); -+ } - } - - Container::Container(WEBP_MetaHandler* handler) : Chunk(NULL, handler) --- -2.18.0 - diff --git a/srcpkgs/exempi/patches/exempi-e23c213-typeinfos.patch b/srcpkgs/exempi/patches/exempi-e23c213-typeinfos.patch new file mode 100644 index 000000000000..66c8f835b2e9 --- /dev/null +++ b/srcpkgs/exempi/patches/exempi-e23c213-typeinfos.patch @@ -0,0 +1,29 @@ +Source: https://src.fedoraproject.org/rpms/exempi/blob/f37/f/exempi-e23c213-typeinfos.patch + +From d45c06270576493e1537080fa43c1af667c4337a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nikola=20Forr=C3=B3?= +Date: Tue, 12 Oct 2021 14:15:17 +0200 +Subject: [PATCH] Avoid multiple definitions of typeinfos + +--- + XMPFiles/source/XMPFiles_Impl.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/XMPFiles/source/XMPFiles_Impl.cpp b/XMPFiles/source/XMPFiles_Impl.cpp +index 2f918ac..ff45040 100644 +--- a/XMPFiles/source/XMPFiles_Impl.cpp ++++ b/XMPFiles/source/XMPFiles_Impl.cpp +@@ -47,7 +47,9 @@ using namespace std; + /// This file ... + /// + // ================================================================================================= +-#include "public/include/XMP.incl_cpp" ++#if ! XMP_StaticBuild ++ #include "public/include/XMP.incl_cpp" ++#endif + + #if XMP_WinBuild + #pragma warning ( disable : 4290 ) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +-- +2.33.0 + diff --git a/srcpkgs/exempi/template b/srcpkgs/exempi/template index 14753617953a..d664f7dc4d80 100644 --- a/srcpkgs/exempi/template +++ b/srcpkgs/exempi/template @@ -1,6 +1,6 @@ # Template file for 'exempi' pkgname=exempi -version=2.5.0 +version=2.6.2 revision=1 build_style=gnu-configure configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --disable-static --disable-unittest" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="BSD-3-Clause" homepage="https://libopenraw.freedesktop.org/wiki/Exempi" distfiles="https://libopenraw.freedesktop.org/download/exempi-${version}.tar.bz2" -checksum=dc82fc24c0540a44a63fa4ad21775d24e00e63f1dedd3e2ae6f7aa27583b711b +checksum=4d17d4c93df2a95da3e3172c45b7a5bf317dd31dafd1c7a340169728c7089d1d post_install() { vlicense COPYING From 38b3653ff67840dfff890cff7c5cd22e2fe27db7 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 29 Aug 2022 00:16:54 +0200 Subject: [PATCH 0629/1407] libffado: update to 2.4.6. --- srcpkgs/libffado/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template index c8590ec1d061..7978d6007f90 100644 --- a/srcpkgs/libffado/template +++ b/srcpkgs/libffado/template @@ -1,6 +1,6 @@ # Template file for 'libffado' pkgname=libffado -version=2.4.5 +version=2.4.6 revision=1 build_style=scons make_build_args="PREFIX=/usr MANDIR=/usr/share/man @@ -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=59599bdde897dbc9533b0d2a282099193725030c3ab100737a1dbe673166af96 +checksum=f0b3bfba677dd43d7f7ed0002a7af12212a405769a44d57531c11e81bbfa891f case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone" ;; From 645625005b8c82c70526a05dcc745b647fc809b7 Mon Sep 17 00:00:00 2001 From: RunningDroid Date: Sun, 28 Aug 2022 20:08:16 -0400 Subject: [PATCH 0630/1407] btop: update to 1.2.9. --- srcpkgs/btop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/btop/template b/srcpkgs/btop/template index 4935494bb04f..26dfc427e1c2 100644 --- a/srcpkgs/btop/template +++ b/srcpkgs/btop/template @@ -1,6 +1,6 @@ # Template file for 'btop' pkgname=btop -version=1.2.8 +version=1.2.9 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=7944b06e3181cc1080064adf1e9eb4f466af0b84a127df6697430736756a89ac +checksum=0f8c3434a9c4c132a34415a9cc4f048595b8a4d1a94e94223ac3a795e1c16531 From 182537be09a7c487e2c97ee14c85c0de6d547d57 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 27 Aug 2022 21:26:55 -0400 Subject: [PATCH 0631/1407] lensfun: update to 0.3.3. --- srcpkgs/lensfun/template | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/srcpkgs/lensfun/template b/srcpkgs/lensfun/template index d41a14922621..e73b8e6626ff 100644 --- a/srcpkgs/lensfun/template +++ b/srcpkgs/lensfun/template @@ -1,17 +1,18 @@ # Template file for 'lensfun' pkgname=lensfun -version=0.3.2 -revision=2 +version=0.3.3 +revision=1 build_style=cmake configure_args="-DINSTALL_HELPER_SCRIPTS=0" -maintainer="Orphaned " -homepage="http://lensfun.sourceforge.net/" -license="LGPL-3, CC-BY-SA-3.0" -short_desc="Library for rectifying and simulating photographic lens distortions" -hostmakedepends="pkg-config python" +hostmakedepends="pkg-config python3" makedepends="libglib-devel" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.gz" -checksum=ae8bcad46614ca47f5bda65b00af4a257a9564a61725df9c74cb260da544d331 +short_desc="Library for rectifying and simulating photographic lens distortions" +maintainer="Orphaned " +license="LGPL-3.0-only, CC-BY-SA-3.0" +homepage="https://lensfun.github.io" +changelog="https://raw.githubusercontent.com/lensfun/lensfun/master/ChangeLog" +distfiles="https://github.com/lensfun/lensfun/archive/refs/tags/v${version}.tar.gz" +checksum=57ba5a0377f24948972339e18be946af12eda22b7c707eb0ddd26586370f6765 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*);; From f03674d44c50420b679fb9ff690d61bbd6556b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Aug 2022 11:57:33 +0200 Subject: [PATCH 0632/1407] perl-Type-Tiny: update to 1.016009. --- srcpkgs/perl-Type-Tiny/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Type-Tiny/template b/srcpkgs/perl-Type-Tiny/template index af87a816b92b..f5d3609bb201 100644 --- a/srcpkgs/perl-Type-Tiny/template +++ b/srcpkgs/perl-Type-Tiny/template @@ -1,6 +1,6 @@ # Template file for 'perl-Type-Tiny' pkgname=perl-Type-Tiny -version=1.016008 +version=1.016009 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -12,4 +12,4 @@ maintainer="Jan Christian Grünhage " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Type-Tiny" distfiles="https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/${pkgname/perl-/}-${version}.tar.gz" -checksum=d554f024d5da0833d623b29a1c0e1aa6147e267266725e9cf322b6d70c60dd0f +checksum=69794c37111ae92cd5b36626e6aa914b40b633df136dff7283dffacaf4562e38 From 3abfb3cb7aebd4f3230936a3867d891b4afdcff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Aug 2022 11:55:26 +0200 Subject: [PATCH 0633/1407] perl-Sub-HandlesVia: update to 0.036. --- srcpkgs/perl-Sub-HandlesVia/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Sub-HandlesVia/template b/srcpkgs/perl-Sub-HandlesVia/template index 5e6ff14e3ee7..582a63059f02 100644 --- a/srcpkgs/perl-Sub-HandlesVia/template +++ b/srcpkgs/perl-Sub-HandlesVia/template @@ -1,6 +1,6 @@ # Template file for 'perl-Sub-HandlesVia' pkgname=perl-Sub-HandlesVia -version=0.035 +version=0.036 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Jan Christian Grünhage " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Sub-HandlesVia" distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-${version}.tar.gz" -checksum=f55ea60632b6f37cd41d447905009b0fff7b1f25b2a42727cdfe572d1ab12497 +checksum=cb4cdd76b131845e4351a963d2e0a25a095cdfd48ccf32c68baa69a612e44a3f From 69dd7ddaf4344dafac8c69507acecb6bd60b0da4 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sat, 27 Aug 2022 19:31:59 +0200 Subject: [PATCH 0634/1407] praat: update to 6.2.17 --- srcpkgs/praat/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template index d5d3de7a47ff..416e5ee0fce3 100644 --- a/srcpkgs/praat/template +++ b/srcpkgs/praat/template @@ -1,6 +1,6 @@ # Template file for 'praat' pkgname=praat -version=6.2.14 +version=6.2.17 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=51f8d8594810fd8a4cda415689eb161a5c740d5c44d52d37e700ebaf2e8bb832 +checksum=a2142099cce628a0aa30d2852e6858624ee18cd328dbc3c6cccde2220c1efaa6 # 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 @@ -62,6 +62,9 @@ do_install() { do_check() { cd "${pkgname}-${version}/test" + # remove failing test + # Error: Cannot view or edit a TextGrid from batch + rm fon/LongSound.praat ../../praat --run runAllTests_batch.praat ../../praat_nogui --run runAllTests_batch.praat } From 946afe55a71abdb70aaeea1cb6e499da14d29261 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sat, 27 Aug 2022 19:43:27 +0200 Subject: [PATCH 0635/1407] perl-CryptX: update to 0.077 --- srcpkgs/perl-CryptX/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-CryptX/template b/srcpkgs/perl-CryptX/template index e8df2eea5906..83e16e8ea0bf 100644 --- a/srcpkgs/perl-CryptX/template +++ b/srcpkgs/perl-CryptX/template @@ -1,6 +1,6 @@ # Template file for 'perl-CryptX' pkgname=perl-CryptX -version=0.076 +version=0.077 revision=1 wrksrc="${pkgname#perl-}-${version}" build_style=perl-module @@ -14,4 +14,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later, Unlicense" homepage="https://metacpan.org/release/CryptX" changelog="https://raw.githubusercontent.com/DCIT/perl-CryptX/master/Changes" distfiles="${CPAN_SITE}/Crypt/${pkgname#perl-}-${version}.tar.gz" -checksum=bb84ac012438c7cecdb51a5a6fffb4f1fee3b0eae0022e96cebc2e167522621c +checksum=f741cd3a371f7754e790d174ff80c8f7fc1b120f95a0ab482bbe26a5246726a9 From 9fae537cbd029f7caeaad08e860ea8304260c4de Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Thu, 11 Aug 2022 16:22:51 +0300 Subject: [PATCH 0636/1407] libqrtr-glib: update to 1.2.2. --- srcpkgs/libqrtr-glib/template | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/srcpkgs/libqrtr-glib/template b/srcpkgs/libqrtr-glib/template index b09104c12bb7..a866cc3b3361 100644 --- a/srcpkgs/libqrtr-glib/template +++ b/srcpkgs/libqrtr-glib/template @@ -1,29 +1,42 @@ # Template file for 'libqrtr-glib' pkgname=libqrtr-glib -version=1.0.0 +version=1.2.2 revision=1 -build_style=gnu-configure -build_helper="gir" -configure_args="--disable-static - $(vopt_enable gir introspection)" -hostmakedepends="pkg-config" +build_style=meson +build_helper="gir qemu" +configure_args="$(vopt_bool gir introspection)" +hostmakedepends="pkg-config gtk-doc" makedepends="glib-devel" short_desc="Qualcomm IPC Router protocol helper library" maintainer="Jami Kettunen " license="LGPL-2.1-or-later" homepage="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib" -distfiles="${FREEDESKTOP_SITE}/libqmi/${pkgname}-${version}.tar.xz" -checksum=30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee +changelog="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/raw/main/NEWS" +distfiles="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/archive/${version}/libqrtr-glib-${version}.tar.gz" +checksum=c5cdf5ea91cbd2cf2758b2896064c7b1dfe7156063267df905f957ac69b6b763 + build_options="gir" build_options_default="gir" +# FIXME: drop gtk-doc generation from cross builds to avoid aarch64-musl & armv6l-musl +# python relocation errors on CI that are not reproducible when building locally +# https://github.com/void-linux/void-packages/runs/8028582126 +if [ "$CROSS_BUILD" ]; then + configure_args+=" -Dgtk_doc=false" +fi + libqrtr-glib-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 [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi + if [ -z "$CROSS_BUILD" ]; then + vmove usr/share/gtk-doc + fi vmove "usr/lib/*.so" - vmove usr/share } } From 5ed80ffed43d1c4d2542409a861e33d523590cb0 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, 27 Aug 2022 11:09:29 +0700 Subject: [PATCH 0637/1407] bootiso: depends on exfatprogs --- srcpkgs/bootiso/patches/new-exfat.patch | 11 +++++++++++ srcpkgs/bootiso/template | 7 +++---- 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/bootiso/patches/new-exfat.patch diff --git a/srcpkgs/bootiso/patches/new-exfat.patch b/srcpkgs/bootiso/patches/new-exfat.patch new file mode 100644 index 000000000000..57085311bfd6 --- /dev/null +++ b/srcpkgs/bootiso/patches/new-exfat.patch @@ -0,0 +1,11 @@ +--- a/bootiso ++++ b/bootiso +@@ -507,7 +507,7 @@ function fs_formatPartition() { + # These options always end up with the label flag setter + local -Ar _mkfsOpts=( + ['vfat']="-v -F 32 -n" # Fat32 mode +- ['exfat']="-n" ++ ['exfat']="-L" + ['ntfs']="-Q -c 4096 -L" # Quick mode + cluster size = 4096 for syslinux support + ['ext2']="-O ^64bit -L" # Disabling pure 64 bits compression for syslinux compatibility + ['ext3']="-O ^64bit -L" # see https://www.syslinux.org/wiki/index.php?title=Filesystem#ext diff --git a/srcpkgs/bootiso/template b/srcpkgs/bootiso/template index db30bfb9db19..2d740ca06809 100644 --- a/srcpkgs/bootiso/template +++ b/srcpkgs/bootiso/template @@ -1,11 +1,10 @@ # Template file for 'bootiso' pkgname=bootiso version=4.2.0 -revision=2 +revision=3 build_style=gnu-makefile -depends="bash bc binutils coreutils curl dosfstools e2fsprogs eudev exfat-utils - f2fs-tools file findutils gawk grep ncurses ntfs-3g rsync syslinux tar util-linux - wimlib jq" +depends="bash bc binutils curl dosfstools e2fsprogs eudev exfatprogs + f2fs-tools file ncurses ntfs-3g rsync syslinux wimlib jq" short_desc="Create a USB bootable device from an ISO image easily and securely" maintainer="Lorem " license="GPL-3.0-only" From 78bd692830fe6b7408031aba972b31263c77dfb6 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 29 Aug 2022 22:10:46 +0200 Subject: [PATCH 0638/1407] lowdown: update to 1.0.0. --- srcpkgs/lowdown/template | 5 ++--- srcpkgs/lowdown/update | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template index 3ead485924ff..ea0d7bce726b 100644 --- a/srcpkgs/lowdown/template +++ b/srcpkgs/lowdown/template @@ -1,19 +1,18 @@ # Template file for 'lowdown' pkgname=lowdown -version=0.11.2 +version=1.0.0 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" maintainer="Duncaen " 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=6e5cfec293afc24968c0ddd8deb4f57389adba6a8b7bcb221d34c1a44aeef3eb +checksum=a7c9dbbd40e3e9d9296ff6ef6ac54fec83b1abe54db7b6113cd9c0f692a20c13 shlib_provides="liblowdown.so" post_install() { diff --git a/srcpkgs/lowdown/update b/srcpkgs/lowdown/update index 8820b185b054..a428eb53503a 100644 --- a/srcpkgs/lowdown/update +++ b/srcpkgs/lowdown/update @@ -1,2 +1,2 @@ -site=https://github.com/kristapsdz/lowdown/releases -pattern="VERSION_\K[\d\_]*(?=\.tar.gz)" +site=https://kristaps.bsd.lv/lowdown/snapshots/ +pattern="\K[\d.]+(?=\.tar.gz)" From 543f00575e953a85ffc84a2f2f0e0c6f13163bf9 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Wed, 18 May 2022 09:27:07 +0530 Subject: [PATCH 0639/1407] dkms: update to 3.0.6 files/kernel.d/dkms.prerm has been updated to match the kernel_prerm.d_dkms file distributed with dkms 3.0.6 Also, note that these dkms.conf directives have been deprecated since dkms 2.8.8 - MODULES_CONF - MODULES_CONF_ALIAS_TYPE - MODULES_CONF_OBSOLETES - MODULES_CONF_OBSOLETE_ONLY - REMAKE_INITRD Also, note that the output of `dkms status` was changed in version 2.8.6 old - zfs, 2.1.4, 5.15.39_1, x86_64: installed new - zfs/2.1.4, 5.15.39_1, x86_64: installed --- srcpkgs/dkms/files/kernel.d/dkms.prerm | 22 ++++++++++------------ srcpkgs/dkms/template | 15 +++++++++------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/srcpkgs/dkms/files/kernel.d/dkms.prerm b/srcpkgs/dkms/files/kernel.d/dkms.prerm index 155e9734aee2..1c4e52a073aa 100644 --- a/srcpkgs/dkms/files/kernel.d/dkms.prerm +++ b/srcpkgs/dkms/files/kernel.d/dkms.prerm @@ -1,21 +1,19 @@ -#!/bin/bash +#!/bin/sh -# We're passed the version of the kernel being installed +# We're passed the version of the kernel being removed PKGNAME="$1" VERSION="$2" if [ -x /usr/bin/dkms ]; then -while read line; do - name=`echo "$line" | awk '{print $1}' | sed 's/,$//'` - vers=`echo "$line" | awk '{print $2}' | sed 's/,$//'` - arch=`echo "$line" | awk '{print $4}' | sed 's/:$//'` - echo "dkms: removing: $name $vers (${PKGNAME}-${VERSION}) ($arch)" >&2 - /usr/bin/dkms remove -q -m $name -v $vers -k ${VERSION} -a $arch -done < <(/usr/bin/dkms status -k ${VERSION} 2>/dev/null | grep ": installed") + /usr/bin/dkms status -k "$VERSION" 2>/dev/null | while IFS=" ,:/" read -r name vers _ arch status; do + [ "$status" = installed ] || continue + echo "dkms: removing: $name $vers ($PKGNAME-$VERSION) ($arch)" >&2 + /usr/bin/dkms remove -q -m "$name" -v "$vers" -k "$VERSION" -a "$arch" + done fi -rmdir \ - "/lib/modules/${VERSION}/updates/dkms" \ - "/lib/modules/${VERSION}/updates" 2>/dev/null +rmdir 2>/dev/null \ + "/lib/modules/$VERSION/updates/dkms" \ + "/lib/modules/$VERSION/updates" exit 0 diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template index 32b0211981f8..ac1ccecffa53 100644 --- a/srcpkgs/dkms/template +++ b/srcpkgs/dkms/template @@ -1,15 +1,15 @@ # Template file for 'dkms' pkgname=dkms -version=2.8.4 -revision=2 +version=3.0.6 +revision=1 conf_files="/etc/dkms/framework.conf" depends="bash kmod gcc make coreutils" -short_desc="Dynamic Kernel Modules System" +short_desc="Dynamic Kernel Module Support" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/dell/dkms" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=540912bf0d845ac333f6971a3ccb80911c770a042af1b30ffbb9b420ac979af3 +distfiles="https://github.com/dell/dkms/archive/v${version}.tar.gz" +checksum=1e1ae273d2a72e3a89b829f3c72f482fb903f12cf766c054d11612e1d70795b4 case "$XBPS_TARGET_MACHINE" in # Too many competing kernels for arm* to depend on linux-headers @@ -21,11 +21,14 @@ if [ "$CROSS_BUILD" ]; then depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex" fi +do_build() { + make dkms dkms.8 +} + do_install() { # We are only interested in the bare minimum. vbin dkms vman dkms.8 - vinstall dkms_dbversion 644 var/lib/dkms vcompletion dkms.bash-completion bash dkms vinstall dkms_framework.conf 644 etc/dkms framework.conf # Kernel hooks. From 48878223574d35074374ca873c9298774de3ce3a Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sun, 31 Jul 2022 23:49:34 +0530 Subject: [PATCH 0640/1407] xbps-triggers: dkms trigger updated and bugfixed The output format of `dkms status` has changed in v2.8.6 old - zfs, 2.1.4, 5.15.39_1, x86_64: installed new - zfs/2.1.4, 5.15.39_1, x86_64: installed So, I've re-worked the _modver and _kver detection logic. NOTE: The detection logic should ideally be identical to the detection logic in srcpkgs/dkms/files/kernel.d/dkms.prerm Also, there was a bug. If a package tried to install a dkms module that failed to build for *all* of the installed kernels, then the output of dkms status for that module would be - old - module-name, x.y.z: added new - module-name/x.y.z: added Which would cause the dkms trigger to set _kver to "added", and then the following call to `dkms remove` would set the flag `-k $_kver`, and dkms would get confused trying to find a kernel of version "added". This commit fixes that bug. --- srcpkgs/dkms/template | 2 +- srcpkgs/xbps-triggers/files/dkms | 25 +++++++++++++++---------- srcpkgs/xbps-triggers/template | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template index ac1ccecffa53..ee16e8c3aeb5 100644 --- a/srcpkgs/dkms/template +++ b/srcpkgs/dkms/template @@ -3,7 +3,7 @@ pkgname=dkms version=3.0.6 revision=1 conf_files="/etc/dkms/framework.conf" -depends="bash kmod gcc make coreutils" +depends="bash kmod gcc make coreutils xbps-triggers>=0.123_1" short_desc="Dynamic Kernel Module Support" maintainer="Orphaned " license="GPL-2.0-or-later" diff --git a/srcpkgs/xbps-triggers/files/dkms b/srcpkgs/xbps-triggers/files/dkms index fcd64efd0301..6b285c576b53 100755 --- a/srcpkgs/xbps-triggers/files/dkms +++ b/srcpkgs/xbps-triggers/files/dkms @@ -2,7 +2,7 @@ # # DKMS trigger. Used to add/build/install or remove the specified modules # from all kernels. -# +# # Modules can be specified like: # dkms_modules=" ..." # @@ -21,19 +21,24 @@ UPDATE="$5" export PATH="usr/bin:usr/sbin:/usr/sbin:/usr/bin:/sbin:/bin" remove_modules() { - local _modver _kver - # Remove the specified modules from all kernels. set -- ${dkms_modules} while [ $# -gt 0 ]; do - $DKMS status -m "$1" | while read line; do - if $(echo "$line" | egrep -vq '(added|built|installed)'); then - shift 2; continue + $DKMS status -m "$1" | while read -r line; do + IFS=" ,:/" read -r modname modver kver arch status _ <<-EOF + $line + EOF + if [ "${line#*: }" = added ]; then + # The module wasn't built successfully for any kernel version + printf %s "Cleaning up DKMS module '$modname-$modver'... " + $DKMS remove -m "$modname" -v "$modver" >/dev/null 2>&1 + elif [ "$status" = installed ] || [ "$status" = built ]; then + printf %s "Removing DKMS module '$modname-$modver' for kernel-$kver... " + $DKMS remove -m "$modname" -v "$modver" -k "$kver" >/dev/null 2>&1 + else + # Invalid output + continue fi - _modver=$(echo "$line"|sed "s/$1,[[:blank:]]\([^,]*\)[,:].*/\1/;t;d") - _kver=$(echo "$line"|awk '{print $3}'|sed "s/\(.*\),$/\1/") - echo -n "Removing DKMS module '${1}-${_modver}' for kernel-${_kver}... " - $DKMS remove -m "$1" -v "${_modver}" -k "${_kver}" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo "done." else diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index b1e4f34a4dde..f0249f6f9964 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.122 +version=0.123 revision=1 bootstrap=yes short_desc="XBPS triggers for Void Linux" From b5dcbb04b5f97674d90ed7e8185cb63734f6a91d Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sun, 15 May 2022 12:17:19 +0530 Subject: [PATCH 0641/1407] broadcom-wl-dkms: remove deprecated dkms directive --- srcpkgs/broadcom-wl-dkms/files/dkms.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/broadcom-wl-dkms/files/dkms.conf b/srcpkgs/broadcom-wl-dkms/files/dkms.conf index a6219f4c89b8..96acd0dc2092 100644 --- a/srcpkgs/broadcom-wl-dkms/files/dkms.conf +++ b/srcpkgs/broadcom-wl-dkms/files/dkms.conf @@ -3,4 +3,3 @@ PACKAGE_VERSION="@VERSION@" BUILT_MODULE_NAME[0]="wl" DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless" AUTOINSTALL="yes" -REMAKE_INITRD="yes" From 9f20950cd7357a8455e80d3568f9911e9cf194ae Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 29 Aug 2022 16:18:19 -0400 Subject: [PATCH 0642/1407] broadcom-wl-dkms: fix xlint, use initramfs-regenerate trigger --- srcpkgs/broadcom-wl-dkms/INSTALL | 7 ------- srcpkgs/broadcom-wl-dkms/REMOVE | 7 ------- srcpkgs/broadcom-wl-dkms/template | 12 +++++------- 3 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 srcpkgs/broadcom-wl-dkms/INSTALL delete mode 100644 srcpkgs/broadcom-wl-dkms/REMOVE diff --git a/srcpkgs/broadcom-wl-dkms/INSTALL b/srcpkgs/broadcom-wl-dkms/INSTALL deleted file mode 100644 index 51795d79e05b..000000000000 --- a/srcpkgs/broadcom-wl-dkms/INSTALL +++ /dev/null @@ -1,7 +0,0 @@ -# Regenerate initramfs. -case ${ACTION} in -post) - echo "Regenerating initramfs, please wait..." - dracut -f -q - ;; -esac diff --git a/srcpkgs/broadcom-wl-dkms/REMOVE b/srcpkgs/broadcom-wl-dkms/REMOVE deleted file mode 100644 index c975fe022861..000000000000 --- a/srcpkgs/broadcom-wl-dkms/REMOVE +++ /dev/null @@ -1,7 +0,0 @@ -# Regenerate initramfs. -case ${ACTION} in -purge) - echo "Regenerating initramfs, please wait..." - dracut -f -q - ;; -esac diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template index 686f11a6d6dd..f640e4a3efeb 100644 --- a/srcpkgs/broadcom-wl-dkms/template +++ b/srcpkgs/broadcom-wl-dkms/template @@ -1,19 +1,17 @@ # Template file for 'broadcom-wl-dkms' - pkgname=broadcom-wl-dkms version=6.30.223.271 revision=12 +archs="i686* x86_64*" +create_wrksrc=yes +depends="dkms" +short_desc="Broadcom proprietary wireless drivers for Linux - DKMS kernel module" maintainer="Orphaned " license="custom:Proprietary Broadcom license" homepage="http://broadcom.com" - -archs="i686* x86_64*" repository="nonfree" -create_wrksrc=yes - -short_desc="Broadcom proprietary wireless drivers for Linux - DKMS kernel module" +triggers="dkms initramfs-regenerate" dkms_modules="wl ${version}" -depends="dkms" case "$XBPS_TARGET_MACHINE" in i686*) From 81bda70414cf4852ddc1ecc9baa4a48257cea0a0 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sun, 15 May 2022 12:18:55 +0530 Subject: [PATCH 0643/1407] rtl8822bu-dkms: remove deprecated dkms directive Closes: #37139 [via git-merge-pr] --- srcpkgs/rtl8822bu-dkms/files/dkms.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/rtl8822bu-dkms/files/dkms.conf b/srcpkgs/rtl8822bu-dkms/files/dkms.conf index 3156be8132bc..243a32dbebca 100644 --- a/srcpkgs/rtl8822bu-dkms/files/dkms.conf +++ b/srcpkgs/rtl8822bu-dkms/files/dkms.conf @@ -8,4 +8,3 @@ KSRC=/lib/modules/${kernelver}/build" CLEAN="make clean" DEST_MODULE_LOCATION="/kernel/drivers/net/wireless" AUTOINSTALL="yes" -REMAKE_INITRD=no From 7d6a99502dfe01d06c8b8da1ab4b0cac7cd9ff52 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 29 Aug 2022 16:30:18 -0400 Subject: [PATCH 0644/1407] broadcom-wl-dkms: missing revbump --- srcpkgs/broadcom-wl-dkms/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template index f640e4a3efeb..68129b4a82a2 100644 --- a/srcpkgs/broadcom-wl-dkms/template +++ b/srcpkgs/broadcom-wl-dkms/template @@ -1,7 +1,7 @@ # Template file for 'broadcom-wl-dkms' pkgname=broadcom-wl-dkms version=6.30.223.271 -revision=12 +revision=13 archs="i686* x86_64*" create_wrksrc=yes depends="dkms" From 936a632728938aff208fc7bdebf463d3ee025094 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 29 Aug 2022 16:30:18 -0400 Subject: [PATCH 0645/1407] rtl8822bu-dkms: missing revbump --- srcpkgs/rtl8822bu-dkms/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rtl8822bu-dkms/template b/srcpkgs/rtl8822bu-dkms/template index 548d0b6299cd..61b92f58464d 100644 --- a/srcpkgs/rtl8822bu-dkms/template +++ b/srcpkgs/rtl8822bu-dkms/template @@ -1,7 +1,7 @@ # Template file for 'rtl8822bu-dkms' pkgname=rtl8822bu-dkms version=20201222 -revision=1 +revision=2 _gitrev=fcfd4ecca1512d4cd2db4aa91679576d2a5ab8eb wrksrc="rtl8822bu-${_gitrev}" depends="dkms" From 25398992f6e30a713e7dac2628f10b46ec7193b3 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Fri, 26 Aug 2022 09:44:51 +0200 Subject: [PATCH 0646/1407] vagrant: update to 2.3.0. --- .../silence-warning-about-installer.patch | 15 ++++++++ srcpkgs/vagrant/template | 38 +++++++++---------- 2 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 srcpkgs/vagrant/patches/silence-warning-about-installer.patch diff --git a/srcpkgs/vagrant/patches/silence-warning-about-installer.patch b/srcpkgs/vagrant/patches/silence-warning-about-installer.patch new file mode 100644 index 000000000000..4432a13d3737 --- /dev/null +++ b/srcpkgs/vagrant/patches/silence-warning-about-installer.patch @@ -0,0 +1,15 @@ +--- /bin/vagrant 2022-08-06 00:16:44.000000000 +0200 ++++ /bin/vagrant 2022-08-23 09:50:50.613805575 +0200 +@@ -221,11 +221,6 @@ + end + end + +- if !Vagrant.in_installer? && !Vagrant.very_quiet? +- # If we're not in the installer, warn. +- env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) +- end +- + # Acceptable experimental flag values include: + # + # Unset - Disables experimental features + diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template index f15d85850d03..6c2d0bf6a11f 100644 --- a/srcpkgs/vagrant/template +++ b/srcpkgs/vagrant/template @@ -1,29 +1,34 @@ # Template file for 'vagrant' pkgname=vagrant -version=2.2.19 -revision=2 +version=2.3.0 +revision=1 archs="i686 x86_64*" -hostmakedepends="ruby" -makedepends="ruby-devel zlib-devel" +build_style=gemspec depends="bsdtar curl openssh rsync" short_desc="Tool for building and distributing development environments" maintainer="Andrea Brancaleoni " license="MIT" homepage="https://www.vagrantup.com/" -distfiles="https://github.com/mitchellh/${pkgname}/archive/v${version}.tar.gz" -checksum=4f0e6b1d466e26dead682c4d4843e8f64a012eba4be91506ae6c6d34d3d9c8f9 +changelog="https://raw.githubusercontent.com/hashicorp/vagrant/main/CHANGELOG.md" +distfiles="https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz" +checksum=1931dbf29ec3c6622a649ae145fe706e5b957d7075870ce577358dd22c3d5dca nocross=yes post_extract() { - sed -i 's|, "< 3\.1"||g' $pkgname.gemspec -} - -do_build() { - gem build $pkgname.gemspec + vsed -i 's|, "< 3\.1"||g' vagrant.gemspec } do_install() { - GEM_PATH=$DESTDIR/usr/lib/$pkgname GEM_HOME="$GEM_PATH" gem install $pkgname-$version.gem --no-document -- --disable-clean + GEM_PATH=$DESTDIR/usr/lib/vagrant GEM_HOME="$GEM_PATH" \ + gem install vagrant-$version.gem --no-document -- --disable-clean + + vlicense LICENSE + + vbin $FILESDIR/vagrant + + vcompletion "contrib/bash/completion.sh" bash + + vinstall contrib/vim/vagrantfile.vim 644 /usr/share/vim/vim90/ftplugin find ${DESTDIR} -type f -name \*.a -delete find ${DESTDIR} -type f -name \*.log -delete @@ -48,12 +53,5 @@ do_install() { find ${DESTDIR} -type d -name examples -print0|xargs -0 rm -rf -- find ${DESTDIR} -type d -name doc -print0|xargs -0 rm -rf -- find ${DESTDIR} -type d -name ports -print0|xargs -0 rm -rf -- - rm -r ${DESTDIR}/usr/lib/$pkgname/cache - - vmkdir usr/bin - vmkdir usr/share/bash-completion/completions - vbin $FILESDIR/$pkgname - ln -sf /usr/lib/$pkgname/gems/$pkgname-$version/contrib/bash/completion.sh \ - $DESTDIR/usr/share/bash-completion/completions/$pkgname - vlicense LICENSE + rm -r ${DESTDIR}/usr/lib/vagrant/cache } From e2b6c8fd8dceb49428cba50a3fe15430c5e06ba8 Mon Sep 17 00:00:00 2001 From: UltimateNyn Date: Sat, 27 Aug 2022 17:21:13 +0200 Subject: [PATCH 0647/1407] chafa: update to 1.12.3; enable manpage, svg, webp --- srcpkgs/chafa/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template index ba80b16495f3..4eabb143fcf9 100644 --- a/srcpkgs/chafa/template +++ b/srcpkgs/chafa/template @@ -1,16 +1,17 @@ # Template file for 'chafa' pkgname=chafa -version=1.8.0 -revision=2 +version=1.12.3 +revision=1 build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="libglib-devel libmagick-devel libXext-devel libxml2-devel" +configure_args="--enable-man" +hostmakedepends="docbook-xml docbook-xsl libxslt pkg-config" +makedepends="libglib-devel libmagick-devel librsvg-devel libwebp-devel libXext-devel libxml2-devel" short_desc="Versatile and fast Unicode/ASCII/ANSI graphics renderer" maintainer="Christian Buschau " license="LGPL-3.0-or-later" homepage="https://hpjansson.org/chafa/" distfiles="https://hpjansson.org/chafa/releases/chafa-${version}.tar.xz" -checksum=21ff652d836ba207098c40c459652b2f1de6c8a64fbffc62e7c6319ced32286b +checksum=2456a0b6c1150e25b64cd6a92810d59bed3f061f8b86f91aba5a77bc7cc76cfa case "$XBPS_TARGET_MACHINE" in x86_64*|i686*) ;; From 0f539765676460a8373d69495e9c0567bdd13486 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 29 Aug 2022 23:17:32 +0200 Subject: [PATCH 0648/1407] cppcheck: update to 2.9. --- srcpkgs/cppcheck/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template index 50427f55b33d..a41275ec7d2a 100644 --- a/srcpkgs/cppcheck/template +++ b/srcpkgs/cppcheck/template @@ -1,16 +1,18 @@ # Template file for 'cppcheck' pkgname=cppcheck -version=2.8.2 +version=2.9 revision=1 build_style=gnu-makefile make_build_args=" FILESDIR=/usr/share/cppcheck MATCHCOMPILER=yes + HAVE_RULES=yes DB2MAN=/usr/share/xsl/docbook/manpages/docbook.xsl" make_install_args="${make_build_args}" make_build_target="cppcheck man" python_version="3" hostmakedepends="libxslt docbook-xsl python3 which" +makedepends="pcre-devel" depends="python3" short_desc="Static analysis of C/C++ code" maintainer="Duncaen " @@ -18,7 +20,10 @@ 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=30ba99ab54089c44b83f02e2453da046a7edff5237950d4a0eb1eba4afcb4f45 +checksum=56aee8b5bdf936ab7adc9ab43903ba2052f088695c80f047682024a1ed0ef3f3 + +export CXXFLAGS="-DNDEBUG" +export LDFLAGS="-pthread" post_install() { vman cppcheck.1 From 7922981e1baef0c289329e3a06ac1517517e4023 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 29 Aug 2022 23:26:04 +0200 Subject: [PATCH 0649/1407] update-check: use gitlab settings for code.videolan.org --- 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 ec53ed9f38e6..40126bc5925e 100644 --- a/common/xbps-src/shutils/update_check.sh +++ b/common/xbps-src/shutils/update_check.sh @@ -123,7 +123,7 @@ update_check() { pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)" url="https://github.com/$pkgurlname/tags" rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';; - *//gitlab.*) + *//gitlab.*|*code.videolan.org*) case "$url" in */-/*) pkgurlname="$(printf %s "$url" | sed -e 's%/-/.*%%g; s%/$%%')";; *) pkgurlname="$(printf %s "$url" | cut -d / -f 1-5)";; From d31d018f700d7bc0e5e2baeebee675b7922e2198 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:18:02 -0400 Subject: [PATCH 0650/1407] common/build-helper/python3.sh: add python3 helper --- common/build-helper/python3.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 common/build-helper/python3.sh diff --git a/common/build-helper/python3.sh b/common/build-helper/python3.sh new file mode 100644 index 000000000000..4707599ef0e0 --- /dev/null +++ b/common/build-helper/python3.sh @@ -0,0 +1,16 @@ +# fix building non-pure-python modules on cross +if [ -n "$CROSS_BUILD" ]; then + export PYPREFIX="$XBPS_CROSS_BASE" + export CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" + export LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" + export CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" + export LDSHARED="${CC} -shared $LDFLAGS" + export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" + export PYTHONPATH="${XBPS_CROSS_BASE}/${py3_lib}" + for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do + [ -f "$f" ] || continue + f=${f##*/} + _PYTHON_SYSCONFIGDATA_NAME=${f%.py} + done + [ -n "$_PYTHON_SYSCONFIGDATA_NAME" ] && export _PYTHON_SYSCONFIGDATA_NAME +fi From f0b10c1423c37c877782a17aa4e04b2703757c24 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:19:03 -0400 Subject: [PATCH 0651/1407] common/{,environment}/build_style/python3.sh: use python3 build_helper --- common/build-style/python3-module.sh | 39 +------------------ .../environment/build-style/python3-module.sh | 1 + 2 files changed, 3 insertions(+), 37 deletions(-) diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh index a0a694ee4a97..b76d89c8b502 100644 --- a/common/build-style/python3-module.sh +++ b/common/build-style/python3-module.sh @@ -3,24 +3,7 @@ # do_build() { - if [ -n "$CROSS_BUILD" ]; then - PYPREFIX="$XBPS_CROSS_BASE" - CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" - LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" - CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" - LDSHARED="${CC} -shared $LDFLAGS" - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - env CC="$CC" LDSHARED="$LDSHARED" \ - PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ - PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} \ - _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME" \ - LDFLAGS="$LDFLAGS" python3 setup.py build ${make_build_args} - else - python3 setup.py build ${make_build_args} - fi + python3 setup.py build ${make_build_args} } do_check() { @@ -47,23 +30,5 @@ do_check() { } do_install() { - if [ -n "$CROSS_BUILD" ]; then - PYPREFIX="$XBPS_CROSS_BASE" - CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" - LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" - CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" - LDSHARED="${CC} -shared $LDFLAGS" - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - env CC="$CC" LDSHARED="$LDSHARED" \ - PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ - PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} \ - _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME" \ - LDFLAGS="$LDFLAGS" python3 setup.py \ - install --prefix=/usr --root=${DESTDIR} ${make_install_args} - else - python3 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args} - fi + python3 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args} } diff --git a/common/environment/build-style/python3-module.sh b/common/environment/build-style/python3-module.sh index 56471fe88bc0..638f6be9373a 100644 --- a/common/environment/build-style/python3-module.sh +++ b/common/environment/build-style/python3-module.sh @@ -1,2 +1,3 @@ lib32disabled=yes makedepends+=" python3" +build_helper+=" python3" From 2b62a89b07c5ca78828f10c3bdb2f93781c59d45 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:20:10 -0400 Subject: [PATCH 0652/1407] brltty: use python3 build_helper, clean up --- srcpkgs/brltty/template | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template index 08707f8dc86c..cf7c198b5253 100644 --- a/srcpkgs/brltty/template +++ b/srcpkgs/brltty/template @@ -1,8 +1,9 @@ # Template file for 'brltty' pkgname=brltty version=6.4 -revision=5 +revision=6 build_style=gnu-configure +build_helper=python3 configure_args="--enable-gpm --with-screen-driver=lx,sc --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3" hostmakedepends="pkg-config python3-Cython" @@ -10,8 +11,8 @@ makedepends="ncurses-devel alsa-lib-devel gpm-devel icu-devel python3-devel libb short_desc="Braille display driver for Linux/Unix" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" -homepage="http://mielke.cc/brltty/" -distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz" +homepage="https://brltty.app" +distfiles="https://brltty.app/archive/brltty-${version}.tar.xz" checksum=bc7573b0d0ab865c36607945b64c209312405571788f3b409397726f6143eaa6 python_version=3 @@ -25,8 +26,8 @@ esac pre_configure() { case "$XBPS_TARGET_MACHINE" in - *-musl) # There is no ldconfig in musl libc - sed -e "s;/sbin/ldconfig -n;echo;" -i configure + *-musl) # There is no ldconfig in musl libc + sed -e "s;/sbin/ldconfig -n;echo;" -i configure ;; esac export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}${py3_abiver}" export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" @@ -34,31 +35,17 @@ pre_configure() { post_configure() { case "$XBPS_TARGET_MACHINE" in - arm*-musl) # Fix erroneously detected "#define HAVE_SYS_IO_H 1" - sed -i config.h -e"s;#define HAVE_SYS_IO_H 1;#undef HAVE_SYS_IO_H;" + arm*-musl) # Fix erroneously detected "#define HAVE_SYS_IO_H 1" + sed -i config.h -e"s;#define HAVE_SYS_IO_H 1;#undef HAVE_SYS_IO_H;" ;; esac } -pre_build() { - if [ "$CROSS_BUILD" ]; then - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - export _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - export PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} - fi -} - -pre_install() { - pre_build -} - do_install() { make INSTALL_ROOT=${DESTDIR} install - vsv $pkgname + vsv brltty vsconf Documents/brltty.conf vdoc Documents/ChangeLog - vcopy Documents/Manual-BRLTTY usr/share/doc/${pkgname} + vcopy Documents/Manual-BRLTTY usr/share/doc/brltty } brltty-devel_package() { From bbf4d57a9933365ddfd844f391bf3be94daaac04 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:20:12 -0400 Subject: [PATCH 0653/1407] i2c-tools: use python3 build_helper --- srcpkgs/i2c-tools/template | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/srcpkgs/i2c-tools/template b/srcpkgs/i2c-tools/template index ec522fd6f71b..1f0b2bcd1f6b 100644 --- a/srcpkgs/i2c-tools/template +++ b/srcpkgs/i2c-tools/template @@ -1,8 +1,9 @@ # Template file for 'i2c-tools' pkgname=i2c-tools version=4.3 -revision=2 +revision=3 build_style=gnu-makefile +build_helper=python3 make_build_args="EXTRA=py-smbus" make_install_args="sbindir=/usr/bin EXTRA=py-smbus" hostmakedepends="python3 python3-setuptools" @@ -16,21 +17,6 @@ distfiles="https://mirrors.edge.kernel.org/pub/software/utils/i2c-tools/i2c-tool checksum=1f899e43603184fac32f34d72498fc737952dbc9c97a8dd9467fadfdf4600cf9 system_groups="i2c" - -if [ -n "$CROSS_BUILD" ]; then - export PYPREFIX="$XBPS_CROSS_BASE" - export CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" - export LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" - export CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" - export LDSHARED="${CC} -shared $LDFLAGS" - export PYTHONPATH="${XBPS_CROSS_BASE}/${py3_lib}" - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - export _PYTHON_SYSCONFIGDATA_NAME -fi - post_install() { vinstall "${FILESDIR}/45-i2c-tools.rules" 644 usr/lib/udev/rules.d } From 8d352803168e3fdd3f7ffbf2d8f176f873ab526b Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:20:13 -0400 Subject: [PATCH 0654/1407] libpwquality: use python3 build_helper --- srcpkgs/libpwquality/template | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template index 9d72a5539baa..e89a8a0c5cf7 100644 --- a/srcpkgs/libpwquality/template +++ b/srcpkgs/libpwquality/template @@ -1,10 +1,11 @@ # Template file for 'libpwquality' pkgname=libpwquality version=1.4.2 -revision=5 +revision=6 build_style=gnu-configure +build_helper=python3 configure_args="--disable-static --enable-pam --with-securedir=/usr/lib/security" -hostmakedepends="libtool automake gettext-devel python3-devel" +hostmakedepends="libtool automake gettext-devel python3" makedepends="cracklib-devel pam-devel python3-devel" depends="cracklib" conf_files="/etc/security/pwquality.conf" @@ -13,29 +14,13 @@ maintainer="bra1nwave " license="GPL-2.0-or-later" homepage="https://github.com/libpwquality/libpwquality" changelog="https://raw.githubusercontent.com/libpwquality/libpwquality/master/NEWS" -distfiles="${homepage}/releases/download/libpwquality-${version}/libpwquality-${version}.tar.bz2" +distfiles="https://github.com/libpwquality/libpwquality/releases/download/libpwquality-${version}/libpwquality-${version}.tar.bz2" checksum=5263e09ee62269c092f790ac159112aed3e66826a795e3afec85fdeac4281c8e -CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" - pre_configure() { - vsed -i python/Makefile.am -e 's|CFLAGS=.*|LDSHARED="${CC} -pthread -shared" &|g' autoreconf -fi } -pre_build() { - if [ "$CROSS_BUILD" ]; then - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - export _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - export PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} - fi -} -pre_install() { - pre_build -} - libpwquality-devel_package() { depends="cracklib-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From eca7211427e006cdd5d964c17a371021990be376 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:20:13 -0400 Subject: [PATCH 0655/1407] tlsh: use python3 build_helper --- srcpkgs/tlsh/template | 42 ++++-------------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/srcpkgs/tlsh/template b/srcpkgs/tlsh/template index c4625ea2c74d..3801747eb959 100644 --- a/srcpkgs/tlsh/template +++ b/srcpkgs/tlsh/template @@ -1,8 +1,9 @@ # Template file for 'tlsh' pkgname=tlsh version=3.19.1 -revision=3 +revision=4 build_style=cmake +build_helper=python3 hostmakedepends="python3" makedepends="python3-devel" short_desc="Fuzzy matching library" @@ -19,24 +20,7 @@ pre_configure() { post_build() { cd py_ext - if [ -n "$CROSS_BUILD" ]; then - PYPREFIX="$XBPS_CROSS_BASE" - CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" - LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" - CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" - LDSHARED="${CC} -shared $LDFLAGS" - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - env CC="$CC" LDSHARED="$LDSHARED" \ - PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ - PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} \ - _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME" \ - LDFLAGS="$LDFLAGS" python3 setup.py build ${make_build_args} - else - python3 setup.py build ${make_build_args} - fi + python3 setup.py build ${make_build_args} } @@ -47,25 +31,7 @@ pre_check() { post_install() { vlicense LICENSE cd py_ext - if [ -n "$CROSS_BUILD" ]; then - PYPREFIX="$XBPS_CROSS_BASE" - CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" - LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" - CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" - LDSHARED="${CC} -shared $LDFLAGS" - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - env CC="$CC" LDSHARED="$LDSHARED" \ - PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ - PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} \ - _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME" \ - LDFLAGS="$LDFLAGS" python3 setup.py \ - install --prefix=/usr --root=${DESTDIR} ${make_install_args} - else - python3 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args} - fi + python3 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args} } tlsh-devel_package() { From a6aa0426e7817666056cd82c1b2cc46757e467d1 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, 30 Aug 2022 14:37:05 +0700 Subject: [PATCH 0656/1407] tzdata: remove posix if right/Canada/East-Saskatchewan exist Chance are both of them exist --- srcpkgs/tzutils/template | 2 +- srcpkgs/tzutils/tzdata.INSTALL | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template index 761361aca73c..c0d3d6500e58 100644 --- a/srcpkgs/tzutils/template +++ b/srcpkgs/tzutils/template @@ -1,7 +1,7 @@ # Template file for 'tzutils' pkgname=tzutils version=2022c -revision=1 +revision=2 bootstrap=yes wrksrc="tzdb-${version}" short_desc="Time zone and daylight-saving time utilities" diff --git a/srcpkgs/tzutils/tzdata.INSTALL b/srcpkgs/tzutils/tzdata.INSTALL index a6a50de6a417..8e87d78afc70 100755 --- a/srcpkgs/tzutils/tzdata.INSTALL +++ b/srcpkgs/tzutils/tzdata.INSTALL @@ -3,8 +3,8 @@ pre) # Due to some reasons, some old timezone was kept # The latest one would be Canada/East-Saskatchewan in 2017c # Don't force remove on everyone since it will spit error on update - if [ ! -L usr/share/zoneinfo/right ] && - [ -f usr/share/zoneinfo/right/Canada/East-Saskatchewan ]; then + if [ -f usr/share/zoneinfo/right/Canada/East-Saskatchewan ]; then + rm -rf usr/share/zoneinfo/posix rm -rf usr/share/zoneinfo/right fi ;; From 8454a3c25e69fbcfac7a300df5e42e0894d1b904 Mon Sep 17 00:00:00 2001 From: Michal Tvrznik Date: Tue, 30 Aug 2022 07:32:07 +0200 Subject: [PATCH 0657/1407] emptty: update to 0.9.0 --- srcpkgs/emptty/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template index d2a813b83105..3f17c66ef127 100644 --- a/srcpkgs/emptty/template +++ b/srcpkgs/emptty/template @@ -1,16 +1,16 @@ # Template file for 'emptty' pkgname=emptty -version=0.8.1 +version=0.9.0 revision=1 build_style=go go_import_path=github.com/tvrzna/emptty makedepends="pam-devel libX11-devel" short_desc="Dead simple Display Manager running in CLI as TTY login" -maintainer="xXR01I1Xx " +maintainer="tvrzna " license="MIT" homepage="https://github.com/tvrzna/emptty" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=3344c3f3a372f713a4384d37dce01fcce25bb0874c08ded3338ed34ab16839ad +checksum=530da58d898c499516b5f5b189e1c86801df949fb794c2242de652ef3ee65d15 conf_files="/etc/emptty/conf /etc/pam.d/emptty" post_install() { From 1b643ab6fef0e4271261da1840c7386cbfb1c8b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 24 Aug 2022 12:56:22 +0200 Subject: [PATCH 0658/1407] ansible: update to 6.3.0. --- srcpkgs/ansible/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 15e0fa8f2a27..ea5e6e9b2251 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=6.2.0 +version=6.3.0 revision=1 build_style="python3-pep517" hostmakedepends="python3-setuptools python3-wheel" @@ -10,6 +10,6 @@ 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=bdaf2b2fd926ff189fbde2fefe7234733f32c36fc413033fa5d93945fbdc06a6 +checksum=d5fa9fc15a8d45c8d5247a9645b0b48f995d735b12c4da655666d48506273526 # Relevant tests happen in ansible-core make_check=no From 37b15d9457a1bbb4fd4e3cc1a6714e94b199bf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 24 Aug 2022 12:42:46 +0200 Subject: [PATCH 0659/1407] python3-ansible-lint: update to 6.5.1. --- srcpkgs/python3-ansible-lint/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template index a34c858ba776..512fc58d653f 100644 --- a/srcpkgs/python3-ansible-lint/template +++ b/srcpkgs/python3-ansible-lint/template @@ -1,11 +1,12 @@ # Template file for 'python3-ansible-lint' pkgname=python3-ansible-lint -version=6.4.0 +version=6.5.1 revision=1 wrksrc="${pkgname/python3-/}-${version}" build_style=python3-pep517 # These require ansible-lint installed properly, or they are flaky make_check_args="--deselect src/ansiblelint/rules/no_loop_var_prefix.py::test_no_loop_var_prefix + --deselect src/ansiblelint/rules/only_builtins.py::test_only_builtin_fail --deselect src/ansiblelint/rules/schema.py::test_schema --deselect test/test_cli_role_paths.py::test_run_inside_role_dir --deselect test/test_cli_role_paths.py::test_run_invalid_role_name_from_meta @@ -30,6 +31,7 @@ make_check_args="--deselect src/ansiblelint/rules/no_loop_var_prefix.py::test_no --deselect test/test_list_rules.py::test_list_tags_includes_opt_in_rules --deselect test/test_main.py::test_call_from_outside_venv --deselect test/test_profiles.py::test_profile_listing + --deselect test/test_rules_collection.py::test_rich_rule_listing --deselect test/test_task_includes.py::test_included_tasks --deselect test/test_utils.py::test_cli_auto_detect --deselect test/test_verbosity.py::test_default_verbosity" @@ -40,7 +42,7 @@ depends="ansible-core python3-yamllint python3-six python3-yaml python3-ansible-compat python3-jsonschema" checkdepends="${depends} python3-pytest black python3-flake8 python3-flaky python3-mypy pylint python3-pytest-cov python3-pytest-xdist - python3-pytest-forked" + python3-pytest-forked python3-filelock" short_desc="Linter for Ansible files" maintainer="Jan Christian Grünhage " # Note about licensing from upstream: @@ -51,7 +53,7 @@ maintainer="Jan Christian Grünhage " 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=c5a76306cae906a260cf7286ca87c4d03ba4492b2ed7bfea21ad11fdf3c7e8d1 +checksum=b02c5222450c469196c9cc28d3128e50f6bcf9549d5dd15c3cfbf47c70b5b06e make_check_pre="env PYTHONPATH=src" post_patch() { From c9eda12d649db2105dba16a16588690807720592 Mon Sep 17 00:00:00 2001 From: Martin Dimov Date: Thu, 25 Aug 2022 03:30:03 +0300 Subject: [PATCH 0660/1407] recoll: update to 1.32.7. - enable python module - update version check page - explicit conf args - proper (host)makedepends - update musl patches - use helper to fix python cross Co-authored-by: classabbyamp --- srcpkgs/recoll/patches/musl.patch | 39 ++++++++++++++++++++++--------- srcpkgs/recoll/template | 20 ++++++++-------- srcpkgs/recoll/update | 2 +- 3 files changed, 39 insertions(+), 22 deletions(-) diff --git a/srcpkgs/recoll/patches/musl.patch b/srcpkgs/recoll/patches/musl.patch index c83d0f553c8a..d633e92b9df1 100644 --- a/srcpkgs/recoll/patches/musl.patch +++ b/srcpkgs/recoll/patches/musl.patch @@ -1,5 +1,5 @@ -Index: utils/fstreewalk.cpp -=================================================================== +diff --git a/utils/fstreewalk.cpp b/utils/fstreewalk.cpp +index fc43edc..5e28d6e 100644 --- a/utils/fstreewalk.cpp +++ b/utils/fstreewalk.cpp @@ -17,6 +17,7 @@ @@ -10,16 +10,33 @@ Index: utils/fstreewalk.cpp #include #include -Index: utils/pxattr.cpp -=================================================================== ---- a/utils/pxattr.cpp 2017-07-03 14:14:46.000000000 +0200 -+++ b/utils/pxattr.cpp 2017-12-17 14:34:29.955674837 +0100 -@@ -44,7 +44,7 @@ - // just let the methods return errors (like they would on a non-xattr - // fs on e.g. linux) +diff --git a/utils/pxattr.cpp b/utils/pxattr.cpp +index 3a1f8f5..dcb93fc 100644 +--- a/utils/pxattr.cpp ++++ b/utils/pxattr.cpp +@@ -46,7 +46,7 @@ --#if defined(__DragonFly__) || defined(__OpenBSD__) -+#if defined(__DragonFly__) || defined(__OpenBSD__) || !defined(__GLIBC__) + // Not exactly true for win32, but makes my life easier by avoiding ifdefs in recoll (the calls just + // fail, which is expected) +-#if defined(__DragonFly__) || defined(__OpenBSD__) || defined(_WIN32) ++#if defined(__DragonFly__) || defined(__OpenBSD__) || defined(_WIN32) || !defined(__GLIBC__) #define HAS_NO_XATTR #endif + +diff --git a/common/conf_post.h b/common/conf_post.h +index 7093ead..0ecd56b 100644 +--- a/common/conf_post.h ++++ b/common/conf_post.h +@@ -73,12 +73,4 @@ typedef int ssize_t; + #define REAL_GCC __GNUC__ // probably + #endif +-#ifdef REAL_GCC +-// Older gcc versions pretended to supply std::regex, but the resulting programs mostly crashed. +-#include +-#if ! __GNUC_PREREQ(6,0) +-#define NO_STD_REGEX 1 +-#endif +-#endif +- + #endif /* INCLUDED */ diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template index 8c5de6966a46..8084f70a8e0e 100644 --- a/srcpkgs/recoll/template +++ b/srcpkgs/recoll/template @@ -1,18 +1,18 @@ # Template file for 'recoll' pkgname=recoll -version=1.30.0 +version=1.32.7 revision=1 build_style=gnu-configure -build_helper=qmake -configure_args="--disable-python-module --disable-python-chm - --enable-recollq --disable-x11mon" -hostmakedepends="automake libtool gettext-devel qt5-qmake pkg-config - qt5-host-tools" -makedepends="xapian-core-devel zlib-devel libuuid-devel qt5-webkit-devel qt5-devel - aspell-devel libxslt-devel libxml2-devel" +build_helper="qmake python3" +configure_args="--enable-recollq --disable-python-chm --disable-x11mon + --disable-webkit --without-systemd --disable-rpath" +hostmakedepends="pkg-config gettext-devel qt5-qmake qt5-host-tools + which python3-setuptools" +makedepends="libxslt-devel xapian-core-devel zlib-devel qt5-devel + python3-devel" short_desc="Full text search tool based on Xapian backend" maintainer="Rui Abreu Ferreira " license="GPL-2.0-or-later" homepage="https://www.lesbonscomptes.com/recoll/" -distfiles="https://www.lesbonscomptes.com/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=17a8e684a8d5560dc7b44cd4b2962cb46476a75bdc107f622051235076d11885 +distfiles="https://www.lesbonscomptes.com/recoll/recoll-${version}.tar.gz" +checksum=ca08a6f4bb0b519bf915a062a9b7aadc4f343473cc1f07895708208d66337dba diff --git a/srcpkgs/recoll/update b/srcpkgs/recoll/update index dcc285e571f0..afe7c791114e 100644 --- a/srcpkgs/recoll/update +++ b/srcpkgs/recoll/update @@ -1 +1 @@ -site="https://www.lesbonscomptes.com/recoll/download.html" +site="https://www.lesbonscomptes.com/recoll/pages/download.html" From f812593a27b6c30f48b2ce8f8cbbf382b8384b05 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:21 +0200 Subject: [PATCH 0661/1407] adriconf: add changelog --- srcpkgs/adriconf/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/adriconf/template b/srcpkgs/adriconf/template index 91ce78ed168d..c559d5b33f98 100644 --- a/srcpkgs/adriconf/template +++ b/srcpkgs/adriconf/template @@ -1,7 +1,7 @@ # Template file for 'adriconf' pkgname=adriconf version=2.5.0 -revision=1 +revision=2 wrksrc="${pkgname}-v${version}" build_style=cmake configure_args="-DENABLE_UNIT_TESTS=false" @@ -11,5 +11,6 @@ short_desc="Advanced DRI Configurator" maintainer="lemmi " license="GPL-3.0-or-later" homepage="https://gitlab.freedesktop.org/mesa/adriconf/" +changelog="https://gitlab.freedesktop.org/mesa/adriconf/-/releases" distfiles="https://gitlab.freedesktop.org/mesa/adriconf/-/archive/v${version}/adriconf-v${version}.tar.gz" checksum=d57bef5e72c7ccd68b442c998f63119da86e637d5d8284bc066347333492e183 From 8b902cba00323e1078dfe206c3d869b19ce5a47c Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:21 +0200 Subject: [PATCH 0662/1407] cadence: add changelog --- srcpkgs/cadence/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cadence/template b/srcpkgs/cadence/template index 5fe361c13921..c11cc50df02e 100644 --- a/srcpkgs/cadence/template +++ b/srcpkgs/cadence/template @@ -1,7 +1,7 @@ # Template file for 'cadence' pkgname=cadence version=0.9.2 -revision=1 +revision=2 wrksrc="Cadence-${version}" build_style=gnu-makefile pycompile_dirs="usr/share/cadence/src" @@ -13,6 +13,7 @@ short_desc="Set of tools useful for audio production" maintainer="lemmi " license="GPL-2.0-only" homepage="https://kx.studio/Applications:Cadence" +changelog="https://github.com/falkTX/Cadence/releases" distfiles="https://github.com/falkTX/Cadence/archive/v${version}.tar.gz" checksum=a07fe845e55c1785d3e1a091b77efd3bb01a88648bd11215461f9fa6a797ae87 python_version=3 From df80c9e9586408004a2be5c15e57e607a06c0795 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:21 +0200 Subject: [PATCH 0663/1407] ddcutil: add changelog --- srcpkgs/ddcutil/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ddcutil/template b/srcpkgs/ddcutil/template index f6313b9f627a..9215d95a8c89 100644 --- a/srcpkgs/ddcutil/template +++ b/srcpkgs/ddcutil/template @@ -1,7 +1,7 @@ # Template file for 'ddcutil' pkgname=ddcutil version=1.2.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="i2c-tools-devel libdrm-devel libgudev-devel libkmod-devel libusb-devel libXrandr-devel" @@ -9,6 +9,7 @@ short_desc="Query and change monitor settings using DDC/CI and USB" maintainer="lemmi " license="GPL-2.0-or-later" homepage="http://www.ddcutil.com" +changelog="https://www.ddcutil.com/release_notes/" distfiles="https://github.com/rockowitz/ddcutil/archive/v${version}.tar.gz" checksum=f6766a00b78decc0bff7345093afb444d60172967555276c93916d181287744e From 03a4856276cd4da05e858ff7d69ee7906eea0fad Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:22 +0200 Subject: [PATCH 0664/1407] dispcalGUI: add changelog --- srcpkgs/dispcalGUI/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dispcalGUI/template b/srcpkgs/dispcalGUI/template index 1bb51316a5d1..7b808449d0da 100644 --- a/srcpkgs/dispcalGUI/template +++ b/srcpkgs/dispcalGUI/template @@ -1,7 +1,7 @@ # Template file for 'dispcalGUI' pkgname=dispcalGUI version=3.8.9.3 -revision=4 +revision=5 _name="DisplayCAL" wrksrc="${_name}-${version}" build_style=python2-module @@ -12,6 +12,7 @@ short_desc="Display Calibration and Characterization" maintainer="lemmi " license="GPL-3.0-or-later" homepage="https://displaycal.net/" +changelog="https://displaycal.net/CHANGES.html" distfiles="${SOURCEFORGE_SITE}/dispcalgui/${_name}-${version}.tar.gz" checksum=7c34dfbd9f66f24f1d4c88de4a5a0de688aad719f095874b6259637d30893bea From 163ea5bd6993cd85f1b7d826662ac8b9a2446cc4 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:22 +0200 Subject: [PATCH 0665/1407] enblend-enfuse: add changelog --- srcpkgs/enblend-enfuse/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template index 783bc4a693f4..77bbcfc27fa8 100644 --- a/srcpkgs/enblend-enfuse/template +++ b/srcpkgs/enblend-enfuse/template @@ -1,7 +1,7 @@ # Template file for 'enblend-enfuse' pkgname=enblend-enfuse version=4.2 -revision=7 +revision=8 build_style=gnu-configure configure_args="--enable-openmp --with-tcmalloc" hostmakedepends="pkg-config perl automake" @@ -11,6 +11,7 @@ short_desc="Tools for for combining multiple images" maintainer="lemmi " license="GPL-2.0-or-later" homepage="http://enblend.sourceforge.net/" +changelog="http://hg.code.sf.net/p/enblend/code/file/tip/NEWS" distfiles="${SOURCEFORGE_SITE}/enblend/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz" checksum=8703e324939ebd70d76afd350e56800f5ea2c053a040a5f5218b2a1a4300bd48 From 6d2e42e641ab59a6b3fda64a4edb15c228bf1284 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:22 +0200 Subject: [PATCH 0666/1407] girara: add changelog --- srcpkgs/girara/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template index 6bcbe95b8076..1e0401305e05 100644 --- a/srcpkgs/girara/template +++ b/srcpkgs/girara/template @@ -1,7 +1,7 @@ # Template file for 'girara' pkgname=girara version=0.3.7 -revision=1 +revision=2 build_style=meson configure_args="$(vopt_if notify -Dnotify=enabled -Dnotify=disabled) -Dtests=disabled" hostmakedepends="pkg-config intltool doxygen glib-devel" @@ -10,6 +10,7 @@ short_desc="Library implementing a user interface that focuses on minimalism" maintainer="lemmi " license="Zlib" homepage="https://pwmt.org/projects/girara/" +changelog="https://pwmt.org/projects/girara/changelog/${version}/index.html" distfiles="https://git.pwmt.org/pwmt/girara/-/archive/${version}/girara-${version}.tar.gz" checksum=41342213f8e745258f1db28cbb6ccc27a63009a5e001bf791bbe01ce436d4db7 From be08b39cc3f32800396defdc9d8a9ec76508cc0b Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:22 +0200 Subject: [PATCH 0667/1407] hidrd: add changelog --- ...use-of-tempfile-with-mktemp-in-tests.patch | 46 +++++++++++++++++++ srcpkgs/hidrd/template | 5 +- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/hidrd/patches/0001-Replace-use-of-tempfile-with-mktemp-in-tests.patch diff --git a/srcpkgs/hidrd/patches/0001-Replace-use-of-tempfile-with-mktemp-in-tests.patch b/srcpkgs/hidrd/patches/0001-Replace-use-of-tempfile-with-mktemp-in-tests.patch new file mode 100644 index 000000000000..730a4768be2b --- /dev/null +++ b/srcpkgs/hidrd/patches/0001-Replace-use-of-tempfile-with-mktemp-in-tests.patch @@ -0,0 +1,46 @@ +From f876ac085a86cc932c7d3093a7d007c78bff4751 Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +Date: Tue, 26 Apr 2016 13:28:04 -0700 +Subject: [PATCH] Replace use of 'tempfile' with 'mktemp' in tests + +The 'tempfile' command has been deprecated in Debian for many years +at this point and may not even be available on modern systems. Use +'mktemp' as the recommended replacement. +--- + lib/fmt/hidrd_read_test | 6 +++--- + lib/fmt/hidrd_write_test | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/lib/fmt/hidrd_read_test b/lib/fmt/hidrd_read_test +index 8ae1350..6b30f6b 100755 +--- a/lib/fmt/hidrd_read_test ++++ b/lib/fmt/hidrd_read_test +@@ -39,9 +39,9 @@ function run () + local input="$1"; shift + local output="$1"; shift + local output_basename="`basename \"$output\"`" +- local test_output="`tempfile -s\"_$output_basename.test\"`" +- local txt_output="`tempfile -s\"_$output_basename.txt\"`" +- local test_txt_output="`tempfile -s\"_$output_basename.txt.test\"`" ++ local test_output="`mktemp --suffix=\"_$output_basename.test\"`" ++ local txt_output="`mktemp --suffix=\"_$output_basename.txt\"`" ++ local test_txt_output="`mktemp --suffix=\"_$output_basename.txt.test\"`" + local status + + echo "Checking \"$format\" reading from \"$input\"" \ +diff --git a/lib/fmt/hidrd_write_test b/lib/fmt/hidrd_write_test +index 3cfb0aa..73dddd8 100755 +--- a/lib/fmt/hidrd_write_test ++++ b/lib/fmt/hidrd_write_test +@@ -34,7 +34,7 @@ function run () + local input="$1"; shift + local output="$1"; shift + local output_basename="`basename \"$output\"`" +- local test_output="`tempfile -s\"_$output_basename.test\"`" ++ local test_output="`mktemp --suffix=\"_$output_basename.test\"`" + local status + + echo "Checking \"$format\" writing of \"$input\"" \ +-- +2.37.2 + diff --git a/srcpkgs/hidrd/template b/srcpkgs/hidrd/template index 3154799a7c34..7a71b10a66b2 100644 --- a/srcpkgs/hidrd/template +++ b/srcpkgs/hidrd/template @@ -1,13 +1,15 @@ # Template file for 'hidrd' pkgname=hidrd version=0.2.0 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" +checkdepends="which" short_desc="HID report descriptor I/O library and conversion tool" maintainer="lemmi " license="GPL-2.0-or-later" homepage="https://github.com/DIGImend/hidrd" +changelog="https://github.com/DIGImend/hidrd/raw/master/NEWS" distfiles="https://github.com/DIGImend/hidrd/archive/${version}.tar.gz" checksum=0147993dedb3066873d22fab1dc3aafec78d8c5783d168cccc43126f0fc3b307 @@ -17,6 +19,7 @@ case $XBPS_TARGET_MACHINE in *-musl) configure_args+=' LIBS=-lobstack' makedepends+=" musl-obstack-devel" + make_check="no" # needs error.h ;; esac From 6852a6bbc3630cc3ac843a04c7449ae83a44ea3e Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:23 +0200 Subject: [PATCH 0668/1407] hugin: add changelog --- srcpkgs/hugin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 7961c74632a1..73a0822f4e25 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,8 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2021.0.0 -revision=1 -wrksrc="${pkgname}-${version}" +revision=2 build_style=cmake build_helper=cmake-wxWidgets-gtk3 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates" @@ -16,6 +15,7 @@ short_desc="Easy to use panoramic imaging toolchain" maintainer="lemmi " license="GPL-2.0-or-later" homepage="http://hugin.sourceforge.net/" +changelog="https://hugin.sourceforge.io/releases/${version}/en.shtml" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version%.*}/${pkgname}-${version}.tar.bz2" checksum=047aea8a7fa47844b34ef27c19d3b697e84939dcb1fdbbeb2c204621b66eead9 python_version=3 From 38700315d40a2ee54db2c6e8a7f6cb60d6366f5d Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:23 +0200 Subject: [PATCH 0669/1407] imapfilter: add changelog --- srcpkgs/imapfilter/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template index 162277fee9cd..bb7c1cc880db 100644 --- a/srcpkgs/imapfilter/template +++ b/srcpkgs/imapfilter/template @@ -1,7 +1,7 @@ # Template file for 'imapfilter' pkgname=imapfilter version=2.6.12 -revision=6 +revision=7 build_style=gnu-makefile make_build_args="LIBLUA=-llua5.3" hostmakedepends="lua53-devel" @@ -10,6 +10,7 @@ short_desc="Mail filtering utility" maintainer="lemmi " license="MIT" homepage="https://github.com/lefcha/imapfilter" +changelog="https://raw.githubusercontent.com/lefcha/imapfilter/master/NEWS" distfiles="https://github.com/lefcha/imapfilter/archive/v${version}.tar.gz" checksum=764a68c737e555d7b164644a4c491fd66cffb93d6077d58f502b94e1a022a884 From 1fae1644013f538cda826fd2f9b03b7b736bc136 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:23 +0200 Subject: [PATCH 0670/1407] libosmgpsmap: add changelog --- srcpkgs/libosmgpsmap/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libosmgpsmap/template b/srcpkgs/libosmgpsmap/template index 63dc740d9cb4..5c1eb2476d2a 100644 --- a/srcpkgs/libosmgpsmap/template +++ b/srcpkgs/libosmgpsmap/template @@ -1,7 +1,7 @@ # Template file for 'libosmgpsmap' pkgname=libosmgpsmap version=1.2.0 -revision=1 +revision=2 wrksrc="osm-gps-map-${version}" build_style=gnu-configure build_helper="gir" @@ -12,6 +12,7 @@ short_desc="Gtk+ Widget for Displaying OpenStreetMap tiles" maintainer="lemmi " license="GPL-2.0-or-later" homepage="http://nzjrs.github.io/osm-gps-map/" +changelog="https://raw.githubusercontent.com/nzjrs/osm-gps-map/master/NEWS" distfiles="https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz" checksum=ddec11449f37b5dffb4bca134d024623897c6140af1f9981a8acc512dbf6a7a5 From 6f41ee3d8ed2299f40f4a3872c950ee545bf1ba2 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:23 +0200 Subject: [PATCH 0671/1407] libserialport: add changelog --- srcpkgs/libserialport/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libserialport/template b/srcpkgs/libserialport/template index 7d1cdd3c7631..48718d759bd3 100644 --- a/srcpkgs/libserialport/template +++ b/srcpkgs/libserialport/template @@ -1,12 +1,13 @@ # Template file for 'libserialport' pkgname=libserialport version=0.1.1 -revision=3 +revision=4 build_style=gnu-configure short_desc="Cross-platform library for accessing serial ports" maintainer="lemmi " license="LGPL-3.0-or-later" homepage="https://sigrok.org/wiki/Libserialport" +changelog="https://sigrok.org/gitweb/?p=libserialport.git;a=blob_plain;f=NEWS;hb=HEAD" distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" checksum=4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d From 5a7099e9da3461a7f5fdbcf94602dff33dab5721 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:23 +0200 Subject: [PATCH 0672/1407] libsigrok: add changelog --- srcpkgs/libsigrok/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libsigrok/template b/srcpkgs/libsigrok/template index 0243925a7312..fa73aefab4de 100644 --- a/srcpkgs/libsigrok/template +++ b/srcpkgs/libsigrok/template @@ -1,7 +1,7 @@ # Template file for 'libsigrok' pkgname=libsigrok version=0.5.2 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config doxygen python3" makedepends="glib-devel libzip-devel glibmm-devel libserialport-devel @@ -10,6 +10,7 @@ short_desc="C library for talking to hardware" maintainer="lemmi " license="GPL-3.0-or-later" homepage="https://sigrok.org/" +changelog="https://sigrok.org/gitweb/?p=libsigrok.git;a=blob_plain;f=NEWS;hb=refs/heads/libsigrok-${version%.*}.x" distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" checksum=4d341f90b6220d3e8cb251dacf726c41165285612248f2c52d15df4590a1ce3c From e2fb1603cbefa66965ff5e503b5052a90d7ee5ae Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:24 +0200 Subject: [PATCH 0673/1407] libsigrokdecode: add changelog --- srcpkgs/libsigrokdecode/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libsigrokdecode/template b/srcpkgs/libsigrokdecode/template index 8b7e131eb460..a5cceddf7ac5 100644 --- a/srcpkgs/libsigrokdecode/template +++ b/srcpkgs/libsigrokdecode/template @@ -1,7 +1,7 @@ # Template file for 'libsigrokdecode' pkgname=libsigrokdecode version=0.5.3 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="pkg-config python3 autoconf automake" makedepends="glib-devel python3-devel" @@ -10,6 +10,7 @@ short_desc="C library provides basic API for running sigrok protocol decoders" maintainer="lemmi " license="GPL-3.0-or-later" homepage="https://sigrok.org/" +changelog="https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blob_plain;f=NEWS;hb=refs/heads/libsigrokdecode-${version%.*}.x" distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" checksum=c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0 From 1a4fe95cfc73565f06a2735237d435b569bc0ee0 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:24 +0200 Subject: [PATCH 0674/1407] libvidstab: add changelog --- srcpkgs/libvidstab/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libvidstab/template b/srcpkgs/libvidstab/template index 6d28468873b5..5fdbabfc3475 100644 --- a/srcpkgs/libvidstab/template +++ b/srcpkgs/libvidstab/template @@ -1,14 +1,15 @@ # Template file for 'libvidstab' pkgname=libvidstab version=1.1.0 -revision=1 +revision=2 wrksrc=vid.stab-${version} build_style=cmake +makedepends="orc-devel libgomp-devel" short_desc="Video stabilization library" maintainer="lemmi " -makedepends="orc-devel libgomp-devel" -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://public.hronopik.de/vid.stab/" +changelog="https://raw.githubusercontent.com/georgmartius/vid.stab/master/Changelog" distfiles="https://github.com/georgmartius/vid.stab/archive/v${version}.tar.gz" checksum=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb From 17823d4bd53ed0553c712822f21901c244d3779e Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:24 +0200 Subject: [PATCH 0675/1407] ndppd: add changelog --- srcpkgs/ndppd/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ndppd/template b/srcpkgs/ndppd/template index e9cbba36942a..6b628b6e9cbf 100644 --- a/srcpkgs/ndppd/template +++ b/srcpkgs/ndppd/template @@ -1,12 +1,13 @@ # Template file for 'ndppd' pkgname=ndppd version=0.2.5 -revision=1 +revision=2 build_style=gnu-makefile short_desc="NDP Proxy Daemon" maintainer="lemmi " license="GPL-3.0-or-later" homepage="https://github.com/DanielAdolfsson/ndppd" +changelog="https://raw.githubusercontent.com/DanielAdolfsson/ndppd/master/ChangeLog" distfiles="https://github.com/DanielAdolfsson/ndppd/archive/${version}.tar.gz" checksum=ee934167f8357f0bd0015e201a77fbe4d028c59e89dc98113805c6855e1c3992 From be2498f580f9145429697f380fd3e38bd81a3d37 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:24 +0200 Subject: [PATCH 0676/1407] pulseview: add changelog --- srcpkgs/pulseview/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template index 83ce80bc39d9..aaaf69757e0a 100644 --- a/srcpkgs/pulseview/template +++ b/srcpkgs/pulseview/template @@ -1,7 +1,7 @@ # Template file for 'pulseview' pkgname=pulseview version=0.4.2 -revision=1 +revision=2 build_style=cmake configure_args="-DDISABLE_WERROR=TRUE" hostmakedepends="pkg-config qt5-qmake qt5-host-tools" @@ -11,8 +11,9 @@ makedepends="glib-devel libzip-devel glibmm-devel qt5-devel depends="sigrok-firmware-fx2lafw qt5-svg" short_desc="Qt-based LA/scope/MSO GUI for sigrok" maintainer="lemmi " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://sigrok.org/" +changelog="https://sigrok.org/gitweb/?p=pulseview.git;a=blob_plain;f=NEWS;hb=refs/heads/pulseview-${version%.*}.x" distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" checksum=f042f77a3e1b35bf30666330e36ec38fab8d248c3693c37b7e35d401c3bfabcb From ded289bbad6317855050e15e6e85008c145136ff Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:25 +0200 Subject: [PATCH 0677/1407] qdirstat: add changelog --- srcpkgs/qdirstat/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template index fc9e04202627..b305f233a63f 100644 --- a/srcpkgs/qdirstat/template +++ b/srcpkgs/qdirstat/template @@ -1,7 +1,7 @@ # Template file for 'qdirstat' pkgname=qdirstat version=1.8.1 -revision=1 +revision=2 build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="zlib-devel qt5-devel" @@ -9,6 +9,7 @@ short_desc="Qt-based directory statistics (KDirStat without any KDE)" maintainer="lemmi " license="GPL-2.0-only" homepage="https://github.com/shundhammer/qdirstat" +changelog="https://github.com/shundhammer/qdirstat/releases" distfiles="https://github.com/shundhammer/qdirstat/archive/${version}.tar.gz" checksum=f41212ddeb7fab86bad43cf65cb7fbd044f4c08fc0b167f8e9eaa384e0c1561b From ed78df8edff85a0e28219b16f2527ac79b2f1ea0 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:25 +0200 Subject: [PATCH 0678/1407] screen-message: add changelog --- srcpkgs/screen-message/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/screen-message/template b/srcpkgs/screen-message/template index 277033966654..84dc6b475254 100644 --- a/srcpkgs/screen-message/template +++ b/srcpkgs/screen-message/template @@ -1,7 +1,7 @@ # Template file for 'screen-message' pkgname=screen-message version=0.26 -revision=2 +revision=3 build_style=gnu-configure make_build_args='execgamesdir=$(prefix)/bin' make_install_args=${make_build_args} @@ -11,5 +11,6 @@ short_desc="Displays a short text fullscreen " maintainer="lemmi " license="GPL-2.0-or-later" homepage="https://www.joachim-breitner.de/projects#screen-message" +changelog="https://raw.githubusercontent.com/nomeata/screen-message/master/debian/changelog" distfiles="https://www.joachim-breitner.de/archive/screen-message/screen-message-${version}.tar.gz" checksum=bc12a7b973844190c00a694d3fdc2327735b21d8b1231ec8ef66ba363ea98f37 From 4e6eb73da08023297083548cec21faff1a37f441 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:25 +0200 Subject: [PATCH 0679/1407] sigrok-cli: add changelog --- srcpkgs/sigrok-cli/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/sigrok-cli/template b/srcpkgs/sigrok-cli/template index 3206dd45815c..cd3f251c6bbc 100644 --- a/srcpkgs/sigrok-cli/template +++ b/srcpkgs/sigrok-cli/template @@ -1,7 +1,7 @@ # Template file for 'sigrok-cli' pkgname=sigrok-cli version=0.7.2 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="glib-devel libzip-devel libsigrok-devel libsigrokdecode-devel" @@ -10,5 +10,6 @@ short_desc="Provide the basic sigrok functionality from the command-line" maintainer="lemmi " license="GPL-3.0-or-later" homepage="https://sigrok.org/" +changelog="https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blob_plain;f=NEWS;hb=refs/heads/sigrok-cli-${version%.*}.x" distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" checksum=71d0443f36897bf565732dec206830dbea0f2789b6601cf10536b286d1140ab8 From c88cfd9d2ce93c8e4ca28a5e35f4101b4cf266fd Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:25 +0200 Subject: [PATCH 0680/1407] sigrok-firmware-fx2lafw: add changelog --- srcpkgs/sigrok-firmware-fx2lafw/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/sigrok-firmware-fx2lafw/template b/srcpkgs/sigrok-firmware-fx2lafw/template index 3f767d70ef4a..e139c5e0996a 100644 --- a/srcpkgs/sigrok-firmware-fx2lafw/template +++ b/srcpkgs/sigrok-firmware-fx2lafw/template @@ -1,12 +1,13 @@ # Template file for 'sigrok-firmware-fx2lafw' pkgname=sigrok-firmware-fx2lafw version=0.1.7 -revision=2 +revision=3 wrksrc="${pkgname}-bin-${version}" short_desc="Sigrok fx2lafw Firmware files" maintainer="lemmi " license="GPL-2.0-or-later,LGPL-2.1-or-later" homepage="https://sigrok.org/" +changelog="https://sigrok.org/gitweb/?p=sigrok-firmware-fx2lafw.git;a=blob_plain;f=NEWS;hb=HEAD" distfiles="https://sigrok.org/download/binary/${pkgname}/${pkgname}-bin-${version}.tar.gz" checksum=c876fd075549e7783a6d5bfc8d99a695cfc583ddbcea0217d8e3f9351d1723af From ea08f4ae051c3f706c7d3e12f7e4bb3abe019299 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:25 +0200 Subject: [PATCH 0681/1407] smcroute: add changelog --- srcpkgs/smcroute/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/smcroute/template b/srcpkgs/smcroute/template index 172ce081413c..8e526f7edd2c 100644 --- a/srcpkgs/smcroute/template +++ b/srcpkgs/smcroute/template @@ -1,7 +1,7 @@ # Template file for 'smcroute' pkgname=smcroute version=2.5.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-mrdisc" hostmakedepends="pkg-config" @@ -10,6 +10,7 @@ short_desc="Static multicast routing for UNIX" maintainer="lemmi " license="GPL-2.0-or-later" homepage="https://github.com/troglobit/smcroute" +changelog="https://raw.githubusercontent.com/troglobit/smcroute/master/ChangeLog.md" distfiles="https://github.com/troglobit/smcroute/releases/download/${version}/smcroute-${version}.tar.gz" checksum=2569cd97fa2047df14203a7144be53a1b32928cb460421a302bbcce381b42bc3 From 8225eadbd92925a738eb459f3b56ec833fc18ccf Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:26 +0200 Subject: [PATCH 0682/1407] tmux-xpanes: add changelog --- srcpkgs/tmux-xpanes/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/tmux-xpanes/template b/srcpkgs/tmux-xpanes/template index 7a5172ba47e7..99e3d04107e3 100644 --- a/srcpkgs/tmux-xpanes/template +++ b/srcpkgs/tmux-xpanes/template @@ -1,11 +1,12 @@ # Template file for 'tmux-xpanes' pkgname=tmux-xpanes version=4.1.3 -revision=1 +revision=2 short_desc="Awesome way to create multiple tmux panes" maintainer="lemmi " license="MIT" homepage="https://github.com/greymd/tmux-xpanes" +changelog="https://github.com/greymd/tmux-xpanes/releases" distfiles="https://github.com/greymd/tmux-xpanes/archive/v${version}.tar.gz" checksum=d6c6ce10bb1a487c6455474fe2274eb56ff0a8a87ee9d5cae7dae676d13c19b2 From 24a4711c40869682d4009be0196b9aa3a63ef846 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:26 +0200 Subject: [PATCH 0683/1407] tvheadend: add changelog --- srcpkgs/tvheadend/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template index 230ecb592571..e6b16d7ccf3b 100644 --- a/srcpkgs/tvheadend/template +++ b/srcpkgs/tvheadend/template @@ -1,8 +1,7 @@ # Template file for 'tvheadend' pkgname=tvheadend version=4.2.8 -revision=5 -wrksrc=tvheadend-${version} +revision=6 build_style=gnu-configure configure_args="--enable-dvbscan --disable-ffmpeg_static --disable-hdhomerun_static --disable-bintray_cache --disable-libx264_static @@ -14,6 +13,7 @@ short_desc="TV streaming server" maintainer="lemmi " license="GPL-3.0-only" homepage="http://tvheadend.org" +changelog="https://tvheadend.org/projects/tvheadend/wiki/Releases" distfiles="https://github.com/tvheadend/tvheadend/archive/v${version}.tar.gz" checksum=1aef889373d5fad2a7bd2f139156d4d5e34a64b6d38b87b868a2df415f01f7ad From ccb406883b1bda8690df1020d49314c99a651526 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:26 +0200 Subject: [PATCH 0684/1407] wcalc: add changelog --- srcpkgs/wcalc/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/wcalc/template b/srcpkgs/wcalc/template index e1effe3ea49f..0307bee89bbe 100644 --- a/srcpkgs/wcalc/template +++ b/srcpkgs/wcalc/template @@ -1,12 +1,13 @@ # Template file for 'wcalc' pkgname=wcalc version=2.5 -revision=6 +revision=7 build_style=gnu-configure makedepends="readline-devel mpfr-devel gmp-devel" short_desc="Powerful arbitrary-precision calculator" maintainer="lemmi " license="GPL-2.0-or-later" homepage="http://w-calc.sourceforge.net" +changelog="http://w-calc.sourceforge.net/history.php" distfiles="${SOURCEFORGE_SITE}/w-calc/${pkgname}-${version}.tar.bz2" checksum=0e2c17c20f935328dcdc6cb4c06250a6732f9ee78adf7a55c01133960d6d28ee From fc8d1f4a3d887ca0c7d6800d4f3eb5794ec5e4d7 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:27 +0200 Subject: [PATCH 0685/1407] zathura-cb: add changelog --- srcpkgs/zathura-cb/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/zathura-cb/template b/srcpkgs/zathura-cb/template index 4cfed7b4d6f0..d1c7b2dd53fa 100644 --- a/srcpkgs/zathura-cb/template +++ b/srcpkgs/zathura-cb/template @@ -1,7 +1,7 @@ # Template file for 'zathura-cb' pkgname=zathura-cb version=0.1.9 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config" makedepends="zathura-devel libarchive-devel" @@ -10,6 +10,7 @@ short_desc="Comic book support for zathura" maintainer="lemmi " license="Zlib" homepage="https://git.pwmt.org/pwmt/zathura-cb/" +changelog="https://pwmt.org/projects/zathura-cb/changelog/${version}/index.html" distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" checksum=30d2cea3b1eb65e7386eb66ec305e455b2bed272c35530faaec541b47217fdcd From 78e4fe195b482ab857226b7b3765c6ff27f91a3f Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:27 +0200 Subject: [PATCH 0686/1407] zathura-djvu: add changelog --- srcpkgs/zathura-djvu/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/zathura-djvu/template b/srcpkgs/zathura-djvu/template index 733475923712..c91afe0c3ef1 100644 --- a/srcpkgs/zathura-djvu/template +++ b/srcpkgs/zathura-djvu/template @@ -1,7 +1,7 @@ # Template file for 'zathura-djvu' pkgname=zathura-djvu version=0.2.9 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config" makedepends="djvulibre-devel zathura-devel" @@ -10,6 +10,7 @@ short_desc="DjVu support for zathura" maintainer="lemmi " license="Zlib" homepage="https://git.pwmt.org/pwmt/zathura-djvu/" +changelog="https://pwmt.org/projects/zathura-djvu/changelog/${version}/index.html" distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" checksum=84fae6da42e7cdc2e49ed4cd4f0315ac09716e95358b9c7487803a2cff47dbca From de46ae5ded7fbd8dae2c7df62acc807a975a218e Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:27 +0200 Subject: [PATCH 0687/1407] zathura-pdf-mupdf: add changelog --- srcpkgs/zathura-pdf-mupdf/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template index 9f973214cf83..66f354d29863 100644 --- a/srcpkgs/zathura-pdf-mupdf/template +++ b/srcpkgs/zathura-pdf-mupdf/template @@ -2,7 +2,7 @@ pkgname=zathura-pdf-mupdf reverts=0.3.8_1 version=0.3.7 -revision=5 +revision=6 build_style=meson configure_args="-Dlink-external=true" hostmakedepends="pkg-config" @@ -13,6 +13,7 @@ short_desc="PDF support for zathura (using mupdf)" maintainer="lemmi " license="Zlib" homepage="https://git.pwmt.org/pwmt/zathura-pdf-mupdf/" +changelog="https://pwmt.org/projects/zathura-pdf-mupdf/changelog/${version}/index.html" distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" checksum=3f2d341dfe3bdbfb7a51a33aee81f3763a684d0ea503dd20c726311125d7c08a conflicts="zathura-pdf-poppler>=0" From d45159e6b05711dea6444b98c5f2829af43b78d8 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:27 +0200 Subject: [PATCH 0688/1407] zathura-pdf-poppler: add changelog --- srcpkgs/zathura-pdf-poppler/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template index d638f659a507..66641d8fad2d 100644 --- a/srcpkgs/zathura-pdf-poppler/template +++ b/srcpkgs/zathura-pdf-poppler/template @@ -1,7 +1,7 @@ # Template file for 'zathura-pdf-poppler' pkgname=zathura-pdf-poppler version=0.3.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config" makedepends="poppler-devel poppler-glib-devel zathura-devel" @@ -10,6 +10,7 @@ short_desc="PDF support for zathura (using poppler)" maintainer="lemmi " license="Zlib" homepage="https://git.pwmt.org/pwmt/zathura-pdf-poppler/" +changelog="https://pwmt.org/projects/zathura-pdf-poppler/changelog/${version}/index.html" distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" checksum=2034f70a936d458ddc9276f769e77ff308ba3bb1b7a7cdc87bab8b9ef7ade84a From 4baea0d1cc4e3985527dd2ca69dc28fea204a9e1 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:28 +0200 Subject: [PATCH 0689/1407] zathura-ps: add changelog --- srcpkgs/zathura-ps/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template index e17da900762c..180bbabff558 100644 --- a/srcpkgs/zathura-ps/template +++ b/srcpkgs/zathura-ps/template @@ -1,7 +1,7 @@ # Template file for 'zathura-ps' pkgname=zathura-ps version=0.2.7 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config" makedepends="libspectre-devel zathura-devel" @@ -10,6 +10,7 @@ short_desc="PostScript support for zathura" maintainer="lemmi " license="Zlib" homepage="https://git.pwmt.org/pwmt/zathura-ps/" +changelog="https://pwmt.org/projects/zathura-ps/changelog/${version}/index.html" distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" checksum=e7092c831e345002edc87321911faa27c5dc3210dd6e3939dfbc49192a54d35e From 941958aac3c19a926d5401ae45605d94c941d6d3 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:28 +0200 Subject: [PATCH 0690/1407] zathura: add changelog --- srcpkgs/zathura/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template index c93fbc062cee..69193d8ded4e 100644 --- a/srcpkgs/zathura/template +++ b/srcpkgs/zathura/template @@ -1,7 +1,7 @@ # Template file for 'zathura' pkgname=zathura version=0.4.9 -revision=1 +revision=2 build_style=meson configure_args="-Dsynctex=enabled" hostmakedepends="pkg-config intltool python3-Sphinx desktop-file-utils @@ -13,6 +13,7 @@ short_desc="Highly customizable and functional document viewer" maintainer="lemmi " license="Zlib" homepage="https://git.pwmt.org/pwmt/zathura/" +changelog="https://pwmt.org/projects/zathura/changelog/${version}/index.html" distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" checksum=82235cbc89899421fca98477265626f2149df7d072740f0360550cc8d4e449d6 From 5980728b5e8b3173dffe33a68c5508e68d28b632 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 30 Aug 2022 19:46:34 +0000 Subject: [PATCH 0691/1407] sedutil: broken on big endian --- srcpkgs/sedutil/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/sedutil/template b/srcpkgs/sedutil/template index a8aa19fbb5af..fff98deeaa2a 100644 --- a/srcpkgs/sedutil/template +++ b/srcpkgs/sedutil/template @@ -11,6 +11,10 @@ homepage="https://github.com/Drive-Trust-Alliance/sedutil" distfiles="https://github.com/Drive-Trust-Alliance/${pkgname}/archive/${version}.tar.gz" checksum=88016b93cbbef98fa6f5c4e6f58e6c871662b6a7f1fc8dc788c8599fa37a44f3 +if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then + broken="explicitly does not support big endian" +fi + pre_configure() { autoreconf -fi } From aa6d8f93ab91c787bb1b68347a7b2509fd8b2e20 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:21 +0200 Subject: [PATCH 0692/1407] babeld: update to 1.12.1. add changelog add conflict with frr (/usr/bin/babeld) --- srcpkgs/babeld/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/babeld/template b/srcpkgs/babeld/template index 5a46f57aafaf..ebf55a4a787e 100644 --- a/srcpkgs/babeld/template +++ b/srcpkgs/babeld/template @@ -1,15 +1,16 @@ # Template file for 'babeld' pkgname=babeld -version=1.10 +version=1.12.1 revision=1 -wrksrc=babeld-babeld-${version} build_style=gnu-makefile short_desc="Babel loop-avoiding distance-vector routing daemon" maintainer="lemmi " license="MIT" homepage="https://www.irif.fr/~jch/software/babel/" -distfiles="https://github.com/jech/babeld/archive/babeld-${version}.tar.gz" -checksum=d44a0ca3cf67595e1ed67ca219c975c3c011c6046028be75df254715c4611d31 +changelog="https://raw.githubusercontent.com/jech/babeld/master/CHANGES" +distfiles="https://www.irif.fr/~jch/software/files/babeld-${version}.tar.gz" +checksum=9ab59d7ac741f3630df23f9c3b67c60294d8b34ab622398f9b89773a878ecb1e +conflicts="frr" pre_build() { echo ${version}-${revision} > version From 805e4323bfd55e2084df599a3d72d9f89674bad5 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 21:50:47 +0200 Subject: [PATCH 0693/1407] frr: add conflict with babeld (/usr/bin/babeld) --- srcpkgs/frr/template | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template index 664313adf10e..ec895357d5b4 100644 --- a/srcpkgs/frr/template +++ b/srcpkgs/frr/template @@ -1,7 +1,7 @@ # Template file for 'frr' pkgname=frr version=7.5 -revision=2 +revision=3 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure # chroot-texinfo is not able to build frr's docs @@ -23,6 +23,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://frrouting.org" distfiles="https://github.com/FRRouting/frr/archive/${pkgname}-${version}.tar.gz" checksum=54066e82a82751ec5876d9b67aa0cb24fe94e19e7371af290ac25099eda9f136 +conflicts="babeld" python_version=3 system_groups="_frrvty" system_accounts="_frr" @@ -42,11 +43,6 @@ else subpackages+=" frr-devel" fi -post_patch() { - # Typo in configure macro - vsed -i m4/ax_python.m4 -e 's/"{py_ver}"/"${py_ver}"/g' -} - pre_configure() { autoreconf -fi } From 194f6e83a8f7c456e8a1f30a181726ff7ce2add4 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 14:23:26 +0200 Subject: [PATCH 0694/1407] usbhid-dump: replace with usbutils usbhid-dump is shipped with usbutils --- srcpkgs/usbhid-dump/template | 17 ----------------- srcpkgs/usbutils/template | 5 +++-- 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/usbhid-dump/template diff --git a/srcpkgs/usbhid-dump/template b/srcpkgs/usbhid-dump/template deleted file mode 100644 index bf47fb064393..000000000000 --- a/srcpkgs/usbhid-dump/template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'usbhid-dump' -pkgname=usbhid-dump -version=1.4 -revision=1 -build_style=gnu-configure -hostmakedepends="automake libtool pkg-config" -makedepends="libusb-devel" -short_desc="USB HID device dumping utility" -maintainer="lemmi " -license="GPL-2.0-or-later" -homepage="https://github.com/DIGImend/usbhid-dump" -distfiles="https://github.com/DIGImend/usbhid-dump/archive/${version}.tar.gz" -checksum=8e39092396bddbda3bc520b39417f78c09958efb3df1f2e16ff37006a3b1905d - -pre_configure() { - autoreconf -i -f -} diff --git a/srcpkgs/usbutils/template b/srcpkgs/usbutils/template index 0b149585e8e6..4c7f552a3fe0 100644 --- a/srcpkgs/usbutils/template +++ b/srcpkgs/usbutils/template @@ -1,7 +1,7 @@ # Template file for 'usbutils' pkgname=usbutils version=014 -revision=1 +revision=2 build_style=gnu-configure configure_args="--datadir=/usr/share/hwdata --disable-zlib" hostmakedepends="automake libtool pkg-config" @@ -10,10 +10,11 @@ depends="hwids" short_desc="Linux USB utilities" maintainer="Enno Boland " license="GPL-2.0-only" -homepage="https://linux-usb.sourceforge.net/" +homepage="https://github.com/gregkh/usbutils" changelog="https://raw.githubusercontent.com/gregkh/usbutils/master/NEWS" distfiles="${KERNEL_SITE}/utils/usb/usbutils/usbutils-${version}.tar.xz" checksum=3a079cfad60560227b67192482d7813bf96326fcbb66c04254839715f276fc69 +replaces="usbhid-dump<=1.4_1" post_install() { # Remove lsusb.py - avoid useless python scripts From 73040a9eb841076a88cff1075820ac65561e43c5 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Wed, 31 Aug 2022 09:15:32 +0200 Subject: [PATCH 0695/1407] google-chrome: update to 105.0.5195.52 --- 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 de2f3e0f982d..711026c24944 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,6 +1,6 @@ # Template file for 'google-chrome' pkgname=google-chrome -version=104.0.5112.101 +version=105.0.5195.52 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=5c13ccf359afc2f98d28513e51b15e3f1e88c4c34f8ac2b83983f2f246ac42b2 +checksum=c4ceafead46160eb91085c6fd1c0581c691e4b3d95405e1c6b5f4dc5f326968b do_extract() { mkdir -p ${DESTDIR} From 774b26ed65e41939e00db2ef00ad1096b168b53d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 30 Aug 2022 21:33:57 +0200 Subject: [PATCH 0696/1407] vttest: update to 20220827. --- srcpkgs/vttest/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vttest/template b/srcpkgs/vttest/template index d57591a5a723..8c2b93bfc921 100644 --- a/srcpkgs/vttest/template +++ b/srcpkgs/vttest/template @@ -1,6 +1,6 @@ # Template file for 'vttest' pkgname=vttest -version=20220215 +version=20220827 revision=1 build_style=gnu-configure short_desc="Tests the compatibility so-called 'VT100-compatible' terminals" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="http://invisible-island.net/vttest/vttest.html" distfiles="http://invisible-mirror.net/archives/${pkgname}/${pkgname}-${version}.tgz" -checksum=4a65998c5e12cf08ced2cfce119adb44fa842ac1495d0f150f21c8a6785915a1 +checksum=5726aae58137773ce6ce01fe6a86fc0f83c47763e30488bff35b9bc4fc946ce2 post_install() { vlicense COPYING From 96be51af99823580e8a6c718c60ef0139c483aef Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 30 Aug 2022 21:39:57 +0200 Subject: [PATCH 0697/1407] vim: update to 9.0.0335. --- srcpkgs/vim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index c6efd5ad0505..4357914ae8e9 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -1,6 +1,6 @@ # Template file for 'vim' pkgname=vim -version=9.0.0135 +version=9.0.0335 revision=1 hostmakedepends="gettext glib-devel pkg-config" makedepends="acl-devel ncurses-devel @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="Vim" homepage="https://www.vim.org" distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz" -checksum=b47690d77a8262d3115bea608fbf27f6ed122b49fc7765fb2cbf7d122d250d8f +checksum=7771561496c208c2d7afdee9cedf36b62c1915836e968a1fa49b685a381dc95d python_version=3 build_options="x11 gtk3 huge" From 7089e8314c206e833556861a6ec041c02f8e95bc Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 30 Aug 2022 21:41:24 +0200 Subject: [PATCH 0698/1407] python3-ropgadget: update to 6.9. --- srcpkgs/python3-ropgadget/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-ropgadget/template b/srcpkgs/python3-ropgadget/template index 9d32b853ddf3..f8587ec7a1b9 100644 --- a/srcpkgs/python3-ropgadget/template +++ b/srcpkgs/python3-ropgadget/template @@ -1,6 +1,6 @@ # Template file for 'python3-ropgadget' pkgname=python3-ropgadget -version=6.8 +version=6.9 revision=1 wrksrc="ROPGadget-${version}" build_style=python3-module @@ -13,4 +13,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/JonathanSalwan/ROPgadget" distfiles="${PYPI_SITE}/R/ROPGadget/ROPGadget-${version}.tar.gz" -checksum=8ce1164d64cb524e07bb67b8e03e57eea1535432b712de9b7efc98829de8ea05 +checksum=ab959e18edafd0eeb88801534544a79afc9f029e4f7ee9171011560754053289 From 6ef8afa7e938e8142d177a1e5b6d2e6e6f656da4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 31 Aug 2022 13:07:52 +0200 Subject: [PATCH 0699/1407] ico: update to 1.0.6. --- srcpkgs/ico/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ico/template b/srcpkgs/ico/template index 8648e9301600..e513afe54ed2 100644 --- a/srcpkgs/ico/template +++ b/srcpkgs/ico/template @@ -1,6 +1,6 @@ # Template build file for 'ico'. pkgname=ico -version=1.0.5 +version=1.0.6 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -9,8 +9,8 @@ short_desc="Animate an icosahedron or other polyhedron" homepage="http://xorg.freedesktop.org" license="X11, MIT" maintainer="Leah Neukirchen " -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=d73b62f29eb98d850f16b76d759395180b860b613fbe1686b18eee99a6e3773f +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" +checksum=38f369d431e753280fde70fa489cc94ce204f9f8eabd2f49fc7d32afa69f4405 post_install() { vlicense COPYING From f1a059eb302aa5ba73bf8c6c663e54d3c53a3519 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 31 Aug 2022 13:08:54 +0200 Subject: [PATCH 0700/1407] oclock: update to 1.0.5. --- srcpkgs/oclock/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/oclock/template b/srcpkgs/oclock/template index 502ba7e3f4f5..282077366938 100644 --- a/srcpkgs/oclock/template +++ b/srcpkgs/oclock/template @@ -1,6 +1,6 @@ # Template build file for 'oclock'. pkgname=oclock -version=1.0.4 +version=1.0.5 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -9,8 +9,8 @@ short_desc="Round X clock" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Leah Neukirchen " -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=cc20cfc1c0d5128d89e1eecd9ba52e58f111075be163e0aeda5690dbaafbaefe +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" +checksum=8f09979655e889d056b7a1e50b57f38b32529453e756b53ec659070fb3c3965c post_install() { vlicense COPYING From 2ab33adea799b04459878f043c83566c0080d642 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 31 Aug 2022 13:24:25 +0200 Subject: [PATCH 0701/1407] minify: update to 2.12.1. --- srcpkgs/minify/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template index 8077fc3ab2f5..02c422cd6d57 100644 --- a/srcpkgs/minify/template +++ b/srcpkgs/minify/template @@ -1,6 +1,6 @@ # Template file for 'minify' pkgname=minify -version=2.12.0 +version=2.12.1 revision=1 build_style=go go_import_path="github.com/tdewolff/minify/v2" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/tdewolff/minify" distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz" -checksum=19a970bcab727e9c0582c3b1a411cafb9ea0d806c24789d31f9b35cf7912a10e +checksum=0b72140fc491198f132ac65b324fab219c972f729a2a7cbce1906550cb479d88 post_install() { vlicense LICENSE From 4af1004953235de4a65471d75630d1a33d88e723 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 31 Aug 2022 13:24:27 +0200 Subject: [PATCH 0702/1407] sbcl: update to 2.2.8. --- srcpkgs/sbcl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index 990c8b0fd6a9..0b3ca5f75070 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,6 +1,6 @@ # Template file for 'sbcl' pkgname=sbcl -version=2.2.7 +version=2.2.8 revision=1 # make sure the sbcl option in maxima is enabled for the same archs archs="i686 x86_64* armv7l aarch64 ppc64le*" @@ -13,7 +13,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=ec98996fdaa68009d98b4d7db2189271f2ad455ec322ca95a9c6aebf08bead6d +checksum=992fcc2b5319010f7587cdc2294b088a595d6c0982ff195b565adfaf4b7d7b0e nocross=yes nopie=yes @@ -21,7 +21,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+=" 4b176dd651437af851f6eb8332b51457f983079d27d347c30c73b3481959be78" + checksum+=" 702a6883403d241663247cb5d1346fadeb359690e085485a1403c539b386d270" ;; arm*) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2" From e93178c066e0a1085298b17b7d411b0966b84045 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Wed, 31 Aug 2022 13:51:11 +0200 Subject: [PATCH 0703/1407] hugo: update to 0.102.2. --- srcpkgs/hugo/template | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index 4ab952760b8c..d24c31d6fb13 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,8 +1,9 @@ # Template file for 'hugo' pkgname=hugo -version=0.101.0 +version=0.102.2 revision=1 build_style=go +build_helper=qemu go_import_path="github.com/gohugoio/hugo" go_build_tags="extended" short_desc="Fast & Modern Static Website Engine" @@ -10,8 +11,20 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://gohugo.io" distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz" -checksum=ce5e2c37d9980428cfbfb22cabedc29aebe8f1142ce261777d0435f9f2d6d1cb +checksum=55c2f1bbddaa1a7be6d95ab983e4a671e6d5f7ecbc1bde8a425295845f0dd764 post_install() { vdoc README.md + + hugo=$(find $GOPATH/bin -name hugo) + + vtargetrun $hugo gen man + for page in $(ls man/); do + vman man/$page + done + + for shell in bash fish zsh; do + vtargetrun $hugo completion $shell > ${pkgname}.$shell + vcompletion ${pkgname}.$shell $shell + done } From bd108552cbc9a8ab4fa679965a3ae06396df6964 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 29 Aug 2022 22:17:11 +0300 Subject: [PATCH 0704/1407] anydesk: add missing run-time dependency on gtkglext. - reported by Sun Saych @ voidlinux tg. --- srcpkgs/anydesk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template index 2b151a7e3dcd..268c6c067c8a 100644 --- a/srcpkgs/anydesk/template +++ b/srcpkgs/anydesk/template @@ -1,11 +1,11 @@ # Template file for 'anydesk' pkgname=anydesk version=6.2.0 -revision=1 +revision=2 archs="x86_64" create_wrksrc="yes" hostmakedepends="patchelf rpmextract" -depends="hicolor-icon-theme" +depends="hicolor-icon-theme gtkglext" short_desc="Fast remote desktop application" maintainer="mobinmob " license="custom:Proprietary" From 8d5690ccb6912cc9ffdc2e004a924f478c04438e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 31 Aug 2022 20:52:29 +0700 Subject: [PATCH 0705/1407] fcitx-unikey: makedepends+=fcitx-devel libfcitx-qt5-devel should depends on fcitx-devel, but fcitx-unikey requires fcitx-devel directly anyway. And it's not worth to revbump fcitx-qt5 --- srcpkgs/fcitx-unikey/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fcitx-unikey/template b/srcpkgs/fcitx-unikey/template index 6c49fd1d1e82..561ad7e37f7f 100644 --- a/srcpkgs/fcitx-unikey/template +++ b/srcpkgs/fcitx-unikey/template @@ -5,7 +5,7 @@ revision=2 build_style=cmake configure_args="-DENABLE_QT=ON" hostmakedepends="pkg-config gobject-introspection gettext fcitx qt5-devel" -makedepends="libfcitx-qt5-devel" +makedepends="libfcitx-qt5-devel fcitx-devel" depends="fcitx" short_desc="Support unikey (Vietnamese input method) for fcitx" maintainer="Đoàn Trần Công Danh " From c8b643b0cb185788a4ce7c5c5065100949ec92a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 31 Aug 2022 21:04:17 +0700 Subject: [PATCH 0706/1407] forkstat: update to 0.02.17. --- srcpkgs/forkstat/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/forkstat/template b/srcpkgs/forkstat/template index fc308ba1c016..66fbcb6e5c0a 100644 --- a/srcpkgs/forkstat/template +++ b/srcpkgs/forkstat/template @@ -1,12 +1,12 @@ # Template file for 'forkstat' pkgname=forkstat -version=0.02.16 +version=0.02.17 revision=1 build_style=gnu-makefile +make_use_env=yes short_desc="Program that logs process fork(), exec() and exit() activity" maintainer="Wilson Birney " license="GPL-2.0-or-later" -homepage="https://kernel.ubuntu.com/~cking/forkstat/" -distfiles="https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz" -checksum=9ce82a4781dca21c37378a423ac5cacf2663b6fb64162c856f459ca439dd3fe7 -CFLAGS="-DVERSION=\'\"${version}\"\'" +homepage="https://github.com/ColinIanKing/forkstat" +distfiles="${DEBIAN_SITE}/main/f/forkstat/forkstat_${version}.orig.tar.xz" +checksum=b50be23301b4e53adf430b4e49b3df271e4754cefb68cbb7e45d66f0b1216acf From 7362d991fe25f0fa6857805907532722f0215ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 31 Aug 2022 21:33:33 +0700 Subject: [PATCH 0707/1407] checkbashisms: update to 2.22.2. --- srcpkgs/checkbashisms/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/checkbashisms/template b/srcpkgs/checkbashisms/template index 1da339030ffe..6d07f087dd99 100644 --- a/srcpkgs/checkbashisms/template +++ b/srcpkgs/checkbashisms/template @@ -1,6 +1,6 @@ # Template file for 'checkbashisms' pkgname=checkbashisms -version=2.22.1 +version=2.22.2 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=35dd5e6029d27be35b96e8c6e38b8aa6fba791a21371dac2de0f8cdee5fe33d5 +checksum=15f95a96dd89c6a2d2d20ab4c32f3ca570aa88dbc78fbb1f3fb7cbc1d4a6502b pre_install() { vsed -i "s|###VERSION###|${version}|" scripts/checkbashisms.pl From a9efa7c6e326a79af807d69b75b5bdce504d83a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 31 Aug 2022 23:29:15 +0700 Subject: [PATCH 0708/1407] chroot-git: update to 2.37.3. --- srcpkgs/chroot-git/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index 3fd609f63653..308bd62f8056 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -1,16 +1,16 @@ # Template file for 'chroot-git' pkgname=chroot-git -version=2.37.2 +version=2.37.3 revision=1 bootstrap=yes wrksrc="git-${version}" makedepends="zlib-devel" short_desc="GIT Tree History Storage Tool -- for xbps-src use" -maintainer="Enno Boland " +maintainer="Đoàn Trần Công Danh " license="GPL-2.0-only" homepage="https://git-scm.com/" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=1c3d9c821c4538e7a6dac30a4af8bd8dcfe4f651f95474c526b52f83406db003 +checksum=814641d7f61659cfbc17825d0462499ca1403e39ff53d76a8512050e6483e87a if [ "$CHROOT_READY" ]; then checkdepends="perl gnupg" From 4294051b22119376fc4b812eaa83a237252aee76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 31 Aug 2022 23:29:10 +0700 Subject: [PATCH 0709/1407] git: update to 2.37.3. --- srcpkgs/git/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 0b331e944d57..38259d411661 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,6 +1,6 @@ # Template file for 'git' pkgname=git -version=2.37.2 +version=2.37.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=1c3d9c821c4538e7a6dac30a4af8bd8dcfe4f651f95474c526b52f83406db003 +checksum=814641d7f61659cfbc17825d0462499ca1403e39ff53d76a8512050e6483e87a replaces="git-perl>=0" register_shell=/usr/bin/git-shell python_version=3 From c772ae260aa0333d83b5154730bc11b3e1d9aacb Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 31 Aug 2022 09:59:19 -0400 Subject: [PATCH 0710/1407] labwc: install example config files --- srcpkgs/labwc/template | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/srcpkgs/labwc/template b/srcpkgs/labwc/template index f23b186dc5a6..eb5099cc725b 100644 --- a/srcpkgs/labwc/template +++ b/srcpkgs/labwc/template @@ -1,7 +1,7 @@ # Template file for 'labwc' pkgname=labwc version=0.5.3 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config scdoc wayland-devel" makedepends="cairo-devel glib-devel libxml2-devel pango-devel wlroots-devel" @@ -12,3 +12,11 @@ homepage="https://labwc.github.io/" changelog="https://raw.githubusercontent.com/labwc/labwc/master/NEWS.md" distfiles="https://github.com/labwc/labwc/archive/${version}.tar.gz" checksum=0b67bc89a5d9059fae28822f3ba2373553dea290cd931c9384a91dbeb2054650 + +post_install() { + local _example + vmkdir usr/share/examples/labwc + for _example in autostart environment menu.xml rc.xml.all themerc; do + vinstall "docs/$_example" 0644 usr/share/examples/labwc + done +} From 17b5200cec6abdb12216aade40aab05884d158f9 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 31 Aug 2022 16:11:39 -0400 Subject: [PATCH 0711/1407] wlr-randr: update homepage, distfiles --- srcpkgs/wlr-randr/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wlr-randr/template b/srcpkgs/wlr-randr/template index 5ae6079bb86b..b74291755b99 100644 --- a/srcpkgs/wlr-randr/template +++ b/srcpkgs/wlr-randr/template @@ -1,16 +1,17 @@ # Template file for 'wlr-randr' pkgname=wlr-randr version=0.2.0 -revision=1 +revision=2 +wrksrc="${pkgname}-v${version}" build_style=meson hostmakedepends="pkg-config wayland-devel" makedepends="wayland-devel" short_desc="Wayland clone of xrandr for wlroots compositors" maintainer="Andrew J. Hesford " license="MIT" -homepage="https://github.com/emersion/wlr-randr" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=e1b60992e41aebf733f13c2bdd2c70375fd3ddf7f0735bc4183858fda9c18e51 +homepage="https://sr.ht/~emersion/wlr-randr/" +distfiles="https://git.sr.ht/~emersion/wlr-randr/archive/v${version}.tar.gz" +checksum=12745bc8050a56603bf9bdee70c798b5d6502cf00a795c59fd03e1d786c17ce3 post_install() { vlicense LICENSE From 90a16a22c7b662407b08a4089d12d461006e238d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 24 Aug 2022 23:19:53 +0200 Subject: [PATCH 0712/1407] gnome-software: don't open unsupported mimetypes The gnome-software package can only be used for flatpaks, opening rpms, debs and other package archives will only result in an error message. --- .../patches/0001-only-associate-flatpak-mimetypes.patch | 8 ++++++++ srcpkgs/gnome-software/template | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gnome-software/patches/0001-only-associate-flatpak-mimetypes.patch diff --git a/srcpkgs/gnome-software/patches/0001-only-associate-flatpak-mimetypes.patch b/srcpkgs/gnome-software/patches/0001-only-associate-flatpak-mimetypes.patch new file mode 100644 index 000000000000..63c2b3aa2232 --- /dev/null +++ b/srcpkgs/gnome-software/patches/0001-only-associate-flatpak-mimetypes.patch @@ -0,0 +1,8 @@ +--- a/src/gnome-software-local-file.desktop.in ++++ b/src/gnome-software-local-file.desktop.in +@@ -9,4 +9,4 @@ Type=Application + Icon=system-software-install + StartupNotify=true + NoDisplay=true +-MimeType=application/x-rpm;application/x-redhat-package-manager;application/x-deb;application/x-app-package;application/vnd.ms-cab-compressed;application/vnd.flatpak;application/vnd.flatpak.repo;application/vnd.flatpak.ref;application/vnd.snap; ++MimeType=application/vnd.flatpak;application/vnd.flatpak.repo;application/vnd.flatpak.ref diff --git a/srcpkgs/gnome-software/template b/srcpkgs/gnome-software/template index 09fb89a4fdd1..4d21ca5c05a7 100644 --- a/srcpkgs/gnome-software/template +++ b/srcpkgs/gnome-software/template @@ -1,7 +1,7 @@ # Template file for 'gnome-software' pkgname=gnome-software version=42.4 -revision=1 +revision=2 build_style=meson configure_args="-Dvalgrind=false -Dpackagekit=false -Dfwupd=false -Dmalcontent=false $(vopt_bool gtk_doc) -Dsoup2=true" From 403c8115e03f6763fef85f6a47bbf35cc447ac78 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 31 Aug 2022 22:34:13 +0200 Subject: [PATCH 0713/1407] wev: fix checksum --- srcpkgs/wev/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wev/template b/srcpkgs/wev/template index eb9f4ea4fc6e..44033ddcd175 100644 --- a/srcpkgs/wev/template +++ b/srcpkgs/wev/template @@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage " license="MIT" homepage="https://git.sr.ht/~sircmpwn/wev" distfiles="https://git.sr.ht/~sircmpwn/wev/archive/${version}.tar.gz" -checksum=6f004dedf3f5ce10d2fe3cd233d59912756d8a0af021214158d6ec54d66c9d6e +checksum=613a1df1a4879d50ce72023de14aaf05be2e6f51346e84a69f50fc6d8502bbf4 post_install() { vlicense LICENSE From bf190bb6b8017606889f9d9b0d21b68115920f3b Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Sun, 28 Aug 2022 11:47:16 +0300 Subject: [PATCH 0714/1407] libatomic_ops: update to 7.6.14 Also, maintainer is specified. --- srcpkgs/libatomic_ops/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libatomic_ops/template b/srcpkgs/libatomic_ops/template index 9fce059f86f3..478b76349b3e 100644 --- a/srcpkgs/libatomic_ops/template +++ b/srcpkgs/libatomic_ops/template @@ -1,15 +1,15 @@ # Template file for 'libatomic_ops' pkgname=libatomic_ops -version=7.6.12 +version=7.6.14 revision=1 build_style=gnu-configure configure_args="--enable-shared --enable-static" short_desc="Semi-portable access to hardware provided atomic memory operations" -maintainer="Orphaned " +maintainer="Ivan Maidanski " license="GPL-2.0-or-later, MIT" homepage="https://github.com/ivmai/libatomic_ops" distfiles="${homepage}/releases/download/v${version}/libatomic_ops-${version}.tar.gz" -checksum=f0ab566e25fce08b560e1feab6a3db01db4a38e5bc687804334ef3920c549f3e +checksum=390f244d424714735b7050d056567615b3b8f29008a663c262fb548f1802d292 post_install() { vlicense doc/LICENSING.txt From 1c4011826925e0eb6b8c4c82b8b3c11e2b5ba370 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:09:46 +0200 Subject: [PATCH 0715/1407] removed-packages: sort list --- srcpkgs/removed-packages/template | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index b340882305e8..3c642d3ce935 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -27,6 +27,7 @@ replaces=" atom<=1.44.0_1 avogadro-devel<=1.2.0_8 avogadro<=1.2.0_8 + bgc<=1.0.1_1 bokken<=1.8_3 bomi<=0.9.11_17 burp-client<=1.4.40_13 @@ -37,10 +38,10 @@ replaces=" california<=0.4.0_4 capstone-python<=4.0.2_3 captain-ballard<=1.0.0_2 - cegui07<=0.7.9_8 cegui07-data<=0.7.9_8 cegui07-devel<=0.7.9_8 cegui07-doc<=0.7.9_8 + cegui07<=0.7.9_8 cgminer<=4.11.1_1 clamz<=0.5_4 couchdb<=1.7.1_2 @@ -76,9 +77,9 @@ replaces=" ebtables<=2.0.10.4_8 eclipse-ecj<=4.9_3 elasticsearch<=5.1.2_2 + electron10<=10.4.7_2 electron7<=7.3.3_1 electron9<=9.4.1_1 - electron10<=10.4.7_2 emacs-gtk2<=27.2_1 enventor<=1.0.0_2 epstopdf<=2.27_3 @@ -90,9 +91,9 @@ replaces=" fuse-usmb<=20130204_7 gandi-cli<=1.6_2 gconf-editor<=3.0.1_3 - gconfmm<=2.28.3_4 gconfmm-devel<=2.28.3_4 gconfmm-doc<=2.28.3_4 + gconfmm<=2.28.3_4 gegl3<=0.3.28_2 gens-gs<=2.16.7_2 geoip-data<=20171002_2 @@ -251,9 +252,9 @@ replaces=" librpcsecgss<=0.19_6 libshiboken-python3<=5.15.0_3 libspa-ffmpeg<=0.3.32_1 + libunique-devel<=3.0.2_11 libunique1-devel<=1.1.6_12 libunique1<=1.1.6_12 - libunique-devel<=3.0.2_11 libunique<=3.0.2_11 libxml2-python<=2.9.10_4 libxnoise<=0.2.21_4 @@ -307,8 +308,8 @@ replaces=" python-Babel<=2.8.0_4 python-M2Crypto<=0.35.2_7 python-Pillow<=6.2.2_3 - python-Pygments<=2.5.2_4 python-PyQt4<=4.12.1_4 + python-Pygments<=2.5.2_4 python-SecretStorage<=2.3.1_4 python-audit<=2.8.5_2 python-chardet<=4.0.0_3 @@ -322,8 +323,8 @@ replaces=" python-gntp<=1.0.3_7 python-gobject-devel<=3.36.1_2 python-gobject<=3.36.1_2 - python-isodate<=0.6.0_5 python-iso8601<=0.1.16_2 + python-isodate<=0.6.0_5 python-jellyfish<=0.6.1_2 python-lockfile<=0.12.2_7 python-lxml<=4.6.4_2 @@ -365,8 +366,8 @@ replaces=" python3-jaraco<=1.0_4 python3-jsonrpc-server<=0.4.0_2 python3-keepalive<=0.5_6 - python3-pgpdump<=1.5_10 python3-lockfile<=0.12.2_7 + python3-pgpdump<=1.5_10 python3-pyPEG2<=2.15.2_7 python3-pyenet<=5.15.0_2 python3-pyside-phonon<=5.15.0_2 @@ -424,6 +425,7 @@ replaces=" urlmatch-git<=20141116_2 uwsgi-python<=2.0.18_3 v8<=3.24.35.33_4 + vkd3d<=1.3_1 volnoti<=0.1_1 volume_key-python<=0.3.12_5 vte-devel<=0.28.2_16 @@ -439,9 +441,9 @@ replaces=" xlennart<=1.1.1_1 xmonad-contrib<=0.16_3 xmonad<=0.15_5 - xnp2<=0.86_2 xnoise-devel<=0.2.21_4 xnoise<=0.2.21_4 + xnp2<=0.86_2 yabause-gtk<=0.9.15_2 yt-play<=20140117_2 ytop<=0.6.2_1 @@ -450,8 +452,6 @@ replaces=" zou<=0.2.0_7 zuluplay-devel<=1.1_1 zuluplay<=1.1_1 - bgc<=1.0.1_1 - vkd3d<=1.3_1 " if [ "$XBPS_TARGET_LIBC" = "musl" ]; then From 801ab6638ae57c1d1fe6c2207ef56177690bbe68 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:10:05 +0200 Subject: [PATCH 0716/1407] govendor: remove package --- srcpkgs/govendor/template | 16 ---------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 srcpkgs/govendor/template diff --git a/srcpkgs/govendor/template b/srcpkgs/govendor/template deleted file mode 100644 index e18a8fb0d11c..000000000000 --- a/srcpkgs/govendor/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'govendor' -pkgname=govendor -version=1.0.9 -revision=3 -build_style=go -go_import_path="github.com/kardianos/govendor" -short_desc="Go vendor tool that works with the standard vendor file" -maintainer="lemmi " -license="BSD-3-Clause" -homepage="https://github.com/kardianos/govendor" -distfiles="https://github.com/kardianos/govendor/archive/v${version}.tar.gz" -checksum=d303abf194838792234a1451c3a1e87885d1b2cd21774867b592c1f7db00551e - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 3c642d3ce935..b70f3299e6e7 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -115,6 +115,7 @@ replaces=" goat<=0.0.0.28022016_10 goffice0.8<=0.8.17_6 goproxy<=7.0_1 + govendor<=1.0.9_3 gradio<=7.2_1 grv<=0.3.1_3 gsettings-qt<=0.1+17.10.20170824_3 From 0b5232395d1dd5075194697ad19143c4ac7b78fc Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:13:39 +0200 Subject: [PATCH 0717/1407] gx: remove package --- srcpkgs/gx/template | 16 ---------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 srcpkgs/gx/template diff --git a/srcpkgs/gx/template b/srcpkgs/gx/template deleted file mode 100644 index 7414b6bab10a..000000000000 --- a/srcpkgs/gx/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'gx' -pkgname=gx -version=0.14.3 -revision=1 -build_style=go -go_import_path="github.com/whyrusleeping/gx" -short_desc="Language-agnostic, universal package manager around IPFS" -maintainer="lemmi " -license="MIT" -homepage="https://github.com/whyrusleeping/gx" -distfiles="https://github.com/whyrusleeping/gx/archive/v${version}.tar.gz" -checksum=2c0b90ddfd3152863f815c35b37e94d027216c6ba1c6653a94b722bf6e2b015d - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index b70f3299e6e7..cd7d3d005ecb 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -125,6 +125,7 @@ replaces=" guile1.8-devel<=1.8.8_3 guile1.8<=1.8.8_3 gx-go<=1.9.0_1 + gx<=0.14.3_1 httperf<=0.9.0_9 icecat-i18n-ach<=78.6.1_1 icecat-i18n-af<=78.6.1_1 From 6319600d9921a9e5d93aef0d7ed9e783c21310dd Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:31:02 +0200 Subject: [PATCH 0718/1407] libpng12: remove package --- common/shlibs | 2 -- srcpkgs/libpng12-devel | 1 - srcpkgs/libpng12/template | 33 ------------------------------- srcpkgs/libpng12/update | 1 - srcpkgs/removed-packages/template | 1 + 5 files changed, 1 insertion(+), 37 deletions(-) delete mode 120000 srcpkgs/libpng12-devel delete mode 100644 srcpkgs/libpng12/template delete mode 100644 srcpkgs/libpng12/update diff --git a/common/shlibs b/common/shlibs index 48c63f2d0735..d38ee63d0bb2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2915,8 +2915,6 @@ libite.so.5 libite-2.0.1_1 liblog4cplus-1.2.so.5 log4cplus-1.2.0_1 liblog4cplus-2.0.so.3 log4cplus-2.0.0_1 liblog4cplusU-2.0.so.3 log4cplus-2.0.3_1 -libpng12.so.0 libpng12-1.2.56_2 -libpng.so.3 libpng12-1.2.56_2 libcapnpc-0.9.1.so capnproto-0.9.1_1 libcapnp-json-0.9.1.so capnproto-0.9.1_1 libcapnp-rpc-0.9.1.so capnproto-0.9.1_1 diff --git a/srcpkgs/libpng12-devel b/srcpkgs/libpng12-devel deleted file mode 120000 index da491d9066b6..000000000000 --- a/srcpkgs/libpng12-devel +++ /dev/null @@ -1 +0,0 @@ -libpng12 \ No newline at end of file diff --git a/srcpkgs/libpng12/template b/srcpkgs/libpng12/template deleted file mode 100644 index 1efdb9e46098..000000000000 --- a/srcpkgs/libpng12/template +++ /dev/null @@ -1,33 +0,0 @@ -# Template build file for 'libpng12'. -pkgname=libpng12 -version=1.2.59 -revision=1 -wrksrc=libpng-${version} -build_style=gnu-configure -makedepends="zlib-devel" -short_desc="Library for manipulating PNG images, compatibility package" -maintainer="lemmi " -homepage="http://www.libpng.org/pub/png/libpng.html" -license="zlib" -distfiles="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng12/libpng-${version}.tar.xz" -checksum=b4635f15b8adccc8ad0934eea485ef59cc4cae24d0f0300a9a941e51974ffcc7 - -post_install() { - rm -f ${DESTDIR}/usr/lib/*.la - vlicense LICENSE - mv $DESTDIR/usr/share/man/man5/png.5 $DESTDIR/usr/share/man/man5/png12.5 -} - -libpng12-devel_package() { - depends="${makedepends} libpng12>=${version}_${revision}" - short_desc+=" - development files" - conflicts="libpng-devel" - pkg_install() { - vmove "usr/bin/libpng*-config" - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - vmove usr/share/man/man3 - } -} diff --git a/srcpkgs/libpng12/update b/srcpkgs/libpng12/update deleted file mode 100644 index 125db71da82d..000000000000 --- a/srcpkgs/libpng12/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*beta*" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index cd7d3d005ecb..8aae5500c2fb 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -246,6 +246,7 @@ replaces=" libmagick6<=6.9.12.12_2 libmpd-devel<=11.8.17_3 libmpd<=11.8.17_3 + libpng12<=1.2.59_1 libpyside-python3<=5.15.0_2 libqmatrixclient-devel<=0.5.3.2_1 libqmatrixclient<=0.5.3.2_1 From 70c19823dbfb3611f2541c22fc4bccf1900dd0e4 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:31:46 +0200 Subject: [PATCH 0719/1407] opencl-clhpp: remove package --- srcpkgs/opencl-clhpp/template | 13 ------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 srcpkgs/opencl-clhpp/template diff --git a/srcpkgs/opencl-clhpp/template b/srcpkgs/opencl-clhpp/template deleted file mode 100644 index c2213bb5f461..000000000000 --- a/srcpkgs/opencl-clhpp/template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'opencl-clhpp' -pkgname=opencl-clhpp -version=2.0.15 -revision=1 -wrksrc="OpenCL-CLHPP-${version}" -build_style=cmake -configure_args="-DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF" -short_desc="OpenCL Host API C++ bindings (cl.hpp and cl2.hpp)" -maintainer="lemmi " -license="Apache-2.0" -homepage="http://www.khronos.org/registry/cl/" -distfiles="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v$version.tar.gz" -checksum=0175806508abc699586fc9a9387e01eb37bf812ca534e3b493ff3091ec2a9246 diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 8aae5500c2fb..9957fb8170b7 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -290,6 +290,7 @@ replaces=" oce-devel<=0.18.3_1 oce<=0.18.3_1 onionshare<=2.2_5 + opencl-clhpp<=2.0.15_1 orage<=4.12.1_7 paraview<=5.8.1_3 perl-Gtk2-Ex-Simple-List<=0.50_4 From 48f4915fb1fdc839f4f4dbd8fa78ac95f02d29a0 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:32:04 +0200 Subject: [PATCH 0720/1407] parallel-rust: remove package --- ...df810acae4ca04bc4c0291e9f0f00309c828.patch | 241 ------------------ srcpkgs/parallel-rust/template | 22 -- srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 263 deletions(-) delete mode 100644 srcpkgs/parallel-rust/patches/c5a0df810acae4ca04bc4c0291e9f0f00309c828.patch delete mode 100644 srcpkgs/parallel-rust/template diff --git a/srcpkgs/parallel-rust/patches/c5a0df810acae4ca04bc4c0291e9f0f00309c828.patch b/srcpkgs/parallel-rust/patches/c5a0df810acae4ca04bc4c0291e9f0f00309c828.patch deleted file mode 100644 index f2a8f7a8267f..000000000000 --- a/srcpkgs/parallel-rust/patches/c5a0df810acae4ca04bc4c0291e9f0f00309c828.patch +++ /dev/null @@ -1,241 +0,0 @@ -From 04d2ac0b22851059ebeb476b953159faaf87c769 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Mon, 4 Dec 2017 01:16:52 +0100 -Subject: [PATCH 1/3] bump arrayvec to 0.4 - -Signed-off-by: Igor Gnatenko ---- - Cargo.lock | 46 ++++++++++++++++++---------------------------- - Cargo.toml | 2 +- - 2 files changed, 19 insertions(+), 29 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index c01308d..ab76676 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,25 +1,9 @@ --[root] --name = "parallel" --version = "0.11.2" --dependencies = [ -- "arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", -- "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", -- "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", --] -- - [[package]] - name = "arrayvec" --version = "0.3.23" -+version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ -- "nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", -+ "nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] -@@ -48,11 +32,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "nodrop" --version = "0.1.9" -+version = "0.1.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", --] - - [[package]] - name = "num_cpus" -@@ -68,9 +49,19 @@ version = "0.0.7" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] --name = "odds" --version = "0.2.25" --source = "registry+https://github.com/rust-lang/crates.io-index" -+name = "parallel" -+version = "0.11.3" -+dependencies = [ -+ "arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] - - [[package]] - name = "permutate" -@@ -125,15 +116,14 @@ version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [metadata] --"checksum arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "699e63a93b79d717e8c3b5eb1b28b7780d0d6d9e59a72eb769291c83b0c8dc67" -+"checksum arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2f0ef4a9820019a0c91d918918c93dc71d469f581a49b47ddc1d285d4270bbe2" - "checksum gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)" = "5f837c392f2ea61cb1576eac188653df828c861b7137d74ea4a5caa89621f9e6" - "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" - "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" - "checksum libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e7eb6b826bfc1fdea7935d46556250d1799b7fe2d9f7951071f4291710665e3e" --"checksum nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "52cd74cd09beba596430cc6e3091b74007169a56246e1262f0ba451ea95117b2" -+"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" - "checksum num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e416ba127a4bb3ff398cb19546a8d0414f73352efe2857f4060d36f5fe5983a" - "checksum numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5c8fcb09df1eba2d128cfc50bdb0c3f33ac4f91fdacc2d3ac039b3b192398f8f" --"checksum odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "c3df9b730298cea3a1c3faa90b7e2f9df3a9c400d0936d6015e6165734eefcba" - "checksum permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53b7d5b19a715ffab38693a9dd44b067fdfa2b18eef65bd93562dfe507022fae" - "checksum redox_syscall 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "3041aeb6000db123d2c9c751433f526e1f404b23213bd733167ab770c3989b4d" - "checksum smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e40af10aafe98b4d8294ae8388d8a5cd0707c65d364872efe72d063ec44bee0" -diff --git a/Cargo.toml b/Cargo.toml -index ee5d106..c526834 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -14,7 +14,7 @@ itoa = "0.3" - numtoa = "0.0" - num_cpus = "1.5" - permutate = "0.3" --arrayvec = "0.3" -+arrayvec = "0.4" - time = "0.1" - smallvec = "0.4" - sys-info = "0.4" - -From 04e954d1adc3f8364f0c5f8edd6418941e5d48d4 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Mon, 4 Dec 2017 01:18:23 +0100 -Subject: [PATCH 2/3] bump smallvec to 0.6 - -Signed-off-by: Igor Gnatenko ---- - Cargo.lock | 6 +++--- - Cargo.toml | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index ab76676..5161560 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -57,7 +57,7 @@ dependencies = [ - "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -75,7 +75,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "smallvec" --version = "0.4.0" -+version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] -@@ -126,7 +126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5c8fcb09df1eba2d128cfc50bdb0c3f33ac4f91fdacc2d3ac039b3b192398f8f" - "checksum permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53b7d5b19a715ffab38693a9dd44b067fdfa2b18eef65bd93562dfe507022fae" - "checksum redox_syscall 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "3041aeb6000db123d2c9c751433f526e1f404b23213bd733167ab770c3989b4d" --"checksum smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e40af10aafe98b4d8294ae8388d8a5cd0707c65d364872efe72d063ec44bee0" -+"checksum smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44db0ecb22921ef790d17ae13a3f6d15784183ff5f2a01aa32098c7498d2b4b9" - "checksum sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "246f8bbb443ae0026c92266c26d997d04634c8b44c3baff9fa3bff445b40878c" - "checksum time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd7ccbf969a892bf83f1e441126968a07a3941c24ff522a26af9f9f4585d1a3" - "checksum wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b9f3bf741a801531993db6478b95682117471f76916f5e690dd8d45395b09349" -diff --git a/Cargo.toml b/Cargo.toml -index c526834..9c3047f 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -16,6 +16,6 @@ num_cpus = "1.5" - permutate = "0.3" - arrayvec = "0.4" - time = "0.1" --smallvec = "0.4" -+smallvec = "0.6" - sys-info = "0.4" - wait-timeout = "0.1" - -From fb63f1e132675f7c634200ccb2f997231f7f6112 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Mon, 4 Dec 2017 01:19:07 +0100 -Subject: [PATCH 3/3] bump sys-info to 0.5 - -Signed-off-by: Igor Gnatenko ---- - Cargo.lock | 12 ++++++------ - Cargo.toml | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 5161560..cbc91ec 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -8,7 +8,7 @@ dependencies = [ - - [[package]] - name = "gcc" --version = "0.3.50" -+version = "0.3.54" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] -@@ -58,7 +58,7 @@ dependencies = [ - "numtoa 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sys-info 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - ] -@@ -80,10 +80,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "sys-info" --version = "0.4.1" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ -- "gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] -@@ -117,7 +117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [metadata] - "checksum arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2f0ef4a9820019a0c91d918918c93dc71d469f581a49b47ddc1d285d4270bbe2" --"checksum gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)" = "5f837c392f2ea61cb1576eac188653df828c861b7137d74ea4a5caa89621f9e6" -+"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb" - "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" - "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" - "checksum libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e7eb6b826bfc1fdea7935d46556250d1799b7fe2d9f7951071f4291710665e3e" -@@ -127,7 +127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53b7d5b19a715ffab38693a9dd44b067fdfa2b18eef65bd93562dfe507022fae" - "checksum redox_syscall 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "3041aeb6000db123d2c9c751433f526e1f404b23213bd733167ab770c3989b4d" - "checksum smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44db0ecb22921ef790d17ae13a3f6d15784183ff5f2a01aa32098c7498d2b4b9" --"checksum sys-info 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "246f8bbb443ae0026c92266c26d997d04634c8b44c3baff9fa3bff445b40878c" -+"checksum sys-info 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f22142cf9c0a96da2db4db82df64fae9f220bd4226b6bd7d6a831c43b2c73a4e" - "checksum time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd7ccbf969a892bf83f1e441126968a07a3941c24ff522a26af9f9f4585d1a3" - "checksum wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b9f3bf741a801531993db6478b95682117471f76916f5e690dd8d45395b09349" - "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -diff --git a/Cargo.toml b/Cargo.toml -index 9c3047f..1785ecd 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -17,5 +17,5 @@ permutate = "0.3" - arrayvec = "0.4" - time = "0.1" - smallvec = "0.6" --sys-info = "0.4" -+sys-info = "0.5" - wait-timeout = "0.1" diff --git a/srcpkgs/parallel-rust/template b/srcpkgs/parallel-rust/template deleted file mode 100644 index d2a746db9108..000000000000 --- a/srcpkgs/parallel-rust/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'parallel-rust'. -pkgname=parallel-rust -version=0.11.3 -revision=2 -wrksrc="parallel-${version}" -build_style=cargo -short_desc="Inspired by GNU Parallel, a command-line CPU load balancer written in Rust" -maintainer="lemmi " -license="MIT" -homepage="https://github.com/mmstick/parallel" -distfiles="https://github.com/mmstick/parallel/archive/${version}.tar.gz" -checksum=70f09dcbf6d34486e505f3e4a04d4f5e30081ec6cd71920017a8e8090eabc242 - -pre_build() { - # default version too old for ppc musl systems - cargo update --package libc --precise 0.2.66 -} - -do_install() { - vlicense LICENSE - vbin target/${RUST_TARGET}/release/parallel parallel-rust -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 9957fb8170b7..78628056a56c 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -292,6 +292,7 @@ replaces=" onionshare<=2.2_5 opencl-clhpp<=2.0.15_1 orage<=4.12.1_7 + parallel-rust<=0.11.3_2 paraview<=5.8.1_3 perl-Gtk2-Ex-Simple-List<=0.50_4 perl-Gtk2-ImageView<=0.05_8 From a15926eb72f03073f809cd346dcf6e8a10790a24 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:33:44 +0200 Subject: [PATCH 0721/1407] vapoursynth-mvtools: remove package --- srcpkgs/mpv/template | 2 +- srcpkgs/removed-packages/template | 1 + srcpkgs/vapoursynth-mvtools/files/example.py | 89 -------------------- srcpkgs/vapoursynth-mvtools/template | 21 ----- 4 files changed, 2 insertions(+), 111 deletions(-) delete mode 100644 srcpkgs/vapoursynth-mvtools/files/example.py delete mode 100644 srcpkgs/vapoursynth-mvtools/template diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 5d016e225da5..ded8c1bbe98f 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -22,7 +22,7 @@ makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel libXv-devel $(vopt_if vulkan "Vulkan-Headers vulkan-loader shaderc libplacebo-devel") $(vopt_if wayland "wayland-devel wayland-protocols libxkbcommon-devel") $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel")" -depends="desktop-file-utils hicolor-icon-theme $(vopt_if vapoursynth vapoursynth-mvtools)" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Video player based on MPlayer/mplayer2" maintainer="travankor " license="GPL-2.0-or-later" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 78628056a56c..b5f2ec5bd367 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -430,6 +430,7 @@ replaces=" urlmatch-git<=20141116_2 uwsgi-python<=2.0.18_3 v8<=3.24.35.33_4 + vapoursynth-mvtools<=23_2 vkd3d<=1.3_1 volnoti<=0.1_1 volume_key-python<=0.3.12_5 diff --git a/srcpkgs/vapoursynth-mvtools/files/example.py b/srcpkgs/vapoursynth-mvtools/files/example.py deleted file mode 100644 index e23620456caa..000000000000 --- a/srcpkgs/vapoursynth-mvtools/files/example.py +++ /dev/null @@ -1,89 +0,0 @@ -import vapoursynth as vs - -# see http://avisynth.org.ru/mvtools/mvtools2.html -# these configs will have around 75% usage with an FX-8350 - -def main(): - # don't interpolate if input is close to 60fps anyway - if container_fps > 59: - video_in.set_output() - return - - # basic config - config = { - 'blksize': 16, - 'chroma': True, - 'search': 4, - 'searchparam': 4, - } - recalcconfig = { - 'blksize': 8, - 'chroma': True, - 'search': 5, - 'searchparam': 2, - } - - # use higher quality on 720p or lower - if video_in.width * video_in.height <= 1280*720: - config.update({ - 'search': 5, - 'searchparam': 16, - 'blksize': 32, - 'badsad': 1000, - 'badrange': 32, - 'divide': 2, - 'overlap': 8, - }) - recalcconfig.update({ - 'search': 3, - 'blksize': 16, - 'overlap': 8, - 'dct': 8, - }) - - interpolate(config, recalcconfig) - -# first pass -def analyse(sup, config): - core = vs.get_core() - bvec = core.mv.Analyse(sup, isb=True, **config) - fvec = core.mv.Analyse(sup, isb=False, **config) - return bvec, fvec - -# optional second pass -def recalculate(sup, bvec, fvec, config): - core = vs.get_core() - bvec = core.mv.Recalculate(sup, bvec, **config) - fvec = core.mv.Recalculate(sup, fvec, **config) - return bvec, fvec - -def interpolate(config, recalcconfig=None): - core = vs.get_core() - clip = video_in - - # Interpolating to fps higher than 60 is too CPU-expensive - # Use interpolation from opengl video output - dst_fps = display_fps - while (dst_fps > 60): - dst_fps /= 2 - - src_fps_num = int(container_fps * 1e8) - src_fps_den = int(1e8) - dst_fps_num = int(dst_fps * 1e4) - dst_fps_den = int(1e4) - - # Needed because clip FPS is missing - clip = core.std.AssumeFPS(clip, fpsnum = src_fps_num, fpsden = src_fps_den) - print("Reflowing from ",src_fps_num/src_fps_den," fps to ",dst_fps_num/dst_fps_den," fps.") - - pad = config.get('blksize', 8) - sup = core.mv.Super(clip, pel=1, hpad=pad, vpad=pad) - bvec, fvec = analyse(sup, config) - if recalcconfig: - bvec, fvec = recalculate(sup, bvec, fvec, recalcconfig) - clip = core.mv.FlowFPS(clip, sup, bvec, fvec, num=dst_fps_num, den=dst_fps_den, thscd2=90) - - clip.set_output() - -if __name__ == '__vapoursynth__': - main() diff --git a/srcpkgs/vapoursynth-mvtools/template b/srcpkgs/vapoursynth-mvtools/template deleted file mode 100644 index f6cd5e1cd9e4..000000000000 --- a/srcpkgs/vapoursynth-mvtools/template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'vapoursynth-mvtools' -pkgname=vapoursynth-mvtools -version=23 -revision=2 -archs="x86_64* i686*" -build_style=meson -hostmakedepends="pkg-config libtool nasm" -makedepends="fftw-devel vapoursynth-devel" -short_desc="Set of filters for motion estimation and compensation" -maintainer="lemmi " -license="GPL-2.0-or-later" -homepage="http://avisynth.org.ru/mvtools/mvtools2.html" -distfiles="https://github.com/dubhater/vapoursynth-mvtools/archive/v${version}.tar.gz" -checksum=3b5fdad2b52a2525764510a04af01eab3bc5e8fe6a02aba44b78955887a47d44 - -post_install() { - vdoc readme.rst - vsconf ${FILESDIR}/example.py - vmkdir /usr/lib/vapoursynth - mv ${DESTDIR}/usr/lib/{,vapoursynth/}libmvtools.so -} From b197acf68c16f900f1bb6f0770dc8d7b4ed23424 Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 30 Aug 2022 12:51:59 +0200 Subject: [PATCH 0722/1407] mp3gain: remove package --- srcpkgs/mp3gain/template | 19 ------------------- srcpkgs/mp3gain/update | 1 - srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 srcpkgs/mp3gain/template delete mode 100644 srcpkgs/mp3gain/update diff --git a/srcpkgs/mp3gain/template b/srcpkgs/mp3gain/template deleted file mode 100644 index d69c2be8aee5..000000000000 --- a/srcpkgs/mp3gain/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'mp3gain' -pkgname=mp3gain -version=1.6.2 -revision=2 -create_wrksrc=yes -build_style=gnu-makefile -make_build_args="OSTYPE=linux" -hostmakedepends="unzip" -makedepends="mpg123-devel" -short_desc="Lossless mp3 normalizer with statistical analysis" -maintainer="lemmi " -license="LGPL-2.1-or-later" -homepage="http://mp3gain.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version//./_}-src.zip" -checksum=5cc04732ef32850d5878b28fbd8b85798d979a025990654aceeaa379bcc9596d - -do_install() { - vbin mp3gain -} diff --git a/srcpkgs/mp3gain/update b/srcpkgs/mp3gain/update deleted file mode 100644 index cd25267403a2..000000000000 --- a/srcpkgs/mp3gain/update +++ /dev/null @@ -1 +0,0 @@ -pattern="${pkgname}-\K[\d_r]+(?=-src\.zip)" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index b5f2ec5bd367..9c847ea1672c 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -278,6 +278,7 @@ replaces=" mirrorbits<=0.5.1_1 mongroup<=0.4.1_2 mozjs68<=68.11.0_1 + mp3gain<=1.6.2_2 mutagen<=1.43.0_3 nautilus-sendto<=3.8.6_2 ncdns<=0.0.2_12 From 0a9322b5d18aaa722a3bfb31e8ca19f036da5c0f Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 16 Aug 2022 18:21:00 -0400 Subject: [PATCH 0723/1407] libjaylink: update to 0.3.0. --- srcpkgs/libjaylink/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libjaylink/template b/srcpkgs/libjaylink/template index 232a30004d4b..625ad84338f6 100644 --- a/srcpkgs/libjaylink/template +++ b/srcpkgs/libjaylink/template @@ -1,6 +1,6 @@ # Template file for 'libjaylink' pkgname=libjaylink -version=0.2.0 +version=0.3.0 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -9,11 +9,13 @@ short_desc="Library to access SEGGER J-Link and compatible devices" maintainer="classabbyamp " license="GPL-2.0-or-later" homepage="https://gitlab.zapb.de/libjaylink/libjaylink" +changelog="https://gitlab.zapb.de/libjaylink/libjaylink/-/raw/master/NEWS" distfiles="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${version}/libjaylink-${version}.tar.gz" -checksum=ac10d03088a2f28ebfc0411f9e617433936220dc183050f2e429694dcadc4f2a +checksum=7885e295a567bcacb3f5ec825647d99b2bb0f7e37ccb390019813ff6e249b9b5 pre_configure() { ./autogen.sh + vsed -e '3904s/^+//' -i configure } libjaylink-devel_package() { From a50eea2ddf368a5bc9f649ac1c2de017b216bfa8 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, 26 Aug 2022 15:21:49 +0700 Subject: [PATCH 0724/1407] boost: update to 1.80.0. --- common/shlibs | 65 +++--- .../{boost-python1.72 => boost-python3-1.80} | 0 .../patches/0001-compat-glibc-2.34.patch | 23 -- .../patches/0002-compat-glibc-2.34.patch | 30 --- srcpkgs/boost/patches/exec_file.patch | 45 ---- .../boost/patches/install-strip-destdir.patch | 27 +++ srcpkgs/boost/patches/mips.patch | 11 - srcpkgs/boost/template | 196 +++++++++--------- ...boost-python3-1.72 => libboost_atomic1.80} | 0 ...ibboost_atomic1.72 => libboost_chrono1.80} | 0 ...oost_chrono1.72 => libboost_container1.80} | 0 ...ost_container1.72 => libboost_context1.80} | 0 ...oost_context1.72 => libboost_contract1.80} | 0 ...st_contract1.72 => libboost_coroutine1.80} | 0 ...t_coroutine1.72 => libboost_date_time1.80} | 0 ...boost_date_time1.72 => libboost_fiber1.80} | 0 ...oost_fiber1.72 => libboost_filesystem1.80} | 0 ...oost_filesystem1.72 => libboost_graph1.80} | 0 ...boost_graph1.72 => libboost_iostreams1.80} | 0 ...bboost_iostreams1.72 => libboost_json1.80} | 0 ...ibboost_locale1.72 => libboost_locale1.80} | 0 .../{libboost_log1.72 => libboost_log1.80} | 0 ...t_log_setup1.72 => libboost_log_setup1.80} | 0 ...ost_math_c991.72 => libboost_math_c991.80} | 0 ...t_math_c99f1.72 => libboost_math_c99f1.80} | 0 ...t_math_c99l1.72 => libboost_math_c99l1.80} | 0 ...ost_math_tr11.72 => libboost_math_tr11.80} | 0 ...t_math_tr1f1.72 => libboost_math_tr1f1.80} | 0 ...t_math_tr1l1.72 => libboost_math_tr1l1.80} | 0 ...g_exec_monitor1.72 => libboost_nowide1.80} | 0 ...ions1.72 => libboost_prg_exec_monitor1.80} | 0 ...andom1.72 => libboost_program_options1.80} | 0 ...libboost_regex1.72 => libboost_random1.80} | 0 ...t_serialization1.72 => libboost_regex1.80} | 0 ...dr2line1.72 => libboost_serialization1.80} | 0 ...1.72 => libboost_stacktrace_addr2line1.80} | 0 ...noop1.72 => libboost_stacktrace_basic1.80} | 0 ...ystem1.72 => libboost_stacktrace_noop1.80} | 0 ...ibboost_thread1.72 => libboost_system1.80} | 0 ...libboost_timer1.72 => libboost_thread1.80} | 0 ...st_type_erasure1.72 => libboost_timer1.80} | 0 ...ramework1.72 => libboost_type_erasure1.80} | 0 ...e1.72 => libboost_unit_test_framework1.80} | 0 ...t_wserialization1.72 => libboost_wave1.80} | 0 srcpkgs/libboost_wserialization1.80 | 1 + 45 files changed, 164 insertions(+), 234 deletions(-) rename srcpkgs/{boost-python1.72 => boost-python3-1.80} (100%) delete mode 100644 srcpkgs/boost/patches/0001-compat-glibc-2.34.patch delete mode 100644 srcpkgs/boost/patches/0002-compat-glibc-2.34.patch delete mode 100644 srcpkgs/boost/patches/exec_file.patch create mode 100644 srcpkgs/boost/patches/install-strip-destdir.patch delete mode 100644 srcpkgs/boost/patches/mips.patch rename srcpkgs/{boost-python3-1.72 => libboost_atomic1.80} (100%) rename srcpkgs/{libboost_atomic1.72 => libboost_chrono1.80} (100%) rename srcpkgs/{libboost_chrono1.72 => libboost_container1.80} (100%) rename srcpkgs/{libboost_container1.72 => libboost_context1.80} (100%) rename srcpkgs/{libboost_context1.72 => libboost_contract1.80} (100%) rename srcpkgs/{libboost_contract1.72 => libboost_coroutine1.80} (100%) rename srcpkgs/{libboost_coroutine1.72 => libboost_date_time1.80} (100%) rename srcpkgs/{libboost_date_time1.72 => libboost_fiber1.80} (100%) rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.80} (100%) rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.80} (100%) rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.80} (100%) rename srcpkgs/{libboost_iostreams1.72 => libboost_json1.80} (100%) rename srcpkgs/{libboost_locale1.72 => libboost_locale1.80} (100%) rename srcpkgs/{libboost_log1.72 => libboost_log1.80} (100%) rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.80} (100%) rename srcpkgs/{libboost_math_c991.72 => libboost_math_c991.80} (100%) rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.80} (100%) rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.80} (100%) rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr11.80} (100%) rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.80} (100%) rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.80} (100%) rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.80} (100%) rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.80} (100%) rename srcpkgs/{libboost_random1.72 => libboost_program_options1.80} (100%) rename srcpkgs/{libboost_regex1.72 => libboost_random1.80} (100%) rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.80} (100%) rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.80} (100%) rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_stacktrace_addr2line1.80} (100%) rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_basic1.80} (100%) rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_noop1.80} (100%) rename srcpkgs/{libboost_thread1.72 => libboost_system1.80} (100%) rename srcpkgs/{libboost_timer1.72 => libboost_thread1.80} (100%) rename srcpkgs/{libboost_type_erasure1.72 => libboost_timer1.80} (100%) rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_type_erasure1.80} (100%) rename srcpkgs/{libboost_wave1.72 => libboost_unit_test_framework1.80} (100%) rename srcpkgs/{libboost_wserialization1.72 => libboost_wave1.80} (100%) create mode 120000 srcpkgs/libboost_wserialization1.80 diff --git a/common/shlibs b/common/shlibs index d38ee63d0bb2..50e0c005d39e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -620,38 +620,39 @@ libip4tc.so.2 iptables-1.8.3_1 libipq.so.0 iptables-1.4.7_1 libnm.so.0 libnm-1.0.0_1 libKF5ItemModels.so.5 kitemmodels-5.26.0_1 -libboost_context.so.1.72.0 libboost_context1.72-1.72.0_1 -libboost_coroutine.so.1.72.0 libboost_coroutine1.72-1.72.0_1 -libboost_container.so.1.72.0 libboost_container1.72-1.72.0_1 -libboost_prg_exec_monitor.so.1.72.0 libboost_prg_exec_monitor1.72-1.72.0_1 -libboost_timer.so.1.72.0 libboost_timer1.72-1.72.0_1 -libboost_random.so.1.72.0 libboost_random1.72-1.72.0_1 -libboost_filesystem.so.1.72.0 libboost_filesystem1.72-1.72.0_1 -libboost_unit_test_framework.so.1.72.0 libboost_unit_test_framework1.72-1.72.0_1 -libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1 -libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1 -libboost_regex.so.1.72.0 libboost_regex1.72-1.72.0_1 -libboost_serialization.so.1.72.0 libboost_serialization1.72-1.72.0_1 -libboost_chrono.so.1.72.0 libboost_chrono1.72-1.72.0_1 -libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1 -libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1 -libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1 -libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1 -libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1 -libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1 -libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1 -libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1 -libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1 -libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1 -libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1 -libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1 -libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1 -libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1 -libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1 -libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1 -libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1 -libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1 -libboost_python310.so.1.72.0 boost-python3-1.72-1.72.0_6 +libboost_context.so.1.80.0 libboost_context1.80-1.80.0_1 +libboost_coroutine.so.1.80.0 libboost_coroutine1.80-1.80.0_1 +libboost_container.so.1.80.0 libboost_container1.80-1.80.0_1 +libboost_prg_exec_monitor.so.1.80.0 libboost_prg_exec_monitor1.80-1.80.0_1 +libboost_timer.so.1.80.0 libboost_timer1.80-1.80.0_1 +libboost_random.so.1.80.0 libboost_random1.80-1.80.0_1 +libboost_filesystem.so.1.80.0 libboost_filesystem1.80-1.80.0_1 +libboost_unit_test_framework.so.1.80.0 libboost_unit_test_framework1.80-1.80.0_1 +libboost_math_c99.so.1.80.0 libboost_math_c991.80-1.80.0_1 +libboost_math_tr1.so.1.80.0 libboost_math_tr11.80-1.80.0_1 +libboost_nowide.so.1.80.0 libboost_nowide1.80-1.80.0_1 +libboost_json.so.1.80.0 libboost_json1.80-1.80.0_1 +libboost_regex.so.1.80.0 libboost_regex1.80-1.80.0_1 +libboost_serialization.so.1.80.0 libboost_serialization1.80-1.80.0_1 +libboost_chrono.so.1.80.0 libboost_chrono1.80-1.80.0_1 +libboost_wserialization.so.1.80.0 libboost_wserialization1.80-1.80.0_1 +libboost_graph.so.1.80.0 libboost_graph1.80-1.80.0_1 +libboost_log.so.1.80.0 libboost_log1.80-1.80.0_1 +libboost_locale.so.1.80.0 libboost_locale1.80-1.80.0_1 +libboost_program_options.so.1.80.0 libboost_program_options1.80-1.80.0_1 +libboost_iostreams.so.1.80.0 libboost_iostreams1.80-1.80.0_1 +libboost_system.so.1.80.0 libboost_system1.80-1.80.0_1 +libboost_thread.so.1.80.0 libboost_thread1.80-1.80.0_1 +libboost_log_setup.so.1.80.0 libboost_log_setup1.80-1.80.0_1 +libboost_date_time.so.1.80.0 libboost_date_time1.80-1.80.0_1 +libboost_wave.so.1.80.0 libboost_wave1.80-1.80.0_1 +libboost_atomic.so.1.80.0 libboost_atomic1.80-1.80.0_1 +libboost_type_erasure.so.1.80.0 libboost_type_erasure1.80-1.80.0_1 +libboost_fiber.so.1.80.0 libboost_fiber1.80-1.80.0_1 +libboost_stacktrace_noop.so.1.80.0 libboost_stacktrace_noop1.80-1.80.0_1 +libboost_stacktrace_addr2line.so.1.80.0 libboost_stacktrace_addr2line1.80-1.80.0_1 +libboost_stacktrace_basic.so.1.80.0 libboost_stacktrace_basic1.80-1.80.0_1 +libboost_python310.so.1.80.0 boost-python3-1.80-1.80.0_6 libexempi.so.8 exempi-2.5.0_1 libatasmart.so.4 libatasmart-0.17_1 libsgutils2-1.45.so.2 libsgutils-1.45_1 diff --git a/srcpkgs/boost-python1.72 b/srcpkgs/boost-python3-1.80 similarity index 100% rename from srcpkgs/boost-python1.72 rename to srcpkgs/boost-python3-1.80 diff --git a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch deleted file mode 100644 index e1e5711e59f2..000000000000 --- a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001 -From: Rob Boehne -Date: Wed, 20 Nov 2019 11:25:20 -0600 -Subject: [PATCH] Revert change to elide a warning that caused Solaris builds - to fail. - ---- - include/boost/thread/pthread/thread_data.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp -index aefbeb43c..bc9b1367a 100644 ---- a/boost/thread/pthread/thread_data.hpp -+++ b/boost/thread/pthread/thread_data.hpp -@@ -57,7 +57,7 @@ namespace boost - #else - std::size_t page_size = ::sysconf( _SC_PAGESIZE); - #endif --#if PTHREAD_STACK_MIN > 0 -+#ifdef PTHREAD_STACK_MIN - if (size -Date: Tue, 10 Aug 2021 14:22:28 +0000 -Subject: [PATCH] Fix -Wsign-compare warning with glibc 2.34 on Linux - platforms. - -In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17, - from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12, - from src/GetTest.cpp:12: -/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp: In member function 'void boost::thread_attributes::set_stack_size(std::size_t)': -/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp:61:19: error: comparison of integer expressions of different signedness: 'std::size_t' {aka 'long unsigned int'} and 'long int' [-Werror=sign-compare] - 61 | if (size(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN; - #endif - size = ((size+page_size-1)/page_size)*page_size; - int res = pthread_attr_setstacksize(&val_, size); diff --git a/srcpkgs/boost/patches/exec_file.patch b/srcpkgs/boost/patches/exec_file.patch deleted file mode 100644 index b1b0ef969c4d..000000000000 --- a/srcpkgs/boost/patches/exec_file.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d9f06052e28873037db7f98629bce72182a42410 Mon Sep 17 00:00:00 2001 -From: Pat Riehecky -Date: Mon, 29 Jun 2020 10:51:58 -0500 -Subject: [PATCH] Convert Python 3.1+ to use public C API for filenames - - [ - Ed.: Paths were adapted from upstream commit - https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410 - ] - ---- - src/exec.cpp | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp -index 171c6f4189..b2eabe59f6 100644 ---- a/libs/python/src/exec.cpp -+++ b/libs/python/src/exec.cpp -@@ -104,14 +104,22 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l - if (local.is_none()) local = global; - // should be 'char const *' but older python versions don't use 'const' yet. - char *f = const_cast(filename); -- // Let python open the file to avoid potential binary incompatibilities. --#if PY_VERSION_HEX >= 0x03040000 -- FILE *fs = _Py_fopen(f, "r"); -+#if PY_VERSION_HEX >= 0x03010000 -+ // Let python manage any UTF bits to avoid potential incompatibilities. -+ PyObject *fo = Py_BuildValue("s", f); -+ PyObject *fb = Py_None; -+ PyUnicode_FSConverter(fo, &fb); -+ f = PyBytes_AsString(fb); -+ FILE *fs = fopen(f, "r"); -+ Py_DECREF(fo); -+ Py_DECREF(fb); - #elif PY_VERSION_HEX >= 0x03000000 -+ // Let python open the file to avoid potential binary incompatibilities. - PyObject *fo = Py_BuildValue("s", f); -- FILE *fs = _Py_fopen(fo, "r"); -+ FILE *fs = _Py_fopen(fo, "r"); // Private CPython API - Py_DECREF(fo); - #else -+ // Let python open the file to avoid potential binary incompatibilities. - PyObject *pyfile = PyFile_FromString(f, const_cast("r")); - if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file"); - python::handle<> file(pyfile); diff --git a/srcpkgs/boost/patches/install-strip-destdir.patch b/srcpkgs/boost/patches/install-strip-destdir.patch new file mode 100644 index 000000000000..61047c5967b1 --- /dev/null +++ b/srcpkgs/boost/patches/install-strip-destdir.patch @@ -0,0 +1,27 @@ +--- a/tools/boost_install/boost-install.jam ++++ b/tools/boost_install/boost-install.jam +@@ -678,6 +678,16 @@ local rule path-native-fwd ( path ) + return $(path) ; + } + ++local rule path-strip-destdir ( path ) ++{ ++ local parts = [ MATCH "^(/destdir(/[^/]+)?/boost-[0-9.]+)(/.*)" : $(path) ] ; ++ if $(parts) ++ { ++ path = $(parts[3]) ; ++ } ++ return $(path) ; ++} ++ + local rule get-dir ( name : dir ) + { + if [ path.is-rooted $(dir) ] +@@ -756,6 +766,7 @@ rule generate-cmake-config- ( target : s + if [ path.is-rooted $(cmakedir) ] + { + local cmakedir-native = [ path-native-fwd $(cmakedir) ] ; ++ cmakedir-native = [ path-strip-destdir $(cmakedir-native) ] ; + + print.text + diff --git a/srcpkgs/boost/patches/mips.patch b/srcpkgs/boost/patches/mips.patch deleted file mode 100644 index a10a2122d9c7..000000000000 --- a/srcpkgs/boost/patches/mips.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/boost/fiber/detail/cpu_relax.hpp 2017-09-02 11:56:11.000000000 +0200 -+++ b/boost/fiber/detail/cpu_relax.hpp 2017-11-09 17:25:40.258995963 +0100 -@@ -48,7 +48,7 @@ - # define cpu_relax() asm volatile ("nop" ::: "memory"); - # endif - #elif BOOST_ARCH_MIPS --# define cpu_relax() asm volatile ("pause" ::: "memory"); -+# define cpu_relax() asm volatile ("nop" ::: "memory"); - #elif BOOST_ARCH_PPC - // http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h - // http://stackoverflow.com/questions/5425506/equivalent-of-x86-pause-instruction-for-ppc diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index f0c5afcec9e8..0d103e335b52 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -1,53 +1,52 @@ # Template file for 'boost' pkgname=boost -version=1.72.0 -revision=9 +version=1.80.0 +revision=1 wrksrc="${pkgname}_${version//\./_}" -hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel" -makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel" +hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config" +makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel + libzstd-devel" short_desc="Free peer-reviewed portable C++ source libraries" maintainer="John " license="BSL-1.0" homepage="http://www.boost.org/" distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2" -checksum=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 +checksum=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 python_version=3 -CXXFLAGS="-std=c++14" - -replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0 - libboost_stacktrace_basic1.69>=0 libboost_stacktrace_noop1.69>=0 - libboost_iostreams1.69>=0 libboost_math_tr1l1.69>=0 libboost_filesystem1.69>=0 - libboost_chrono1.69>=0 libboost_math_tr1f1.69>=0 libboost_wave1.69>=0 - libboost_graph1.69>=0 libboost_locale1.69>=0 libboost_regex1.69>=0 - libboost_fiber1.69>=0 libboost_type_erasure1.69>=0 libboost_coroutine1.69>=0 - libboost_atomic1.69>=0 libboost_prg_exec_monitor1.69>=0 libboost_math_c991.69>=0 - boost-python3-1.69>=0 libboost_log_setup1.69>=0 boost1.69>=0-devel - libboost_timer1.69>=0 libboost_system1.69>=0 libboost_unit_test_framework1.69>=0 - libboost_serialization1.69>=0 libboost_math_tr11.69>=0 boost1.69>=0-build - libboost_math_c99l1.69>=0 boost-python1.69>=0 libboost_contract1.69>=0 - libboost_date_time1.69>=0 libboost_log1.69>=0 libboost_random1.69>=0 - libboost_thread1.69>=0 libboost_container1.69>=0 boost1.69>=0-jam - libboost_wserialization1.69>=0 libboost_context1.69>=0 - libboost_stacktrace_addr2line1.69>=0" - -subpackages="libboost_program_options1.72 libboost_math_c99f1.72 - libboost_stacktrace_basic1.72 libboost_stacktrace_noop1.72 - libboost_iostreams1.72 libboost_math_tr1l1.72 libboost_filesystem1.72 - libboost_chrono1.72 libboost_math_tr1f1.72 libboost_wave1.72 - libboost_graph1.72 libboost_locale1.72 libboost_regex1.72 - libboost_fiber1.72 libboost_type_erasure1.72 libboost_coroutine1.72 - libboost_atomic1.72 libboost_prg_exec_monitor1.72 libboost_math_c991.72 - boost-python3-1.72 libboost_log_setup1.72 boost-devel - libboost_timer1.72 libboost_system1.72 libboost_unit_test_framework1.72 - libboost_serialization1.72 libboost_math_tr11.72 boost-build - libboost_math_c99l1.72 boost-python1.72 libboost_contract1.72 - libboost_date_time1.72 libboost_log1.72 libboost_random1.72 - libboost_thread1.72 libboost_container1.72 boost-jam - libboost_wserialization1.72 libboost_context1.72" +replaces="libboost_program_options1.72>=0 libboost_math_c99f1.72>=0 + libboost_stacktrace_basic1.72>=0 libboost_stacktrace_noop1.72>=0 + libboost_iostreams1.72>=0 libboost_math_tr1l1.72>=0 libboost_filesystem1.72>=0 + libboost_chrono1.72>=0 libboost_math_tr1f1.72>=0 libboost_wave1.72>=0 + libboost_graph1.72>=0 libboost_locale1.72>=0 libboost_regex1.72>=0 + libboost_fiber1.72>=0 libboost_type_erasure1.72>=0 libboost_coroutine1.72>=0 + libboost_atomic1.72>=0 libboost_prg_exec_monitor1.72>=0 libboost_math_c991.72>=0 + boost-python3-1.72>=0 libboost_log_setup1.72>=0 + libboost_timer1.72>=0 libboost_system1.72>=0 libboost_unit_test_framework1.72>=0 + libboost_serialization1.72>=0 libboost_math_tr11.72>=0 + libboost_math_c99l1.72>=0 boost-python1.72>=0 libboost_contract1.72>=0 + libboost_date_time1.72>=0 libboost_log1.72>=0 libboost_random1.72>=0 + libboost_thread1.72>=0 libboost_container1.72>=0 + libboost_wserialization1.72>=0 libboost_context1.72>=0 + libboost_stacktrace_addr2line1.72>=0" + +subpackages="libboost_program_options1.80 libboost_math_c99f1.80 + libboost_stacktrace_basic1.80 libboost_stacktrace_noop1.80 + libboost_iostreams1.80 libboost_math_tr1l1.80 libboost_filesystem1.80 + libboost_chrono1.80 libboost_math_tr1f1.80 libboost_wave1.80 + libboost_graph1.80 libboost_locale1.80 libboost_regex1.80 + libboost_fiber1.80 libboost_type_erasure1.80 libboost_coroutine1.80 + libboost_atomic1.80 libboost_prg_exec_monitor1.80 libboost_math_c991.80 + boost-python3-1.80 libboost_log_setup1.80 boost-devel libboost_json1.80 + libboost_timer1.80 libboost_system1.80 libboost_unit_test_framework1.80 + libboost_serialization1.80 libboost_math_tr11.80 boost-build + libboost_math_c99l1.80 libboost_contract1.80 libboost_nowide1.80 + libboost_date_time1.80 libboost_log1.80 libboost_random1.80 + libboost_thread1.80 libboost_container1.80 boost-jam + libboost_wserialization1.80 libboost_context1.80" if [ -z "$CROSS_BUILD" ]; then - subpackages+=" libboost_stacktrace_addr2line1.72" + subpackages+=" libboost_stacktrace_addr2line1.80" fi case "$XBPS_TARGET_MACHINE" in @@ -60,38 +59,40 @@ case "$XBPS_TARGET_MACHINE" in esac do_build() { - CXX=${BUILD_CXX} CXXFLAGS=${BUILD_CXXFLAGS} ./bootstrap.sh \ - --prefix=${DESTDIR}/usr --with-python=${XBPS_CROSS_BASE}/usr/bin/python3 \ + # bootstrap.sh will reset CXX and CXXFLAGS (L229) + ./bootstrap.sh --with-toolset=gcc \ + --prefix=${DESTDIR}/usr --with-python=/usr/bin/python3 \ --with-python-root=${XBPS_CROSS_BASE}/usr ( # Rebuild bjam for target cd tools/build/src/engine - ./build.sh gcc + CXXFLAGS="$CXXFLAGS -fdebug-prefix-map=$PWD=." + # toolset gcc will force gcc -x c++ -O2 -s + # toolset cxx will use CXX and CXXFLAGS + CXX_VERSION_OPT=--version ./build.sh cxx ) cat > user-config.jam <<-__EOF using gcc : : ${CXX} : "${CXXFLAGS}" "${LDFLAGS}" ; - using python : 2.7 : ${XBPS_CROSS_BASE}/usr/bin/python2 : ${XBPS_CROSS_BASE}/usr/include/python2.7 : ${XBPS_CROSS_BASE}/usr/lib/python2.7 ; - using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ; + using python : ${py3_ver} : /usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ; __EOF - # --no-cmake-config should be removed with boost-1.71 or later ./b2 ${makejobs} \ --user-config=${wrksrc}/user-config.jam --debug-building \ - --no-cmake-config \ - --toolset=gcc abi=${_abi} architecture=${_arch} python=2.7,${py3_ver} \ + --toolset=gcc abi=${_abi} architecture=${_arch} python=${py3_ver} \ threading=multi runtime-link=shared link=shared,static } do_install() { # Install bjam # XXX: make bjam a symlink to b2 - for _b in bjam b2; do + for _b in b2; do vbin tools/build/src/engine/${_b} done + ln -sf b2 "$DESTDIR/usr/bin/bjam" # Install headers/libs ./b2 --prefix=${DESTDIR}/usr abi=${_abi} architecture=${_arch} \ - --user-config=${wrksrc}/user-config.jam --no-cmake-config \ - python=2.7,${py3_ver} threading=multi runtime-link=shared link=shared,static \ + --user-config=${wrksrc}/user-config.jam \ + python=${py3_ver} threading=multi runtime-link=shared link=shared,static \ install # Install Boost.Build stuff. @@ -119,15 +120,7 @@ boost-jam_package() { vmove usr/bin/b2 } } -boost-python1.72_package() { - depends="boost python" - replaces="boost-python>=0" - short_desc+=" - Python bindings" - pkg_install() { - vmove "usr/lib/libboost_python2*.so.*" - } -} -boost-python3-1.72_package() { +boost-python3-1.80_package() { depends="boost python3" replaces="boost-python3>=0" short_desc+=" - Python3 bindings" @@ -149,12 +142,13 @@ boost-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove "usr/lib/*.a" vmove "usr/lib/*.so" } } -libboost_atomic1.72_package() { +libboost_atomic1.80_package() { depends="boost" short_desc+=" - libboost_atomic" pkg_install() { @@ -162,7 +156,7 @@ libboost_atomic1.72_package() { } } -libboost_chrono1.72_package() { +libboost_chrono1.80_package() { depends="boost" short_desc+=" - libboost_chrono" pkg_install() { @@ -170,7 +164,7 @@ libboost_chrono1.72_package() { } } -libboost_container1.72_package() { +libboost_container1.80_package() { depends="boost" short_desc+=" - libboost_container" pkg_install() { @@ -178,7 +172,7 @@ libboost_container1.72_package() { } } -libboost_context1.72_package() { +libboost_context1.80_package() { depends="boost" short_desc+=" - libboost_context" pkg_install() { @@ -186,7 +180,7 @@ libboost_context1.72_package() { } } -libboost_contract1.72_package() { +libboost_contract1.80_package() { depends="boost" short_desc+=" - libboost_contract" pkg_install() { @@ -194,7 +188,7 @@ libboost_contract1.72_package() { } } -libboost_coroutine1.72_package() { +libboost_coroutine1.80_package() { depends="boost" short_desc+=" - libboost_coroutine" pkg_install() { @@ -202,7 +196,7 @@ libboost_coroutine1.72_package() { } } -libboost_date_time1.72_package() { +libboost_date_time1.80_package() { depends="boost" short_desc+=" - libboost_date_time" pkg_install() { @@ -210,7 +204,7 @@ libboost_date_time1.72_package() { } } -libboost_fiber1.72_package() { +libboost_fiber1.80_package() { depends="boost" short_desc+=" - libboost_fiber" pkg_install() { @@ -218,7 +212,7 @@ libboost_fiber1.72_package() { } } -libboost_filesystem1.72_package() { +libboost_filesystem1.80_package() { depends="boost" short_desc+=" - libboost_filesystem" pkg_install() { @@ -226,7 +220,7 @@ libboost_filesystem1.72_package() { } } -libboost_graph1.72_package() { +libboost_graph1.80_package() { depends="boost" short_desc+=" - libboost_graph" pkg_install() { @@ -234,7 +228,7 @@ libboost_graph1.72_package() { } } -libboost_iostreams1.72_package() { +libboost_iostreams1.80_package() { depends="boost" short_desc+=" - libboost_iostreams" pkg_install() { @@ -242,7 +236,7 @@ libboost_iostreams1.72_package() { } } -libboost_locale1.72_package() { +libboost_locale1.80_package() { depends="boost" short_desc+=" - libboost_locale" pkg_install() { @@ -250,7 +244,7 @@ libboost_locale1.72_package() { } } -libboost_log1.72_package() { +libboost_log1.80_package() { depends="boost" short_desc+=" - libboost_log" pkg_install() { @@ -258,7 +252,7 @@ libboost_log1.72_package() { } } -libboost_log_setup1.72_package() { +libboost_log_setup1.80_package() { depends="boost" short_desc+=" - libboost_log_setup" pkg_install() { @@ -266,7 +260,7 @@ libboost_log_setup1.72_package() { } } -libboost_math_c991.72_package() { +libboost_math_c991.80_package() { depends="boost" short_desc+=" - libboost_math_c99" pkg_install() { @@ -274,7 +268,7 @@ libboost_math_c991.72_package() { } } -libboost_math_c99f1.72_package() { +libboost_math_c99f1.80_package() { depends="boost" short_desc+=" - libboost_math_c99f" pkg_install() { @@ -282,7 +276,7 @@ libboost_math_c99f1.72_package() { } } -libboost_math_c99l1.72_package() { +libboost_math_c99l1.80_package() { depends="boost" short_desc+=" - libboost_math_c99l" pkg_install() { @@ -290,7 +284,15 @@ libboost_math_c99l1.72_package() { } } -libboost_math_tr11.72_package() { +libboost_json1.80_package() { + depends="boost" + short_desc+=" - libboost_json" + pkg_install() { + vmove usr/lib/libboost_json.so.* + } +} + +libboost_math_tr11.80_package() { depends="boost" short_desc+=" - libboost_math_tr1" pkg_install() { @@ -298,7 +300,7 @@ libboost_math_tr11.72_package() { } } -libboost_math_tr1f1.72_package() { +libboost_math_tr1f1.80_package() { depends="boost" short_desc+=" - libboost_math_tr1f" pkg_install() { @@ -306,7 +308,7 @@ libboost_math_tr1f1.72_package() { } } -libboost_math_tr1l1.72_package() { +libboost_math_tr1l1.80_package() { depends="boost" short_desc+=" - libboost_math_tr1l" pkg_install() { @@ -314,7 +316,15 @@ libboost_math_tr1l1.72_package() { } } -libboost_prg_exec_monitor1.72_package() { +libboost_nowide1.80_package() { + depends="boost" + short_desc+=" - libboost_nowide" + pkg_install() { + vmove usr/lib/libboost_nowide.so.* + } +} + +libboost_prg_exec_monitor1.80_package() { depends="boost" short_desc+=" - libboost_prg_exec_monitor" pkg_install() { @@ -322,7 +332,7 @@ libboost_prg_exec_monitor1.72_package() { } } -libboost_program_options1.72_package() { +libboost_program_options1.80_package() { depends="boost" short_desc+=" - libboost_program_options" pkg_install() { @@ -330,7 +340,7 @@ libboost_program_options1.72_package() { } } -libboost_random1.72_package() { +libboost_random1.80_package() { depends="boost" short_desc+=" - libboost_random" pkg_install() { @@ -338,7 +348,7 @@ libboost_random1.72_package() { } } -libboost_regex1.72_package() { +libboost_regex1.80_package() { depends="boost" short_desc+=" - libboost_regex" pkg_install() { @@ -346,7 +356,7 @@ libboost_regex1.72_package() { } } -libboost_serialization1.72_package() { +libboost_serialization1.80_package() { depends="boost" short_desc+=" - libboost_serialization" pkg_install() { @@ -354,7 +364,7 @@ libboost_serialization1.72_package() { } } -libboost_stacktrace_addr2line1.72_package() { +libboost_stacktrace_addr2line1.80_package() { depends="boost" short_desc+=" - libboost_stacktrace_addr2line" pkg_install() { @@ -362,7 +372,7 @@ libboost_stacktrace_addr2line1.72_package() { } } -libboost_stacktrace_basic1.72_package() { +libboost_stacktrace_basic1.80_package() { depends="boost" short_desc+=" - libboost_stacktrace_basic" pkg_install() { @@ -370,7 +380,7 @@ libboost_stacktrace_basic1.72_package() { } } -libboost_stacktrace_noop1.72_package() { +libboost_stacktrace_noop1.80_package() { depends="boost" short_desc+=" - libboost_stacktrace_noop" pkg_install() { @@ -378,7 +388,7 @@ libboost_stacktrace_noop1.72_package() { } } -libboost_system1.72_package() { +libboost_system1.80_package() { depends="boost" short_desc+=" - libboost_system" pkg_install() { @@ -386,7 +396,7 @@ libboost_system1.72_package() { } } -libboost_thread1.72_package() { +libboost_thread1.80_package() { depends="boost" short_desc+=" - libboost_thread" pkg_install() { @@ -394,7 +404,7 @@ libboost_thread1.72_package() { } } -libboost_timer1.72_package() { +libboost_timer1.80_package() { depends="boost" short_desc+=" - libboost_timer" pkg_install() { @@ -402,7 +412,7 @@ libboost_timer1.72_package() { } } -libboost_type_erasure1.72_package() { +libboost_type_erasure1.80_package() { depends="boost" short_desc+=" - libboost_type_erasure" pkg_install() { @@ -410,7 +420,7 @@ libboost_type_erasure1.72_package() { } } -libboost_unit_test_framework1.72_package() { +libboost_unit_test_framework1.80_package() { depends="boost" short_desc+=" - libboost_unit_test_framework" pkg_install() { @@ -418,7 +428,7 @@ libboost_unit_test_framework1.72_package() { } } -libboost_wave1.72_package() { +libboost_wave1.80_package() { depends="boost" short_desc+=" - libboost_wave" pkg_install() { @@ -426,7 +436,7 @@ libboost_wave1.72_package() { } } -libboost_wserialization1.72_package() { +libboost_wserialization1.80_package() { depends="boost" short_desc+=" - libboost_wserialization" pkg_install() { diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/libboost_atomic1.80 similarity index 100% rename from srcpkgs/boost-python3-1.72 rename to srcpkgs/libboost_atomic1.80 diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_chrono1.80 similarity index 100% rename from srcpkgs/libboost_atomic1.72 rename to srcpkgs/libboost_chrono1.80 diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_container1.80 similarity index 100% rename from srcpkgs/libboost_chrono1.72 rename to srcpkgs/libboost_container1.80 diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_context1.80 similarity index 100% rename from srcpkgs/libboost_container1.72 rename to srcpkgs/libboost_context1.80 diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_contract1.80 similarity index 100% rename from srcpkgs/libboost_context1.72 rename to srcpkgs/libboost_contract1.80 diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_coroutine1.80 similarity index 100% rename from srcpkgs/libboost_contract1.72 rename to srcpkgs/libboost_coroutine1.80 diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_date_time1.80 similarity index 100% rename from srcpkgs/libboost_coroutine1.72 rename to srcpkgs/libboost_date_time1.80 diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_fiber1.80 similarity index 100% rename from srcpkgs/libboost_date_time1.72 rename to srcpkgs/libboost_fiber1.80 diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.80 similarity index 100% rename from srcpkgs/libboost_fiber1.72 rename to srcpkgs/libboost_filesystem1.80 diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.80 similarity index 100% rename from srcpkgs/libboost_filesystem1.72 rename to srcpkgs/libboost_graph1.80 diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.80 similarity index 100% rename from srcpkgs/libboost_graph1.72 rename to srcpkgs/libboost_iostreams1.80 diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_json1.80 similarity index 100% rename from srcpkgs/libboost_iostreams1.72 rename to srcpkgs/libboost_json1.80 diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.80 similarity index 100% rename from srcpkgs/libboost_locale1.72 rename to srcpkgs/libboost_locale1.80 diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.80 similarity index 100% rename from srcpkgs/libboost_log1.72 rename to srcpkgs/libboost_log1.80 diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.80 similarity index 100% rename from srcpkgs/libboost_log_setup1.72 rename to srcpkgs/libboost_log_setup1.80 diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c991.80 similarity index 100% rename from srcpkgs/libboost_math_c991.72 rename to srcpkgs/libboost_math_c991.80 diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.80 similarity index 100% rename from srcpkgs/libboost_math_c99f1.72 rename to srcpkgs/libboost_math_c99f1.80 diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.80 similarity index 100% rename from srcpkgs/libboost_math_c99l1.72 rename to srcpkgs/libboost_math_c99l1.80 diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr11.80 similarity index 100% rename from srcpkgs/libboost_math_tr11.72 rename to srcpkgs/libboost_math_tr11.80 diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.80 similarity index 100% rename from srcpkgs/libboost_math_tr1f1.72 rename to srcpkgs/libboost_math_tr1f1.80 diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.80 similarity index 100% rename from srcpkgs/libboost_math_tr1l1.72 rename to srcpkgs/libboost_math_tr1l1.80 diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.80 similarity index 100% rename from srcpkgs/libboost_prg_exec_monitor1.72 rename to srcpkgs/libboost_nowide1.80 diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.80 similarity index 100% rename from srcpkgs/libboost_program_options1.72 rename to srcpkgs/libboost_prg_exec_monitor1.80 diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.80 similarity index 100% rename from srcpkgs/libboost_random1.72 rename to srcpkgs/libboost_program_options1.80 diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.80 similarity index 100% rename from srcpkgs/libboost_regex1.72 rename to srcpkgs/libboost_random1.80 diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.80 similarity index 100% rename from srcpkgs/libboost_serialization1.72 rename to srcpkgs/libboost_regex1.80 diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.80 similarity index 100% rename from srcpkgs/libboost_stacktrace_addr2line1.72 rename to srcpkgs/libboost_serialization1.80 diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_stacktrace_addr2line1.80 similarity index 100% rename from srcpkgs/libboost_stacktrace_basic1.72 rename to srcpkgs/libboost_stacktrace_addr2line1.80 diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_basic1.80 similarity index 100% rename from srcpkgs/libboost_stacktrace_noop1.72 rename to srcpkgs/libboost_stacktrace_basic1.80 diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_noop1.80 similarity index 100% rename from srcpkgs/libboost_system1.72 rename to srcpkgs/libboost_stacktrace_noop1.80 diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_system1.80 similarity index 100% rename from srcpkgs/libboost_thread1.72 rename to srcpkgs/libboost_system1.80 diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_thread1.80 similarity index 100% rename from srcpkgs/libboost_timer1.72 rename to srcpkgs/libboost_thread1.80 diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_timer1.80 similarity index 100% rename from srcpkgs/libboost_type_erasure1.72 rename to srcpkgs/libboost_timer1.80 diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_type_erasure1.80 similarity index 100% rename from srcpkgs/libboost_unit_test_framework1.72 rename to srcpkgs/libboost_type_erasure1.80 diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_unit_test_framework1.80 similarity index 100% rename from srcpkgs/libboost_wave1.72 rename to srcpkgs/libboost_unit_test_framework1.80 diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wave1.80 similarity index 100% rename from srcpkgs/libboost_wserialization1.72 rename to srcpkgs/libboost_wave1.80 diff --git a/srcpkgs/libboost_wserialization1.80 b/srcpkgs/libboost_wserialization1.80 new file mode 120000 index 000000000000..baef819c48f6 --- /dev/null +++ b/srcpkgs/libboost_wserialization1.80 @@ -0,0 +1 @@ +boost \ No newline at end of file From a7f1fcfd06fc8d3d1988f4e3bbec695a67fc5697 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, 26 Aug 2022 16:51:50 +0700 Subject: [PATCH 0725/1407] TSC: rebuild for boost-1.80 --- srcpkgs/TSC/patches/boost-1.80.patch | 11 +++++++++++ srcpkgs/TSC/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/TSC/patches/boost-1.80.patch diff --git a/srcpkgs/TSC/patches/boost-1.80.patch b/srcpkgs/TSC/patches/boost-1.80.patch new file mode 100644 index 000000000000..19f9ee57bad5 --- /dev/null +++ b/srcpkgs/TSC/patches/boost-1.80.patch @@ -0,0 +1,11 @@ +--- a/tsc/scrdg/scrdg.cpp ++++ b/tsc/scrdg/scrdg.cpp +@@ -15,6 +15,8 @@ + */ + + #include "scrdg.hpp" ++#include ++#include + #include + #include + #include diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template index 71534315cf7c..469f6d859bc7 100644 --- a/srcpkgs/TSC/template +++ b/srcpkgs/TSC/template @@ -1,7 +1,7 @@ # Template file for 'TSC' pkgname=TSC version=2.1.0 -revision=2 +revision=3 build_wrksrc=tsc build_style=cmake build_helper="qemu" From 80edfd0d8eea554cff34e028a5e54d14d1375eba 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, 26 Aug 2022 17:00:27 +0700 Subject: [PATCH 0726/1407] 0ad: rebuild for boost-1.80 --- srcpkgs/0ad/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template index 552d2728a7a0..b9f0751c4836 100644 --- a/srcpkgs/0ad/template +++ b/srcpkgs/0ad/template @@ -1,7 +1,7 @@ # Template file for '0ad' pkgname=0ad version=0.0.25b -revision=3 +revision=4 archs="x86_64* i686* aarch64* armv7l* ppc64le*" wrksrc="${pkgname}-${version}-alpha" hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang" From 75788f8a10a2b3b6187c18265db7e5e46883f13f 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, 26 Aug 2022 17:00:27 +0700 Subject: [PATCH 0727/1407] Aegisub: rebuild for boost-1.80 --- srcpkgs/Aegisub/patches/link-icu18n.patch | 15 +++++++++++++++ srcpkgs/Aegisub/template | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/Aegisub/patches/link-icu18n.patch diff --git a/srcpkgs/Aegisub/patches/link-icu18n.patch b/srcpkgs/Aegisub/patches/link-icu18n.patch new file mode 100644 index 000000000000..e5c037ca1f68 --- /dev/null +++ b/srcpkgs/Aegisub/patches/link-icu18n.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -347,9 +347,9 @@ target_link_libraries(Aegisub PRIVATE "O + find_package(Iconv REQUIRED) + target_link_libraries(libaegisub PRIVATE "Iconv::Iconv") + +-find_package(ICU REQUIRED uc) +-target_link_libraries(libaegisub PRIVATE "ICU::uc") +-target_link_libraries(Aegisub PRIVATE "ICU::uc") ++find_package(ICU REQUIRED uc i18n) ++target_link_libraries(libaegisub PRIVATE "ICU::uc" ICU::i18n) ++target_link_libraries(Aegisub PRIVATE "ICU::uc" ICU::i18n) + + find_package(wxWidgets REQUIRED adv base core gl stc xml) + include(${wxWidgets_USE_FILE}) diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template index ff34249aaee4..a68e1ab43089 100644 --- a/srcpkgs/Aegisub/template +++ b/srcpkgs/Aegisub/template @@ -1,7 +1,7 @@ # Template file for 'Aegisub' pkgname=Aegisub version=3.3.2 -revision=4 +revision=5 build_style=cmake build_helper=cmake-wxWidgets-gtk3 cmake_builddir="BUILD" From 8b31873b857c37d133838b915a8e0087b2e0aa26 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, 26 Aug 2022 17:00:27 +0700 Subject: [PATCH 0728/1407] Field3D: rebuild for boost-1.80 --- srcpkgs/Field3D/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template index 62f0589e9e0b..9a5af0034d14 100644 --- a/srcpkgs/Field3D/template +++ b/srcpkgs/Field3D/template @@ -1,7 +1,7 @@ # Template file for 'Field3D' pkgname=Field3D version=1.7.3 -revision=2 +revision=3 build_style=cmake makedepends="boost-devel hdf5-devel ilmbase-devel" short_desc="Library for storing voxel data on disk and in memory" From efe4a1625158b673b6294f3c9f4a56a68b4d97f7 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, 26 Aug 2022 17:00:28 +0700 Subject: [PATCH 0729/1407] LGOGDownloader: rebuild for boost-1.80 --- srcpkgs/LGOGDownloader/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template index 6e7e5c685f83..0778374ad224 100644 --- a/srcpkgs/LGOGDownloader/template +++ b/srcpkgs/LGOGDownloader/template @@ -1,7 +1,7 @@ # Template file for 'LGOGDownloader' pkgname=LGOGDownloader version=3.9 -revision=1 +revision=2 wrksrc="lgogdownloader-${version}" build_style=cmake hostmakedepends="pkg-config" From 3f2d7f1e5a95890bec4ef4c77a4b21c0f387b078 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, 26 Aug 2022 17:00:28 +0700 Subject: [PATCH 0730/1407] Lucene++: rebuild for boost-1.80 --- srcpkgs/Lucene++/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template index 3873189f2dfc..34b6e05393fe 100644 --- a/srcpkgs/Lucene++/template +++ b/srcpkgs/Lucene++/template @@ -1,7 +1,7 @@ # Template file for 'Lucene++' pkgname=Lucene++ version=3.0.7 -revision=11 +revision=12 wrksrc=LucenePlusPlus-rel_$version build_style=cmake configure_args="-Wno-dev" From 9fb72b55a73c08fe0d2b44183fafc4f0caf1d1c1 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, 26 Aug 2022 17:00:28 +0700 Subject: [PATCH 0731/1407] PrusaSlicer: rebuild for boost-1.80 --- srcpkgs/PrusaSlicer/patches/fstream.patch | 20 ++++++++++++++++++++ srcpkgs/PrusaSlicer/template | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch new file mode 100644 index 000000000000..a766c747f704 --- /dev/null +++ b/srcpkgs/PrusaSlicer/patches/fstream.patch @@ -0,0 +1,20 @@ +--- a/src/hints/HintsToPot.cpp ++++ b/src/hints/HintsToPot.cpp +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- a/tests/fff_print/test_data.cpp ++++ b/tests/fff_print/test_data.cpp +@@ -8,6 +8,7 @@ + #include "libslic3r/Format/STL.hpp" + + #include ++#include + #include + + #include diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index 931ac73e5c94..29f1f641a488 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -1,7 +1,7 @@ # Template file for 'PrusaSlicer' pkgname=PrusaSlicer version=2.4.2 -revision=1 +revision=2 wrksrc="PrusaSlicer-version_${version}" build_style=cmake build_helper="qemu" From 1c48f59effee984ea8db2c7c7e0298316482542e 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, 26 Aug 2022 17:00:28 +0700 Subject: [PATCH 0732/1407] astroid: rebuild for boost-1.80 --- srcpkgs/astroid/template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template index 8ee0e729e134..91e3ca400acd 100644 --- a/srcpkgs/astroid/template +++ b/srcpkgs/astroid/template @@ -1,8 +1,9 @@ # Template file for 'astroid' pkgname=astroid version=0.16 -revision=5 +revision=6 build_style=cmake +build_helper=gir hostmakedepends="pkg-config scdoc protobuf gobject-introspection" makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel gmime3-devel boost-devel protobuf-devel vte3-devel gobject-introspection @@ -15,10 +16,6 @@ homepage="http://astroidmail.github.io/" distfiles="https://github.com/astroidmail/astroid/archive/v${version}.tar.gz" checksum=32ecb8c2fafe67f70c7d5f2bc60bda1796d98a56a75f7868c7c1ca50cd7baf5e -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qemu-user-static prelink-cross" -fi - do_check() { cd build xvfb-run ctest From 617db88711197c44c9beb11b570efe0a818b1a25 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, 26 Aug 2022 17:00:28 +0700 Subject: [PATCH 0733/1407] bitcoin: rebuild for boost-1.80 --- srcpkgs/bitcoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index ccc9c4cc5f10..9ae457ecb9c5 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=22.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui" From b28a4671fea363ba0d4f5990383dca7562864302 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, 26 Aug 2022 17:00:29 +0700 Subject: [PATCH 0734/1407] blender: rebuild for boost-1.80 --- srcpkgs/blender/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 91799f04fba5..28befed1faf8 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=3.0.0 -revision=4 +revision=5 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="/usr/share/blender/${version%.*}/scripts" From 9589fa978b54cf78bae7753b67b73dd71a7886f2 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, 26 Aug 2022 17:00:29 +0700 Subject: [PATCH 0735/1407] cclive: rebuild for boost-1.80 --- srcpkgs/cclive/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template index c43dbb94209c..936be99b866c 100644 --- a/srcpkgs/cclive/template +++ b/srcpkgs/cclive/template @@ -1,7 +1,7 @@ # Template file for 'cclive' pkgname=cclive version=0.9.3 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel" From 434f6820d11a3df621aa6e26faae8ac17092f922 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, 26 Aug 2022 17:00:29 +0700 Subject: [PATCH 0736/1407] cgal: rebuild for boost-1.80 --- srcpkgs/cgal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template index 7e28c2b28dfd..d448e8dd3c63 100644 --- a/srcpkgs/cgal/template +++ b/srcpkgs/cgal/template @@ -1,7 +1,7 @@ # Template file for 'cgal' pkgname=cgal version=4.14 -revision=3 +revision=4 wrksrc="CGAL-${version}" build_style=cmake build_helper="qemu" From 797fc41ac64d7485f0dec3d4aa5a5b3cc713aadd 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, 26 Aug 2022 17:00:29 +0700 Subject: [PATCH 0737/1407] codeblocks: rebuild for boost-1.80 --- .../patches/cross-autorevision.patch | 51 +++++++++++++++++++ srcpkgs/codeblocks/template | 19 +------ 2 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 srcpkgs/codeblocks/patches/cross-autorevision.patch diff --git a/srcpkgs/codeblocks/patches/cross-autorevision.patch b/srcpkgs/codeblocks/patches/cross-autorevision.patch new file mode 100644 index 000000000000..7d3ef3acfd29 --- /dev/null +++ b/srcpkgs/codeblocks/patches/cross-autorevision.patch @@ -0,0 +1,51 @@ +--- a/src/build_tools/autorevision/Makefile.am ++++ b/src/build_tools/autorevision/Makefile.am +@@ -1,3 +1,10 @@ ++CC = cc ++CXX = g++ ++LD = g++ ++CFLAGS = -O2 -pipe ++CXXFLAGS = -O2 -pipe ++LDFLAGS = -s ++ + noinst_PROGRAMS = auto_revision + auto_revision_SOURCES = autorevision.cpp + +--- a/src/build_tools/autorevision/Makefile.in ++++ b/src/build_tools/autorevision/Makefile.in +@@ -240,17 +240,17 @@ CB_SQUIRREL_CFLAGS = @CB_SQUIRREL_CFLAGS + CB_SQUIRREL_LIBS = @CB_SQUIRREL_LIBS@ + CB_TINYXML_CFLAGS = @CB_TINYXML_CFLAGS@ + CB_TINYXML_LIBS = @CB_TINYXML_LIBS@ +-CC = @CC@ ++CC = cc + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ ++CFLAGS = -O2 -pipe + CODEBLOCKS_PLATFORM = @CODEBLOCKS_PLATFORM@ + CODEBLOCKS_VERSION_INFO = @CODEBLOCKS_VERSION_INFO@ +-CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ ++CPP = cpp ++CPPFLAGS := ++CXX = g++ ++CXXCPP = g++ + CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ ++CXXFLAGS = -O2 -pipe + CYGPATH_W = @CYGPATH_W@ + DATE = @DATE@ + DEFS = @DEFS@ +@@ -288,8 +288,8 @@ INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-LD = @LD@ +-LDFLAGS = @LDFLAGS@ ++LD = g++ ++LDFLAGS = -s + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template index 33b9b9a77853..26487b40f796 100644 --- a/srcpkgs/codeblocks/template +++ b/srcpkgs/codeblocks/template @@ -1,11 +1,11 @@ # Template file for 'codeblocks' pkgname=codeblocks version=20.03 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins --with-boost=${XBPS_CROSS_BASE}/usr --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" -hostmakedepends="automake libtool pkg-config zip" +hostmakedepends="libtool pkg-config zip" makedepends="gtk+3-devel wxWidgets-gtk3-devel tinyxml-devel hunspell-devel gamin-devel boost-devel boost-build" short_desc="Free C, C++ and Fortran IDE" @@ -20,21 +20,6 @@ if [ "$CROSS_BUILD" ]; then configure_args+=" ac_cv_exeext=no --with-gnu-ld" fi -pre_configure() { - ./bootstrap - if [ "$CROSS_BUILD" ]; then - # Patch auto_revision's Makefile.am to use the host compiler and flags - cd src/build_tools/autorevision - sed -i Makefile.am \ - -e "/noinst_PROGRAMS = auto_revision/a CC = gcc" \ - -e "/noinst_PROGRAMS = auto_revision/a CXX = g++" \ - -e "/noinst_PROGRAMS = auto_revision/a LD = g++" \ - -e "/noinst_PROGRAMS = auto_revision/a CFLAGS = -O2 -pipe" \ - -e "/noinst_PROGRAMS = auto_revision/a CXXFLAGS = -O2 -pipe" \ - -e "/noinst_PROGRAMS = auto_revision/a LDFLAGS = -s" - fi -} - post_install() { vinstall debian/codeblocks.sharedmime 644 /usr/share/mime/packages codeblocks.xml vinstall src/mime/codeblocks.desktop 644 /usr/share/applications From c273c08891d8e545efffa76d22efeb6804f99ca2 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, 26 Aug 2022 17:00:29 +0700 Subject: [PATCH 0738/1407] colobot: rebuild for boost-1.80 --- srcpkgs/colobot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/colobot/template b/srcpkgs/colobot/template index 1b415dd2cfad..a7613cad90b5 100644 --- a/srcpkgs/colobot/template +++ b/srcpkgs/colobot/template @@ -2,7 +2,7 @@ pkgname=colobot # needs to be kept in sync with colobot-data (provides game assets) version=0.2.0 -revision=1 +revision=2 wrksrc="colobot-colobot-gold-${version}-alpha" build_style=cmake configure_args="-DCOLOBOT_INSTALL_BIN_DIR=/usr/bin -DOpenGL_GL_PREFERENCE=GLVND" From f9a1d7b1c7609112e7165cff3047b43f54c7e695 Mon Sep 17 00:00:00 2001 From: Andy Weidenbaum Date: Mon, 29 Aug 2022 10:56:35 +1000 Subject: [PATCH 0739/1407] cryfs: update to 0.11.2. --- .../cryfs/patches/allow-build-type-none.patch | 22 --- srcpkgs/cryfs/patches/de-vendor.patch | 134 +++++++----------- srcpkgs/cryfs/patches/fix-test.patch | 22 --- srcpkgs/cryfs/patches/fmt-9-fix.patch | 54 +++++++ .../rename-simple-to-basic-filesink.patch | 21 --- srcpkgs/cryfs/patches/spdlog-include.patch | 33 ----- srcpkgs/cryfs/template | 13 +- 7 files changed, 109 insertions(+), 190 deletions(-) delete mode 100644 srcpkgs/cryfs/patches/fix-test.patch create mode 100644 srcpkgs/cryfs/patches/fmt-9-fix.patch delete mode 100644 srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch delete mode 100644 srcpkgs/cryfs/patches/spdlog-include.patch diff --git a/srcpkgs/cryfs/patches/allow-build-type-none.patch b/srcpkgs/cryfs/patches/allow-build-type-none.patch index e591974c05f4..ffcf0ee53320 100644 --- a/srcpkgs/cryfs/patches/allow-build-type-none.patch +++ b/srcpkgs/cryfs/patches/allow-build-type-none.patch @@ -9,25 +9,3 @@ Index: cryfs-0.10.2/doc/CMakeLists.txt - CONFIGURATIONS Release ) ENDIF(WIN32) -Index: cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt -=================================================================== ---- cryfs-0.10.2.orig/src/cryfs-cli/CMakeLists.txt -+++ cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt -@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_N - target_activate_cpp14(${PROJECT_NAME}_bin) - - install(TARGETS ${PROJECT_NAME}_bin -- CONFIGURATIONS Debug Release RelWithDebInfo - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) -Index: cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt -=================================================================== ---- cryfs-0.10.2.orig/src/cryfs-unmount/CMakeLists.txt -+++ cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt -@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_N - target_activate_cpp14(${PROJECT_NAME}_bin) - - install(TARGETS ${PROJECT_NAME}_bin -- CONFIGURATIONS Debug Release RelWithDebInfo - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) diff --git a/srcpkgs/cryfs/patches/de-vendor.patch b/srcpkgs/cryfs/patches/de-vendor.patch index 4909cad7b84a..09e51f0aa7fc 100644 --- a/srcpkgs/cryfs/patches/de-vendor.patch +++ b/srcpkgs/cryfs/patches/de-vendor.patch @@ -1,32 +1,14 @@ -Index: cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp -=================================================================== ---- cryfs-0.10.2.orig/src/blockstore/implementations/compressing/compressors/Gzip.cpp -+++ cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp -@@ -1,6 +1,6 @@ - #include "cpp-utils/crypto/cryptopp_byte.h" +--- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:14:05.481898162 +0400 ++++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:17:49.606653292 +0400 +@@ -1,5 +1,5 @@ #include "Gzip.h" -#include +#include using cpputils::Data; -Index: cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h -=================================================================== ---- cryfs-0.10.2.orig/src/cpp-utils/crypto/cryptopp_byte.h -+++ cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h -@@ -2,7 +2,7 @@ - #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H - #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H - --#include -+#include - - // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet. - // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP). -Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp -=================================================================== ---- cryfs-0.10.2.orig/src/cpp-utils/crypto/hash/Hash.cpp -+++ cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp +--- a/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:14:05.482898159 +0400 ++++ b/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:18:07.131800277 +0400 @@ -1,6 +1,6 @@ #include "Hash.h" #include @@ -35,10 +17,8 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp using cpputils::Random; using CryptoPP::SHA512; -Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp -=================================================================== ---- cryfs-0.10.2.orig/src/cpp-utils/crypto/kdf/Scrypt.cpp -+++ cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp +--- a/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:14:05.482898159 +0400 ++++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:18:17.754889373 +0400 @@ -1,5 +1,5 @@ #include "Scrypt.h" -#include @@ -46,11 +26,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp using std::string; -Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h -=================================================================== ---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/CFB_Cipher.h -+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h -@@ -7,7 +7,7 @@ +--- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:14:05.482898159 +0400 ++++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:18:28.524979704 +0400 +@@ -6,7 +6,7 @@ #include "../../data/Data.h" #include "../../random/Random.h" #include @@ -59,24 +37,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h #include "Cipher.h" #include "EncryptionKey.h" -Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h -=================================================================== ---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/GCM_Cipher.h -+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h -@@ -6,7 +6,7 @@ - #include "../../data/FixedSizeData.h" - #include "../../data/Data.h" - #include "../../random/Random.h" --#include -+#include - #include "Cipher.h" - #include "EncryptionKey.h" - -Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h -=================================================================== ---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/ciphers.h -+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h -@@ -2,11 +2,11 @@ +--- a/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:14:05.482898159 +0400 ++++ b/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:18:52.181178110 +0400 +@@ -2,12 +2,12 @@ #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_ @@ -85,30 +48,39 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h -#include -#include -#include +-#include +#include +#include +#include +#include +#include ++#include #include "GCM_Cipher.h" #include "CFB_Cipher.h" -Index: cryfs-0.10.2/src/cpp-utils/data/Data.cpp -=================================================================== ---- cryfs-0.10.2.orig/src/cpp-utils/data/Data.cpp -+++ cryfs-0.10.2/src/cpp-utils/data/Data.cpp +--- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:14:05.482898159 +0400 ++++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:18:38.836066183 +0400 +@@ -3,7 +3,7 @@ + #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_ + + #include "AEAD_Cipher.h" +-#include ++#include + + namespace cpputils { + +--- a/src/cpp-utils/data/Data.cpp 2022-08-25 22:14:05.482898159 +0400 ++++ b/src/cpp-utils/data/Data.cpp 2022-08-25 22:19:09.349322106 +0400 @@ -1,6 +1,6 @@ #include "Data.h" #include -#include +#include - #include using std::istream; -Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h -=================================================================== ---- cryfs-0.10.2.orig/src/cpp-utils/data/FixedSizeData.h -+++ cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h + using std::ofstream; +--- a/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:14:05.482898159 +0400 ++++ b/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:19:19.103403916 +0400 @@ -2,7 +2,7 @@ #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_ #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_ @@ -116,25 +88,21 @@ Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h -#include +#include #include + #include #include - #include "../assert/assert.h" -Index: cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h -=================================================================== ---- cryfs-0.10.2.orig/src/cpp-utils/random/OSRandomGenerator.h -+++ cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h -@@ -4,7 +4,7 @@ +--- a/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:14:05.483898156 +0400 ++++ b/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:19:29.602491973 +0400 +@@ -3,7 +3,7 @@ + #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H - #include "cpp-utils/crypto/cryptopp_byte.h" #include "RandomGenerator.h" -#include +#include namespace cpputils { class OSRandomGenerator final : public RandomGenerator { -Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h -=================================================================== ---- cryfs-0.10.2.orig/src/cpp-utils/random/RandomGeneratorThread.h -+++ cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h +--- a/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:14:05.484898153 +0400 ++++ b/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:19:36.713551613 +0400 @@ -4,7 +4,7 @@ #include "../thread/LoopThread.h" @@ -144,10 +112,9 @@ Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h namespace cpputils { //TODO Test -Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp -=================================================================== ---- cryfs-0.10.2.orig/src/cryfs/localstate/BasedirMetadata.cpp -+++ cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp +diff -Naurp0 -U3 cryfs-0.11.2/src/cryfs/impl/localstate/BasedirMetadata.cpp cryfs-0.11.2-mine/src/cryfs/impl/localstate/BasedirMetadata.cpp +--- a/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:14:05.487898144 +0400 ++++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:19:46.722635560 +0400 @@ -1,7 +1,7 @@ #include "BasedirMetadata.h" #include @@ -157,11 +124,9 @@ Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp #include #include "LocalStateDir.h" #include -Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp -=================================================================== ---- cryfs-0.10.2.orig/test/cryfs/config/CompatibilityTest.cpp -+++ cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp -@@ -3,7 +3,7 @@ +--- a/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:14:05.493898126 +0400 ++++ b/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:19:54.589701542 +0400 +@@ -2,7 +2,7 @@ #include #include #include @@ -169,12 +134,9 @@ Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp +#include #include #include - #include -Index: cryfs-0.10.2/vendor/CMakeLists.txt -=================================================================== ---- cryfs-0.10.2.orig/vendor/CMakeLists.txt -+++ cryfs-0.10.2/vendor/CMakeLists.txt -@@ -1,3 +1 @@ + #include +--- a/vendor/CMakeLists.txt 2022-08-25 22:14:05.497898115 +0400 ++++ b/vendor/CMakeLists.txt 2022-08-25 22:20:11.176840657 +0400 +@@ -1,2 +1 @@ add_subdirectory(googletest) --add_subdirectory(spdlog) -add_subdirectory(cryptopp) diff --git a/srcpkgs/cryfs/patches/fix-test.patch b/srcpkgs/cryfs/patches/fix-test.patch deleted file mode 100644 index d3a5847b1a3c..000000000000 --- a/srcpkgs/cryfs/patches/fix-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h -=================================================================== ---- cryfs-0.10.2.orig/test/cpp-utils/logging/testutils/LoggingTest.h -+++ cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h -@@ -11,8 +11,7 @@ class MockLogger final { - public: - MockLogger(): - _capturedLogData(), -- _sink(std::make_shared>(_capturedLogData, true)), -- _logger(spdlog::create("MockLogger", {_sink})) { -+ _logger(spdlog::create("MockLogger", _capturedLogData, true)) { - } - - ~MockLogger() { -@@ -28,7 +27,6 @@ public: - } - private: - std::ostringstream _capturedLogData; -- std::shared_ptr> _sink; - std::shared_ptr _logger; - }; - diff --git a/srcpkgs/cryfs/patches/fmt-9-fix.patch b/srcpkgs/cryfs/patches/fmt-9-fix.patch new file mode 100644 index 000000000000..6fe97eaeafa4 --- /dev/null +++ b/srcpkgs/cryfs/patches/fmt-9-fix.patch @@ -0,0 +1,54 @@ +From 27515e0116fd7cb034bd4e9763d1f3bfdc855a5f Mon Sep 17 00:00:00 2001 +From: Bernhard Rosenkraenzer +Date: Fri, 22 Jul 2022 14:13:38 +0200 +Subject: [PATCH] Fix build with fmt 9.0 (#433) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* Fix build with fmt 9.0 + +Co-authored-by: Sebastian Meßmer +--- + ChangeLog.txt | 4 ++++ + src/fspp/fuse/Fuse.cpp | 8 ++++---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp +index 4e9dbd7f..4b881815 100644 +--- a/src/fspp/fuse/Fuse.cpp ++++ b/src/fspp/fuse/Fuse.cpp +@@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) { + UNUSED(mode); + UNUSED(path); + ThreadNameForDebugging _threadName("mknod"); +- LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode); ++ LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode); + return ENOSYS; + } + + int Fuse::mkdir(const bf::path &path, ::mode_t mode) { + ThreadNameForDebugging _threadName("mkdir"); + #ifdef FSPP_LOG +- LOG(DEBUG, "mkdir({}, {})", path, mode); ++ LOG(DEBUG, "mkdir({}, {})", path.string(), mode); + #endif + try { + ASSERT(is_valid_fspp_path(path), "has to be an absolute path"); + // DokanY seems to call mkdir("/"). Ignore that + if ("/" == path) { + #ifdef FSPP_LOG +- LOG(DEBUG, "mkdir({}, {}): ignored", path, mode); ++ LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode); + #endif + return 0; + } +@@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) { + //TODO + int Fuse::link(const bf::path &from, const bf::path &to) { + ThreadNameForDebugging _threadName("link"); +- LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to); ++ LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string()); + //auto real_from = _impl->RootDir() / from; + //auto real_to = _impl->RootDir() / to; + //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str()); diff --git a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch b/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch deleted file mode 100644 index 08513cb4d0ca..000000000000 --- a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: cryfs-0.10.2/src/cryfs-cli/Cli.cpp -=================================================================== ---- cryfs-0.10.2.orig/src/cryfs-cli/Cli.cpp -+++ cryfs-0.10.2/src/cryfs-cli/Cli.cpp -@@ -27,6 +27,7 @@ - #include "Environment.h" - #include - #include -+#include - - //TODO Many functions accessing the ProgramOptions object. Factor out into class that stores it as a member. - //TODO Factor out class handling askPassword -@@ -310,7 +311,7 @@ namespace cryfs_cli { - //TODO Test that --logfile parameter works. Should be: file if specified, otherwise stderr if foreground, else syslog. - if (options.logFile() != none) { - cpputils::logging::setLogger( -- spdlog::create>("cryfs", options.logFile()->string())); -+ spdlog::create>("cryfs", options.logFile()->string())); - } else if (options.foreground()) { - cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs")); - } else { diff --git a/srcpkgs/cryfs/patches/spdlog-include.patch b/srcpkgs/cryfs/patches/spdlog-include.patch deleted file mode 100644 index 2c1c5a926cf3..000000000000 --- a/srcpkgs/cryfs/patches/spdlog-include.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: cryfs-0.10.2/src/cpp-utils/logging/Logger.h -=================================================================== ---- cryfs-0.10.2.orig/src/cpp-utils/logging/Logger.h -+++ cryfs-0.10.2/src/cpp-utils/logging/Logger.h -@@ -7,6 +7,7 @@ - #endif - - #include -+#include - #include "../macros.h" - - namespace cpputils { -Index: cryfs-0.10.2/src/cpp-utils/logging/logging.h -=================================================================== ---- cryfs-0.10.2.orig/src/cpp-utils/logging/logging.h -+++ cryfs-0.10.2/src/cpp-utils/logging/logging.h -@@ -5,6 +5,7 @@ - #include "Logger.h" - #include - #include -+#include - - #if defined(_MSC_VER) - #include -@@ -75,7 +76,7 @@ namespace cpputils { - #if defined(_MSC_VER) - return spdlog::create(name); - #else -- return spdlog::syslog_logger(name, name, LOG_PID); -+ return spdlog::syslog_logger_mt(name, name, LOG_PID); - #endif - } - } diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template index 495c2b318a3b..1affee1d8f03 100644 --- a/srcpkgs/cryfs/template +++ b/srcpkgs/cryfs/template @@ -1,14 +1,15 @@ # Template file for 'cryfs' pkgname=cryfs -version=0.10.2 -revision=5 +version=0.11.2 +revision=1 create_wrksrc=yes build_style=cmake -configure_args="-DCRYFS_UPDATE_CHECKS=off - -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt" +configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF + -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt + -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake" hostmakedepends="pkg-config python3" makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel - spdlog" + spdlog range-v3 fmt-devel" depends="fuse" short_desc="Cryptographic filesystem for the cloud" maintainer="Andy Weidenbaum " @@ -16,7 +17,7 @@ license="LGPL-3.0-only" homepage="https://www.cryfs.org" changelog="https://github.com/cryfs/cryfs/raw/master/ChangeLog.txt" distfiles="https://github.com/cryfs/cryfs/releases/download/${version}/${pkgname}-${version}.tar.gz" -checksum=004c7fdf537062e197aaa0bcdafd2682904a279802441bb6063cb72c1fba52d2 +checksum=a89ab8fea2d494b496867107ec0a3772fe606ebd71ef12152fcd233f463a2c00 if [ "${XBPS_CHECK_PKGS}" ]; then configure_args+=" -DBUILD_TESTING=on" From d6e021d13490d90b74f2cd3a222ea0fe607ed124 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, 26 Aug 2022 17:00:30 +0700 Subject: [PATCH 0740/1407] eclib: rebuild for boost-1.80 --- srcpkgs/eclib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/eclib/template b/srcpkgs/eclib/template index 3db0bd2119b9..694a39ed4068 100644 --- a/srcpkgs/eclib/template +++ b/srcpkgs/eclib/template @@ -1,7 +1,7 @@ # Template file for 'eclib' pkgname=eclib version=20210625 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-flint --with-boost" hostmakedepends="automake autoconf-archive libtool" From 1a61f9f67c0fc59d0ca4c507e0232da10b806746 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, 26 Aug 2022 17:00:30 +0700 Subject: [PATCH 0741/1407] facter: rebuild for boost-1.80 --- srcpkgs/facter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index 93d6bfc6af51..45c921a0b72d 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,7 +1,7 @@ # Template file for 'facter' pkgname=facter version=3.14.16 -revision=3 +revision=4 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include -DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib" From 903346e935e7ff76abc593251e5d4b59738d6528 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, 26 Aug 2022 17:00:30 +0700 Subject: [PATCH 0742/1407] fcitx5-chinese-addons: rebuild for boost-1.80 --- srcpkgs/fcitx5-chinese-addons/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template index d207bde9ada9..a3a1948474a7 100644 --- a/srcpkgs/fcitx5-chinese-addons/template +++ b/srcpkgs/fcitx5-chinese-addons/template @@ -1,7 +1,7 @@ # Template file for 'fcitx5-chinese-addons' pkgname=fcitx5-chinese-addons version=5.0.14 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake qt5-host-tools libime-utils" From 7dbd48c54c3cefa1058b2cd771f59c91d7f31c69 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, 26 Aug 2022 17:00:31 +0700 Subject: [PATCH 0743/1407] fifengine: rebuild for boost-1.80 --- srcpkgs/fifengine/patches/ftbfs.patch | 18 ++++++++++++++++++ srcpkgs/fifengine/template | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/fifengine/patches/ftbfs.patch diff --git a/srcpkgs/fifengine/patches/ftbfs.patch b/srcpkgs/fifengine/patches/ftbfs.patch new file mode 100644 index 000000000000..9c205f9fe159 --- /dev/null +++ b/srcpkgs/fifengine/patches/ftbfs.patch @@ -0,0 +1,18 @@ +--- a/engine/core/vfs/zip/zipnode.cpp ++++ b/engine/core/vfs/zip/zipnode.cpp +@@ -29,6 +29,8 @@ + + #include "zipnode.h" + ++#include ++ + namespace { + /** helper function to find a value in a ZipNodeContainer + * @param container the ZipNodeContainer to search through +@@ -266,4 +268,4 @@ std::ostream& operator<<(std::ostream& o + } + + return os; +-} +\ No newline at end of file ++} diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template index 1987e06f7d03..24d2f8521c8d 100644 --- a/srcpkgs/fifengine/template +++ b/srcpkgs/fifengine/template @@ -1,7 +1,7 @@ # Template file for 'fifengine' pkgname=fifengine version=0.4.2 -revision=8 +revision=9 build_style=cmake hostmakedepends="swig python3" makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel From e7bc9013182c3fb9f2840bb6f42154ac7f236b1c 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, 26 Aug 2022 17:00:31 +0700 Subject: [PATCH 0744/1407] freecad: rebuild for boost-1.80 --- srcpkgs/freecad/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index e9c697adbe1a..843d2281f324 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad version=0.20.1 -revision=1 +revision=2 wrksrc="FreeCAD-${version}" build_style=cmake From c7f28e2f8ef3d52bcfe1e562e5b4704a75ff4a36 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, 26 Aug 2022 17:00:31 +0700 Subject: [PATCH 0745/1407] freeorion: rebuild for boost-1.80 --- srcpkgs/freeorion/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template index 20fd819e49b0..71d41f3e987b 100644 --- a/srcpkgs/freeorion/template +++ b/srcpkgs/freeorion/template @@ -1,7 +1,7 @@ # Template file for 'freeorion' pkgname=freeorion version=0.4.10.2 -revision=1 +revision=2 _release=${version}_2021-08-01.f663dad wrksrc=src-tarball build_style=cmake From 41217a069d5d456c7c677a8ea136b5f02ac179ea 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, 26 Aug 2022 17:00:31 +0700 Subject: [PATCH 0746/1407] gnucash: rebuild for boost-1.80 --- srcpkgs/gnucash/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index 5d403e47c02b..81627ef4f8a1 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,7 +1,7 @@ # Template file for 'gnucash' pkgname=gnucash version=4.11 -revision=1 +revision=2 wrksrc="${pkgname}-${version%b}" build_style=cmake make_check_target=check From 898b55026f30e61f6d5728b857ebfe9818594ed1 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, 26 Aug 2022 17:00:31 +0700 Subject: [PATCH 0747/1407] gnuradio: rebuild for boost-1.80 --- .../gnuradio/patches/boost-1.80-fmt-9.patch | 79 +++++++++++++++++++ srcpkgs/gnuradio/template | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch new file mode 100644 index 000000000000..a0c3f6d4701b --- /dev/null +++ b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch @@ -0,0 +1,79 @@ +Upstream: no + +Honestly, I don't care much. I tries to print as much as it makes sense +--- a/gnuradio-runtime/include/gnuradio/logger.h ++++ b/gnuradio-runtime/include/gnuradio/logger.h +@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr + #include + #include + #include ++#include ++#include ++#include + + #include + +@@ -285,6 +288,52 @@ struct fmt::formatter : f + } + }; + ++namespace fmt { ++template ++struct formatter< ++ T, ++ typename std::enable_if< ++ std::is_convertible< ++ decltype(std::declval().identifier()), ++ std::string ++ >::value, ++ char ++ >::type > : fmt::formatter { ++ template ++ auto format(const T& value, FormatCtx& ctx) ++ -> decltype(fmt::formatter::format(value.identifier(), ctx)) ++ { ++ return fmt::formatter::format(value.identifier(), ctx); ++ } ++}; ++template ++struct formatter, Ch> : fmt::formatter { ++ template ++ auto format(const std::shared_ptr& ptr, FormatCtx& ctx) ++ -> decltype(fmt::formatter::format(fmt::ptr(ptr), ctx)) ++ { ++ return fmt::formatter::format(fmt::ptr(ptr), ctx); ++ } ++}; ++template ++struct formatter< ++ std::shared_ptr, ++ typename std::enable_if< ++ std::is_convertible< ++ decltype(std::declval().identifier()), ++ std::string ++ >::value, ++ char ++ >::type > : fmt::formatter { ++ template ++ auto format(const std::shared_ptr& ptr, FormatCtx& ctx) ++ -> decltype(fmt::formatter::format(ptr->identifier(), ctx)) ++ { ++ return fmt::formatter::format(ptr->identifier(), ctx); ++ } ++}; ++} ++ + #endif + + #endif /* INCLUDED_GR_LOGGER_H */ +--- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc ++++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc +@@ -15,7 +15,7 @@ + /* BINDTOOL_GEN_AUTOMATIC(0) */ + /* BINDTOOL_USE_PYGCCXML(0) */ + /* BINDTOOL_HEADER_FILE(logger.h) */ +-/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */ ++/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */ + /***********************************************************************************/ + + #include diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 43ae4e1cb1ba..973339f92921 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio version=3.10.3.0 -revision=1 +revision=2 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax From ba10b767a362f09307c6ac1b7f884f3a57cc0a25 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, 26 Aug 2022 17:00:32 +0700 Subject: [PATCH 0748/1407] gnuradio-osmosdr: rebuild for boost-1.80 --- srcpkgs/gnuradio-osmosdr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template index cdb4d27faf68..bf0696c672a9 100644 --- a/srcpkgs/gnuradio-osmosdr/template +++ b/srcpkgs/gnuradio-osmosdr/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-osmosdr' pkgname=gnuradio-osmosdr version=0.2.3git20210128 -revision=1 +revision=2 _githash=a100eb024c0210b95e4738b6efd836d48225bd03 wrksrc="gr-osmosdr-${_githash}" build_style=cmake From 89563f3f95984e623aa706f1392f550190e6116b 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, 26 Aug 2022 17:00:32 +0700 Subject: [PATCH 0749/1407] gnuradio-rds: rebuild for boost-1.80 --- srcpkgs/gnuradio-rds/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template index 35d19fb82b11..e9e865151f7a 100644 --- a/srcpkgs/gnuradio-rds/template +++ b/srcpkgs/gnuradio-rds/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-rds' pkgname=gnuradio-rds version=3.10 -revision=1 +revision=2 wrksrc="gr-rds-${version}" build_style=cmake configure_args="-Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11" From 39dc0e361e22cf20e50873ea73e94561635c0068 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, 26 Aug 2022 17:00:32 +0700 Subject: [PATCH 0750/1407] gource: rebuild for boost-1.80 --- srcpkgs/gource/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template index 8ec3b05ca772..08b2e222f607 100644 --- a/srcpkgs/gource/template +++ b/srcpkgs/gource/template @@ -1,7 +1,7 @@ # Template file for 'gource' pkgname=gource version=0.51 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF --with-boost-libdir=$XBPS_CROSS_BASE/usr/lib/" From b8430566a791351aaf1c61b492d3107312863851 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, 26 Aug 2022 17:00:32 +0700 Subject: [PATCH 0751/1407] gpick: rebuild for boost-1.80 --- srcpkgs/gpick/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template index b30108334144..7b3a4db6d69c 100644 --- a/srcpkgs/gpick/template +++ b/srcpkgs/gpick/template @@ -1,7 +1,7 @@ # Template file for 'gpick' pkgname=gpick version=0.2.6 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake hostmakedepends="gettext pkg-config ragel" From d6a86b7067bc8aaeee397204ba61f92659092a46 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, 26 Aug 2022 17:00:32 +0700 Subject: [PATCH 0752/1407] grive2: rebuild for boost-1.80 --- srcpkgs/grive2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template index 140688ee9aec..e416cdc606b5 100644 --- a/srcpkgs/grive2/template +++ b/srcpkgs/grive2/template @@ -1,7 +1,7 @@ # Template file for 'grive2' pkgname=grive2 version=0.5.1 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel" From 131ed12c98447ad55cf6a4f01a9008d7248e95bd 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, 26 Aug 2022 17:00:33 +0700 Subject: [PATCH 0753/1407] guitarix2: rebuild for boost-1.80 --- srcpkgs/guitarix2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template index 880814313a2b..90010b5a2be8 100644 --- a/srcpkgs/guitarix2/template +++ b/srcpkgs/guitarix2/template @@ -1,7 +1,7 @@ # Template file for 'guitarix2' pkgname=guitarix2 version=0.42.1 -revision=1 +revision=2 wrksrc="guitarix-${version}" build_style=waf3 configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust @@ -12,7 +12,7 @@ makedepends="boost-devel eigen fftw-devel gtkmm-devel jack-devel ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel lv2 sratom-devel zita-convolver-devel zita-resampler-devel $(vopt_if avahi avahi-glib-libs-devel) $(vopt_if bluez libbluetooth-devel)" -depends="desktop-file-utils" +depends="desktop-file-utils fonts-roboto-ttf" short_desc="Virtual guitar amplifier running on Jack Audio Connection Kit" maintainer="Orphaned " license="GPL-3.0-or-later" From 351b5fb4556f50da0a8e5f9168223eb2cf096283 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, 26 Aug 2022 17:00:33 +0700 Subject: [PATCH 0754/1407] heaptrack: rebuild for boost-1.80 --- srcpkgs/heaptrack/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template index ed98a952dfdc..0ccc1e6415a7 100644 --- a/srcpkgs/heaptrack/template +++ b/srcpkgs/heaptrack/template @@ -1,7 +1,7 @@ # Template file for 'heaptrack' pkgname=heaptrack version=1.4.0 -revision=1 +revision=2 build_style=cmake configure_args="-DHEAPTRACK_BUILD_GUI=ON" hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons From 26ecbfc58ce4fcb09e810ecc8cc0c6bb18bd43e1 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, 26 Aug 2022 17:00:33 +0700 Subject: [PATCH 0755/1407] hugin: rebuild for boost-1.80 --- srcpkgs/hugin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 73a0822f4e25..72e1439d9933 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2021.0.0 -revision=2 +revision=3 build_style=cmake build_helper=cmake-wxWidgets-gtk3 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates" From 7c829e54bbcc810cfcd386ee0e880c20ae942a16 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, 26 Aug 2022 17:00:33 +0700 Subject: [PATCH 0756/1407] i2pd: rebuild for boost-1.80 --- srcpkgs/i2pd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template index fe12bb2e19bf..522235bebc17 100644 --- a/srcpkgs/i2pd/template +++ b/srcpkgs/i2pd/template @@ -1,7 +1,7 @@ # Template file for 'i2pd' pkgname=i2pd version=2.42.1 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="USE_UPNP=yes" makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel From a35fc66a709ebe005d405fbc3ba71f9b02b51394 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, 26 Aug 2022 17:00:34 +0700 Subject: [PATCH 0757/1407] icinga2: rebuild for boost-1.80 --- srcpkgs/icinga2/patches/cmake-3.15.patch | 45 ++++++++++++++++++++++++ srcpkgs/icinga2/template | 2 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/icinga2/patches/cmake-3.15.patch diff --git a/srcpkgs/icinga2/patches/cmake-3.15.patch b/srcpkgs/icinga2/patches/cmake-3.15.patch new file mode 100644 index 000000000000..5c99e60370cb --- /dev/null +++ b/srcpkgs/icinga2/patches/cmake-3.15.patch @@ -0,0 +1,45 @@ +CMake 3.15 Boost_VERSION to Boost_VERSION_MACRO +and define Boost_VERSION to have dot +--- a/third-party/cmake/BoostTestTargets.cmake ++++ b/third-party/cmake/BoostTestTargets.cmake +@@ -47,11 +47,11 @@ set(BOOST_TEST_TARGET_PREFIX "boosttest" + if(NOT Boost_FOUND) + find_package(Boost 1.34.0 QUIET) + endif() +-if("${Boost_VERSION}0" LESS "1034000") ++if("${Boost_VERSION_MACRO}0" LESS "1034000") + set(_shared_msg + "NOTE: boost::test-based targets and tests cannot " + "be added: boost >= 1.34.0 required but not found. " +- "(found: '${Boost_VERSION}'; want >=103400) ") ++ "(found: '${Boost_VERSION_MACRO}'; want >=103400) ") + if(BUILD_TESTING) + message(FATAL_ERROR + ${_shared_msg} +@@ -67,7 +67,7 @@ endif() + include(GetForceIncludeDefinitions) + include(CopyResourcesToBuildTree) + +-if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000") ++if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000") + set(_boosttesttargets_libs) + set(_boostConfig "BoostTestTargetsIncluded.h") + if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY) +@@ -144,7 +144,7 @@ function(add_boost_test _name) + "Syntax error in use of add_boost_test: at least one source file required!") + endif() + +- if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000") ++ if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000") + + include_directories(${Boost_INCLUDE_DIRS}) + +@@ -236,7 +236,7 @@ function(add_boost_test _name) + set(_test_command ${_target_name}) + endif() + +- if(TESTS AND "${Boost_VERSION}" VERSION_GREATER "103799") ++ if(TESTS AND "${Boost_VERSION_MACRO}" VERSION_GREATER "103799") + foreach(_test ${TESTS}) + add_test(NAME + ${_name}-${_test} diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template index a884892fc49e..4ef7abea2fc3 100644 --- a/srcpkgs/icinga2/template +++ b/srcpkgs/icinga2/template @@ -1,7 +1,7 @@ # Template file for 'icinga2' pkgname=icinga2 version=2.9.3 -revision=6 +revision=7 build_style=cmake build_helper="qemu" configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc From a3fc942cc857832fe00add886c9994b1072e802f 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, 26 Aug 2022 17:00:34 +0700 Subject: [PATCH 0758/1407] imagescan: rebuild for boost-1.80 --- srcpkgs/imagescan/patches/boost-1.80.patch | 15 +++++++++++++++ srcpkgs/imagescan/patches/sane.patch | 11 +++++++++++ srcpkgs/imagescan/template | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/imagescan/patches/boost-1.80.patch create mode 100644 srcpkgs/imagescan/patches/sane.patch diff --git a/srcpkgs/imagescan/patches/boost-1.80.patch b/srcpkgs/imagescan/patches/boost-1.80.patch new file mode 100644 index 000000000000..4425d84a34a5 --- /dev/null +++ b/srcpkgs/imagescan/patches/boost-1.80.patch @@ -0,0 +1,15 @@ +_1 should be looked up via ADL, don't know +--- a/utsushi/functional.hpp ++++ b/utsushi/functional.hpp +@@ -59,6 +59,11 @@ using NAMESPACE::function; + using NAMESPACE::ref; + using NAMESPACE::reference_wrapper; + ++#if __cplusplus >= 201103L && !WITH_INCLUDED_BOOST ++using std::placeholders::_1; ++using std::placeholders::_2; ++#endif ++ + } // namespace utsushi + + #undef NAMESPACE diff --git a/srcpkgs/imagescan/patches/sane.patch b/srcpkgs/imagescan/patches/sane.patch new file mode 100644 index 000000000000..58e220ba786d --- /dev/null +++ b/srcpkgs/imagescan/patches/sane.patch @@ -0,0 +1,11 @@ +--- a/sane/version.hpp ++++ b/sane/version.hpp +@@ -37,7 +37,7 @@ extern "C" { // neede + #include + } + +-#if !((SANE_MAJOR == SANE_CURRENT_MAJOR) && (SANE_MINOR == 0)) ++#if !((SANE_MAJOR == SANE_CURRENT_MAJOR) && (SANE_CURRENT_MINOR == 0)) + #error "SANE installation violates versioning portability constraints." + #endif + diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template index a12adfe05713..152ef2f83b33 100644 --- a/srcpkgs/imagescan/template +++ b/srcpkgs/imagescan/template @@ -1,7 +1,7 @@ # Template file for 'imagescan' pkgname=imagescan version=3.65.0 -revision=1 +revision=2 wrksrc=utsushi-0.65.0 build_style=gnu-configure configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib From 147f2cad6b46c9bbc9499d00572e4283c161403d 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, 26 Aug 2022 17:00:34 +0700 Subject: [PATCH 0759/1407] inkscape: rebuild for boost-1.80 --- srcpkgs/inkscape/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 4d902e663f73..c77236be6848 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape version=1.1.1 -revision=4 +revision=5 wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25" build_style=cmake # builds executables then runs checks From f09fa7c7742ebb3d61de6c2ba1a6ab4c4985937e 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, 26 Aug 2022 17:00:34 +0700 Subject: [PATCH 0760/1407] innoextract: rebuild for boost-1.80 --- srcpkgs/innoextract/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template index 079a8ce1350a..9b8e1e163e55 100644 --- a/srcpkgs/innoextract/template +++ b/srcpkgs/innoextract/template @@ -1,7 +1,7 @@ # Template file for 'innoextract' pkgname=innoextract version=1.9 -revision=1 +revision=2 build_style=cmake configure_args="-DCMAKE_INSTALL_PREFIX=/usr" hostmakedepends="boost extra-cmake-modules" From 9c2c8f2ab4e8eecd26b963aeaeeed23c4e5e0e95 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, 26 Aug 2022 17:00:34 +0700 Subject: [PATCH 0761/1407] juCi++: rebuild for boost-1.80 --- srcpkgs/juCi++/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template index 1a7604b44a00..6f3474154e27 100644 --- a/srcpkgs/juCi++/template +++ b/srcpkgs/juCi++/template @@ -1,7 +1,7 @@ # Template file for 'juCi++' pkgname=juCi++ version=1.6.2 -revision=2 +revision=3 _libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590" _tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5" wrksrc="jucipp-v${version}" @@ -27,7 +27,9 @@ esac post_extract() { mv ${wrksrc}/../libclangmm-${_libclangmm_commit}/* ${wrksrc}/lib/libclangmm/ + rm -rf ${wrksrc}/../libclangmm-${_libclangmm_commit} mv ${wrksrc}/../tiny-process-library-${_tiny_commit}/* ${wrksrc}/lib/tiny-process-library + rm -rf ${wrksrc}/../tiny-process-library-${_tiny_commit}/* } post_install() { From 71ec6a7dbb6d6fd8eb88bec43d4b1e2f365d0e19 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, 26 Aug 2022 17:00:35 +0700 Subject: [PATCH 0762/1407] kea: rebuild for boost-1.80 --- srcpkgs/kea/patches/std.patch | 12 ++++++++++++ srcpkgs/kea/template | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/kea/patches/std.patch diff --git a/srcpkgs/kea/patches/std.patch b/srcpkgs/kea/patches/std.patch new file mode 100644 index 000000000000..a8ccafef6bb9 --- /dev/null +++ b/srcpkgs/kea/patches/std.patch @@ -0,0 +1,12 @@ +--- a/src/lib/dhcpsrv/timer_mgr.cc ++++ b/src/lib/dhcpsrv/timer_mgr.cc +@@ -14,7 +14,9 @@ + + #include + ++#include + #include ++#include + #include + + using namespace isc; diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index dc0bcc5de3fc..a55b58691de9 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -1,7 +1,7 @@ # Template file for 'kea' pkgname=kea version=1.9.5 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr $(vopt_if mysql --with-mysql) From 0bffd6c8485b9e5cbf22e8886fac762f78f29e8f 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, 26 Aug 2022 17:00:35 +0700 Subject: [PATCH 0763/1407] kig: rebuild for boost-1.80 --- srcpkgs/kig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template index 591db4bd477c..748c09f99e59 100644 --- a/srcpkgs/kig/template +++ b/srcpkgs/kig/template @@ -1,7 +1,7 @@ # Template file for 'kig' pkgname=kig version=22.04.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext pkg-config qt5-host-tools qt5-qmake" From 575a20351a341b72348724b28bcc5025c04b5515 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, 26 Aug 2022 17:00:35 +0700 Subject: [PATCH 0764/1407] leatherman: rebuild for boost-1.80 --- .../leatherman/patches/reduce-vendor.patch | 128 ++++++++++++++++++ srcpkgs/leatherman/template | 7 +- 2 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/leatherman/patches/reduce-vendor.patch diff --git a/srcpkgs/leatherman/patches/reduce-vendor.patch b/srcpkgs/leatherman/patches/reduce-vendor.patch new file mode 100644 index 000000000000..4d4dfe525e51 --- /dev/null +++ b/srcpkgs/leatherman/patches/reduce-vendor.patch @@ -0,0 +1,128 @@ +Still vendor rapidjson, facter depends on older API +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,11 +66,10 @@ file(GLOB_RECURSE ALL_LEATHERMAN_SOURCES + add_subdirectory(locales) + + add_leatherman_dir(catch EXCLUDE_FROM_VARS) +-add_leatherman_dir(nowide) + add_leatherman_dir(util) + add_leatherman_dir(locale) + add_leatherman_dir(logging) + add_leatherman_dir(rapidjson) + add_leatherman_dir(json_container) + add_leatherman_dir(file_util) + add_leatherman_dir(curl) +--- a/util/CMakeLists.txt ++++ b/util/CMakeLists.txt +@@ -1,10 +1,8 @@ +-find_package(Boost 1.54 REQUIRED date_time chrono system) ++find_package(Boost 1.54 REQUIRED date_time chrono system nowide) + + add_leatherman_deps(${Boost_LIBRARIES}) + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) +- + if(WIN32) + set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc") + set(PLATFORM_TESTS "tests/windows/environment.cc") +--- a/json_container/CMakeLists.txt ++++ b/json_container/CMakeLists.txt +@@ -1,11 +1,11 @@ +-find_package(Boost 1.54 REQUIRED COMPONENTS regex) ++find_package(Boost 1.54 REQUIRED COMPONENTS regex nowide) + + add_leatherman_deps("${Boost_LIBRARIES}") + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + + leatherman_dependency(rapidjson) + leatherman_dependency(locale) + + add_leatherman_library("src/json_container.cc") + add_leatherman_headers("inc/leatherman") +-add_leatherman_test("tests/json_container_test.cc") +\ No newline at end of file ++add_leatherman_test("tests/json_container_test.cc") +--- a/logging/CMakeLists.txt ++++ b/logging/CMakeLists.txt +@@ -1,10 +1,10 @@ +-find_package(Boost 1.54 REQUIRED COMPONENTS log log_setup thread date_time filesystem system chrono regex) ++find_package(Boost 1.54 REQUIRED COMPONENTS log log_setup thread date_time ++ filesystem system chrono regex nowide) + find_package(Threads) + + add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) + leatherman_dependency(locale) + + if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS") +--- a/execution/CMakeLists.txt ++++ b/execution/CMakeLists.txt +@@ -1,4 +1,4 @@ +-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) ++find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system nowide) + + add_leatherman_deps("${Boost_LIBRARIES}") + if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS") +@@ -10,7 +10,6 @@ endif() + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + + leatherman_dependency(util) +-leatherman_dependency(nowide) + leatherman_dependency(locale) + leatherman_dependency(logging) + leatherman_dependency(file_util) +--- a/file_util/CMakeLists.txt ++++ b/file_util/CMakeLists.txt +@@ -1,9 +1,8 @@ +-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) ++find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system nowide) + + add_leatherman_deps("${Boost_LIBRARIES}") + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) + leatherman_dependency(locale) + leatherman_dependency(logging) + leatherman_dependency(util) +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,4 +1,5 @@ +-set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex) ++set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread ++ filesystem regex nowide) + if (LEATHERMAN_USE_LOCALES) + set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale) + endif() +--- a/file_util/src/file.cc ++++ b/file_util/src/file.cc +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + #include + #include + #include +--- a/util/src/environment.cc ++++ b/util/src/environment.cc +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include + + using namespace std; +--- a/util/tests/environment.cc ++++ b/util/tests/environment.cc +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + + using namespace std; + using namespace leatherman::util; diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template index b61fcd5dc205..3f9d08752dd2 100644 --- a/srcpkgs/leatherman/template +++ b/srcpkgs/leatherman/template @@ -1,7 +1,7 @@ # Template file for 'leatherman' pkgname=leatherman version=1.12.4 -revision=1 +revision=2 build_style=cmake configure_args="-DLEATHERMAN_SHARED=ON" hostmakedepends="pkg-config python3" @@ -16,6 +16,11 @@ python_version=3 CXXFLAGS="-Wno-ignored-qualifiers -Wno-class-memaccess -Wno-catch-value -Wno-deprecated-copy -Wno-type-limits" +do_check() { + cd build + ctest -V +} + leatherman-devel_package() { short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 3b4362ed73f79049f6b3da04f7e8e115c214f32a 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, 26 Aug 2022 17:00:35 +0700 Subject: [PATCH 0765/1407] ledger: rebuild for boost-1.80 --- srcpkgs/ledger/patches/boost-1.80.patch | 30 +++++++++++++++++++++++++ srcpkgs/ledger/template | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ledger/patches/boost-1.80.patch diff --git a/srcpkgs/ledger/patches/boost-1.80.patch b/srcpkgs/ledger/patches/boost-1.80.patch new file mode 100644 index 000000000000..b59161388490 --- /dev/null +++ b/srcpkgs/ledger/patches/boost-1.80.patch @@ -0,0 +1,30 @@ +--- a/src/system.hh.in ++++ b/src/system.hh.in +@@ -134,7 +134,7 @@ + + #include + #include +-#include ++#include + #include + #include + +@@ -184,6 +184,8 @@ + #include + #endif // HAVE_BOOST_REGEX_UNICODE + ++#include ++ + #include + + #include +--- a/src/utils.h ++++ b/src/utils.h +@@ -81,6 +81,7 @@ + + namespace ledger { + using namespace boost; ++ using namespace boost::placeholders; + + typedef std::string string; + typedef std::list strings_list; diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template index c94b72709dea..130c727e7768 100644 --- a/srcpkgs/ledger/template +++ b/srcpkgs/ledger/template @@ -1,7 +1,7 @@ # Template file for 'ledger' pkgname=ledger version=3.2.1 -revision=1 +revision=2 build_style=cmake makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel" short_desc="Double-entry accounting system with a command-line reporting interface" From f455b51006b4e69279f3725b275fc2b079837f34 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, 26 Aug 2022 17:00:36 +0700 Subject: [PATCH 0766/1407] libbitcoin-blockchain: rebuild for boost-1.80 --- srcpkgs/libbitcoin-blockchain/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template index e43ab8b9ede1..09a126e75356 100644 --- a/srcpkgs/libbitcoin-blockchain/template +++ b/srcpkgs/libbitcoin-blockchain/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-blockchain' pkgname=libbitcoin-blockchain version=3.6.0 -revision=6 +revision=7 archs="aarch64* ppc64* x86_64*" build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib From 09ca632fccf5ee15708713b7ae326d3055538e0c 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, 26 Aug 2022 17:00:36 +0700 Subject: [PATCH 0767/1407] libbitcoin-client: rebuild for boost-1.80 --- srcpkgs/libbitcoin-client/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template index 17849cd906d0..35f17b74ae00 100644 --- a/srcpkgs/libbitcoin-client/template +++ b/srcpkgs/libbitcoin-client/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-client' pkgname=libbitcoin-client version=3.6.0 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples" From bf923f27a2ce97e92b7d0cc6d3009946cf4dd322 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, 26 Aug 2022 17:00:36 +0700 Subject: [PATCH 0768/1407] libbitcoin-database: rebuild for boost-1.80 --- srcpkgs/libbitcoin-database/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template index a3c48226ba2d..13cec4fdc3dd 100644 --- a/srcpkgs/libbitcoin-database/template +++ b/srcpkgs/libbitcoin-database/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-database' pkgname=libbitcoin-database version=3.6.0 -revision=6 +revision=7 archs="aarch64* ppc64* x86_64*" build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib From 05f501e0d24142ae7d103243ee1461bfb45585e1 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, 26 Aug 2022 17:00:36 +0700 Subject: [PATCH 0769/1407] libbitcoin-explorer: rebuild for boost-1.80 --- srcpkgs/libbitcoin-explorer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template index a1929f350269..7a5f8368b271 100644 --- a/srcpkgs/libbitcoin-explorer/template +++ b/srcpkgs/libbitcoin-explorer/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-explorer' pkgname=libbitcoin-explorer version=3.6.0 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib From 1dcbec6fa3c2030e3d25cd24d74b88bb3be9ea77 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, 26 Aug 2022 17:00:36 +0700 Subject: [PATCH 0770/1407] libbitcoin-network: rebuild for boost-1.80 --- .../patches/boost-1.80.patch | 76 +++++++++++++++++++ srcpkgs/libbitcoin-network/template | 2 +- 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libbitcoin-network/patches/boost-1.80.patch diff --git a/srcpkgs/libbitcoin-network/patches/boost-1.80.patch b/srcpkgs/libbitcoin-network/patches/boost-1.80.patch new file mode 100644 index 000000000000..fb59ac61723d --- /dev/null +++ b/srcpkgs/libbitcoin-network/patches/boost-1.80.patch @@ -0,0 +1,76 @@ +--- a/src/channel.cpp ++++ b/src/channel.cpp +@@ -147,7 +147,7 @@ void channel::handle_expiration(const co + LOG_DEBUG(LOG_NETWORK) + << "Channel lifetime expired [" << authority() << "]"; + +- stop(error::channel_timeout); ++ stop(error::make_error_code(error::channel_timeout)); + } + + void channel::start_inactivity() +@@ -168,7 +168,7 @@ void channel::handle_inactivity(const co + LOG_DEBUG(LOG_NETWORK) + << "Channel inactivity timeout [" << authority() << "]"; + +- stop(error::channel_timeout); ++ stop(error::make_error_code(error::channel_timeout)); + } + + } // namespace network +--- a/src/proxy.cpp ++++ b/src/proxy.cpp +@@ -150,7 +150,7 @@ void proxy::handle_read_heading(const bo + { + LOG_WARNING(LOG_NETWORK) + << "Invalid heading from [" << authority() << "]"; +- stop(error::bad_stream); ++ stop(error::make_error_code(error::bad_stream)); + return; + } + +@@ -160,7 +160,7 @@ void proxy::handle_read_heading(const bo + LOG_DEBUG(LOG_NETWORK) + << "Invalid heading magic (" << head.magic() << ") from [" + << authority() << "]"; +- stop(error::bad_stream); ++ stop(error::make_error_code(error::bad_stream)); + return; + } + +@@ -170,7 +170,7 @@ void proxy::handle_read_heading(const bo + << "Oversized payload indicated by " << head.command() + << " heading from [" << authority() << "] (" + << head.payload_size() << " bytes)"; +- stop(error::bad_stream); ++ stop(error::make_error_code(error::bad_stream)); + return; + } + +@@ -212,7 +212,7 @@ void proxy::handle_read_payload(const bo + LOG_WARNING(LOG_NETWORK) + << "Invalid " << head.command() << " payload from [" << authority() + << "] bad checksum."; +- stop(error::bad_stream); ++ stop(error::make_error_code(error::bad_stream)); + return; + } + +@@ -250,7 +250,7 @@ void proxy::handle_read_payload(const bo + LOG_WARNING(LOG_NETWORK) + << "Invalid " << head.command() << " payload from [" << authority() + << "] trailing bytes."; +- stop(error::bad_stream); ++ stop(make_error_code(error::bad_stream)); + return; + } + +@@ -333,7 +333,7 @@ void proxy::stop(const code& ec) + + void proxy::stop(const boost_code& ec) + { +- stop(error::boost_to_error_code(ec)); ++ stop(error::make_error_code(error::boost_to_error_code(ec))); + } + + bool proxy::stopped() const diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template index d130facc40de..4f730a814242 100644 --- a/srcpkgs/libbitcoin-network/template +++ b/srcpkgs/libbitcoin-network/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-network' pkgname=libbitcoin-network version=3.6.0 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" From 3359dd5d9aa816463a3a4b3c1008bcba426f794b 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, 26 Aug 2022 17:00:37 +0700 Subject: [PATCH 0771/1407] libbitcoin-node: rebuild for boost-1.80 --- srcpkgs/libbitcoin-node/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template index 23e32624b5cc..ead87310627b 100644 --- a/srcpkgs/libbitcoin-node/template +++ b/srcpkgs/libbitcoin-node/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-node' pkgname=libbitcoin-node version=3.6.0 -revision=6 +revision=7 archs="aarch64* ppc64* x86_64*" build_style=gnu-configure configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions From e070fd4669042fff7175bb1b2375e1506c4b93ef 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, 26 Aug 2022 17:00:37 +0700 Subject: [PATCH 0772/1407] libbitcoin-protocol: rebuild for boost-1.80 --- srcpkgs/libbitcoin-protocol/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template index 838d62cc9ecd..53e2e6520f6a 100644 --- a/srcpkgs/libbitcoin-protocol/template +++ b/srcpkgs/libbitcoin-protocol/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-protocol' pkgname=libbitcoin-protocol version=3.6.0 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" From 9394cd6ec418a70d95c643cc13b1262a3c4fc616 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, 26 Aug 2022 17:00:37 +0700 Subject: [PATCH 0773/1407] libbitcoin-server: rebuild for boost-1.80 --- srcpkgs/libbitcoin-server/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template index fc4988deac2b..70d4c492c5bb 100644 --- a/srcpkgs/libbitcoin-server/template +++ b/srcpkgs/libbitcoin-server/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-server' pkgname=libbitcoin-server version=3.6.0 -revision=6 +revision=7 archs="aarch64* ppc64* x86_64*" build_style=gnu-configure configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions From 275342f661f39676911b521801df7d05b4488ac2 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, 26 Aug 2022 17:00:37 +0700 Subject: [PATCH 0774/1407] libbitcoin-system: rebuild for boost-1.80 --- .../patches/boost-1.80.patch | 79 +++++++++++++++++++ srcpkgs/libbitcoin-system/template | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libbitcoin-system/patches/boost-1.80.patch diff --git a/srcpkgs/libbitcoin-system/patches/boost-1.80.patch b/srcpkgs/libbitcoin-system/patches/boost-1.80.patch new file mode 100644 index 000000000000..2d44e24ea5ab --- /dev/null +++ b/srcpkgs/libbitcoin-system/patches/boost-1.80.patch @@ -0,0 +1,79 @@ +--- a/include/bitcoin/bitcoin/log/file_collector.hpp ++++ b/include/bitcoin/bitcoin/log/file_collector.hpp +@@ -68,14 +68,18 @@ public: + void store_file(boost::filesystem::path const& src_path) override; + + //! Scans the target directory for the files that have already been stored ++ boost::log::sinks::file::scan_result scan_for_files( ++ boost::log::sinks::file::scan_method method, ++ boost::filesystem::path const& pattern) override; + uintmax_t scan_for_files(boost::log::sinks::file::scan_method method, +- boost::filesystem::path const& pattern, unsigned int* counter) override; ++ boost::filesystem::path const& pattern, unsigned int* counter); + + //! The function updates storage restrictions + void update(size_t max_size, size_t min_free_space, size_t max_files); + + //! The function checks if the directory is governed by this collector + bool is_governed(boost::filesystem::path const& dir) const; ++ bool is_in_storage(boost::filesystem::path const & src_path) const override; + + private: + //! Information about a single stored file +--- a/src/log/file_collector.cpp ++++ b/src/log/file_collector.cpp +@@ -357,6 +357,17 @@ void file_collector::store_file(filesyst + + + //! Scans the target directory for the files that have already been stored ++boost::log::sinks::file::scan_result file_collector::scan_for_files( ++ boost::log::sinks::file::scan_method method, ++ filesystem::path const& pattern) ++{ ++ boost::log::sinks::file::scan_result result; ++ unsigned int counter = 0; ++ result.found_count = scan_for_files(method, pattern, &counter); ++ result.last_file_counter = counter; ++ return result; ++} ++ + uintmax_t file_collector::scan_for_files( + boost::log::sinks::file::scan_method method, + filesystem::path const& pattern, unsigned int* counter) +@@ -450,6 +461,15 @@ bool file_collector::is_governed(filesys + return filesystem::equivalent(storage_dir_, dir); + } + ++/* I don't care if this is correct or not */ ++/* upstream removed */ ++bool file_collector::is_in_storage(filesystem::path const& src_path) const ++{ ++ if (!is_governed(src_path.parent_path())) ++ return false; ++ return filesystem::exists(src_path); ++} ++ + filesystem::path file_collector::make_absolute( + filesystem::path const& path) + { +--- a/include/bitcoin/bitcoin/unicode/file_lock.hpp ++++ b/include/bitcoin/bitcoin/unicode/file_lock.hpp +@@ -14,14 +14,11 @@ + #define LIBBITCOIN_INTERPROCESS_FILE_LOCK_HPP + + #include +-#include +-#include ++#include + #include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include + #include + + // Includes from bitcoin/unicode.hpp under _MSC_VER. diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template index 8b03fb248c42..8e6790c3ba66 100644 --- a/srcpkgs/libbitcoin-system/template +++ b/srcpkgs/libbitcoin-system/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-system' pkgname=libbitcoin-system version=3.6.0 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png From 766b5f3694f8daa090b0a98d7ac11e2f7247303d 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, 26 Aug 2022 17:00:38 +0700 Subject: [PATCH 0775/1407] libcmis: rebuild for boost-1.80 --- srcpkgs/libcmis/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template index fac133d5e4d9..43dd0a856122 100644 --- a/srcpkgs/libcmis/template +++ b/srcpkgs/libcmis/template @@ -1,7 +1,7 @@ # Template file for 'libcmis' pkgname=libcmis version=0.5.2 -revision=4 +revision=5 build_style=gnu-configure configure_args="DOCBOOK2MAN=docbook2man --disable-werror" hostmakedepends="pkg-config docbook2x" From 2fefb8686031e470285fac0c0fd83d5c724f4a47 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, 26 Aug 2022 17:00:38 +0700 Subject: [PATCH 0776/1407] libime: rebuild for boost-1.80 --- srcpkgs/libime/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template index a37db9885a48..363bdd93b16d 100644 --- a/srcpkgs/libime/template +++ b/srcpkgs/libime/template @@ -1,7 +1,7 @@ # Template file for 'libime' pkgname=libime version=1.0.13 -revision=1 +revision=2 build_style=cmake build_helper=qemu hostmakedepends="pkg-config gettext extra-cmake-modules python3" From ae5274460e8ac6c0540591f205429ea04bc78e8d 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, 26 Aug 2022 17:00:38 +0700 Subject: [PATCH 0777/1407] libime-jyutping: rebuild for boost-1.80 --- srcpkgs/libime-jyutping/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template index 3c33940ca368..6ae0855c3d7a 100644 --- a/srcpkgs/libime-jyutping/template +++ b/srcpkgs/libime-jyutping/template @@ -1,7 +1,7 @@ # Template file for 'libime-jyutping' pkgname=libime-jyutping version=1.0.4 -revision=1 +revision=2 build_style=cmake build_helper=qemu hostmakedepends="pkg-config gettext extra-cmake-modules python3 libime-utils" From 6b35221ac1ea4e79c9c401e069aaefb3cba62f79 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, 26 Aug 2022 17:00:38 +0700 Subject: [PATCH 0778/1407] libixion: rebuild for boost-1.80 --- srcpkgs/libixion/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template index 37298a8b9427..ef1a00100f53 100644 --- a/srcpkgs/libixion/template +++ b/srcpkgs/libixion/template @@ -1,7 +1,7 @@ # Template file for 'libixion' pkgname=libixion version=0.17.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="boost-devel fmt-devel mdds python3-devel spdlog" From c377182cac87dd5a632996b629d17902e91124ac 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, 26 Aug 2022 17:00:38 +0700 Subject: [PATCH 0779/1407] liborcus: rebuild for boost-1.80 --- srcpkgs/liborcus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template index cf4b938fe37a..7b6b21a26dca 100644 --- a/srcpkgs/liborcus/template +++ b/srcpkgs/liborcus/template @@ -1,7 +1,7 @@ # Template file for 'liborcus' pkgname=liborcus version=0.17.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config python3" makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel" From 6d1956c6b80e679c34e97078fe8a4a1f8bc7a4b0 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, 26 Aug 2022 17:00:39 +0700 Subject: [PATCH 0780/1407] libphonenumber: rebuild for boost-1.80 --- srcpkgs/libphonenumber/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template index 9bef2825781c..05f28c4f5579 100644 --- a/srcpkgs/libphonenumber/template +++ b/srcpkgs/libphonenumber/template @@ -1,7 +1,7 @@ # Template file for 'libphonenumber' pkgname=libphonenumber version=8.12.39 -revision=6 +revision=7 build_wrksrc=cpp build_style=cmake build_helper=qemu From 902e1dbdd68003179259b093f80b12a47f258a84 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, 26 Aug 2022 17:00:39 +0700 Subject: [PATCH 0781/1407] librime: rebuild for boost-1.80 --- srcpkgs/librime/patches/boost-1.76.patch | 111 +++++++++++++++++++++++ srcpkgs/librime/template | 2 +- 2 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/librime/patches/boost-1.76.patch diff --git a/srcpkgs/librime/patches/boost-1.76.patch b/srcpkgs/librime/patches/boost-1.76.patch new file mode 100644 index 000000000000..9c8d75aa5161 --- /dev/null +++ b/srcpkgs/librime/patches/boost-1.76.patch @@ -0,0 +1,111 @@ +From 57cffcd02ac70148e21ce982be834876b3df87db Mon Sep 17 00:00:00 2001 +From: HanatoK +Date: Sat, 1 May 2021 01:04:38 -0500 +Subject: [PATCH] Fix FTBFS. + +Previous boost library (1.75) may implicitly include cmath, but the +latest version (1.76) does not, so the calls to exp are undefined. This +commit include cmath in script_translator.cc and table_translator.cc to +fix the issue (#462). +--- + src/rime/gear/script_translator.cc | 1 + + src/rime/gear/table_translator.cc | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/rime/gear/script_translator.cc b/src/rime/gear/script_translator.cc +index 4a45f05e6..250616593 100644 +--- a/src/rime/gear/script_translator.cc ++++ b/src/rime/gear/script_translator.cc +@@ -8,6 +8,7 @@ + // + #include + #include ++#include + #include + #include + #include +diff --git a/src/rime/gear/table_translator.cc b/src/rime/gear/table_translator.cc +index 162ac0244..c95e5e24b 100644 +--- a/src/rime/gear/table_translator.cc ++++ b/src/rime/gear/table_translator.cc +@@ -6,6 +6,7 @@ + // + #include + #include ++#include + #include + #include + #include +From bc589fd45eca349b7ca408f9b85a85474745abb0 Mon Sep 17 00:00:00 2001 +From: Chen Gong +Date: Sun, 16 Jan 2022 01:06:29 +0800 +Subject: [PATCH] fix: qualify std::exp after including + +As noted in #462, including only guarantees that std::exp is +declared, so calling exp(double) unqualified is not portable. + +Squashed commit with a style change to the original PR: + +commit 8b9d48c0340f3fb82de59a6f7ec71ddfd86a602f +Author: Chen Gong +Date: Sun Jan 16 00:49:47 2022 +0800 + +commit df4fe3ea11e0222426b98e489db36d32856b3361 +Author: Jonathan Wakely +Date: Tue Aug 10 10:18:38 2021 +0100 + +Closes #476 +--- + src/rime/gear/script_translator.cc | 12 ++++++------ + src/rime/gear/table_translator.cc | 8 ++++---- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/rime/gear/script_translator.cc b/src/rime/gear/script_translator.cc +index 250616593..e220aed9c 100644 +--- a/src/rime/gear/script_translator.cc ++++ b/src/rime/gear/script_translator.cc +@@ -488,9 +488,9 @@ void ScriptTranslation::PrepareCandidate() { + start_, + start_ + user_phrase_code_length, + entry); +- cand->set_quality(exp(entry->weight) + +- translator_->initial_quality() + +- (IsNormalSpelling() ? 0.5 : -0.5)); ++ cand->set_quality(std::exp(entry->weight) + ++ translator_->initial_quality() + ++ (IsNormalSpelling() ? 0.5 : -0.5)); + } + else if (phrase_code_length > 0) { + DictEntryIterator& iter = phrase_iter_->second; +@@ -502,9 +502,9 @@ void ScriptTranslation::PrepareCandidate() { + start_, + start_ + phrase_code_length, + entry); +- cand->set_quality(exp(entry->weight) + +- translator_->initial_quality() + +- (IsNormalSpelling() ? 0 : -1)); ++ cand->set_quality(std::exp(entry->weight) + ++ translator_->initial_quality() + ++ (IsNormalSpelling() ? 0 : -1)); + } + candidate_ = cand; + } +diff --git a/src/rime/gear/table_translator.cc b/src/rime/gear/table_translator.cc +index c95e5e24b..97cfc96e5 100644 +--- a/src/rime/gear/table_translator.cc ++++ b/src/rime/gear/table_translator.cc +@@ -81,10 +81,10 @@ an TableTranslation::Peek() { + if (phrase) { + phrase->set_comment(comment); + phrase->set_preedit(preedit_); +- phrase->set_quality(exp(e->weight) + +- options_->initial_quality() + +- (incomplete ? -1 : 0) + +- (is_user_phrase ? 0.5 : 0)); ++ phrase->set_quality(std::exp(e->weight) + ++ options_->initial_quality() + ++ (incomplete ? -1 : 0) + ++ (is_user_phrase ? 0.5 : 0)); + } + return phrase; + } diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template index 5f734c200bd7..7110eeffd3f9 100644 --- a/srcpkgs/librime/template +++ b/srcpkgs/librime/template @@ -1,7 +1,7 @@ # Template file for 'librime' pkgname=librime version=1.7.3 -revision=3 +revision=4 build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON -DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++" From 2ee5b022d756985df9434567bb39a4990268ca97 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, 26 Aug 2022 17:00:39 +0700 Subject: [PATCH 0782/1407] libtorrent-rasterbar: rebuild for boost-1.80 --- srcpkgs/libtorrent-rasterbar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index b1ceddc95282..5aceddec5646 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -2,7 +2,7 @@ # Breaks ABI/API without changing soname, revbump all dependants pkgname=libtorrent-rasterbar version=1.2.14 -revision=2 +revision=3 build_style=cmake configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON -Dpython-bindings=ON" From 34498e97ded0edbc1a9829a54bc7e3ae0d4e4cae 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, 26 Aug 2022 17:00:40 +0700 Subject: [PATCH 0783/1407] linssid: rebuild for boost-1.80 --- srcpkgs/linssid/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template index 937c8a0745e0..09206656186e 100644 --- a/srcpkgs/linssid/template +++ b/srcpkgs/linssid/template @@ -1,7 +1,7 @@ # Template file for 'linssid' pkgname=linssid version=3.6 -revision=4 +revision=5 build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="boost-devel qwt-devel" From f258d4067ab12fa3f603887c7b74412753a85867 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, 26 Aug 2022 17:00:40 +0700 Subject: [PATCH 0784/1407] litecoin: rebuild for boost-1.80 --- srcpkgs/litecoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 3c33d9b0eb8a..7a188c3c9af8 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin version=0.18.1 -revision=7 +revision=8 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-openssl" From 0b786797c4a972a54c72006a181c6c9d102f56a2 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, 26 Aug 2022 17:00:40 +0700 Subject: [PATCH 0785/1407] monero: rebuild for boost-1.80 --- srcpkgs/monero/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index bff62347ebd6..eebce3d0a551 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -1,7 +1,7 @@ # Template file for 'monero' pkgname=monero version=0.17.2.3 -revision=2 +revision=3 _randomx_version="1.1.9" # the revision monero uses as a submodule for the specific version _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c" From e81f28cc77fccf64cf6966b52a0a0c37924fe9e5 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, 26 Aug 2022 17:00:40 +0700 Subject: [PATCH 0786/1407] monero-gui: rebuild for boost-1.80 --- srcpkgs/monero-gui/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index 67ed3273defa..61e5dd9da1b7 100644 --- a/srcpkgs/monero-gui/template +++ b/srcpkgs/monero-gui/template @@ -1,7 +1,7 @@ # Template file for 'monero-gui' pkgname=monero-gui version=0.17.2.3 -revision=1 +revision=2 _monero_version=0.17.2.3 _randomx_version="1.1.9" # the revision monero uses as a submodule for the specific version From d6f9b51bf060367286d88a6c9d1b3db198c68d98 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, 26 Aug 2022 17:00:40 +0700 Subject: [PATCH 0787/1407] mupen64plus: rebuild for boost-1.80 --- srcpkgs/mupen64plus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template index 4984a7f4a777..f4a58a4749cb 100644 --- a/srcpkgs/mupen64plus/template +++ b/srcpkgs/mupen64plus/template @@ -1,7 +1,7 @@ # Template file for 'mupen64plus' pkgname=mupen64plus version=2.5.9 -revision=1 +revision=2 archs="x86_64* i686*" wrksrc="mupen64plus-bundle-src-${version}" hostmakedepends="pkg-config which nasm" From eb88a9d063ecaf58b66c6efa6c4f81145123aae2 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, 26 Aug 2022 17:00:41 +0700 Subject: [PATCH 0788/1407] musikcube: rebuild for boost-1.80 --- srcpkgs/musikcube/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index 2b75cbd976ea..11a3df3dc0aa 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -1,7 +1,7 @@ # Template file for 'musikcube' pkgname=musikcube version=0.98.0 -revision=1 +revision=2 build_style=cmake make_cmd=make configure_args="-DNO_NCURSESW=1 -DENABLE_BUNDLED_TAGLIB=false" From cc1948b4cdd7e47e3603b3632130c8ba9f6b9d29 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, 26 Aug 2022 17:00:41 +0700 Subject: [PATCH 0789/1407] namecoin: rebuild for boost-1.80 --- srcpkgs/namecoin/patches/boost-1.80.patch | 57 +++++++++++++++++++++++ srcpkgs/namecoin/template | 4 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/namecoin/patches/boost-1.80.patch diff --git a/srcpkgs/namecoin/patches/boost-1.80.patch b/srcpkgs/namecoin/patches/boost-1.80.patch new file mode 100644 index 000000000000..5a250af68487 --- /dev/null +++ b/srcpkgs/namecoin/patches/boost-1.80.patch @@ -0,0 +1,57 @@ +--- a/src/names/main.cpp ++++ b/src/names/main.cpp +@@ -365,12 +365,14 @@ ConflictTrackerNotifyEntryRemoved (CName + CNameConflictTracker::CNameConflictTracker (CTxMemPool &p) + : txNameConflicts(std::make_shared>()), pool(p) + { ++ using namespace boost::placeholders; + pool.NotifyEntryRemoved.connect ( + boost::bind (&ConflictTrackerNotifyEntryRemoved, this, _1, _2)); + } + + CNameConflictTracker::~CNameConflictTracker () + { ++ using namespace boost::placeholders; + pool.NotifyEntryRemoved.disconnect ( + boost::bind (&ConflictTrackerNotifyEntryRemoved, this, _1, _2)); + } +--- a/src/wallet/test/init_test_fixture.cpp ++++ b/src/wallet/test/init_test_fixture.cpp +@@ -29,7 +29,7 @@ InitWalletDirTestingSetup::InitWalletDir + fs::create_directories(m_walletdir_path_cases["default"]); + fs::create_directories(m_walletdir_path_cases["custom"]); + fs::create_directories(m_walletdir_path_cases["relative"]); +- std::ofstream f(m_walletdir_path_cases["file"].BOOST_FILESYSTEM_C_STR); ++ std::ofstream f(BOOST_FILESYSTEM_C_STR(m_walletdir_path_cases["file"])); + f.close(); + } + +@@ -41,4 +41,4 @@ InitWalletDirTestingSetup::~InitWalletDi + void InitWalletDirTestingSetup::SetWalletDir(const fs::path& walletdir_path) + { + gArgs.ForceSetArg("-walletdir", walletdir_path.string()); +-} +\ No newline at end of file ++} +--- a/src/wallet/test/db_tests.cpp ++++ b/src/wallet/test/db_tests.cpp +@@ -18,7 +18,7 @@ BOOST_AUTO_TEST_CASE(getwalletenv_file) + std::string test_name = "test_name.dat"; + fs::path datadir = SetDataDir("tempdir"); + fs::path file_path = datadir / test_name; +- std::ofstream f(file_path.BOOST_FILESYSTEM_C_STR); ++ std::ofstream f(BOOST_FILESYSTEM_C_STR(file_path)); + f.close(); + + std::string filename; +--- a/src/fs.cpp ++++ b/src/fs.cpp +@@ -206,7 +206,7 @@ void ofstream::close() + } + #else // __GLIBCXX__ + +-static_assert(sizeof(*fs::path().BOOST_FILESYSTEM_C_STR) == sizeof(wchar_t), ++static_assert(sizeof(BOOST_FILESYSTEM_C_STR(*fs::path())) == sizeof(wchar_t), + "Warning: This build is using boost::filesystem ofstream and ifstream " + "implementations which will fail to open paths containing multibyte " + "characters. You should delete this static_assert to ignore this warning, " diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template index e4cfb3777b71..710cb2c4ceb3 100644 --- a/srcpkgs/namecoin/template +++ b/srcpkgs/namecoin/template @@ -1,7 +1,7 @@ # Template file for 'namecoin' pkgname=namecoin version=0.18.1 -revision=5 +revision=6 wrksrc="${pkgname}-core-nc${version}" build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-static @@ -28,4 +28,6 @@ pre_configure() { post_install() { vlicense COPYING + # They don't bother to rename from bitcoin + rm -rf $DESTDIR/usr/share/man/man1 } From 6d1032e7c8e34789959854e631cd9821fbd166fe 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, 26 Aug 2022 17:00:41 +0700 Subject: [PATCH 0790/1407] ncmpcpp: rebuild for boost-1.80 --- srcpkgs/ncmpcpp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template index 773deb4917d4..72a0d35e5e7f 100644 --- a/srcpkgs/ncmpcpp/template +++ b/srcpkgs/ncmpcpp/template @@ -1,7 +1,7 @@ # Template file for 'ncmpcpp' pkgname=ncmpcpp version=0.9.2 -revision=5 +revision=6 build_style=gnu-configure configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw" From 91197d2cb5031cb4b5b29f74060c6529ceeec3f4 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, 26 Aug 2022 17:00:41 +0700 Subject: [PATCH 0791/1407] nix: rebuild for boost-1.80 --- srcpkgs/nix/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index bb585b6d7d54..e21c94aa2759 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,23 +1,25 @@ # Template file for 'nix' pkgname=nix -version=2.8.1 -revision=1 +version=2.10.3 +revision=2 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 jq" +configure_args="--localstatedir=/nix/var + --with-sandbox-shell=/usr/bin/busybox.static" +hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq + busybox-static" 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 gtest-devel lowdown-devel json-c++" -depends="curl tar xz" +depends="curl tar xz busybox-static" short_desc="Purely functional package manager" -maintainer="Juan RP " +maintainer="Orphaned " 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=6f19455775523fca4ae4096e6a6fc493f577198b968811f7fa77eb1fa5213b43 +checksum=5a8d79714bf04c425f41fdd22e67d4704d2e44c7a760c6c144e5767c6d662413 disable_parallel_build=yes nocross="cross build populates /usr/lib32 with libraries and tries to link against them" From a17a9be5babaef7c25fc808722e2d6e77f5f2171 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, 26 Aug 2022 17:00:42 +0700 Subject: [PATCH 0792/1407] opencamlib: rebuild for boost-1.80 --- srcpkgs/opencamlib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template index 8722aaf9ee64..140315ef3467 100644 --- a/srcpkgs/opencamlib/template +++ b/srcpkgs/opencamlib/template @@ -1,7 +1,7 @@ # Template file for 'opencamlib' pkgname=opencamlib version=2019.07 -revision=3 +revision=4 build_style=cmake configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}" hostmakedepends="python3" From 4f5330acddc341545c3ff18c1c876e677bd5b1b8 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, 26 Aug 2022 17:00:42 +0700 Subject: [PATCH 0793/1407] openimageio: rebuild for boost-1.80 --- srcpkgs/openimageio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 8abf3b05d6a3..bae68ead21e6 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,11 +1,11 @@ # Template file for 'openimageio' pkgname=openimageio version=2.2.15.1 -revision=3 +revision=4 wrksrc="oiio-Release-${version}" build_style=cmake configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1 - -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0" + -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14" hostmakedepends="pkg-config git" makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel From cb6bc30662ea84bce35175289477a35986a88a41 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, 26 Aug 2022 17:00:42 +0700 Subject: [PATCH 0794/1407] openmw: rebuild for boost-1.80 --- srcpkgs/openmw/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template index 581e2cbb081e..9a263c9eae45 100644 --- a/srcpkgs/openmw/template +++ b/srcpkgs/openmw/template @@ -1,7 +1,7 @@ # Template file for 'openmw' pkgname=openmw version=0.47.0 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake # System bullet doesn't use double precision (double precision would break vdrift) From 9bb1f588b43ae5e307751cf77fee74e171d715c5 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, 26 Aug 2022 17:00:42 +0700 Subject: [PATCH 0795/1407] openscad: rebuild for boost-1.80 --- srcpkgs/openscad/patches/boost-1.80.patch | 16 ++++++++++++++++ srcpkgs/openscad/template | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/openscad/patches/boost-1.80.patch diff --git a/srcpkgs/openscad/patches/boost-1.80.patch b/srcpkgs/openscad/patches/boost-1.80.patch new file mode 100644 index 000000000000..5ff43f54c700 --- /dev/null +++ b/srcpkgs/openscad/patches/boost-1.80.patch @@ -0,0 +1,16 @@ +--- a/openscad.pro ++++ b/openscad.pro +@@ -178,9 +178,13 @@ skip-version-check { + + isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config + ++ + # Application configuration + CONFIG += c++std + CONFIG += cgal ++ ++LIBS += -lCGAL -lCGAL_Core -lCGAL_ImageIO ++ + CONFIG += opencsg + CONFIG += glew + CONFIG += boost diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template index 60d45d60615f..a3951a1a2201 100644 --- a/srcpkgs/openscad/template +++ b/srcpkgs/openscad/template @@ -1,7 +1,7 @@ # Template file for 'openscad' pkgname=openscad version=2021.01 -revision=2 +revision=3 build_style=qmake hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools" makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel From 6ac5da9e4894475fd74bf07cbae3c0c173951178 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, 26 Aug 2022 17:00:42 +0700 Subject: [PATCH 0796/1407] openvdb: rebuild for boost-1.80 --- srcpkgs/openvdb/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template index 4957f642552a..24bc2253828b 100644 --- a/srcpkgs/openvdb/template +++ b/srcpkgs/openvdb/template @@ -1,7 +1,7 @@ # Template file for 'openvdb' pkgname=openvdb version=9.0.0 -revision=2 +revision=3 build_style=cmake configure_args="-DOPENVDB_BUILD_VDB_VIEW=1" hostmakedepends="pkg-config" From 38c9e5f23e6459b4df35f583dcba6bba7c35fdca 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, 26 Aug 2022 17:00:43 +0700 Subject: [PATCH 0797/1407] osm2pgsql: rebuild for boost-1.80 --- srcpkgs/osm2pgsql/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template index 1c53c4505047..1d5f71b70140 100644 --- a/srcpkgs/osm2pgsql/template +++ b/srcpkgs/osm2pgsql/template @@ -1,7 +1,7 @@ # Template file for 'osm2pgsql' pkgname=osm2pgsql version=1.6.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="boost" makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel From 867b9f3bfbb682b8b82473409985e581d506fabd 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, 26 Aug 2022 17:00:43 +0700 Subject: [PATCH 0798/1407] poedit: rebuild for boost-1.80 --- srcpkgs/poedit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index f10aaf4c88a2..15cd4b6bae20 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,7 +1,7 @@ # Template file for 'poedit' pkgname=poedit version=3.0.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="pkg-config" From 447c58d16f15aeb9bdf69ab808c8533bc3c57543 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, 26 Aug 2022 17:00:43 +0700 Subject: [PATCH 0799/1407] povray: rebuild for boost-1.80 --- srcpkgs/povray/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template index 30a2baab2039..93ab71f8e0db 100644 --- a/srcpkgs/povray/template +++ b/srcpkgs/povray/template @@ -1,7 +1,7 @@ # Template file for 'povray' pkgname=povray version=3.7.0.8 -revision=5 +revision=6 build_style=gnu-configure _v=${version%.*.*} configure_args="COMPILED_BY=Void --disable-optimiz-arch" From 32d9a87b41a52e60c59f3005613163d6a1df5aeb 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, 26 Aug 2022 17:00:43 +0700 Subject: [PATCH 0800/1407] pulseeffects-legacy: rebuild for boost-1.80 --- .../patches/boost-1.80.patch | 19 +++++++++++++++++++ srcpkgs/pulseeffects-legacy/template | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/pulseeffects-legacy/patches/boost-1.80.patch diff --git a/srcpkgs/pulseeffects-legacy/patches/boost-1.80.patch b/srcpkgs/pulseeffects-legacy/patches/boost-1.80.patch new file mode 100644 index 000000000000..9b96f4ad359a --- /dev/null +++ b/srcpkgs/pulseeffects-legacy/patches/boost-1.80.patch @@ -0,0 +1,19 @@ +--- a/src/general_settings_ui.cpp ++++ b/src/general_settings_ui.cpp +@@ -20,6 +20,7 @@ + #include "general_settings_ui.hpp" + #include + #include ++#include + #include + #include "util.hpp" + +@@ -176,7 +177,7 @@ auto GeneralSettingsUi::on_enable_autost + + if (state) { + if (!boost::filesystem::exists(autostart_file)) { +- boost::filesystem::ofstream ofs{autostart_file}; ++ std::ofstream ofs{autostart_file.native()}; + + ofs << "[Desktop Entry]\n"; + ofs << "Name=PulseEffects\n"; diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template index 585f25a55c8f..121e90e7f7dc 100644 --- a/srcpkgs/pulseeffects-legacy/template +++ b/srcpkgs/pulseeffects-legacy/template @@ -1,7 +1,7 @@ # Template file for 'pulseeffects-legacy' pkgname=pulseeffects-legacy version=4.8.5 -revision=3 +revision=4 wrksrc="easyeffects-${version}" build_style=meson hostmakedepends="itstool pkg-config gettext glib-devel" From 68f6b84bc8be019577a9def4e8e2d82e50ef3537 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, 26 Aug 2022 17:00:44 +0700 Subject: [PATCH 0801/1407] pulseview: rebuild for boost-1.80 --- srcpkgs/pulseview/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template index aaaf69757e0a..1651792206e2 100644 --- a/srcpkgs/pulseview/template +++ b/srcpkgs/pulseview/template @@ -1,7 +1,7 @@ # Template file for 'pulseview' pkgname=pulseview version=0.4.2 -revision=2 +revision=3 build_style=cmake configure_args="-DDISABLE_WERROR=TRUE" hostmakedepends="pkg-config qt5-qmake qt5-host-tools" From 00da7af375a539ccb06a6e447e390a8e0593f8b6 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, 26 Aug 2022 17:00:44 +0700 Subject: [PATCH 0802/1407] remwharead: rebuild for boost-1.80 --- srcpkgs/remwharead/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template index 3e52473f86ce..cd36bd3b9849 100644 --- a/srcpkgs/remwharead/template +++ b/srcpkgs/remwharead/template @@ -1,7 +1,7 @@ # Template file for 'remwharead' pkgname=remwharead version=0.10.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="poco-devel asciidoc pkg-config" makedepends="poco-devel boost-devel" From d94e5f2f28e2ee368a8c1529020f93c26a9eba28 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, 26 Aug 2022 17:00:44 +0700 Subject: [PATCH 0803/1407] rstudio: rebuild for boost-1.80 --- srcpkgs/rstudio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index ad7c1e85cce7..c0354b8130cc 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,7 +1,7 @@ # Template file for 'rstudio' pkgname=rstudio version=1.4.1717 -revision=3 +revision=4 build_style=cmake configure_args="-DRSTUDIO_TARGET=Desktop -DRSTUDIO_USE_SYSTEM_BOOST=ON From 20c574dc5c694567ea4b2838697b539c15d5caf4 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, 26 Aug 2022 17:00:44 +0700 Subject: [PATCH 0804/1407] snapper: rebuild for boost-1.80 --- srcpkgs/snapper/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index bc7bbe5cf84b..85697667ff77 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,7 +1,7 @@ # Template file for 'snapper' pkgname=snapper version=0.10.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d" conf_files="/etc/conf.d/snapper" From f87d11bcb17b8532bf14e25649b2485c239fb537 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, 26 Aug 2022 17:00:45 +0700 Subject: [PATCH 0805/1407] source-highlight: rebuild for boost-1.80 --- srcpkgs/source-highlight/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template index ab56401c64a0..f76c987335af 100644 --- a/srcpkgs/source-highlight/template +++ b/srcpkgs/source-highlight/template @@ -1,7 +1,7 @@ # Template file for 'source-highlight' pkgname=source-highlight version=3.1.9 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --with-bash-completion=/usr/share/bash-completion/completions" From 7aaa51b85ccf382453cb00d9b85416d6d8aaf4a2 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, 26 Aug 2022 17:00:45 +0700 Subject: [PATCH 0806/1407] supercollider: rebuild for boost-1.80 --- srcpkgs/supercollider/patches/boost.patch | 39 +++++++++++++++++++++++ srcpkgs/supercollider/template | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/supercollider/patches/boost.patch diff --git a/srcpkgs/supercollider/patches/boost.patch b/srcpkgs/supercollider/patches/boost.patch new file mode 100644 index 000000000000..db5c874dc463 --- /dev/null +++ b/srcpkgs/supercollider/patches/boost.patch @@ -0,0 +1,39 @@ +From cc873049ff9249a33567e4cbcdeffeb6806a30d6 Mon Sep 17 00:00:00 2001 +From: brianlheim +Date: Tue, 25 Aug 2020 17:14:29 -0500 +Subject: [PATCH] remove workarounds for old boost versions + +we don't need to support boost pre-1.70 anymore, and tcp::socket::executor_type was always the right typealias to use +--- + server/supernova/sc/sc_osc_handler.hpp | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/server/supernova/sc/sc_osc_handler.hpp b/server/supernova/sc/sc_osc_handler.hpp +index f17e99a5573..676c94dbf15 100644 +--- a/server/supernova/sc/sc_osc_handler.hpp ++++ b/server/supernova/sc/sc_osc_handler.hpp +@@ -234,11 +234,7 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer + class tcp_connection : public nova_endpoint { + public: + using pointer = std::shared_ptr; +-#if BOOST_VERSION >= 107000 +- using executor = boost::asio::executor; +-#else +- using executor = boost::asio::io_context::executor_type; +-#endif ++ using executor = tcp::socket::executor_type; + + static pointer create(const executor& executor) { return pointer(new tcp_connection(executor)); } + +@@ -249,11 +245,7 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer + bool operator==(tcp_connection const& rhs) const { return &rhs == this; } + + private: +-#if BOOST_VERSION >= 107000 + tcp_connection(const executor& executor): socket_(executor) {} +-#else +- tcp_connection(const executor& executor): socket_(executor.context()) {} +-#endif + + void send(const char* data, size_t length) override final; + diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index 35f6d9dfb7c2..b0b8278470ef 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -1,7 +1,7 @@ # Template file for 'supercollider' pkgname=supercollider version=3.11.1 -revision=3 +revision=4 wrksrc="SuperCollider-${version}-Source" build_style=cmake make_cmd=make From 6837166dc0d6b687ad482a63b48a8c9d1fdf9315 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, 26 Aug 2022 17:00:45 +0700 Subject: [PATCH 0807/1407] supertux2: rebuild for boost-1.80 --- srcpkgs/supertux2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template index 56057f5837d5..fce60e205a59 100644 --- a/srcpkgs/supertux2/template +++ b/srcpkgs/supertux2/template @@ -1,7 +1,7 @@ # Template file for 'supertux2' pkgname=supertux2 version=0.6.3 -revision=1 +revision=2 wrksrc="SuperTux-v${version}-Source" build_style=cmake configure_args=" From 9104a4faa7b79ffb3ff2a6b34e82977875768fb0 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, 26 Aug 2022 17:00:45 +0700 Subject: [PATCH 0808/1407] swiften: rebuild for boost-1.80 --- srcpkgs/swiften/patches/boost-endian.patch | 15 +++++++++++++++ srcpkgs/swiften/patches/std.patch | 11 +++++++++++ srcpkgs/swiften/template | 4 ++-- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/swiften/patches/boost-endian.patch create mode 100644 srcpkgs/swiften/patches/std.patch diff --git a/srcpkgs/swiften/patches/boost-endian.patch b/srcpkgs/swiften/patches/boost-endian.patch new file mode 100644 index 000000000000..1cd2c2fb4816 --- /dev/null +++ b/srcpkgs/swiften/patches/boost-endian.patch @@ -0,0 +1,15 @@ +--- a/Swiften/Base/Platform.h ++++ b/Swiften/Base/Platform.h +@@ -43,9 +43,9 @@ + #endif + + // Endianness +-#include +-#if defined(BOOST_LITTLE_ENDIAN) ++#include ++#if BOOST_ENDIAN_LITTLE_BYTE + #define SWIFTEN_LITTLE_ENDIAN +-#elif defined(BOOST_BIG_ENDIAN) ++#elif BOOST_ENDIAN_BIG_BYTE + #define SWIFTEN_BIG_ENDIAN + #endif diff --git a/srcpkgs/swiften/patches/std.patch b/srcpkgs/swiften/patches/std.patch new file mode 100644 index 000000000000..9534e8a321d2 --- /dev/null +++ b/srcpkgs/swiften/patches/std.patch @@ -0,0 +1,11 @@ +--- a/Swift/Controllers/ShowProfileController.h ++++ b/Swift/Controllers/ShowProfileController.h +@@ -18,6 +18,8 @@ + + #include + ++#include ++ + namespace Swift { + class VCardManager; + class ProfileWindow; diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template index 969ef1eb5d78..9014153a8818 100644 --- a/srcpkgs/swiften/template +++ b/srcpkgs/swiften/template @@ -1,11 +1,11 @@ # Template file for 'swiften' pkgname=swiften version=4.0.3 -revision=2 +revision=3 wrksrc="swift-${version}" hostmakedepends="scons pkg-config" makedepends="boost-devel openssl-devel libxml2-devel libidn-devel - lua51-devel miniupnpc-devel sqlite-devel" + lua51-devel miniupnpc-devel sqlite-devel hunspell-devel" short_desc="XMPP library for C++" maintainer="John Regan " license="GPL-3.0-only" From cd68a9218cc7bedf5885093c1fe155cd21410be3 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, 26 Aug 2022 17:00:46 +0700 Subject: [PATCH 0809/1407] syncthingtray: rebuild for boost-1.80 --- srcpkgs/syncthingtray/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template index 4f338f2cc200..f445aa92db1e 100644 --- a/srcpkgs/syncthingtray/template +++ b/srcpkgs/syncthingtray/template @@ -1,7 +1,7 @@ # Template file for 'syncthingtray' pkgname=syncthingtray version=1.2.2 -revision=1 +revision=2 build_style=cmake configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF -DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none)" From c42d7d65ad406ef385cd1cd53ad89c08d69994ee 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, 26 Aug 2022 17:00:46 +0700 Subject: [PATCH 0810/1407] tmfs: rebuild for boost-1.80 --- srcpkgs/tmfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template index 1dbed3e0eb72..ed4fb5fed836 100644 --- a/srcpkgs/tmfs/template +++ b/srcpkgs/tmfs/template @@ -1,7 +1,7 @@ # Template file for 'tmfs' pkgname=tmfs version=r5 -revision=7 +revision=8 build_style=cmake hostmakedepends="pkg-config" makedepends="fuse-devel boost-devel" From 5acc59d1f16a3a336530d6fdffc6e166580c9ca3 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, 26 Aug 2022 17:00:46 +0700 Subject: [PATCH 0811/1407] tomahawk: rebuild for boost-1.80 --- srcpkgs/tomahawk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template index 0edbacc5f8ad..b66b9a876a5c 100644 --- a/srcpkgs/tomahawk/template +++ b/srcpkgs/tomahawk/template @@ -1,7 +1,7 @@ # Template file for 'tomahawk' pkgname=tomahawk version=0.8.4 -revision=21 +revision=22 wrksrc=${pkgname}-${_commit} _commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f build_style=cmake From 99a19559c5b98d834dffa1ab05e5946f2bb0b2c3 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, 26 Aug 2022 17:00:46 +0700 Subject: [PATCH 0812/1407] uhd: rebuild for boost-1.80 --- srcpkgs/uhd/patches/boost-math.patch | 31 +++++++++++++++++++++++++++ srcpkgs/uhd/patches/std-complex.patch | 10 +++++++++ srcpkgs/uhd/template | 2 +- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/uhd/patches/boost-math.patch create mode 100644 srcpkgs/uhd/patches/std-complex.patch diff --git a/srcpkgs/uhd/patches/boost-math.patch b/srcpkgs/uhd/patches/boost-math.patch new file mode 100644 index 000000000000..9ac6dae1df9d --- /dev/null +++ b/srcpkgs/uhd/patches/boost-math.patch @@ -0,0 +1,31 @@ +--- a/host/lib/usrp/usrp2/usrp2_impl.cpp ++++ b/host/lib/usrp/usrp2/usrp2_impl.cpp +@@ -18,6 +18,8 @@ + #include //used for htonl and ntohl + #include + #include ++#include ++#include + #include + #include + +--- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp ++++ b/host/lib/usrp/cores/rx_frontend_core_3000.cpp +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + + using namespace uhd; +--- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp ++++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/srcpkgs/uhd/patches/std-complex.patch b/srcpkgs/uhd/patches/std-complex.patch new file mode 100644 index 000000000000..c7573bf4ade2 --- /dev/null +++ b/srcpkgs/uhd/patches/std-complex.patch @@ -0,0 +1,10 @@ +--- a/host/tests/tx_streamer_test.cpp ++++ b/host/tests/tx_streamer_test.cpp +@@ -7,6 +7,7 @@ + #include "../common/mock_link.hpp" + #include + #include ++#include + #include + #include + diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template index 5f043162d7dc..170e12670c2c 100644 --- a/srcpkgs/uhd/template +++ b/srcpkgs/uhd/template @@ -1,7 +1,7 @@ # Template file for 'uhd' pkgname=uhd version=4.0.0.0 -revision=1 +revision=2 build_wrksrc=host build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None" From c6edf93af69fd30da6f0e15d8012d22eb10de15e 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, 26 Aug 2022 17:00:47 +0700 Subject: [PATCH 0813/1407] wesnoth: rebuild for boost-1.80 --- srcpkgs/wesnoth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template index 0fcc09b29c10..4d55d20b5959 100644 --- a/srcpkgs/wesnoth/template +++ b/srcpkgs/wesnoth/template @@ -1,7 +1,7 @@ # Template file for 'wesnoth' pkgname=wesnoth version=1.14.17 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_OMP=1" hostmakedepends="pkg-config gettext" @@ -18,7 +18,7 @@ checksum=3646cba604e09c12d6900a733bcb78cbf05f2f75f05346630d6529c220f584e1 replaces="wesnoth-data>=0" CFLAGS="-UNDEBUG" -CXXFLAGS="-UNDEBUG" +CXXFLAGS="-UNDEBUG -std=c++14" post_install() { # runit service From be299ebd587106baa8728173dbe3d0cf85eed044 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, 26 Aug 2022 17:00:47 +0700 Subject: [PATCH 0814/1407] wsjtx: rebuild for boost-1.80 --- srcpkgs/wsjtx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template index c1838dd7cf51..7324d85bd64d 100644 --- a/srcpkgs/wsjtx/template +++ b/srcpkgs/wsjtx/template @@ -1,7 +1,7 @@ # Template file for 'wsjtx' pkgname=wsjtx version=2.5.4 -revision=1 +revision=2 build_wrksrc=wsjtx build_style=cmake configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE=" From 7c5e84caa66d28c1da954b73717c342e4adfd3d1 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 25 Aug 2022 20:49:38 +0400 Subject: [PATCH 0815/1407] fmt: update to 9.0.0. --- common/shlibs | 2 +- srcpkgs/fmt/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 50e0c005d39e..473d686afdef 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3538,7 +3538,7 @@ libcotp.so.12 libcotp-1.2.1_1 libunarr.so.1 libunarr-1.0.1_1 libretro-gtk-1.so.0 retro-gtk-1.0.0_1 libmanette-0.2.so.0 libmanette-0.2.1_1 -libfmt.so.8 fmt-8.0.1_1 +libfmt.so.9 fmt-9.0.0_1 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1 libolm.so.3 olm-3.0.0_1 libtls.so.25 libtls-3.5.2_1 diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template index 35a914c75eab..6fa037dfbaab 100644 --- a/srcpkgs/fmt/template +++ b/srcpkgs/fmt/template @@ -1,6 +1,6 @@ # Template file for 'fmt' pkgname=fmt -version=8.1.1 +version=9.0.0 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF" @@ -10,7 +10,7 @@ license="BSD-2-Clause" homepage="https://github.com/fmtlib/fmt" changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst" distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz" -checksum=3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346 +checksum=9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5 post_install() { vlicense LICENSE.rst LICENSE From 73f34ed9543b45c262aece9aa0cf9791802a9e5b Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 25 Aug 2022 19:55:33 +0400 Subject: [PATCH 0816/1407] Bear: update to 3.0.20. --- srcpkgs/Bear/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template index fce6309ca6fa..c6c1fb6e9c38 100644 --- a/srcpkgs/Bear/template +++ b/srcpkgs/Bear/template @@ -1,7 +1,7 @@ # Template file for 'Bear' pkgname=Bear -version=3.0.19 -revision=2 +version=3.0.20 +revision=1 build_style=cmake hostmakedepends="pkg-config protobuf protobuf-devel grpc" makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://github.com/rizsotto/Bear" distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=2fcfe2c6e029182cfc54ed26b3505c0ef12b0f43df03fb587f335afdc2ca9431 +checksum=45cfcdab07f824f6c06c9776701156f7a04b23eadd25ecbc88c188789a447cc7 conflicts="interception-tools>=0" # /usr/bin/intercept if [ -z "$XBPS_CHECK_PKGS" ]; then From 8f7a963507a1351fbf67af8d1b6731acdad32ea3 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 25 Aug 2022 19:55:33 +0400 Subject: [PATCH 0817/1407] cherrytree: revbump for fmt 9.0 --- srcpkgs/cherrytree/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template index 55512e3b5ef7..e52a677a47b5 100644 --- a/srcpkgs/cherrytree/template +++ b/srcpkgs/cherrytree/template @@ -1,7 +1,7 @@ # Template file for 'cherrytree' pkgname=cherrytree version=0.99.39 -revision=2 +revision=3 wrksrc="${pkgname}_${version}" build_style=cmake hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel" From 3fcfca827a138bb29bdf731198892ca900a1d4b8 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 25 Aug 2022 19:55:33 +0400 Subject: [PATCH 0818/1407] coeurl: revbump for fmt 9.0 --- srcpkgs/coeurl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template index d0dbcbc60ba0..a9f2dfbbc123 100644 --- a/srcpkgs/coeurl/template +++ b/srcpkgs/coeurl/template @@ -1,7 +1,7 @@ # Template file for 'coeurl' pkgname=coeurl version=0.1.1 -revision=1 +revision=2 wrksrc=coeurl-v${version} build_style=meson hostmakedepends="pkg-config" From f0faa1d9897cabef936372c951dcabad0b74df03 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 25 Aug 2022 19:55:34 +0400 Subject: [PATCH 0819/1407] easyeffects: revbump for fmt 9.0 --- srcpkgs/easyeffects/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template index ac84ce15b068..0ddfb1b5833d 100644 --- a/srcpkgs/easyeffects/template +++ b/srcpkgs/easyeffects/template @@ -1,7 +1,7 @@ # Template file for 'easyeffects' pkgname=easyeffects version=6.2.4 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config gettext itstool glib-devel" makedepends="gtkmm4-devel pipewire-devel zita-convolver-devel lilv-devel From ae84cc4fc2064491c0f444fe4855c4c08c27ba24 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 25 Aug 2022 19:55:34 +0400 Subject: [PATCH 0820/1407] gerbera: revbump for fmt 9.0, add patch --- srcpkgs/gerbera/patches/fmt-9-fix.patch | 32 +++++++++++++++++++++++++ srcpkgs/gerbera/template | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gerbera/patches/fmt-9-fix.patch diff --git a/srcpkgs/gerbera/patches/fmt-9-fix.patch b/srcpkgs/gerbera/patches/fmt-9-fix.patch new file mode 100644 index 000000000000..7adedf9005db --- /dev/null +++ b/srcpkgs/gerbera/patches/fmt-9-fix.patch @@ -0,0 +1,32 @@ +From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Fri, 19 Aug 2022 15:22:10 +0300 +Subject: [PATCH] Fix build with fmt 9.0 + +Fixes #2681 +--- + src/database/sql_format.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/database/sql_format.h b/src/database/sql_format.h +index 32dc00efa..e4e1909a8 100644 +--- a/src/database/sql_format.h ++++ b/src/database/sql_format.h +@@ -42,7 +42,7 @@ struct SQLIdentifier { + template <> + struct fmt::formatter : formatter { + template +- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end); + } +@@ -61,7 +61,7 @@ struct ColumnUpdate { + template <> + struct fmt::formatter : formatter { + template +- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{} = {}", a.column, a.value); + } diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template index 35136708b3e5..100b94a7acbe 100644 --- a/srcpkgs/gerbera/template +++ b/srcpkgs/gerbera/template @@ -1,7 +1,7 @@ # Template file for 'gerbera' pkgname=gerbera version=1.11.0 -revision=2 +revision=3 build_style=cmake configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1" hostmakedepends="pkg-config" From 20b41355337f2b2d7f479a205a594f9a9b25ab62 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, 1 Sep 2022 01:19:36 +0700 Subject: [PATCH 0821/1407] kodi: revbump for fmt 9.0 --- srcpkgs/kodi/patches/fmt-9.patch | 44 ++++++++++++++++++++++++++++++++ srcpkgs/kodi/template | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/kodi/patches/fmt-9.patch diff --git a/srcpkgs/kodi/patches/fmt-9.patch b/srcpkgs/kodi/patches/fmt-9.patch new file mode 100644 index 000000000000..aba5f9b67b56 --- /dev/null +++ b/srcpkgs/kodi/patches/fmt-9.patch @@ -0,0 +1,44 @@ +The original type is const unsigned char * +--- a/xbmc/windowing/X11/WinSystemX11.cpp ++++ b/xbmc/windowing/X11/WinSystemX11.cpp +@@ -1038,7 +1038,7 @@ bool CWinSystemX11::HasWindowManager() + + if(status == Success && items_read) + { +- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data); ++ CLog::Log(LOGDEBUG,"Window Manager Name: %s", (char *)data); + } + else + CLog::Log(LOGDEBUG,"Window Manager Name: "); +--- a/xbmc/utils/GLUtils.cpp ++++ b/xbmc/utils/GLUtils.cpp +@@ -152,25 +152,25 @@ void LogGraphicsInfo() + + s = glGetString(GL_VENDOR); + if (s) +- CLog::Log(LOGINFO, "GL_VENDOR = %s", s); ++ CLog::Log(LOGINFO, "GL_VENDOR = %s", (char *)(s)); + else + CLog::Log(LOGINFO, "GL_VENDOR = NULL"); + + s = glGetString(GL_RENDERER); + if (s) +- CLog::Log(LOGINFO, "GL_RENDERER = %s", s); ++ CLog::Log(LOGINFO, "GL_RENDERER = %s", (char *)(s)); + else + CLog::Log(LOGINFO, "GL_RENDERER = NULL"); + + s = glGetString(GL_VERSION); + if (s) +- CLog::Log(LOGINFO, "GL_VERSION = %s", s); ++ CLog::Log(LOGINFO, "GL_VERSION = %s", (char *)(s)); + else + CLog::Log(LOGINFO, "GL_VERSION = NULL"); + + s = glGetString(GL_SHADING_LANGUAGE_VERSION); + if (s) +- CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s); ++ CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", (char *)(s)); + else + CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = NULL"); + diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index d3e9a13afdd5..4b6c9e1ade0c 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=19.4 -revision=3 +revision=4 _codename="Matrix" wrksrc="xbmc-${version}-${_codename}" build_style=cmake From f3a61a1b0bfd1f1025eed869a655693ab24c9af6 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 25 Aug 2022 19:55:34 +0400 Subject: [PATCH 0822/1407] MangoHud: revbump for fmt 9.0 --- srcpkgs/MangoHud/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template index a9973bcad30a..fb0e18c1a1f4 100644 --- a/srcpkgs/MangoHud/template +++ b/srcpkgs/MangoHud/template @@ -2,7 +2,7 @@ pkgname=MangoHud version=0.6.7.1 _version="${version%.*}-${version##*.}" -revision=2 +revision=3 wrksrc="MangoHud-v${_version}" build_style=meson configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled From 87dbdd285a4bb376690b21bfb8ec1d879e2dc958 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 25 Aug 2022 19:55:35 +0400 Subject: [PATCH 0823/1407] mkvtoolnix: revbump for fmt 9.0 --- srcpkgs/mkvtoolnix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index a1d2adbc4b3f..d98022773c0a 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,7 +1,7 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix version=70.0.0 -revision=1 +revision=2 build_style=gnu-configure build_helper=qmake configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt From 78fbd79d4df878ae87e7d33a435fdd6a14b2fcd1 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 25 Aug 2022 19:55:35 +0400 Subject: [PATCH 0824/1407] mpd: revbump for fmt 9.0 --- srcpkgs/mpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index 98195b80a38d..b43c83fbb0f7 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd version=0.23.8 -revision=1 +revision=2 build_style=meson configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled From a475c040c793b8bca66f3cdf4f16fb96925ab743 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 25 Aug 2022 19:55:35 +0400 Subject: [PATCH 0825/1407] mtxclient: revbump for fmt 9.0 --- srcpkgs/mtxclient/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template index 4ec895656749..12fea54d3fd5 100644 --- a/srcpkgs/mtxclient/template +++ b/srcpkgs/mtxclient/template @@ -1,7 +1,7 @@ # Template file for 'mtxclient' pkgname=mtxclient version=0.8.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF" hostmakedepends="pkg-config" From bd481003c8ceaf5bce643f78bc109114e151dbc1 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 25 Aug 2022 19:55:35 +0400 Subject: [PATCH 0826/1407] nheko: revbump for fmt 9.0 --- srcpkgs/nheko/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template index f35fd3942116..8e41e9e1f2f0 100644 --- a/srcpkgs/nheko/template +++ b/srcpkgs/nheko/template @@ -1,7 +1,7 @@ # Template file for 'nheko' pkgname=nheko version=0.10.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc" makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel From d8bb8ca5fa369dec466263e985070b57ba524448 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 25 Aug 2022 19:55:35 +0400 Subject: [PATCH 0827/1407] spdlog: revbump for fmt 9.0 --- srcpkgs/spdlog/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template index 187ec0d0eb6e..ef1ee76ffcca 100644 --- a/srcpkgs/spdlog/template +++ b/srcpkgs/spdlog/template @@ -1,7 +1,7 @@ # Template file for 'spdlog' pkgname=spdlog version=1.10.0 -revision=1 +revision=2 build_style=cmake configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON -DSPDLOG_BUILD_SHARED=ON" From 23971719de8f37df00b66a8fa921aa6dcbe268d6 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, 1 Sep 2022 01:20:15 +0700 Subject: [PATCH 0828/1407] Waybar: revbump for fmt 9.0 --- srcpkgs/Waybar/patches/fmt-9.patch | 180 +++++++++++++++++++++++++++++ srcpkgs/Waybar/template | 2 +- 2 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/Waybar/patches/fmt-9.patch diff --git a/srcpkgs/Waybar/patches/fmt-9.patch b/srcpkgs/Waybar/patches/fmt-9.patch new file mode 100644 index 000000000000..d9a6aae3edf1 --- /dev/null +++ b/srcpkgs/Waybar/patches/fmt-9.patch @@ -0,0 +1,180 @@ +From 24a8332b62b5c1c8d480116655ce9c582d1f4516 Mon Sep 17 00:00:00 2001 +From: Aleksei Bavshin +Date: Mon, 11 Jul 2022 22:52:33 -0700 +Subject: [PATCH 1/3] fix: adapt to fmt 9.0.0 breaking changes + +--- + include/util/json.hpp | 8 ++++++++ + src/client.cpp | 2 +- + src/config.cpp | 1 - + src/modules/sni/host.cpp | 1 - + src/modules/sway/bar.cpp | 1 - + 5 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/include/util/json.hpp b/include/util/json.hpp +index cc514e139..7cd43552b 100644 +--- a/include/util/json.hpp ++++ b/include/util/json.hpp +@@ -1,7 +1,15 @@ + #pragma once + ++#include + #include + ++#if (FMT_VERSION >= 90000) ++ ++template <> ++struct fmt::formatter : ostream_formatter {}; ++ ++#endif ++ + namespace waybar::util { + + struct JsonParser { +diff --git a/src/client.cpp b/src/client.cpp +index be2ec9178..a815e2fe1 100644 +--- a/src/client.cpp ++++ b/src/client.cpp +@@ -1,12 +1,12 @@ + #include "client.hpp" + +-#include + #include + + #include + + #include "idle-inhibit-unstable-v1-client-protocol.h" + #include "util/clara.hpp" ++#include "util/format.hpp" + #include "wlr-layer-shell-unstable-v1-client-protocol.h" + + waybar::Client *waybar::Client::inst() { +diff --git a/src/config.cpp b/src/config.cpp +index 5894cb6b1..dec3b50b2 100644 +--- a/src/config.cpp ++++ b/src/config.cpp +@@ -1,6 +1,5 @@ + #include "config.hpp" + +-#include + #include + #include + #include +diff --git a/src/modules/sni/host.cpp b/src/modules/sni/host.cpp +index 560d7368b..007862dcc 100644 +--- a/src/modules/sni/host.cpp ++++ b/src/modules/sni/host.cpp +@@ -1,6 +1,5 @@ + #include "modules/sni/host.hpp" + +-#include + #include + + namespace waybar::modules::SNI { +diff --git a/src/modules/sway/bar.cpp b/src/modules/sway/bar.cpp +index 26234e3b5..f28b05025 100644 +--- a/src/modules/sway/bar.cpp ++++ b/src/modules/sway/bar.cpp +@@ -1,6 +1,5 @@ + #include "modules/sway/bar.hpp" + +-#include + #include + + #include + +From 3117aefdf3e0bcae6671ab4669241c934bc9ec50 Mon Sep 17 00:00:00 2001 +From: Aleksei Bavshin +Date: Tue, 12 Jul 2022 22:20:49 -0700 +Subject: [PATCH 2/3] fix: drop conditionals for ancient fmt versions + +--- + include/modules/keyboard_state.hpp | 5 ----- + include/modules/simpleclock.hpp | 6 +----- + src/modules/clock.cpp | 9 ++------- + 3 files changed, 3 insertions(+), 17 deletions(-) + +diff --git a/include/modules/keyboard_state.hpp b/include/modules/keyboard_state.hpp +index 6af19d145..05fbec131 100644 +--- a/include/modules/keyboard_state.hpp ++++ b/include/modules/keyboard_state.hpp +@@ -1,11 +1,6 @@ + #pragma once + +-#include +-#if FMT_VERSION < 60000 +-#include +-#else + #include +-#endif + #include + + #include "AModule.hpp" +diff --git a/include/modules/simpleclock.hpp b/include/modules/simpleclock.hpp +index aa9a0a224..5cbee4c6c 100644 +--- a/include/modules/simpleclock.hpp ++++ b/include/modules/simpleclock.hpp +@@ -1,11 +1,7 @@ + #pragma once + +-#include +-#if FMT_VERSION < 60000 +-#include +-#else + #include +-#endif ++ + #include "ALabel.hpp" + #include "util/sleeper_thread.hpp" + +diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp +index 959cad903..467536e1e 100644 +--- a/src/modules/clock.cpp ++++ b/src/modules/clock.cpp +@@ -1,15 +1,10 @@ + #include "modules/clock.hpp" + +-#include +- +-#include +-#if FMT_VERSION < 60000 +-#include +-#else + #include +-#endif ++#include + + #include ++#include + #include + #include + + +From a44622aa9ff4b85c5eeb54663ecf9d7fe617bc08 Mon Sep 17 00:00:00 2001 +From: Aleksei Bavshin +Date: Wed, 13 Jul 2022 22:34:29 -0700 +Subject: [PATCH 3/3] fix: fmt 9.x deprecation warning for implicit enum + conversions + +--- + src/modules/mpd/state.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/modules/mpd/state.cpp b/src/modules/mpd/state.cpp +index 4d1e8c91b..aa1a18f8e 100644 +--- a/src/modules/mpd/state.cpp ++++ b/src/modules/mpd/state.cpp +@@ -10,6 +10,13 @@ namespace waybar::modules { + } // namespace waybar::modules + #endif + ++#if FMT_VERSION >= 90000 ++/* Satisfy fmt 9.x deprecation of implicit conversion of enums to int */ ++auto format_as(enum mpd_idle val) { ++ return static_cast>(val); ++} ++#endif ++ + namespace waybar::modules::detail { + + #define IDLE_RUN_NOIDLE_AND_CMD(...) \ diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template index 8ac3d4290b39..e40288e00b75 100644 --- a/srcpkgs/Waybar/template +++ b/srcpkgs/Waybar/template @@ -1,7 +1,7 @@ # Template file for 'Waybar' pkgname=Waybar version=0.9.13 -revision=1 +revision=2 _date_version=3.0.0 build_style=meson configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled From 54405ad423fe72b1314ad59147d5453250989a28 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, 30 Aug 2022 22:35:02 +0700 Subject: [PATCH 0829/1407] libreoffice: rebuild for boost-1.80 --- srcpkgs/libreoffice/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 158df0f30ebc..cc00e88157d0 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice version=7.3.3.2 -revision=3 +revision=4 build_style=meta make_build_target="build-nocheck" nocross="Several dependencies are nocross=yes" From e9ea26fa6648a4743a5c671403273403a6022c93 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, 1 Sep 2022 08:21:06 +0700 Subject: [PATCH 0830/1407] schroot: rebuild for boost-1.80 --- srcpkgs/schroot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template index fd9ff15c7140..1a6dfe8ef1a0 100644 --- a/srcpkgs/schroot/template +++ b/srcpkgs/schroot/template @@ -2,7 +2,7 @@ pkgname=schroot reverts="1.7.2_9" version=1.6.10 -revision=12 +revision=13 _debian_version=12+deb11u1 build_style=cmake configure_args=" From a9043601e050de5b5c3269a86db3dfa733649e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 24 Aug 2022 08:53:46 +0700 Subject: [PATCH 0831/1407] cmake: update to 3.24.1. --- srcpkgs/cmake/template | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index b19395670af3..bb2ea304dbdf 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,6 +1,6 @@ # Template file for 'cmake' pkgname=cmake -version=3.22.2 +version=3.24.1 revision=1 build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake @@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause, ICU" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced +checksum=4931e277a4db1a805f13baa7013a7757a0cbfe5b7932882925c7061d9d1fa82b replaces="cmake-bootstrap>=0" pre_configure() { @@ -39,6 +39,12 @@ pre_configure() { PATH="${wrksrc}/build/Bootstrap.cmk:$PATH" } +do_check() { + cd build + # https://gitlab.kitware.com/cmake/cmake/-/issues/23885 + ./bin/ctest -E RunCMake.SymlinkTrees +} + post_install() { rm -rf ${DESTDIR}/usr/share/doc/cmake sed -n -e '/Copyright/,/authorization[.]/p' \ From f8af9eea191ef771de41f49f6ccc0db043340c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 24 Aug 2022 08:53:49 +0700 Subject: [PATCH 0832/1407] cmake-gui: update to 3.24.1. --- srcpkgs/cmake-gui/template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index 8333cc703569..7ff8a9b42265 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -1,11 +1,11 @@ # Template file for 'cmake-gui' pkgname=cmake-gui -version=3.22.2 +version=3.24.1 revision=1 wrksrc="cmake-${version}" build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake - -DSPHINX_MAN=1 -DCMAKE_MAN_DIR=/share/man -DQT_HOST_PATH=/usr + -DSPHINX_MAN=1 -DCMAKE_MAN_DIR=/share/man -DBUILD_QtDialog=ON -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" hostmakedepends="qt6-base-devel python3-Sphinx" makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel @@ -17,7 +17,13 @@ maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz" -checksum=3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced +checksum=4931e277a4db1a805f13baa7013a7757a0cbfe5b7932882925c7061d9d1fa82b + +do_check() { + cd build + # https://gitlab.kitware.com/cmake/cmake/-/issues/23885 + ctest -E RunCMake.SymlinkTrees +} do_install() { # We are only interested in cmake-gui. From 2d8977f2b95632432bd7fcf07f2cdece347b6a03 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, 1 Sep 2022 09:06:33 +0700 Subject: [PATCH 0833/1407] libphonenumber: devel depends on protobuf-devel --- srcpkgs/libphonenumber/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template index 05f28c4f5579..cd01943a4e7f 100644 --- a/srcpkgs/libphonenumber/template +++ b/srcpkgs/libphonenumber/template @@ -1,7 +1,7 @@ # Template file for 'libphonenumber' pkgname=libphonenumber version=8.12.39 -revision=7 +revision=8 build_wrksrc=cpp build_style=cmake build_helper=qemu @@ -16,7 +16,7 @@ distfiles="https://github.com/google/libphonenumber/archive/refs/tags/v${version checksum=ff16330f130917e42bc0b1a7efe5e4fba46633bfa62e35268acec855e17e385c libphonenumber-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} protobuf-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From fe9d63d14d5c07875dfa507e47bf2239695d5195 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, 1 Sep 2022 09:32:39 +0700 Subject: [PATCH 0834/1407] yoshimi: Do not need boost-devel --- srcpkgs/yoshimi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template index 5b075d6036e2..95c7f262a803 100644 --- a/srcpkgs/yoshimi/template +++ b/srcpkgs/yoshimi/template @@ -6,7 +6,7 @@ build_wrksrc=src build_style=cmake configure_args="-DCMAKE_INSTALL_DATAROOTDIR=/usr/share" hostmakedepends="pkg-config fltk" -makedepends="boost-devel jack-devel fltk-devel fftw-devel mxml-devel cairo-devel +makedepends="jack-devel fltk-devel fftw-devel mxml-devel cairo-devel lv2 readline-devel ncurses-devel" short_desc="ZynAddSubFX fork with improved JACK audio & MIDI IO" maintainer="Andrea Brancaleoni " From d43e39a935b241972338edffeb584c2df6ce1186 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, 1 Sep 2022 09:32:39 +0700 Subject: [PATCH 0835/1407] adriconf: Do not need boost-devel --- srcpkgs/adriconf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/adriconf/template b/srcpkgs/adriconf/template index c559d5b33f98..e2d348747563 100644 --- a/srcpkgs/adriconf/template +++ b/srcpkgs/adriconf/template @@ -6,7 +6,7 @@ wrksrc="${pkgname}-v${version}" build_style=cmake configure_args="-DENABLE_UNIT_TESTS=false" hostmakedepends="pkg-config glib-devel gettext" -makedepends="MesaLib-devel gtkmm-devel boost-devel pugixml-devel pciutils-devel gtest-devel" +makedepends="MesaLib-devel gtkmm-devel pugixml-devel pciutils-devel gtest-devel" short_desc="Advanced DRI Configurator" maintainer="lemmi " license="GPL-3.0-or-later" From a6df028678331fdcdef7a78582335c1ca70a68e8 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, 1 Sep 2022 09:32:39 +0700 Subject: [PATCH 0836/1407] kgpg: Do not need boost-devel --- srcpkgs/kgpg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kgpg/template b/srcpkgs/kgpg/template index f837f1e425d6..8b3731091fc5 100644 --- a/srcpkgs/kgpg/template +++ b/srcpkgs/kgpg/template @@ -9,7 +9,7 @@ makedepends="kwindowsystem-devel kcrash-devel kdbusaddons-devel kiconthemes-devel kjobwidgets-devel kio-devel kservice-devel ktextwidgets-devel kxmlgui-devel kwidgetsaddons-devel knotifications-devel kdoctools-devel - akonadi-contacts-devel kcontacts-devel boost-devel" + akonadi-contacts-devel kcontacts-devel" depends="gnupg" checkdepends="gnupg" short_desc="Simple interface for GnuPG, a powerful encryption utility" From 798160792717aeaf7b1fabefd7f03d61eff64918 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, 1 Sep 2022 09:32:39 +0700 Subject: [PATCH 0837/1407] kwallet: Do not need boost-devel --- srcpkgs/kwallet/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template index 27dd1746a7d3..304f480dcb50 100644 --- a/srcpkgs/kwallet/template +++ b/srcpkgs/kwallet/template @@ -7,7 +7,7 @@ configure_args="-DBUILD_TESTING=ON" hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-host-tools qt5-qmake python3 kdoctools" makedepends="kdoctools-devel gpgmepp-devel libgcrypt-devel - kservice-devel knotifications-devel kiconthemes-devel boost-devel" + kservice-devel knotifications-devel kiconthemes-devel" short_desc="KDE Safe desktop-wide storage for passwords" maintainer="John " license="LGPL-2.1-or-later" From 6dce5619d22ca0749693d8b996ee0d816cb3a464 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, 1 Sep 2022 10:32:47 +0700 Subject: [PATCH 0838/1407] common/shlib: fix for boost-python --- common/shlibs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/shlibs b/common/shlibs index 473d686afdef..21a43eac0a7d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -652,7 +652,7 @@ libboost_fiber.so.1.80.0 libboost_fiber1.80-1.80.0_1 libboost_stacktrace_noop.so.1.80.0 libboost_stacktrace_noop1.80-1.80.0_1 libboost_stacktrace_addr2line.so.1.80.0 libboost_stacktrace_addr2line1.80-1.80.0_1 libboost_stacktrace_basic.so.1.80.0 libboost_stacktrace_basic1.80-1.80.0_1 -libboost_python310.so.1.80.0 boost-python3-1.80-1.80.0_6 +libboost_python310.so.1.80.0 boost-python3-1.80-1.80.0_1 libexempi.so.8 exempi-2.5.0_1 libatasmart.so.4 libatasmart-0.17_1 libsgutils2-1.45.so.2 libsgutils-1.45_1 From e15bd869dee099879646ddca56c2015f99bc0aea 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, 1 Sep 2022 10:37:19 +0700 Subject: [PATCH 0839/1407] freecad: rebuild for boost-python3-1.80 shlib --- srcpkgs/freecad/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index 843d2281f324..f568808bb356 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad version=0.20.1 -revision=2 +revision=3 wrksrc="FreeCAD-${version}" build_style=cmake From 7d3b166a53a885de1e71b2425ab444e65b806b4d 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, 1 Sep 2022 10:37:19 +0700 Subject: [PATCH 0840/1407] freeorion: rebuild for boost-python3-1.80 shlib --- srcpkgs/freeorion/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template index 71d41f3e987b..1b2644d09618 100644 --- a/srcpkgs/freeorion/template +++ b/srcpkgs/freeorion/template @@ -1,7 +1,7 @@ # Template file for 'freeorion' pkgname=freeorion version=0.4.10.2 -revision=2 +revision=3 _release=${version}_2021-08-01.f663dad wrksrc=src-tarball build_style=cmake From 518dad7a531e5b9303d295430a03a6f3f08fb295 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, 1 Sep 2022 10:37:20 +0700 Subject: [PATCH 0841/1407] kig: rebuild for boost-python3-1.80 shlib --- srcpkgs/kig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template index 748c09f99e59..49b55e87dc37 100644 --- a/srcpkgs/kig/template +++ b/srcpkgs/kig/template @@ -1,7 +1,7 @@ # Template file for 'kig' pkgname=kig version=22.04.3 -revision=2 +revision=3 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext pkg-config qt5-host-tools qt5-qmake" From 11b8d8957fccecdb23acfc7393322cbc793e5a7f 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, 1 Sep 2022 10:37:20 +0700 Subject: [PATCH 0842/1407] libtorrent-rasterbar: rebuild for boost-python3-1.80 shlib --- srcpkgs/libtorrent-rasterbar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index 5aceddec5646..27da1199ee38 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -2,7 +2,7 @@ # Breaks ABI/API without changing soname, revbump all dependants pkgname=libtorrent-rasterbar version=1.2.14 -revision=3 +revision=4 build_style=cmake configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON -Dpython-bindings=ON" From eedb13199e4d9454d4f3c0f38cfca740a123d6af 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, 1 Sep 2022 10:37:20 +0700 Subject: [PATCH 0843/1407] opencamlib: rebuild for boost-python3-1.80 shlib --- srcpkgs/opencamlib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template index 140315ef3467..8ecfbeeac701 100644 --- a/srcpkgs/opencamlib/template +++ b/srcpkgs/opencamlib/template @@ -1,7 +1,7 @@ # Template file for 'opencamlib' pkgname=opencamlib version=2019.07 -revision=4 +revision=5 build_style=cmake configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}" hostmakedepends="python3" From db47cf40dc58653d0264a5b29ed899445030781f 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, 30 Aug 2022 11:03:10 +0700 Subject: [PATCH 0844/1407] cpp-hocon: rebuild for boost-1.80 --- srcpkgs/cpp-hocon/template | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template index 1e050aeb41aa..f61316adcc11 100644 --- a/srcpkgs/cpp-hocon/template +++ b/srcpkgs/cpp-hocon/template @@ -1,14 +1,20 @@ # Template file for 'cpp-hocon' pkgname=cpp-hocon version=0.3.0 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel leatherman-devel libcurl-devel" -depends="leatherman" short_desc="C++ port of the Typesafe Config library" maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/puppetlabs/cpp-hocon/" distfiles="https://github.com/puppetlabs/cpp-hocon/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=dab02354046f05aca6275c746d7583ee5f71853aa5b1d93529564632e184c3dd + +post_install() { + # this package is a static library, + # needs to be rebuild when update boost, + # force an shlib-dependencies + vbin build/bin/libcpp-hocon_test +} From e96c4893ab0a566ecb5b1104d4afa345e10ec2a8 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Thu, 1 Sep 2022 00:42:34 -0400 Subject: [PATCH 0845/1407] discord-ptb: update to 0.0.32. --- srcpkgs/discord-ptb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template index 897477e303c2..ced17e607054 100644 --- a/srcpkgs/discord-ptb/template +++ b/srcpkgs/discord-ptb/template @@ -1,6 +1,6 @@ # Template file for 'discord-ptb' pkgname=discord-ptb -version=0.0.31 +version=0.0.32 revision=1 archs="x86_64" wrksrc="DiscordPTB" @@ -12,7 +12,7 @@ maintainer="0x5c " license="custom:Proprietary" homepage="https://discord.com/" distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz" -checksum=5d00df5cc25e91f93596f5839e2ba97d809104c61578b26d17e8854bda99db13 +checksum=ab5be39fb03a9cd25e63249f609c87043255e64ef2387d90c11fc9faefaafce1 _license_checksum=41fe9e5a91c8f0af3a0a3833a0badf0ace75f1c4097889fafc0a029c68b96fcd nopie=yes restricted=yes From e83b9110cb962ac9b6c69ee9a47638348d376438 Mon Sep 17 00:00:00 2001 From: akierig Date: Wed, 31 Aug 2022 23:02:29 -0500 Subject: [PATCH 0846/1407] Signal-Desktop: update to 5.57.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 61f212c679c0..a69f86dd28f9 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.56.0 +version=5.57.0 revision=1 # Signal officially only supports x86_64 (also due to Electron) # x86_64-musl fails because of its dependency on 'node-gyp' which depends on a glibc specific extension @@ -13,7 +13,7 @@ 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=ddec149fcb53253a26e8436fd1157e28ccf32673663d3b6a51753af31efa883b +checksum=eeb2a8cfcfb8410fc7ee901cb1b7994421844fb7af1e52b9faad6151b32b152b nostrip_files="signal-desktop" post_extract() { From fbf3610f8be1249c56b9969edaef6ca569b71a15 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Thu, 1 Sep 2022 10:45:46 -0400 Subject: [PATCH 0847/1407] NetworkManager: update to 1.40.0 --- srcpkgs/NetworkManager/patches/no-gtk-doc.patch | 16 ++++++++-------- srcpkgs/NetworkManager/template | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch index 87e75aa35106..2cd7cf42b71c 100644 --- a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch +++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch @@ -1,10 +1,10 @@ -Reason: We only want to build man pages, not development docs -Upstream: An issue has been filed - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689 -Index: b/meson.build -=================================================================== +# Reason: We only want to build man pages, not development docs +# Upstream: Patch was rejected - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689 +diff --git a/meson.build b/meson.build +index 996617f4ca..fb4a914470 100644 --- a/meson.build +++ b/meson.build -@@ -943,10 +943,8 @@ if enable_qt +@@ -952,10 +952,8 @@ if enable_qt endif if enable_docs @@ -15,8 +15,8 @@ Index: b/meson.build endif configure_file( -Index: b/src/libnmc-setting/meson.build -=================================================================== +diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build +index 49314cad2e..376ec4e740 100644 --- a/src/libnmc-setting/meson.build +++ b/src/libnmc-setting/meson.build @@ -1,6 +1,6 @@ @@ -24,6 +24,6 @@ Index: b/src/libnmc-setting/meson.build -if enable_docs +if enable_docs and enable_introspection + assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true') settings_docs_input_xml = custom_target( 'settings-docs-input.xml', - input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']], diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 191bbfa1f172..8bff706bc42d 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,6 +1,6 @@ # Template file for 'NetworkManager' pkgname=NetworkManager -version=1.38.4 +version=1.40.0 revision=1 build_style=meson build_helper="gir qemu" @@ -19,7 +19,7 @@ configure_args="-Dsystemd_journal=false -Dsuspend_resume=$(vopt_if elogind elogind upower) -Dconfig_dhcp_default=internal" hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config - intltool dbus-glib-devel docbook-xsl gtk-doc + dbus-glib-devel docbook-xsl gtk-doc polkit-devel perl $(vopt_if gir 'vala python3-gobject')" makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel @@ -33,9 +33,9 @@ short_desc="Network Management daemon" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/NetworkManager" -changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-38/NEWS" +changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-40/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=841f64d41776aadd92b151f47e50f62be8a0611a9056fe6bf81881024e6a96c5 +checksum=aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03 # TODO: Some tests require network namespaces to run. make_check=extended lib32disabled=yes From 168d2b50c79fa6afd77b742edf7d563f8bde3fd1 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 1 Sep 2022 20:01:51 +0400 Subject: [PATCH 0848/1407] tree: update to 2.0.3. --- srcpkgs/tree/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tree/template b/srcpkgs/tree/template index 0509494b75fb..e933b423102a 100644 --- a/srcpkgs/tree/template +++ b/srcpkgs/tree/template @@ -1,6 +1,6 @@ # Template file for 'tree' pkgname=tree -version=2.0.2 +version=2.0.3 revision=1 build_style=gnu-makefile short_desc="Recursive directory listing program" @@ -10,7 +10,7 @@ homepage="http://mama.indstate.edu/users/ice/tree" changelog="http://mama.indstate.edu/users/ice/tree/changes.html" distfiles="http://deb.debian.org/debian/pool/main/t/tree/tree_${version}.orig.tar.gz" #distfiles="http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz" -checksum=7d693a1d88d3c4e70a73e03b8dbbdc12c2945d482647494f2f5bd83a479eeeaf +checksum=ba14e77b5f9dc7f8250c3f702ec5b6be2f93cd0fa87311bab3239676866a3b1d do_install() { make MANDIR=${DESTDIR}/usr/share/man DESTDIR=${DESTDIR}/usr/bin install From 4f7183b03936f811f8ee49268ef7365f4e2b62b7 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 1 Sep 2022 10:55:23 -0400 Subject: [PATCH 0849/1407] php8.0: update to 8.0.23. --- srcpkgs/php8.0/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template index 9aa552c38e3a..4b2fa162e3e3 100644 --- a/srcpkgs/php8.0/template +++ b/srcpkgs/php8.0/template @@ -1,6 +1,6 @@ # Template file for 'php8.0' pkgname=php8.0 -version=8.0.22 +version=8.0.23 revision=1 _php_version=8.0 wrksrc="php-${version}" @@ -16,7 +16,7 @@ license="PHP-3.01" homepage="https://www.php.net" changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS" distfiles="https://www.php.net/distributions/php-${version}.tar.gz" -checksum=56fce7529a9798fd0895bca3539d2a65b9cac5d23ffbdf6338419c62ed083519 +checksum=a2dd50e9c4a0328d921b6bc914e8b4e6572f94f09867318f88acca5ac4fa76c7 conf_files="/etc/php${_php_version}/php.ini" From 7a5b5da8cbb3b843e3e44e5c918cba4568e1f0e3 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 1 Sep 2022 10:55:33 -0400 Subject: [PATCH 0850/1407] php8.1: update to 8.1.10. --- srcpkgs/php8.1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template index ae058f5fefdb..f18fa2cb9a7c 100644 --- a/srcpkgs/php8.1/template +++ b/srcpkgs/php8.1/template @@ -1,6 +1,6 @@ # Template file for 'php8.1' pkgname=php8.1 -version=8.1.9 +version=8.1.10 revision=1 _php_version=8.1 wrksrc="php-${version}" @@ -16,7 +16,7 @@ license="PHP-3.01" homepage="https://www.php.net" changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS" distfiles="https://www.php.net/distributions/php-${version}.tar.gz" -checksum=954cf77f7e0a70dc765e7639acdfdccd164be5cd1bce3dbe9d10c58dca631e76 +checksum=3ea4f323109dfbc8d2631d08aa0e08602c1f713678e9dc6c750f081ef49eab0f conf_files="/etc/php${_php_version}/php.ini" From 76047acdfdf1063b61dbda04711ed37c28ebfefe 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, 30 Aug 2022 11:03:10 +0700 Subject: [PATCH 0851/1407] volk: not depends on boost anymore --- srcpkgs/volk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template index 62a6ed0b118e..25bb89e31427 100644 --- a/srcpkgs/volk/template +++ b/srcpkgs/volk/template @@ -5,7 +5,7 @@ revision=1 _cpu_features_gitrev="69d39934e83be9a0133d2850f15f5debd5eba06f" build_style=cmake hostmakedepends="pkg-config python3-cheetah3 git python3-Mako python3-six" -makedepends="boost-devel python3-cheetah3 python3-devel python3-Mako python3-six" +makedepends="python3-cheetah3 python3-devel python3-Mako python3-six" short_desc="Vector-Optimized Library of Kernels" maintainer="Andrew Benson " license="GPL-3.0-or-later" From 203153f82875e70779dc9206a70bbca6a6aeefad 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, 30 Aug 2022 11:03:10 +0700 Subject: [PATCH 0852/1407] gnuradio: needs fmt-devel in makedepends --- srcpkgs/gnuradio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 973339f92921..bfd2a8e35123 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -14,7 +14,7 @@ hostmakedepends="pkg-config doxygen mathjax python3-Sphinx python3-pybind11 pyth makedepends="SDL-devel SoapySDR-devel boost-devel codec2-devel cppzmq fftw-devel gmpxx-devel gsl-devel gtk+3-devel jack-devel libgsm-devel libiio-devel libsndfile-devel mpir-devel python3-devel python3-gobject-devel python3-pybind11 python3-pygccxml qwt-devel spdlog - uhd-devel volk-devel" + fmt-devel uhd-devel volk-devel" depends="${_pydeps} python3-cheetah3 python3-lxml python3-matplotlib" checkdepends="python3-pytest" short_desc="Framework for software defined radio" From 42738289b33d29f4cc5f28f1ce15653ff5d5f916 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, 2 Sep 2022 01:26:36 +0700 Subject: [PATCH 0853/1407] build-helper/cmake-wxWidgets-gtk3: set configure_args, too CMake on their mission to handle all use-cases, ships a FindwxWidgets, this module ignores WX_CONFIG environment variable, even the code seems to respect it. --- common/build-helper/cmake-wxWidgets-gtk3.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/common/build-helper/cmake-wxWidgets-gtk3.sh b/common/build-helper/cmake-wxWidgets-gtk3.sh index 68bc53de5464..7d813dc5f953 100644 --- a/common/build-helper/cmake-wxWidgets-gtk3.sh +++ b/common/build-helper/cmake-wxWidgets-gtk3.sh @@ -3,3 +3,4 @@ if [ "$CROSS_BUILD" ]; then else export WX_CONFIG=/usr/bin/wx-config-gtk3 fi +configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} " From dbf16b5db803ccb5f2c51c916dbdc3c1e624727a 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, 2 Sep 2022 01:37:51 +0700 Subject: [PATCH 0854/1407] PrusaSlicer: fix cross-build Old artifact depends on boost 1.72 --- .../patches/cmake-is-very-good.patch | 25 +++++++++++++++++++ srcpkgs/PrusaSlicer/template | 8 +++--- 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-is-very-good.patch diff --git a/srcpkgs/PrusaSlicer/patches/cmake-is-very-good.patch b/srcpkgs/PrusaSlicer/patches/cmake-is-very-good.patch new file mode 100644 index 000000000000..f2ca8e0c1f76 --- /dev/null +++ b/srcpkgs/PrusaSlicer/patches/cmake-is-very-good.patch @@ -0,0 +1,25 @@ +get_prerequisites will go straight to run ldd on the libraries. + +get_prerequisites supports objdump, but only on Windows +--- a/cmake/modules/FindOpenVDB.cmake ++++ b/cmake/modules/FindOpenVDB.cmake +@@ -381,19 +381,6 @@ set(_EXCLUDE_SYSTEM_PREREQUISITES 1) + set(_RECURSE_PREREQUISITES 0) + set(_OPENVDB_PREREQUISITE_LIST) + +-if(NOT OPENVDB_USE_STATIC_LIBS) +-get_prerequisites(${OpenVDB_openvdb_LIBRARY} +- _OPENVDB_PREREQUISITE_LIST +- ${_EXCLUDE_SYSTEM_PREREQUISITES} +- ${_RECURSE_PREREQUISITES} +- "" +- "${SYSTEM_LIBRARY_PATHS}" +-) +-endif() +- +-unset(_EXCLUDE_SYSTEM_PREREQUISITES) +-unset(_RECURSE_PREREQUISITES) +- + # As the way we resolve optional libraries relies on library file names, use + # the configuration options from the main CMakeLists.txt to allow users + # to manually identify the requirements of OpenVDB builds if they know them. diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index 29f1f641a488..b8dba603326f 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -4,20 +4,20 @@ version=2.4.2 revision=2 wrksrc="PrusaSlicer-version_${version}" build_style=cmake -build_helper="qemu" -configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3" +build_helper="qemu cmake-wxWidgets-gtk3" +configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3 + -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON" hostmakedepends="pkg-config" makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel - wxWidgets-gtk3-devel" + c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel" short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" maintainer="Jasper Chan " license="GPL-3.0-or-later" homepage="https://www.prusa3d.com/prusaslicer/" distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz" checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23 -nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio" post_extract() { # Mark tests that fail on certain targets From efbe448f9bbca92d9744b9038237c9cdc3fe83b5 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, 2 Sep 2022 08:58:19 +0700 Subject: [PATCH 0855/1407] nix: hardening the build nix build system drops all of our hardening CFLAGS and CXXFLAGS --- srcpkgs/nix/patches/respect-our-flags.patch | 25 +++++++++++++++++++++ srcpkgs/nix/template | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/nix/patches/respect-our-flags.patch diff --git a/srcpkgs/nix/patches/respect-our-flags.patch b/srcpkgs/nix/patches/respect-our-flags.patch new file mode 100644 index 000000000000..5d4e0c907d50 --- /dev/null +++ b/srcpkgs/nix/patches/respect-our-flags.patch @@ -0,0 +1,25 @@ +--- a/Makefile ++++ b/Makefile +@@ -28,10 +28,8 @@ makefiles = \ + OPTIMIZE = 1 + + ifeq ($(OPTIMIZE), 1) +- GLOBAL_CXXFLAGS += -O3 $(CXXLTO) ++ GLOBAL_CXXFLAGS += $(CXXLTO) + GLOBAL_LDFLAGS += $(CXXLTO) +-else +- GLOBAL_CXXFLAGS += -O0 -U_FORTIFY_SOURCE + endif + + include mk/lib.mk +--- a/configure.ac ++++ b/configure.ac +@@ -41,8 +41,6 @@ AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], + test "$localstatedir" = '${prefix}/var' && localstatedir=/nix/var + + +-CFLAGS= +-CXXFLAGS= + AC_PROG_CC + AC_PROG_CXX + AC_PROG_CPP diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index e21c94aa2759..42f983935ba9 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,7 +1,7 @@ # Template file for 'nix' pkgname=nix version=2.10.3 -revision=2 +revision=3 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var From a7261a643e4d70e1b79234584d99ea565638373b 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, 2 Sep 2022 11:20:30 +0700 Subject: [PATCH 0856/1407] gc: not depends on libatomic_ops --- srcpkgs/gc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gc/template b/srcpkgs/gc/template index 3e00fa2ab468..8f88681f6693 100644 --- a/srcpkgs/gc/template +++ b/srcpkgs/gc/template @@ -1,11 +1,11 @@ # Template file for 'gc' pkgname=gc version=8.0.6 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--enable-static --enable-mmap" +# libatomic_ops is replaced by C11 atomic +configure_args="--enable-static --enable-mmap --with-libatomic-ops=none" hostmakedepends="pkg-config" -makedepends="libatomic_ops-devel" short_desc="Garbage collector for C and C++" maintainer="Orphaned " license="GPL-2.0-or-later" From 6a92b4f4f83a3fff9e89448a5dde3e345f7f0d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Fri, 2 Sep 2022 09:07:42 +0200 Subject: [PATCH 0857/1407] fotoxx: update to 22.31. --- srcpkgs/fotoxx/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template index a19f07b5f071..20a74d973b80 100644 --- a/srcpkgs/fotoxx/template +++ b/srcpkgs/fotoxx/template @@ -1,6 +1,6 @@ # Template file for 'fotoxx' pkgname=fotoxx -version=22.30 +version=22.31 revision=1 wrksrc=fotoxx build_style=gnu-makefile @@ -12,8 +12,9 @@ short_desc="Free open source program for image editing and collection management maintainer="Benjamín Albiñana " license="GPL-3.0-or-later" homepage="https://www.kornelix.net/fotoxx/fotoxx.html" +changelog="https://www.kornelix.net/downloads/recent_changes.txt" distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz" -checksum=418e56bdb4fab90681495859a2c601ddf093a5b194f16e56fc697e256a722788 +checksum=e378a495d346dfe764bb5c56325cec13ea4997b54b996ef13889f5735a60893f CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/champlain-0.12" From 142616b4720f53c967969eb5ca498dc11d4a39e7 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Thu, 1 Sep 2022 21:14:57 +0200 Subject: [PATCH 0858/1407] hugo: update to 0.102.3. --- srcpkgs/hugo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index d24c31d6fb13..a0ed35c29fe7 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,6 +1,6 @@ # Template file for 'hugo' pkgname=hugo -version=0.102.2 +version=0.102.3 revision=1 build_style=go build_helper=qemu @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://gohugo.io" distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz" -checksum=55c2f1bbddaa1a7be6d95ab983e4a671e6d5f7ecbc1bde8a425295845f0dd764 +checksum=5fab29ababef5294c891d687aef027c423771d4ad33af10c69f18ff9754d283b post_install() { vdoc README.md From e48df9eb197a9789836d80276e0a4d4bc5b90f0b Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 1 Sep 2022 10:30:32 -0400 Subject: [PATCH 0859/1407] dendrite: update to 0.9.6. --- srcpkgs/dendrite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template index 64b7085e53f4..a6af572446b1 100644 --- a/srcpkgs/dendrite/template +++ b/srcpkgs/dendrite/template @@ -1,6 +1,6 @@ # Template file for 'dendrite' pkgname=dendrite -version=0.9.5 +version=0.9.6 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=2789352e40120025ed1ab65591b89a08255b088c3e919cfc70b9bd59706ae3f1 +checksum=408adccc67545a91bab5a533bf8be6eb9773025290013c2f0adb8bcbad124af1 system_accounts="_dendrite" _dendrite_homedir="/var/lib/dendrite" From ea1980abd7cc36e09411a06b90f7a8b20dc6746a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Thu, 1 Sep 2022 17:09:56 +0200 Subject: [PATCH 0860/1407] doomretro: update to 4.6.2. --- srcpkgs/doomretro/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template index 5ab48621c2c4..e0da5267bd45 100644 --- a/srcpkgs/doomretro/template +++ b/srcpkgs/doomretro/template @@ -1,6 +1,6 @@ # Template file for 'doomretro' pkgname=doomretro -version=4.6.1 +version=4.6.2 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=addaabbfe7a873f2215a6f8a11468022f15bb1409fef16def1d4f8aa96838238 +checksum=78d60b90a5b53d242612a6363f9c04237d9d5bb9c501e1c8216f9c51eda7fa01 From 1a254aea12e74c0c74ba93026834e94c9797cd47 Mon Sep 17 00:00:00 2001 From: lemmi Date: Thu, 1 Sep 2022 11:09:30 +0200 Subject: [PATCH 0861/1407] ddcutil: update to 1.3.0. --- srcpkgs/ddcutil/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ddcutil/template b/srcpkgs/ddcutil/template index 9215d95a8c89..919a3ccb42d8 100644 --- a/srcpkgs/ddcutil/template +++ b/srcpkgs/ddcutil/template @@ -1,7 +1,7 @@ # Template file for 'ddcutil' pkgname=ddcutil -version=1.2.2 -revision=2 +version=1.3.0 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="i2c-tools-devel libdrm-devel libgudev-devel libkmod-devel libusb-devel libXrandr-devel" @@ -11,7 +11,7 @@ license="GPL-2.0-or-later" homepage="http://www.ddcutil.com" changelog="https://www.ddcutil.com/release_notes/" distfiles="https://github.com/rockowitz/ddcutil/archive/v${version}.tar.gz" -checksum=f6766a00b78decc0bff7345093afb444d60172967555276c93916d181287744e +checksum=fa439f031c9372360e8d266f4294937dd3ee0a1c812d41e596b5e75a6d73d6d3 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libexecinfo-devel musl-legacy-compat" From 4ea8e06fd9094060cb9bf3ee3c61954d85c44c10 Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 1 Sep 2022 16:31:54 +0530 Subject: [PATCH 0862/1407] azote: update to 1.9.5. --- srcpkgs/azote/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template index 92deba3aa229..510a7fdcdb6b 100644 --- a/srcpkgs/azote/template +++ b/srcpkgs/azote/template @@ -1,16 +1,17 @@ # Template file for 'azote' pkgname=azote -version=1.8.1 -revision=2 +version=1.9.5 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-setuptools python3-gobject python3-Pillow gtk+3" +depends="python3-cairo python3-gobject python3-Pillow gtk+3" short_desc="Wallpaper & color manager for Sway, i3 and other WMs" maintainer="Piotr Miller " license="BSD-3-Clause, GPL-3.0-or-later" homepage="https://github.com/nwg-piotr/azote" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=d8b2f5f4e351e72d9c58f9d5fc9c9e2526087e57e5553f6defbd163c78727905 +distfiles="https://github.com/nwg-piotr/azote/archive/refs/tags/v${version}.tar.gz" +checksum=582961c1d216b7a66040d2bbc811890a0ef4312965a23784401ea24211385e9d +make_check=no # no tests provided post_install() { vmkdir usr/bin From 0ce4e90bc9821df3daae32120c225a63cb0da2c1 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Fri, 2 Sep 2022 09:33:42 +0300 Subject: [PATCH 0863/1407] gc: Update to 8.2.2 Other cleanups: * Remove --enable-mmap (which is the default configure option now) * Fix license (it is MIT, not GPL) * Set maintainer * Remove unneeded CFLAGS * Specify README.QUICK as license file --- srcpkgs/gc/template | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/srcpkgs/gc/template b/srcpkgs/gc/template index 8f88681f6693..a62033103920 100644 --- a/srcpkgs/gc/template +++ b/srcpkgs/gc/template @@ -1,28 +1,24 @@ # Template file for 'gc' pkgname=gc -version=8.0.6 -revision=2 +version=8.2.2 +revision=1 build_style=gnu-configure # libatomic_ops is replaced by C11 atomic -configure_args="--enable-static --enable-mmap --with-libatomic-ops=none" +configure_args="--enable-static --with-libatomic-ops=none" hostmakedepends="pkg-config" short_desc="Garbage collector for C and C++" -maintainer="Orphaned " -license="GPL-2.0-or-later" +maintainer="Ivan Maidanski " +license="MIT" homepage="https://www.hboehm.info/gc/" distfiles="https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" -checksum=3b4914abc9fa76593596773e4da671d7ed4d5390e3d46fbf2e5f155e121bea11 - -case "$XBPS_TARGET_MACHINE" in -*-musl) - CFLAGS='-D_GNU_SOURCE -DNO_GETCONTEXT -DSEARCH_FOR_DATA_START -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR' -esac +checksum=f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0 post_install() { mkdir -p ${DESTDIR}/usr/include/gc/ mv ${wrksrc}/include/* ${DESTDIR}/usr/include/gc/ mv ${DESTDIR}/usr/include/gc/extra/* ${DESTDIR}/usr/include/ rmdir ${DESTDIR}/usr/include/gc/extra + vlicense README.QUICK } gc-devel_package() { From d788cf4ebced5a4e1c92561261b8c8a3fb5e3702 Mon Sep 17 00:00:00 2001 From: Philipp David Date: Fri, 2 Sep 2022 07:32:06 +0200 Subject: [PATCH 0864/1407] python3-pikepdf: update to 5.6.1. --- srcpkgs/python3-pikepdf/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template index 31a0c40c52ed..1d7af9c3ce8b 100644 --- a/srcpkgs/python3-pikepdf/template +++ b/srcpkgs/python3-pikepdf/template @@ -1,6 +1,6 @@ # Template file for 'python3-pikepdf' pkgname=python3-pikepdf -version=5.4.2 +version=5.6.1 revision=1 wrksrc="pikepdf-${version}" build_style=python3-module @@ -14,8 +14,9 @@ short_desc="Python library for reading and writing PDF files" maintainer="Philipp David " license="MPL-2.0" homepage="https://github.com/pikepdf/pikepdf" +changelog="https://raw.githubusercontent.com/pikepdf/pikepdf/master/docs/releasenotes/version${version%%.*}.rst" distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz" -checksum=8f3a056f7a5647c91fc0861e8ae011c6dd7ecdf6c622ff483739c74887fc3eaa +checksum=03fb70ff4fada9cba864d04033f4166b5bf7fa85c90cdc05afd0ab87c9ccaa1a pre_check() { cp -r src/pikepdf.egg-info "$(cd build/lib* && pwd)" From 64fbbc6ea46413b31d6af9808c83625926d66ff1 Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 1 Sep 2022 15:58:54 +0530 Subject: [PATCH 0865/1407] black: update to 22.8.0. --- srcpkgs/black/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/black/template b/srcpkgs/black/template index 6e4a1f15fcab..6acc211b8d4a 100644 --- a/srcpkgs/black/template +++ b/srcpkgs/black/template @@ -1,9 +1,9 @@ # Template file for 'black' pkgname=black -version=22.6.0 +version=22.8.0 revision=1 build_style=python3-module -hostmakedepends="python3-setuptools python3-setuptools_scm" +hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-click python3-platformdirs python3-tomli python3-pathspec python3-mypy_extensions" checkdepends="${depends} python3-pytest-xdist python3-aiohttp python3-colorama python3-uvloop python3-ipython python3-tokenize-rt" @@ -13,7 +13,7 @@ license="MIT" homepage="https://github.com/psf/black" changelog="https://raw.githubusercontent.com/psf/black/main/CHANGES.md" distfiles="${PYPI_SITE}/b/black/black-${version}.tar.gz" -checksum=6c6d39e28aed379aec40da1c65434c77d75e65bb59a1e1c283de545fb4e7c6c9 +checksum=792f7eb540ba9a17e8656538701d3eb1afcb134e3b45b71f20b25c77a8db7e6e do_check() { PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest --run-optional jupyter -m jupyter From 98059e4ad33b7c3f764ac25ef0806995a779c9c5 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, 2 Sep 2022 12:47:09 +0700 Subject: [PATCH 0866/1407] nix: do not touch outside {build,dest}dir While we're at it, cross compile --- ...anual-build-without-nix-installation.patch | 85 +++++++++++++++++++ .../nix/patches/0002-manual-cross-build.patch | 58 +++++++++++++ srcpkgs/nix/template | 13 ++- 3 files changed, 153 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/nix/patches/0001-manual-build-without-nix-installation.patch create mode 100644 srcpkgs/nix/patches/0002-manual-cross-build.patch diff --git a/srcpkgs/nix/patches/0001-manual-build-without-nix-installation.patch b/srcpkgs/nix/patches/0001-manual-build-without-nix-installation.patch new file mode 100644 index 000000000000..6a1807defd66 --- /dev/null +++ b/srcpkgs/nix/patches/0001-manual-build-without-nix-installation.patch @@ -0,0 +1,85 @@ +From b8a68be8b552584f28bd177bbf785fd768828081 Mon Sep 17 00:00:00 2001 +Message-Id: +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + +Date: Fri, 2 Sep 2022 10:33:10 +0700 +Subject: [PATCH 1/2] manual: build without nix installation + +--- + doc/manual/local.mk | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index 371ed6f21..ef37d5d6b 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -20,7 +20,7 @@ dummy-env = env -i \ + NIX_STATE_DIR=/dummy \ + NIX_CONFIG='cores = 0' + +-nix-eval = $(dummy-env) $(bindir)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw ++nix-eval = $(dummy-env) $(nix_DIR)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw + + $(d)/%.1: $(d)/src/command-ref/%.md + @printf "Title: %s\n\n" "$$(basename $@ .1)" > $^.tmp +@@ -44,31 +44,31 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/command-ref/new-cli + $(trace-gen) cat doc/manual/src/SUMMARY.md.in | while IFS= read line; do if [[ $$line = @manpages@ ]]; then cat doc/manual/src/command-ref/new-cli/SUMMARY.md; else echo "$$line"; fi; done > $@.tmp + @mv $@.tmp $@ + +-$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/generate-manpage.nix $(bindir)/nix ++$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/generate-manpage.nix $(nix_DIR)/nix + @rm -rf $@ + $(trace-gen) $(nix-eval) --write-to $@ --expr 'import doc/manual/generate-manpage.nix { command = builtins.readFile $<; renderLinks = true; }' + +-$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md $(bindir)/nix ++$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md $(nix_DIR)/nix + @cat doc/manual/src/command-ref/conf-file-prefix.md > $@.tmp + $(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-options.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp + @mv $@.tmp $@ + +-$(d)/nix.json: $(bindir)/nix +- $(trace-gen) $(dummy-env) $(bindir)/nix __dump-args > $@.tmp ++$(d)/nix.json: $(nix_DIR)/nix ++ $(trace-gen) $(dummy-env) $(nix_DIR)/nix __dump-args > $@.tmp + @mv $@.tmp $@ + +-$(d)/conf-file.json: $(bindir)/nix +- $(trace-gen) $(dummy-env) $(bindir)/nix show-config --json --experimental-features nix-command > $@.tmp ++$(d)/conf-file.json: $(nix_DIR)/nix ++ $(trace-gen) $(dummy-env) $(nix_DIR)/nix show-config --json --experimental-features nix-command > $@.tmp + @mv $@.tmp $@ + +-$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(bindir)/nix ++$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(nix_DIR)/nix + @cat doc/manual/src/expressions/builtins-prefix.md > $@.tmp + $(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp + @cat doc/manual/src/expressions/builtins-suffix.md >> $@.tmp + @mv $@.tmp $@ + +-$(d)/builtins.json: $(bindir)/nix +- $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp ++$(d)/builtins.json: $(nix_DIR)/nix ++ $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(nix_DIR)/nix __dump-builtins > $@.tmp + @mv $@.tmp $@ + + # Generate the HTML manual. +@@ -85,14 +85,14 @@ $(mandir)/man1/nix3-manpages: doc/manual/generated/man1/nix3-manpages + $(trace-install) install -m 0644 $$(dirname $<)/* $(DESTDIR)$$(dirname $@) + + doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli +- @mkdir -p $(DESTDIR)$$(dirname $@) ++ @mkdir -p $$(dirname $@) + $(trace-gen) for i in doc/manual/src/command-ref/new-cli/*.md; do \ + name=$$(basename $$i .md); \ + tmpFile=$$(mktemp); \ + if [[ $$name = SUMMARY ]]; then continue; fi; \ + printf "Title: %s\n\n" "$$name" > $$tmpFile; \ + cat $$i >> $$tmpFile; \ +- lowdown -sT man -M section=1 $$tmpFile -o $(DESTDIR)$$(dirname $@)/$$name.1; \ ++ lowdown -sT man -M section=1 $$tmpFile -o $$(dirname $@)/$$name.1; \ + rm $$tmpFile; \ + done + @touch $@ +-- +2.37.2.587.g219fe53025.dirty + diff --git a/srcpkgs/nix/patches/0002-manual-cross-build.patch b/srcpkgs/nix/patches/0002-manual-cross-build.patch new file mode 100644 index 000000000000..6bcdd4619e31 --- /dev/null +++ b/srcpkgs/nix/patches/0002-manual-cross-build.patch @@ -0,0 +1,58 @@ +From 83130b47f14a74387f4ab185d3109ca4523e8f2a Mon Sep 17 00:00:00 2001 +Message-Id: <83130b47f14a74387f4ab185d3109ca4523e8f2a.1662098974.git.congdanhqx@gmail.com> +In-Reply-To: +References: +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + +Date: Fri, 2 Sep 2022 12:05:18 +0700 +Subject: [PATCH 2/2] manual: cross-build + +--- + doc/manual/local.mk | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index ef37d5d6b..cae3b007a 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -20,7 +20,13 @@ dummy-env = env -i \ + NIX_STATE_DIR=/dummy \ + NIX_CONFIG='cores = 0' + +-nix-eval = $(dummy-env) $(nix_DIR)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw ++ifneq (,$(findstring qemu,$(CROSS_EMULATOR))) ++ _nix-emu := QEMU_LD_PREFIX=${QEMU_LD_PREFIX} $(CROSS_EMULATOR) ++else ++ _nix-emu := $(CROSS_EMULATOR) ++endif ++ ++nix-eval = $(dummy-env) $(_nix-emu) $(nix_DIR)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw + + $(d)/%.1: $(d)/src/command-ref/%.md + @printf "Title: %s\n\n" "$$(basename $@ .1)" > $^.tmp +@@ -54,11 +60,11 @@ $(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix + @mv $@.tmp $@ + + $(d)/nix.json: $(nix_DIR)/nix +- $(trace-gen) $(dummy-env) $(nix_DIR)/nix __dump-args > $@.tmp ++ $(trace-gen) $(dummy-env) $(_nix-emu) $(nix_DIR)/nix __dump-args > $@.tmp + @mv $@.tmp $@ + + $(d)/conf-file.json: $(nix_DIR)/nix +- $(trace-gen) $(dummy-env) $(nix_DIR)/nix show-config --json --experimental-features nix-command > $@.tmp ++ $(trace-gen) $(dummy-env) $(_nix-emu) $(nix_DIR)/nix show-config --json --experimental-features nix-command > $@.tmp + @mv $@.tmp $@ + + $(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(nix_DIR)/nix +@@ -68,7 +74,7 @@ $(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix + @mv $@.tmp $@ + + $(d)/builtins.json: $(nix_DIR)/nix +- $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(nix_DIR)/nix __dump-builtins > $@.tmp ++ $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(_nix-emu) $(nix_DIR)/nix __dump-builtins > $@.tmp + @mv $@.tmp $@ + + # Generate the HTML manual. +-- +2.37.2.587.g219fe53025.dirty + diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 42f983935ba9..6d7724ba7fe1 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -3,11 +3,14 @@ pkgname=nix version=2.10.3 revision=3 build_style=gnu-configure +build_helper=qemu # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var --with-sandbox-shell=/usr/bin/busybox.static" +make_build_args="V=1 SET_RPATH_TO_LIBS=0" +make_install_args="V=1 SET_RPATH_TO_LIBS=0" hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq - busybox-static" + busybox-static lowdown" 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 @@ -20,8 +23,7 @@ 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=5a8d79714bf04c425f41fdd22e67d4704d2e44c7a760c6c144e5767c6d662413 -disable_parallel_build=yes -nocross="cross build populates /usr/lib32 with libraries and tries to link against them" +# disable_parallel_build="build is fine, only linking test" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" @@ -33,6 +35,11 @@ esac CXXFLAGS="-Wno-deprecated-declarations" +if [ "$CROSS_BUILD" ]; then + make_build_args+=" CROSS_EMULATOR=/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static" + make_install_args+=" CROSS_EMULATOR=/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static" +fi + # Default configuration file. conf_files="/etc/nix/nix.conf" # Create required build users/groups. From 546acff705797f4dd89f37536db353537b9f2e75 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, 2 Sep 2022 15:40:10 +0700 Subject: [PATCH 0867/1407] linux5.19: update to 5.19.5. Although linux-5.19.5 doesn't change anything from linux-5.19.4. We need this update to pick up the change to CONFIG_RCU_EXP_CPU_STALL_TIMEOUT on x86 and arm See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1045a06724f322ed61f1ffb994427c7bdbe64647 --- srcpkgs/linux5.19/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.19/template b/srcpkgs/linux5.19/template index 4eb2f4e2a886..013ef67e19cb 100644 --- a/srcpkgs/linux5.19/template +++ b/srcpkgs/linux5.19/template @@ -1,6 +1,6 @@ # Template file for 'linux5.19' pkgname=linux5.19 -version=5.19.4 +version=5.19.5 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="ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8 - 953fc93b8abfc5e167d61df58dce7cd76571286a4d5006dbf20bf59e51b399e8" + ea4f4be61b0635d8b2cb58c373b670e78250dac9d0f2432222052789974c09d7" skip_extraction="patch-${version}.xz" python_version=3 From 8a481fc8ff6e34cc28782dbceb6b1e59b64f72fc Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 1 Sep 2022 20:12:55 +0400 Subject: [PATCH 0868/1407] osinfo-db: update to 20220830. --- 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 5e93997ec2a4..1af4572464a0 100644 --- a/srcpkgs/osinfo-db/template +++ b/srcpkgs/osinfo-db/template @@ -1,6 +1,6 @@ # Template file for 'osinfo-db' pkgname=osinfo-db -version=20220727 +version=20220830 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/osinfo-db-${version}.tar.xz" -checksum=2291e5234ed899a830c36f2b4056ff5e76235f4ba07b593421f4865290634d5e +checksum=8111643d90deab838db7f213f154bef2e057350a9c834245ee01dd64433baafb skip_extraction="${pkgname}-${version}.tar.xz" do_install() { From 1777df34f4c8e2b96c08c08d0c329d080798ea19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 2 Sep 2022 09:41:53 +0200 Subject: [PATCH 0869/1407] python3-jsonschema: update to 4.15.0. --- srcpkgs/python3-jsonschema/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template index 72e143e63ac5..f010fe21e108 100644 --- a/srcpkgs/python3-jsonschema/template +++ b/srcpkgs/python3-jsonschema/template @@ -1,6 +1,6 @@ # Template file for 'python3-jsonschema' pkgname=python3-jsonschema -version=4.14.0 +version=4.15.0 revision=1 wrksrc="jsonschema-${version}" build_style=python3-pep517 @@ -13,7 +13,7 @@ license="MIT" homepage="https://github.com/Julian/jsonschema" changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz" -checksum=15062f4cc6f591400cd528d2c355f2cfa6a57e44c820dc783aee5e23d36a831f +checksum=21f4979391bdceb044e502fd8e79e738c0cdfbdc8773f9a49b5769461e82fe1e do_check() { rm -rf *.dist-info tmp # remove artifacts from previous unsuccessful check run From 9d58441f081407b54e40af62448443c3f56f6605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 2 Sep 2022 10:05:35 +0200 Subject: [PATCH 0870/1407] python3-ansible-lint: update to 6.5.2. --- srcpkgs/python3-ansible-lint/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template index 512fc58d653f..2f2582a30243 100644 --- a/srcpkgs/python3-ansible-lint/template +++ b/srcpkgs/python3-ansible-lint/template @@ -1,6 +1,6 @@ # Template file for 'python3-ansible-lint' pkgname=python3-ansible-lint -version=6.5.1 +version=6.5.2 revision=1 wrksrc="${pkgname/python3-/}-${version}" build_style=python3-pep517 @@ -26,6 +26,7 @@ make_check_args="--deselect src/ansiblelint/rules/no_loop_var_prefix.py::test_no --deselect test/test_formatter_json.py::test_code_climate_parsable_ignored --deselect test/test_formatter_sarif.py::test_sarif_parsable_ignored --deselect test/test_import_playbook.py::test_task_hook_import_playbook + --deselect test/test_include_miss_file_with_role.py::test_cases_warning_message --deselect test/test_list_rules.py::test_list_rules_includes_opt_in_rules --deselect test/test_list_rules.py::test_list_rules_with_format_option --deselect test/test_list_rules.py::test_list_tags_includes_opt_in_rules @@ -53,7 +54,7 @@ maintainer="Jan Christian Grünhage " 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=b02c5222450c469196c9cc28d3128e50f6bcf9549d5dd15c3cfbf47c70b5b06e +checksum=f4432c74c0f28b2870a188b4999592f6338042f30d0c6f4ee11b32440ca9ffe4 make_check_pre="env PYTHONPATH=src" post_patch() { From 3858fbea184bc480f35eb233fdb71fc2e57ad768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 2 Sep 2022 10:12:20 +0200 Subject: [PATCH 0871/1407] perl-Type-Tiny: update to 1.016010. --- srcpkgs/perl-Type-Tiny/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Type-Tiny/template b/srcpkgs/perl-Type-Tiny/template index f5d3609bb201..6289677b2653 100644 --- a/srcpkgs/perl-Type-Tiny/template +++ b/srcpkgs/perl-Type-Tiny/template @@ -1,6 +1,6 @@ # Template file for 'perl-Type-Tiny' pkgname=perl-Type-Tiny -version=1.016009 +version=1.016010 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -12,4 +12,4 @@ maintainer="Jan Christian Grünhage " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Type-Tiny" distfiles="https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/${pkgname/perl-/}-${version}.tar.gz" -checksum=69794c37111ae92cd5b36626e6aa914b40b633df136dff7283dffacaf4562e38 +checksum=e3fee77753a0abc636c5a57595cfb1c8e1ac11d7c8ff3b216e599091abe3e368 From e67cea9e72193974bd95919e9d857d3e1cb14434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 2 Sep 2022 08:52:56 +0200 Subject: [PATCH 0872/1407] element-desktop: update to 1.11.4. --- srcpkgs/element-desktop/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template index e095421207a4..b21d97a39056 100644 --- a/srcpkgs/element-desktop/template +++ b/srcpkgs/element-desktop/template @@ -1,6 +1,6 @@ # Template file for 'element-desktop' pkgname=element-desktop -version=1.11.3 +version=1.11.4 revision=1 create_wrksrc=yes conf_files="/etc/${pkgname}/config.json" @@ -17,8 +17,8 @@ homepage="https://element.io" changelog="https://raw.githubusercontent.com/vector-im/element-desktop/develop/CHANGELOG.md" distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz>element-desktop.tar.gz https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web.tar.gz" -checksum="36205847fa61e17fc2a2ab40c066ea08f901987e16541a9f0817ad8314bd2a72 - f75f431295091ff5c43e21d0c58d504f37c45ef57550926ecbeefe7a01c83c48" +checksum="156e34306695f2233bd7a34089f803e742b439eca0e11ce6cbc9ff4c94ff67bf + 12c62ba6ed5a19a2af52797599917bbabbf42f1a0babf30dc9e787bbeb0329df" export USE_SYSTEM_APP_BUILDER=true From 22c14ac8fcd47e52c4eba7f8977c823a13b37e1f Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 1 Sep 2022 08:53:28 -0400 Subject: [PATCH 0873/1407] php-ast: update to 1.1.0, enable tests. --- srcpkgs/php-ast/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/php-ast/template b/srcpkgs/php-ast/template index 2d63572004f6..839a74c6a766 100644 --- a/srcpkgs/php-ast/template +++ b/srcpkgs/php-ast/template @@ -1,18 +1,21 @@ # Template file for 'php-ast' pkgname=php-ast -version=1.0.6 +version=1.1.0 revision=1 wrksrc="ast-${version}" build_style=gnu-configure +make_check_target="test" hostmakedepends="php-devel autoconf" makedepends="php-devel" depends="php>=7.4.3" +checkdepends="${depends}" short_desc="Exposes the abstract syntax tree generated by PHP 7" maintainer="Merlin Diavova " license="BSD-3-Clause" homepage="https://github.com/nikic/php-ast" distfiles="https://pecl.php.net/get/ast-${version}.tgz" -checksum=70347b04d5ab6223106bb098483a74ac0aa23e3e7fd41549ae95d56ccb15631e +checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13 +make_check_pre="env NO_INTERACTION=1" pre_configure() { phpize From 728a1a0ee206332e95938f86b10b562539b5ad89 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 1 Sep 2022 08:53:32 -0400 Subject: [PATCH 0874/1407] php8.0-ast: update to 1.1.0, enable tests. --- srcpkgs/php8.0-ast/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/php8.0-ast/template b/srcpkgs/php8.0-ast/template index 7f7a3bda75d2..ba9abe01c95e 100644 --- a/srcpkgs/php8.0-ast/template +++ b/srcpkgs/php8.0-ast/template @@ -1,19 +1,22 @@ # Template file for 'php8.0-ast' pkgname=php8.0-ast -version=1.0.16 +version=1.1.0 revision=1 wrksrc="ast-${version}" build_style=gnu-configure +make_check_target="test" configure_args="--with-php-config=/usr/bin/php-config8.0" hostmakedepends="php8.0-devel autoconf" makedepends="php8.0-devel" depends="php8.0" +checkdepends="${depends}" 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 +checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13 +make_check_pre="env NO_INTERACTION=1" pre_configure() { phpize8.0 From eae25c748fa007871e92a856a62f4ee452ea0d41 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 1 Sep 2022 08:54:39 -0400 Subject: [PATCH 0875/1407] php8.1-ast: update to 1.1.0, enable tests. --- srcpkgs/php8.1-ast/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/php8.1-ast/template b/srcpkgs/php8.1-ast/template index 549b8fcc1bce..d07770718a31 100644 --- a/srcpkgs/php8.1-ast/template +++ b/srcpkgs/php8.1-ast/template @@ -1,19 +1,22 @@ # Template file for 'php8.1-ast' pkgname=php8.1-ast -version=1.0.16 +version=1.1.0 revision=1 wrksrc="ast-${version}" build_style=gnu-configure configure_args="--with-php-config=/usr/bin/php-config8.1" +make_check_target="test" hostmakedepends="php8.1-devel autoconf" makedepends="php8.1-devel" depends="php8.1" +checkdepends="${depends}" 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 +checksum=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13 +make_check_pre="env NO_INTERACTION=1" pre_configure() { phpize8.1 From 1e0ea92ddcc65330ba54d84660a9d2a33ab48fbd Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Wed, 31 Aug 2022 20:52:35 +0200 Subject: [PATCH 0876/1407] helix: update to 22.08.1 --- srcpkgs/helix/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template index 3dd840770006..395e77c97b34 100644 --- a/srcpkgs/helix/template +++ b/srcpkgs/helix/template @@ -1,6 +1,6 @@ # Template file for 'helix' pkgname=helix -version=22.05 +version=22.08.1 revision=1 build_style=cargo make_install_args="--path helix-term" @@ -10,8 +10,8 @@ maintainer="Marcin Puc " license="MPL-2.0" homepage="https://helix-editor.com/" changelog="https://raw.githubusercontent.com/helix-editor/helix/master/CHANGELOG.md" -distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz" -checksum=96603cf5504bbd7ebeee1867d65356cccaa2877f697da50c0ad3789a3eb287e4 +distfiles="https://github.com/helix-editor/helix/archive/refs/tags/${version}.tar.gz" +checksum=c9b184d53bab51e7a9fe81dc8c191a853177abba67ea408e968937f31b50b45a # skip problematic doctests on i686 case "$XBPS_TARGET_MACHINE" in From 3cc1b9f5baef80b0bfe4173b2cf166702d77c8cd Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Wed, 31 Aug 2022 15:35:33 -0400 Subject: [PATCH 0877/1407] fcft: update to 3.1.3 --- srcpkgs/fcft/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template index 8d8b4313a55d..3bdb382c1376 100644 --- a/srcpkgs/fcft/template +++ b/srcpkgs/fcft/template @@ -1,6 +1,6 @@ # Template file for 'fcft' pkgname=fcft -version=3.1.2 +version=3.1.3 revision=1 wrksrc=$pkgname build_style=meson @@ -14,8 +14,9 @@ short_desc="Simple library for font loading and glyph rasterization" maintainer="Isaac Freund " license="MIT" homepage="https://codeberg.org/dnkl/fcft" +changelog="https://codeberg.org/dnkl/fcft/raw/branch/master/CHANGELOG.md" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=f571afe693d3fa11fe36e97c7a2ecbbf9313755ee31c1ec3dcc648796b8e6db0 +checksum=d9bff464ae5c31fbaad0fb8a50b6db2fc168c48aae169d005066ad358b9d432d build_options="textshaping" build_options_default="textshaping" From 957a301206e54c9c7fcde8980af9c1fa7b265681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Wed, 31 Aug 2022 23:06:13 +0200 Subject: [PATCH 0878/1407] dasel: update to 1.26.1, install completions --- srcpkgs/dasel/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template index 7e1108177775..74c6b4e0bbc9 100644 --- a/srcpkgs/dasel/template +++ b/srcpkgs/dasel/template @@ -1,8 +1,9 @@ # Template file for 'dasel' pkgname=dasel -version=1.26.0 +version=1.26.1 revision=1 build_style=go +build_helper=qemu go_import_path=github.com/tomwright/dasel go_package="${go_import_path}/cmd/dasel" go_ldflags="-X ${go_import_path}/internal.Version=${version}" @@ -12,8 +13,12 @@ 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=3c28ffd0ce63884835ce10392591624014c4d0af4444d9230a9027385559f898 +checksum=44c90753cf4c1b6e7fb82074c6701fd4b47dc6dc26fe4e5504dcccb4d273b946 post_install() { vlicense LICENSE + for shell in bash fish zsh; do + vtargetrun ${DESTDIR}/usr/bin/dasel completion ${shell} > completions.${shell} + vcompletion completions.${shell} ${shell} + done } From 07dc7981f9105095b4050f337f826ee22dd90619 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Wed, 31 Aug 2022 14:06:58 -0400 Subject: [PATCH 0879/1407] texlab: update to 4.2.2 --- srcpkgs/texlab/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template index db076a180f48..511019543741 100644 --- a/srcpkgs/texlab/template +++ b/srcpkgs/texlab/template @@ -1,6 +1,6 @@ # Template file for 'texlab' pkgname=texlab -version=4.2.1 +version=4.2.2 revision=1 build_style=cargo short_desc="Implementation of the Language Server Protocol for LaTeX" @@ -9,7 +9,7 @@ license="GPL-3.0-or-later" homepage="https://texlab.netlify.app/" changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md" distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz" -checksum=5333487e31c6b21fc9a4b351de844fc11626452b98d6413d9f5bc620aa5a0966 +checksum=db5426766c7d9f23fb269fa27c725af459728a3d3a1b0642dc823fb7b26a8f93 if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then broken="smartstring fails to compile" From 0e602a8e617484a32e6a1ba7defa69a69dca28e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Thu, 1 Sep 2022 22:08:14 +0100 Subject: [PATCH 0880/1407] xsel: fix dead distfile and upstream webpage --- srcpkgs/xsel/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xsel/template b/srcpkgs/xsel/template index 614585a5facb..d83385cdcbe2 100644 --- a/srcpkgs/xsel/template +++ b/srcpkgs/xsel/template @@ -7,8 +7,9 @@ makedepends="libXt-devel" short_desc="Command-line getting and setting the contents of the X selection" maintainer="Steven R " license="HPND-sell-variant" -homepage="http://www.vergenet.net/~conrad/software/xsel/" -distfiles="http://www.vergenet.net/~conrad/software/xsel/download/xsel-${version}.tar.gz" +homepage="http://www.kfish.org/software/xsel/" +changelog="https://raw.githubusercontent.com/kfish/xsel/master/release_notes/xsel-${version}.txt" +distfiles="http://www.kfish.org/software/xsel/download/xsel-${version}.tar.gz" checksum=b927ce08dc82f4c30140223959b90cf65e1076f000ce95e520419ec32f5b141c post_install() { From a6dde7c67561db448238fe0169e69f589f82cbce Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 2 Sep 2022 12:04:58 +0200 Subject: [PATCH 0881/1407] netbsd-wtf: update to 20220831. --- srcpkgs/netbsd-wtf/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template index 5503e9cb55ab..64d133f1a08f 100644 --- a/srcpkgs/netbsd-wtf/template +++ b/srcpkgs/netbsd-wtf/template @@ -1,18 +1,18 @@ # Template file for 'netbsd-wtf' pkgname=netbsd-wtf -version=20180621 -revision=3 -_commit=b1e5be48e340146f63b174cc14fef892a783168b -wrksrc="$pkgname-$_commit" +version=20220831 +revision=1 +_commit=fc5588bdd1c45dc812e39bc8ac75084424c67de8 +wrksrc="netbsd-wtf-${_commit}" build_style=gnu-makefile short_desc="NetBSD's wtf(6) utility" -maintainer="Orphaned " +maintainer="Duncaen " license="Public Domain" homepage="https://www.netbsd.org" distfiles="https://github.com/void-linux/netbsd-wtf/archive/$_commit.tar.gz" -checksum=5da7c6c286673baa8cc0ce2840c16895eef3e884e038a6cb7dedabdd15753de7 +checksum=1504a28e5b7785bce98d57824747e40b2ebf3c4ca013e6d15dcf0bb13c0228cd post_install() { - mv ${DESTDIR}/usr/bin/{wtf,$pkgname} - mv ${DESTDIR}/usr/share/man/man6/{wtf,$pkgname}.6 + mv ${DESTDIR}/usr/bin/{wtf,netbsd-wtf} + mv ${DESTDIR}/usr/share/man/man6/{wtf,netbsd-wtf}.6 } From cb7a431b45cb1df841770b1573fe7c8e81b739fb Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 2 Sep 2022 12:26:54 +0200 Subject: [PATCH 0882/1407] minidlna: update to 1.3.2. --- srcpkgs/minidlna/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template index da681f604300..e8081b1cbc67 100644 --- a/srcpkgs/minidlna/template +++ b/srcpkgs/minidlna/template @@ -1,7 +1,7 @@ # Template file for 'minidlna' pkgname=minidlna -version=1.3.0 -revision=2 +version=1.3.2 +revision=1 build_style=gnu-configure configure_args=" --sbindir=/usr/bin @@ -18,19 +18,23 @@ short_desc="DLNA/UPnP-AV compliant media server" maintainer="Duncaen " license="GPL-2.0-only, BSD-3-Clause" homepage="https://minidlna.sourceforge.net/" -changelog="https://sourceforge.net/projects/minidlna/files/minidlna/${version}/README/view" +changelog="https://sourceforge.net/p/minidlna/git/ci/master/tree/NEWS?format=raw" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=47d9b06b4c48801a4c1112ec23d24782728b5495e95ec2195bbe5c81bc2d3c63 +checksum=222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0 system_accounts="minidlna" minidlna_homedir="/var/lib/minidlna" -CFLAGS="-fcommon" +export CFLAGS="-fcommon" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" fi +post_patch() { + vsed -e 's/@LIBAVUTIL_LIBS@/-lavutil/g' -i Makefile.in +} + post_install() { vlicense LICENCE.miniupnpd # This one is BSD. COPYING is GPL-2 vconf minidlna.conf From 5048674ea33e1847a228c6300e371ca9eaf37285 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 2 Sep 2022 12:37:49 +0200 Subject: [PATCH 0883/1407] ninja: update to 1.11.1. --- srcpkgs/ninja/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ninja/template b/srcpkgs/ninja/template index 046b6e9e303f..669f8a189259 100644 --- a/srcpkgs/ninja/template +++ b/srcpkgs/ninja/template @@ -1,6 +1,6 @@ # Template file for 'ninja' pkgname=ninja -version=1.11.0 +version=1.11.1 revision=1 hostmakedepends="python3 asciidoc" short_desc="Small build system with a focus on speed" @@ -8,7 +8,7 @@ maintainer="Duncaen " license="Apache-2.0" homepage="https://ninja-build.org/" distfiles="https://github.com/ninja-build/ninja/archive/v${version}.tar.gz" -checksum=3c6ba2e66400fe3f1ae83deb4b235faf3137ec20bd5b08c29bfc368db143e4c6 +checksum=31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea do_configure() { # Skip rebuild with bootstrapped ninja until build phase: @@ -37,4 +37,7 @@ do_install() { vdoc doc/manual.asciidoc vinstall misc/bash-completion 644 usr/share/bash-completion/completions ninja vinstall misc/zsh-completion 644 usr/share/zsh/site-functions _ninja + vinstall misc/ninja-mode.el 644 usr/share/emacs/site-lisp + vinstall misc/ninja.vim 644 usr/share/vim/vimfiles/syntax + vinstall misc/ninja_syntax.py 644 usr/lib/python3.10/site-packages } From 02e4bed26c86e2e942cc30943a601ae31f1b3497 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 2 Sep 2022 12:52:19 +0200 Subject: [PATCH 0884/1407] elixir: update to 1.14.0. --- srcpkgs/elixir/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template index 8f721e3a3337..012c48cddbde 100644 --- a/srcpkgs/elixir/template +++ b/srcpkgs/elixir/template @@ -1,6 +1,6 @@ # Template file for 'elixir' pkgname=elixir -version=1.13.4 +version=1.14.0 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=95daf2dd3052e6ca7d4d849457eaaba09de52d65ca38d6933c65bc1cdf6b8579 +checksum=ac129e266a1e04cdc389551843ec3dbdf36086bb2174d3d7e7936e820735003b do_check() { ERL_EPMD_PORT=5369 make ${make_check_target} From 0a890cc56bf07f5eb06c8fce34d3c3f14034b39c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 1 Sep 2022 12:50:49 +0200 Subject: [PATCH 0885/1407] xmh: update to 1.0.4. --- srcpkgs/xmh/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/xmh/template b/srcpkgs/xmh/template index d1f46ae00554..3b1851569aca 100644 --- a/srcpkgs/xmh/template +++ b/srcpkgs/xmh/template @@ -1,17 +1,17 @@ -# Template build file for 'xmh'. +# Template file for 'xmh' pkgname=xmh -version=1.0.3 -revision=3 +version=1.0.4 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libXaw-devel xbitmaps" depends="nmh" short_desc="Send and read mail with an X interface to MH" -homepage="http://xorg.freedesktop.org" -license="MIT" maintainer="Leah Neukirchen " -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=b92f4f912a5fb6346d52cc2b639aea087b347f3b2e4e1a4fc7a165b1345f5689 +license="MIT" +homepage="http://xorg.freedesktop.org" +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" +checksum=e82c425a4c4156eee2e344d2e952f3fd816e03973005cd656ec1e9acf6f329db post_install() { vlicense COPYING From 82ae74d6256026ac27918b86bfa5c18f62ff8323 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 1 Sep 2022 13:02:15 +0200 Subject: [PATCH 0886/1407] xdaliclock: update to 2.46. --- srcpkgs/xdaliclock/patches/autoconf.patch | 10 ++++++++++ srcpkgs/xdaliclock/template | 22 ++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 srcpkgs/xdaliclock/patches/autoconf.patch diff --git a/srcpkgs/xdaliclock/patches/autoconf.patch b/srcpkgs/xdaliclock/patches/autoconf.patch new file mode 100644 index 000000000000..a7ae01425d86 --- /dev/null +++ b/srcpkgs/xdaliclock/patches/autoconf.patch @@ -0,0 +1,10 @@ +--- a/X11/configure ++++ b/X11/configure +@@ -2232,7 +2232,6 @@ + + if ! test -z "$ac_unrecognized_opts" ; then + echo "" >&2 +- exit 2 + fi + + diff --git a/srcpkgs/xdaliclock/template b/srcpkgs/xdaliclock/template index 4c397c59eb42..a5b052e0373e 100644 --- a/srcpkgs/xdaliclock/template +++ b/srcpkgs/xdaliclock/template @@ -1,30 +1,20 @@ # Template file for 'xdaliclock' pkgname=xdaliclock -version=2.44 -revision=2 +version=2.46 +revision=1 build_wrksrc=X11 build_style=gnu-configure -makedepends="libXext-devel libXt-devel" +hostmakedepends="glib-devel libxml2 pkg-config" +makedepends="glib-devel gtk+3-devel" short_desc="Melting digital clock" maintainer="Leah Neukirchen " license="X11" homepage="http://www.jwz.org/xdaliclock/" distfiles="http://www.jwz.org/xdaliclock/xdaliclock-${version}.tar.gz" -checksum=800db9ad00adaeb73079370fb64452230ff186e670b6fbd36315506caab64fbf +checksum=320b49e673068697d2ac6dd84771f243bda215305817285fc21e52efc24162e4 -post_install() { - vlicense LICENSE -} - -pre_configure() { - sed -i -e '/a trivial ANSI C/,+10s/ { (exit 1); exit 1; };//' \ - -e '/INCLUDES=/s/.*/:/' \ - -e '/LDFLAGS=/s/.*/:/' \ - configure -} do_install() { - vbin xdaliclock - vman xdaliclock.man xdaliclock.1 + make install install_prefix=${DESTDIR} sed -n '/Jamie/,/warranty/p' xdaliclock.c > LICENSE vlicense LICENSE } From 10b86213c38f06a370b83738bb887cd861f15f13 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 1 Sep 2022 13:04:48 +0200 Subject: [PATCH 0887/1407] fzf: update to 0.33.0. --- srcpkgs/fzf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template index 71e7b17e21d6..adea1370913c 100644 --- a/srcpkgs/fzf/template +++ b/srcpkgs/fzf/template @@ -1,6 +1,6 @@ # Template file for 'fzf' pkgname=fzf -version=0.32.1 +version=0.33.0 revision=1 build_style=go go_import_path="github.com/junegunn/fzf" @@ -11,7 +11,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=c7afef61553b3b3e4e02819c5d560fa4acf33ecb39829aeba392c2e05457ca6a +checksum=136ddddfdb229631b08ea7e67be965bcf9c95f5fe1360b80b11f81aa64ba19ad post_install() { cd ${wrksrc} From 504c4c8832ef9bb4c63a7cae6e21543adfc65ef0 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 1 Sep 2022 14:56:23 +0200 Subject: [PATCH 0888/1407] scite: update to 5.3.0. --- srcpkgs/scite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template index 226cf45d84ac..96196bf43580 100644 --- a/srcpkgs/scite/template +++ b/srcpkgs/scite/template @@ -1,6 +1,6 @@ # Template file for 'scite' pkgname=scite -version=5.2.4 +version=5.3.0 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=d546165b06f01aa06bb3735484c392856e1defebf29f14160dfd7f8a2000d930 +checksum=32890add647faf2e1e57dc40006609e3580e27c43f20f6053b1b1c07b080a0a5 post_extract() { sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile From 6dee057116e117170c122aa3459202ef5ab551d7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 2 Sep 2022 16:04:21 +0200 Subject: [PATCH 0889/1407] tig: update to 2.5.7. --- srcpkgs/tig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tig/template b/srcpkgs/tig/template index 647bc57bc7fd..4bb6cef09952 100644 --- a/srcpkgs/tig/template +++ b/srcpkgs/tig/template @@ -1,6 +1,6 @@ # Template file for 'tig' pkgname=tig -version=2.5.6 +version=2.5.7 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure @@ -15,7 +15,7 @@ license="GPL-2.0-only" homepage="https://jonas.github.io/tig/" changelog="https://github.com/jonas/tig/blob/master/NEWS.adoc" distfiles="https://github.com/jonas/tig/archive/tig-${version}.tar.gz" -checksum=4805b73b29338ba225bc7b03301b4ed8803433b0a593dcf118bd750ac79a5786 +checksum=60a1acfda3238df28dfbe309adc1892a8c9b35138c738f1567c6c3c65c81fb72 pre_configure() { NOCONFIGURE=1 ./autogen.sh From b3834d17cadb691ed15628587712998b0dd35a5d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 2 Sep 2022 16:05:31 +0200 Subject: [PATCH 0890/1407] python3-pyinfra: update to 2.4. --- 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 d35d0342ce41..9e6087e5e622 100644 --- a/srcpkgs/python3-pyinfra/template +++ b/srcpkgs/python3-pyinfra/template @@ -1,6 +1,6 @@ # Template file for 'python3-pyinfra' pkgname=python3-pyinfra -version=2.3 +version=2.4 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=fb82d4a0f32b3500720d8b779bfd3d26e64ff56518f2b5633e219d5cc90a1fdb +checksum=00d206b1ae90386b19124842e0a8c39ddfffdc557a7c396f0cbfde169df919b4 post_extract() { vsed -i -e '/configparser/d' setup.py # is in Python 3.8 From 53b091aa371c8d0cdc5e1cfb2b62a6fe32416535 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 2 Sep 2022 16:06:45 +0200 Subject: [PATCH 0891/1407] perl-Plack: update to 1.0049. --- srcpkgs/perl-Plack/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Plack/template b/srcpkgs/perl-Plack/template index 7294d1db9bff..b99cfb1d8422 100644 --- a/srcpkgs/perl-Plack/template +++ b/srcpkgs/perl-Plack/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Plack' pkgname=perl-Plack -version=1.0048 +version=1.0049 revision=1 wrksrc="Plack-${version}" build_style=perl-module @@ -17,4 +17,4 @@ maintainer="Leah Neukirchen " homepage="https://metacpan.org/release/Plack" license="Artistic-1.0-Perl, GPL-1.0-or-later" distfiles="${CPAN_SITE}/Plack/Plack-${version}.tar.gz" -checksum=30f5f25e19b437859156a2526f61ca9ab708d50d5730c279189403aabfe542a6 +checksum=b5728e84d52a41598f60f108f0aebc75dcbc70b0c362f3a175177fca547c0418 From f0887f39f13a4c0388c89f7cfeb470685d88159f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 2 Sep 2022 16:07:36 +0200 Subject: [PATCH 0892/1407] python3-ropgadget: update to 7.0. --- srcpkgs/python3-ropgadget/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-ropgadget/template b/srcpkgs/python3-ropgadget/template index f8587ec7a1b9..dbc06306b0ad 100644 --- a/srcpkgs/python3-ropgadget/template +++ b/srcpkgs/python3-ropgadget/template @@ -1,6 +1,6 @@ # Template file for 'python3-ropgadget' pkgname=python3-ropgadget -version=6.9 +version=7.0 revision=1 wrksrc="ROPGadget-${version}" build_style=python3-module @@ -13,4 +13,4 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/JonathanSalwan/ROPgadget" distfiles="${PYPI_SITE}/R/ROPGadget/ROPGadget-${version}.tar.gz" -checksum=ab959e18edafd0eeb88801534544a79afc9f029e4f7ee9171011560754053289 +checksum=765975bac59a4208c61fea6d22445155acb4ff30791ffa2dc622716057f4354d From a81487e2cf29f2559076f553f4b7a19ec0bf1b61 Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm Date: Thu, 1 Sep 2022 14:28:49 +0100 Subject: [PATCH 0893/1407] linux5.19: Set CONFIG_RCU_EXP_CPU_STALL_TIMEOUT to zero The Void kernel config defines CONFIG_ANDROID, which in 5.19 inadvertantly sets CONFIG_RCU_EXP_CPU_STALL_TIMEOUT to 20. Setting it to zero matches previous and future behaviour. This was fixed in kernel v6.0: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1045a06724f322ed61f1ffb994427c7bdbe64647 Close: #39023 --- srcpkgs/linux5.19/files/arm64-dotconfig | 2 +- srcpkgs/linux5.19/files/i386-dotconfig | 2 +- srcpkgs/linux5.19/files/x86_64-dotconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux5.19/files/arm64-dotconfig b/srcpkgs/linux5.19/files/arm64-dotconfig index 2c6f82ecf62b..7189dede07df 100644 --- a/srcpkgs/linux5.19/files/arm64-dotconfig +++ b/srcpkgs/linux5.19/files/arm64-dotconfig @@ -12350,7 +12350,7 @@ CONFIG_TORTURE_TEST=m CONFIG_RCU_TORTURE_TEST=m CONFIG_RCU_REF_SCALE_TEST=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 CONFIG_RCU_TRACE=y # CONFIG_RCU_EQS_DEBUG is not set # end of RCU Debugging diff --git a/srcpkgs/linux5.19/files/i386-dotconfig b/srcpkgs/linux5.19/files/i386-dotconfig index 82e1c846ba3a..bf3ce35396c3 100644 --- a/srcpkgs/linux5.19/files/i386-dotconfig +++ b/srcpkgs/linux5.19/files/i386-dotconfig @@ -10479,7 +10479,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_REF_SCALE_TEST=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_TRACE is not set # CONFIG_RCU_EQS_DEBUG is not set # end of RCU Debugging diff --git a/srcpkgs/linux5.19/files/x86_64-dotconfig b/srcpkgs/linux5.19/files/x86_64-dotconfig index 3c6c45056643..749aaf7144ef 100644 --- a/srcpkgs/linux5.19/files/x86_64-dotconfig +++ b/srcpkgs/linux5.19/files/x86_64-dotconfig @@ -10745,7 +10745,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_REF_SCALE_TEST=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_TRACE is not set # CONFIG_RCU_EQS_DEBUG is not set # end of RCU Debugging From 2c8a4c2e3a964b7e6230d2db7e3d1893ddc67cea Mon Sep 17 00:00:00 2001 From: Ramdziana F Y Date: Fri, 2 Sep 2022 20:35:37 +0700 Subject: [PATCH 0894/1407] vivaldi: update to 5.4.2753.45 --- srcpkgs/vivaldi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template index 0bcd418e2193..3e9b613b798b 100644 --- a/srcpkgs/vivaldi/template +++ b/srcpkgs/vivaldi/template @@ -1,6 +1,6 @@ # Template file for 'vivaldi' pkgname=vivaldi -version=5.4.2753.40 +version=5.4.2753.45 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=3961f785aec7b1ab8fec71dd681069117cd8a135e8fbf939a7d53331e03b54c9 +checksum=d481b1c4bf2229e1cb88155593c9bad4bdd6cba51fa8ed6e193c3db2ac3badf9 repository=nonfree restricted=yes nostrip=yes From 54cb86368a8611e35049be78ca7059e06fd700ff Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 1 Sep 2022 09:17:38 -0400 Subject: [PATCH 0895/1407] python3-pybcj: update to 1.0.1. --- srcpkgs/python3-pybcj/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template index c6cef8f80b03..420b7ce605de 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.2 +version=1.0.1 revision=1 wrksrc="pybcj-${version}" build_style=python3-module @@ -11,6 +11,7 @@ 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" +homepage="https://codeberg.org/miurahr/pybcj" +changelog="https://codeberg.org/miurahr/pybcj/raw/branch/main/Changelog.rst" distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz" -checksum=050e7bf780b82b0c6ba4368c4a78953a1cf5922cef50e8b251fb8b87f0483ad7 +checksum=8b682ed08caabfb7c042d4be083e28ddc692afb1deff5567111f8855071b75c3 From 1d7bc8e8f5410d94e407247ccebefbeae4bf5d18 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 1 Sep 2022 09:19:36 -0400 Subject: [PATCH 0896/1407] python3-pyzstd: update to 0.15.3. --- .../patches/support_pytest.patch | 30 ------------------- srcpkgs/python3-pyzstd/template | 4 +-- 2 files changed, 2 insertions(+), 32 deletions(-) delete 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 deleted file mode 100644 index 05ffa75fab5b..000000000000 --- a/srcpkgs/python3-pyzstd/patches/support_pytest.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 c097aeb44a09..758ef737250e 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.2 +version=0.15.3 revision=1 wrksrc="pyzstd-${version}" build_style=python3-module @@ -15,7 +15,7 @@ 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=eda9d2874a8f3823eea882125f304620f592693b3af0101c484bfc75726c8c59 +checksum=ac4edab5d3955343e8f7f287e62cd2882907d46bcba4b406a1e9f84aa2887472 post_install() { vlicense LICENSE From 7ffdc05460224259115804497f29401d16e4ecaf Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 1 Sep 2022 09:22:06 -0400 Subject: [PATCH 0897/1407] python3-pyppmd: update to 0.18.3. --- srcpkgs/python3-pyppmd/template | 8 ++++---- srcpkgs/python3-pyppmd/update | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/python3-pyppmd/update diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template index a80c2a5f0382..649457c535c7 100644 --- a/srcpkgs/python3-pyppmd/template +++ b/srcpkgs/python3-pyppmd/template @@ -1,6 +1,6 @@ # Template file for 'python3-pyppmd' pkgname=python3-pyppmd -version=0.18.2 +version=0.18.3 revision=1 wrksrc="pyppmd-${version}" build_style=python3-module @@ -12,7 +12,7 @@ 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" +homepage="https://codeberg.org/miurahr/pyppmd" +changelog="https://codeberg.org/miurahr/pyppmd/raw/branch/main/Changelog.rst" distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz" -checksum=732b28ea25afa41a282c986178b29e60ea5ec2e2b67f66997af943f73d4673e0 +checksum=6c74ce28213044e33a595279019e8d71512d5d8188826d106df9083f2b3006c4 diff --git a/srcpkgs/python3-pyppmd/update b/srcpkgs/python3-pyppmd/update new file mode 100644 index 000000000000..e299d00ea67c --- /dev/null +++ b/srcpkgs/python3-pyppmd/update @@ -0,0 +1 @@ +ignore="*rc*" From 67ed602352fc230aef1f76999c062888c1243ea1 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 1 Sep 2022 10:05:02 -0400 Subject: [PATCH 0898/1407] New package: python3-inflate64-0.3.0 --- srcpkgs/python3-inflate64/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/python3-inflate64/template diff --git a/srcpkgs/python3-inflate64/template b/srcpkgs/python3-inflate64/template new file mode 100644 index 000000000000..c4baefb6de36 --- /dev/null +++ b/srcpkgs/python3-inflate64/template @@ -0,0 +1,17 @@ +# Template file for 'python3-inflate64' +pkgname=python3-inflate64 +version=0.3.0 +revision=1 +wrksrc="inflate64-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +makedepends="python3-devel" +depends="python3" +checkdepends="python3-pytest" +short_desc="Deflate64 compression/decompression library" +maintainer="Joel Beckmeyer " +license="LGPL-2.1-or-later" +homepage="https://codeberg.org/miurahr/inflate64" +changelog="https://codeberg.org/miurahr/inflate64/raw/branch/main/docs/Changelog.rst" +distfiles="${PYPI_SITE}/i/inflate64/inflate64-${version}.tar.gz" +checksum=81fb8e690fbcb92e7d3e6769ec4c6fbfabb88aade677f61b2f4c99874538bf64 From 107e84496591acd43ffa70825a9d960b24222e2b Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 1 Sep 2022 09:39:56 -0400 Subject: [PATCH 0899/1407] python3-py7zr: update to 0.20.0. --- srcpkgs/python3-py7zr/template | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template index e6e8e05ec41a..0f13d88d158a 100644 --- a/srcpkgs/python3-py7zr/template +++ b/srcpkgs/python3-py7zr/template @@ -1,14 +1,20 @@ # Template file for 'python3-py7zr' pkgname=python3-py7zr -version=0.18.4 +version=0.20.0 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-zipfile-deflate64" +build_style=python3-pep517 +# - test_concurrent.py fails on timeout. This test downloads several different +# 7z archives; likely failing due to slow download or dead links - +# tests/test_misc.py::test_extract_high_compression_rate fails only in chroot, +# but passes when run on my system +make_check_args="--ignore=tests/test_benchmark.py --noconftest + --ignore=tests/test_concurrent.py + --deselect=tests/test_misc.py::test_extract_high_compression_rate" +hostmakedepends="python3-setuptools_scm python3-wheel" +depends="python3-texttable python3-pycryptodomex python3-Brotli python3-psutil + python3-pyzstd python3-pyppmd python3-pybcj python3-multivolumefile + python3-inflate64" checkdepends="python3-pytest python3-pytest-timeout python3-py-cpuinfo $depends" short_desc="7zip in python3 with various compressions, and AES encryption" maintainer="Joel Beckmeyer " @@ -16,4 +22,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=6986e90ca4ca1f4999d57987a54d891673c9f8befa02c9c6cd8201893a17442c +checksum=2270f922f8d07bb8a83d28e1c57dd77570aea6bb876ed8eb4879a038c149ce5e From 961a7673ba870f69979e01ad996328752ad08978 Mon Sep 17 00:00:00 2001 From: octeep Date: Thu, 1 Sep 2022 12:02:15 +0800 Subject: [PATCH 0900/1407] wireproxy: update to 1.0.5 --- srcpkgs/wireproxy/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template index 984027a4f69e..15ff49dc0d12 100644 --- a/srcpkgs/wireproxy/template +++ b/srcpkgs/wireproxy/template @@ -1,16 +1,17 @@ # Template file for 'wireproxy' pkgname=wireproxy -version=1.0.1 +version=1.0.5 revision=1 build_style=go go_import_path="github.com/octeep/wireproxy" go_package="${go_import_path}/cmd/wireproxy" +go_ldflags="-X 'main.version=${version}'" 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 +checksum=3779a157713b462a7b5322f1437f768ab69ae446df0ceca76c6dff7c4030e425 make_dirs=" /etc/wireproxy 0750 root _wireproxy /var/lib/wireproxy 0700 _wireproxy _wireproxy" From 5c2da3fd44b9e320f9cf35e3661575fc335d70e6 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 2 Sep 2022 11:22:50 +0200 Subject: [PATCH 0901/1407] zoxide: update to 0.8.3 --- srcpkgs/zoxide/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template index 9391834fc8cc..c75b07434f5a 100644 --- a/srcpkgs/zoxide/template +++ b/srcpkgs/zoxide/template @@ -1,6 +1,6 @@ # Template file for 'zoxide' pkgname=zoxide -version=0.8.2 +version=0.8.3 revision=1 build_style=cargo short_desc="Faster way to navigate your filesystem" @@ -8,8 +8,8 @@ maintainer="Lorem " license="MIT" homepage="https://github.com/ajeetdsouza/zoxide" changelog="https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/CHANGELOG.md" -distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz" -checksum=3a977960284bc06f3c7f02ec93b6f269fd9f5bf933115828e6f46cf6c2601f5e +distfiles="https://github.com/ajeetdsouza/zoxide/archive/refs/tags/v${version}.tar.gz" +checksum=eb1839a4ab0ce7680c5a97dc753d006d5604b71c41a77047e981a439ac3b9de6 post_install() { vlicense LICENSE From b21f5a2736d216249e32c7b58d36c77c1e4f1eb2 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Thu, 1 Sep 2022 13:59:01 +0200 Subject: [PATCH 0902/1407] foot: update to 1.13.1. --- srcpkgs/foot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template index a21aba144cb6..8d736584b023 100644 --- a/srcpkgs/foot/template +++ b/srcpkgs/foot/template @@ -1,6 +1,6 @@ # Template file for 'foot' pkgname=foot -version=1.13.0 +version=1.13.1 revision=1 wrksrc=$pkgname build_style=meson @@ -15,7 +15,7 @@ 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=9fd10584d40f6aac6b87c11a94e1fdfc4bac43aef9144f4aa84213257672da8c +checksum=604f777fdaccfc1ee2d20376cc5688a819dcd6b7113725880cc973194fd6c737 conf_files="/etc/xdg/foot/foot.ini" post_install() { From 37eaa9f1e4036a09ae4a9a318c5d39e4dd06065f Mon Sep 17 00:00:00 2001 From: Tony Zorman Date: Thu, 1 Sep 2022 20:42:12 +0200 Subject: [PATCH 0903/1407] git-annex: update to 10.20220822 --- srcpkgs/git-annex/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template index 44440f32d0df..18c260fb7c68 100644 --- a/srcpkgs/git-annex/template +++ b/srcpkgs/git-annex/template @@ -1,6 +1,6 @@ # Template file for 'git-annex' pkgname=git-annex -version=10.20220525 +version=10.20220822 revision=1 build_style=haskell-stack makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel @@ -10,9 +10,10 @@ depends="git rsync curl lsof gnupg2" short_desc="Git addon for managing large files" 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" +homepage="https://git-annex.branchable.com" +changelog="https://git.joeyh.name/index.cgi/git-annex.git/plain/CHANGELOG" distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=c6c7b50df31acec63c70fd249e3e3d0d7e5140af8181057a0879f65131513cdb +checksum=ccad0c1595e1c0e7cf8da2d5b864f1d6715ddb7fce92cc6e2dcc7f71cf6263e3 nopie_files="/usr/bin/git-annex" nocross=yes From f375315446f043ad9d90239610daa1efd220b84a Mon Sep 17 00:00:00 2001 From: 0x5c Date: Thu, 1 Sep 2022 21:51:08 -0400 Subject: [PATCH 0904/1407] liquidwar: move to python3, cleanup. Added patch from debian (with small tweaks) to convert the documentation generator script from python2 to python3. Related to #38229 Added texinfo to hostmakedeps. Somehow, something changed outside the template since last version/revbump that caused info files to no longer be built. Disabled checks since the only one is a linter step that requires xmllint. Also fixed an xlint in the description. --- .../patches/python3-conversion.patch | 266 ++++++++++++++++++ srcpkgs/liquidwar/template | 6 +- 2 files changed, 270 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/liquidwar/patches/python3-conversion.patch diff --git a/srcpkgs/liquidwar/patches/python3-conversion.patch b/srcpkgs/liquidwar/patches/python3-conversion.patch new file mode 100644 index 000000000000..d997856503e6 --- /dev/null +++ b/srcpkgs/liquidwar/patches/python3-conversion.patch @@ -0,0 +1,266 @@ +Author: Reiner Herrmann +Description: Port makedoc.py to Python 3 + +-- +void-packages: patch cleaned up; fixed invalid escape sequences with +raw string literals +-- + +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -110,31 +110,31 @@ + + html/%.html: xml/%.xml makedoc.py html/header.inc html/footer.inc + @echo Creating $@ from $< +- @python -c "import makedoc; makedoc.make_html('$@','$<','html/header.inc','html/footer.inc')" ++ @python3 -c "import makedoc; makedoc.make_html('$@','$<','html/header.inc','html/footer.inc')" + + php/%.php: xml/%.xml makedoc.py + @echo Creating $@ from $< +- @python -c "import makedoc; makedoc.make_php('$@','$<')" ++ @python3 -c "import makedoc; makedoc.make_php('$@','$<')" + + tex/%.tex: xml/%.xml makedoc.py + @echo Creating $@ from $< +- @python -c "import makedoc; makedoc.make_tex('$@','$<')" ++ @python3 -c "import makedoc; makedoc.make_tex('$@','$<')" + + man/%.man: xml/%.xml makedoc.py + @echo Creating $@ from $< +- @python -c "import makedoc; makedoc.make_man('$@','$<')" ++ @python3 -c "import makedoc; makedoc.make_man('$@','$<')" + + txt/%.txt: xml/%.xml makedoc.py + @echo Creating $@ from $< +- @python -c "import makedoc; makedoc.make_txt('$@','$<','Liquid War (v$(VERSION))')" ++ @python3 -c "import makedoc; makedoc.make_txt('$@','$<','Liquid War (v$(VERSION))')" + + texi/%.texi: xml/%.xml makedoc.py + @echo Creating $@ from $< +- @python -c "import makedoc; makedoc.make_texi('$@','$<')" ++ @python3 -c "import makedoc; makedoc.make_texi('$@','$<')" + + uwc/%.uwc: xml/%.xml makedoc.py + @echo Creating $@ from $< +- @python -c "import makedoc; makedoc.make_uwc('$@','$<')" ++ @python3 -c "import makedoc; makedoc.make_uwc('$@','$<')" + + %.gz: % + @if [ -f $< ]; then echo "Compressing $@..."; gzip -c -9 $< > $@; fi +--- a/doc/makedoc.py ++++ b/doc/makedoc.py +@@ -16,14 +16,14 @@ + def remove_duplicate_blanks(text): + result=text + +- result=string.replace(result,"\t"," ") +- result=string.replace(result,"\n"," ") ++ result=result.replace("\t"," ") ++ result=result.replace("\n"," ") + + if (result!=""): + temp="" + while temp!=result: + temp=result +- result=string.replace(result," "," ") ++ result=result.replace(" "," ") + + return result + +@@ -63,10 +63,10 @@ + def format_email_and_url(text): + result=text + +- email=re.compile('"([\w\-\.]+@[\w\-\.]+)"') ++ email=re.compile(r'"([\w\-\.]+@[\w\-\.]+)"') + result=email.sub(r'\1',result); + +- url=re.compile('"http://([\w\-\.\~/]+)"', re.I) ++ url=re.compile(r'"http://([\w\-\.\~/]+)"', re.I) + result=url.sub(r'http://\1',result); + + return result +@@ -74,11 +74,11 @@ + def format_html(text): + result=text + +- result=string.replace(result,"<","ufoot_html_lt") +- result=string.replace(result,">","ufoot_html_gt") +- result=string.replace(result,"&","&") +- result=string.replace(result,"ufoot_html_lt","<") +- result=string.replace(result,"ufoot_html_gt",">") ++ result=result.replace("<","ufoot_html_lt") ++ result=result.replace(">","ufoot_html_gt") ++ result=result.replace("&","&") ++ result=result.replace("ufoot_html_lt","<") ++ result=result.replace("ufoot_html_gt",">") + + # Uncomment this to make mailing list adresses look like "xxx at xxx" + # instead of "xxx@xxx". This can prevent spammers from harvesting +@@ -86,10 +86,10 @@ + # fakeemail=re.compile('"([\w\.]+\-user)@([\w\-\.]+)"') + # result=fakeemail.sub(r'\1 at \2 (replace "at" by "@")',result); + +- email=re.compile('"([\w\-\.]+@[\w\-\.]+)"') ++ email=re.compile(r'"([\w\-\.]+@[\w\-\.]+)"') + result=email.sub(r'\1',result); + +- url=re.compile('"http://([\w\-\.\~/]+)"', re.I) ++ url=re.compile(r'"http://([\w\-\.\~/]+)"', re.I) + result=url.sub(r'\1',result); + + return result +@@ -97,31 +97,31 @@ + def format_tex(text): + result=text + +- result=string.replace(result,"\\","$\\backslash$") +- result=string.replace(result,"_","\\_") +- result=string.replace(result,"#","\\#") +- result=string.replace(result,"%","\\%") +- result=string.replace(result,"}","\\}") +- result=string.replace(result,"<","$<$") +- result=string.replace(result,">","$>$") +- result=string.replace(result,"~","$\\tilde{}$") ++ result=result.replace("\\","$\\backslash$") ++ result=result.replace("_","\\_") ++ result=result.replace("#","\\#") ++ result=result.replace("%","\\%") ++ result=result.replace("}","\\}") ++ result=result.replace("<","$<$") ++ result=result.replace(">","$>$") ++ result=result.replace("~","$\\tilde{}$") + + return result + + def format_texi(text): + result=text + +- result=string.replace(result,"@","@@") +- result=string.replace(result,"}","@}") +- result=string.replace(result,"{","@{") ++ result=result.replace("@","@@") ++ result=result.replace("}","@}") ++ result=result.replace("{","@{") + + return result + + def format_uwc(text): + result=text + +- result=string.replace(result,"]","]") +- result=string.replace(result,"[","[[") ++ result=result.replace("]","]") ++ result=result.replace("[","[[") + + return result + +@@ -139,8 +139,8 @@ + result=text + + result=format_uwc(result) +- result=string.replace(result,"\n"," ") +- result=string.replace(result,"\r"," ") ++ result=result.replace("\n"," ") ++ result=result.replace("\r"," ") + result=remove_duplicate_blanks(result) + + return result +@@ -208,7 +208,7 @@ + if tag=="code": + self.start_code() + def endElement(self,tag): +- data=string.strip(self.charbuf) ++ data=self.charbuf.strip() + if (data!=""): + self.write(self.translate(data,self.stack[-1])) + self.charbuf="" +@@ -366,7 +366,7 @@ + self.write("\n\\end{verbatim}\n") + def translate(self,data,tag): + result=data +- result=format_email_and_url(result) ++ result=format_email_and_url(result) + if (tag!="code"): + result=format_tex(result) + return result +@@ -405,12 +405,12 @@ + self.write("\n") + def translate(self,data,tag): + result=data +- result=format_email_and_url(result) +- result=string.replace(result,"\\","\\\\") +- result=string.replace(result,".","\.") +- result=string.replace(result,"-","\-") ++ result=format_email_and_url(result) ++ result=result.replace("\\","\\\\") ++ result=result.replace(".",r"\.") ++ result=result.replace("-",r"\-") + if (tag=="code"): +- result=string.replace(result,"\n","\n.br\n") ++ result=result.replace("\n","\n.br\n") + else: + result=remove_duplicate_blanks(result) + return result +@@ -460,10 +460,10 @@ + self.write("\n") + def translate(self,data,tag): + result=data +- result=format_email_and_url(result) ++ result=format_email_and_url(result) + if (tag=="code"): + result=" "*self.indent+\ +- string.replace(result,"\n","\n"+" "*self.indent) ++ result.replace("\n","\n"+" "*self.indent) + else: + result=format_text(result,self.indent,80) + if (tag=="elem"): +@@ -505,7 +505,7 @@ + self.write("\n@end example\n") + def translate(self,data,tag): + result=data +- result=format_email_and_url(result) ++ result=format_email_and_url(result) + + if (tag!="code"): + result=remove_duplicate_blanks(result) +@@ -548,7 +548,7 @@ + self.write("\n") + def translate(self,data,tag): + result=data +- result=format_email_and_url(result) ++ result=format_email_and_url(result) + + if (tag=="code"): + result=format_uwc_code(result) +@@ -560,7 +560,7 @@ + return result + + def run_parser(handler,dst,src): +- dst_file=open(dst,"w") ++ dst_file=open(dst,"wb") + src_file=open(src,"r") + #src_code=src_file.read() + parser=xml.sax.make_parser() +@@ -602,8 +602,8 @@ + run_parser(handler,txt_file,xml_file) + + def make_texi(texi_file,xml_file): +- node=string.replace(xml_file,".xml","") +- node=string.replace(node,"xml/","") ++ node=xml_file.replace(".xml","") ++ node=node.replace("xml/","") + parser=xml.sax.make_parser() + handler=XMLToTexi(node) + run_parser(handler,texi_file,xml_file) +--- a/configure.ac ++++ b/configure.ac +@@ -123,7 +123,7 @@ + + + dnl Various checks which will enable/disable some of the doc targets +-AC_CHECK_PROG(PYTHON,python,yes,no) ++AC_CHECK_PROG(PYTHON,python3,yes,no) + AC_CHECK_PROG(GZIP,gzip,yes,no) + AC_CHECK_PROG(LATEX,latex,yes,no) + AC_CHECK_PROG(DVIPS,dvips,yes,no) diff --git a/srcpkgs/liquidwar/template b/srcpkgs/liquidwar/template index 69bc87d1b1a7..cf6f74ff7747 100644 --- a/srcpkgs/liquidwar/template +++ b/srcpkgs/liquidwar/template @@ -6,15 +6,17 @@ build_style="gnu-configure" make_build_args="GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar" make_install_args="GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar" make_install_target="install_nolink" -hostmakedepends="python" +hostmakedepends="python3 texinfo" makedepends="allegro4-devel" -short_desc="A unique multiplayer wargame" +short_desc="Unique multiplayer wargame" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.ufoot.org/liquidwar" distfiles="http://www.ufoot.org/download/${pkgname}/v5/${version}/${pkgname}-${version}.tar.gz" checksum=dad0aa84dd416cad055421ed9b40df39efae78d3df759c0583c64c54f7f2ff5f nocross="run build artifarts" +# the only check is a linter for documentation sources that requires additional packages +make_check="no" CFLAGS="-fcommon" From 1c9ba552427f806eb24c4382c47eb36877c1dbda Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Thu, 23 Jun 2022 16:58:40 +0300 Subject: [PATCH 0905/1407] fish-shell: update to 3.5.1. --- srcpkgs/fish-shell/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template index 0fc86db7e7b0..5362009ae71b 100644 --- a/srcpkgs/fish-shell/template +++ b/srcpkgs/fish-shell/template @@ -1,12 +1,11 @@ # Template file for 'fish-shell' pkgname=fish-shell -version=3.4.1 +version=3.5.1 revision=1 wrksrc="fish-${version}" build_style=cmake hostmakedepends="gettext" makedepends="ncurses-devel pcre2-devel" -depends="groff" checkdepends="python3-pexpect procps-ng" short_desc="User friendly shell intended mostly for interactive use" maintainer="Nathan Owens " @@ -14,7 +13,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=b6f23b3843b04db6b0a90fea1f6f0d0e40cc027b4a732098200863f2864a94ea +checksum=a6d45b3dc5a45dd31772e7f8dfdfecabc063986e8f67d60bd7ca60cc81db6928 register_shell="/bin/fish /usr/bin/fish" # tests don't work as root make_check=ci-skip From 927b8d9978084c089110ebd610dc3c28fd637293 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Wed, 31 Aug 2022 09:31:50 -0400 Subject: [PATCH 0906/1407] nerd-fonts: update to 2.2.1 --- srcpkgs/nerd-fonts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nerd-fonts/template b/srcpkgs/nerd-fonts/template index 0481b3cfa7a3..a9f043be3076 100644 --- a/srcpkgs/nerd-fonts/template +++ b/srcpkgs/nerd-fonts/template @@ -1,14 +1,14 @@ # Template file for 'nerd-fonts' pkgname=nerd-fonts -version=2.1.0 -revision=3 +version=2.2.1 +revision=1 depends="font-util xbps-triggers nerd-fonts-ttf nerd-fonts-otf" short_desc="Iconic font aggregator, collection and patcher" maintainer="cinerea0 " license="MIT" homepage="https://nerdfonts.com" distfiles="https://github.com/ryanoasis/nerd-fonts/archive/v${version}.tar.gz" -checksum="a084ca91a174b547bab4523507824c76aa91ebcf38f9256a4ffd181813f87bd8" +checksum=05e733b4ac0a6fed997ca3a697c6881d4327991fa57f4376ae17d725413b89f7 do_install() { vmkdir usr/share/fonts/NerdFonts/otf From 4162b479b8f168a66d5850a6bc8bf378f6918acd Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Wed, 31 Aug 2022 09:28:13 -0400 Subject: [PATCH 0907/1407] mdcat: update to 0.28.0 --- srcpkgs/mdcat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template index 84a8294986a9..1afbf6376f12 100644 --- a/srcpkgs/mdcat/template +++ b/srcpkgs/mdcat/template @@ -1,6 +1,6 @@ # Template file for 'mdcat' pkgname=mdcat -version=0.27.1 +version=0.28.0 revision=1 wrksrc="${pkgname}" build_style=cargo @@ -14,7 +14,7 @@ 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=79961e0a842ee0f68aee3d54b39458352664c67388e56175a9d18d80f357bf14 +checksum=5d7b4f4b4c1066a679cd171e7d784b4ab8cad37c44d1e1b4250a21683abff9ca case "$XBPS_TARGET_MACHINE" in x86_64*|i686*|arm*|aarch64*) ;; From 14f8a397928f600c5b0778f40952a191b9247554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Tue, 30 Aug 2022 22:36:05 +0100 Subject: [PATCH 0908/1407] ImageMagick: update to 7.1.0.47. --- srcpkgs/ImageMagick/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index fa71c583d328..a0ed01b98383 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,6 +1,6 @@ # Template file for 'ImageMagick' pkgname=ImageMagick -version=7.1.0.46 +version=7.1.0.47 revision=1 _upstream_version="${version/.${version##*.}/-${version##*.}}" wrksrc=${pkgname}-${_upstream_version} @@ -19,7 +19,7 @@ license="ImageMagick" homepage="https://www.imagemagick.org" changelog="https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md" distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_upstream_version}.tar.gz" -checksum=51e9863ae4a52d6477da0aecc4f79ebccfc5da2721e7a0e63bf09f41700da43c +checksum=ad489af583bdfc0b5edd6c2106c955bf3af68fe838f6bd32c0ee8505ec6891ff subpackages="libmagick libmagick-devel" From a704afeab26b97ff731788de8335ff7d60343562 Mon Sep 17 00:00:00 2001 From: glaulher Date: Tue, 30 Aug 2022 17:58:41 -0300 Subject: [PATCH 0909/1407] icewm: update to 2.9.9. --- srcpkgs/icewm/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template index bfa83ab2a6d7..a46de55800ed 100644 --- a/srcpkgs/icewm/template +++ b/srcpkgs/icewm/template @@ -1,12 +1,12 @@ # Template file for 'icewm' pkgname=icewm -version=2.9.8 +version=2.9.9 revision=1 build_style=cmake make_cmd=make configure_args="-DENABLE_LTO=ON -DCONFIG_LIBRSVG=ON -DENABLE_ALSA=ON -DCONFIG_XPM=ON -DCONFIG_LIBJPEG=ON -DCFGDIR=/etc/icewm" -hostmakedepends="asciidoc gettext-devel libtool mkfontdir perl +hostmakedepends="python3-Markdown gettext-devel libtool mkfontdir perl pkg-config" makedepends="libSM-devel libXft-devel libXinerama-devel libXpm-devel libXrandr-devel libao-devel librsvg-devel libsndfile-devel @@ -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=970ff5234e0176054016a40accc8d80a865993366177d12567de56aa089eb7c9 +checksum=533314e5464a7340b8891cb6a2906b6b69b52dcd80d4d2fc15900adcc1950a41 # broken tests make_check=no From 5d85660ba98f2a0d5629de04d79ba51e5422f43d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sat, 14 May 2022 19:12:13 +0200 Subject: [PATCH 0910/1407] New package: blueprint-compiler-0.2.0 --- srcpkgs/blueprint-compiler/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/blueprint-compiler/template diff --git a/srcpkgs/blueprint-compiler/template b/srcpkgs/blueprint-compiler/template new file mode 100644 index 000000000000..0fdc3107925a --- /dev/null +++ b/srcpkgs/blueprint-compiler/template @@ -0,0 +1,14 @@ +# Template file for 'blueprint-compiler' +pkgname=blueprint-compiler +version=0.2.0 +revision=1 +wrksrc="${pkgname}-v${version}" +build_style=meson +depends="python3-gobject gobject-introspection" +checkdepends="${depends} gtk4-devel" +short_desc="Blueprint is a markup language and compiler for GTK 4 user interfaces" +maintainer="Jan Christian Grünhage " +license="LGPL-3.0-or-later" +homepage="https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/" +distfiles="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/v${version}/blueprint-compiler-v${version}.tar.gz" +checksum=d4e5444c95e8d0060c819d0ab96f79a7ea2673296be95a2fb00359d1d54a0d83 From b8e52e73a2b3386118f6a59a06cb5217868cfa9e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 2 Sep 2022 21:01:18 +0200 Subject: [PATCH 0911/1407] gtk+: set python_version to 3 since 2.24.33 gtk-builder-convert is compatible with Python 3 https://gitlab.gnome.org/GNOME/gtk/-/commit/56c6970b027740d1a35e8452a9172c9e7c2368d5 --- srcpkgs/gtk+/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template index 9bafe81beefc..06bbda0de151 100644 --- a/srcpkgs/gtk+/template +++ b/srcpkgs/gtk+/template @@ -1,7 +1,7 @@ # Template file for 'gtk+' pkgname=gtk+ version=2.24.33 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)" @@ -19,8 +19,8 @@ homepage="https://gtk.org" changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-2-24/NEWS" distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz" checksum=ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da -# gtk-builder-convert:794 -python_version=2 +# gtk-builder-convert +python_version=3 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED" # Package build options From 0dff2f6d66409c4bbe61ed5c0073a96eed9e8598 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 2 Sep 2022 15:23:40 -0400 Subject: [PATCH 0912/1407] chezmoi: update to 2.22.0. --- srcpkgs/chezmoi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 86e49437e8d8..176972223063 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,6 +1,6 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.21.0 +version=2.22.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=4c4e741b225a3e23c5e80143567482f6cf9c237c8b92c78199731ca78b96cb8b +checksum=83b396ab0f4e293d90baffd96ace2ac63aac2ec4679e72b931d075d27da67a86 pre_build() { local _date From a428cc94219f5dda0e81620fe9b6e9db958fca3b Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 2 Sep 2022 15:26:44 -0400 Subject: [PATCH 0913/1407] libjaylink: update to 0.3.1. --- srcpkgs/libjaylink/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libjaylink/template b/srcpkgs/libjaylink/template index 625ad84338f6..56eae2f11537 100644 --- a/srcpkgs/libjaylink/template +++ b/srcpkgs/libjaylink/template @@ -1,6 +1,6 @@ # Template file for 'libjaylink' pkgname=libjaylink -version=0.3.0 +version=0.3.1 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -11,11 +11,10 @@ license="GPL-2.0-or-later" homepage="https://gitlab.zapb.de/libjaylink/libjaylink" changelog="https://gitlab.zapb.de/libjaylink/libjaylink/-/raw/master/NEWS" distfiles="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${version}/libjaylink-${version}.tar.gz" -checksum=7885e295a567bcacb3f5ec825647d99b2bb0f7e37ccb390019813ff6e249b9b5 +checksum=a2d98c1aa13dcf41c6c681767a43cdefc42b6f71af9362937555051007514cd9 pre_configure() { ./autogen.sh - vsed -e '3904s/^+//' -i configure } libjaylink-devel_package() { From e837e305cfd083e27cd44a1ef9bcc08cab4fbc88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Wed, 31 Aug 2022 13:44:46 +0100 Subject: [PATCH 0914/1407] xkeyboard-config: fix upstream issue. use backslashes instead of slashes for line continuation This fixes 324 (https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/324) --- .../patches/fix_backlashes.patch | 56 +++++++++++++++++++ srcpkgs/xkeyboard-config/template | 2 +- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xkeyboard-config/patches/fix_backlashes.patch diff --git a/srcpkgs/xkeyboard-config/patches/fix_backlashes.patch b/srcpkgs/xkeyboard-config/patches/fix_backlashes.patch new file mode 100644 index 000000000000..e5776cd83ead --- /dev/null +++ b/srcpkgs/xkeyboard-config/patches/fix_backlashes.patch @@ -0,0 +1,56 @@ +From 8ac41c50ab0aa7cd3a7e94313074115de2a172d2 Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg +Date: Fri, 10 Jun 2022 12:05:52 +0200 +Subject: [PATCH] rules: use backslashes instead of slashes for line + continuation :\ + +This fixes #324. + +Reported-by: Adriaan de Groot + +Bug existed since commit c3c5d02a7e from six weeks ago. + +Signed-off-by: Benno Schulenberg +--- + rules/0002-base.lists.part | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/rules/0002-base.lists.part b/rules/0002-base.lists.part +index 0af6db56..cb661240 100644 +--- a/rules/0002-base.lists.part ++++ b/rules/0002-base.lists.part +@@ -37,18 +37,18 @@ + unitekkb1925 yahoo + + ! $inetmediakbds = \ +- a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop / +- armada asus_laptop benqx btc5090 btc6301urf btc9019u / +- cherrybluea cherryblueb cherrycyboard chicony042 / +- compalfl90 compaqik13 compaqik18 creativedw7000 / +- cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 / +- emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy / +- geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf / +- hpxe4xxx hpxt1000 hpzt11xx inspiron latitude / +- logidinovo logidinovoedge logitech_base logitech_g15 / +- microsoft4000 microsoft7000 microsoftmult microsoftpro / +- microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m / +- presario propeller samsung4500 samsung4510 scorpius / +- silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 / +- thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 / ++ a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop \ ++ armada asus_laptop benqx btc5090 btc6301urf btc9019u \ ++ cherrybluea cherryblueb cherrycyboard chicony042 \ ++ compalfl90 compaqik13 compaqik18 creativedw7000 \ ++ cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 \ ++ emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy \ ++ geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf \ ++ hpxe4xxx hpxt1000 hpzt11xx inspiron latitude \ ++ logidinovo logidinovoedge logitech_base logitech_g15 \ ++ microsoft4000 microsoft7000 microsoftmult microsoftpro \ ++ microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m \ ++ presario propeller samsung4500 samsung4510 scorpius \ ++ silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 \ ++ thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 \ + toshiba_s3000 trust trustda trust_slimline unitekkb1925 +-- +GitLab diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template index 35fbce369b42..85bfeb5c425a 100644 --- a/srcpkgs/xkeyboard-config/template +++ b/srcpkgs/xkeyboard-config/template @@ -1,7 +1,7 @@ # Template file for 'xkeyboard-config' pkgname=xkeyboard-config version=2.36 -revision=1 +revision=2 build_style=meson configure_args="-Dxorg-rules-symlinks=true -Dcompat-rules=true" hostmakedepends="pkg-config libxslt python3 intltool perl" From a1841863ee2648dcf45ad30130acef2732626bb7 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 25 Aug 2022 15:13:56 -0400 Subject: [PATCH 0915/1407] python3-elementpath: update to 3.0.2. --- srcpkgs/python3-elementpath/template | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template index 1145bc45c6cd..f4e9a8267d6b 100644 --- a/srcpkgs/python3-elementpath/template +++ b/srcpkgs/python3-elementpath/template @@ -1,29 +1,23 @@ # Template file for 'python3-elementpath' pkgname=python3-elementpath -version=2.4.0 +version=3.0.2 revision=1 wrksrc=elementpath-${version} build_style=python3-module +# depends on xmlschema and memory_profiling +make_check_args="--ignore tests/memory_profiling.py \ + --ignore tests/execute_w3c_tests.py" hostmakedepends="python3-setuptools" depends="python3" -checkdepends="python3-lxml" +checkdepends="python3-lxml python3-pytest" short_desc="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml" maintainer="Đoàn Trần Công Danh " license="MIT" homepage="https://github.com/sissaschool/elementpath" distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz" -checksum=5b6801b3be94d48d213beb7b8ebad96addb35c95fc6a9c062c80e033b4a32fe8 +checksum=cca18742dc0f354f79874c41a906e6ce4cc15230b7858d22a861e1ec5946940f post_patch() { - # depends on xmlschema and memory_profiling - rm -f tests/memory_profiling.py tests/execute_w3c_tests.py - # unparsed text is broken - vsed -i ' - /def test_unparsed_text_function/,/^ *def /{ - /def test_unparse/d - /^ *def /!d - } - ' tests/test_xpath3.py # locale handling in musl is NOT that ideal, # those tests are broken on musl if [ "$XBPS_TARGET_LIBC" = musl ]; then From 8e7a59a06b6b25f4de6a938f8575bd4bf6020886 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 25 Aug 2022 15:18:06 -0400 Subject: [PATCH 0916/1407] python3-xmlschema: update to 2.0.3. --- srcpkgs/python3-xmlschema/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-xmlschema/template b/srcpkgs/python3-xmlschema/template index 39798935bd80..21d3ef9eb1d3 100644 --- a/srcpkgs/python3-xmlschema/template +++ b/srcpkgs/python3-xmlschema/template @@ -1,6 +1,6 @@ # Template file for 'python3-xmlschema' pkgname=python3-xmlschema -version=1.9.2 +version=2.0.3 revision=1 wrksrc=xmlschema-${version} build_style=python3-module @@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh " license="MIT" homepage="https://github.com/sissaschool/xmlschema" distfiles="${PYPI_SITE}/x/xmlschema/xmlschema-${version}.tar.gz" -checksum=3ce6fe408a8c0a0ca5917cbe6181a933dfb5cfade9714eeb07b6335f9aff7b10 +checksum=adef8cb1e6572fe095b56ae4243b3618f842b32adba98e1b1bab0bd014f2234e post_install() { vlicense LICENSE From 6271524e1d6cd8f7d7f0c984d66054b62738871b Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 25 Aug 2022 15:08:33 -0400 Subject: [PATCH 0917/1407] python3-saml2: update to 7.2.1. --- srcpkgs/python3-saml2/template | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template index ce87ae737d8d..9c12d9fd5a79 100644 --- a/srcpkgs/python3-saml2/template +++ b/srcpkgs/python3-saml2/template @@ -1,9 +1,12 @@ # Template file for 'python3-saml2' pkgname=python3-saml2 -version=7.1.2 +version=7.2.1 revision=1 wrksrc="pysaml2-${version}" build_style=python3-module +make_check_args="--ignore=tests/test_36_mdbcache.py \ + --ignore=tests/test_75_mongodb.py \ + --ignore=tests/test_76_metadata_in_mdb.py" hostmakedepends="python3-setuptools" depends="python3-cryptography python3-openssl python3-dateutil python3-pytz python3-requests python3-six python3-defusedxml python3-xmlschema" @@ -15,12 +18,5 @@ license="Apache-2.0" homepage="https://github.com/IdentityPython/pysaml2" changelog="https://raw.githubusercontent.com/IdentityPython/pysaml2/master/CHANGELOG.md" distfiles="https://github.com/IdentityPython/pysaml2/archive/v${version}.tar.gz" -checksum=308934d5cd5f22a3ea7bd8d4fb5423ab0f5b0f08bf541e7c6b2cb0eb7302a3ab - -do_check() { - # Ignore tests that depend on unpackaged python dependency 'pymongo' - PYTHONPATH=src python3 -m pytest \ - --ignore=tests/test_36_mdbcache.py \ - --ignore=tests/test_75_mongodb.py \ - --ignore=tests/test_76_metadata_in_mdb.py -} +checksum=c6f5e36c0df040ebeccc0acc0be65960a2f12aaba1d77bbdae29cc3c475b0cdc +make_check_pre="env PYTHONPATH=src" From 169ecd0e07e8a562dd4496b806b148167c2675c2 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 25 Aug 2022 15:27:22 -0400 Subject: [PATCH 0918/1407] python3-phonenumbers: update to 8.12.54. --- 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 52e3cd6e3c5a..9b863eec5273 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.53 +version=8.12.54 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=b945c1410d52448bb560a869e0a77af343422c96da55efbb2a44c5da38df299a +checksum=ec1ac87bed33640ef85e0b00be44e247c65367e8b846d3d8d0a10e0fb7aae1b9 From 59d95875152088d99535835bc9fca5138442a97e Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 26 Aug 2022 09:15:01 -0400 Subject: [PATCH 0919/1407] python3-simplejson: update to 3.17.6, adopt. --- srcpkgs/python3-simplejson/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-simplejson/template b/srcpkgs/python3-simplejson/template index 905ebb3e4e6d..941f5a15c810 100644 --- a/srcpkgs/python3-simplejson/template +++ b/srcpkgs/python3-simplejson/template @@ -1,19 +1,20 @@ # Template file for 'python3-simplejson' pkgname=python3-simplejson -version=3.17.2 -revision=3 +version=3.17.6 +revision=1 wrksrc="simplejson-${version}" build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" depends="python3" +checkdepends="python3-pytest" short_desc="Simple, fast, extensible JSON encoder/decoder for Python3" -maintainer="Orphaned " +maintainer="Joel Beckmeyer " license="MIT, AFL-2.1" homepage="https://github.com/simplejson/simplejson" changelog="https://raw.githubusercontent.com/simplejson/simplejson/master/CHANGES.txt" -distfiles="https://github.com/simplejson/simplejson/releases/download/v${version}/simplejson-${version}.tar.gz" -checksum=75ecc79f26d99222a084fbdd1ce5aad3ac3a8bd535cd9059528452da38b68841 +distfiles="https://github.com/simplejson/simplejson/archive/refs/tags/v${version}.tar.gz" +checksum=5522f3113924325499f15cd8a3fe47a42dfa127a6b76c1921b51cf3c3f2a6aa6 post_install() { vlicense LICENSE.txt LICENSE From f7876b51da8916ca98b477a4b3a45b1ae6ddcae0 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 31 Aug 2022 09:25:22 -0400 Subject: [PATCH 0920/1407] New package: python3-pydantic-1.10.1 --- srcpkgs/python3-pydantic/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/python3-pydantic/template diff --git a/srcpkgs/python3-pydantic/template b/srcpkgs/python3-pydantic/template new file mode 100644 index 000000000000..d73778a7ff71 --- /dev/null +++ b/srcpkgs/python3-pydantic/template @@ -0,0 +1,20 @@ +# Template file for 'python3-pydantic' +pkgname=python3-pydantic +version=1.10.1 +revision=1 +wrksrc="pydantic-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-typing_extensions" +checkdepends="${depends} python3-pytest python3-pytest-mock" +short_desc="Data parsing and validation using Python type hints" +maintainer="Joel Beckmeyer " +license="MIT" +homepage="https://github.com/pydantic/pydantic" +changelog="https://raw.githubusercontent.com/pydantic/pydantic/main/HISTORY.md" +distfiles="${PYPI_SITE}/p/pydantic/pydantic-${version}.tar.gz" +checksum=d41bb80347a8a2d51fbd6f1748b42aca14541315878447ba159617544712f770 + +post_install() { + vlicense LICENSE +} From 2f252c1d6eb459e3f357fddec890ba96c45b6d70 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 31 Aug 2022 09:06:42 -0400 Subject: [PATCH 0921/1407] synapse: update to 1.66.0. --- srcpkgs/synapse/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index c0c9864974fc..65d4d87c7610 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,6 +1,6 @@ # Template file for 'synapse' pkgname=synapse -version=1.65.0 +version=1.66.0 revision=1 build_style=python3-pep517 make_check_target=tests @@ -14,7 +14,7 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson python3-setuptools python3-bleach python3-Jinja2 python3-psycopg2 python3-lxml python3-saml2 python3-treq python3-macaroons python3-sortedcontainers python3-typing_extensions python3-ijson python3-matrix-common - python3-packaging" + python3-packaging python3-pydantic" checkdepends="$depends python3-parameterized unzip" short_desc="Matrix reference homeserver" maintainer="Joel Beckmeyer " @@ -22,7 +22,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=1872baa5a8a7124d0b4a02acb12a613488eb74d78c591bb85a32eb13de8576c4 +checksum=fa9f9ec286dc1ef967c442f9c87b9d722222b2a9cb3ef25b6bdbb0f20407a911 system_accounts="synapse" synapse_homedir="/var/lib/synapse" From 4cb91154508fd1c26d5a6333d34770dee1e77405 Mon Sep 17 00:00:00 2001 From: icp Date: Wed, 31 Aug 2022 00:49:42 +0530 Subject: [PATCH 0922/1407] fonttools: update to 4.37.1. --- srcpkgs/fonttools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fonttools/template b/srcpkgs/fonttools/template index cbe2d7e98911..23e51993a786 100644 --- a/srcpkgs/fonttools/template +++ b/srcpkgs/fonttools/template @@ -1,6 +1,6 @@ # Template file for 'fonttools' pkgname=fonttools -version=4.36.0 +version=4.37.1 revision=1 build_style=python3-module make_check_args="--deselect Tests/otlLib/optimize_test.py::test_main @@ -14,7 +14,7 @@ license="MIT, OFL-1.1, BSD-3-Clause" homepage="https://github.com/fonttools/fonttools" changelog="https://raw.githubusercontent.com/fonttools/fonttools/main/NEWS.rst" distfiles="https://github.com/fonttools/fonttools/archive/${version}.tar.gz" -checksum=7f48433c42351102f25e63778c702be8bed76bfa6c192c67e6d0e985c01f674e +checksum=9a94f852b602540b11aa520952245ddebc22a490f74d838dbb88f82710a4db20 replaces="python-fonttools>=0 python3-fonttools>=0" provides="python-fonttools-${version}_${revision} python3-fonttools-${version}_${revision}" From 01c52fbdc7663850dec6792641744e7b04a2f389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Thu, 1 Sep 2022 22:21:29 +0200 Subject: [PATCH 0923/1407] yt-dlp: update to 2022.09.01. --- 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 ebe05b64fa80..fb8d8be82bb1 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.08.14 +version=2022.09.01 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=6a3cbf305fdfdc3b531761cf5457f904ef127fe5a837b511bb63703cf14f65ab +checksum=675ff266e9400c47bb4df947ab3e7d5e9d4c362abcadd2c61ba341e86590f1df do_check() { PYTHON=/usr/bin/python3 make offlinetest From 4340ddf135d325fd162f3210a499f2279340c61e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 21 Jun 2022 13:25:08 +0200 Subject: [PATCH 0924/1407] tootle: fix build with vala 0.56 --- srcpkgs/tootle/patches/vala-0.56b.patch | 69 +++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 srcpkgs/tootle/patches/vala-0.56b.patch diff --git a/srcpkgs/tootle/patches/vala-0.56b.patch b/srcpkgs/tootle/patches/vala-0.56b.patch new file mode 100644 index 000000000000..2432c03c28a9 --- /dev/null +++ b/srcpkgs/tootle/patches/vala-0.56b.patch @@ -0,0 +1,69 @@ +diff --git a/src/API/NotificationType.vala b/src/API/NotificationType.vala +index c3f4420..15ba2ae 100644 +--- a/src/API/NotificationType.vala ++++ b/src/API/NotificationType.vala +@@ -5,7 +5,8 @@ public enum Tootle.API.NotificationType { + FAVOURITE, + FOLLOW, + FOLLOW_REQUEST, // Internal +- WATCHLIST; // Internal ++ WATCHLIST, // Internal ++ NONE; // Internal + + public string to_string () { + switch (this) { +diff --git a/src/Widgets/Notification.vala b/src/Widgets/Notification.vala +index 3e2fe54..41ed71f 100644 +--- a/src/Widgets/Notification.vala ++++ b/src/Widgets/Notification.vala +@@ -16,7 +16,7 @@ public class Tootle.Widgets.Notification : Widgets.Status { + } + + protected override void on_kind_changed () { +- if (kind == null) ++ if (kind == API.NotificationType.NONE) + return; + + header_icon.visible = header_label.visible = true; +diff --git a/src/Widgets/Status.vala b/src/Widgets/Status.vala +index ef51340..ce1c951 100644 +--- a/src/Widgets/Status.vala ++++ b/src/Widgets/Status.vala +@@ -5,7 +5,7 @@ using Gdk; + public class Tootle.Widgets.Status : ListBoxRow { + + public API.Status status { get; construct set; } +- public API.NotificationType? kind { get; construct set; } ++ public API.NotificationType kind { get; construct set; } + + public enum ThreadRole { + NONE, +@@ -113,7 +113,7 @@ public class Tootle.Widgets.Status : ListBoxRow { + notify["kind"].connect (on_kind_changed); + open.connect (on_open); + +- if (kind == null) { ++ if (kind == API.NotificationType.NONE) { + if (status.reblog != null) + kind = API.NotificationType.REBLOG_REMOTE_USER; + } +@@ -164,7 +164,7 @@ public class Tootle.Widgets.Status : ListBoxRow { + menu_button.clicked.connect (open_menu); + } + +- public Status (owned API.Status status, API.NotificationType? kind = null) { ++ public Status (owned API.Status status, API.NotificationType kind = API.NotificationType.NONE) { + Object ( + status: status, + kind: kind +@@ -180,8 +180,8 @@ public class Tootle.Widgets.Status : ListBoxRow { + } + + protected virtual void on_kind_changed () { +- header_icon.visible = header_label.visible = (kind != null); +- if (kind == null) ++ header_icon.visible = header_label.visible = (kind != API.NotificationType.NONE); ++ if (kind == API.NotificationType.NONE) + return; + + header_icon.icon_name = kind.get_icon (); From ee7eb326a6ffe33ccf594e305dc14c2188ec0593 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Jun 2022 13:24:44 +0200 Subject: [PATCH 0925/1407] gegl: update to 0.4.38. --- srcpkgs/gegl/template | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template index cd195ed8846b..0c34513f2d51 100644 --- a/srcpkgs/gegl/template +++ b/srcpkgs/gegl/template @@ -1,6 +1,6 @@ # Template file for 'gegl' pkgname=gegl -version=0.4.34 +version=0.4.38 revision=1 build_style=meson build_helper="gir" @@ -8,20 +8,24 @@ configure_args="-Ddocs=false -Dintrospection=true -Dlibspiro=disabled -Dlibv4l=disabled -Dlibv4l2=disabled -Dlua=disabled -Dmrg=disabled -Dopenexr=disabled -Dsdl2=disabled -Dvapigen=disabled -Dlibav=disabled -Dumfpack=disabled" -hostmakedepends="pkg-config intltool" +hostmakedepends="pkg-config gettext" makedepends="babl-devel exiv2-devel gtk+-devel jasper-devel json-glib-devel lensfun-devel libgexiv2-devel librsvg-devel libraw-devel libwebp-devel python3-gobject-devel poppler-glib-devel" short_desc="Graph based image processing framework" maintainer="Enno Boland " license="GPL-3.0-only, LGPL-3.0-only" -homepage="https://www.gimp.org" -changelog="https://gitlab.gnome.org/GNOME/gegl/raw/master/docs/NEWS.txt" +homepage="https://gegl.org/" +changelog="https://gitlab.gnome.org/GNOME/gegl/-/raw/master/docs/NEWS.adoc" distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.xz" -checksum=ef63f0bca5b431c6119addd834ca7fbb507c900c4861c57b3667b6f4ccfcaaaa +checksum=e4a33c8430a5042fba8439b595348e71870f0d95fbf885ff553f9020c1bed750 + +case "$XBPS_TARGET_MACHINE" in + arm*) configure_args+=" -Db_lto=false" +esac gegl-devel_package() { - depends="json-glib-devel babl-devel gegl>=${version}_${revision}" + depends="json-glib-devel babl-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 5390a85b172570ba9f5842e92bbf06e2dd231b2c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 20 Jun 2022 13:36:46 +0200 Subject: [PATCH 0926/1407] babl: update to 0.1.96. --- srcpkgs/babl/patches/meson-0.62.patch | 33 --------------------------- srcpkgs/babl/template | 15 ++++++++---- 2 files changed, 10 insertions(+), 38 deletions(-) delete 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 deleted file mode 100644 index a105c98cb0db..000000000000 --- a/srcpkgs/babl/patches/meson-0.62.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 - diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template index 1ed797f599da..c220d2ccbdf1 100644 --- a/srcpkgs/babl/template +++ b/srcpkgs/babl/template @@ -1,6 +1,6 @@ # Template file for 'babl' pkgname=babl -version=0.1.88 +version=0.1.96 revision=1 build_style=meson build_helper=gir @@ -10,16 +10,21 @@ makedepends="lcms2-devel vala-devel" short_desc="Dynamic pixel format translation library" maintainer="Enno Boland " license="LGPL-3.0-only" -homepage="http://gegl.org/babl/" -changelog="https://raw.githubusercontent.com/GNOME/babl/master/NEWS" +homepage="https://gegl.org/babl/" +changelog="https://gitlab.gnome.org/GNOME/babl/-/raw/master/NEWS" distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.xz" -checksum=4f0d7f4aaa0bb2e725f349adf7b351a957d9fb26d555d9895a7af816b4167039 +checksum=33673fe459a983f411245a49f81fd7f1966af1ea8eca9b095a940c542b8545f6 + +case "$XBPS_TARGET_MACHINE" in + arm*) configure_args+=" -Db_lto=false" +esac babl-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" + depends="lcms2-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include + vmove usr/share/vala vmove usr/lib/pkgconfig vmove "usr/lib/*.so" vmove "usr/share/gir-*" From 42d61e883a86b77d5b43c4767b4fce3fa6296a4e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 14 Aug 2022 17:45:54 +0200 Subject: [PATCH 0927/1407] gedit: update to 42.2. --- srcpkgs/gedit/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index 822d3e282cd8..090f776b6384 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -1,6 +1,6 @@ # Template file for 'gedit' pkgname=gedit -version=42.1 +version=42.2 revision=1 build_helper="gir" build_style=meson @@ -10,18 +10,18 @@ makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel libpeas-devel python3-gobject-devel" depends="desktop-file-utils gsettings-desktop-schemas iso-codes" short_desc="Text editor for GNOME" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Gedit" changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7f1fd43df5110d4c37de6541993f41f0fbc3efc790900e92053479ba069920e9 +checksum=3c6229111f0ac066ae44964920791d1265f5bbb56b0bd949a69b7b1261fc8fca shlib_provides="libgedit-41.so" python_version=3 gedit-devel_package() { - depends="${sourcepkg}>=${version}_${revision} gtksourceview4-devel - libpeas-devel" + depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel + gtksourceview4-devel libpeas-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From a6da5058522fa153414264ce49133e5f88551ff6 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Tue, 30 Aug 2022 11:52:48 -0700 Subject: [PATCH 0928/1407] runc: update to 1.1.4 --- srcpkgs/runc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template index ef7d7995d07a..2072901d6181 100644 --- a/srcpkgs/runc/template +++ b/srcpkgs/runc/template @@ -1,6 +1,6 @@ # Template file for 'runc' pkgname=runc -version=1.1.3 +version=1.1.4 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=2db1f3a01ffd2f8fa3a259b9b512ca7d4dbf89be5765cc58d306e45658668453 +checksum=9f5972715dffb0b2371e4d678c1206cc8c4ec5eb80f2d48755d150bac49be35b post_build() { make man From 62dbb5cdcd91c24bdb76634359bdea9c8348ed5d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 2 Sep 2022 22:59:15 +0200 Subject: [PATCH 0929/1407] containerd: update to 1.6.8. --- srcpkgs/containerd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template index 12c3d9ed3f15..34fa3909d589 100644 --- a/srcpkgs/containerd/template +++ b/srcpkgs/containerd/template @@ -1,6 +1,6 @@ # Template file for 'containerd' pkgname=containerd -version=1.6.6 +version=1.6.8 revision=1 build_style=go go_import_path=github.com/containerd/containerd @@ -20,7 +20,7 @@ maintainer="Paul Knopf " license="Apache-2.0" homepage="https://github.com/containerd/containerd" distfiles="https://github.com/containerd/containerd/archive/v${version}.tar.gz" -checksum=27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24 +checksum=f5f938513c28377f64f85e84f2750d39f26b01262f3a062b7e8ce35b560ca407 make_dirs="/var/lib/containerd 0755 root root" post_build() { From 43daaa8039e201c4e1429f2232958a8bca37037d Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Tue, 30 Aug 2022 11:58:32 -0700 Subject: [PATCH 0930/1407] podman: update to 4.2.0 --- srcpkgs/podman/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template index bc2e8cce46cb..3b07673c4e23 100644 --- a/srcpkgs/podman/template +++ b/srcpkgs/podman/template @@ -1,6 +1,6 @@ # Template file for 'podman' pkgname=podman -version=4.1.0 +version=4.2.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=f814e12a7311d486c1ccdc4eb021bc6dd24499569de7a572e436342876f70e95 +checksum=15f8bc59025ccd97dc9212a552e7274dfb79e1633b02d6a2a7f63d747eadb2f4 if [ "$CROSS_BUILD" ]; then go_build_tags+=" containers_image_openpgp" From 7097e72b448e7b2168b81679961ec0ef81ab9357 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 2 Sep 2022 22:59:13 +0200 Subject: [PATCH 0931/1407] docker-compose: update to 2.10.2. --- srcpkgs/docker-compose/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template index de87881f75d3..c96225550bce 100644 --- a/srcpkgs/docker-compose/template +++ b/srcpkgs/docker-compose/template @@ -1,6 +1,6 @@ # Template file for 'docker-compose' pkgname=docker-compose -version=2.6.1 +version=2.10.2 revision=1 wrksrc="compose-${version}" build_style=go @@ -12,7 +12,7 @@ maintainer="Michal Vasilek " license="Apache-2.0" homepage="https://docs.docker.com/compose/" distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.gz" -checksum=7d4ad5354e382809368016210b33c4f6c3bca68da15e36edc671da00fb234666 +checksum=74c86d544fcfb80bb2d3b58187bd017adb0e62863d22114a66c14fc94fdbc421 post_install() { mkdir -p ${DESTDIR}/usr/libexec/docker/cli-plugins From 9986f298657f19aaf242db7afded80e1d193b44d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 2 Sep 2022 23:01:10 +0200 Subject: [PATCH 0932/1407] docker-buildx: update to 0.9.1. --- srcpkgs/docker-buildx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/docker-buildx/template b/srcpkgs/docker-buildx/template index 8c203a800576..dba5899c8496 100644 --- a/srcpkgs/docker-buildx/template +++ b/srcpkgs/docker-buildx/template @@ -1,6 +1,6 @@ # Template file for 'docker-buildx' pkgname=docker-buildx -version=0.8.2 +version=0.9.1 revision=1 wrksrc="buildx-${version}" build_style=go @@ -12,7 +12,7 @@ maintainer="Gabriel Sanches " license="Apache-2.0" homepage="https://docs.docker.com/buildx/working-with-buildx/" distfiles="https://github.com/docker/buildx/archive/refs/tags/v${version}.tar.gz" -checksum=5a368ffa7c0fd3df510bbb89f345bea9be490a3783de350d2b79b3ed69c237fe +checksum=22b0d2acfffaaa4a52d13cd6fa78608e9c817c3d1bdfbaf2e274242325bb293d post_install() { vmkdir usr/libexec/docker/cli-plugins From 96f92071912c4f89d38ecbe354425d22f6d24c5f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 24 Aug 2022 00:25:24 +0200 Subject: [PATCH 0933/1407] common/shlibs: remove old entries --- common/shlibs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index 21a43eac0a7d..c1134b639fd2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -345,9 +345,6 @@ libgsf-1.so.114 libgsf-1.14.11_1 libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1 -libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1 -libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1 -libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1 libltdl.so.7 libltdl-2.2.6_1 libpoppler.so.122 libpoppler-22.06.0_1 libpoppler-glib.so.8 poppler-glib-0.18.2_1 @@ -1400,7 +1397,6 @@ libopts.so.25 libopts-5.18.4_6 libanjuta-3.so.0 anjuta-3.8.4_1 libgmlib.so.1 gmtk-1.0.8_1 libgmtk.so.1 gmtk-1.0.8_1 -liblrzip.so.0 liblrzip-0.614_3 libsilcclient-1.1.so.4 silc-toolkit-1.1.11_1 libsilc-1.1.so.4 silc-toolkit-1.1.11_1 libphorward.so.0 libphorward-0.17_1 @@ -2205,7 +2201,6 @@ libasr.so.0 libasr-1.0.0_1 libssr-glinject.so ssr-0.3.1_1 libgdict-1.0.so.10 gnome-dictionary-3.18.1_1 libasignify.so.1 asignify-1.0_1 -libvte2_90.so.9 vte290-0.36.3_1 libd0_blind_id.so.0 xonotic-0.8.0_1 libuecc.so.0 libuecc-5_1 libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1 @@ -2381,7 +2376,6 @@ libskarnet.so.2.12 skalibs-2.12.0.0_1 libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1 libtidy.so.58 libtidy5-5.8.0_1 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1 -libQupZilla.so.2 qupzilla-2.0.0_1 libinjeqt.so.1 injeqt-1.1.0_1 libgadu.so.3 libgadu-1.12.1_1 libhiredis.so.1.0.0 hiredis-1.0.0_1 @@ -2583,7 +2577,6 @@ libglob.so.0 libglob-1.0_1 libepub.so.0 ebook-tools-0.2.2_1 libosmgpsmap-1.0.so.1 libosmgpsmap-1.1.0_1 libtspi.so.1 trousers-0.3.14_11 -libpsiconv.so.6 psiconv-0.9.9_1 libshout.so.3 libshout-2.4.1_1 libfirm.so.1.22 libfirm-1.22.0_1 libaudiofile.so.1 audiofile-0.3.6_1 @@ -3473,7 +3466,6 @@ libspa-audioconvert.so libspa-audioconvert-0.3.6_1 libspa-audiomixer.so libspa-audiomixer-0.3.6_1 libspa-bluez5.so libspa-bluetooth-0.3.6_1 libspa-control.so libspa-control-0.3.6_1 -libspa-ffmpeg.so libspa-ffmpeg-0.3.6_1 libspa-jack.so libspa-jack-0.3.6_1 libspa-v4l2.so libspa-v4l2-0.3.6_1 libspa-videoconvert.so libspa-videoconvert-0.3.6_1 From 98ae29824d9426caf863493860df87979f59b4d1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 28 Aug 2022 06:26:11 -0400 Subject: [PATCH 0934/1407] rizin: update to 0.4.0. --- common/shlibs | 50 ++++++++++++++++++++++-------------------- srcpkgs/rizin/template | 9 +++++--- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/common/shlibs b/common/shlibs index c1134b639fd2..1e80a6799732 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4115,30 +4115,32 @@ mod_spatialite.so.7 libspatialite-5.0.1_1 libSvtAv1Enc.so.1 libsvt-av1-1.0.0_1 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1 libyascreen.so.0 yascreen-1.86_1 -librz_bp.so.0.3.4 rizin-0.3.4_1 -librz_reg.so.0.3.4 rizin-0.3.4_1 -librz_debug.so.0.3.4 rizin-0.3.4_1 -librz_hash.so.0.3.4 rizin-0.3.4_1 -librz_config.so.0.3.4 rizin-0.3.4_1 -librz_parse.so.0.3.4 rizin-0.3.4_1 -librz_asm.so.0.3.4 rizin-0.3.4_1 -librz_type.so.0.3.4 rizin-0.3.4_1 -librz_socket.so.0.3.4 rizin-0.3.4_1 -librz_egg.so.0.3.4 rizin-0.3.4_1 -librz_core.so.0.3.4 rizin-0.3.4_1 -librz_diff.so.0.3.4 rizin-0.3.4_1 -librz_main.so.0.3.4 rizin-0.3.4_1 -librz_cons.so.0.3.4 rizin-0.3.4_1 -librz_crypto.so.0.3.4 rizin-0.3.4_1 -librz_analysis.so.0.3.4 rizin-0.3.4_1 -librz_syscall.so.0.3.4 rizin-0.3.4_1 -librz_io.so.0.3.4 rizin-0.3.4_1 -librz_flag.so.0.3.4 rizin-0.3.4_1 -librz_magic.so.0.3.4 rizin-0.3.4_1 -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 +librz_analysis.so.0.4 rizin-0.4.0_1 +librz_asm.so.0.4 rizin-0.4.0_1 +librz_bin.so.0.4 rizin-0.4.0_1 +librz_bp.so.0.4 rizin-0.4.0_1 +librz_config.so.0.4 rizin-0.4.0_1 +librz_cons.so.0.4 rizin-0.4.0_1 +librz_core.so.0.4 rizin-0.4.0_1 +librz_crypto.so.0.4 rizin-0.4.0_1 +librz_debug.so.0.4 rizin-0.4.0_1 +librz_demangler.so.0.4 rizin-0.4.0_1 +librz_diff.so.0.4 rizin-0.4.0_1 +librz_egg.so.0.4 rizin-0.4.0_1 +librz_flag.so.0.4 rizin-0.4.0_1 +librz_hash.so.0.4 rizin-0.4.0_1 +librz_io.so.0.4 rizin-0.4.0_1 +librz_lang.so.0.4 rizin-0.4.0_1 +librz_magic.so.0.4 rizin-0.4.0_1 +librz_main.so.0.4 rizin-0.4.0_1 +librz_parse.so.0.4 rizin-0.4.0_1 +librz_reg.so.0.4 rizin-0.4.0_1 +librz_search.so.0.4 rizin-0.4.0_1 +librz_sign.so.0.4 rizin-0.4.0_1 +librz_socket.so.0.4 rizin-0.4.0_1 +librz_syscall.so.0.4 rizin-0.4.0_1 +librz_type.so.0.4 rizin-0.4.0_1 +librz_util.so.0.4 rizin-0.4.0_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/rizin/template b/srcpkgs/rizin/template index 40c2dffeb9ae..8c2e0711086d 100644 --- a/srcpkgs/rizin/template +++ b/srcpkgs/rizin/template @@ -1,13 +1,13 @@ # Template file for 'rizin' pkgname=rizin -version=0.3.4 +version=0.4.0 revision=1 wrksrc="${pkgname}-v${version}" build_style=meson configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v4 -D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled -D use_sys_lz4=enabled -D use_sys_xxhash=enabled -D use_sys_openssl=enabled - -D use_sys_tree_sitter=enabled -D use_libuv=true -D use_webui=true -D local=disabled" + -D use_sys_tree_sitter=enabled -D use_libuv=true -D local=disabled" hostmakedepends="pkg-config" makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel libuv-devel tree-sitter-devel file-devel openssl-devel" @@ -16,7 +16,9 @@ maintainer="Urs Schulz " license="LGPL-3.0-only" homepage="https://github.com/rizinorg/rizin" distfiles="https://github.com/rizinorg/${pkgname}/releases/download/v${version}/${pkgname}-src-v${version}.tar.xz" -checksum=eea49b396387c09d19705aab02a617cdb15682fca67f101ff2b27eef94a710e9 +checksum=09eba8684fe813cf42a716b59a86d3d65afce013d7e8b275e145e849d3366b5a +# requires some external files, not clear where they come from +make_check=no rizin-devel_package() { @@ -26,5 +28,6 @@ rizin-devel_package() { vmove "usr/lib/*.so" vmove usr/include/librz vmove usr/lib/pkgconfig + vmove usr/lib/cmake } } From 2835151537469dbcebf2b646240cd5d3e265caf6 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 28 Aug 2022 06:27:02 -0400 Subject: [PATCH 0935/1407] cutter: update to 2.1.0. --- srcpkgs/cutter-devel | 1 + .../cutter/patches/ksyntaxhighlighting.patch | 43 ------------------- srcpkgs/cutter/template | 22 +++++++--- 3 files changed, 16 insertions(+), 50 deletions(-) create mode 120000 srcpkgs/cutter-devel delete mode 100644 srcpkgs/cutter/patches/ksyntaxhighlighting.patch diff --git a/srcpkgs/cutter-devel b/srcpkgs/cutter-devel new file mode 120000 index 000000000000..834ab3347b6f --- /dev/null +++ b/srcpkgs/cutter-devel @@ -0,0 +1 @@ +cutter \ No newline at end of file diff --git a/srcpkgs/cutter/patches/ksyntaxhighlighting.patch b/srcpkgs/cutter/patches/ksyntaxhighlighting.patch deleted file mode 100644 index 461a3dec9d58..000000000000 --- a/srcpkgs/cutter/patches/ksyntaxhighlighting.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp -index 3c309e83..47019165 100644 ---- a/src/common/Configuration.cpp -+++ b/src/common/Configuration.cpp -@@ -7,9 +7,9 @@ - #include - - #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING --# include --# include --# include -+# include -+# include -+# include - #endif - - #include "common/ColorThemeWorker.h" -diff --git a/src/common/SyntaxHighlighter.cpp b/src/common/SyntaxHighlighter.cpp -index 64a2038e..eebb59f9 100644 ---- a/src/common/SyntaxHighlighter.cpp -+++ b/src/common/SyntaxHighlighter.cpp -@@ -5,7 +5,7 @@ - - # include "Configuration.h" - --# include -+# include - - SyntaxHighlighter::SyntaxHighlighter(QTextDocument *document) - : KSyntaxHighlighting::SyntaxHighlighter(document) -diff --git a/src/common/SyntaxHighlighter.h b/src/common/SyntaxHighlighter.h -index b9e88970..a21b4ec2 100644 ---- a/src/common/SyntaxHighlighter.h -+++ b/src/common/SyntaxHighlighter.h -@@ -10,7 +10,7 @@ - - #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING - --# include -+# include - - class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter - { diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template index a2d6ca506827..c5b5c53045cb 100644 --- a/srcpkgs/cutter/template +++ b/srcpkgs/cutter/template @@ -1,10 +1,10 @@ # Template file for 'cutter' pkgname=cutter -version=2.0.5 +version=2.1.0 revision=1 -_translations_commit="974298653ba71b958e1b6c83f6011f5fefff6236" +_translations_commit="67f5c654523d22c7843811e5aa852a01742f6f12" build_style=cmake -configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/Cutter/plugins +configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/cutter/plugins -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF -DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON -DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF @@ -17,13 +17,21 @@ short_desc="GUI for radare2 written in C++ and QT" maintainer="Urs Schulz " license="GPL-3.0-only" homepage="https://cutter.re" -distfiles="https://github.com/rizinorg/${pkgname}/archive/refs/tags/v${version}.tar.gz +distfiles="https://github.com/rizinorg/cutter/archive/refs/tags/v${version}.tar.gz https://github.com/rizinorg/cutter-translations/archive/${_translations_commit}.tar.gz" -checksum="c206cc72443b989b7306cbc1ec5c85206a5feb5e7dc8621fe4f03876b9e447ab - 9a9d42769c1e9364dfc694968b05994d02ea840813a33b16ca6a6cbe80c90069" - +checksum="60aacead1604c2dc8afad4239732ad10d5882ab38828e695c0f53d1e134c2a5c + 12a06a7f977cf7c6d28e1d466cb9e421edb2d26c36e838d02292e5e45bc326c5" post_extract() { rmdir src/translations mv "${XBPS_BUILDDIR}/cutter-translations-${_translations_commit}" "src/translations" } + +cutter-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + } +} From a8ba2166884945684fea6969014c7cfe2b51daf2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 28 Aug 2022 06:27:23 -0400 Subject: [PATCH 0936/1407] New package: rz-ghidra-0.4.0 --- srcpkgs/rz-ghidra/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/rz-ghidra/template diff --git a/srcpkgs/rz-ghidra/template b/srcpkgs/rz-ghidra/template new file mode 100644 index 000000000000..c2bded70007b --- /dev/null +++ b/srcpkgs/rz-ghidra/template @@ -0,0 +1,17 @@ +# Template file for 'rz-ghidra' +pkgname=rz-ghidra +version=0.4.0 +revision=1 +wrksrc="$pkgname" +build_style=cmake +configure_args="-DCUTTER_INSTALL_PLUGDIR=/usr/lib/rizin/cutter/plugins/native + -DBUILD_CUTTER_PLUGIN=ON" +hostmakedepends="pkg-config qt5-host-tools qt5-qmake" +makedepends="cutter-devel rizin-devel" +short_desc="Deep ghidra decompiler and sleigh disassembler integration for rizin" +maintainer="classabbyamp " +license="LGPL-3.0-or-later" +homepage="https://github.com/rizinorg/rz-ghidra" +distfiles="https://github.com/rizinorg/rz-ghidra/releases/download/v${version}/rz-ghidra-src-v${version}.tar.gz" +checksum=6b8a6d1259699115e70f1f7d27de26c57fc19338d2d3e517460e35bb5f39eb55 +nocross="https://github.com/rizinorg/rz-ghidra/issues/298" From db691f906ddd92455ab80fb4c7aa0d22944884a6 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 2 Sep 2022 18:02:13 -0400 Subject: [PATCH 0937/1407] rz-ghidra: touch for builder --- srcpkgs/rz-ghidra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rz-ghidra/template b/srcpkgs/rz-ghidra/template index c2bded70007b..15a1b6aa7b5f 100644 --- a/srcpkgs/rz-ghidra/template +++ b/srcpkgs/rz-ghidra/template @@ -1,4 +1,4 @@ -# Template file for 'rz-ghidra' +# Template file for 'rz-ghidra' pkgname=rz-ghidra version=0.4.0 revision=1 From 63e5cecd1317bf726b1b571b7f5500765d57ef4e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 11 Aug 2022 23:47:59 -0400 Subject: [PATCH 0938/1407] opencv: update to 4.6.0. remove subpackage: libopencv-python - python 2, no revdeps. --- common/shlibs | 69 +++++++++++++++++++++++-------- srcpkgs/libopencv-python | 1 - srcpkgs/opencv/template | 48 ++++++++++----------- srcpkgs/removed-packages/template | 1 + 4 files changed, 75 insertions(+), 44 deletions(-) delete mode 120000 srcpkgs/libopencv-python diff --git a/common/shlibs b/common/shlibs index 1e80a6799732..3cc19dcd797a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2097,23 +2097,6 @@ libcapstone.so.4 capstone-4.0_1 libhavege.so.2 libhaveged-1.9.11_1 libnih.so.1 libnih-1.0.3_1 libnih-dbus.so.1 libnih-1.0.3_1 -libopencv_ml.so.3.4 libopencv-3.4.1_1 -libopencv_objdetect.so.3.4 libopencv-3.4.1_1 -libopencv_dnn.so.3.4 libopencv-3.4.1_1 -libopencv_shape.so.3.4 libopencv-3.4.1_1 -libopencv_stitching.so.3.4 libopencv-3.4.1_1 -libopencv_photo.so.3.4 libopencv-3.4.1_1 -libopencv_video.so.3.4 libopencv-3.4.1_1 -libopencv_calib3d.so.3.4 libopencv-3.4.1_1 -libopencv_features2d.so.3.4 libopencv-3.4.1_1 -libopencv_flann.so.3.4 libopencv-3.4.1_1 -libopencv_highgui.so.3.4 libopencv-3.4.1_1 -libopencv_videoio.so.3.4 libopencv-3.4.1_1 -libopencv_imgcodecs.so.3.4 libopencv-3.4.1_1 -libopencv_imgproc.so.3.4 libopencv-3.4.1_1 -libopencv_core.so.3.4 libopencv-3.4.1_1 -libopencv_superres.so.3.4 libopencv-3.4.1_1 -libopencv_videostab.so.3.4 libopencv-3.4.1_1 libopencv_quality.so.4.5 libopencv4-4.5.3_1 libopencv_reg.so.4.5 libopencv4-4.5.3_1 libopencv_surface_matching.so.4.5 libopencv4-4.5.3_1 @@ -2166,6 +2149,58 @@ libopencv_intensity_transform.so.4.5 libopencv4-4.5.3_1 libopencv_alphamat.so.4.5 libopencv4-4.5.3_1 libopencv_barcode.so.4.5 libopencv4-4.5.3_1 libopencv_mcc.so.4.5 libopencv4-4.5.3_1 +libopencv_quality.so.406 libopencv-4.6.0_1 +libopencv_reg.so.406 libopencv-4.6.0_1 +libopencv_surface_matching.so.406 libopencv-4.6.0_1 +libopencv_xphoto.so.406 libopencv-4.6.0_1 +libopencv_freetype.so.406 libopencv-4.6.0_1 +libopencv_fuzzy.so.406 libopencv-4.6.0_1 +libopencv_hfs.so.406 libopencv-4.6.0_1 +libopencv_img_hash.so.406 libopencv-4.6.0_1 +libopencv_line_descriptor.so.406 libopencv-4.6.0_1 +libopencv_saliency.so.406 libopencv-4.6.0_1 +libopencv_structured_light.so.406 libopencv-4.6.0_1 +libopencv_aruco.so.406 libopencv-4.6.0_1 +libopencv_bgsegm.so.406 libopencv-4.6.0_1 +libopencv_bioinspired.so.406 libopencv-4.6.0_1 +libopencv_ccalib.so.406 libopencv-4.6.0_1 +libopencv_face.so.406 libopencv-4.6.0_1 +libopencv_tracking.so.406 libopencv-4.6.0_1 +libopencv_xfeatures2d.so.406 libopencv-4.6.0_1 +libopencv_optflow.so.406 libopencv-4.6.0_1 +libopencv_ximgproc.so.406 libopencv-4.6.0_1 +libopencv_plot.so.406 libopencv-4.6.0_1 +libopencv_text.so.406 libopencv-4.6.0_1 +libopencv_ml.so.406 libopencv-4.6.0_1 +libopencv_objdetect.so.406 libopencv-4.6.0_1 +libopencv_dnn.so.406 libopencv-4.6.0_1 +libopencv_shape.so.406 libopencv-4.6.0_1 +libopencv_stitching.so.406 libopencv-4.6.0_1 +libopencv_photo.so.406 libopencv-4.6.0_1 +libopencv_video.so.406 libopencv-4.6.0_1 +libopencv_calib3d.so.406 libopencv-4.6.0_1 +libopencv_features2d.so.406 libopencv-4.6.0_1 +libopencv_flann.so.406 libopencv-4.6.0_1 +libopencv_highgui.so.406 libopencv-4.6.0_1 +libopencv_videoio.so.406 libopencv-4.6.0_1 +libopencv_imgcodecs.so.406 libopencv-4.6.0_1 +libopencv_imgproc.so.406 libopencv-4.6.0_1 +libopencv_core.so.406 libopencv-4.6.0_1 +libopencv_superres.so.406 libopencv-4.6.0_1 +libopencv_videostab.so.406 libopencv-4.6.0_1 +libopencv_gapi.so.406 libopencv-4.6.0_1 +libopencv_xobjdetect.so.406 libopencv-4.6.0_1 +libopencv_datasets.so.406 libopencv-4.6.0_1 +libopencv_dnn_objdetect.so.406 libopencv-4.6.0_1 +libopencv_dnn_superres.so.406 libopencv-4.6.0_1 +libopencv_dpm.so.406 libopencv-4.6.0_1 +libopencv_phase_unwrapping.so.406 libopencv-4.6.0_1 +libopencv_stereo.so.406 libopencv-4.6.0_1 +libopencv_rapid.so.406 libopencv-4.6.0_1 +libopencv_intensity_transform.so.406 libopencv-4.6.0_1 +libopencv_alphamat.so.406 libopencv-4.6.0_1 +libopencv_barcode.so.406 libopencv-4.6.0_1 +libopencv_mcc.so.406 libopencv-4.6.0_1 libuniconf.so.4.6 wvstreams-4.6.1_20 libwvbase.so.4.6 wvstreams-4.6.1_20 libwvutils.so.4.6 wvstreams-4.6.1_20 diff --git a/srcpkgs/libopencv-python b/srcpkgs/libopencv-python deleted file mode 120000 index f5341cf36786..000000000000 --- a/srcpkgs/libopencv-python +++ /dev/null @@ -1 +0,0 @@ -opencv \ No newline at end of file diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index 10c687200014..d6a810e0d3a2 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -1,40 +1,43 @@ # Template file for 'opencv' pkgname=opencv -version=3.4.15 +version=4.6.0 revision=1 +create_wrksrc=yes +build_wrksrc=${pkgname}-${version} build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib} - -DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}" -hostmakedepends="pkg-config eigen python-numpy python3-numpy" + -DOPENCV_GENERATE_PKGCONFIG=YES -DWITH_EIGEN=ON + -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${version}/modules + -DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF + -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF" +hostmakedepends="pkg-config eigen python3-numpy" makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel libgphoto2-devel gst-plugins-base1-devel openblas-devel - python-numpy python3-numpy python-devel python3-devel" + python3-numpy python3-devel" short_desc="Computer vision and machine learning software library" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://opencv.org" -distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz" -checksum=b1e8470b18e9e793bf70b4ae051bbc9bf81fa45f8cbfee1e6c88858c90be8ff7 +changelog="https://github.com/opencv/opencv/wiki/ChangeLog" +distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz + https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz" +checksum="1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277 + 1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7" +patch_args="-Np1 -d ${build_wrksrc}" +# tests hang indenfinitely, even with test data included +make_check=no if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi -if [ -z "$XBPS_CHECK_PKGS" ]; then - # opencv by default builds tests that only seem to be used in make check - configure_args+=" -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF" -fi - if [ "$CROSS_BUILD" ]; then # Tell opencv where to find python and numpy - _npincdir="numpy/core/include" - configure_args+=" -DPYTHON2_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py2_inc} - -DPYTHON2_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py2_sitelib}/${_npincdir} - -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc} - -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/${_npincdir}" + configure_args+=" -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc} + -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/include" fi case "$XBPS_TARGET_MACHINE" in @@ -58,17 +61,10 @@ libopencv-devel_package() { depends="libopencv>=${version}_${revision}" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove usr/lib/pkgconfig vmove usr/lib/*.so - vmove usr/share/OpenCV - } -} - -libopencv-python_package() { - short_desc+=" - Python2 bindings" - depends="python-numpy" - pkg_install() { - vmove usr/lib/python2.7 + vmove usr/share/opencv4 } } @@ -76,6 +72,6 @@ libopencv-python3_package() { short_desc+=" - Python3 bindings" depends="python3-numpy" pkg_install() { - vmove usr/lib/python3* + vmove ${py3_sitelib} } } diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 9c847ea1672c..05ef18e742ae 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -246,6 +246,7 @@ replaces=" libmagick6<=6.9.12.12_2 libmpd-devel<=11.8.17_3 libmpd<=11.8.17_3 + libopencv-python<=3.4.15_1 libpng12<=1.2.59_1 libpyside-python3<=5.15.0_2 libqmatrixclient-devel<=0.5.3.2_1 From f755a2a7a9b931abb32928d503a99f9e20d83c24 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 11 Aug 2022 23:51:09 -0400 Subject: [PATCH 0939/1407] opencv4: remove package. no longer needed, merged into opencv template --- common/shlibs | 52 ----------- srcpkgs/libopencv4 | 2 +- srcpkgs/libopencv4-devel | 2 +- srcpkgs/libopencv4-python | 1 - srcpkgs/libopencv4-python3 | 2 +- srcpkgs/opencv/template | 24 +++++ srcpkgs/opencv4 | 1 + .../patches/undef-altivec-macros-cpp.patch | 16 ---- srcpkgs/opencv4/template | 89 ------------------- srcpkgs/removed-packages/template | 1 + 10 files changed, 29 insertions(+), 161 deletions(-) delete mode 120000 srcpkgs/libopencv4-python create mode 120000 srcpkgs/opencv4 delete mode 100644 srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch delete mode 100644 srcpkgs/opencv4/template diff --git a/common/shlibs b/common/shlibs index 3cc19dcd797a..5fe37e3d0b62 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2097,58 +2097,6 @@ libcapstone.so.4 capstone-4.0_1 libhavege.so.2 libhaveged-1.9.11_1 libnih.so.1 libnih-1.0.3_1 libnih-dbus.so.1 libnih-1.0.3_1 -libopencv_quality.so.4.5 libopencv4-4.5.3_1 -libopencv_reg.so.4.5 libopencv4-4.5.3_1 -libopencv_surface_matching.so.4.5 libopencv4-4.5.3_1 -libopencv_xphoto.so.4.5 libopencv4-4.5.3_1 -libopencv_freetype.so.4.5 libopencv4-4.5.3_1 -libopencv_fuzzy.so.4.5 libopencv4-4.5.3_1 -libopencv_hfs.so.4.5 libopencv4-4.5.3_1 -libopencv_img_hash.so.4.5 libopencv4-4.5.3_1 -libopencv_line_descriptor.so.4.5 libopencv4-4.5.3_1 -libopencv_saliency.so.4.5 libopencv4-4.5.3_1 -libopencv_structured_light.so.4.5 libopencv4-4.5.3_1 -libopencv_aruco.so.4.5 libopencv4-4.5.3_1 -libopencv_bgsegm.so.4.5 libopencv4-4.5.3_1 -libopencv_bioinspired.so.4.5 libopencv4-4.5.3_1 -libopencv_ccalib.so.4.5 libopencv4-4.5.3_1 -libopencv_face.so.4.5 libopencv4-4.5.3_1 -libopencv_tracking.so.4.5 libopencv4-4.5.3_1 -libopencv_xfeatures2d.so.4.5 libopencv4-4.5.3_1 -libopencv_optflow.so.4.5 libopencv4-4.5.3_1 -libopencv_ximgproc.so.4.5 libopencv4-4.5.3_1 -libopencv_plot.so.4.5 libopencv4-4.5.3_1 -libopencv_text.so.4.5 libopencv4-4.5.3_1 -libopencv_ml.so.4.5 libopencv4-4.5.3_1 -libopencv_objdetect.so.4.5 libopencv4-4.5.3_1 -libopencv_dnn.so.4.5 libopencv4-4.5.3_1 -libopencv_shape.so.4.5 libopencv4-4.5.3_1 -libopencv_stitching.so.4.5 libopencv4-4.5.3_1 -libopencv_photo.so.4.5 libopencv4-4.5.3_1 -libopencv_video.so.4.5 libopencv4-4.5.3_1 -libopencv_calib3d.so.4.5 libopencv4-4.5.3_1 -libopencv_features2d.so.4.5 libopencv4-4.5.3_1 -libopencv_flann.so.4.5 libopencv4-4.5.3_1 -libopencv_highgui.so.4.5 libopencv4-4.5.3_1 -libopencv_videoio.so.4.5 libopencv4-4.5.3_1 -libopencv_imgcodecs.so.4.5 libopencv4-4.5.3_1 -libopencv_imgproc.so.4.5 libopencv4-4.5.3_1 -libopencv_core.so.4.5 libopencv4-4.5.3_1 -libopencv_superres.so.4.5 libopencv4-4.5.3_1 -libopencv_videostab.so.4.5 libopencv4-4.5.3_1 -libopencv_gapi.so.4.5 libopencv4-4.5.3_1 -libopencv_xobjdetect.so.4.5 libopencv4-4.5.3_1 -libopencv_datasets.so.4.5 libopencv4-4.5.3_1 -libopencv_dnn_objdetect.so.4.5 libopencv4-4.5.3_1 -libopencv_dnn_superres.so.4.5 libopencv4-4.5.3_1 -libopencv_dpm.so.4.5 libopencv4-4.5.3_1 -libopencv_phase_unwrapping.so.4.5 libopencv4-4.5.3_1 -libopencv_stereo.so.4.5 libopencv4-4.5.3_1 -libopencv_rapid.so.4.5 libopencv4-4.5.3_1 -libopencv_intensity_transform.so.4.5 libopencv4-4.5.3_1 -libopencv_alphamat.so.4.5 libopencv4-4.5.3_1 -libopencv_barcode.so.4.5 libopencv4-4.5.3_1 -libopencv_mcc.so.4.5 libopencv4-4.5.3_1 libopencv_quality.so.406 libopencv-4.6.0_1 libopencv_reg.so.406 libopencv-4.6.0_1 libopencv_surface_matching.so.406 libopencv-4.6.0_1 diff --git a/srcpkgs/libopencv4 b/srcpkgs/libopencv4 index 84ec4806fc8d..f5341cf36786 120000 --- a/srcpkgs/libopencv4 +++ b/srcpkgs/libopencv4 @@ -1 +1 @@ -opencv4 \ No newline at end of file +opencv \ No newline at end of file diff --git a/srcpkgs/libopencv4-devel b/srcpkgs/libopencv4-devel index 84ec4806fc8d..f5341cf36786 120000 --- a/srcpkgs/libopencv4-devel +++ b/srcpkgs/libopencv4-devel @@ -1 +1 @@ -opencv4 \ No newline at end of file +opencv \ No newline at end of file diff --git a/srcpkgs/libopencv4-python b/srcpkgs/libopencv4-python deleted file mode 120000 index 84ec4806fc8d..000000000000 --- a/srcpkgs/libopencv4-python +++ /dev/null @@ -1 +0,0 @@ -opencv4 \ No newline at end of file diff --git a/srcpkgs/libopencv4-python3 b/srcpkgs/libopencv4-python3 index 84ec4806fc8d..f5341cf36786 120000 --- a/srcpkgs/libopencv4-python3 +++ b/srcpkgs/libopencv4-python3 @@ -1 +1 @@ -opencv4 \ No newline at end of file +opencv \ No newline at end of file diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index d6a810e0d3a2..a46cf9d79a78 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -75,3 +75,27 @@ libopencv-python3_package() { vmove ${py3_sitelib} } } + +opencv4_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + build_style=meta +} + +libopencv4_package() { + depends="lib${sourcepkg}>=${version}_${revision}" + short_desc+=" - library files (transitional dummy package)" + build_style=meta +} + +libopencv4-devel_package() { + depends="lib${sourcepkg}-devel>=${version}_${revision}" + short_desc+=" - development files (transitional dummy package)" + build_style=meta +} + +libopencv4-python3_package() { + depends="lib${sourcepkg}-python3>=${version}_${revision}" + short_desc+=" - Python3 bindings (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/opencv4 b/srcpkgs/opencv4 new file mode 120000 index 000000000000..f5341cf36786 --- /dev/null +++ b/srcpkgs/opencv4 @@ -0,0 +1 @@ +opencv \ No newline at end of file diff --git a/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch b/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch deleted file mode 100644 index 83460ce56fb6..000000000000 --- a/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch +++ /dev/null @@ -1,16 +0,0 @@ -This is necessary because otherwise conflicts are introduced in C++ code that -includes this. The header itself does not rely on the macros. The issue is not -visible on little endian because they undef the macros somewhere else. - ---- a/3rdparty/include/opencl/1.2/CL/cl_platform.h -+++ b/3rdparty/include/opencl/1.2/CL/cl_platform.h -@@ -332,6 +332,9 @@ typedef unsigned int cl_GLenum; - /* Define basic vector types */ - #if defined( __VEC__ ) - #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ -+ #undef vector -+ #undef pixel -+ #undef bool - typedef __vector unsigned char __cl_uchar16; - typedef __vector signed char __cl_char16; - typedef __vector unsigned short __cl_ushort8; diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template deleted file mode 100644 index 595d8b2e22a9..000000000000 --- a/srcpkgs/opencv4/template +++ /dev/null @@ -1,89 +0,0 @@ -# Template file for 'opencv4' -pkgname=opencv4 -version=4.5.3 -revision=2 -wrksrc=opencv-${version} -build_style=cmake -configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON - -DOPENCV_GENERATE_PKGCONFIG=YES - -DWITH_EIGEN=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON - -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib} - -DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib} - -DOPENCV_EXTRA_MODULES_PATH=${XBPS_BUILDDIR}/opencv_contrib-${version}/modules - -DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF" -hostmakedepends="pkg-config eigen python-numpy python3-numpy" -makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel - jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel - libgphoto2-devel gst-plugins-base1-devel openblas-devel - python-numpy python3-numpy python-devel python3-devel" -short_desc="Computer vision and machine learning software library, version 4.x" -maintainer="Hazel Levine " -license="BSD-3-Clause" -homepage="https://opencv.org" -distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz - https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz" -checksum="77f616ae4bea416674d8c373984b20c8bd55e7db887fd38c6df73463a0647bab - 73da052fd10e73aaba2560eaff10cc5177e2dcc58b27f8aedf7c649e24c233bc" - -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - -if [ -z "$XBPS_CHECK_PKGS" ]; then - # opencv by default builds tests that only seem to be used in make check - configure_args+=" -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF" -fi - -if [ "$CROSS_BUILD" ]; then - # Tell opencv where to find python and numpy - _npincdir="numpy/core/include" - configure_args+=" -DPYTHON2_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py2_inc} - -DPYTHON2_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py2_sitelib}/${_npincdir} - -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc} - -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/${_npincdir}" -fi - -case "$XBPS_TARGET_MACHINE" in - ppc64*) ;; - ppc*) broken="grfmt_jpeg2000.cpp:380:48: error: lvalue required as unary '&' operand";; -esac - -post_install() { - vlicense LICENSE -} - -libopencv4_package() { - short_desc+=" - library files" - pkg_install() { - vmove usr/lib/*.so.* - } -} - -libopencv4-devel_package() { - short_desc+=" - development files" - depends="libopencv4>=${version}_${revision}" - conflicts="libopencv-devel>=0" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/lib/pkgconfig - vmove usr/lib/*.so - vmove usr/share/opencv4 - } -} - -libopencv4-python_package() { - short_desc+=" - Python2 bindings" - depends="python-numpy" - pkg_install() { - vmove ${py2_sitelib} - } -} - -libopencv4-python3_package() { - short_desc+=" - Python3 bindings" - depends="python3-numpy" - pkg_install() { - vmove ${py3_sitelib} - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 05ef18e742ae..66b9fdc5cdc9 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -247,6 +247,7 @@ replaces=" libmpd-devel<=11.8.17_3 libmpd<=11.8.17_3 libopencv-python<=3.4.15_1 + libopencv4-python<=4.5.3_2 libpng12<=1.2.59_1 libpyside-python3<=5.15.0_2 libqmatrixclient-devel<=0.5.3.2_1 From 2d5e9524434492ce08e6fb87798b89d85615b4c2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:23:43 -0400 Subject: [PATCH 0940/1407] actiona: rebuild for opencv-4.6.0 --- srcpkgs/actiona/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template index 6ce3ccdc6b41..cf5f0b7a2ae6 100644 --- a/srcpkgs/actiona/template +++ b/srcpkgs/actiona/template @@ -1,8 +1,9 @@ # Template file for 'actiona' pkgname=actiona version=3.10.1 -revision=1 +revision=2 build_style=qmake +configure_args="PKGCONFIG_OPENCV=opencv4" hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake qt5-host-tools" makedepends="boost-devel libnotify-devel libopencv-devel pulseaudio-devel qt5-multimedia-devel qt5-script-devel qt5-speech-devel qt5-tools-devel @@ -12,10 +13,9 @@ short_desc="Cross platform automation tool" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://actiona.tools/" -distfiles="https://github.com/Jmgr/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" +distfiles="https://github.com/Jmgr/actiona/archive/v${version}.tar.gz" checksum=447065e380f8f37db4c8af01df8e1b9d7189cd256205f758845b71d8de6f37ea post_build() { lrelease-qt5 locale/*.ts } - From f41dc9198d19f419974ec697a87276c4a20ef18c Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:28:09 -0400 Subject: [PATCH 0941/1407] digikam: rebuild for opencv-4.6.0 --- srcpkgs/digikam/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template index 1a08760e0f56..169a101e5cf4 100644 --- a/srcpkgs/digikam/template +++ b/srcpkgs/digikam/template @@ -1,7 +1,7 @@ # Template file for 'digikam' pkgname=digikam version=7.7.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config bison flex qt5-qmake From be3bf1301762bdba94f6ae868df38ae4dfed1ad2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:37:55 -0400 Subject: [PATCH 0942/1407] gmic: rebuild for opencv-4.6.0 --- srcpkgs/gmic/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index b9871e7bbe7c..f08da26fd824 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -1,7 +1,7 @@ # Template file for 'gmic' pkgname=gmic version=2.9.9 -revision=2 +revision=3 _zart_hash=939cf381c5871e506aabd066037acf2b55143c1d build_wrksrc="src" build_style=gnu-makefile From 5a750f21f098e5f8dd044c033c6448c25e673ac7 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:40:01 -0400 Subject: [PATCH 0943/1407] mlt7: rebuild for opencv-4.6.0 --- srcpkgs/mlt7/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template index 5aefa500dd8a..15c426838648 100644 --- a/srcpkgs/mlt7/template +++ b/srcpkgs/mlt7/template @@ -1,7 +1,7 @@ # Template file for 'mlt7' pkgname=mlt7 version=7.4.0 -revision=1 +revision=2 wrksrc="mlt-${version}" build_style=cmake configure_args="-DSWIG_PYTHON=ON" @@ -35,7 +35,7 @@ esac if [ "$_have_opencv" = "yes" ]; then configure_args+=" -DMOD_OPENCV=ON" - makedepends+=" libopencv4-devel" + makedepends+=" libopencv-devel" fi post_install() { From cd4c39dedebd71f5eff0cf3d96b03c41c15dbe55 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:41:06 -0400 Subject: [PATCH 0944/1407] nomacs: rebuild for opencv-4.6.0, fix homepage --- srcpkgs/nomacs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template index 0c38e2737bac..895e83071a8a 100644 --- a/srcpkgs/nomacs/template +++ b/srcpkgs/nomacs/template @@ -1,7 +1,7 @@ # Template file for 'nomacs' pkgname=nomacs version=3.16.224 -revision=2 +revision=3 build_wrksrc=ImageLounge build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_TRANSLATIONS=1 @@ -12,6 +12,6 @@ makedepends="qt5-tools-devel qt5-svg-devel exiv2-devel libopencv-devel short_desc="Simple yet powerful Qt imageviewer" maintainer="Kharlamov Alexey " license="GPL-3.0-or-later" -homepage="https://nomacs.org/" +homepage="https://github.com/nomacs/nomacs" distfiles="https://github.com/nomacs/nomacs/archive/${version}.tar.gz" checksum=bbc7e9048026ef9e0d2b64902c88050f17a679ef3d3c009de2c3b7de5d1d217c From 103ebaea42c41bf337a245e190fa3d0d0bdb5801 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:49:12 -0400 Subject: [PATCH 0945/1407] opentoonz: rebuild for opencv-4.6.0 --- srcpkgs/opentoonz/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template index 23bba3407e89..0452c1e68d09 100644 --- a/srcpkgs/opentoonz/template +++ b/srcpkgs/opentoonz/template @@ -1,7 +1,7 @@ # Template file for 'opentoonz' pkgname=opentoonz version=1.6.0 -revision=1 +revision=2 build_wrksrc="toonz/sources" build_style=cmake make_cmd=make @@ -9,7 +9,7 @@ hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool" makedepends="qt5-devel qt5-svg-devel qt5-script-devel qt5-tools-devel qt5-multimedia-devel superlu-devel glew-devel libjpeg-turbo-devel liblzma-devel liblz4-devel lzo-devel libusb-devel SDL2-devel libmypaint-devel boost-devel libfreeglut-devel - openblas-devel qt5-serialport-devel libopencv4-devel" + openblas-devel qt5-serialport-devel libopencv-devel" short_desc="Full-featured 2D animation creation software" maintainer="bra1nwave " license="BSD-3-Clause" From 3c9f664893764f12a7395d3f6737ce32357b77db Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:56:06 -0400 Subject: [PATCH 0946/1407] retroshare: rebuild for opencv-4.6.0 --- srcpkgs/retroshare/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index 8a72be9ca3fa..13fe19f4d9fd 100644 --- a/srcpkgs/retroshare/template +++ b/srcpkgs/retroshare/template @@ -1,7 +1,7 @@ # Template file for 'retroshare' pkgname=retroshare version=0.6.6 -revision=1 +revision=2 wrksrc="RetroShare-${version}" build_style=qmake #XXX broadcast feature requires an ancient udp-discovery-cpp which either needs From ea79e75c473f209f53dd9415c8c4a6eadb511582 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:57:27 -0400 Subject: [PATCH 0947/1407] siril: rebuild for opencv-4.6.0 --- srcpkgs/siril/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template index 1a3c7c761e9d..0a9e150a80a3 100644 --- a/srcpkgs/siril/template +++ b/srcpkgs/siril/template @@ -1,7 +1,7 @@ # Template file for 'siril' pkgname=siril version=0.9.12 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="pkg-config intltool autoconf automake gettext-devel" makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel From 33a119d9e01e026e70424d9dcd9bc7a907e84882 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:58:26 -0400 Subject: [PATCH 0948/1407] waifu2x-converter-cpp: rebuild for opencv-4.6.0, fix tests --- srcpkgs/waifu2x-converter-cpp/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/waifu2x-converter-cpp/template b/srcpkgs/waifu2x-converter-cpp/template index 4030c6f0da06..8c095d0d7bab 100644 --- a/srcpkgs/waifu2x-converter-cpp/template +++ b/srcpkgs/waifu2x-converter-cpp/template @@ -1,7 +1,7 @@ # Template file for 'waifu2x-converter-cpp' pkgname=waifu2x-converter-cpp version=5.2.4 -revision=1 +revision=2 build_style=cmake configure_args="-DINSTALL_MODELS=ON" hostmakedepends="pkg-config" @@ -26,6 +26,10 @@ pre_configure() { cc -o build/conv conv.c } +pre_check() { + cp -r models_rgb build +} + post_install() { vlicense LICENSE } From 6bd30a99ade3dd66872afacb06dcf29eb6b44093 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 17 Aug 2022 16:59:22 -0400 Subject: [PATCH 0949/1407] qimgv: fix dependency name --- srcpkgs/qimgv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qimgv/template b/srcpkgs/qimgv/template index 7dede61524ee..bb91ee98eab7 100644 --- a/srcpkgs/qimgv/template +++ b/srcpkgs/qimgv/template @@ -8,7 +8,7 @@ configure_args="$(vopt_if video -DVIDEO_SUPPORT=ON -DVIDEO_SUPPORT=OFF) $(vopt_if kde -DKDE_SUPPORT=ON -DKDE_SUPPORT=OFF)" hostmakedepends="pkg-config" makedepends="exiv2-devel qt5-devel qt5-svg-devel $(vopt_if video mpv-devel) - $(vopt_if scale libopencv4-devel) $(vopt_if kde kwindowsystem-devel)" + $(vopt_if scale libopencv-devel) $(vopt_if kde kwindowsystem-devel)" depends="hicolor-icon-theme qt5-imageformats" short_desc="Cross-platform image viewer with webm support" maintainer="travankor " From 01a68d2fd7b6ae31a5a489a77db2378b5677bce9 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 2 Sep 2022 21:36:27 -0400 Subject: [PATCH 0950/1407] dkms: make sure /var/lib/dkms exists on installation Closes #39066. --- srcpkgs/dkms/template | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template index ee16e8c3aeb5..61afd2bbf085 100644 --- a/srcpkgs/dkms/template +++ b/srcpkgs/dkms/template @@ -1,7 +1,7 @@ # Template file for 'dkms' pkgname=dkms version=3.0.6 -revision=1 +revision=2 conf_files="/etc/dkms/framework.conf" depends="bash kmod gcc make coreutils xbps-triggers>=0.123_1" short_desc="Dynamic Kernel Module Support" @@ -10,6 +10,9 @@ license="GPL-2.0-or-later" homepage="https://github.com/dell/dkms" distfiles="https://github.com/dell/dkms/archive/v${version}.tar.gz" checksum=1e1ae273d2a72e3a89b829f3c72f482fb903f12cf766c054d11612e1d70795b4 +# dkms does not create this directory, but needs it +# https://github.com/void-linux/void-packages/issues/39066 +make_dirs="/var/lib/dkms 0755 root root" case "$XBPS_TARGET_MACHINE" in # Too many competing kernels for arm* to depend on linux-headers From fe9edfce4fe141a5f5e73d8fd63c2e01f3f7d37f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 30 Aug 2022 21:54:50 -0400 Subject: [PATCH 0951/1407] New package: Gokapi-1.6.1 Closes #39004. --- srcpkgs/Gokapi/files/gokapi/log/run | 3 +++ srcpkgs/Gokapi/files/gokapi/run | 11 +++++++++++ srcpkgs/Gokapi/template | 25 +++++++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 srcpkgs/Gokapi/files/gokapi/log/run create mode 100644 srcpkgs/Gokapi/files/gokapi/run create mode 100644 srcpkgs/Gokapi/template diff --git a/srcpkgs/Gokapi/files/gokapi/log/run b/srcpkgs/Gokapi/files/gokapi/log/run new file mode 100644 index 000000000000..cb759c1f80d7 --- /dev/null +++ b/srcpkgs/Gokapi/files/gokapi/log/run @@ -0,0 +1,3 @@ +#!/bin/sh + +exec logger -t gokapi -p daemon.info diff --git a/srcpkgs/Gokapi/files/gokapi/run b/srcpkgs/Gokapi/files/gokapi/run new file mode 100644 index 000000000000..8f4295583d2c --- /dev/null +++ b/srcpkgs/Gokapi/files/gokapi/run @@ -0,0 +1,11 @@ +#!/bin/sh + +[ -r ./conf ] && . ./conf + +: ${USER:=_gokapi} +: ${GROUP:=_gokapi} +: ${HOME:=/var/lib/gokapi} + +export USER GROUP HOME + +cd "${HOME}" && exec chpst -u ${USER}:${GROUP} gokapi 2>&1 diff --git a/srcpkgs/Gokapi/template b/srcpkgs/Gokapi/template new file mode 100644 index 000000000000..4eb7702d73cc --- /dev/null +++ b/srcpkgs/Gokapi/template @@ -0,0 +1,25 @@ +# Template file for 'Gokapi' +pkgname=Gokapi +version=1.6.1 +revision=1 +build_style=go +go_import_path=github.com/forceu/gokapi +go_package="${go_import_path}/cmd/gokapi" +short_desc="Lightweight, self-hosted Firefox Send alternative" +maintainer="Andrew J. Hesford " +license="AGPL-3.0-only" +homepage="https://github.com/Forceu/Gokapi" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=225f069817eef50cdd316f6c9ed037e939f4c5678c488dfb54dd52141d367e0f +system_accounts="_gokapi" +_gokapi_homedir="/var/lib/gokapi" +make_dirs="/var/lib/gokapi 700 _gokapi _gokapi" + +pre_build() { + GOARCH= go generate ./... +} + +post_install() { + vlicense LICENSE.md + vsv gokapi +} From 8d1329c21000acfc23bb51e4d364caf2f0712c47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Wed, 31 Aug 2022 23:23:57 +0200 Subject: [PATCH 0952/1407] mpd: update to 0.23.9. --- srcpkgs/mpd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index b43c83fbb0f7..536e06c891c9 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd -version=0.23.8 -revision=2 +version=0.23.9 +revision=1 build_style=meson configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled @@ -39,7 +39,7 @@ license="GPL-2.0-or-later" homepage="https://www.musicpd.org/" changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS" distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz" -checksum=86bb569bf3b519821f36f6bb5564e484e85d2564411b34b200fe2cd3a04e78cf +checksum=2becaba980402e8dc7972ccc3476e493b7ae2eeb720d31fa6712472ed48e9f2d LDFLAGS="-Wl,-z,stack-size=1048576" system_accounts="mpd" From 512887187755dd57949f117d1971962d7adb9ef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Tue, 2 Aug 2022 23:45:36 +0200 Subject: [PATCH 0953/1407] tectonic: fix update check --- srcpkgs/tectonic/update | 1 + 1 file changed, 1 insertion(+) create mode 100644 srcpkgs/tectonic/update diff --git a/srcpkgs/tectonic/update b/srcpkgs/tectonic/update new file mode 100644 index 000000000000..93131668f690 --- /dev/null +++ b/srcpkgs/tectonic/update @@ -0,0 +1 @@ +pattern="tectonic@\K[\d.]+(?=.tar.gz)" From f42f1c060283f2dbd615061910b2eb13a1e641f3 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 29 Aug 2022 20:07:10 -0400 Subject: [PATCH 0954/1407] adobe-flash-plugin: remove package. flash is very EOL, distfiles no longer exist upstream nor on sources.voidlinux.org --- srcpkgs/adobe-flash-plugin-ppapi | 1 - .../files/flash-plugin-ppapi.sh | 1 - srcpkgs/adobe-flash-plugin/template | 64 ------------------- srcpkgs/removed-packages/template | 2 + 4 files changed, 2 insertions(+), 66 deletions(-) delete mode 120000 srcpkgs/adobe-flash-plugin-ppapi delete mode 100644 srcpkgs/adobe-flash-plugin/files/flash-plugin-ppapi.sh delete mode 100644 srcpkgs/adobe-flash-plugin/template diff --git a/srcpkgs/adobe-flash-plugin-ppapi b/srcpkgs/adobe-flash-plugin-ppapi deleted file mode 120000 index b1ab0e7015b2..000000000000 --- a/srcpkgs/adobe-flash-plugin-ppapi +++ /dev/null @@ -1 +0,0 @@ -adobe-flash-plugin \ No newline at end of file diff --git a/srcpkgs/adobe-flash-plugin/files/flash-plugin-ppapi.sh b/srcpkgs/adobe-flash-plugin/files/flash-plugin-ppapi.sh deleted file mode 100644 index e4a2566dc316..000000000000 --- a/srcpkgs/adobe-flash-plugin/files/flash-plugin-ppapi.sh +++ /dev/null @@ -1 +0,0 @@ -export CHROME_FLAGS="${CHROME_FLAGS}${CHROME_FLAGS:+ }--ppapi-flash-path=/usr/lib/chromium/PepperFlash/libpepflashplayer.so --ppapi-flash-version=@VERSION@" diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template deleted file mode 100644 index df9f3f997a59..000000000000 --- a/srcpkgs/adobe-flash-plugin/template +++ /dev/null @@ -1,64 +0,0 @@ -# Template file for 'adobe-flash-plugin' -pkgname=adobe-flash-plugin -version=32.0.0.465 -revision=1 -depends="curl hicolor-icon-theme desktop-file-utils" -short_desc="Adobe Flash Player plugin for Netscape compatible browsers" -maintainer="mkf " -license="custom:Adobe License (non free)" -homepage="https://www.adobe.com" -repository="nonfree" - -restricted=yes -create_wrksrc=yes -archs="i686 x86_64" -nopie=yes - -# The EULA file -_eula="https://www.adobe.com/content/dam/Adobe/en/legal/licenses-terms/pdf/PlatformClients_PC_WWEULA-en_US-20150407_1357.pdf" -_eulacksum=5a0a95eb4082b6db7182188ce119f3829184b238b0a91293322c2a51a2b41fc1 -_url=https://fpdownload.adobe.com/pub/flashplayer/pdc/${version} -if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - distfiles=" - ${_url}/flash_player_npapi_linux.x86_64.tar.gz - ${_url}/flash_player_ppapi_linux.x86_64.tar.gz" - checksum=" - a90f2edb98231896331c61a81017f390e180015f90193865e3295319cf636c35 - 99fcc780897be55bac7d11c0204ba7a3d5e7dc1f1aed75d5e7b5ad28c0b2ff5d" -else - distfiles=" - ${_url}/flash_player_npapi_linux.i386.tar.gz - ${_url}/flash_player_ppapi_linux.i386.tar.gz" - checksum=" - 27b7210d09514d661c34752d29cbc0b6c09968b8d197d21fedc14fd3c49a0bd6 - d32ad3eb24f22cd11cb83910a72880c98f69ea1ec0f3ce6beb31812e166f0f62" -fi -distfiles+=" ${_eula}" -checksum+=" ${_eulacksum}" -skip_extraction="${_eula##*/}" - -do_install() { - vinstall libflashplayer.so 755 usr/lib/mozilla/plugins - #vinstall usr/lib/kde4/kcm_adobe_flash_player.so 755 usr/lib/kde4 - vbin usr/bin/flash-player-properties - for i in 16x16 22x22 24x24 32x32 48x48; do - vinstall usr/share/icons/hicolor/${i}/apps/flash-player-properties.png \ - 644 usr/share/icons/hicolor/${i}/apps - done - vinstall usr/share/applications/flash-player-properties.desktop 644 \ - usr/share/applications - vinstall usr/share/kde4/services/kcm_adobe_flash_player.desktop 644 \ - usr/share/kde4/services - vlicense "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_eula##*/}" LICENSE.pdf -} - -adobe-flash-plugin-ppapi_package() { - short_desc="Adobe Flash Player plugin for Chromium-based browsers" - pkg_install() { - vinstall libpepflashplayer.so 755 usr/lib/chromium/PepperFlash - vinstall manifest.json 644 usr/lib/chromium/PepperFlash - vinstall ${FILESDIR}/flash-plugin-ppapi.sh 644 etc/profile.d - vsed -e "s/@VERSION@/${version}/g" -i ${PKGDESTDIR}/etc/profile.d/flash-plugin-ppapi.sh - vlicense "${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/${_eula##*/}" LICENSE.pdf - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 66b9fdc5cdc9..76fb680f2773 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -16,6 +16,8 @@ replaces=" SMC<=1.9_9 Venom<=0.5.5_1 XorCurses<=0.2.2_1 + adobe-flash-plugin<=32.0.0.465_1 + adobe-flash-plugin-ppapi<=32.0.0.465_1 acme-client<=0.1.16_5 alarm-clock<=1.4.9_1 albert<=0.16.1_4 From 7478344e118f45e7e33fc91046fa2ed6f5f8041b Mon Sep 17 00:00:00 2001 From: icp Date: Wed, 31 Aug 2022 00:13:14 +0530 Subject: [PATCH 0955/1407] New package: python3-inflect-6.0.0 --- srcpkgs/python3-inflect/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/python3-inflect/template diff --git a/srcpkgs/python3-inflect/template b/srcpkgs/python3-inflect/template new file mode 100644 index 000000000000..d8cb62fa1204 --- /dev/null +++ b/srcpkgs/python3-inflect/template @@ -0,0 +1,20 @@ +# Template file for 'python3-inflect' +pkgname=python3-inflect +version=6.0.0 +revision=1 +wrksrc=inflect-${version} +build_style=python3-pep517 +hostmakedepends="python3-wheel python3-setuptools_scm" +depends="python3-pydantic" +checkdepends="${depends} python3-pytest-xdist" +short_desc="Correctly generate plurals, ordinals; convert numbers to words" +maintainer="icp " +license="MIT" +homepage="https://github.com/jaraco/inflect" +changelog="https://raw.githubusercontent.com/jaraco/inflect/main/CHANGES.rst" +distfiles="${PYPI_SITE}/i/inflect/inflect-${version}.tar.gz" +checksum=0bc1516ec2725e2d8221707a612245093cb6f1cea209cfd8cbd4fc5e96fa6365 + +post_install() { + vlicense LICENSE +} From a0341f28f16af0468a15c340275bbbba32bf5682 Mon Sep 17 00:00:00 2001 From: icp Date: Wed, 31 Aug 2022 00:13:21 +0530 Subject: [PATCH 0956/1407] New package: python3-autocommand-2.2.1 --- .../patches/fix-out-of-date-patterns.patch | 285 ++++++++++++++++++ srcpkgs/python3-autocommand/template | 15 + 2 files changed, 300 insertions(+) create mode 100644 srcpkgs/python3-autocommand/patches/fix-out-of-date-patterns.patch create mode 100644 srcpkgs/python3-autocommand/template diff --git a/srcpkgs/python3-autocommand/patches/fix-out-of-date-patterns.patch b/srcpkgs/python3-autocommand/patches/fix-out-of-date-patterns.patch new file mode 100644 index 000000000000..54593a9e94b1 --- /dev/null +++ b/srcpkgs/python3-autocommand/patches/fix-out-of-date-patterns.patch @@ -0,0 +1,285 @@ +From 031c9750c74e3313b954b09e3027aaa6595649bb Mon Sep 17 00:00:00 2001 +From: Nathan West +Date: Thu, 18 Nov 2021 14:06:30 -0500 +Subject: [PATCH] Fix out of date patterns in autocommand + +- Use async def instead of asyncio.coroutine +- Use create_task instead of asyncio.async +- Use pytest.fixture instead of pytest.yield_fixture +--- + src/autocommand/autoasync.py | 6 +-- + test/test_autoasync.py | 95 ++++++++++++++++-------------------- + test/test_autocommand.py | 6 +-- + 3 files changed, 49 insertions(+), 58 deletions(-) + +diff --git a/src/autocommand/autoasync.py b/src/autocommand/autoasync.py +index 3c8ebdc..2e6e28a 100644 +--- a/src/autocommand/autoasync.py ++++ b/src/autocommand/autoasync.py +@@ -20,7 +20,7 @@ + from inspect import signature + + +-def _launch_forever_coro(coro, args, kwargs, loop): ++async def _run_forever_coro(coro, args, kwargs, loop): + ''' + This helper function launches an async main function that was tagged with + forever=True. There are two possibilities: +@@ -48,7 +48,7 @@ def _launch_forever_coro(coro, args, kwargs, loop): + # forever=True feature from autoasync at some point in the future. + thing = coro(*args, **kwargs) + if iscoroutine(thing): +- loop.create_task(thing) ++ await thing + + + def autoasync(coro=None, *, loop=None, forever=False, pass_loop=False): +@@ -127,7 +127,7 @@ def autoasync_wrapper(*args, **kwargs): + args, kwargs = bound_args.args, bound_args.kwargs + + if forever: +- _launch_forever_coro(coro, args, kwargs, local_loop) ++ local_loop.create_task(_run_forever_coro(coro, args, kwargs, local_loop)) + local_loop.run_forever() + else: + return local_loop.run_until_complete(coro(*args, **kwargs)) +diff --git a/test/test_autoasync.py b/test/test_autoasync.py +index 6ffb782..dfeb019 100644 +--- a/test/test_autoasync.py ++++ b/test/test_autoasync.py +@@ -20,6 +20,10 @@ + asyncio = pytest.importorskip('asyncio') + autoasync = pytest.importorskip('autocommand.autoasync').autoasync + ++class YieldOnce: ++ def __await__(self): ++ yield ++ + + @contextmanager + def temporary_context_loop(loop): +@@ -35,7 +39,7 @@ def temporary_context_loop(loop): + asyncio.set_event_loop(old_loop) + + +-@pytest.yield_fixture ++@pytest.fixture + def new_loop(): + ''' + Get a new event loop. The loop is closed afterwards +@@ -44,7 +48,7 @@ def new_loop(): + yield loop + + +-@pytest.yield_fixture ++@pytest.fixture + def context_loop(): + ''' + Create a new event loop and set it as the current context event loop. +@@ -63,29 +67,27 @@ def context_loop(): + def test_basic_autoasync(context_loop): + data = set() + +- @asyncio.coroutine +- def coro_1(): ++ async def coro_1(): + data.add(1) +- yield ++ await YieldOnce() + data.add(2) + + return 1 + +- @asyncio.coroutine +- def coro_2(): ++ async def coro_2(): + data.add(3) +- yield ++ await YieldOnce() + data.add(4) + + return 2 + + @autoasync +- def async_main(): +- task1 = asyncio.async(coro_1()) +- task2 = asyncio.async(coro_2()) ++ async def async_main(): ++ task1 = asyncio.create_task(coro_1()) ++ task2 = asyncio.create_task(coro_2()) + +- result1 = yield from task1 +- result2 = yield from task2 ++ result1 = await task1 ++ result2 = await task2 + + assert result1 == 1 + assert result2 == 2 +@@ -99,19 +101,19 @@ def async_main(): + def test_custom_loop(context_loop, new_loop): + did_bad_coro_run = False + +- @asyncio.coroutine +- def bad_coro(): ++ async def bad_coro(): + nonlocal did_bad_coro_run + did_bad_coro_run = True +- yield ++ await YieldOnce() + +- asyncio.async(bad_coro()) ++ # TODO: this fires a "task wasn't awaited" warning; figure out how to ++ # supress ++ context_loop.create_task(bad_coro()) + + @autoasync(loop=new_loop) +- @asyncio.coroutine +- def async_main(): +- yield +- yield ++ async def async_main(): ++ await YieldOnce() ++ await YieldOnce() + return 3 + + assert async_main() == 3 +@@ -120,9 +122,7 @@ def async_main(): + + def test_pass_loop(context_loop): + @autoasync(pass_loop=True) +- @asyncio.coroutine +- def async_main(loop): +- yield ++ async def async_main(loop): + return loop + + assert async_main() is asyncio.get_event_loop() +@@ -134,9 +134,7 @@ def test_pass_loop_prior_argument(context_loop): + still passed correctly + ''' + @autoasync(pass_loop=True) +- @asyncio.coroutine +- def async_main(loop, argument): +- yield ++ async def async_main(loop, argument): + return loop, argument + + loop, value = async_main(10) +@@ -146,9 +144,8 @@ def async_main(loop, argument): + + def test_pass_loop_kwarg_only(context_loop): + @autoasync(pass_loop=True) +- @asyncio.coroutine +- def async_main(*, loop, argument): +- yield ++ async def async_main(*, loop, argument): ++ await YieldOnce() + return loop, argument + + loop, value = async_main(argument=10) +@@ -157,48 +154,43 @@ def async_main(*, loop, argument): + + + def test_run_forever(context_loop): +- @asyncio.coroutine +- def stop_loop_after(t): +- yield from asyncio.sleep(t) ++ async def stop_loop_after(t): ++ await asyncio.sleep(t) + context_loop.stop() + + retrieved_value = False + +- @asyncio.coroutine +- def set_value_after(t): ++ async def set_value_after(t): + nonlocal retrieved_value +- yield from asyncio.sleep(t) ++ await asyncio.sleep(t) + retrieved_value = True + + @autoasync(forever=True) +- @asyncio.coroutine +- def async_main(): +- asyncio.async(set_value_after(0.1)) +- asyncio.async(stop_loop_after(0.2)) +- yield ++ async def async_main(): ++ asyncio.create_task(set_value_after(0.1)) ++ asyncio.create_task(stop_loop_after(0.2)) ++ await YieldOnce() + + async_main() + assert retrieved_value + + + def test_run_forever_func(context_loop): +- @asyncio.coroutine +- def stop_loop_after(t): +- yield from asyncio.sleep(t) ++ async def stop_loop_after(t): ++ await asyncio.sleep(t) + context_loop.stop() + + retrieved_value = False + +- @asyncio.coroutine +- def set_value_after(t): ++ async def set_value_after(t): + nonlocal retrieved_value +- yield from asyncio.sleep(t) ++ await asyncio.sleep(t) + retrieved_value = True + + @autoasync(forever=True) + def main_func(): +- asyncio.async(set_value_after(0.1)) +- asyncio.async(stop_loop_after(0.2)) ++ asyncio.create_task(set_value_after(0.1)) ++ asyncio.create_task(stop_loop_after(0.2)) + + main_func() + assert retrieved_value +@@ -212,9 +204,8 @@ def test_defered_loop(context_loop, new_loop): + called. + ''' + @autoasync(pass_loop=True) +- @asyncio.coroutine +- def async_main(loop): +- yield ++ async def async_main(loop): ++ await YieldOnce() + return loop + + with temporary_context_loop(new_loop): +diff --git a/test/test_autocommand.py b/test/test_autocommand.py +index 6531146..791e1cc 100644 +--- a/test/test_autocommand.py ++++ b/test/test_autocommand.py +@@ -41,7 +41,7 @@ def _asyncio_unavailable(): + reason="async tests require asyncio (python3.4+)") + + +-@pytest.yield_fixture ++@pytest.fixture + def patched_autoparse(): + with patch.object( + autocommand_module, +@@ -50,7 +50,7 @@ def patched_autoparse(): + yield autoparse + + +-@pytest.yield_fixture ++@pytest.fixture + def patched_autoasync(): + with patch.object( + autocommand_module, +@@ -62,7 +62,7 @@ def patched_autoasync(): + yield autoasync + + +-@pytest.yield_fixture ++@pytest.fixture + def patched_automain(): + with patch.object( + autocommand_module, diff --git a/srcpkgs/python3-autocommand/template b/srcpkgs/python3-autocommand/template new file mode 100644 index 000000000000..099b1970a92b --- /dev/null +++ b/srcpkgs/python3-autocommand/template @@ -0,0 +1,15 @@ +# Template file for 'python3-autocommand' +pkgname=python3-autocommand +version=2.2.1 +revision=1 +wrksrc=autocommand-${version} +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3" +checkdepends="python3-pytest-xdist" +short_desc="Python library to create a command-line program from a function" +maintainer="icp " +license="LGPL-3.0-only" +homepage="https://github.com/Lucretiel/autocommand" +distfiles="${PYPI_SITE}/a/autocommand/autocommand-${version}.tar.gz" +checksum=fed420e9d02745821a782971b583c6970259ee0b229be2a0a401e1467a4f170f From 8d7de99ad1470d11edcb7bf815a7baac518bc16b Mon Sep 17 00:00:00 2001 From: icp Date: Wed, 31 Aug 2022 00:13:27 +0530 Subject: [PATCH 0957/1407] python3-jaraco.text: update to 3.9.1. --- srcpkgs/python3-jaraco.text/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-jaraco.text/template b/srcpkgs/python3-jaraco.text/template index cba91bbe6237..f63d4e0a8459 100644 --- a/srcpkgs/python3-jaraco.text/template +++ b/srcpkgs/python3-jaraco.text/template @@ -1,11 +1,12 @@ # Template file for 'python3-jaraco.text' pkgname=python3-jaraco.text -version=3.7.0 +version=3.9.1 revision=1 wrksrc="jaraco.text-${version}" build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" -depends="python3-jaraco.functools python3-six python3-jaraco.context" +depends="python3-jaraco.functools python3-jaraco.context python3-autocommand + python3-inflect python3-more-itertools" checkdepends="$depends python3-pytest" short_desc="Module for text manipulation (Python3)" maintainer="bra1nwave " @@ -13,7 +14,7 @@ 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=a7f9cc1b44a5f3096a216cbd130b650c7a6b2c9f8005b000ae97f329239a7c00 +checksum=d57cd4448a588020318425e04194e897f96fc23b92b82ff9308a24d5cbf2b3fb post_install() { vlicense LICENSE From 592ece22b10a5dad215bf97734e6f7259fe8723c Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 3 Sep 2022 08:47:56 +0200 Subject: [PATCH 0958/1407] perl-Locale-Codes: update to 3.72. --- srcpkgs/perl-Locale-Codes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Locale-Codes/template b/srcpkgs/perl-Locale-Codes/template index d41539051c76..129f77015001 100644 --- a/srcpkgs/perl-Locale-Codes/template +++ b/srcpkgs/perl-Locale-Codes/template @@ -1,6 +1,6 @@ # Template file for 'perl-Locale-Codes' pkgname=perl-Locale-Codes -version=3.71 +version=3.72 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -12,4 +12,4 @@ maintainer="Helmut Pozimski " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Locale-Codes" distfiles="${CPAN_SITE}/Locale/${pkgname/perl-/}-${version}.tar.gz" -checksum=e0d9cb7e12026b01b797766b3f624f13d7f2329a2c32f20b2d73204c50baed50 +checksum=5859c087d6f977ee237bc762396adb352b9732d325ccbd2cecacdad63e2f1320 From bf456cf53e01c377df4f257609e90b2ffc263315 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 3 Sep 2022 10:24:07 +0200 Subject: [PATCH 0959/1407] wine: update to 7.16. --- srcpkgs/wine/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index ca804182841d..b4c7489729af 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=7.15 +version=7.16 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="d1ab8a19aae6fe6c0833c3d882a32448abfa4a28590f146e95450eb9f58fb91c - d087889e8ae592ede55b4079ef6661d36c4e3054e4e56d0848381ac13caa3e31" +checksum="b5723ced3d1e0329d4a741ff8e89cdf7a0b7b883a7f983b956649075ba353edc + d0ea7d7a83d03f0331e6912c9feb215aa7a07af77526336f9aa93b96e6efa43b" build_options="mingw staging xshm" build_options_default="mingw xshm" From 2624f426b4a456c12bb6b3835b8830d1d18a4f08 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 2 Sep 2022 22:34:30 +0200 Subject: [PATCH 0960/1407] gnome: remove gnome-books from apps gnome-books is archived --- srcpkgs/gnome/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 7f17687741ce..31535e9971c6 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,7 @@ # Template file for 'gnome' pkgname=gnome version=42.0 -revision=2 +revision=3 build_style=meta short_desc="GNOME meta-package for Void Linux" maintainer="Enno Boland " @@ -46,7 +46,6 @@ _apps_depends=" evolution>=3.44.0 ghex>=${version} gitg>=41 - gnome-books>=40.0 gnome-boxes>=${version} gnome-builder>=${version} gnome-calculator>=${version} From e13976ece556221139da77df4228215d7575674b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 2 Sep 2022 22:35:05 +0200 Subject: [PATCH 0961/1407] gnome-books: remove package archived upstream, doesn't build with meson 0.63 --- srcpkgs/gnome-books/patches/meson-0.61.patch | 33 -------------------- srcpkgs/gnome-books/template | 18 ----------- srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 srcpkgs/gnome-books/patches/meson-0.61.patch delete mode 100644 srcpkgs/gnome-books/template diff --git a/srcpkgs/gnome-books/patches/meson-0.61.patch b/srcpkgs/gnome-books/patches/meson-0.61.patch deleted file mode 100644 index 0e6ba9befd96..000000000000 --- a/srcpkgs/gnome-books/patches/meson-0.61.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 - diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template deleted file mode 100644 index f03b170589b4..000000000000 --- a/srcpkgs/gnome-books/template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'gnome-books' -pkgname=gnome-books -version=40.0 -revision=2 -build_helper="gir" -build_style=meson -hostmakedepends="pkg-config vala glib-devel librsvg docbook-xsl libxslt - gettext appstream-glib desktop-file-utils" -makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel - gnome-desktop-devel evince-devel libgepub-devel tracker3-devel" -depends="gjs libgepub libtracker3" -short_desc="E-book manager application for GNOME" -maintainer="Enno Boland " -license="GPL-2.0-or-later" -homepage="https://wiki.gnome.org/Apps/Books" -changelog="https://gitlab.gnome.org/GNOME/gnome-books/-/raw/master/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=85e56f4e4a5e91fb615c18f32a29c4e672faf885d68959571a10c5262aa28130 diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 76fb680f2773..87fa3eab02f0 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -106,6 +106,7 @@ replaces=" gmpc-devel<=11.8.16_3 gmpc<=11.8.16_3 gnac<=0.2.4.1_4 + gnome-books<=40.0_2 gnome-doc-utils<=0.20.10_9 gnome-documents<=3.34.0_2 gnome-games<=40.0_1 From 993d4565cb039f66772605a167aff32b62eb11e0 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, 3 Sep 2022 17:42:24 +0700 Subject: [PATCH 0962/1407] libtorrent-rasterbar: update to 1.2.17. --- srcpkgs/libtorrent-rasterbar/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index 27da1199ee38..52377b39eca4 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -1,10 +1,10 @@ # Template file for 'libtorrent-rasterbar' # Breaks ABI/API without changing soname, revbump all dependants pkgname=libtorrent-rasterbar -version=1.2.14 -revision=4 +version=1.2.17 +revision=1 build_style=cmake -configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON +configure_args="DCMAKE_CXX_STANDARD=14 -Dbuild_examples=ON -Dbuild_tools=ON -Dpython-bindings=ON" hostmakedepends="pkg-config intltool libtool python3-devel" makedepends="openssl-devel boost-devel geoip-devel python3-devel" @@ -13,7 +13,9 @@ maintainer="Orphaned " license="BSD-3-Clause" homepage="https://libtorrent.org/" distfiles="https://github.com/arvidn/libtorrent/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=9e27bf359b45236d4490960faffc796528f3adbdea6aeb6881d39f310e27953f +checksum=5d536dbed9fe3a15d51ea1e93b94b62d806fc89b86504bba05f4c53d5245d14b + +CXXFLAGS="-std=c++14" if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -Dbuild_tests=ON" @@ -58,6 +60,7 @@ libtorrent-rasterbar-devel_package() { pkg_install() { vmove usr/include vmove usr/share/cmake + vmove usr/lib/cmake vmove usr/lib/pkgconfig vmove "usr/lib/*.so" } From 62940285a11e5aedd1da2913326e674f2887ad64 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, 3 Sep 2022 17:42:59 +0700 Subject: [PATCH 0963/1407] qbittorrent: rebuild for libtorrent-rasterbar Fix #39078 --- srcpkgs/qbittorrent/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index ada2ed429f26..67e6b94edc53 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,7 +1,7 @@ # Template file for 'qbittorrent' pkgname=qbittorrent version=4.4.3.1 -revision=1 +revision=2 create_wrksrc=yes build_style=gnu-configure build_helper=qmake @@ -17,6 +17,7 @@ homepage="https://www.qbittorrent.org/" changelog="https://www.qbittorrent.org/news.php" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" checksum=b64559ca50b54bc6c5be17302e69f34fba8433059842aa4093865dc2c00d24c8 +CXXFLAGS=-std=gnu++17 do_extract() { local n=${pkgname}-${version} From 4a3d94ac0e74823ed66a3cb3d668e9bd636d6ca3 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, 3 Sep 2022 17:43:27 +0700 Subject: [PATCH 0964/1407] btfs: rebuild for libtorrent-rasterbar --- srcpkgs/btfs/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template index a41afd1e2db5..52bc6df43026 100644 --- a/srcpkgs/btfs/template +++ b/srcpkgs/btfs/template @@ -1,7 +1,7 @@ # Template file for 'btfs' pkgname=btfs version=2.24 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel" @@ -12,6 +12,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/johang/btfs" distfiles="https://github.com/johang/btfs/archive/v${version}.tar.gz" checksum=d71ddefe3c572e05362542a0d9fd0240d8d4e1578ace55a8b3245176e7fd8935 +CXXFLAGS=-std=gnu++14 pre_configure() { autoreconf -fi From f59af879e334d4583d2852eb507877a26de401e8 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 3 Sep 2022 12:51:23 +0200 Subject: [PATCH 0965/1407] hashcat: update to 6.2.6. --- srcpkgs/hashcat/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hashcat/template b/srcpkgs/hashcat/template index 8e3f90d91385..f2420cd080a3 100644 --- a/srcpkgs/hashcat/template +++ b/srcpkgs/hashcat/template @@ -1,6 +1,6 @@ # Template file for 'hashcat' pkgname=hashcat -version=6.2.5 +version=6.2.6 revision=1 build_style=gnu-makefile make_build_args="ENABLE_UNRAR=$(vopt_if unrar 1 0) USE_SYSTEM_OPENCL=1 @@ -17,7 +17,9 @@ license="MIT" homepage="https://hashcat.net/hashcat/" changelog="https://raw.githubusercontent.com/hashcat/hashcat/master/docs/changes.txt" distfiles="https://hashcat.net/files/hashcat-${version}.tar.gz" -checksum=6f6899d7ad899659f7b43a4d68098543ab546d2171f8e51d691d08a659378969 +checksum=b25e1077bcf34908cc8f18c1a69a2ec98b047b2cbcf0f51144dcf3ba1e0b7b2a + +python_version=3 build_options="unrar" desc_option_unrar="Enable support for unrar" From 68697abd3594a9d42f93193475b13cc4f94d94e3 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Sat, 3 Sep 2022 11:27:57 +0200 Subject: [PATCH 0966/1407] google-chrome: update to 105.0.5195.102 --- 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 711026c24944..e2a23d7efc63 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,6 +1,6 @@ # Template file for 'google-chrome' pkgname=google-chrome -version=105.0.5195.52 +version=105.0.5195.102 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=c4ceafead46160eb91085c6fd1c0581c691e4b3d95405e1c6b5f4dc5f326968b +checksum=8a079176c17d41f5f915cc4a6be804e78c3051bd9e0b70a8d1a9f9af157cd958 do_extract() { mkdir -p ${DESTDIR} From e7d61467dea4c69a0265d44bce7fa96fc87932d9 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, 3 Sep 2022 18:54:38 +0700 Subject: [PATCH 0967/1407] ruler: add missing linking libs --- srcpkgs/ruler/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ruler/template b/srcpkgs/ruler/template index 0884fc46578f..4068e2d91ee9 100644 --- a/srcpkgs/ruler/template +++ b/srcpkgs/ruler/template @@ -12,7 +12,7 @@ homepage="https://github.com/tudurom/ruler" distfiles="https://github.com/tudurom/ruler/archive/v${version}.tar.gz" checksum=5355e19530bb158b504cca6ba18cc402585e9bdb488e01a2ee76492bc70923c7 -LDFLAGS="-lxcb -lxcb-ewmh -lxcb-icccm -lwm" +LDFLAGS="-lwm -lxcb -lxcb-ewmh -lxcb-icccm -lxcb-cursor" post_install() { vlicense LICENSE From 7f5675c388626de556808269593a58ec3c9066a0 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, 3 Sep 2022 19:04:45 +0700 Subject: [PATCH 0968/1407] xidle: add missing makedepends --- srcpkgs/xidle/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/xidle/template b/srcpkgs/xidle/template index c9db6829a5df..92694a1d3e33 100644 --- a/srcpkgs/xidle/template +++ b/srcpkgs/xidle/template @@ -6,7 +6,8 @@ wrksrc="${pkgname}-linux-${version}" build_style=gnu-makefile make_use_env=yes hostmakedepends="pkg-config" -makedepends="libbsd-devel libXScrnSaver-devel" +makedepends="libbsd-devel libXScrnSaver-devel libmd-devel libXext-devel + libX11-devel" short_desc="Run a program on X inactivity" maintainer="Frank Steinborn " license="BSD-2-Clause" From 8083b93f217100fa9909b4211f1cb379790d091b 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, 3 Sep 2022 19:21:01 +0700 Subject: [PATCH 0969/1407] shlibs: bump requirements for libtorrent-rasterbar --- common/shlibs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/shlibs b/common/shlibs index 5fe37e3d0b62..081118a049b3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2092,7 +2092,7 @@ libldns.so.3 libldns-1.7.1_4 libopenjpeg.so.5 libopenjpeg-1.5.2_1 liboping.so.0 liboping-1.8.0_1 libloudmouth-1.so.0 loudmouth-1.5.3_12 -libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2 +libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.17_1 libcapstone.so.4 capstone-4.0_1 libhavege.so.2 libhaveged-1.9.11_1 libnih.so.1 libnih-1.0.3_1 From b5641a84b782e7a8fe1d8ae40cc520ebe1af57c9 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, 3 Sep 2022 19:21:27 +0700 Subject: [PATCH 0970/1407] file: downgrade to 5.41. This revert commit: 455908f5ca This is broken, and xbps-src needs this: find dir | file --mime-type --files-from - --- srcpkgs/file/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/file/template b/srcpkgs/file/template index 97426c4741b1..0b2c0c2c70dc 100644 --- a/srcpkgs/file/template +++ b/srcpkgs/file/template @@ -1,7 +1,8 @@ # Template file for 'file' pkgname=file -version=5.42 -revision=1 +reverts="5.42_1" +version=5.41 +revision=2 bootstrap=yes build_style=gnu-configure configure_args="--enable-static $(vopt_enable libseccomp)" @@ -11,7 +12,7 @@ maintainer="Enno Boland " license="BSD-2-Clause" homepage="https://www.darwinsys.com/file/" distfiles="https://astron.com/pub/file/file-${version}.tar.gz" -checksum=c076fb4d029c74073f15c43361ef572cfb868407d347190ba834af3b1639b0e4 +checksum=13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f build_options="libseccomp" From f900038ced8d364d9ce67b7c64e2fa4e222d4b39 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 3 Sep 2022 15:17:01 +0200 Subject: [PATCH 0971/1407] digikam: update to 7.8.0. --- srcpkgs/digikam/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template index 169a101e5cf4..f6bee74b64dc 100644 --- a/srcpkgs/digikam/template +++ b/srcpkgs/digikam/template @@ -1,7 +1,7 @@ # Template file for 'digikam' pkgname=digikam -version=7.7.0 -revision=2 +version=7.8.0 +revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config bison flex qt5-qmake @@ -21,7 +21,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.digikam.org" distfiles="${KDE_SITE}/digikam/${version}/digiKam-${version}.tar.xz" -checksum=c0c6dd2ea8a07514acbf2462f3a54518e7e8099b3337f881336168cff63d771c +checksum=b08577b0b15ef99843695708aa2c0e98d547303d85be2a3b39905484f2cab6ce CXXFLAGS="-Wl,-lpthread" From ff1463c534e89a6a09dce3f0a68228afe723dff7 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 3 Sep 2022 15:23:59 +0200 Subject: [PATCH 0972/1407] file: update to 5.42, fix --files-from. --- .../file/patches/fix-files-from-flag.patch | 108 ++++++++++++++++++ srcpkgs/file/template | 5 +- 2 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/file/patches/fix-files-from-flag.patch diff --git a/srcpkgs/file/patches/fix-files-from-flag.patch b/srcpkgs/file/patches/fix-files-from-flag.patch new file mode 100644 index 000000000000..574f019672c2 --- /dev/null +++ b/srcpkgs/file/patches/fix-files-from-flag.patch @@ -0,0 +1,108 @@ +From 19bf47777d0002ee884467e45e6ace702e40a4c1 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Mon, 4 Jul 2022 17:00:51 +0000 +Subject: [PATCH] PR/358: Fix width for -f - (jpalus) + +--- + ChangeLog | 3 ++- + src/file.c | 46 +++++++++++++++++++++++++++++----------------- + 2 files changed, 31 insertions(+), 18 deletions(-) + +diff --git a/src/file.c b/src/file.c +index 5300e5af8..bb058ce1e 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -32,7 +32,7 @@ + #include "file.h" + + #ifndef lint +-FILE_RCSID("@(#)$File: file.c,v 1.195 2022/06/02 15:45:43 christos Exp $") ++FILE_RCSID("@(#)$File: file.c,v 1.196 2022/07/04 17:00:51 christos Exp $") + #endif /* lint */ + + #include "magic.h" +@@ -506,35 +506,47 @@ unwrap(struct magic_set *ms, const char *fn) + size_t llen = 0; + int wid = 0, cwid; + int e = 0; ++ size_t fi = 0, fimax = 100; ++ char **flist = malloc(sizeof(*flist) * fimax); + +- if (strcmp("-", fn) == 0) { ++ if (flist == NULL) ++out: file_err(EXIT_FAILURE, "Cannot allocate memory for file list"); ++ ++ if (strcmp("-", fn) == 0) + f = stdin; +- wid = 1; +- } else { ++ else { + if ((f = fopen(fn, "r")) == NULL) { + file_warn("Cannot open `%s'", fn); + return 1; + } +- +- while ((len = getline(&line, &llen, f)) > 0) { +- if (line[len - 1] == '\n') +- line[len - 1] = '\0'; +- cwid = file_mbswidth(ms, line); +- if (cwid > wid) +- wid = cwid; +- } +- +- rewind(f); + } + + while ((len = getline(&line, &llen, f)) > 0) { + if (line[len - 1] == '\n') + line[len - 1] = '\0'; +- e |= process(ms, line, wid); ++ if (fi >= fimax) { ++ fimax += 100; ++ char **nf = realloc(flist, fimax * sizeof(*flist)); ++ if (nf == NULL) ++ goto out; ++ } ++ flist[fi++] = line; ++ cwid = file_mbswidth(ms, line); ++ if (cwid > wid) ++ wid = cwid; ++ line = NULL; ++ llen = 0; ++ } ++ ++ fimax = fi; ++ for (fi = 0; fi < fimax; fi++) { ++ e |= process(ms, flist[fi], wid); ++ free(flist[fi]); + } ++ free(flist); + +- free(line); +- (void)fclose(f); ++ if (f != stdin) ++ (void)fclose(f); + return e; + } + +From be1ac8c0aa6d21921012f62582f51a9e546e4972 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Tue, 26 Jul 2022 15:10:05 +0000 +Subject: [PATCH] Fix bug with large flist (Florian Weimer) + +--- + src/file.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/file.c b/src/file.c +index e169c08fc..c0b8aa197 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -535,6 +535,7 @@ out: file_err(EXIT_FAILURE, "Cannot allocate memory for file list"); + char **nf = realloc(flist, fimax * sizeof(*flist)); + if (nf == NULL) + goto out; ++ flist = nf; + } + flist[fi++] = line; + cwid = file_mbswidth(ms, line); diff --git a/srcpkgs/file/template b/srcpkgs/file/template index 0b2c0c2c70dc..3687f0f63da0 100644 --- a/srcpkgs/file/template +++ b/srcpkgs/file/template @@ -1,7 +1,6 @@ # Template file for 'file' pkgname=file -reverts="5.42_1" -version=5.41 +version=5.42 revision=2 bootstrap=yes build_style=gnu-configure @@ -12,7 +11,7 @@ maintainer="Enno Boland " license="BSD-2-Clause" homepage="https://www.darwinsys.com/file/" distfiles="https://astron.com/pub/file/file-${version}.tar.gz" -checksum=13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f +checksum=c076fb4d029c74073f15c43361ef572cfb868407d347190ba834af3b1639b0e4 build_options="libseccomp" From b76b09daf79325253dfd5864e61641b023ca6199 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 3 Sep 2022 15:30:51 +0200 Subject: [PATCH 0973/1407] 11-pkglint-elf-in-usrshare: use file --no-pad so we don't have to strip it --- common/hooks/post-install/11-pkglint-elf-in-usrshare.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/hooks/post-install/11-pkglint-elf-in-usrshare.sh b/common/hooks/post-install/11-pkglint-elf-in-usrshare.sh index a665f3ed94d0..729f5203b897 100644 --- a/common/hooks/post-install/11-pkglint-elf-in-usrshare.sh +++ b/common/hooks/post-install/11-pkglint-elf-in-usrshare.sh @@ -24,8 +24,7 @@ hook() { # Find all binaries in /usr/share and add them to the pool while read -r f; do - mime="${f##*:}" - mime="${mime// /}" + mime="${f##*: }" file="${f%:*}" file="${file#${PKGDESTDIR}}" case "${mime}" in @@ -37,7 +36,7 @@ hook() { fi ;; esac - done < <(find $PKGDESTDIR/usr/share $prune_expr -type f | file --mime-type --files-from -) + done < <(find $PKGDESTDIR/usr/share $prune_expr -type f | file --no-pad --mime-type --files-from -) # Check passed if no packages in pool if [ -z "$matches" ]; then From 230ad7e1df97bff04f8461efa6660ef5cde383e6 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 3 Sep 2022 15:45:22 +0200 Subject: [PATCH 0974/1407] libvirt: update to 8.7.0. --- srcpkgs/libvirt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index b27ac3cc869a..b041299b96dd 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,6 +1,6 @@ # Template file for 'libvirt' pkgname=libvirt -version=8.6.0 +version=8.7.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=a81847c43ac9ade61b6f8447c44e8ba2cc544ab49bac5c0b18a5b105f5da3ae2 +checksum=72e63a0f27911e339afd8269c6e8b029721893940edec11e09e471944f60e538 # At least one test times out on CI but works locally make_check=ci-skip From f2a92d9d12594f1029c3c80633e2482e85690c99 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 3 Sep 2022 15:52:36 +0200 Subject: [PATCH 0975/1407] libvirt-python3: update to 8.7.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 f071809324ea..cb232f6091b3 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.6.0 +version=8.7.0 revision=1 wrksrc="libvirt-python-${version}" build_style=python3-module @@ -13,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=81f49a648a4f3fbebf4abf3f8d4b1468654689d4df6fd21a303d1c1ca9344871 +checksum=60dcb571e44b6f0d7ca812addb513feac863c3c6c02282871cdfdcda5104dbb3 do_check() { PYTHONPATH="$(cd build/lib.* && pwd)" pytest From 22a71cb4b2cbc32aa2de02885fa285cb2b1003ef Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 3 Sep 2022 18:11:44 +0200 Subject: [PATCH 0976/1407] removed-packages: bump revision --- 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 87fa3eab02f0..8b6917f7582f 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=72 +revision=73 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " From 82a40e7b1d9f749c9daa99d3a53f727fb8c5152c Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Tue, 30 Aug 2022 11:49:31 -0700 Subject: [PATCH 0977/1407] conmon: update to 2.1.4 --- srcpkgs/conmon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template index 763a2d6697dc..3363c9985ca1 100644 --- a/srcpkgs/conmon/template +++ b/srcpkgs/conmon/template @@ -1,6 +1,6 @@ # Template file for 'conmon' pkgname=conmon -version=2.1.2 +version=2.1.4 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/containers/conmon" distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz" -checksum=8ba76eb54c319197235fd39c3a5b5a975b5a21e02cd4be985b8619220a497a0e +checksum=f0441f3d9b00d3130a7746e8d6a6c53a7973c9fd914e92b129726d152c9d60fb _have_docs=no From 76f6cfb3ee150f8f89155367ac77d72a9ab79dd7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 3 Sep 2022 11:22:35 +0200 Subject: [PATCH 0978/1407] virt-manager: update to 4.1.0. * fixes build with setuptools 61 --- ...le-compile-schemas-update-icon-cache.patch | 20 ------------------- srcpkgs/virt-manager/template | 14 ++++++++++--- 2 files changed, 11 insertions(+), 23 deletions(-) delete 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 deleted file mode 100644 index ad8f6f798b20..000000000000 --- a/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 3b66b6fd8a90..2172af5b2beb 100644 --- a/srcpkgs/virt-manager/template +++ b/srcpkgs/virt-manager/template @@ -1,6 +1,6 @@ # Template file for 'virt-manager' pkgname=virt-manager -version=4.0.0 +version=4.1.0 revision=1 build_style=python3-module pycompile_dirs="/usr/share/${pkgname}/virtManager" @@ -9,16 +9,24 @@ depends="virt-manager-tools>=${version}_${revision} libvirt-glib gtk-vnc spice-gtk gtksourceview4 dconf vte3 gir-freedesktop" _coredeps="python3-gobject libvirt-python3 libosinfo libxml2-python3 python3-requests cdrtools" -checkdepends="python3-pytest cpio ${_coredeps}" +checkdepends="python3-pytest cpio xorriso ${_coredeps}" short_desc="User interface for managing virtual machines" maintainer="Andrea Brancaleoni " 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=515aaa2021a4bf352b0573098fe6958319b1ba8ec508ea37e064803f97f17086 +checksum=950681d7b32dc61669278ad94ef31da33109bf6fcf0426ed82dfd7379aa590a2 python_version=3 +do_install() { + # make_install_args can't be used because --no-* has to be specified + # before the install argument + ./setup.py \ + --no-update-icon-cache --no-compile-schemas \ + install --root=${DESTDIR} +} + virt-manager-tools_package() { short_desc="Programs to create and clone virtual machines" depends="${_coredeps} python3-argcomplete" From 196b09f1484b115ffe245e94388fbc414c01a935 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 31 Aug 2022 14:50:21 +0200 Subject: [PATCH 0979/1407] chromium: update to 105.0.5195.102. --- .../files/musl-patches/musl-sandbox.patch | 13 - .../files/musl-patches/no-mallinfo.patch | 6 +- .../patches/angle-wayland-include.patch | 39 ++ .../patches/chromium-105-bitmap-include.patch | 27 + .../chromium-105-browser-include.patch | 25 + .../patches/chromium-105-math-ceilf.patch | 42 ++ srcpkgs/chromium/patches/cross-build.patch | 12 +- .../patches/reenable-linux-i686-builds.patch | 8 +- .../remove-no-opaque-pointers-flag.patch | 18 - .../patches/sandbox-sched_getparam.patch | 17 +- srcpkgs/chromium/patches/sndio.patch | 14 +- ...ozone-fix-X11-screensaver-suspension.patch | 490 ------------------ .../patches/xxx-ppc64le-4k-pages.patch | 24 +- .../patches/xxx-ppc64le-support.patch | 8 +- srcpkgs/chromium/template | 4 +- 15 files changed, 183 insertions(+), 564 deletions(-) create mode 100644 srcpkgs/chromium/patches/angle-wayland-include.patch create mode 100644 srcpkgs/chromium/patches/chromium-105-bitmap-include.patch create mode 100644 srcpkgs/chromium/patches/chromium-105-browser-include.patch create mode 100644 srcpkgs/chromium/patches/chromium-105-math-ceilf.patch delete mode 100644 srcpkgs/chromium/patches/remove-no-opaque-pointers-flag.patch delete mode 100644 srcpkgs/chromium/patches/x11-ozone-fix-X11-screensaver-suspension.patch diff --git a/srcpkgs/chromium/files/musl-patches/musl-sandbox.patch b/srcpkgs/chromium/files/musl-patches/musl-sandbox.patch index 230bb7bbd297..c770e76d8688 100644 --- a/srcpkgs/chromium/files/musl-patches/musl-sandbox.patch +++ b/srcpkgs/chromium/files/musl-patches/musl-sandbox.patch @@ -77,16 +77,3 @@ index 80f02c0..21fbe21 100644 case __NR_unshare: #if !defined(__mips__) && !defined(__aarch64__) case __NR_vfork: ---- sandbox/policy/linux/bpf_renderer_policy_linux.cc -+++ sandbox/policy/linux/bpf_renderer_policy_linux.cc -@@ -100,9 +100,9 @@ - case __NR_uname: - case __NR_sched_getparam: - case __NR_sched_getscheduler: -+ case __NR_sched_setscheduler: - return Allow(); - case __NR_sched_getaffinity: -- case __NR_sched_setscheduler: - return RestrictSchedTarget(GetPolicyPid(), sysno); - case __NR_prlimit64: - // See crbug.com/662450 and setrlimit comment above. diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch index aaa4cebf84e9..6c021d74b27e 100644 --- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch +++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch @@ -1,11 +1,11 @@ --- base/trace_event/malloc_dump_provider.cc.orig +++ base/trace_event/malloc_dump_provider.cc -@@ -174,7 +174,8 @@ +@@ -189,7 +189,8 @@ #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ -- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA)) -+ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA) && \ +- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA)) ++ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA) && \ + !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))) void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, diff --git a/srcpkgs/chromium/patches/angle-wayland-include.patch b/srcpkgs/chromium/patches/angle-wayland-include.patch new file mode 100644 index 000000000000..65770b9439c5 --- /dev/null +++ b/srcpkgs/chromium/patches/angle-wayland-include.patch @@ -0,0 +1,39 @@ +Patch-Source: https://github.com/archlinux/svntogit-packages/blob/a353833a5a731abfaa465b658f61894a516aa49b/trunk/angle-wayland-include-protocol.patch +diff -upr third_party/angle.orig/BUILD.gn third_party/angle/BUILD.gn +--- a/third_party/angle.orig/BUILD.gn 2022-08-17 19:38:11.000000000 +0000 ++++ b/third_party/angle/BUILD.gn 2022-08-18 11:04:09.061751111 +0000 +@@ -489,6 +489,12 @@ config("angle_vulkan_wayland_config") { + if (angle_enable_vulkan && angle_use_wayland && + defined(vulkan_wayland_include_dirs)) { + include_dirs = vulkan_wayland_include_dirs ++ } else if (angle_enable_vulkan && angle_use_wayland) { ++ include_dirs = [ ++ "$wayland_gn_dir/src/src", ++ "$wayland_gn_dir/include/src", ++ "$wayland_gn_dir/include/protocol", ++ ] + } + } + +@@ -1073,6 +1079,7 @@ if (angle_use_wayland) { + include_dirs = [ + "$wayland_dir/egl", + "$wayland_dir/src", ++ "$wayland_gn_dir/include/protocol", + ] + } + +diff -upr third_party/angle.orig/src/third_party/volk/BUILD.gn third_party/angle/src/third_party/volk/BUILD.gn +--- a/third_party/angle.orig/src/third_party/volk/BUILD.gn 2022-08-17 19:38:12.000000000 +0000 ++++ b/third_party/angle/src/third_party/volk/BUILD.gn 2022-08-18 11:04:36.499828006 +0000 +@@ -21,6 +21,9 @@ source_set("volk") { + configs += [ "$angle_root:angle_no_cfi_icall" ] + public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ] + if (angle_use_wayland) { +- include_dirs = [ "$wayland_dir/src" ] ++ include_dirs = [ ++ "$wayland_dir/src", ++ "$wayland_gn_dir/include/protocol", ++ ] + } + } diff --git a/srcpkgs/chromium/patches/chromium-105-bitmap-include.patch b/srcpkgs/chromium/patches/chromium-105-bitmap-include.patch new file mode 100644 index 000000000000..b37eee65265f --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-105-bitmap-include.patch @@ -0,0 +1,27 @@ +Patch-Source: https://github.com/stha09/chromium-patches/blob/cd45403f83a2305d388e1b1f930ca05c13535636/chromium-105-Bitmap-include.patch +From 8959d9d1c6e4ed083c278ab9e8def20a409052b9 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Fri, 22 Jul 2022 16:51:28 +0000 +Subject: [PATCH] IWYU: add memory for std::unique_ptr in disk_cache::Bitmap + +Bug: 957519 +Change-Id: I123198345e5f9062329b7eabe980f312525c268b +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3779530 +Reviewed-by: Maks Orlovich +Commit-Queue: Stephan Hartmann +Cr-Commit-Position: refs/heads/main@{#1027289} +--- + +diff --git a/net/disk_cache/blockfile/bitmap.h b/net/disk_cache/blockfile/bitmap.h +index 07806cf..9ffa98b9 100644 +--- a/net/disk_cache/blockfile/bitmap.h ++++ b/net/disk_cache/blockfile/bitmap.h +@@ -8,6 +8,8 @@ + #include + #include + ++#include ++ + #include "base/memory/raw_ptr.h" + #include "net/base/net_export.h" + diff --git a/srcpkgs/chromium/patches/chromium-105-browser-include.patch b/srcpkgs/chromium/patches/chromium-105-browser-include.patch new file mode 100644 index 000000000000..17cd0a296220 --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-105-browser-include.patch @@ -0,0 +1,25 @@ +Patch-Source: https://github.com/stha09/chromium-patches/blob/cd45403f83a2305d388e1b1f930ca05c13535636/chromium-105-browser_finder-include.patch +From 41dca8bd0c5e8ac5197d7477c6f01556fb88fb43 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Sun, 14 Aug 2022 08:41:11 +0000 +Subject: [PATCH] IWYU: add vector for std::vector in browser_finder.h + +--- + chrome/browser/ui/browser_finder.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chrome/browser/ui/browser_finder.h b/chrome/browser/ui/browser_finder.h +index f885be0..ad7a184 100644 +--- a/chrome/browser/ui/browser_finder.h ++++ b/chrome/browser/ui/browser_finder.h +@@ -6,6 +6,7 @@ + #define CHROME_BROWSER_UI_BROWSER_FINDER_H_ + + #include ++#include + + #include "ui/display/types/display_constants.h" + #include "ui/gfx/native_widget_types.h" +-- +2.35.1 + diff --git a/srcpkgs/chromium/patches/chromium-105-math-ceilf.patch b/srcpkgs/chromium/patches/chromium-105-math-ceilf.patch new file mode 100644 index 000000000000..3d4a72ad4bfb --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-105-math-ceilf.patch @@ -0,0 +1,42 @@ +Patch-Source: https://github.com/stha09/chromium-patches/blob/cd45403f83a2305d388e1b1f930ca05c13535636/chromium-105-AdjustMaskLayerGeometry-ceilf.patch +From 385068e1eb1cde9629d18ceee1fd13255c70c806 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Fri, 22 Jul 2022 18:29:24 +0000 +Subject: [PATCH] libstdc++: use math.h in blink::AdjustMaskLayerGeometry + +libstdc++ does not implement std::ceilf. Use ceilf from math.h +instead. + +Bug: 957519 +Change-Id: I03b5e0a1eb73fdeae34d5f3d2f2e9c8871c52543 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3782841 +Commit-Queue: Stephan Hartmann +Reviewed-by: Juanmi Huertas +Cr-Commit-Position: refs/heads/main@{#1027342} +--- + +diff --git a/third_party/blink/renderer/platform/graphics/compositing/adjust_mask_layer_geometry.cc b/third_party/blink/renderer/platform/graphics/compositing/adjust_mask_layer_geometry.cc +index 4abe1d9..b5b43da 100644 +--- a/third_party/blink/renderer/platform/graphics/compositing/adjust_mask_layer_geometry.cc ++++ b/third_party/blink/renderer/platform/graphics/compositing/adjust_mask_layer_geometry.cc +@@ -4,8 +4,9 @@ + + #include "third_party/blink/renderer/platform/graphics/compositing/adjust_mask_layer_geometry.h" + ++#include + #include +-#include ++ + #include "third_party/blink/renderer/platform/graphics/paint/geometry_mapper.h" + #include "third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h" + #include "ui/gfx/geometry/size.h" +@@ -29,8 +30,7 @@ + // Map a screen pixel into the layer. + GeometryMapper::SourceToDestinationRect(TransformPaintPropertyNode::Root(), + transform, pixel_rect); +- int outset = +- std::ceilf(std::max(pixel_rect.width(), pixel_rect.height()) * 2); ++ int outset = ceilf(std::max(pixel_rect.width(), pixel_rect.height()) * 2); + // Don't expand too far in extreme cases. + constexpr int kMaxOutset = 1000; + outset = std::min(kMaxOutset, outset); diff --git a/srcpkgs/chromium/patches/cross-build.patch b/srcpkgs/chromium/patches/cross-build.patch index ddfe14951eef..53df490bac97 100644 --- a/srcpkgs/chromium/patches/cross-build.patch +++ b/srcpkgs/chromium/patches/cross-build.patch @@ -1,6 +1,6 @@ --- a/build/config/compiler/BUILD.gn.orig +++ b/build/config/compiler/BUILD.gn -@@ -58,6 +58,10 @@ +@@ -55,6 +55,10 @@ } declare_args() { @@ -11,10 +11,10 @@ # Normally, Android builds are lightly optimized, even for debug builds, to # keep binary size down. Setting this flag to true disables such optimization android_full_debug = false -@@ -880,8 +884,13 @@ - } +@@ -917,8 +917,13 @@ } else if (current_cpu == "arm64") { - if (is_clang && !is_android && !is_nacl && !is_fuchsia) { + if (is_clang && !is_android && !is_nacl && !is_fuchsia && + !(is_chromeos_lacros && is_chromeos_device)) { - cflags += [ "--target=aarch64-linux-gnu" ] - ldflags += [ "--target=aarch64-linux-gnu" ] + if (is_musl) { @@ -25,8 +25,8 @@ + ldflags += [ "--target=aarch64-linux-gnu" ] + } } - } else if (current_cpu == "mipsel" && !is_nacl) { - ldflags += [ "-Wl,--hash-style=sysv" ] + if (is_android) { + # Outline atomics crash on Exynos 9810. http://crbug.com/1272795 --- a/build/toolchain/linux/unbundle/BUILD.gn.orig +++ b/build/toolchain/linux/unbundle/BUILD.gn @@ -39,3 +39,22 @@ diff --git a/srcpkgs/chromium/patches/reenable-linux-i686-builds.patch b/srcpkgs/chromium/patches/reenable-linux-i686-builds.patch index 11c2298c4eb8..b18718e43649 100644 --- a/srcpkgs/chromium/patches/reenable-linux-i686-builds.patch +++ b/srcpkgs/chromium/patches/reenable-linux-i686-builds.patch @@ -1,6 +1,6 @@ ---- a/BUILD.gn +--- a/BUILD.gn.orig +++ b/BUILD.gn -@@ -1522,14 +1522,6 @@ +@@ -1616,16 +1616,6 @@ } } @@ -8,8 +8,10 @@ -is_valid_x86_target = - target_os != "ios" && target_os != "mac" && - (target_os != "linux" || use_libfuzzer || !build_with_chromium) +- +-# Note: v8_target_cpu == arm allows using the V8 arm simulator on x86 for fuzzing. -assert( -- is_valid_x86_target || target_cpu != "x86", +- is_valid_x86_target || target_cpu != "x86" || v8_target_cpu == "arm", - "'target_cpu=x86' is not supported for 'target_os=$target_os'. Consider omitting 'target_cpu' (default) or using 'target_cpu=x64' instead.") - group("chromium_builder_perf") { diff --git a/srcpkgs/chromium/patches/remove-no-opaque-pointers-flag.patch b/srcpkgs/chromium/patches/remove-no-opaque-pointers-flag.patch deleted file mode 100644 index 1231eeb7def0..000000000000 --- a/srcpkgs/chromium/patches/remove-no-opaque-pointers-flag.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- chromium-102.0.5005.61/build/config/compiler/BUILD.gn.orig 2022-05-19 10:35:52.991415777 +0000 -+++ chromium-102.0.5005.61/build/config/compiler/BUILD.gn 2022-05-19 10:36:11.102017131 +0000 -@@ -1538,15 +1538,6 @@ config("default_warnings") { - cflags += [ "-Wno-unqualified-std-cast-call" ] - } - -- if (!is_nacl && !(is_chromeos || -- default_toolchain == "//build/toolchain/cros:target")) { -- # TODO(https://crbug.com/1322823): Remove flags once potential miscompile is investigated. -- cflags += [ -- "-Xclang", -- "-no-opaque-pointers", -- ] -- } -- - if (is_fuchsia) { - # TODO(https://bugs.chromium.org/p/fuchsia/issues/detail?id=77383) - cflags += [ "-Wno-deprecated-copy" ] diff --git a/srcpkgs/chromium/patches/sandbox-sched_getparam.patch b/srcpkgs/chromium/patches/sandbox-sched_getparam.patch index b9e1dc79924b..dfe0bd8f8235 100644 --- a/srcpkgs/chromium/patches/sandbox-sched_getparam.patch +++ b/srcpkgs/chromium/patches/sandbox-sched_getparam.patch @@ -3,18 +3,19 @@ musl uses them for pthread_getschedparam() source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e ---- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc 2019-10-08 21:03:18.253080425 +0200 -+++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc 2019-10-08 21:04:19.648549718 +0200 -@@ -88,10 +88,10 @@ - case __NR_sysinfo: - case __NR_times: - case __NR_uname: +--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc ++++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc +@@ -102,11 +102,11 @@ + #if defined(__arm__) || defined(__aarch64__) + case __NR_getcpu: + #endif - return Allow(); - case __NR_sched_getaffinity: case __NR_sched_getparam: case __NR_sched_getscheduler: + case __NR_sched_setscheduler: + return Allow(); + case __NR_sched_getaffinity: - case __NR_sched_setscheduler: - return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno); + return RestrictSchedTarget(GetPolicyPid(), sysno); case __NR_prlimit64: + // See crbug.com/662450 and setrlimit comment above. diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch index df668d13b2a3..077ceaa8acbc 100644 --- a/srcpkgs/chromium/patches/sndio.patch +++ b/srcpkgs/chromium/patches/sndio.patch @@ -1,6 +1,6 @@ diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn --- a/media/BUILD.gn 2020-06-03 20:40:26.000000000 +0200 -+++ b/media/BUILD.gn 2020-06-13 17:32:28.510395975 +0200 ++++ b/media/BUILD.gn 2021-06-13 17:32:28.510395975 +0200 @@ -65,6 +65,9 @@ defines += [ "DLOPEN_PULSEAUDIO" ] } @@ -863,15 +863,15 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium- + +#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni ---- a/media/media_options.gni 2020-06-03 20:40:26.000000000 +0200 -+++ b/media/media_options.gni 2020-06-13 17:32:28.512395963 +0200 -@@ -125,6 +125,9 @@ +--- a/media/media_options.gni ++++ b/media/media_options.gni +@@ -158,6 +158,9 @@ # Enables runtime selection of ALSA library for audio. use_alsa = false + # Enable runtime selection of sndio(7) + use_sndio = false + - # Alsa should be used on non-Android, non-Mac POSIX systems (excluding CastOS - # video builds). - if (is_posix && !is_android && !is_mac && + # Alsa should be used on all non-Android, non-Mac POSIX systems - with the + # exception of CastOS desktop builds. + # diff --git a/srcpkgs/chromium/patches/x11-ozone-fix-X11-screensaver-suspension.patch b/srcpkgs/chromium/patches/x11-ozone-fix-X11-screensaver-suspension.patch deleted file mode 100644 index 4336d6a7a0a4..000000000000 --- a/srcpkgs/chromium/patches/x11-ozone-fix-X11-screensaver-suspension.patch +++ /dev/null @@ -1,490 +0,0 @@ -From 8c1ebea5f601b0b5247535dcdfd01755f3e6e1a6 Mon Sep 17 00:00:00 2001 -From: Andrew Wolfers -Date: Tue, 19 Jul 2022 15:01:25 +0000 -Subject: [PATCH] [x11][ozone] Fix X11 screensaver suspension. - -X11 screensaver suspension was broken by https://crrev.com/c/3507472, -in which usage patterns were migrated to a non-stacking paradigm. - -"Non-stacking" screensaver suspension describes an overriding behavior, -such that the last suspending or un-suspending call defines the current -state. Conversely, a "stacking" screensaver suspension paradigm allows -for parallel suspension, such that suspending calls are expected to be -matched by an equal number of un-suspending calls. - -Documentation for `PlatformScreen::SetScreenSaverSuspended` (inherited -by `X11ScreenOzone`) explains that it should be used in a non-stacking -manner [1], which contradicts the child class's underlying -implementation [2]. - -> If XScreenSaverSuspend is called multiple times with suspend set to -> 'True', it must be called an equal number of times with suspend set -> to 'False' in order for the screensaver timer to be restarted. - -This change updates the documentation/API of the `PlatformScreen` -parent class to correctly describe the stacking behavior of child class -`X11ScreenOzone`. This change also updates the implementation of -`WaylandScreen` to a stacking version. Lastly, this change updates the -call sites of `PlatformScreen` according to the API change. - -[1] https://crsrc.org/c/ui/ozone/public/platform_screen.h;l=96 -[2] https://linux.die.net/man/3/xscreensaverunsetattributes - -Bug: b:193670013 -Bug: b:196213351 -Bug: 1329573 -Bug: 1339361 -Change-Id: I60975c8da9f86a0f26f3c32cf49c4a7eeeea6a12 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3759067 -Commit-Queue: Andrew Wolfers -Reviewed-by: Thomas Anderson -Reviewed-by: Scott Violet -Cr-Commit-Position: refs/heads/main@{#1025717} - -(cherry picked from commit e61f08f8dbf1ec7cead427f3c497934e9d0db35f) ---- - ui/aura/screen_ozone.cc | 14 ++++++-- - ui/aura/screen_ozone.h | 29 ++++++++++++---- - ui/base/x/x11_util.h | 4 ++- - ui/display/screen.cc | 21 ++---------- - ui/display/screen.h | 34 ++++++------------- - .../platform/wayland/host/wayland_screen.cc | 31 +++++++++++++++++ - .../platform/wayland/host/wayland_screen.h | 30 +++++++++++++++- - ui/ozone/platform/x11/x11_screen_ozone.cc | 27 +++++++++++++-- - ui/ozone/platform/x11/x11_screen_ozone.h | 19 ++++++++++- - ui/ozone/public/platform_screen.cc | 8 +++-- - ui/ozone/public/platform_screen.h | 26 +++++++++++--- - 11 files changed, 182 insertions(+), 61 deletions(-) - -diff --git a/ui/aura/screen_ozone.cc b/ui/aura/screen_ozone.cc -index a78a6a48f1..09f62dc982 100644 ---- a/ui/aura/screen_ozone.cc -+++ b/ui/aura/screen_ozone.cc -@@ -4,6 +4,8 @@ - - #include "ui/aura/screen_ozone.h" - -+#include -+ - #include "ui/aura/client/screen_position_client.h" - #include "ui/aura/window.h" - #include "ui/aura/window_tree_host.h" -@@ -108,8 +110,16 @@ display::Display ScreenOzone::GetPrimaryDisplay() const { - } - - #if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) --bool ScreenOzone::SetScreenSaverSuspended(bool suspend) { -- return platform_screen_->SetScreenSaverSuspended(suspend); -+ScreenOzone::ScreenSaverSuspenderOzone::ScreenSaverSuspenderOzone( -+ std::unique_ptr suspender) -+ : suspender_(std::move(suspender)) {} -+ -+ScreenOzone::ScreenSaverSuspenderOzone::~ScreenSaverSuspenderOzone() = default; -+ -+std::unique_ptr -+ScreenOzone::SuspendScreenSaver() { -+ return std::make_unique( -+ platform_screen_->SuspendScreenSaver()); - } - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) - -diff --git a/ui/aura/screen_ozone.h b/ui/aura/screen_ozone.h -index 2970a0e0e7..d033abf366 100644 ---- a/ui/aura/screen_ozone.h -+++ b/ui/aura/screen_ozone.h -@@ -11,10 +11,7 @@ - #include "build/chromeos_buildflags.h" - #include "ui/aura/aura_export.h" - #include "ui/display/screen.h" -- --namespace ui { --class PlatformScreen; --} -+#include "ui/ozone/public/platform_screen.h" - - namespace aura { - -@@ -48,6 +45,10 @@ class AURA_EXPORT ScreenOzone : public display::Screen { - display::Display GetDisplayMatching( - const gfx::Rect& match_rect) const override; - display::Display GetPrimaryDisplay() const override; -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+ std::unique_ptr SuspendScreenSaver() -+ override; -+#endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) - bool IsScreenSaverActive() const override; - base::TimeDelta CalculateIdleTime() const override; - void AddObserver(display::DisplayObserver* observer) override; -@@ -65,11 +66,27 @@ class AURA_EXPORT ScreenOzone : public display::Screen { - protected: - ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } - -+ private: - #if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -- bool SetScreenSaverSuspended(bool suspend) override; -+ class ScreenSaverSuspenderOzone -+ : public display::Screen::ScreenSaverSuspender { -+ public: -+ explicit ScreenSaverSuspenderOzone( -+ std::unique_ptr -+ suspender); -+ -+ ScreenSaverSuspenderOzone(const ScreenSaverSuspenderOzone&) = delete; -+ ScreenSaverSuspenderOzone& operator=(const ScreenSaverSuspenderOzone&) = -+ delete; -+ -+ ~ScreenSaverSuspenderOzone() override; -+ -+ private: -+ std::unique_ptr -+ suspender_; -+ }; - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) - -- private: - gfx::AcceleratedWidget GetAcceleratedWidgetForWindow( - aura::Window* window) const; - -diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h -index bf36efe170..0692571582 100644 ---- a/ui/base/x/x11_util.h -+++ b/ui/base/x/x11_util.h -@@ -337,7 +337,9 @@ COMPONENT_EXPORT(UI_BASE_X) bool IsCompositingManagerPresent(); - COMPONENT_EXPORT(UI_BASE_X) bool IsX11WindowFullScreen(x11::Window window); - - // Suspends or resumes the X screen saver, and returns whether the operation was --// successful. Must be called on the UI thread. -+// successful. Must be called on the UI thread. If called multiple times with -+// |suspend| set to true, the screen saver is not un-suspended until this method -+// is called an equal number of times with |suspend| set to false. - COMPONENT_EXPORT(UI_BASE_X) bool SuspendX11ScreenSaver(bool suspend); - - // Returns true if the window manager supports the given hint. -diff --git a/ui/display/screen.cc b/ui/display/screen.cc -index b9723889ce..70dc0a9f5c 100644 ---- a/ui/display/screen.cc -+++ b/ui/display/screen.cc -@@ -85,26 +85,11 @@ void Screen::SetDisplayForNewWindows(int64_t display_id) { - } - - #if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) --std::unique_ptr Screen::SuspendScreenSaver() { -- SetScreenSaverSuspended(true); -- screen_saver_suspension_count_++; -- return base::WrapUnique(new Screen::ScreenSaverSuspender(this)); --} -- --Screen::ScreenSaverSuspender::~ScreenSaverSuspender() { -- // Check that this suspender still refers to the active screen. Particularly -- // in tests, the screen might be destructed before the suspender. -- if (screen_ == GetScreen()) { -- screen_->screen_saver_suspension_count_--; -- if (screen_->screen_saver_suspension_count_ == 0) { -- screen_->SetScreenSaverSuspended(false); -- } -- } --} -+Screen::ScreenSaverSuspender::~ScreenSaverSuspender() = default; - --bool Screen::SetScreenSaverSuspended(bool suspend) { -+std::unique_ptr Screen::SuspendScreenSaver() { - NOTIMPLEMENTED_LOG_ONCE(); -- return false; -+ return nullptr; - } - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) - -diff --git a/ui/display/screen.h b/ui/display/screen.h -index a86c5b63cc..d04534006f 100644 ---- a/ui/display/screen.h -+++ b/ui/display/screen.h -@@ -133,28 +133,22 @@ class DISPLAY_EXPORT Screen { - // its existence. - class ScreenSaverSuspender { - public: -- ScreenSaverSuspender(const Screen&) = delete; -- ScreenSaverSuspender& operator=(const Screen&) = delete; -+ ScreenSaverSuspender() = default; - -- // Notifies |screen_| that this instance is being destructed, and causes its -- // platform-specific screensaver to be un-suspended if this is the last such -- // remaining instance. -- ~ScreenSaverSuspender(); -+ ScreenSaverSuspender(const ScreenSaverSuspender&) = delete; -+ ScreenSaverSuspender& operator=(const ScreenSaverSuspender&) = delete; - -- private: -- friend class Screen; -- -- explicit ScreenSaverSuspender(Screen* screen) : screen_(screen) {} -- -- Screen* screen_; -+ // Causes the platform-specific screensaver to be un-suspended iff this is -+ // the last remaining instance. -+ virtual ~ScreenSaverSuspender() = 0; - }; - - // Suspends the platform-specific screensaver until the returned -- // |ScreenSaverSuspender| is destructed. This method allows stacking multiple -- // overlapping calls, such that the platform-specific screensaver will not be -- // un-suspended until all returned |SreenSaverSuspender| instances have been -- // destructed. -- std::unique_ptr SuspendScreenSaver(); -+ // |ScreenSaverSuspender| is destructed, or returns nullptr if suspension -+ // failed. This method allows stacking multiple overlapping calls, such that -+ // the platform-specific screensaver will not be un-suspended until all -+ // returned |ScreenSaverSuspender| instances have been destructed. -+ virtual std::unique_ptr SuspendScreenSaver(); - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) - - // Returns whether the screensaver is currently running. -@@ -200,12 +194,6 @@ class DISPLAY_EXPORT Screen { - const gfx::GpuExtraInfo& gpu_extra_info); - - protected: --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -- // Suspends or un-suspends the platform-specific screensaver, and returns -- // whether the operation was successful. -- virtual bool SetScreenSaverSuspended(bool suspend); --#endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -- - void set_shutdown(bool shutdown) { shutdown_ = shutdown; } - - private: -diff --git a/ui/ozone/platform/wayland/host/wayland_screen.cc b/ui/ozone/platform/wayland/host/wayland_screen.cc -index 0c7dc5c02b..18cd81b472 100644 ---- a/ui/ozone/platform/wayland/host/wayland_screen.cc -+++ b/ui/ozone/platform/wayland/host/wayland_screen.cc -@@ -327,6 +327,37 @@ display::Display WaylandScreen::GetDisplayMatching( - return display_matching ? *display_matching : GetPrimaryDisplay(); - } - -+std::unique_ptr -+WaylandScreen::WaylandScreenSaverSuspender::Create(WaylandScreen& screen) { -+ auto suspender = base::WrapUnique(new WaylandScreenSaverSuspender(screen)); -+ if (suspender->is_suspending_) { -+ screen.screen_saver_suspension_count_++; -+ return suspender; -+ } -+ -+ return nullptr; -+} -+ -+WaylandScreen::WaylandScreenSaverSuspender::WaylandScreenSaverSuspender( -+ WaylandScreen& screen) -+ : screen_(screen.GetWeakPtr()) { -+ is_suspending_ = screen.SetScreenSaverSuspended(true); -+} -+ -+WaylandScreen::WaylandScreenSaverSuspender::~WaylandScreenSaverSuspender() { -+ if (screen_ && is_suspending_) { -+ screen_->screen_saver_suspension_count_--; -+ if (screen_->screen_saver_suspension_count_ == 0) { -+ screen_->SetScreenSaverSuspended(false); -+ } -+ } -+} -+ -+std::unique_ptr -+WaylandScreen::SuspendScreenSaver() { -+ return WaylandScreenSaverSuspender::Create(*this); -+} -+ - bool WaylandScreen::SetScreenSaverSuspended(bool suspend) { - if (!connection_->zwp_idle_inhibit_manager()) - return false; -diff --git a/ui/ozone/platform/wayland/host/wayland_screen.h b/ui/ozone/platform/wayland/host/wayland_screen.h -index 87358f4f06..8e5515104a 100644 ---- a/ui/ozone/platform/wayland/host/wayland_screen.h -+++ b/ui/ozone/platform/wayland/host/wayland_screen.h -@@ -68,7 +68,8 @@ class WaylandScreen : public PlatformScreen { - const gfx::Point& point) const override; - display::Display GetDisplayMatching( - const gfx::Rect& match_rect) const override; -- bool SetScreenSaverSuspended(bool suspend) override; -+ std::unique_ptr -+ SuspendScreenSaver() override; - bool IsScreenSaverActive() const override; - base::TimeDelta CalculateIdleTime() const override; - void AddObserver(display::DisplayObserver* observer) override; -@@ -76,7 +77,33 @@ class WaylandScreen : public PlatformScreen { - std::vector GetGpuExtraInfo( - const gfx::GpuExtraInfo& gpu_extra_info) override; - -+ protected: -+ // Suspends or un-suspends the platform-specific screensaver, and returns -+ // whether the operation was successful. Can be called more than once with the -+ // same value for |suspend|, but those states should not stack: the first -+ // alternating value should toggle the state of the suspend. -+ bool SetScreenSaverSuspended(bool suspend); -+ - private: -+ class WaylandScreenSaverSuspender -+ : public PlatformScreen::PlatformScreenSaverSuspender { -+ public: -+ WaylandScreenSaverSuspender(const WaylandScreenSaverSuspender&) = delete; -+ WaylandScreenSaverSuspender& operator=(const WaylandScreenSaverSuspender&) = -+ delete; -+ -+ ~WaylandScreenSaverSuspender() override; -+ -+ static std::unique_ptr Create( -+ WaylandScreen& screen); -+ -+ private: -+ explicit WaylandScreenSaverSuspender(WaylandScreen& screen); -+ -+ base::WeakPtr screen_; -+ bool is_suspending_ = false; -+ }; -+ - // All parameters are in DIP screen coordinates/units except |physical_size|, - // which is in physical pixels. - void AddOrUpdateDisplay(uint32_t output_id, -@@ -103,6 +130,7 @@ class WaylandScreen : public PlatformScreen { - #endif - - wl::Object idle_inhibitor_; -+ uint32_t screen_saver_suspension_count_ = 0; - - base::WeakPtrFactory weak_factory_; - }; -diff --git a/ui/ozone/platform/x11/x11_screen_ozone.cc b/ui/ozone/platform/x11/x11_screen_ozone.cc -index 53265ab58a..b450df9c83 100644 ---- a/ui/ozone/platform/x11/x11_screen_ozone.cc -+++ b/ui/ozone/platform/x11/x11_screen_ozone.cc -@@ -4,6 +4,8 @@ - - #include "ui/ozone/platform/x11/x11_screen_ozone.h" - -+#include -+ - #include "base/containers/flat_set.h" - #include "ui/base/linux/linux_desktop.h" - #include "ui/base/x/x11_idle_query.h" -@@ -131,8 +133,29 @@ display::Display X11ScreenOzone::GetDisplayMatching( - return matching_display ? *matching_display : GetPrimaryDisplay(); - } - --bool X11ScreenOzone::SetScreenSaverSuspended(bool suspend) { -- return SuspendX11ScreenSaver(suspend); -+X11ScreenOzone::X11ScreenSaverSuspender::X11ScreenSaverSuspender() { -+ is_suspending_ = SuspendX11ScreenSaver(true); -+} -+ -+std::unique_ptr -+X11ScreenOzone::X11ScreenSaverSuspender::Create() { -+ auto suspender = base::WrapUnique(new X11ScreenSaverSuspender()); -+ if (suspender->is_suspending_) { -+ return suspender; -+ } -+ -+ return nullptr; -+} -+ -+X11ScreenOzone::X11ScreenSaverSuspender::~X11ScreenSaverSuspender() { -+ if (is_suspending_) { -+ SuspendX11ScreenSaver(false); -+ } -+} -+ -+std::unique_ptr -+X11ScreenOzone::SuspendScreenSaver() { -+ return X11ScreenSaverSuspender::Create(); - } - - bool X11ScreenOzone::IsScreenSaverActive() const { -diff --git a/ui/ozone/platform/x11/x11_screen_ozone.h b/ui/ozone/platform/x11/x11_screen_ozone.h -index d86acae9aa..81e0fd13d8 100644 ---- a/ui/ozone/platform/x11/x11_screen_ozone.h -+++ b/ui/ozone/platform/x11/x11_screen_ozone.h -@@ -50,7 +50,8 @@ class X11ScreenOzone : public PlatformScreen, - const gfx::Point& point) const override; - display::Display GetDisplayMatching( - const gfx::Rect& match_rect) const override; -- bool SetScreenSaverSuspended(bool suspend) override; -+ std::unique_ptr -+ SuspendScreenSaver() override; - bool IsScreenSaverActive() const override; - base::TimeDelta CalculateIdleTime() const override; - void AddObserver(display::DisplayObserver* observer) override; -@@ -66,6 +67,22 @@ class X11ScreenOzone : public PlatformScreen, - private: - friend class X11ScreenOzoneTest; - -+ class X11ScreenSaverSuspender -+ : public PlatformScreen::PlatformScreenSaverSuspender { -+ public: -+ X11ScreenSaverSuspender(const X11ScreenSaverSuspender&) = delete; -+ X11ScreenSaverSuspender& operator=(const X11ScreenSaverSuspender&) = delete; -+ -+ ~X11ScreenSaverSuspender() override; -+ -+ static std::unique_ptr Create(); -+ -+ private: -+ X11ScreenSaverSuspender(); -+ -+ bool is_suspending_ = false; -+ }; -+ - // Overridden from ui::XDisplayManager::Delegate: - void OnXDisplayListUpdated() override; - float GetXDisplayScaleFactor() const override; -diff --git a/ui/ozone/public/platform_screen.cc b/ui/ozone/public/platform_screen.cc -index 98f599aa41..2353208396 100644 ---- a/ui/ozone/public/platform_screen.cc -+++ b/ui/ozone/public/platform_screen.cc -@@ -30,9 +30,13 @@ std::string PlatformScreen::GetCurrentWorkspace() { - return {}; - } - --bool PlatformScreen::SetScreenSaverSuspended(bool suspend) { -+PlatformScreen::PlatformScreenSaverSuspender::~PlatformScreenSaverSuspender() = -+ default; -+ -+std::unique_ptr -+PlatformScreen::SuspendScreenSaver() { - NOTIMPLEMENTED_LOG_ONCE(); -- return false; -+ return nullptr; - } - - bool PlatformScreen::IsScreenSaverActive() const { -diff --git a/ui/ozone/public/platform_screen.h b/ui/ozone/public/platform_screen.h -index 091220a99f..e4adfafce3 100644 ---- a/ui/ozone/public/platform_screen.h -+++ b/ui/ozone/public/platform_screen.h -@@ -89,11 +89,27 @@ class COMPONENT_EXPORT(OZONE_BASE) PlatformScreen { - virtual display::Display GetDisplayMatching( - const gfx::Rect& match_rect) const = 0; - -- // Suspends or un-suspends the platform-specific screensaver, and returns -- // whether the operation was successful. Can be called more than once with the -- // same value for |suspend|, but those states should not stack: the first -- // alternating value should toggle the state of the suspend. -- virtual bool SetScreenSaverSuspended(bool suspend); -+ // Object which suspends the platform-specific screensaver for the duration of -+ // its existence. -+ class PlatformScreenSaverSuspender { -+ public: -+ PlatformScreenSaverSuspender() = default; -+ -+ PlatformScreenSaverSuspender(const PlatformScreenSaverSuspender&) = delete; -+ PlatformScreenSaverSuspender& operator=( -+ const PlatformScreenSaverSuspender&) = delete; -+ -+ // Causes the platform-specific screensaver to be un-suspended iff this is -+ // the last remaining instance. -+ virtual ~PlatformScreenSaverSuspender() = 0; -+ }; -+ -+ // Suspends the platform-specific screensaver until the returned -+ // |PlatformScreenSaverSuspender| is destructed, or returns nullptr if -+ // suspension failed. This method allows stacking multiple overlapping calls, -+ // such that the platform-specific screensaver will not be un-suspended until -+ // all returned |PlatformScreenSaverSuspender| instances have been destructed. -+ virtual std::unique_ptr SuspendScreenSaver(); - - // Returns whether the screensaver is currently running. - virtual bool IsScreenSaverActive() const; diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch b/srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch index 886be0bf4666..28c4ad35f14e 100644 --- a/srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch +++ b/srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch @@ -38,19 +38,23 @@ index 0b9260d..3e054ec 100644 #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t -diff --git a/base/allocator/partition_allocator/partition_alloc_forward.h b/base/allocator/partition_allocator/partition_alloc_forward.h -index 938ea38..9414b41 100644 --- a/base/allocator/partition_allocator/partition_alloc_forward.h +++ b/base/allocator/partition_allocator/partition_alloc_forward.h -@@ -26,7 +26,10 @@ namespace base { - // - // __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on all - // platforms, as Chrome's requirement is C++14 as of 2020. --#if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__) +@@ -25,12 +25,17 @@ + // the second one 16. We could technically return something different for + // malloc() and operator new(), but this would complicate things, and most of + // our allocations are presumably coming from operator new() anyway. +#if defined(__powerpc64__) +/* we want this to be 16 here always */ +constexpr size_t kAlignment = 16; -+#elif defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__) ++#else constexpr size_t kAlignment = - std::max(alignof(max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__); - #else + std::max(alignof(max_align_t), + static_cast(__STDCPP_DEFAULT_NEW_ALIGNMENT__)); + static_assert(kAlignment <= 16, + "PartitionAlloc doesn't support a fundamental alignment larger " + "than 16 bytes."); ++#endif + + constexpr bool ThreadSafe = true; + diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch index d9a2724e1e22..3c2df31566ec 100644 --- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch +++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch @@ -3551,16 +3551,16 @@ diff --git a/v8/test/BUILD.gn b/v8/test/BUILD.gn index fb872ad39..45fc585dd 100644 --- a/v8/test/BUILD.gn +++ b/v8/test/BUILD.gn -@@ -36,7 +36,7 @@ group("gn_all") { +@@ -42,7 +42,7 @@ group("gn_all") { "benchmarks/cpp:gn_all", "cctest:cctest", - "cctest:generate-bytecode-expectations", + "unittests:generate-bytecode-expectations", - "unittests:unittests", + #"unittests:unittests", ] } } -@@ -83,7 +83,7 @@ +@@ -84,7 +84,7 @@ "message:v8_message", "mjsunit:v8_mjsunit", "mkgrokdump:mkgrokdump", @@ -3569,7 +3569,7 @@ index fb872ad39..45fc585dd 100644 "webkit:v8_webkit", ] -@@ -108,7 +108,7 @@ +@@ -109,7 +109,7 @@ "message:v8_message", "mjsunit:v8_mjsunit", "mkgrokdump:mkgrokdump", diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 6a5fc76de0aa..01d4a075d759 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=104.0.5112.101 +version=105.0.5195.102 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=60f015e1559de4044cdfa3bdc1f8fde535927c8ab15b0959ccc9b6feec832f5b +checksum=1cba0527c951e3c506ade96cf6ec2507ee9d43661764731ed896348182369262 lib32disabled=yes From a06983c94b532f19db180c8ba2ff49c53b10ee20 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 6 Aug 2022 18:23:29 +0200 Subject: [PATCH 0980/1407] meson: update to 0.63.2. --- srcpkgs/meson/patches/10702.patch | 59 ------------------------------- srcpkgs/meson/template | 8 ++--- 2 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 srcpkgs/meson/patches/10702.patch diff --git a/srcpkgs/meson/patches/10702.patch b/srcpkgs/meson/patches/10702.patch deleted file mode 100644 index 7ab15ebbc007..000000000000 --- a/srcpkgs/meson/patches/10702.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 869b95d0c2a854d73db0fceb7d0dbee9dc88cf46 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Tue, 16 Aug 2022 22:42:53 -0400 -Subject: [PATCH] minstall: do not trample install_mode by rpath fixer - -install_mode can include the setuid bit, which has the special property -(mentioned in the set_mode logic for minstall itself) of needing to come -last, because it "will get wiped by chmod" (or at least chown). - -In fact, it's not just chown that wipes setuid, but other changes as -well, such as the file contents. This is not an issue for install_data / -custom_target, but for compiled outputs, we run depfixer to handle -rpaths. This may or may not cause edits to the binary, depending on -whether we have a build rpath to wipe, or an install rpath to add. (We -also may run `strip`, but that external program already has its own mode -restoration logic.) - -Fix this by switching the order of operations around, so that setting -the permissions happens last. - -Fixes https://github.com/void-linux/void-packages/issues/38682 ---- - mesonbuild/minstall.py | 3 ++- - test cases/common/190 install_mode/meson.build | 1 + - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 551f909c80d..a810ccbbd40 100644 ---- a/mesonbuild/minstall.py -+++ b/mesonbuild/minstall.py -@@ -693,7 +693,6 @@ def install_targets(self, d: InstallData, dm: DirMaker, destdir: str, fullprefix - raise MesonException(f'File {fname!r} could not be found') - elif os.path.isfile(fname): - file_copied = self.do_copyfile(fname, outname, makedirs=(dm, outdir)) -- self.set_mode(outname, install_mode, d.install_umask) - if should_strip and d.strip_bin is not None: - if fname.endswith('.jar'): - self.log('Not stripping jar target: {}'.format(os.path.basename(fname))) -@@ -723,6 +722,8 @@ def install_targets(self, d: InstallData, dm: DirMaker, destdir: str, fullprefix - pass - else: - raise -+ # file mode needs to be set last, after strip/depfixer editing -+ self.set_mode(outname, install_mode, d.install_umask) - - def rebuild_all(wd: str) -> bool: - if not (Path(wd) / 'build.ninja').is_file(): -diff --git a/test cases/common/190 install_mode/meson.build b/test cases/common/190 install_mode/meson.build -index cae1e91aba3..e877ba75757 100644 ---- a/test cases/common/190 install_mode/meson.build -+++ b/test cases/common/190 install_mode/meson.build -@@ -51,6 +51,7 @@ install_man('foo.1', - executable('trivialprog', - sources : 'trivial.c', - install : true, -+ build_rpath: meson.current_build_dir(), - install_mode : ['rwxr-sr-x', 'root', 'root']) - - # test install_mode in static_library diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index d3243fe16052..aea31234fd19 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,12 +1,12 @@ # Template file for 'meson' pkgname=meson -version=0.62.2 -revision=2 +version=0.63.2 +revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" depends="ninja python3-setuptools" checkdepends="glib-devel gobject-introspection ninja - gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel + gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel cross-arm-linux-gnueabihf" short_desc="Super fast build system" maintainer="Michal Vasilek " @@ -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=a7669e4c4110b06b743d57cc5d6432591a6677ef2402139fe4f3d42ac13380b0 +checksum=16222f17ef76be0542c91c07994f9676ae879f46fc21c0c786a21ef2cb518bbf # XXX: sanitizers aren't available on musl if [ "$XBPS_TARGET_LIBC" = glibc ]; then From 24ae69f08a98a0284f1a12a72888d1380019db78 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 6 Aug 2022 18:23:26 +0200 Subject: [PATCH 0981/1407] budgie-desktop: fix build with meson 0.63 --- .../budgie-desktop/patches/meson-0.63.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/budgie-desktop/patches/meson-0.63.patch diff --git a/srcpkgs/budgie-desktop/patches/meson-0.63.patch b/srcpkgs/budgie-desktop/patches/meson-0.63.patch new file mode 100644 index 000000000000..07b36c8dda55 --- /dev/null +++ b/srcpkgs/budgie-desktop/patches/meson-0.63.patch @@ -0,0 +1,33 @@ +From 078ee1b05436adc67ba6175345ebdfd5c0463195 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Mon, 20 Jun 2022 19:59:35 -0400 +Subject: [PATCH] fix broken C std for gvc subproject + +Historically, Meson didn't know how to set c_std for a subproject at +all. Meson 0.63.0 adds support for this, so the default_options kwarg to +subproject now begins to respect this. + +budgie-desktop uses c11, but artificially sets c89 for the gvc +submodule. However, this does not actually work... the build then errors +out when trying to build +subprojects/gvc/test-audio-device-selection.p/test-audio-device-selection.c.o + +Remove the faulty argument. + +Fixes regression in commit 3d6d71c167dd9742cd072e7e6a3453c23ebb2658. +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 763d5a1b..3c52b8f5 100644 +--- a/meson.build ++++ b/meson.build +@@ -130,7 +130,6 @@ with_polkit = get_option('with-polkit') + # Get gvc built before we do anything + gvc = subproject('gvc', + default_options: [ +- 'c_std=c89', + 'static=false', + 'pkglibdir=@0@'.format(rpath_libdir), + 'package_name=' + meson.project_name(), From 2a025dc64c0c2973d1ebd77e0bc4b035283f7c00 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 2 Sep 2022 21:46:59 -0700 Subject: [PATCH 0982/1407] evolution-data-server: update to 3.44.4 --- srcpkgs/evolution-data-server/template | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 65e5fddbf24d..6304e8cc5b34 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,17 +1,17 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.44.3 +version=3.44.4 revision=1 build_style=cmake build_helper="gir qemu" -configure_args="-DENABLE_UOA=OFF - -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON +configure_args=" -DSYSCONF_INSTALL_DIR=/etc + -DWITH_GWEATHER4=ON -DWITH_PHONENUMBER=ON $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')" hostmakedepends="flex glib-devel gperf gettext pkg-config libglib-devel $(vopt_if gir vala)" makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel - libsoup-devel $(vopt_if gir vala-devel)" + libsoup-devel libphonenumber-devel $(vopt_if gir vala-devel)" depends="libgweather libsoup-gnome" checkdepends="dbus" short_desc="Centralized access to appointments and contacts" @@ -20,7 +20,7 @@ license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9043ab53f341da10315c550384a6b320430193fc8d7861dd25c4e9b2e0be425b +checksum=c0c6658838d58ba46042a4b9e50a3bb1129691e4cdb84b5eba0bf330b2ccb2eb build_options="gir" build_options_default="gir" @@ -33,10 +33,6 @@ pre_build() { LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/private" } -post_install() { - rm -rf ${DESTDIR}/usr/lib/systemd -} - evolution-data-server-devel_package() { depends="sqlite-devel mit-krb5-devel nss-devel nspr-devel libical-devel libgdata-devel>=0.15 libsecret-devel libglib-devel From e30e57b27555502ac46e2270b3803a82a003f899 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 2 Sep 2022 21:47:14 -0700 Subject: [PATCH 0983/1407] evolution-ews: update to 3.44.4 --- srcpkgs/evolution-ews/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index 98f8323511a9..2446b3edd159 100644 --- a/srcpkgs/evolution-ews/template +++ b/srcpkgs/evolution-ews/template @@ -1,6 +1,6 @@ # Template file for 'evolution-ews' pkgname=evolution-ews -version=3.44.3 +version=3.44.4 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" @@ -13,4 +13,4 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=85ccaca2887af85bf048e473c7b6c42c5f5641ab05a5bc4cfcea34e2b6f5be17 +checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3 From 998b19f534c61d1f2335764f3746084ca78dd96c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 2 Sep 2022 21:47:22 -0700 Subject: [PATCH 0984/1407] evolution: update to 3.44.4 --- srcpkgs/evolution/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 66e9705a2d2e..a2d7f527c1d8 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,10 +1,10 @@ # Template file for 'evolution' pkgname=evolution -version=3.44.3 +version=3.44.4 revision=1 build_style=cmake build_helper="qemu" -configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc +configure_args="-DSYSCONF_INSTALL_DIR=/etc -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON -DWITH_GWEATHER4=ON -DWITH_ENCHANT_VERSION=2" @@ -20,7 +20,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=536b11f4133df6f216f27af9a2481a19ed7ae08be2d4a13b128061c262a36499 +checksum=f0b16e7abad3c7945a29c322f17dab4a08d61e99bd7cc91b8df35053c5c12e8c shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so" From 458790c25d098d1d60b746980ad3e9aee33d9bc7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 3 Sep 2022 22:38:41 +0200 Subject: [PATCH 0985/1407] gtk4: update to 4.6.7. --- srcpkgs/gtk4/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index 842af8f4c1c9..03aa34b7e52d 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,7 +1,7 @@ # Template file for 'gtk4' pkgname=gtk4 -version=4.6.6 -revision=2 +version=4.6.7 +revision=1 wrksrc="gtk-${version}" build_style=meson build_helper="gir" @@ -22,16 +22,17 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel') $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel') $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel') - $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers') + $(vopt_if cloudproviders 'libcloudproviders-devel') + $(vopt_if vulkan 'vulkan-loader Vulkan-Headers') $(vopt_if tracker 'tracker-devel')" depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')" short_desc="GIMP ToolKit (v4)" -maintainer="Enno Boland " +maintainer="Michal Vasilek " 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=7bbfe4d13569f7c297ed49834ac7263e318b7bf102d3271cb466d5971f59ae70 +checksum=effd2e7c4b5e2a5c7fad43e0f24adea68baa4092abb0b752caff278e6bb010e8 # Package build options build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker" From 7de65347b047d7408aae6c01b6753e2c3f366bce Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 3 Sep 2022 15:00:58 +0200 Subject: [PATCH 0986/1407] perl-IO-Socket-SSL: update to 2.075. --- srcpkgs/perl-IO-Socket-SSL/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template index a4f21362b9ab..3e08cbfbaf61 100644 --- a/srcpkgs/perl-IO-Socket-SSL/template +++ b/srcpkgs/perl-IO-Socket-SSL/template @@ -1,6 +1,6 @@ # Template file for 'perl-IO-Socket-SSL' pkgname=perl-IO-Socket-SSL -version=2.074 +version=2.075 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/IO-Socket-SSL" distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz" -checksum=36486b6be49da4d029819cf7069a7b41ed48af0c87e23be0f8e6aba23d08a832 +checksum=c30ee2220b1e181a968ebbc81861d0cadf334b001377a44105ae5a8637ddae8c From 6b37873eca3505a15f2028c985f4d963cb115573 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 3 Sep 2022 15:02:23 +0200 Subject: [PATCH 0987/1407] perl-Log-Log4perl: update to 1.56. --- srcpkgs/perl-Log-Log4perl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Log-Log4perl/template b/srcpkgs/perl-Log-Log4perl/template index 755d9e25d94c..ce8e290eb7f3 100644 --- a/srcpkgs/perl-Log-Log4perl/template +++ b/srcpkgs/perl-Log-Log4perl/template @@ -1,6 +1,6 @@ # Template file for 'perl-Log-Log4perl' pkgname=perl-Log-Log4perl -version=1.55 +version=1.56 revision=1 wrksrc="Log-Log4perl-${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/Log-Log4perl" distfiles="${CPAN_SITE}/Log/Log-Log4perl-${version}.tar.gz" -checksum=c4f3caa1328fdc48595ccd0d1e16c40bd74af2547552370125b4b7e5eae1ff44 +checksum=47e08d63c9a940743308c8ba39fa51e4c15459c7d70acfc3b131b981f843a941 From 3fb3bd8a021b9ff363b84996b83c53f01db63519 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 3 Sep 2022 15:06:47 +0200 Subject: [PATCH 0988/1407] perl-Path-Tiny: update to 0.124. --- srcpkgs/perl-Path-Tiny/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Path-Tiny/template b/srcpkgs/perl-Path-Tiny/template index 81fd5b4619af..402ddfb6adb7 100644 --- a/srcpkgs/perl-Path-Tiny/template +++ b/srcpkgs/perl-Path-Tiny/template @@ -1,6 +1,6 @@ # Template file for 'perl-Path-Tiny' pkgname=perl-Path-Tiny -version=0.122 +version=0.124 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/Path-Tiny" distfiles="${CPAN_SITE}/Object/DAGOLDEN/Path-Tiny-${version}.tar.gz" -checksum=4bc6f76d0548ccd8b38cb66291a885bf0de453d0167562c7b82e8861afdcfb7c +checksum=fa083144781e46817ec39d21962bbbb0533c201f3baf031d2999a785a2a013fd From 1d171a1ebc376d4556638f7560e100ab5f525641 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 4 Sep 2022 09:08:16 +0200 Subject: [PATCH 0989/1407] bmake: update to 20220901. --- srcpkgs/bmake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template index b7b2e3c59d71..e9639a1fb54e 100644 --- a/srcpkgs/bmake/template +++ b/srcpkgs/bmake/template @@ -1,6 +1,6 @@ # Template file for 'bmake' pkgname=bmake -version=20220726 +version=20220901 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=1bf3770789722721dca7b0bff8afc4a9520da20f0219bb7bc52350af0133f0a0 +checksum=3f67c575ee9ae443a5f589a40acac0163743da98cb50afd1144b4246cd5063ad python_version=3 do_configure() { From e58cb1b1718f1f8f8e54608f4d95d1f830dc091f Mon Sep 17 00:00:00 2001 From: icp Date: Fri, 19 Aug 2022 16:09:20 +0530 Subject: [PATCH 0990/1407] python-selectors2: remove package Inessential python2 remnant --- srcpkgs/python-selectors2/template | 17 ----------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 srcpkgs/python-selectors2/template diff --git a/srcpkgs/python-selectors2/template b/srcpkgs/python-selectors2/template deleted file mode 100644 index 8b4191943bdd..000000000000 --- a/srcpkgs/python-selectors2/template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'python-selectors2' -pkgname=python-selectors2 -version=2.0.2 -revision=2 -wrksrc="selectors2-${version}" -build_style=python2-module -hostmakedepends="python-setuptools" -short_desc="Drop-in replacement of the selectors module for Python 2.6+" -maintainer="pulux " -license="MIT" -homepage="https://github.com/SethMichaelLarson/selectors2" -distfiles="${PYPI_SITE}/s/selectors2/selectors2-${version}.tar.gz" -checksum=1f1bbaac203a23fbc851dc1b5a6e92c50698cc8cefa5873eb5b89eef53d1d82b - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 8b6917f7582f..3b271dae4c33 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -358,6 +358,7 @@ replaces=" python-rdflib<=4.2.2_6 python-reportlab<=3.5.42_3 python-requests<=2.26.0_2 + python-selectors2<=2.0.2_2 python-spambayes<=1.1b3_3 python-sqlite<=2.8.3_1 python-unicorn>=0 From 3d36bc70096478f60df7efb2babbaf0af62a0e3d Mon Sep 17 00:00:00 2001 From: icp Date: Fri, 19 Aug 2022 16:01:39 +0530 Subject: [PATCH 0991/1407] python-rfc6555: remove package Inessential python2 remnant --- srcpkgs/python-rfc6555/template | 23 ----------------------- srcpkgs/python3-rfc6555 | 1 - srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 srcpkgs/python-rfc6555/template delete mode 120000 srcpkgs/python3-rfc6555 diff --git a/srcpkgs/python-rfc6555/template b/srcpkgs/python-rfc6555/template deleted file mode 100644 index c55e56a71b76..000000000000 --- a/srcpkgs/python-rfc6555/template +++ /dev/null @@ -1,23 +0,0 @@ -# Template file for 'python-rfc6555' -pkgname=python-rfc6555 -version=0.0.0 -revision=5 -wrksrc="rfc6555-${version}" -build_style=python-module -pycompile_module="rfc6555" -hostmakedepends="python-setuptools python3-setuptools" -depends="python-selectors2" -short_desc="Python2 implementation of the Happy Eyeballs Algorithm" -maintainer="Peter Bui " -license="Apache-2.0" -homepage="https://github.com/sethmlarson/rfc6555" -distfiles="${PYPI_SITE}/r/rfc6555/rfc6555-${version}.tar.gz" -checksum=191cbba0315b53654155321e56a93466f42cd0a474b4f341df4d03264dcb5217 - -python3-rfc6555_package() { - pycompile_module="rfc6555" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - } -} diff --git a/srcpkgs/python3-rfc6555 b/srcpkgs/python3-rfc6555 deleted file mode 120000 index 7275c04c1a46..000000000000 --- a/srcpkgs/python3-rfc6555 +++ /dev/null @@ -1 +0,0 @@ -python-rfc6555 \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 3b271dae4c33..baab7f738f3b 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -358,6 +358,7 @@ replaces=" python-rdflib<=4.2.2_6 python-reportlab<=3.5.42_3 python-requests<=2.26.0_2 + python-rfc6555<=0.0.0_5 python-selectors2<=2.0.2_2 python-spambayes<=1.1b3_3 python-sqlite<=2.8.3_1 From b3c52039a92e8f9e03954cb0d2ecedb8b81b2a64 Mon Sep 17 00:00:00 2001 From: icp Date: Fri, 19 Aug 2022 16:11:40 +0530 Subject: [PATCH 0992/1407] python3-rfc6555: decouple from python-rfc6555, update to 0.1.0. --- srcpkgs/python3-rfc6555/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/python3-rfc6555/template diff --git a/srcpkgs/python3-rfc6555/template b/srcpkgs/python3-rfc6555/template new file mode 100644 index 000000000000..b195c55b676d --- /dev/null +++ b/srcpkgs/python3-rfc6555/template @@ -0,0 +1,17 @@ +# Template file for 'python3-rfc6555' +pkgname=python3-rfc6555 +version=0.1.0 +revision=1 +wrksrc=rfc6555-${version} +build_style=python3-module +make_check_args="--deselect tests/test_ipv6.py::test_ipv6_available" # CI fail +hostmakedepends="python3-setuptools" +depends="python3" +checkdepends="python3-pytest-xdist" +short_desc="Python implementation of Happy Eyeballs Algorithm described in RFC 6555" +maintainer="icp " +license="Apache-2.0" +homepage="https://github.com/sethmlarson/rfc6555" +changelog="https://raw.githubusercontent.com/sethmlarson/rfc6555/main/CHANGES.rst" +distfiles="https://github.com/sethmlarson/rfc6555/archive/refs/tags/v${version}.tar.gz" +checksum=8a15da0f619227c6938be27c64e844668701bca65205002eda789a4fd883b23f From 2728fd42d2a62b47e88260868b8fcd86b14f53dc Mon Sep 17 00:00:00 2001 From: icp Date: Fri, 19 Aug 2022 16:12:33 +0530 Subject: [PATCH 0993/1407] New package: python3-imaplib2-3.6 --- srcpkgs/python3-imaplib2/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/python3-imaplib2/template diff --git a/srcpkgs/python3-imaplib2/template b/srcpkgs/python3-imaplib2/template new file mode 100644 index 000000000000..7c7d7f4fe330 --- /dev/null +++ b/srcpkgs/python3-imaplib2/template @@ -0,0 +1,19 @@ +# Template file for 'python3-imaplib2' +pkgname=python3-imaplib2 +version=3.6 +revision=1 +wrksrc=imaplib2-${version} +build_style=python3-pep517 +hostmakedepends="python3-setuptools python3-wheel" +depends="python3" +checkdepends="python3-pytest-xdist" +short_desc="Threaded Python IMAP4 client" +maintainer="icp " +license="MIT" +homepage="https://github.com/jazzband/imaplib2" +distfiles="https://github.com/jazzband/imaplib2/archive/refs/tags/v${version}.tar.gz" +checksum=b55c434ecfb26a057d6bb3c8da0d674c83dd702674bb898c418a075a60560e42 + +post_install() { + vlicense LICENCE +} From 1dc506f39bc58b7022186227c307da5500438cc3 Mon Sep 17 00:00:00 2001 From: icp Date: Fri, 19 Aug 2022 16:13:27 +0530 Subject: [PATCH 0994/1407] offlineimap: update to 8.0.0. --- srcpkgs/offlineimap/template | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/srcpkgs/offlineimap/template b/srcpkgs/offlineimap/template index 481ffdb97779..ea68ab99738d 100644 --- a/srcpkgs/offlineimap/template +++ b/srcpkgs/offlineimap/template @@ -1,17 +1,22 @@ # Template file for 'offlineimap' pkgname=offlineimap -version=7.3.3 -revision=2 -build_style=python2-module -hostmakedepends="python-six python-rfc6555 asciidoc" -depends="python-six python-rfc6555" +version=8.0.0 +revision=1 +wrksrc="offlineimap3-${version}" +build_style=python3-module +make_check_args="--ignore test/tests/test_00_imaputil.py + --ignore test/tests/test_01_basic.py --ignore test/tests/test_02_MappedIMAP.py" +_deps="python3-distro python3-rfc6555 python3-imaplib2" +hostmakedepends="${_deps} python3-setuptools asciidoc" +depends="${_deps}" +checkdepends="${depends} python3-pytest-xdist" short_desc="Powerful IMAP/Maildir synchronization and reader support" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://offlineimap.org/" -changelog="https://raw.githubusercontent.com/OfflineIMAP/offlineimap/master/Changelog.md" -distfiles="https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz" -checksum=bf1a777e63d2174eef0fe864ea577d843515b64d4f3a8630ad2d1b34a4afcaa6 +changelog="https://raw.githubusercontent.com/OfflineIMAP/offlineimap3/master/Changelog.md" +distfiles="https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/v${version}.tar.gz" +checksum=5d40c163ca2fbf89658116e29f8fa75050d0c34c29619019eee1a84c90fcab32 post_install() { make -C docs man From 54e301a7e1d44ebfb5e0fd225e6468fa71e86055 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Sat, 3 Sep 2022 11:02:53 +0200 Subject: [PATCH 0995/1407] thunderbird: update to 102.2.1. --- srcpkgs/thunderbird-i18n/template | 134 +++++++++++++++--------------- srcpkgs/thunderbird/template | 8 +- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index 559b9d381a94..ffd39b8919c2 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,6 +1,6 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=102.1.2 +version=102.2.1 revision=1 build_style=meta short_desc="Thunderbird language packs" @@ -107,69 +107,69 @@ _pkgtmpl() { } } -checksum="8f06968550143821839b81b69027e78c903f77de3906ff67ed44a03769f38b57 - 14b7ed3929b3f6c987d7a1fa672e703e793b766f2448a08c0832aead1f5327d4 - 4c6370806e9e0e0f87adfa192dfceac24850f4ad64ebb818badc670ee2b4d972 - a0f800d77f99abf95fb6f7c09c993d3d4654813ad3113cd168a64cd59a7e90de - 82feac6493137a7814498d21c547c9cb848a12f17ea8112ea26dbbe2590067d2 - 46fb1548f42643986113b9444cf3af15bae07434318320a310647a5a2eb52e68 - d8b0e2a52fc90b284b13dab2e68f18c5f2c1e95fd9bf95c24532f3fffe61eb28 - 4a7270383b3cf4cadd810249857fc2faa1219b3a2980255d50d370d57cb4cfbe - af4c31540399954076433e5738ac0c94c58aec5d848b6942288d0d0644ee6c23 - b6f99d02413a4efcdfadf23bb5851757a7b2251527b7cd2712311cd902a20538 - 609420602f72f77d956372f87ff985b5a54b21bb3bbca5726074e11cef93e1ff - 4cff50e04ec1d3fea22a4f23e9fcd506afe50106bb15a39476694f6cbcb7ebef - 89d9d09f628dbed431e31abc6a9e3be2878b0dc9cbcd834af7f1a1bef1a4a953 - bc9629062d973390bfa753f1b96f8f438aa0f0636a57f11845a27df44e36fc20 - 24d16ffd98c60e67931960e0615c5f072ea26da27fabb361f4328e789e66308f - 83ecce0d5130f9e4026972618bb027acb969325df7736f63b71d32d3b69ba2f0 - 09f9398076f85d4d75655536b7fc54a3cb045a24ce74abeb5527d0f65f6808cb - 97274d46415904a44d5e537ee7d4a90ce405856ff3a0694527d634974ba6f313 - 33863ff3cb47944a9844d16028977b52bc0d5426d981f0583749c1a98e91ca41 - 78baf19ffda66d5446c97898a3cbc6f696427f20c8342f48d3b44d5c4f8390d3 - 2e6e973387e3fe1456810cc967d4b0bba1c88338b92c54dd98862991ce495b58 - b37a2d5ed6c6ef0e8885f9e15d8b4e396d1a78110be069c8e68212acde700a13 - ce98b86592b803a913be87af42003a08c1e069a724175486a0832d91179c806e - 32bc4fa9596da092c3573ea782eebf2f05416530a83c00231f6d849884d70f71 - c65a8ca172792e7f9ddd9f863a798c8916efeb05f77143c8b5777c43dfd639b9 - 0745cdd40ce615eb571a4697990132d4fb835bfdc01acceef0955eb22001c78c - 77f8b16712fa6b709c066b3397807afeee0ac76f000fc5a4ac6caef147a8bceb - 7393971c701c6ed21894dc1381ea17cbde1323845ed2625331c7542644ea0a2a - fa8f1a6685f06923067940240d3dad009a9f1eb7b3cc58fea915c8935307fd28 - aae540d5b3499d551f465754ca3bd89ff5e5f07a27405901a53b0c2abeaa8d18 - 499d3eb4f3366499848db450393f144c756e3082d53ab5bdfb25d1db895eda49 - 6a7bf13bd2ae517e8fa51b8a0dc42eb7985c4800304502e30b0966110e38b978 - 8baa23a0733ac84adfa8522a3e0c4e0e20791fbd40e4fdd8ac780b9203ddec9d - b1fc63a768a93519907be22b573a4ac5a08fabb093087cf27efb24361ad8fdd3 - 5d20d44d43b0a81d7057be8ad12dd5c62a3e456db7818b6b70b62e12d1b557a7 - 8b5c151f0e90d4914ec47389722801389de26fb1ee2b2fc1a2440ed84a20e405 - 739b421325d6df67dbb7feb7873ac298e217631ee15c603233f947923851477e - 3bd0f464d97d88ca1e7f0615bca19f7d3b382223796e65bd3c4f9c20d1924548 - 6f44d0780f9fbb20031d69a6bc8e32ae8a0f2342416cebeefda5e681d81bd579 - 297d7ea533b0acb57f25571e2e3259b29ee6fec82070c7c7b3fb9b422aaf50a1 - f237f2cb2fef8977c9363f00d3cbb67d67e9a2fccbb5bf428482f9587929ecf1 - 28594df8bd7a275d87052024a7567be220438b70af161b0d66178c8fa41a5f1c - 09b9cb72d27dc7021ad9e83c8d5f7634091110e102ff4d84f1a37ef4083fba5b - ae1d245f58cf9fddac5a9d9c074a0433d15e558bfb72618a2e3e0728d69764bf - e048473d8e61b0e586222b865b243a0320bd74f37fde5cf5d2645efc3fda62f8 - 73ec871296503df04baf58939e5569ad47755ce4003f380b7ab42fea9596621b - 98b7e2fa98685b8107ece839dc120123099f59289d6bf0582a507e7ed16f8c6d - 3d8d53f0c7e1a8ab04856ef0b57244191d9661eb5ce6028f63b3282022efbf75 - c01d7f7374c1993ef317588dfad6a5f40daae5fca98c3a0184855ffd620ae457 - 17ff4f8b157931372a76326469ab64857a595d15bdda2b878ac9fecebdbd5416 - d53a5d88e2b67dcaffee79c1f24b627a3177743c47dfc928f379fce2ec208930 - d440b31ec3a8b9c2590d3b97fd0a7bcd5464d5f890466c3760ad474f3d4cd026 - 87fec4d63d1dae9f7075eda0c1a3a291f625f560db11fc26034ff0563fc9514a - f4c8e40126881e35a96ef6637e12806f76f3ce5a050782befc8f48560a9fb262 - deef65de225ae3e76dbe4a74522cfd1bb2166b4752d34ceb3212f4a319ca2515 - 83942005bcc7d3967986f59fc8809e5275c7c23142258dc9a7eebd94c8f0fd09 - bf6df9954cad4e1ffbbdaffb3a3dd228f594e7fbff2c61a818114e58a7639985 - 4d84ade12cfb2539f33c576a4a44de0e1eea00bac3352c290f208a5ce11fdc3b - 053da2e53c545ceb506ed0f09375a7e17f26678560cc1c89238f974b3b23e415 - 92fd7c817d363314786d6a3a64863ed11d0c880b4ccd68ad2cb7efc3cd6a426d - 12ec42b22997103a51488758abb9ca7d403613a01233b7f4e98e778579193232 - 018c4bd37990cd02b391548c5535216201556de6cdd1337fbfc696499e699174 - 4b6433f4323edbfed1251c7ff615ed0d26695eb4cd985676ad888708f5366b6f - ac7d12aa2d1504b7a80e2a6c8311cab92b9ee3254e6ddcf65091b7dfef9e29c3 - 6c8e82f1eb81e2d4746c7b2181efe470b7f169453f2c39d29538b4a01fdddbb6 - c3ff546c435d4540cba812aa24ed04299467f29781777be160182ff19250575b" +checksum="d4aa154af68bde84a48a91e28009802574f82cdab5841300c7354f6ca83950d2 + a701a4f57880baa46756527f0d355e5332f7089ef5687ccd2d52dd1c3c3c1821 + 3eff1ae1a9fadad4897d88c6d6ea1b674c9281c70eb8330fb83079943c725e9e + ae2698fd11b3b863c61f6e62ddeaf5eed6bcd25c4079b269735fca06a93c887b + 67820ea326b1a808eb8806d3474a261408b7ce58adb6615c6a237d8b8638537f + ec697ee41c4ad6a249cd3025660537222a22de7cc8a3dbd27c4786a963048a29 + 548329b747d70b18e9e3d5154d18dbd78e3d4c323511d120e525662b69aeefec + 90594683e126415128b3a93b9ef8fa5369b9724950aba0b1d44cca255c38c8c2 + 342a33827f529c6eaa5db4e79ceb2cd551b3c264af2ffde339c9927ff37ece42 + 9540600bd2912ea4d9eedbf467465025344877c63531773b69c328249a7849ce + f1c9048a6d4e78ab5940209f979fe1670e232b318df82877690387ec2bc7dacf + e4f7ea32ac84cd04d8698e840ab6cb87fd2b0ec842687fba6bc9825cbf321068 + 7250741c037115bbcc98c71f46811f1a59c3065442ff4e5758c8a5528c6a39b3 + caf21710f304eaaada0a02c479849a11b574a7677771ba923bd0a2d20d87938c + 155cc0f76aeaba23455187691aeca9ffbb7f916ca905947f1530c9aa189762b5 + 6109a3bfda9988e22fbae0d77b7a9cba8a4dc29aa47712e83199cb6989572970 + eb9f3df0986a06126692007694ea3803b848c3409d241b97a40354e2b2c702d1 + cc64cc928ef3f633fa4224f742fbad071670f92dd928a07b3e9e78e3b7180379 + af3af626fc6df848a198acbb4adb259f0319a98ff2241a21ea438a80c79c08c5 + 39774b2fb6262ea7d8f2c6042bf1a80570653488f7e643cf3b681e6104de755b + 97aa8f083083d31929328b6b80235e5b2175197bea925b30cea02485c2bb2035 + 36ffa7328c7f4e4a64ca45066a2ae7412d795136e0aefb1e3dd02c4f06c9b1ed + 23d719a2d4ccc2f080a16058aad6f81a59d6758b20de1ad1f855540cc812b05c + e6c2feb8714b12afe7fe4299bf4220f74cdefb62d2300beaf3353fc055e10f67 + 1323cce731af6ad9e5b668da489ca04fcd0752feaf623583bfc1f705d15a20fb + f2e8b105c5db9e44d78469220e2892b949f34ba026ce32e90b6f240b40b1e92a + 18f8e49953ab0d1dbed33cdc84705681761daf541a5f899c16aca1b52dadc0a0 + 3cf376006fb61a4a201709953fe42fc9517b327a2db6ca67cfacb936e3996476 + b5111a2af3f5d304dc0f41efc390a121265e5092db5703e22a2536b1b272a8fa + 789902e62f13eac5b554abd94cf192c24f4b43be32ab38c2840956517ee6d5ba + 827d49c5716475f45a08bfdcb6c6dd0c95cd99a035050487c845c821eb9d1cad + d8ac4c45825da3918cc3e5392d9006c7f81d66c740995ef9e20240c525fd1348 + cc5d4044eb37097918aad6bcebec576fcd71031a49e896e985eaff92e23b5c15 + 214bce4adeecb5f246ea0db420283d5cad6d86c20e2c53ff357880b8bbde87fb + f43d4bffcc97221c49faa7d45a29b3819661ccfc4bb9a1a0bcff30c7baa7c770 + 4b38e659d15e45368711b5ee9a944318bd4d6e96f6246af03618076b55574869 + 4cfefce9d1f1cadb8f08d45823588f833c142740ea5d3b5d982f3cd9109e31ab + 5978a0d79b4f01eb40d9c24752d6fa8f5a9a1a9cc66be30871a95ac97a01791c + 60cf3df6d0061822b24667e8f492e1646d99f5adde4ca941b4eabe92d5399f48 + d8da03b9710785b4ac04d16410656d832aa10ecd238f97e34721800b5e8c1016 + 12ba287b1e3d4d3c720f50cd58fe67734c773206ebc892ca538193e468eeace9 + 4fdadef517b81ed5d431f24be25e09d030b7e1f501d904c520d050e6d346fdb7 + 1fe86615c159d68f40af2213c0c0bd7800c60e6a1dfe9524f7004f13189b71b7 + 2a788b626f329ff7fd9c97bb260c704b1dff16b7f4cfa3b5a7a56861fa633b30 + 785d093ad342729d519a124f51622bc1b33f2cda2474ce1408baec802d18caea + 465c2acaf85fafb368dbaeeb4a3ef71530c4c5c69e6a0c909f229d656135ee32 + 336d151e4eccc89619e1ac714d9817e53f0b90ee681b0f27501d0c9dc47bb989 + cafaa453cbf51f214a33abdffbd1b96f14d10199df8354728a67f1cb33d75289 + 92a6c1b052feed9a8cb0be747ac17f0e4251bbe636dfc849ea389a71e9bcfa6d + bd391482e24505411357f21d461bfc048df0cb034413ee3f6a2f07ab0a168dee + ffd8f48333ddd6feb75861cd607998bce171379f3a424a952ea66ed8648e41cd + 712de3c528cf491e6d339c9e3fbeb483c21cb0b7040eb62b256a5d2ceb44b236 + 13c74275a5fe784943946fd759881c578d41ff29d684d3634ac8c7a5f8cf1a0b + 6149d133ab3e59a41e29993e7ba8fab2948232299258d8f54a4a2d8c866c93eb + 145c81b960a8fd2e260a3b04d9a7b9f17f9d8281508c4f4e4fda1b6761ed9b0c + bbce121261069539f1f8b52ffddf6ede1e09476074773d4df90465b9af8f12d4 + 32ecd9378ce26a25a73c5e96e89a71387db3537acd2febf42dadd62e8375b196 + 22f17addccad9972c2b6649534f6a0a382fdaa0f764e03c9970b0c9e5bf30839 + c0614f3b48fe18d33fe6f1ec848011bad5439b9a439c73b6b6d7aa199038cdca + 77285e47e4fd0b8870c3ae5c79166a641cd23c11dfe88905a8d36fcccfc205d1 + d640a8677ef3994e5c76662dbd11d5ec6329b40de90e69d7320da1e199a4ded4 + 9cbe5083f1122380b8dd081573c5198cb76373c2e25309f319680f1807247a0a + a2721cee4c436888e88d09fefb597053ba995e9b773a269cc1b511911333fb50 + c2f3e81df840c882db695b4d47a6bc2dfaa3f3d1e464f3bcba69edcbd8f1ca51 + 5316cd64d25dabb9988d72156612e0ecf9e561b348f5d7e51fdc6363d33d9403 + 1b90ad633498a70b0c2f41aa8c74f801c22ce0d9261131263f3c61a5aadd4fc1" diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 07b9d115ae4f..a5c905b86dbc 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=102.1.2 +version=102.2.1 revision=1 build_helper="rust" short_desc="Standalone Mail/News reader" @@ -11,12 +11,12 @@ 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=00acfe3d8fd534a3734602ba7bd377297fa4e09a9ebe0f7c69f455a596334903 +checksum=ae61fb1e58d5e44ef929aea28e8979dddace9ecb4f43c7d56dc09cb8ea3eb521 lib32disabled=yes -hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo - llvm clang nodejs-lts cbindgen python nasm which tar" +hostmakedepends="autoconf unzip zip pkg-config perl python3 yasm rust cargo + llvm clang nodejs-lts cbindgen nasm which tar" makedepends="nss-devel libjpeg-turbo-devel gtk+3-devel icu-devel pixman-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std From 1ef8b7cb8594274782af22c5cba109fad4578534 Mon Sep 17 00:00:00 2001 From: Ramdziana F Y Date: Sun, 4 Sep 2022 13:07:10 +0700 Subject: [PATCH 0996/1407] vivaldi: update to 5.4.2753.47 --- srcpkgs/vivaldi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template index 3e9b613b798b..4864db6888d1 100644 --- a/srcpkgs/vivaldi/template +++ b/srcpkgs/vivaldi/template @@ -1,6 +1,6 @@ # Template file for 'vivaldi' pkgname=vivaldi -version=5.4.2753.45 +version=5.4.2753.47 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=d481b1c4bf2229e1cb88155593c9bad4bdd6cba51fa8ed6e193c3db2ac3badf9 +checksum=b9be2446818a9b924734a2c66982604add3025764675a97c49e3bb9a592d25dc repository=nonfree restricted=yes nostrip=yes From ec6f4577ddb0051ad1de2afd2c6dc930b5211508 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, 4 Sep 2022 21:29:33 +0700 Subject: [PATCH 0997/1407] telepathy-qt5: need libxml2-devel to build --- srcpkgs/telepathy-qt5/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/telepathy-qt5/template b/srcpkgs/telepathy-qt5/template index 5c8be2df306a..fd6b972d1c9b 100644 --- a/srcpkgs/telepathy-qt5/template +++ b/srcpkgs/telepathy-qt5/template @@ -10,7 +10,8 @@ configure_args=" -DDESIRED_QT_VERSION=5 -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5" hostmakedepends="python pkg-config" -makedepends="qt5-devel telepathy-farstream-devel telepathy-glib-devel gstreamer1-devel" +makedepends="qt5-devel telepathy-farstream-devel telepathy-glib-devel + gstreamer1-devel libxml2-devel" short_desc="Qt5 bindings for the Telepathy D-Bus protocol" maintainer="Duncaen " license="LGPL-2.1" From e814c11041a721c99b88770fefa33936b5b83a3b Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 4 Sep 2022 09:35:03 -0400 Subject: [PATCH 0998/1407] gnuradio: fix build when XBPS_WORDSIZE != XBPS_TARGET_WORDSIZE --- srcpkgs/gnuradio/template | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index bfd2a8e35123..4b74134fa7c1 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,16 +1,15 @@ # Template file for 'gnuradio' pkgname=gnuradio version=3.10.3.0 -revision=2 +revision=3 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax -DZEROMQ_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include - -Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11" + -Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" _pydeps="python3-Mako python3-cairo python3-click python3-click-plugins python3-gobject python3-jsonschema python3-numpy python3-pyqtgraph python3-pyzmq python3-scipy python3-yaml" -hostmakedepends="pkg-config doxygen mathjax python3-Sphinx python3-pybind11 python3-pygccxml - ${_pydeps}" +hostmakedepends="pkg-config doxygen mathjax python3-Sphinx python3-pygccxml ${_pydeps}" makedepends="SDL-devel SoapySDR-devel boost-devel codec2-devel cppzmq fftw-devel gmpxx-devel gsl-devel gtk+3-devel jack-devel libgsm-devel libiio-devel libsndfile-devel mpir-devel python3-devel python3-gobject-devel python3-pybind11 python3-pygccxml qwt-devel spdlog @@ -34,10 +33,6 @@ if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" fi -if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then - nocross="pybind11: Python config failure: Python is 64-bit, chosen compiler is 32-bit" -fi - if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then make_check=ci-skip # See https://github.com/gnuradio/gnuradio/issues/5973 fi From 4e13959de1caecf0968d8310d299b7f1359c77c0 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, 4 Sep 2022 21:34:52 +0700 Subject: [PATCH 0999/1407] urbanterror: need libXxf86vm-devel --- srcpkgs/urbanterror/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/urbanterror/template b/srcpkgs/urbanterror/template index 2790380ddc35..2c4966159468 100644 --- a/srcpkgs/urbanterror/template +++ b/srcpkgs/urbanterror/template @@ -3,7 +3,8 @@ pkgname=urbanterror version=4.3.4 revision=2 wrksrc="ioq3-for-UrbanTerror-4-release-${version}" -makedepends="SDL-devel libopenal-devel libcurl-devel libvorbis-devel" +makedepends="SDL-devel libopenal-devel libcurl-devel libvorbis-devel + libXxf86vm-devel" depends="urbanterror-data>=${version}" short_desc="Team tactical shooter based on ioquake" maintainer="Andrea Brancaleoni " From 818d7ea40b3b492421bb4d85b740fb7fee26ab8c 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, 4 Sep 2022 22:14:43 +0700 Subject: [PATCH 1000/1407] gzdoom: fix build --- srcpkgs/gzdoom/patches/fix-build.patch | 13 +++++++++++++ srcpkgs/gzdoom/template | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 srcpkgs/gzdoom/patches/fix-build.patch diff --git a/srcpkgs/gzdoom/patches/fix-build.patch b/srcpkgs/gzdoom/patches/fix-build.patch new file mode 100644 index 000000000000..78b898e09b61 --- /dev/null +++ b/srcpkgs/gzdoom/patches/fix-build.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -276,7 +276,9 @@ else() + include ( FindPkgConfig ) + pkg_check_modules( MUSL_FTS musl-fts ) + if ( MUSL_FTS_FOUND ) +- set ( ALL_C_FLAGS "${ALL_C_FLAGS} ${MUSL_FTS_LDFLAGS}" ) ++ foreach(flags IN LISTS MUSL_FTS_LDFLAGS) ++ set ( ALL_C_FLAGS "${ALL_C_FLAGS} ${flags}" ) ++ endforeach() + else ( MUSL_FTS_FOUND ) + message (ERROR "fts_* functions not found in the system" ) + endif ( MUSL_FTS_FOUND ) diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template index ac587d95bd19..a28aea253ec7 100644 --- a/srcpkgs/gzdoom/template +++ b/srcpkgs/gzdoom/template @@ -20,6 +20,8 @@ checksum="454257582be0576501eef1efc99fe7ea70f1c4d7993549db3cbc709ce75fc102 skip_extraction="${pkgname}_${version}_amd64.deb" nocross=yes +CXXFLAGS=-std=gnu++11 + if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" musl-fts-devel libexecinfo-devel" fi From 20d82014542c1eb5ed5801686c7d6632b7e026a1 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, 4 Sep 2022 22:24:12 +0700 Subject: [PATCH 1001/1407] setroot: fix build --- srcpkgs/setroot/patches/new-imlib.patch | 11 +++++++++++ srcpkgs/setroot/template | 1 + 2 files changed, 12 insertions(+) create mode 100644 srcpkgs/setroot/patches/new-imlib.patch diff --git a/srcpkgs/setroot/patches/new-imlib.patch b/srcpkgs/setroot/patches/new-imlib.patch new file mode 100644 index 000000000000..ad4d1b93ed39 --- /dev/null +++ b/srcpkgs/setroot/patches/new-imlib.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ NAME := setroot + CC := gcc + OFLAG := + CFLAGS := -std=c99 -Wall -g -Wextra ${OFLAG} +-LIBS := -lX11 `imlib2-config --libs` ++LIBS := -lX11 `${PKG_CONFIG} --libs imlib2` + + SRC := setroot.c + diff --git a/srcpkgs/setroot/template b/srcpkgs/setroot/template index 9f30a3b13e3e..2e4a93a52af3 100644 --- a/srcpkgs/setroot/template +++ b/srcpkgs/setroot/template @@ -4,6 +4,7 @@ version=2.0.2 revision=1 build_style=gnu-makefile make_build_args="xinerama=$(vopt_if xinerama 1 0)" +hostmakedepends="pkg-config" makedepends="imlib2-devel $(vopt_if xinerama libXinerama-devel)" short_desc="Simple X background setter" maintainer="SolitudeSF " From 321064e01eacc9d37c8e46c1eb73d07bbaf45c1f 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, 4 Sep 2022 22:49:51 +0700 Subject: [PATCH 1002/1407] freecad: fix version minor Fix #39099 --- srcpkgs/freecad/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index f568808bb356..6963278981fc 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad version=0.20.1 -revision=3 +revision=4 wrksrc="FreeCAD-${version}" build_style=cmake @@ -44,7 +44,9 @@ fi post_extract() { # Report exact minor version - vsed -i -e "s,^\(set(PACKAGE_VERSION_MINOR\) .*,\1 \"${version#*.}\")," CMakeLists.txt + vminor=${version#*.} + vminor=${vminor%%.*} + vsed -i -e "s,^\(set(PACKAGE_VERSION_MINOR\) .*,\1 \"${vminor}\")," CMakeLists.txt # SubWCRev.py (SCM check) reports "unknown" for these fields vsed -e "s,\${PACKAGE_WCREF},${revision}_voidlinux," \ From e6740bff5b2297eab4951381f9173e09b48ea3d0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 4 Sep 2022 12:33:14 -0400 Subject: [PATCH 1003/1407] gnuradio-nrsc5: fix build when XBPS_WORDSIZE != XBPS_TARGET_WORDSIZE --- srcpkgs/gnuradio-nrsc5/template | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template index 9b87518269bd..d3c7377168bc 100644 --- a/srcpkgs/gnuradio-nrsc5/template +++ b/srcpkgs/gnuradio-nrsc5/template @@ -1,13 +1,13 @@ # Template file for 'gnuradio-nrsc5' pkgname=gnuradio-nrsc5 version=2.0.0 -revision=1 +revision=2 wrksrc="gr-nrsc5-${version}" build_style=cmake make_cmd=make -configure_args="-Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11" -hostmakedepends="git automake libtool pkg-config gnuradio python3 python3-pybind11" -makedepends="gnuradio-devel" +configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" +hostmakedepends="git automake libtool pkg-config gnuradio python3" +makedepends="gnuradio-devel python3-pybind11" short_desc="GNU Radio implementation of HD Radio" maintainer="Remi Pommarel " license="GPL-3.0-or-later" @@ -16,10 +16,6 @@ distfiles="https://github.com/argilo/gr-nrsc5/archive/v${version}.tar.gz" checksum=cc9135b20e79111f609b95e02c5b5926c8c71c3ed8ab6e58b2b484d4efb333ae make_check=no # XXX: ModuleNotFoundError: No module named 'nrsc5' -if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then - nocross="pybind11: Python config failure: Python is 64-bit, chosen compiler is 32-bit" -fi - export CMAKE_GENERATOR="Unix Makefiles" pre_configure() { From 2a770f26c0f323031f0c7fde0d2bde9e9cfa11e2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 4 Sep 2022 12:33:14 -0400 Subject: [PATCH 1004/1407] gnuradio-osmosdr: fix build when XBPS_WORDSIZE != XBPS_TARGET_WORDSIZE --- srcpkgs/gnuradio-osmosdr/template | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template index bf0696c672a9..a79c832ba457 100644 --- a/srcpkgs/gnuradio-osmosdr/template +++ b/srcpkgs/gnuradio-osmosdr/template @@ -1,13 +1,14 @@ # Template file for 'gnuradio-osmosdr' pkgname=gnuradio-osmosdr version=0.2.3git20210128 -revision=2 +revision=3 _githash=a100eb024c0210b95e4738b6efd836d48225bd03 wrksrc="gr-osmosdr-${_githash}" build_style=cmake -configure_args="-Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11" -hostmakedepends="pkg-config gnuradio python3 python3-pybind11" -makedepends="SoapySDR-devel gnuradio-devel libairspy-devel libhackrf-devel librtlsdr-devel" +configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" +hostmakedepends="pkg-config gnuradio python3" +makedepends="SoapySDR-devel gnuradio-devel libairspy-devel + libhackrf-devel librtlsdr-devel python3-pybind11" short_desc="GNU Radio source block for rtlsdr, hackrf and airspy" maintainer="bra1nwave " license="GPL-3.0-or-later" @@ -15,10 +16,6 @@ homepage="https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR" distfiles="https://github.com/osmocom/gr-osmosdr/archive/${_githash}.tar.gz" checksum=a3cc85dd708d06d234ff4ab7f274a4a49db6427eed1e7e58711a1b61a4fa4de1 -if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then - nocross="pybind11: Python config failure: Python is 64-bit, chosen compiler is 32-bit" -fi - gnuradio-osmosdr-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" From b82117c2643ebcb43baaa2fd993158b5d234bf33 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 4 Sep 2022 12:33:14 -0400 Subject: [PATCH 1005/1407] gnuradio-rds: fix build when XBPS_WORDSIZE != XBPS_TARGET_WORDSIZE --- srcpkgs/gnuradio-rds/template | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template index e9e865151f7a..45e91fe3463a 100644 --- a/srcpkgs/gnuradio-rds/template +++ b/srcpkgs/gnuradio-rds/template @@ -1,12 +1,12 @@ # Template file for 'gnuradio-rds' pkgname=gnuradio-rds version=3.10 -revision=2 +revision=3 wrksrc="gr-rds-${version}" build_style=cmake -configure_args="-Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11" -hostmakedepends="pkg-config gnuradio python3 python3-pybind11" -makedepends="gnuradio-devel" +configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" +hostmakedepends="pkg-config gnuradio python3" +makedepends="gnuradio-devel python3-pybind11" short_desc="GNUradio FM RDS/TMC Transceiver" maintainer="Remi Pommarel " license="GPL-2.0-or-later" @@ -14,10 +14,6 @@ homepage="https://github.com/bastibl/gr-rds" distfiles="https://github.com/bastibl/gr-rds/archive/v${version}.tar.gz" checksum=083a9f479d83ac2f6273cdf3b3cf1beca47dfdce2d28264ce979f23c119607f7 -if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then - nocross="pybind11: Python config failure: Python is 64-bit, chosen compiler is 32-bit" -fi - gnuradio-rds-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" From d313570db4b4faf59434be20a8baa11886f7fa83 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 4 Sep 2022 20:31:18 -0400 Subject: [PATCH 1006/1407] chezmoi: update to 2.22.1. --- srcpkgs/chezmoi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 176972223063..13505278dbaa 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,6 +1,6 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.22.0 +version=2.22.1 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=83b396ab0f4e293d90baffd96ace2ac63aac2ec4679e72b931d075d27da67a86 +checksum=ff2efcb9323f0f4e5334791f5310bc82f382a5c002d81a31792aff8935054326 pre_build() { local _date From afb5fe76fa7467b8191ee187df3e12b2737b3c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Aug 2022 12:29:32 +0200 Subject: [PATCH 1007/1407] rpi-firmware: update to 20220823. --- srcpkgs/rpi-firmware/template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template index 951782411446..ed8529716065 100644 --- a/srcpkgs/rpi-firmware/template +++ b/srcpkgs/rpi-firmware/template @@ -1,10 +1,10 @@ # Template file for 'rpi-firmware' -_githash="8f13114b9ea29bd004151d4a8afa500b2df721be" +_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c" _gitshort="${_githash:0:7}" pkgname=rpi-firmware -version=20201123 -revision=5 +version=20220823 +revision=1 archs="armv6l* armv7l* aarch64*" wrksrc="firmware-${_githash}" provides="linux-firmware-broadcom-${version}_${revision}" @@ -14,7 +14,7 @@ maintainer="Piraty " license="BSD-3-Clause, custom:Cypress" homepage="https://github.com/raspberrypi/firmware" distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz" -checksum=f9be0cc177aae7dddaa0a2967d090ea33a95be9dd519d2eee3bc740af8ffb19e +checksum=3fc5ab7155bde7221245f439971217558300dcbc988ade861cfef4e737de9909 conf_files="/boot/cmdline.txt /boot/config.txt" nostrip=yes @@ -35,39 +35,39 @@ do_install() { vinstall ${FILESDIR}/cmdline.txt 644 boot vinstall ${FILESDIR}/config.txt 644 boot - $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/LICENCE.cypress + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/LICENCE.cypress vlicense LICENCE.cypress # Firmware for rpi3 b and zero wifi chip for f in bin txt; do - $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43430-sdio.${f} + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43430-sdio.${f} vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm done # Firmware for rpi3 b and zero bluetooth chip - $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430A1.hcd + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm # Firmware for rpi3 b+ wifi chip for f in bin txt clm_blob; do - $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43455-sdio.${f} + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43455-sdio.${f} vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm done # Firmware for rpi3 b+ bluetooth chip - $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C0.hcd + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm # Firmware for rpi4/rpi400 wifi chip for f in bin txt clm_blob; do - $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43456-sdio.${f} + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43456-sdio.${f} vinstall brcmfmac43456-sdio.${f} 0644 usr/lib/firmware/brcm done # Firmware for rpi4/rpi400 bluetooth chip - $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C5.hcd + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C5.hcd vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm - $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430B0.hcd + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430B0.hcd vinstall BCM43430B0.hcd 0644 usr/lib/firmware/brcm } From 1c63be036e06a4e5772717d29369ab720a6d323e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Aug 2022 12:30:03 +0200 Subject: [PATCH 1008/1407] rpi-kernel: update to 5.15.61. --- srcpkgs/rpi-kernel/template | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index 3c2188d2d5bc..3183183b6a4e 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -1,9 +1,9 @@ # Template file for 'rpi-kernel' # # We track the latest Raspberry Pi LTS kernel as that is what is used in the -# official Raspbian distribution. This is currently 5.10: +# official Raspberry Pi OS distribution. This is currently 5.15: # -# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234 +# https://forums.raspberrypi.com/viewtopic.php?t=322879 # # Commit hash is picked from latest tag [1], if appropriate, or from latest # "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit. @@ -12,22 +12,22 @@ # # WARNING: keep all rpi*-kernel packages in sync -_githash="82c6f8643398e222099066bfffb2070772f0696f" +_githash="64ad74084fa44abe8689564071df5729ded4c589" _gitshort="${_githash:0:7}" pkgname=rpi-kernel -version=5.10.110 +version=5.15.61 revision=1 archs="armv6l*" wrksrc="linux-${_githash}" -hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex" +hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz" makedepends="ncurses-devel" maintainer="Piraty " homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3 +checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244 python_version=3 _kernver="${version}_${revision}" @@ -206,10 +206,6 @@ 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/ - # Remove unneeded architectures # (save the correct one + Kconfig and delete all others) mkdir -p arch-backup From 5789a24b8c24fd86198033edb68e5bbeb6f8dffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 2 Sep 2022 14:45:42 +0200 Subject: [PATCH 1009/1407] rpi2-kernel: update to 5.10.110. --- srcpkgs/rpi2-kernel/template | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template index 228b6d2c5551..8963b855a4de 100644 --- a/srcpkgs/rpi2-kernel/template +++ b/srcpkgs/rpi2-kernel/template @@ -1,7 +1,7 @@ # Template file for 'rpi2-kernel' # See rpi-kernel for version policy -_githash="82c6f8643398e222099066bfffb2070772f0696f" +_githash="64ad74084fa44abe8689564071df5729ded4c589" _gitshort="${_githash:0:7}" pkgname=rpi2-kernel @@ -16,7 +16,7 @@ homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3 +checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244 python_version=3 _kernver="${version}_${revision}" @@ -198,10 +198,6 @@ 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/ - # Remove unneeded architectures # (save the correct one + Kconfig and delete all others) mkdir -p arch-backup From 357d710485405bfb07a9f079f9b041a838dce639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Aug 2022 12:29:56 +0200 Subject: [PATCH 1010/1407] rpi3-kernel: update to 5.15.61. --- srcpkgs/rpi3-kernel/template | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template index 937308fc6576..20d51a6b8579 100644 --- a/srcpkgs/rpi3-kernel/template +++ b/srcpkgs/rpi3-kernel/template @@ -1,22 +1,22 @@ # Template file for 'rpi3-kernel' # See rpi-kernel for version policy -_githash="82c6f8643398e222099066bfffb2070772f0696f" +_githash="64ad74084fa44abe8689564071df5729ded4c589" _gitshort="${_githash:0:7}" pkgname=rpi3-kernel -version=5.10.110 +version=5.15.61 revision=1 archs="aarch64*" wrksrc="linux-${_githash}" -hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex" +hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz" makedepends="ncurses-devel" maintainer="Piraty " homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel for Raspberry Pi 3 / Zero 2 (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3 +checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244 python_version=3 _kernver="${version}_${revision}" @@ -198,10 +198,6 @@ 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/ - # Remove unneeded architectures # (save the correct one + Kconfig and delete all others) mkdir -p arch-backup From 2a20d0d41df37822d8251ce94b7d21f5aa383da0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 28 Aug 2022 12:30:00 +0200 Subject: [PATCH 1011/1407] rpi4-kernel: update to 5.15.61. --- srcpkgs/rpi4-kernel/template | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template index e2c8ac19efee..d4fb3c72906e 100644 --- a/srcpkgs/rpi4-kernel/template +++ b/srcpkgs/rpi4-kernel/template @@ -1,22 +1,22 @@ # Template file for 'rpi4-kernel' # See rpi-kernel for version policy -_githash="82c6f8643398e222099066bfffb2070772f0696f" +_githash="64ad74084fa44abe8689564071df5729ded4c589" _gitshort="${_githash:0:7}" pkgname=rpi4-kernel -version=5.10.110 +version=5.15.61 revision=1 archs="aarch64*" wrksrc="linux-${_githash}" -hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex" +hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz" makedepends="ncurses-devel" maintainer="Piraty " homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3 +checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244 python_version=3 conflicts=rpi3-kernel @@ -199,10 +199,6 @@ 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/ - # Remove unneeded architectures # (save the correct one + Kconfig and delete all others) mkdir -p arch-backup From a46a08273bd2866d51f18ed41014d2049ff9ee29 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Sun, 4 Sep 2022 22:17:47 -0400 Subject: [PATCH 1012/1407] nano: fix example nanorc. --- srcpkgs/nano/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template index d8ea605980cf..060d19aef166 100644 --- a/srcpkgs/nano/template +++ b/srcpkgs/nano/template @@ -1,7 +1,7 @@ # Template file for 'nano' pkgname=nano version=6.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-utf8" makedepends="file-devel ncurses-devel" @@ -14,5 +14,5 @@ distfiles="https://www.nano-editor.org/dist/v${version%%.*}/nano-${version}.tar. checksum=4199ae8ca78a7796de56de1a41b821dc47912c0307e9816b56cc317df34661c0 post_install() { - vsconf syntax/nanorc.nanorc + vsconf doc/sample.nanorc } From 8b8d709f236166ff3b6b769acb921c39b53b601d 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, 27 Aug 2022 09:53:57 +0700 Subject: [PATCH 1013/1407] exfat-dkms: remove package exfat has been integrated into linux mainline from 5.7 --- srcpkgs/exfat-dkms/patches/linux4.18.patch | 32 ---------------------- srcpkgs/exfat-dkms/template | 20 -------------- 2 files changed, 52 deletions(-) delete mode 100644 srcpkgs/exfat-dkms/patches/linux4.18.patch delete mode 100644 srcpkgs/exfat-dkms/template diff --git a/srcpkgs/exfat-dkms/patches/linux4.18.patch b/srcpkgs/exfat-dkms/patches/linux4.18.patch deleted file mode 100644 index 172934f350d5..000000000000 --- a/srcpkgs/exfat-dkms/patches/linux4.18.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/exfat_super.c -+++ b/exfat_super.c -@@ -97,6 +97,11 @@ static int exfat_default_codepage = CONF - static char exfat_default_iocharset[] = CONFIG_EXFAT_DEFAULT_IOCHARSET; - - extern struct timezone sys_tz; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,0) -+#define timespec_compat timespec64 -+#else -+#define timespec_compat timespec -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0) - #define current_time(x) (CURRENT_TIME_SEC) -@@ -147,7 +152,7 @@ static time_t accum_days_in_year[] = { - static void _exfat_truncate(struct inode *inode, loff_t old_size); - - /* Convert a FAT time/date pair to a UNIX date (seconds since 1 1 70). */ --void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec *ts, -+void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec_compat *ts, - DATE_TIME_T *tp) - { - time_t year = tp->Year; -@@ -166,7 +171,7 @@ void exfat_time_fat2unix(struct exfat_sb - } - - /* Convert linear UNIX date to a FAT time/date pair. */ --void exfat_time_unix2fat(struct exfat_sb_info *sbi, struct timespec *ts, -+void exfat_time_unix2fat(struct exfat_sb_info *sbi, struct timespec_compat *ts, - DATE_TIME_T *tp) - { - time_t second = ts->tv_sec; diff --git a/srcpkgs/exfat-dkms/template b/srcpkgs/exfat-dkms/template deleted file mode 100644 index f0d28ef17dfb..000000000000 --- a/srcpkgs/exfat-dkms/template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'exfat-dkms' -pkgname=exfat-dkms -version=1.2.8 -revision=5 -_commit=01c30ad52625a7261e1b0d874553b6ca7af25966 -wrksrc="exfat-nofuse-${_commit}" -short_desc="Exfat kernel driver (nofuse)" -maintainer="Andrea Brancaleoni " -license="GPL-2.0-or-later" -homepage="https://github.com/dorimanx/exfat-nofuse" -distfiles="https://github.com/dorimanx/exfat-nofuse/archive/${_commit}.tar.gz" -checksum=b88a98f0a7e1b987465f5ccfcafb384b293506c7fec9d3b91b803e0fe5b16e0a - -dkms_modules="exfat ${version}" -depends="dkms" - -do_install() { - vmkdir usr/src/exfat-${version} - vcopy "*" usr/src/exfat-${version} -} From b11d7ad3cf63796ca1b4b021f3f7431caa3f848c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 5 Sep 2022 11:25:08 +0200 Subject: [PATCH 1014/1407] fio: update to 3.32. --- srcpkgs/fio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template index 452f95ad9b0d..9bdbe7a1dfd2 100644 --- a/srcpkgs/fio/template +++ b/srcpkgs/fio/template @@ -1,6 +1,6 @@ # Template file for 'fio' pkgname=fio -version=3.31 +version=3.32 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=077100819a243d0e00f232eb7c53fe1d30f4c54fba4d82847d5747eae1d255ab +checksum=409e459840912e68be487dbbda9a7a1b3f6ddf1478e3f456f278f957ce4f7b66 python_version=3 case "$XBPS_TARGET_MACHINE" in From 1e6c190d00bdae5481b88586eb9d9735cf425f78 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 5 Sep 2022 11:26:42 +0200 Subject: [PATCH 1015/1407] nncp: update to 8.8.0. --- srcpkgs/nncp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template index 9dd39f4ee3af..53bcfb6f27da 100644 --- a/srcpkgs/nncp/template +++ b/srcpkgs/nncp/template @@ -1,6 +1,6 @@ # Template file for 'nncp' pkgname=nncp -version=8.7.2 +version=8.8.0 revision=1 build_style=go go_import_path=cypherpunks.ru/nncp @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-only" homepage="http://www.nncpgo.org/" distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz" -checksum=a0eec9b0f33059de33f13084599805d0f4a1c8c379e925bacfe8dc94d1ddc23d +checksum=829e2fb2f1eed8af7ace4554405e56f0341be2a01c234a34d01122382aa0794c do_build() { make From 0c03d0a904fe8359ac987d0ee9ef767d487d3eaf Mon Sep 17 00:00:00 2001 From: clyhtsuriva Date: Mon, 5 Sep 2022 11:25:31 +0200 Subject: [PATCH 1016/1407] pdd: update to 1.6 --- srcpkgs/pdd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pdd/template b/srcpkgs/pdd/template index 0ec02c971ec6..dccea79e32c8 100644 --- a/srcpkgs/pdd/template +++ b/srcpkgs/pdd/template @@ -1,6 +1,6 @@ # Template file for 'pdd' pkgname=pdd -version=1.5 +version=1.6 revision=1 build_style=gnu-makefile depends="python3-dateutil" @@ -11,4 +11,4 @@ license="GPL-3.0-or-later" homepage="https://github.com/jarun/pdd" changelog="https://raw.githubusercontent.com/jarun/pdd/master/CHANGELOG" distfiles="https://github.com/jarun/pdd/archive/v${version}.tar.gz" -checksum=cd615dc9aa015bb5d0f1a1d03f1de7db994628256cfe8ed8ab25e1fb2e9d3762 +checksum=607fe77b0faf3f50301971120bad01da571c9107151a5344523ee38055649267 From 381720d6b4eb7ef9a082bb8354be99176390de2c Mon Sep 17 00:00:00 2001 From: meator Date: Sun, 4 Sep 2022 11:27:38 +0200 Subject: [PATCH 1017/1407] stunnel: update to 5.65. The 5.60 distfile no longer exists. This update makes stunnel buildable. --- srcpkgs/stunnel/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template index feadf1d1a681..10434223dab4 100644 --- a/srcpkgs/stunnel/template +++ b/srcpkgs/stunnel/template @@ -1,19 +1,24 @@ # Template file for 'stunnel' pkgname=stunnel -version=5.60 +version=5.65 revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="perl" makedepends="openssl-devel" -checkdepends="nmap procps-ng iproute2" +checkdepends="nmap procps-ng iproute2 python3" short_desc="SSL encryption wrapper" maintainer="Toyam Cox " license="GPL-2.0-or-later" homepage="https://www.stunnel.org/" changelog="https://www.stunnel.org/NEWS.html" distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz" -checksum=c45d765b1521861fea9b03b425b9dd7d48b3055128c0aec673bba5ef9b8f787d +checksum=60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc + +pre_check() { + # GitHub's CI doesn't support IPv6 + rm tests/plugins/p08_ipv6.py +} post_install() { rm ${DESTDIR}/usr/share/man/man8/stunnel.??.8 From 7efdcbbc6015e4983393879deb757e7f70a51b48 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Sun, 4 Sep 2022 10:34:11 +0200 Subject: [PATCH 1018/1407] mercurial: update to 6.2.2. --- srcpkgs/mercurial/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template index 363f240c2c17..f58eb0da9003 100644 --- a/srcpkgs/mercurial/template +++ b/srcpkgs/mercurial/template @@ -1,6 +1,6 @@ # Template file for 'mercurial' pkgname=mercurial -version=6.2.1 +version=6.2.2 revision=1 build_style=python3-module hostmakedepends="python3 python3-setuptools python3-devel gettext" @@ -10,11 +10,11 @@ depends="python3 ca-certificates" checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2 python3-Pygments" short_desc="Fast, lightweight source control management system" -maintainer="Orphaned " +maintainer="dataCobra " license="GPL-2.0-or-later" homepage="https://www.mercurial-scm.org/" distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz" -checksum=8ac5d7a20d1c2ad54d4c263d134164646dc34a8e3a6bed69cfbeabaf8d3882da +checksum=9efa9da5f497a8750ac9c48fa431c4ab72209f1360180c5d4920d1311b0420df pre_check() { if [ "$XBPS_TARGET_LIBC" = musl ]; then From 9f2a22e957fe89f1f39b24a09352bfa4e33c6055 Mon Sep 17 00:00:00 2001 From: Dakota Walsh Date: Fri, 2 Sep 2022 12:23:59 +1200 Subject: [PATCH 1019/1407] aerc: update to 0.12.0. --- srcpkgs/aerc/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template index b3b55adc4c92..3800ffc1d050 100644 --- a/srcpkgs/aerc/template +++ b/srcpkgs/aerc/template @@ -1,6 +1,6 @@ # Template file for 'aerc' pkgname=aerc -version=0.11.0 +version=0.12.0 revision=1 build_style=go go_import_path="git.sr.ht/~rjarry/aerc" @@ -12,8 +12,9 @@ short_desc="Terminal email client" maintainer="shtayerc " license="MIT" homepage="https://aerc-mail.org" +changelog="https://git.sr.ht/~rjarry/aerc/blob/master/CHANGELOG.md" distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz" -checksum=3d8f3a2800946fce070e3eb02122e77c427a61c670a06337539b3e7f09e57861 +checksum=402b48367b87338188036e713b3a421e228199accfa5fdb551f5efa21edb23be post_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install From b0fefbf36d2114d82622399d2608fcf09b73965a Mon Sep 17 00:00:00 2001 From: clyhtsuriva Date: Fri, 2 Sep 2022 18:49:43 +0200 Subject: [PATCH 1020/1407] bcal: update to 2.4 --- srcpkgs/bcal/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bcal/template b/srcpkgs/bcal/template index b0b19b4db9b0..0307229432b6 100644 --- a/srcpkgs/bcal/template +++ b/srcpkgs/bcal/template @@ -1,6 +1,6 @@ # Template file for 'bcal' pkgname=bcal -version=2.3 +version=2.4 revision=1 build_style=gnu-makefile makedepends="readline-devel" @@ -9,8 +9,9 @@ short_desc="Byte CALculator for storage conversions and calculations" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/jarun/bcal" +changelog="https://raw.githubusercontent.com/jarun/bcal/master/CHANGELOG" distfiles="https://github.com/jarun/bcal/archive/v${version}.tar.gz" -checksum=e295b022e5187079b4cc5310447da5c787cb6bade86936dabf34a42bb85348ba +checksum=141f39d866f62274b2262164baaac6202f60749862c84c2e6ed231f6d03ee8df if [ "$XBPS_TARGET_WORDSIZE" -ne 64 ]; then broken="Can only be built for 64 bit targets which define __uint128_t." From 2023281f45645ac547440438a002d894267bc2d8 Mon Sep 17 00:00:00 2001 From: clyhtsuriva Date: Mon, 5 Sep 2022 11:53:22 +0200 Subject: [PATCH 1021/1407] vile: update to 9.8w --- srcpkgs/vile/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vile/template b/srcpkgs/vile/template index 7164c00f9dfa..f3b6cbb8c83b 100644 --- a/srcpkgs/vile/template +++ b/srcpkgs/vile/template @@ -1,6 +1,6 @@ # Template file for 'vile' pkgname=vile -version=9.8v +version=9.8w revision=1 build_style=gnu-configure configure_args="--disable-stripping" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="http://invisible-island.net/vile/vile.html" distfiles="https://invisible-mirror.net/archives/vile/current/vile-${version}.tgz" -checksum=240edec7bbf3d9df48b3042754bf9854d9a233d371d50bba236ec0edd708eed5 +checksum=78253ec3f7ae5f4f9d4799a3c8bc35b85b47d456f2ac172810008a48e4609815 post_extract() { sed -i 's/\[\[//g' filters/sh-filt.l From fae386559b7c2d4638cbe8f533751aa60c4e4e27 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, 4 Sep 2022 23:46:58 +0700 Subject: [PATCH 1022/1407] SPIRV-Headers: update to 1.3.224.1. --- srcpkgs/SPIRV-Headers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template index 8f3e68ba87c3..f812dbfb4b12 100644 --- a/srcpkgs/SPIRV-Headers/template +++ b/srcpkgs/SPIRV-Headers/template @@ -1,7 +1,7 @@ # Template file for 'SPIRV-Headers' pkgname=SPIRV-Headers 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 +version=1.3.224.1 revision=1 wrksrc="SPIRV-Headers-sdk-${version}" build_style=cmake @@ -10,7 +10,7 @@ maintainer="tibequadorian " license="MIT" homepage="https://github.com/KhronosGroup/SPIRV-Headers" distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-${version}.tar.gz" -checksum=262864053968c217d45b24b89044a7736a32361894743dd6cfe788df258c746c +checksum=c85714bfe62f84007286bd3b3c0471af0a7e06ab66bc2ca4623043011b28737f post_install() { vlicense LICENSE From d3c6a6180e8e9e3396d952db2d59571826591095 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, 4 Sep 2022 23:49:47 +0700 Subject: [PATCH 1023/1407] SPIRV-Tools: update to 2022.3. --- common/shlibs | 1 + srcpkgs/SPIRV-Tools/template | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index 081118a049b3..8db47d5a4585 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3469,6 +3469,7 @@ libshaderc_shared.so.1 shaderc-2018.0_1 libglslang.so glslang-6.2.2596_1 libHLSL.so glslang-8.13.3743_1 libSPIRV.so glslang-6.2.2596_1 +libSPIRV-Tools-shared.so SPIRV-Tools-2022.3_1 libmaxminddb.so.0 libmaxminddb-1.3.2_1 libmysqlpp.so.3 mysql++-3.2.5_1 libKF5Syndication.so.5 syndication-5.50.0_1 diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template index ffb2fe25efaf..e12fac380ba8 100644 --- a/srcpkgs/SPIRV-Tools/template +++ b/srcpkgs/SPIRV-Tools/template @@ -1,6 +1,6 @@ # Template file for 'SPIRV-Tools' pkgname=SPIRV-Tools -version=2022.1 +version=2022.3 revision=1 build_style=cmake configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF @@ -13,13 +13,15 @@ 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=844c0f590a0ab9237cec947e27cfc75bd14f39a68fc3b37d8f1b9e1b21490a58 +checksum=df6dc5ed5351f99aaaa6acc78111342d3400b27b99f18148d3be408570144a70 +LDFLAGS="-Wl,--no-undefined" SPIRV-Tools-devel_package() { depends="SPIRV-Tools-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } From 07fc138851313d0cce32d407675923216a19c2f2 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, 5 Sep 2022 00:01:15 +0700 Subject: [PATCH 1024/1407] Vulkan-ValidationLayers: rebuild for glslang-11.11.0 --- srcpkgs/Vulkan-ValidationLayers/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Vulkan-ValidationLayers/template b/srcpkgs/Vulkan-ValidationLayers/template index 330c8e3169f0..640c604f7005 100644 --- a/srcpkgs/Vulkan-ValidationLayers/template +++ b/srcpkgs/Vulkan-ValidationLayers/template @@ -1,7 +1,7 @@ # Template file for 'Vulkan-ValidationLayers' pkgname=Vulkan-ValidationLayers version=1.3.204.1 -revision=1 +revision=2 wrksrc="Vulkan-ValidationLayers-sdk-${version}" build_style=cmake configure_args="-Wno-dev -DBUILD_LAYER_SUPPORT_FILES=ON" From b0b8605c73b0b5cf3fefb779c42dfce96464641c 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, 5 Sep 2022 00:00:45 +0700 Subject: [PATCH 1025/1407] retroarch: rebuild for glslang-11.11.0 --- srcpkgs/retroarch/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index ad22866768fa..a7aeeff16e9d 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -1,7 +1,7 @@ # Template file for 'retroarch' pkgname=retroarch version=1.10.3 -revision=1 +revision=2 wrksrc="RetroArch-$version" build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking From 47a66c6cbb8254ed0947484d65071897ef005a24 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, 5 Sep 2022 00:05:31 +0700 Subject: [PATCH 1026/1407] glslang: update to 11.11.0. --- common/shlibs | 6 +++--- srcpkgs/glslang/template | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8db47d5a4585..8b4edbd9ce66 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3466,9 +3466,9 @@ liblinphone++.so.10 linphone-4.4.0_1 libbelr.so.1 belr-0.1.3_1 libbelcard.so.1 belcard-1.0.2_1 libshaderc_shared.so.1 shaderc-2018.0_1 -libglslang.so glslang-6.2.2596_1 -libHLSL.so glslang-8.13.3743_1 -libSPIRV.so glslang-6.2.2596_1 +libglslang.so.11 glslang-11.11.0_1 +libHLSL.so glslang-11.11.0_1 +libSPIRV.so glslang-11.11.0_1 libSPIRV-Tools-shared.so SPIRV-Tools-2022.3_1 libmaxminddb.so.0 libmaxminddb-1.3.2_1 libmysqlpp.so.3 mysql++-3.2.5_1 diff --git a/srcpkgs/glslang/template b/srcpkgs/glslang/template index 2f070b916606..f374b3ae7c9f 100644 --- a/srcpkgs/glslang/template +++ b/srcpkgs/glslang/template @@ -1,7 +1,7 @@ # Template file for 'glslang' # Libraries are unversioned, beware of ABI breakage (rebuild shaderc on updates) pkgname=glslang -version=8.13.3743 +version=11.11.0 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/KhronosGroup/glslang" distfiles="https://github.com/KhronosGroup/glslang/archive/${version}.tar.gz" -checksum=639ebec56f1a7402f2fa094469a5ddea1eceecfaf2e9efe361376a0f73a7ee2f +checksum=26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438 post_install() { sed -n '2,32p' < glslang/GenericCodeGen/CodeGen.cpp > LICENSE @@ -24,6 +24,7 @@ glslang-devel_package() { pkg_install() { vmove usr/include vmove "usr/lib/*.a" + vmove usr/lib/libglslang.so vmove usr/lib/cmake } } From b482a9c5d497f745bef3bbb8a237a6304ba2d23c 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, 5 Sep 2022 00:05:57 +0700 Subject: [PATCH 1027/1407] shaderc: update to 2022.2. --- .../patches/fix-glslang-link-order.patch | 44 ++++++------------- srcpkgs/shaderc/template | 15 ++++--- 2 files changed, 23 insertions(+), 36 deletions(-) diff --git a/srcpkgs/shaderc/patches/fix-glslang-link-order.patch b/srcpkgs/shaderc/patches/fix-glslang-link-order.patch index 691719c0d9c3..99292c744837 100644 --- a/srcpkgs/shaderc/patches/fix-glslang-link-order.patch +++ b/srcpkgs/shaderc/patches/fix-glslang-link-order.patch @@ -1,43 +1,25 @@ -Original upstream PR: https://github.com/google/shaderc/pull/463 - -From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001 -From: Niklas Haas -Date: Tue, 29 May 2018 07:34:00 +0200 -Subject: [PATCH] Fix the link order of libglslang and libHLSL - -libglslang depends on libHLSL, so the latter needs to be specified last. -This fixes an issue when trying to build shaderc against system-wide -versions of libglslang/libHLSL, rather than the in-tree versions from -third_party. - -Additionally, libshaderc_util also depends on SPIRV-Tools ---- - glslc/CMakeLists.txt | 2 +- - libshaderc_util/CMakeLists.txt | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - +https://github.com/google/shaderc/pull/463 --- a/glslc/CMakeLists.txt +++ b/glslc/CMakeLists.txt -@@ -18,7 +18,7 @@ add_library(glslc STATIC - shaderc_default_compile_options(glslc) - target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR}) - target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler -- HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT}) -+ glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT}) - target_link_libraries(glslc PRIVATE shaderc_util shaderc) - - add_executable(glslc_exe src/main.cc) +@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT) + endif(SHADERC_ENABLE_WGSL_OUTPUT) + + target_link_libraries(glslc PRIVATE +- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries ++ glslang OSDependent OGLCompiler glslang SPIRV HLSL # Glslang libraries + $<$:libtint> # Tint libraries, optional + shaderc_util shaderc # internal Shaderc libraries + ${CMAKE_THREAD_LIBS_INIT}) --- a/libshaderc_util/CMakeLists.txt +++ b/libshaderc_util/CMakeLists.txt -@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL) - +@@ -46,8 +46,8 @@ add_definitions(-DENABLE_HLSL) + find_package(Threads) target_link_libraries(shaderc_util PRIVATE - glslang OSDependent OGLCompiler HLSL glslang SPIRV - SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) + glslang OSDependent OGLCompiler glslang HLSL SPIRV + SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT}) - + shaderc_add_tests( TEST_PREFIX shaderc_util - diff --git a/srcpkgs/shaderc/template b/srcpkgs/shaderc/template index 7382d081551c..1ab7478262a6 100644 --- a/srcpkgs/shaderc/template +++ b/srcpkgs/shaderc/template @@ -1,6 +1,6 @@ # Template file for 'shaderc' pkgname=shaderc -version=2020.0 +version=2022.2 revision=1 build_style=cmake configure_args="-DSHADERC_SKIP_TESTS=ON" @@ -11,9 +11,10 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/google/shaderc" distfiles="https://github.com/google/shaderc/archive/v${version}.tar.gz" -checksum=e02e2a9d4c3960bc629ca8cdcf83d295bec9c80ed08a8c5062e4e294022605ec +checksum=517d36937c406858164673db696dc1d9c7be7ef0960fbf2965bfef768f46b8c0 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/glslang" +LDFLAGS="-Wl,--no-undefined" pre_configure() { # Unbundle glslang, SPIRV-Headers, SPIRV-Tools @@ -27,9 +28,13 @@ pre_configure() { # Create our own build-version.inc since we disabled git versioning # need to keep this in sync with glslang and SPIRV-Tools versions # this is displayed with 'glslc --version' + spirv="$($XBPS_QUERY_XCMD -p pkgver SPIRV-Tools)" + spirv=${spirv%_*} + glslang=$($XBPS_QUERY_XCMD -p pkgver glslang) + glslang=${glslang%_*} cat <<- EOF > glslc/src/build-version.inc - "shaderc 2020.0\n" - "SPIRV-Tools-2020.3\n" - "glslang-8.13.3743\n" + "shaderc ${version}\n" + "${spirv}\n" + "${glslang}\n" EOF } From a80b7500fe7a1bd64385a58026e1825f5d9d0cd1 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, 30 Aug 2022 11:32:21 +0700 Subject: [PATCH 1028/1407] libime: update to 1.0.14. --- srcpkgs/libime/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template index 363bdd93b16d..8ff46d093dad 100644 --- a/srcpkgs/libime/template +++ b/srcpkgs/libime/template @@ -1,7 +1,7 @@ # Template file for 'libime' pkgname=libime -version=1.0.13 -revision=2 +version=1.0.14 +revision=1 build_style=cmake build_helper=qemu hostmakedepends="pkg-config gettext extra-cmake-modules python3" @@ -10,15 +10,15 @@ short_desc="Library to support generic input method implementation" maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" -_lm_sc=lm_sc.arpa-20220630.tar.xz -_dict=dict_sc.txt-20220628.tar.xz +_lm_sc=lm_sc.arpa-20220810.tar.xz +_dict=dict-20220810.tar.xz distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz https://download.fcitx-im.org/data/${_lm_sc} https://download.fcitx-im.org/data/${_dict} https://download.fcitx-im.org/data/table.tar.gz" -checksum="0ef4af58e4b5719991315bd214d9cd53a1513f6897c565073e4e119c1e126176 - 8d3b0fa8fa16b93d0d4590f02da04029c271364b5925c1c902845c374a2a00bf - d0fc77543cc763cacb986d6e650827bd6050579584273f6216ab58672480f17c +checksum="931f6a1c91d67dccb5b16b29810fc7444707a21b30c5bfa850498ea6a9d7b6aa + a11bc97d275adaf195f9bac854368ae06cdb4a0fe1eecf59db5ae580615db4fa + 971752f413188007e8d19158c11b85c955e25d7b321ec2275c4b3af6d8a85d26 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7" skip_extraction=" ${_lm_sc} From 5598e8372c2ec62617f0ea8c78dddbb374c9e8b6 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, 1 Sep 2022 11:06:42 +0700 Subject: [PATCH 1029/1407] fcitx5-chinese-addons: update to 5.0.15. --- srcpkgs/fcitx5-chinese-addons/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template index a3a1948474a7..0b4724ca494a 100644 --- a/srcpkgs/fcitx5-chinese-addons/template +++ b/srcpkgs/fcitx5-chinese-addons/template @@ -1,7 +1,7 @@ # Template file for 'fcitx5-chinese-addons' pkgname=fcitx5-chinese-addons -version=5.0.14 -revision=2 +version=5.0.15 +revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake qt5-host-tools libime-utils" @@ -17,7 +17,7 @@ _pystroke_version=20121124 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz" -checksum="509d02718b32b8409b35e61caab8d6c4a1092c8691734cb2315f28d60d5fb39f +checksum="dd543d0a544bffbe9bd24aa35e9f1711fc8235558ad44da3ed1652a14f53df06 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248" skip_extraction=" From 1b409643398cea2c9c258949cd9a91c602ffe357 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, 1 Sep 2022 11:06:46 +0700 Subject: [PATCH 1030/1407] fcitx5-configtool: update to 5.0.15. --- srcpkgs/fcitx5-configtool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template index bcca02e86007..6eef82e7d7aa 100644 --- a/srcpkgs/fcitx5-configtool/template +++ b/srcpkgs/fcitx5-configtool/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-configtool' pkgname=fcitx5-configtool -version=5.0.14 +version=5.0.15 revision=1 build_style=cmake configure_args="-DENABLE_KCM=ON -DENABLE_CONFIG_QT=ON -DENABLE_TEST=ON" @@ -19,7 +19,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz" -checksum=2f16c6a100c890496c8757a220a84fe2b9fd0df2e99e0ba4fb65d20700f76e88 +checksum=68ae08be2ff796ea804a720034499f9839a59d33be3db569c862a22d2eafb8cc lib32disabled=yes post_install() { From 2ff06de33596c11faa7c7db7629b979b19ea42a6 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, 28 Aug 2022 00:01:40 +0700 Subject: [PATCH 1031/1407] fcitx: update to 4.2.9.9. --- srcpkgs/fcitx/template | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template index 590f93109621..c2183bf5dcfc 100644 --- a/srcpkgs/fcitx/template +++ b/srcpkgs/fcitx/template @@ -1,7 +1,7 @@ # Template file for 'fcitx' pkgname=fcitx -version=4.2.9.8 -revision=5 +version=4.2.9.9 +revision=1 build_style=cmake build_helper=gir configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF @@ -18,8 +18,28 @@ short_desc="Flexible Context-aware Input Tool with eXtension" maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT" homepage="https://fcitx-im.org/" -distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}_dict.tar.xz" -checksum=bc3515cba0561546fe02dae81391d4a03e0e79a2d668aa794cd3a377284033c6 +_en_dict=20121020 +_pytable=20121124 +_pystroke=20121124 +distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}.tar.xz + https://download.fcitx-im.org/data/en_dict-${_en_dict}.tar.gz + http://download.fcitx-im.org/data/py_table-${_pytable}.tar.gz + http://download.fcitx-im.org/data/py_stroke-${_pystroke}.tar.gz + http://download.fcitx-im.org/data/pinyin.tar.gz + http://download.fcitx-im.org/data/table.tar.gz + " +checksum="307bddeabbec383eb27c4ea222d9f71d8d9011d7942f4010368e5bc3ca7440a1 + c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb + 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04 + 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248 + 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 + 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7" +skip_extraction=" + en_dict-${_en_dict}.tar.gz + py_table-${_pytable}.tar.gz + py_stroke-${_pystroke}.tar.gz + pinyin.tar.gz + table.tar.gz" lib32disabled=yes # Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel @@ -34,6 +54,16 @@ fi build_options="gir" build_options_default="gir" +post_extract() { + local _src="$XBPS_SRCDISTDIR/fcitx-$version" + cp "$_src/en_dict-${_en_dict}.tar.gz" src/module/spell/dict + cp "$_src/py_table-${_pytable}.tar.gz" \ + "$_src/py_stroke-${_pystroke}.tar.gz" \ + src/module/pinyin-enhance/data + cp "$_src/pinyin.tar.gz" src/im/pinyin/data + cp "$_src/table.tar.gz" src/im/table/data +} + pre_configure() { # include FcitxMacro.cmake without invoking fcitx4-config vsed -i -e 's;INCLUDE(${FCITX4_PREFIX}/share/cmake/fcitx;INCLUDE(${CMAKE_CURRENT_LIST_DIR};' \ From 644e0cfa0fc240b1d35c7c93d6900280b44be5af 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, 28 Aug 2022 00:06:50 +0700 Subject: [PATCH 1032/1407] fcitx5-gtk: update to 5.0.18 --- srcpkgs/fcitx5-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template index ddf2910cc696..a047cce7bca1 100644 --- a/srcpkgs/fcitx5-gtk/template +++ b/srcpkgs/fcitx5-gtk/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-gtk' pkgname=fcitx5-gtk -version=5.0.16 +version=5.0.18 revision=1 build_style=cmake build_helper=gir @@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz" -checksum=3dd1f941170fffda0bafa75baea84fdbcd2d212c6b1dfd99555915aa033e6de6 +checksum=8bca04a821b6450f7a2878f55d0450388e9f3f529e7c76789d7d26c74ab8e374 lib32disabled=yes build_options="gir" From 79f8c752cb1d5c633dc4f8ece298f53fb02e8509 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, 1 Sep 2022 11:06:56 +0700 Subject: [PATCH 1033/1407] fcitx5-qt: update to 5.0.15. --- srcpkgs/fcitx5-qt/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template index c53a830ee9ce..3c88aa0bf50c 100644 --- a/srcpkgs/fcitx5-qt/template +++ b/srcpkgs/fcitx5-qt/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-qt' pkgname=fcitx5-qt -version=5.0.14 +version=5.0.15 revision=1 build_style=cmake configure_args="--trace-expand -DENABLE_QT4=OFF -DENABLE_QT5=ON @@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later, BSD-3-Clause" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz" -checksum=fdf6d4750a9326b6539179f94c6e8c04a30c5d5f877ae01debd571c6e8035dfe +checksum=21743c4353c793934222fa7115493cd30da9843b4baed22e64bddfa6dd7341a8 lib32disabled=yes if [ "$XBPS_TARGET_NOATOMIC8" ]; then @@ -40,6 +40,7 @@ fcitx5-qt5_package() { vmove usr/lib/qt5 vmove "usr/libexec/*qt5-*" vmove "usr/lib/*Qt5*.so.*" + vmove "usr/share/applications/org.fcitx.fcitx5-qt5-*" } } From 9e876b2315a497b19f129ecfedd0aed7e30131c6 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, 1 Sep 2022 11:07:00 +0700 Subject: [PATCH 1034/1407] fcitx5-lua: update to 5.0.10. --- srcpkgs/fcitx5-lua/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-lua/template b/srcpkgs/fcitx5-lua/template index db54789fc506..08205f27a38a 100644 --- a/srcpkgs/fcitx5-lua/template +++ b/srcpkgs/fcitx5-lua/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-lua' pkgname=fcitx5-lua -version=5.0.9 +version=5.0.10 revision=1 build_style=cmake configure_args="-DUSE_DLOPEN=No" @@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later" homepage="https://github.com/fcitx/fcitx5-lua" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-${version}.tar.xz" -checksum=e391d68c4b597a3f38ae322c3b5dd92872aa5ea11fd39a5723e7ded4fcadd173 +checksum=29ddd350836d7a05a05b918897f8a4904b764f746cc42cb34c705c754f34708f lib32disabled=yes fcitx5-lua-devel_package() { From 6c9f007e57ca1d909defdb9f411288ba9258cc4e 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, 1 Sep 2022 11:06:35 +0700 Subject: [PATCH 1035/1407] fcitx5: update to 5.0.19. --- srcpkgs/fcitx5/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template index 25ab9570488b..37b5b9316d34 100644 --- a/srcpkgs/fcitx5/template +++ b/srcpkgs/fcitx5/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5' pkgname=fcitx5 -version=5.0.18 +version=5.0.19 revision=1 build_style=cmake build_helper=qemu @@ -21,7 +21,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx" _en_dict_ver=20121020 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz" -checksum="6803f65b9f26e70e0498809f2b0f973b06340f484793d58dde08f2498bd8c6f5 +checksum="ae05bec1843becd69451971c1e03c163e19ea59f32919fb99494ec9935f159ef c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb" skip_extraction=en_dict-${_en_dict_ver}.tar.gz lib32disabled=yes @@ -30,7 +30,7 @@ lib32disabled=yes post_extract() { local _distdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} - cp ${_distdir}/en_dict-${_en_dict_ver}.tar.gz src/modules/spell/dict + cp ${_distdir}/en_dict-${_en_dict_ver}.tar.gz src/modules/spell/ } post_install() { From cc57e8288ea304e408232cfebb0c1e277d40db61 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, 2 Sep 2022 22:49:18 +0700 Subject: [PATCH 1036/1407] build-style/scons: use --install-sandbox for $DESTDIR See https://scons.org/doc/production/HTML/scons-user.html#b-Install Some projects uses --prefix=$DESTDIR/usr must be fixed. --- common/build-style/scons.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/common/build-style/scons.sh b/common/build-style/scons.sh index 17527d7ac652..f87c0dcc5304 100644 --- a/common/build-style/scons.sh +++ b/common/build-style/scons.sh @@ -9,18 +9,27 @@ do_build() { CXXFLAGS="$CXXFLAGS" LINKFLAGS="$LDFLAGS" \ cxxflags="$CXXFLAGS" linkflags="$LDFLAGS" \ RANLIB="$RANLIB" ranlib="$RANLIB" \ - prefix=/usr destdir=${DESTDIR} DESTDIR=${DESTDIR} \ + prefix=/usr \ + ${scons_use_destdir:+DESTDIR="${DESTDIR}"} \ + ${scons_use_destdir:+destdir="${DESTDIR}"} \ ${make_build_args} ${make_build_target} } do_install() { : ${make_cmd:=scons} : ${make_install_target:=install} + local _sandbox= + + if [ -z "$scons_use_destdir" ]; then _sandbox=yes ; fi + ${make_cmd} ${makejobs} CC=$CC CXX=$CXX CCFLAGS="$CFLAGS" \ cc=$CC cxx=$CXX ccflags="$CFLAGS" \ CXXFLAGS="$CXXFLAGS" LINKFLAGS="$LDFLAGS" \ cxxflags="$CXXFLAGS" linkflags="$LDFLAGS" \ RANLIB="$RANLIB" ranlib="$RANLIB" \ - prefix=/usr destdir=${DESTDIR} DESTDIR=${DESTDIR} \ + prefix=/usr \ + ${scons_use_destdir:+DESTDIR="${DESTDIR}"} \ + ${scons_use_destdir:+destdir="${DESTDIR}"} \ + ${_sandbox:+--install-sandbox="${DESTDIR}"} \ ${make_install_args} ${make_install_target} } From 691e652ffde41d9c42635dbaba6bb38d1a5f2e7c 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, 2 Sep 2022 22:52:47 +0700 Subject: [PATCH 1037/1407] cbang: rebuild for correct prefix --- srcpkgs/cbang/template | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template index 63388b2aa828..9357bdc0d709 100644 --- a/srcpkgs/cbang/template +++ b/srcpkgs/cbang/template @@ -1,13 +1,14 @@ # Template file for 'cbang' pkgname=cbang version=1.6.0 -revision=3 +revision=4 build_style=scons make_build_args="sharedlib=1 staticlib=1" make_install_args="${make_build_args}" hostmakedepends="pkg-config" makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel" +checkdepends="python" short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries" maintainer="Orphaned " license="LGPL-2.1-only" @@ -15,31 +16,24 @@ homepage="https://github.com/CauldronDevelopmentLLC/cbang" distfiles="https://github.com/CauldronDevelopmentLLC/cbang/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=8aa5efacf419b712b5bd0172c9d56301bdcbd477cb590ceec25c3595a192e9c0 -pre_build() { - make_build_args+=" prefix=$DESTDIR/usr" +post_extract() { + touch tests/iostreamTests/{C,Dec}ompressTest/disable } -do_check() { +post_build() { cd tests - touch iostreamTests/{C,Dec}ompressTest/disable - scons ${makejobs} CC=$CC CXX=$CXX CCFLAGS="$CFLAGS" \ - cc=$CC cxx=$CXX ccflags="$CFLAGS" \ - CXXFLAGS="$CXXFLAGS" LINKFLAGS="$LDFLAGS" \ - cxxflags="$CXXFLAGS" linkflags="$LDFLAGS" \ - RANLIB="$RANLIB" ranlib="$RANLIB" \ - prefix=/usr destdir=${DESTDIR} DESTDIR=${DESTDIR} - ./testHarness + do_build } -pre_install() { - make_install_args+=" prefix=$DESTDIR/usr" +do_check() { + cd tests + ./testHarness } post_install() { # Create missing symbolic links for the shared library - ln -sf libcbang0.so.0.0.1 ${DESTDIR}/usr/lib/libcbang.so.0.0 - ln -sf libcbang0.so.0.0.1 ${DESTDIR}/usr/lib/libcbang.so.0 - ln -sf libcbang0.so.0.0.1 ${DESTDIR}/usr/lib/libcbang.so + ln -sf libcbang0.so.* ${DESTDIR}/usr/lib/libcbang0.so + ln -sf libcbang0.so.* ${DESTDIR}/usr/lib/libcbang.so } cbang-devel_package() { From 6d1cf297834bc929a9cfb6932d36ea1ebda8329f 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, 3 Sep 2022 11:05:01 +0700 Subject: [PATCH 1038/1407] endless-sky: work with --install-sandbox --- srcpkgs/endless-sky/patches/paths.patch | 70 +++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 4 deletions(-) diff --git a/srcpkgs/endless-sky/patches/paths.patch b/srcpkgs/endless-sky/patches/paths.patch index e80095b88eff..36029192f4b2 100644 --- a/srcpkgs/endless-sky/patches/paths.patch +++ b/srcpkgs/endless-sky/patches/paths.patch @@ -1,6 +1,8 @@ +We need to patch for PREFIX and s/games/bin anyway, +let's patch $DESTDIR, too --- a/SConstruct +++ b/SConstruct -@@ -41,7 +41,7 @@ +@@ -37,7 +37,7 @@ opts.AddVariables( PathVariable("BUILDDIR", "Directory to store compiled object files in", "build", PathVariable.PathIsDirCreate), PathVariable("BIN_DIR", "Directory to store binaries in", ".", PathVariable.PathIsDirCreate), PathVariable("DESTDIR", "Destination root directory, e.g. if building a package", "", PathVariable.PathAccept), @@ -9,12 +11,72 @@ ) opts.Update(env) Help(opts.GenerateHelpText(env)) -@@ -150,7 +150,7 @@ +@@ -157,22 +157,22 @@ env.AlwaysBuild("test") # Install the binary: -env.Install("$DESTDIR$PREFIX/games", sky) -+env.Install("$DESTDIR$PREFIX/bin", sky) ++install = env.Install("$PREFIX/bin", sky) # Install the desktop file: - env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") +-env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") ++install += env.Install("$PREFIX/share/applications", "endless-sky.desktop") + + # Install app center metadata: +-env.Install("$DESTDIR$PREFIX/share/appdata", "endless-sky.appdata.xml") ++install += env.Install("$PREFIX/share/appdata", "endless-sky.appdata.xml") + + # Install icons, keeping track of all the paths. + # Most Ubuntu apps supply 16, 22, 24, 32, 48, and 256, and sometimes others. + sizes = ["16x16", "22x22", "24x24", "32x32", "48x48", "128x128", "256x256", "512x512"] + icons = [] + for size in sizes: +- destination = "$DESTDIR$PREFIX/share/icons/hicolor/" + size + "/apps/endless-sky.png" ++ destination = "$PREFIX/share/icons/hicolor/" + size + "/apps/endless-sky.png" + icons.append(destination) +- env.InstallAs(destination, "icons/icon_" + size + ".png") ++ install += env.InstallAs(destination, "icons/icon_" + size + ".png") + + # If any of those icons changed, also update the cache. + # Do not update the cache if we're not installing into "usr". +@@ -181,28 +181,30 @@ if env.get("PREFIX").startswith("/usr/") + env.Command( + [], + icons, +- "gtk-update-icon-cache -t $DESTDIR$PREFIX/share/icons/hicolor/") ++ "gtk-update-icon-cache -t $PREFIX/share/icons/hicolor/") + + # Install the man page. + env.Command( +- "$DESTDIR$PREFIX/share/man/man6/endless-sky.6.gz", ++ "$PREFIX/share/man/man6/endless-sky.6.gz", + "endless-sky.6", + "gzip -c $SOURCE > $TARGET") + + # Install the data files. + def RecursiveInstall(env, target, source): + rootIndex = len(env.Dir(source).abspath) + 1 ++ install = [] + for node in env.Glob(pathjoin(source, '*')): + if node.isdir(): + name = node.abspath[rootIndex:] +- RecursiveInstall(env, pathjoin(target, name), node.abspath) ++ install += RecursiveInstall(env, pathjoin(target, name), node.abspath) + else: +- env.Install(target, node) +-RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/data", "data") +-RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/images", "images") +-RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/sounds", "sounds") +-env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "credits.txt") +-env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "keys.txt") ++ install += env.Install(target, node) ++ return install ++install += RecursiveInstall(env, "$PREFIX/share/games/endless-sky/data", "data") ++install += RecursiveInstall(env, "$PREFIX/share/games/endless-sky/images", "images") ++install += RecursiveInstall(env, "$PREFIX/share/games/endless-sky/sounds", "sounds") ++install += env.Install("$PREFIX/share/games/endless-sky", "credits.txt") ++install += env.Install("$PREFIX/share/games/endless-sky", "keys.txt") + + # Make the word "install" in the command line do an installation. +-env.Alias("install", "$DESTDIR$PREFIX") ++env.Alias("install", install) From e95325474cb5df06d1f5e75b0f7271aafee208c3 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, 3 Sep 2022 11:11:38 +0700 Subject: [PATCH 1039/1407] endless-sky-gl21: merge data, use --install-sandbox --- srcpkgs/endless-sky-gl21-data | 1 - srcpkgs/endless-sky-gl21/patches/paths.patch | 72 ++++++++++++++++++-- srcpkgs/endless-sky-gl21/template | 13 +--- 3 files changed, 69 insertions(+), 17 deletions(-) delete mode 120000 srcpkgs/endless-sky-gl21-data diff --git a/srcpkgs/endless-sky-gl21-data b/srcpkgs/endless-sky-gl21-data deleted file mode 120000 index 698f56bdb723..000000000000 --- a/srcpkgs/endless-sky-gl21-data +++ /dev/null @@ -1 +0,0 @@ -endless-sky-gl21 \ No newline at end of file diff --git a/srcpkgs/endless-sky-gl21/patches/paths.patch b/srcpkgs/endless-sky-gl21/patches/paths.patch index c283ff8052a8..d8c919c97df9 100644 --- a/srcpkgs/endless-sky-gl21/patches/paths.patch +++ b/srcpkgs/endless-sky-gl21/patches/paths.patch @@ -1,6 +1,6 @@ ---- a/SConstruct.old 2017-12-06 12:54:20.524502000 -0800 -+++ b/SConstruct 2017-12-12 12:39:21.764384877 -0800 -@@ -18,7 +18,7 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -18,7 +18,7 @@ if 'SCHROOT_CHROOT_NAME' in os.environ a env.Append(LINKFLAGS = ["-static-libstdc++"]) opts = Variables() @@ -9,12 +9,72 @@ opts.Add(PathVariable("DESTDIR", "Destination root directory", "", PathVariable.PathAccept)) opts.Add(EnumVariable("mode", "Compilation mode", "release", allowed_values=("release", "debug", "profile"))) opts.Update(env) -@@ -66,7 +66,7 @@ +@@ -66,22 +66,22 @@ sky = env.Program("endless-sky", Glob("b # Install the binary: -env.Install("$DESTDIR$PREFIX/games", sky) -+env.Install("$DESTDIR$PREFIX/bin", sky) ++install = env.Install("$PREFIX/bin", sky) # Install the desktop file: - env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") +-env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") ++install += env.Install("$PREFIX/share/applications", "endless-sky.desktop") + + # Install app center metadata: +-env.Install("$DESTDIR$PREFIX/share/appdata", "endless-sky.appdata.xml") ++install += env.Install("$PREFIX/share/appdata", "endless-sky.appdata.xml") + + # Install icons, keeping track of all the paths. + # Most Ubuntu apps supply 16, 22, 24, 32, 48, and 256, and sometimes others. + sizes = ["16x16", "22x22", "24x24", "32x32", "48x48", "256x256"] + icons = [] + for size in sizes: +- destination = "$DESTDIR$PREFIX/share/icons/hicolor/" + size + "/apps/endless-sky.png" ++ destination = "$PREFIX/share/icons/hicolor/" + size + "/apps/endless-sky.png" + icons.append(destination) +- env.InstallAs(destination, "icons/icon_" + size + ".png") ++ install += env.InstallAs(destination, "icons/icon_" + size + ".png") + + # If any of those icons changed, also update the cache. + # Do not update the cache if we're not installing into "usr". +@@ -90,28 +90,30 @@ if env.get("PREFIX").startswith("/usr/") + env.Command( + [], + icons, +- "gtk-update-icon-cache -t $DESTDIR$PREFIX/share/icons/hicolor/") ++ "gtk-update-icon-cache -t $PREFIX/share/icons/hicolor/") + + # Install the man page. + env.Command( +- "$DESTDIR$PREFIX/share/man/man6/endless-sky.6.gz", ++ "$PREFIX/share/man/man6/endless-sky.6.gz", + "endless-sky.6", + "gzip -c $SOURCE > $TARGET") + + # Install the data files. + def RecursiveInstall(env, target, source): + rootIndex = len(env.Dir(source).abspath) + 1 ++ inst = [] + for node in env.Glob(os.path.join(source, '*')): + if node.isdir(): + name = node.abspath[rootIndex:] +- RecursiveInstall(env, os.path.join(target, name), node.abspath) ++ inst += RecursiveInstall(env, os.path.join(target, name), node.abspath) + else: +- env.Install(target, node) +-RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/data", "data") +-RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/images", "images") +-RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/sounds", "sounds") +-env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "credits.txt") +-env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "keys.txt") ++ inst += env.Install(target, node) ++ return inst ++install += RecursiveInstall(env, "$PREFIX/share/games/endless-sky/data", "data") ++install += RecursiveInstall(env, "$PREFIX/share/games/endless-sky/images", "images") ++install += RecursiveInstall(env, "$PREFIX/share/games/endless-sky/sounds", "sounds") ++install += env.Install("$PREFIX/share/games/endless-sky", "credits.txt") ++install += env.Install("$PREFIX/share/games/endless-sky", "keys.txt") + + # Make the word "install" in the command line do an installation. +-env.Alias("install", "$DESTDIR$PREFIX") ++env.Alias("install", install) diff --git a/srcpkgs/endless-sky-gl21/template b/srcpkgs/endless-sky-gl21/template index 5bb8355dc570..b4ee955c4689 100644 --- a/srcpkgs/endless-sky-gl21/template +++ b/srcpkgs/endless-sky-gl21/template @@ -1,24 +1,17 @@ # Template file for 'endless-sky-gl21' pkgname=endless-sky-gl21 version=0.9.2.20170822 -revision=2 +revision=3 _commit=fc707954b0eb61ff2bb6888c5712e6b55d1c2f91 wrksrc="endless-sky-${_commit}" build_style=scons hostmakedepends="scons" makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel libopenal-devel libpng-devel" -depends="${pkgname}-data" -conflicts="endless-sky endless-sky-data" short_desc="Space exploring, trading, and combat game. opengl21 version" maintainer="Benjamín Albiñana " license="GPL-3.0-or-later" homepage="https://github.com/SolraBizna/endless-sky" distfiles="https://github.com/SolraBizna/endless-sky/archive/${_commit}.tar.gz" checksum=46918d0cc35aaeb1219194099223e3338245aa04aa3f29fd76e3376bf5779376 - -endless-sky-gl21-data_package() { - short_desc+=" - data files" - pkg_install() { - vmove usr/share/games/endless-sky - } -} +replaces="endless-sky-gl21-data>=0" +conflicts="endless-sky>=0 endless-sky-data>=0" From df09633f7773f4a96ea5d5061ce53d6651a37f8d 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, 3 Sep 2022 11:47:16 +0700 Subject: [PATCH 1040/1407] libffado: only work with DESTDIR --- srcpkgs/libffado/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template index 7978d6007f90..9523835ae179 100644 --- a/srcpkgs/libffado/template +++ b/srcpkgs/libffado/template @@ -3,6 +3,7 @@ pkgname=libffado version=2.4.6 revision=1 build_style=scons +scons_use_destdir=yes make_build_args="PREFIX=/usr MANDIR=/usr/share/man UDEVDIR=/usr/lib/udev/rules.d CUSTOM_ENV=1 BUILD_TESTS=0 ENABLE_OPTIMIZATIONS=0 DEBUG=0 PYTHON_INTERPRETER=/usr/bin/python3 From 169235e882b4729303d620352f4e0321a0d4dba1 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, 3 Sep 2022 11:21:29 +0700 Subject: [PATCH 1041/1407] gpsd: not export DESTDIR on install scons will use --install-sandbox --- srcpkgs/gpsd/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index c60f03ae5bd7..eaa83e4ac8c5 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -35,7 +35,6 @@ pre_build() { pre_install() { unset LD - export DESTDIR=${DESTDIR} makejobs="-j1" } From dda6b672c87f5d31f589dc19d85e6a90d2705996 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, 3 Sep 2022 12:10:07 +0700 Subject: [PATCH 1042/1407] vdrift: doesn't work with --install-sandbox --- srcpkgs/vdrift/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/vdrift/template b/srcpkgs/vdrift/template index cc586376b4e6..3fbbce0da07b 100644 --- a/srcpkgs/vdrift/template +++ b/srcpkgs/vdrift/template @@ -4,6 +4,7 @@ version=2014.10.20 revision=11 wrksrc="$pkgname" build_style=scons +scons_use_destdir=yes make_build_args="release=1 force_feedback=1 extbullet=1 datadir=share/${pkgname}" make_install_args="$make_build_args" hostmakedepends="gettext pkg-config" From 6cf834f73c1150dcc29764c782896885a479fd29 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, 5 Sep 2022 19:57:25 +0700 Subject: [PATCH 1043/1407] linux5.19: update to 5.19.6. --- srcpkgs/linux5.19/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.19/template b/srcpkgs/linux5.19/template index 013ef67e19cb..53a6108e5f3d 100644 --- a/srcpkgs/linux5.19/template +++ b/srcpkgs/linux5.19/template @@ -1,6 +1,6 @@ # Template file for 'linux5.19' pkgname=linux5.19 -version=5.19.5 +version=5.19.6 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="ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8 - ea4f4be61b0635d8b2cb58c373b670e78250dac9d0f2432222052789974c09d7" + 529ef98eb4463c48e276240de679c3dd37093a61cd7b55ae3fe4ba052045f844" skip_extraction="patch-${version}.xz" python_version=3 From c5a2fc1656351d6a742f87497664460b3b6bae9c Mon Sep 17 00:00:00 2001 From: lonxwolx Date: Mon, 5 Sep 2022 15:42:51 +0800 Subject: [PATCH 1044/1407] betterlockscreen: use loginctl Close: #39106 Close: #39108 --- srcpkgs/betterlockscreen/patches/use-loginctl.patch | 12 ++++++++++++ srcpkgs/betterlockscreen/template | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/betterlockscreen/patches/use-loginctl.patch diff --git a/srcpkgs/betterlockscreen/patches/use-loginctl.patch b/srcpkgs/betterlockscreen/patches/use-loginctl.patch new file mode 100644 index 000000000000..b2f67eb8bdb7 --- /dev/null +++ b/srcpkgs/betterlockscreen/patches/use-loginctl.patch @@ -0,0 +1,12 @@ +--- a/betterlockscreen ++++ b/betterlockscreen +@@ -965,6 +965,6 @@ done + # Activate lockscreen + [[ $runsuspend ]] || lockargs+=(-n) + [[ $runlock ]] && lockselect "$lockstyle" && \ +- { [[ $runsuspend ]] && systemctl suspend; } ++ { [[ $runsuspend ]] && loginctl suspend; } + +-exit 0 +\ No newline at end of file ++exit 0 diff --git a/srcpkgs/betterlockscreen/template b/srcpkgs/betterlockscreen/template index bb02d9c0f01e..5de5ae4c67b6 100644 --- a/srcpkgs/betterlockscreen/template +++ b/srcpkgs/betterlockscreen/template @@ -1,7 +1,7 @@ # Template file for 'betterlockscreen' pkgname=betterlockscreen version=4.0.3 -revision=1 +revision=2 depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb xset" short_desc="Sweet looking lockscreen for linux system" maintainer="Aleksander Zien " @@ -11,6 +11,7 @@ distfiles="https://github.com/pavanjadhaw/betterlockscreen/archive/refs/tags/v${ checksum=d96fd64f1c94c91fec5d26b9665ba68f7f130c8a8612978ad9edbfa859710671 do_install() { - vbin ${pkgname} + vbin betterlockscreen + vsconf examples/betterlockscreenrc vlicense LICENSE } From 87160778cd19e31f4262dc961bece94e3b86cffa Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 5 Sep 2022 08:26:23 -0400 Subject: [PATCH 1045/1407] ddcutil: add back depends on i2c-tools --- srcpkgs/ddcutil/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ddcutil/template b/srcpkgs/ddcutil/template index 919a3ccb42d8..170bcdae5cc0 100644 --- a/srcpkgs/ddcutil/template +++ b/srcpkgs/ddcutil/template @@ -1,14 +1,16 @@ # Template file for 'ddcutil' pkgname=ddcutil version=1.3.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" -makedepends="i2c-tools-devel libdrm-devel libgudev-devel libkmod-devel libusb-devel libXrandr-devel" +makedepends="i2c-tools-devel libdrm-devel libgudev-devel libkmod-devel + libusb-devel libXrandr-devel" +depends="i2c-tools" short_desc="Query and change monitor settings using DDC/CI and USB" maintainer="lemmi " license="GPL-2.0-or-later" -homepage="http://www.ddcutil.com" +homepage="https://www.ddcutil.com" changelog="https://www.ddcutil.com/release_notes/" distfiles="https://github.com/rockowitz/ddcutil/archive/v${version}.tar.gz" checksum=fa439f031c9372360e8d266f4294937dd3ee0a1c812d41e596b5e75a6d73d6d3 From 6ad79ec3974eb1f5a0c00e3e72de3b7f76558417 Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Fri, 2 Sep 2022 19:03:45 +0300 Subject: [PATCH 1046/1407] libglibutil: update to 1.0.67. --- srcpkgs/libglibutil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template index 849e9560e5b9..61a8191e84a8 100644 --- a/srcpkgs/libglibutil/template +++ b/srcpkgs/libglibutil/template @@ -1,6 +1,6 @@ # Template file for 'libglibutil' pkgname=libglibutil -version=1.0.66 +version=1.0.67 revision=1 build_style=gnu-makefile make_use_env=1 @@ -15,7 +15,7 @@ maintainer="Jami Kettunen " license="BSD-3-Clause" homepage="https://github.com/sailfishos/libglibutil" distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz" -checksum=421879428ef54aabf7e946f3308f408ad09d9438766882cc038d7bc1bc9761ce +checksum=622f7d420e3f95ee7237b65c17495fe8d4cda1ed0cb68e0794f63c57034e1401 post_install() { vlicense LICENSE From 2f1a4bd9e4122e6cd18ec47a76cb3cd42a99f866 Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Fri, 2 Sep 2022 19:04:56 +0300 Subject: [PATCH 1047/1407] gbinder-python: update to 1.1.1. --- srcpkgs/gbinder-python/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template index f83515434e64..6a2bbf71f849 100644 --- a/srcpkgs/gbinder-python/template +++ b/srcpkgs/gbinder-python/template @@ -1,6 +1,6 @@ # Template file for 'gbinder-python' pkgname=gbinder-python -version=1.1.0 +version=1.1.1 revision=1 build_style=python3-module make_build_args="--cython" @@ -12,4 +12,4 @@ maintainer="Jami Kettunen " license="GPL-3.0-or-later" homepage="https://github.com/erfanoabdi/gbinder-python" distfiles="https://github.com/erfanoabdi/gbinder-python/archive/refs/tags/${version}.tar.gz" -checksum=930028fd2269df331591a5db155775c301d6fbc1b8d5c933be22c7a22e62d4fb +checksum=64ef246a7c538105d92350c88fe8634b4d64e04b45dce95b76abc0d2f3376246 From 0ea5b933c023c87aef2b00389881ebfbc0c4762d Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Fri, 2 Sep 2022 19:13:29 +0300 Subject: [PATCH 1048/1407] waydroid: update to 1.3.1. --- srcpkgs/waydroid/files/README.voidlinux | 9 +++++++-- srcpkgs/waydroid/template | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux index 196e969a36b3..f185f4f454d8 100644 --- a/srcpkgs/waydroid/files/README.voidlinux +++ b/srcpkgs/waydroid/files/README.voidlinux @@ -3,14 +3,19 @@ To finish Waydroid installation run: # waydroid init # ln -s /etc/sv/waydroid-container /var/service -Additionally ensure 'psi=1' is present on your /proc/cmdline (unless the kernel -is configured with CONFIG_PSI_DEFAULT_DISABLED=n). +Additionally for Android 11+ system images ensure 'psi=1' is present on your +/proc/cmdline (unless the kernel is configured with CONFIG_PSI_DEFAULT_DISABLED=n). + +Currently for audio support you need a PulseAudio server running (pipewire-pulse +also works). Optionally clipboard syncing between the container and host Wayland compositor can be enabled with: # xbps-install python3-pyclip wl-clipboard +When running under X11 in a nested Wayland compositor you'll also need xclip. + In case of graphical rendering issues etc. make sure to check the Waydroid documentation if they have a solution: https://docs.waydro.id/ diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template index acb8c2583d5a..8afdace4fba2 100644 --- a/srcpkgs/waydroid/template +++ b/srcpkgs/waydroid/template @@ -1,6 +1,6 @@ # Template file for 'waydroid' pkgname=waydroid -version=1.3.0 +version=1.3.1 revision=1 # https://developer.android.com/ndk/guides/abis#sa archs="aarch64* armv7* i686* x86_64*" @@ -12,7 +12,7 @@ maintainer="Jami Kettunen " license="GPL-3.0-or-later" homepage="https://waydro.id" distfiles="https://github.com/waydroid/waydroid/archive/refs/tags/${version}.tar.gz" -checksum=1cd2ef0808820879730ddbbde08aa9bc1b16b0b320ca920a9059c2cbd92f637a +checksum=b1121db558df3f513d17816703cd02843a55b00ba6c18e39a2b00c6969385408 python_version=3 pycompile_dirs="usr/lib/waydroid" From e2a0a5c905cc686daa16cfbf90e6608ec437635e Mon Sep 17 00:00:00 2001 From: skmpz Date: Fri, 2 Sep 2022 08:28:01 +0400 Subject: [PATCH 1049/1407] fmt: update to 9.1.0. --- srcpkgs/fmt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template index 6fa037dfbaab..8b94c6dc51f1 100644 --- a/srcpkgs/fmt/template +++ b/srcpkgs/fmt/template @@ -1,6 +1,6 @@ # Template file for 'fmt' pkgname=fmt -version=9.0.0 +version=9.1.0 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF" @@ -10,7 +10,7 @@ license="BSD-2-Clause" homepage="https://github.com/fmtlib/fmt" changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst" distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz" -checksum=9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5 +checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2 post_install() { vlicense LICENSE.rst LICENSE From 1f8e6e3cd77c9103c6b05f7779b7476cfc5481a9 Mon Sep 17 00:00:00 2001 From: xolophreny Date: Sat, 3 Sep 2022 02:21:59 +0500 Subject: [PATCH 1050/1407] vkBasalt: update to 0.3.2.6 --- srcpkgs/vkBasalt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vkBasalt/template b/srcpkgs/vkBasalt/template index d00eb3d4a376..30dd790babff 100644 --- a/srcpkgs/vkBasalt/template +++ b/srcpkgs/vkBasalt/template @@ -1,6 +1,6 @@ # Template file for 'vkBasalt' pkgname=vkBasalt -version=0.3.2.5 +version=0.3.2.6 revision=1 build_style=meson hostmakedepends="glslang pkg-config" @@ -10,4 +10,4 @@ maintainer="xolophreny " license="Zlib" homepage="https://github.com/DadSchoorse/vkBasalt" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=837cf63737302de7ab9c4a190a1ed3b8a1174630d3753f7a8478b140294b3b39 +checksum=bf71e34d5d3fea677bc5ab95c07fd5eb052369c399d839789331614b90957593 From 2fcb00ed23447a6412f9d7eba0b6511f3112f242 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, 5 Sep 2022 20:59:44 +0700 Subject: [PATCH 1051/1407] build-style/cmake: sysconfigdir is /etc --- common/build-style/cmake.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 211d39063780..a38c3413f62c 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -54,6 +54,7 @@ _EOF cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr" cmake_args+=" -DCMAKE_BUILD_TYPE=None" cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}" + cmake_args+=" -DCMAKE_INSTALL_SYSCONFDIR=/etc" if [ "$CROSS_BUILD" ]; then cmake_args+=" -DQT_HOST_PATH=/usr" From be6fc1c44d89537f931e01075ec879676155f135 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, 5 Sep 2022 21:00:34 +0700 Subject: [PATCH 1052/1407] nm-tray: fix autostart file location Close #39024 --- srcpkgs/nm-tray/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nm-tray/template b/srcpkgs/nm-tray/template index 03b6cd85e1be..077bd77221ed 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.5.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools pkg-config" makedepends="qt5-tools-devel networkmanager-qt5-devel" From de2b744a39fc43e90367fb975bbafe2dbe652d00 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, 5 Sep 2022 21:10:18 +0700 Subject: [PATCH 1053/1407] vimpager: fix config files installation --- srcpkgs/vimpager/template | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/vimpager/template b/srcpkgs/vimpager/template index eb8697af94bb..b742dbbbce52 100644 --- a/srcpkgs/vimpager/template +++ b/srcpkgs/vimpager/template @@ -1,15 +1,18 @@ # Template file for 'vimpager' pkgname=vimpager version=2.06 -revision=3 +revision=4 build_style=gnu-makefile +make_install_args="SYSCONFDIR=/etc" hostmakedepends="sharutils $(vopt_if man pandoc) tar" +depends="bash vim" short_desc="Pager using vim and less.vim" maintainer="ivierlin " license="BSD-3-Clause-Attribution" homepage="https://github.com/rkitover/vimpager" distfiles="${homepage}/archive/${version}.tar.gz" checksum=cc616d0840a6f2501704eea70de222ab662421f34b2da307e11fb62aa70bda5d +conf_files="/etc/vimpagerrc" build_options="man" desc_option_man="Use pandoc for manpages" From 0dec2d0aa669683c9d70a1189d54cccbc83d5487 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, 5 Sep 2022 22:27:16 +0700 Subject: [PATCH 1054/1407] boost: describe patches --- srcpkgs/boost/patches/install-strip-destdir.patch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/srcpkgs/boost/patches/install-strip-destdir.patch b/srcpkgs/boost/patches/install-strip-destdir.patch index 61047c5967b1..d931a5d41177 100644 --- a/srcpkgs/boost/patches/install-strip-destdir.patch +++ b/srcpkgs/boost/patches/install-strip-destdir.patch @@ -1,3 +1,9 @@ +boost doesn't support DESTDIR or something like that, +hence, we need --prefix=$DESTDIR/usr. + +However --prefix=$DESTDIR/usr adds $DESTDIR into +its cmake config. This patch strips $DESTDIR out +of cmake config --- a/tools/boost_install/boost-install.jam +++ b/tools/boost_install/boost-install.jam @@ -678,6 +678,16 @@ local rule path-native-fwd ( path ) From 08258d12dcddd1aa195dd0189db373d287455b5e Mon Sep 17 00:00:00 2001 From: clyhtsuriva Date: Mon, 5 Sep 2022 11:36:33 +0200 Subject: [PATCH 1055/1407] tali: update to 40.8 --- srcpkgs/tali/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template index 659f5257ae2e..463e3d3c5964 100644 --- a/srcpkgs/tali/template +++ b/srcpkgs/tali/template @@ -1,6 +1,6 @@ # Template file for 'tali' pkgname=tali -version=40.6 +version=40.8 revision=1 build_style=meson hostmakedepends="pkg-config gettext glib-devel itstool" @@ -11,4 +11,4 @@ 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=83fba047edecd196d30719a70e2f4d0986bb26cc2bd5f955a0a9200ea63f0612 +checksum=6c178c160fcbb4d11be3d1569d538e0e78140d50bbdb52a7583188f795c017ee From 7833d7937793f4dd55a789f3579091dd3b0e643c Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Mon, 5 Sep 2022 14:29:14 +0200 Subject: [PATCH 1056/1407] lsd: update to 0.23.0 --- srcpkgs/lsd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template index 469f3e254558..1bf1103426ba 100644 --- a/srcpkgs/lsd/template +++ b/srcpkgs/lsd/template @@ -1,6 +1,6 @@ # Template file for 'lsd' pkgname=lsd -version=0.22.0 +version=0.23.0 revision=1 build_style=cargo short_desc="Next gen ls command with lots of pretty colors and awesome icons" @@ -9,7 +9,7 @@ license="Apache-2.0" homepage="https://github.com/Peltoche/lsd" changelog="https://raw.githubusercontent.com/Peltoche/lsd/master/CHANGELOG.md" distfiles="https://github.com/Peltoche/lsd/archive/${version}.tar.gz" -checksum=30ad1b1d014c7b6a2fca44c6de3b17198c84168d34fc946245d67094ebc0f7ed +checksum=0ce6582745b5364fdb4052954d24f6a211af616061d1454583e68f3366f6496e conflicts="disputils" export SHELL_COMPLETIONS_DIR="${wrksrc}" From edb95490ae45b9ef5fdb69ecd773173aa7058f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 4 Sep 2022 14:46:45 +0200 Subject: [PATCH 1057/1407] rusty-diceware: update to 0.3.3. --- .../0001-Fix-values-in-test-cases.patch | 38 +++++++++++++++++++ srcpkgs/rusty-diceware/template | 6 +-- 2 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/rusty-diceware/patches/0001-Fix-values-in-test-cases.patch diff --git a/srcpkgs/rusty-diceware/patches/0001-Fix-values-in-test-cases.patch b/srcpkgs/rusty-diceware/patches/0001-Fix-values-in-test-cases.patch new file mode 100644 index 000000000000..e9ded5de45c3 --- /dev/null +++ b/srcpkgs/rusty-diceware/patches/0001-Fix-values-in-test-cases.patch @@ -0,0 +1,38 @@ +From 9f480fcbc9cb7bfb0d0bde8727dbfba9d878b596 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= + +Date: Sun, 4 Sep 2022 14:38:10 +0200 +Subject: [PATCH] Fix values in test cases + +SeedableRng values are "stable", but minor version bumps (which have +happened since these cases were written) are allowed to change those. A +breaking change here was documentated for 0.7. +--- + tests/tests.rs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/tests.rs b/tests/tests.rs +index d569663..ed4eff4 100644 +--- a/tests/tests.rs ++++ b/tests/tests.rs +@@ -33,7 +33,7 @@ fn make_reinhold_vector() -> Vec { + + #[test] + fn beale_rng_test() { +- let wanted: Vec = vec!["dr", "raced", "pvc", "moon"] ++ let wanted: Vec = vec!["io", "gavel", "beam", "time"] + .into_iter() + .map(BealeWord::new) + .collect(); +@@ -45,7 +45,7 @@ fn beale_rng_test() { + + #[test] + fn reinhold_rng_test() { +- let wanted: Vec = vec!["douse", "qo", "prune", "moan"] ++ let wanted: Vec = vec!["india", "gamma", "bcd", "theme"] + .into_iter() + .map(ReinholdWord::new) + .collect(); +-- +2.37.3 + diff --git a/srcpkgs/rusty-diceware/template b/srcpkgs/rusty-diceware/template index bf5254ecefbd..f179e7db3eab 100644 --- a/srcpkgs/rusty-diceware/template +++ b/srcpkgs/rusty-diceware/template @@ -1,15 +1,15 @@ # Template file for 'rusty-diceware' pkgname=rusty-diceware -version=0.3.0 +version=0.3.3 revision=1 wrksrc="${pkgname}-v${version}" build_style=cargo short_desc="Commandline diceware, sans dice, written in rustlang" maintainer="jcgruenhage " -license="AGPL-3.0" +license="AGPL-3.0-only" homepage="https://gitlab.com/yuvallanger/rusty-diceware" distfiles="https://gitlab.com/yuvallanger/rusty-diceware/-/archive/v${version}/rusty-diceware-v${version}.tar.gz" -checksum=79c02206ad825604507be96623d6de9185c837900bce9b1d392095e789c06f61 +checksum=906a082a2b85fe8d1f5db88705704f44a7b5cafcd419a2eccb29e9ccbdff9e0e post_install() { vlicense LICENSE From a3ee4cc7f1cccf4756d4e58472d1f9c8ffbe5405 Mon Sep 17 00:00:00 2001 From: icp Date: Sun, 4 Sep 2022 12:30:48 +0530 Subject: [PATCH 1058/1407] python3-numexpr: update to 2.8.3. --- srcpkgs/python3-numexpr/template | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template index 64be5908b161..79edf913658f 100644 --- a/srcpkgs/python3-numexpr/template +++ b/srcpkgs/python3-numexpr/template @@ -1,19 +1,24 @@ # Template file for 'python3-numexpr' pkgname=python3-numexpr -version=2.7.2 -revision=3 +version=2.8.3 +revision=1 wrksrc="numexpr-${version}" build_style=python3-module build_helper=numpy -hostmakedepends="python3-setuptools" +hostmakedepends="python3-wheel" makedepends="python3-devel python3-numpy" -depends="python3-numpy" +depends="python3-numpy python3-packaging" +checkdepends="${depends} python3-pytest-xdist" short_desc="Fast numerical expression evaluator for NumPy (Python3)" maintainer="Orphaned " license="MIT" homepage="https://github.com/pydata/numexpr" distfiles="https://github.com/pydata/numexpr/archive/v${version}.tar.gz" -checksum=7d1b3790103221feda07f4a93a4fa5c6654f46865197a677ca6f27eb5cb4e5ef +checksum=389ceefca74eff30ec3fd03fc4c3b7ab3df8f22d1f235117a392ce702ed208c0 + +pre_check() { + python3 setup.py build_ext --inplace +} post_install() { vlicense LICENSE.txt From 47a56f91e2af2e923fed246f1519b23a2ebdb946 Mon Sep 17 00:00:00 2001 From: icp Date: Sun, 4 Sep 2022 14:31:19 +0530 Subject: [PATCH 1059/1407] python3-tables: update to 3.7.0. --- srcpkgs/python3-tables/template | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-tables/template b/srcpkgs/python3-tables/template index 766b76fd5018..b7e9426dd8e9 100644 --- a/srcpkgs/python3-tables/template +++ b/srcpkgs/python3-tables/template @@ -1,26 +1,33 @@ # Template file for 'python3-tables' pkgname=python3-tables -version=3.6.1 -revision=3 +version=3.7.0 +revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-module +build_helper=numpy # XXX: c-blosc (using internal for now) -hostmakedepends="python3-setuptools python3-numpy python3-Cython" +hostmakedepends="python3-wheel python3-Cython python3-packaging" makedepends="python3-devel hdf5-devel lzo-devel bzip2-devel" -depends="python3-numpy python3-numexpr" +depends="python3-numpy python3-numexpr python3-packaging" +checkdepends=$depends short_desc="Hierarchical datasets for Python3" maintainer="pulux " license="BSD-3-Clause" homepage="http://www.pytables.org/" changelog="http://www.pytables.org/release_notes.html" distfiles="${PYPI_SITE}/t/tables/tables-${version}.tar.gz" -checksum=49a972b8a7c27a8a173aeb05f67acb45fe608b64cd8e9fa667c0962a60b71b49 +checksum=e92a887ad6f2a983e564a69902de4a7645c30069fc01abd353ec5da255c5e1fe post_extract() { # Make sure Cython is run during build rm tables/*.c } +do_check() { + python3 setup.py build_ext --inplace + PYTHONPATH="$(cd build/lib* && pwd)" python3 -m tables.tests.test_all +} + post_install() { vlicense LICENSE.txt LICENSE } From 08a1ae5f3e34db3ecf49851c757271f4bf813289 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Sat, 3 Sep 2022 20:43:22 +1100 Subject: [PATCH 1060/1407] CastXML: update to 0.4.6. --- srcpkgs/CastXML/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template index 364a363852d6..5d7d9503658c 100644 --- a/srcpkgs/CastXML/template +++ b/srcpkgs/CastXML/template @@ -1,6 +1,6 @@ # Template file for 'CastXML' pkgname=CastXML -version=0.4.5 +version=0.4.6 revision=1 build_style=cmake configure_args="-DSPHINX_MAN=YES -DCastXML_INSTALL_MAN_DIR=share/man" @@ -13,7 +13,7 @@ maintainer="Evgeny Ermakov " license="Apache-2.0" homepage="https://github.com/CastXML/CastXML" distfiles="https://github.com/CastXML/CastXML/archive/v${version}.tar.gz" -checksum=007f6d073165e150df0e40e1ec331f6f94304684af9eed3b0e5dabaebcfb1197 +checksum=8dcdbc1f23a130e4bdb0b09f57c30761a02a346b4db4037555048af2a293d66a post_install() { rm -r ${DESTDIR}/usr/share/castxml/clang/include From 5a0173f69637bca5b569a2a2e2ea474caf82bb49 Mon Sep 17 00:00:00 2001 From: Karel Balej Date: Sat, 3 Sep 2022 10:48:11 +0200 Subject: [PATCH 1061/1407] pmbootstrap: update to 1.46.0. --- srcpkgs/pmbootstrap/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template index 474961425930..b325ea472c7e 100644 --- a/srcpkgs/pmbootstrap/template +++ b/srcpkgs/pmbootstrap/template @@ -1,14 +1,14 @@ # Template file for 'pmbootstrap' pkgname=pmbootstrap -version=1.43.0 +version=1.46.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-setuptools openssl git" +depends="git openssl python3" short_desc="PostmarketOS's chroot, build and flash tool" 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=65f720fe8c8436cc13780e74978e2dfa66c4ca72e9e8567004015ff6f8a536a3 +checksum=b50667a760bc072ac96b19cd36cfebf2c5b6d07928d6c79a0b822fb3e3c3e90a make_check=no # tests require chroot From 1bb975e19c501c171534718c1eb2e042649308ba Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sat, 3 Sep 2022 10:40:41 -0700 Subject: [PATCH 1062/1407] srb2: fix build with latest xbps-src This fixes a build failure introduced by: https://github.com/void-linux/void-packages/commit/e14cf6cc7a85fcde7fb3fdb2cdba117bede8bb19 --- srcpkgs/srb2/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/srb2/template b/srcpkgs/srb2/template index f966b5e88a6c..1fb45fd1875e 100644 --- a/srcpkgs/srb2/template +++ b/srcpkgs/srb2/template @@ -6,10 +6,11 @@ create_wrksrc=true build_wrksrc="SRB2-SRB2_release_${version}" build_style=gnu-makefile make_use_env=yes -make_build_args=" -C src ECHO=1 LINUX=1 USE_OPENMP=1 EXENAME=${pkgname} - DBGNAME=${pkgname}-debug NOOBJDUMP=1 NOUPX=1" +make_build_args="ECHO=1 LINUX=1 USE_OPENMP=1 EXENAME=${pkgname} + DBGNAME=${pkgname}-debug NOOBJDUMP=1 NOUPX=1 PREFIX=" hostmakedepends="pkg-config gettext" -makedepends="SDL2-devel SDL2_mixer-devel libpng-devel libupnp-devel libcurl-devel libgme-devel libopenmpt-devel" +makedepends="SDL2-devel SDL2_mixer-devel libpng-devel libupnp-devel + libcurl-devel libgme-devel libopenmpt-devel" short_desc="3D Sonic fan game based off of Doom Legacy" maintainer="oreo639 " license="GPL-2.0-or-later" From b79a2ae14b06711a4f19ebb6df10c06db9a8d2c6 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, 5 Sep 2022 23:13:09 +0700 Subject: [PATCH 1063/1407] bftpd: remove usr/etc, mark conf_files --- srcpkgs/bftpd/patches/paths.patch | 43 +++++++++++++++++++++++++++++++ srcpkgs/bftpd/template | 12 +++------ 2 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/bftpd/patches/paths.patch diff --git a/srcpkgs/bftpd/patches/paths.patch b/srcpkgs/bftpd/patches/paths.patch new file mode 100644 index 000000000000..2de63d36d2a9 --- /dev/null +++ b/srcpkgs/bftpd/patches/paths.patch @@ -0,0 +1,43 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -15,7 +15,7 @@ OBJS=bftpdutmp.o commands.o commands_adm + SRCS=bftpdutmp.c commands.c commands_admin.c cwd.c dirlist.c list.c login.c logging.c main.c mystring.c options.c md5.c + + OBJS2LINK=$(OBJS) $(PAX) +-LDFLAGS= ++LDFLAGS=@LDFLAGS@ + + all: bftpd + +@@ -37,18 +37,12 @@ endif + %.o: %.d + + install: all +- mkdir -p $(DESTDIR)/$(prefix)/sbin +- $(INSTALL) -g 0 -m 700 -o 0 bftpd $(DESTDIR)/$(prefix)/sbin ++ mkdir -p $(DESTDIR)/$(prefix)/bin ++ $(INSTALL) -g 0 -m 700 -o 0 bftpd $(DESTDIR)/$(prefix)/bin + mkdir -p $(DESTDIR)/$(mandir)/man8 + $(INSTALL) -g 0 -m 644 -o 0 bftpd.8 $(DESTDIR)/$(mandir)/man8 +- mkdir -p $(DESTDIR)/$(prefix)/etc +- [ -f $(DESTDIR)/$(prefix)/etc/bftpd.conf ] || \ +- $(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/$(prefix)/etc +- mkdir -p $(DESTDIR)/$(prefix)/var/log +- touch $(DESTDIR)/$(prefix)/var/log/bftpd.log +- chmod 644 $(DESTDIR)/$(prefix)/var/log/bftpd.log +- mkdir -p $(DESTDIR)/$(prefix)/var/run/bftpd +- chmod 755 $(DESTDIR)/$(prefix)/var/run/bftpd ++ mkdir -p $(DESTDIR)/etc ++ $(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/etc + + clean distclean: + rm -f *~ $(OBJS) bftpd mksources.finished config.cache +--- a/mypaths.h ++++ b/mypaths.h +@@ -1,5 +1,5 @@ + #define PATH_BFTPD_CONF "/etc/bftpd.conf" +-#ifdef PREFIX ++#if 0 + #define PATH_BFTPD_CONF_WITH_PREFIX PREFIX"/etc/bftpd.conf" + #endif + #define PATH_STATUSLOG "/dev/null" diff --git a/srcpkgs/bftpd/template b/srcpkgs/bftpd/template index 7c456ad4fc60..90aef98844ab 100644 --- a/srcpkgs/bftpd/template +++ b/srcpkgs/bftpd/template @@ -2,7 +2,7 @@ pkgname=bftpd version=6.1 revision=1 -wrksrc="$pkgname" +wrksrc="bftpd" build_style=gnu-configure configure_args="--enable-libz" makedepends="zlib-devel" @@ -14,14 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/bftpd/bftpd-${version}.tar.gz" checksum=9721d0614e1a5d0fe6b80c9a8a04ada8efd42cbdfddd239e95a8059ae283aa6f CFLAGS="-fcommon" - -post_configure() { - vsed -i -e "s|LDFLAGS=$|LDFLAGS=${LDFLAGS}|" \ - -e "s|sbin|bin|g" \ - Makefile -} +make_build_args=V=1 +make_dirs="/var/run/bftpd 0755 root root" +conf_files="/etc/bftpd.conf" post_install() { vsv bftpd - vconf bftpd.conf } From 40d07838a5c5abf1389e8c79cf74be9350a27fe7 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, 5 Sep 2022 23:48:55 +0700 Subject: [PATCH 1064/1407] gromit-mpx: fix config files installation --- srcpkgs/gromit-mpx/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gromit-mpx/template b/srcpkgs/gromit-mpx/template index fd8b3a43f2c6..3330ccfeba2b 100644 --- a/srcpkgs/gromit-mpx/template +++ b/srcpkgs/gromit-mpx/template @@ -1,7 +1,7 @@ # Template file for 'gromit-mpx' pkgname=gromit-mpx version=1.4.2 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="gtk+3-devel libappindicator-devel libdbusmenu-glib-devel" @@ -11,3 +11,4 @@ license="GPL-2.0-only" homepage="https://github.com/bk138/gromit-mpx" distfiles="https://github.com/bk138/${pkgname}/archive/${version}.tar.gz" checksum=84bd7c5ea735a1c2f31fb664c8bb1ddd76edbb78a0f1aad57433969ab937595f +conf_files="/etc/gromit-mpx/gromit-mpx.cfg" From 99750f32edac270b205c87c04f19202cddb98dc4 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, 5 Sep 2022 23:58:18 +0700 Subject: [PATCH 1065/1407] lltag: fix config files location --- srcpkgs/lltag/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/lltag/template b/srcpkgs/lltag/template index c540ae3ddef8..2ec7b7d3819f 100644 --- a/srcpkgs/lltag/template +++ b/srcpkgs/lltag/template @@ -1,9 +1,11 @@ # Template file for 'lltag' pkgname=lltag version=0.14.6 -revision=3 +revision=4 wrksrc="lltag-lltag-${version}" build_style=gnu-makefile +make_build_args="SYSCONFDIR=/etc" +make_install_args="$make_build_args" hostmakedepends="perl" makedepends="${hostmakedepends}" depends="perl mp3info vorbis-tools flac perl-MP3-Tag" From 8ee06ebacc82c4c81ab48ac85e186c317eb02b2d 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, 6 Sep 2022 00:01:37 +0700 Subject: [PATCH 1066/1407] papis: fix bash completions' location --- srcpkgs/papis/patches/bash-completion.patch | 11 +++++++++++ srcpkgs/papis/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/papis/patches/bash-completion.patch diff --git a/srcpkgs/papis/patches/bash-completion.patch b/srcpkgs/papis/patches/bash-completion.patch new file mode 100644 index 000000000000..943198b11e6c --- /dev/null +++ b/srcpkgs/papis/patches/bash-completion.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -25,7 +25,7 @@ else: + "LICENSE.txt", + ]), + +- ("etc/bash_completion.d/", [ ++ ("share/bash-completion/completions/", [ + "scripts/shell_completion/click/papis.sh", + ]), + diff --git a/srcpkgs/papis/template b/srcpkgs/papis/template index f693def810ea..9f52b2f3f713 100644 --- a/srcpkgs/papis/template +++ b/srcpkgs/papis/template @@ -1,7 +1,7 @@ # Template file for 'papis' pkgname=papis version=0.12 -revision=1 +revision=2 build_style=python3-module make_check_args="--deselect=tests/downloaders/test_project_euclid.py::test_1" make_check_target="papis tests" From 7c09577f5c067d08de03aa9f4073f5d863e4caa8 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, 6 Sep 2022 00:08:17 +0700 Subject: [PATCH 1067/1407] rofs-filtered: fix configuration loading --- .../rofs-filtered/patches/sysconf_dir-is-string.patch | 11 +++++++++++ srcpkgs/rofs-filtered/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/rofs-filtered/patches/sysconf_dir-is-string.patch diff --git a/srcpkgs/rofs-filtered/patches/sysconf_dir-is-string.patch b/srcpkgs/rofs-filtered/patches/sysconf_dir-is-string.patch new file mode 100644 index 000000000000..3e966f31c74f --- /dev/null +++ b/srcpkgs/rofs-filtered/patches/sysconf_dir-is-string.patch @@ -0,0 +1,11 @@ +--- a/rofs-filtered.c ++++ b/rofs-filtered.c +@@ -136,7 +136,7 @@ enum { + + + #ifdef SYSCONF_DIR +-char *default_config_file = STR(SYSCONF_DIR) "/rofs-filtered.rc"; ++char *default_config_file = SYSCONF_DIR "/rofs-filtered.rc"; + #else + char *default_config_file = "/etc/rofs-filtered.rc"; + #endif diff --git a/srcpkgs/rofs-filtered/template b/srcpkgs/rofs-filtered/template index 2bb8a2304312..5bdce99d7a1c 100644 --- a/srcpkgs/rofs-filtered/template +++ b/srcpkgs/rofs-filtered/template @@ -1,7 +1,7 @@ # Template file for 'rofs-filtered' pkgname=rofs-filtered version=1.7 -revision=2 +revision=3 wrksrc="${pkgname}-rel-${version}" build_style=cmake makedepends="fuse-devel" From 9a617537a38a3f407adb2e9af0b9ac8219071dc3 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, 6 Sep 2022 00:16:00 +0700 Subject: [PATCH 1068/1407] spectrwm: fix config files location spectrwm will search in this order: - XDG_CONFIG_HOME - $HOME/.spectrwm.conf - XDG_CONFIG_DIRS - /etc/spectrwm.conf - $HOME/.scrotwm.conf - /etc/scrotwm.conf Nowhere it searchs in /usr/etc --- srcpkgs/spectrwm/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/spectrwm/template b/srcpkgs/spectrwm/template index 70701e7f1f2e..2af4c063d090 100644 --- a/srcpkgs/spectrwm/template +++ b/srcpkgs/spectrwm/template @@ -1,11 +1,11 @@ # Template file for 'spectrwm' pkgname=spectrwm version=3.4.1 -revision=2 +revision=3 _distname=SPECTRWM_${version//./_} wrksrc="spectrwm-${_distname}" build_style=gnu-makefile -make_build_args='-C linux' +make_build_args='-C linux SYSCONFDIR=/etc' make_install_args="$make_build_args" hostmakedepends="pkg-config" makedepends="libXcursor-devel libXft-devel libXrandr-devel libXt-devel @@ -16,6 +16,7 @@ license="ISC" homepage="http://spectrwm.org" distfiles="https://github.com/conformal/spectrwm/archive/${_distname}.tar.gz" checksum=c030ef30bd11bbdfce3d4a1daf51f0c1358821ba95ebdc4cdb32d3944c8ce03c +conf_files="/etc/spectrwm.conf" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" From 8a61369e54b604226582e4197a9fe5eda558698b Mon Sep 17 00:00:00 2001 From: skmpz Date: Mon, 5 Sep 2022 10:49:55 +0400 Subject: [PATCH 1069/1407] python3-psutil: update to 5.9.2. --- srcpkgs/python3-psutil/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-psutil/template b/srcpkgs/python3-psutil/template index 1139f84b7aa7..8775a5bc0f77 100644 --- a/srcpkgs/python3-psutil/template +++ b/srcpkgs/python3-psutil/template @@ -1,6 +1,6 @@ # Template file for 'python3-psutil' pkgname=python3-psutil -version=5.9.1 +version=5.9.2 revision=1 wrksrc="psutil-${version}" build_style=python3-module @@ -13,10 +13,11 @@ license="BSD-3-Clause" homepage="https://github.com/giampaolo/psutil" changelog="https://raw.githubusercontent.com/giampaolo/psutil/master/HISTORY.rst" distfiles="${PYPI_SITE}/p/psutil/psutil-${version}.tar.gz" -checksum=57f1819b5d9e95cdfb0c881a8a5b7d542ed0b7c522d575706a80bedc848c8954 +checksum=feb861a10b6c3bb00701063b37e4afc754f8217f0f09c42280586bd6ac712b5c # Tests seem to assume package is installed make_check=no post_install() { + rm -r ${DESTDIR}/${py3_sitelib}/psutil/tests/ vlicense LICENSE } From f7ffbe170b0c969b3a10495c83c476c26a704d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Mon, 5 Sep 2022 22:47:10 +0200 Subject: [PATCH 1070/1407] blueprint-compiler: update to 0.4.0. --- srcpkgs/blueprint-compiler/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/blueprint-compiler/template b/srcpkgs/blueprint-compiler/template index 0fdc3107925a..a74d7acdffb8 100644 --- a/srcpkgs/blueprint-compiler/template +++ b/srcpkgs/blueprint-compiler/template @@ -1,6 +1,6 @@ # Template file for 'blueprint-compiler' pkgname=blueprint-compiler -version=0.2.0 +version=0.4.0 revision=1 wrksrc="${pkgname}-v${version}" build_style=meson @@ -10,5 +10,6 @@ short_desc="Blueprint is a markup language and compiler for GTK 4 user interface maintainer="Jan Christian Grünhage " license="LGPL-3.0-or-later" homepage="https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/" +changelog="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/raw/main/NEWS.md" distfiles="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/v${version}/blueprint-compiler-v${version}.tar.gz" -checksum=d4e5444c95e8d0060c819d0ab96f79a7ea2673296be95a2fb00359d1d54a0d83 +checksum=c1a5efd8562aca7df259679c6d9cd067ea2a78372069fcc01985619ec3963d8f From a7ae2463926b9e9d3741f519f2c19283ec75cf95 Mon Sep 17 00:00:00 2001 From: ologantr Date: Mon, 5 Sep 2022 17:21:38 +0200 Subject: [PATCH 1071/1407] sqlite: update to 3.39.3. --- srcpkgs/sqlite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index 47539c7b37b5..33a12851a34d 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,6 +1,6 @@ # Template file for 'sqlite' pkgname=sqlite -version=3.39.2 +version=3.39.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/changes.html" distfiles="${homepage}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz" -checksum=852be8a6183a17ba47cee0bbff7400b7aa5affd283bf3beefc34fcd088a239de +checksum=7868fb3082be3f2cf4491c6fba6de2bddcbc293a35fefb0624ee3c13f01422b9 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \ From 3b3a051ea9bbd3bd59af5f3a01473e3960a5e0d5 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Sat, 3 Sep 2022 11:24:35 +0200 Subject: [PATCH 1072/1407] vscode: update to 1.71.0 --- srcpkgs/vscode/patches/product.patch | 4 ++-- srcpkgs/vscode/template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index 8ed252e575e7..6e085d6f0b5f 100644 --- a/srcpkgs/vscode/patches/product.patch +++ b/srcpkgs/vscode/patches/product.patch @@ -1,5 +1,5 @@ diff --git a/product.json b/product.json -index a50c00f6cf3..8dd13191377 100644 +index 736f4355886..339ac2005a4 100644 --- a/product.json +++ b/product.json @@ -27,7 +27,15 @@ @@ -9,7 +9,7 @@ index a50c00f6cf3..8dd13191377 100644 + "quality": "stable", + "documentationUrl": "https://github.com/microsoft/vscode-docs", + "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues", - "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/3c8520fab514b9f56070214496b26ff68d1b1cb5/out/vs/workbench/contrib/webview/browser/pre/", + "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/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/template b/srcpkgs/vscode/template index a46df432b797..9dab06393046 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.70.2 +version=1.71.0 revision=1 _electronver=19.0.8 _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=7654fc391688e8f0d5b050529bc17bd72d837d4ad17f1f99551d0a20b179e3d0 +checksum=fb106039f73ddefdf81b393d29af6f35e262628c39007307b6748dc2ee786ea6 nocross=yes # x64 build does not cut it, it contains native code if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then From 954458d0415f081782feb8335e1b9d75f6388dc3 Mon Sep 17 00:00:00 2001 From: amak Date: Sun, 4 Sep 2022 19:28:29 +1000 Subject: [PATCH 1073/1407] snapcast: update to 0.26.0 --- .../patches/meta_mpd.py-permission-fix.patch | 19 +++++++++++++++++++ srcpkgs/snapcast/template | 5 +++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch diff --git a/srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch b/srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch new file mode 100644 index 000000000000..ebff8013f574 --- /dev/null +++ b/srcpkgs/snapcast/patches/meta_mpd.py-permission-fix.patch @@ -0,0 +1,19 @@ +This patch fixes an issue where meta_mpd.py is installed with executable +permissions only. This results in a 'Permission denied' message for +03-rewrite-python-shebang, and a fatal error for xbps-create when processing +the file hash. Fixed upstream in 7ab3daa. + +https://github.com/badaix/snapcast/issues/1021 + +diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt +index e1271b80..25432cd5 100644 +--- a/server/CMakeLists.txt ++++ b/server/CMakeLists.txt +@@ -117,6 +117,6 @@ else() + install(FILES etc/snapserver.conf COMPONENT server DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}) + install(FILES etc/index.html COMPONENT server DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver) + install(DIRECTORY etc/snapweb/ DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/snapweb) +- install(FILES etc/plug-ins/meta_mpd.py PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/plug-ins/) ++ install(FILES etc/plug-ins/meta_mpd.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/plug-ins/) + #install(FILES ../debian/snapserver.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}) + endif() diff --git a/srcpkgs/snapcast/template b/srcpkgs/snapcast/template index 918f02061082..e330653723ed 100644 --- a/srcpkgs/snapcast/template +++ b/srcpkgs/snapcast/template @@ -1,6 +1,6 @@ # Template file for 'snapcast' pkgname=snapcast -version=0.25.0 +version=0.26.0 revision=1 build_style=cmake configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc -DBUILD_WITH_TREMOR=OFF @@ -14,8 +14,9 @@ short_desc="Synchronous multi-room audio player" maintainer="amak " license="GPL-3.0-or-later" homepage="https://github.com/badaix/snapcast" +changelog="https://raw.githubusercontent.com/badaix/snapcast/master/changelog.md" distfiles="https://github.com/badaix/snapcast/archive/v${version}.tar.gz" -checksum=c4e449cb693e091261727421f4965492be049632537e034fa9c59c92d091a846 +checksum=166353267a5c461a3a0e7cbd05d78c4bfdaebeda078801df3b76820b54f27683 build_options="avahi pulseaudio" build_options_default="avahi pulseaudio" From 15c753791ab37cb47c96b732bd7ad3c0ebb28d5b 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, 6 Sep 2022 00:29:06 +0700 Subject: [PATCH 1074/1407] wpgtk: remove usr/etc wpgtk only reads from $HOME $XDG_CONFIG_HOME, then fallbacks to modules directory --- srcpkgs/wpgtk/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/wpgtk/template b/srcpkgs/wpgtk/template index 733d3635b566..f25d1ed58a3f 100644 --- a/srcpkgs/wpgtk/template +++ b/srcpkgs/wpgtk/template @@ -1,7 +1,7 @@ # Template file for 'wpgtk' pkgname=wpgtk version=6.1.3 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-gobject python3-Pillow pywal libxslt" @@ -11,3 +11,7 @@ license="GPL-2.0-only" homepage="https://github.com/deviantfero/wpgtk/" distfiles="https://github.com/deviantfero/wpgtk/archive/${version}.tar.gz" checksum=158f93c6dbb6f14c17fb43847a750e049a7a92a0c76fa54b9c0c5fee1012fcfe + +post_install() { + rm -rf ${DESTDIR}/usr/etc +} From 1e3b3b599ca4faf9bc5f7d229b89dbcc45e9060c 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, 6 Sep 2022 08:23:38 +0700 Subject: [PATCH 1075/1407] thc-hydra: move data to usr/share --- srcpkgs/thc-hydra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template index 4186ce948105..40ade86edbcc 100644 --- a/srcpkgs/thc-hydra/template +++ b/srcpkgs/thc-hydra/template @@ -1,9 +1,9 @@ # Template file for 'thc-hydra' pkgname=thc-hydra version=9.1 -revision=3 +revision=4 build_style=gnu-configure -make_install_args="MANDIR=/share/man/man1" +make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra" makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel postgresql-libs-devel libmariadbclient-devel libssh-devel" short_desc="Tool to guess/crack valid login/password pairs" From 6583d0130f19a3c9d10e19cbea98a16078a962ea 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, 6 Sep 2022 09:16:25 +0700 Subject: [PATCH 1076/1407] wmii: move fallback config to usr/share --- srcpkgs/wmii/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wmii/template b/srcpkgs/wmii/template index fd2c01e4c166..90e593a1792c 100644 --- a/srcpkgs/wmii/template +++ b/srcpkgs/wmii/template @@ -1,7 +1,7 @@ # Template file for 'wmii' pkgname=wmii version=3.9.2 -revision=7 +revision=8 wrksrc=${pkgname}+ixp-${version} hostmakedepends="pkg-config" makedepends="libXrandr-devel libXft-devel libXinerama-devel" @@ -14,13 +14,14 @@ checksum=0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b python_version=2 CFLAGS="-fcommon" +LDFLAGS=" -lX11 -lXrender" do_build() { - LDFLAGS+=" -lX11 -lXrender" - make CC="$CC -c" AR="$AR crs" LD=$CC RANLIB=$RANLIB PREFIX=/usr + make CC="$CC -c" AR="$AR crs" LD=$CC RANLIB=$RANLIB \ + V=1 PREFIX=/usr ETC=/usr/share } do_install() { - make PREFIX=/usr DESTDIR=${DESTDIR} install + make PREFIX=/usr DESTDIR=${DESTDIR} ETC=/usr/share install vlicense LICENSE } From 2ecd11a03f97a8cbcb30fa9556d79a54dfd66fc0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 1 Sep 2022 19:26:11 -0400 Subject: [PATCH 1077/1407] New package: python3-betamax-0.8.1 --- srcpkgs/python3-betamax/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/python3-betamax/template diff --git a/srcpkgs/python3-betamax/template b/srcpkgs/python3-betamax/template new file mode 100644 index 000000000000..442cd6107794 --- /dev/null +++ b/srcpkgs/python3-betamax/template @@ -0,0 +1,18 @@ +# Template file for 'python3-betamax' +pkgname=python3-betamax +version=0.8.1 +revision=1 +wrksrc="${pkgname#python3-}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-requests" +checkdepends="$depends python3-pytest" +short_desc="VCR imitation designed only for python-requests (Python3)" +maintainer="Orphaned " +license="Apache-2.0" +homepage="https://betamax.readthedocs.org" +changelog="https://raw.githubusercontent.com/betamaxpy/betamax/master/HISTORY.rst" +distfiles="${PYPI_SITE}/b/betamax/betamax-${version}.tar.gz" +checksum=5bf004ceffccae881213fb722f34517166b84a34919b92ffc14d1dbd050b71c2 +# does some stuff with long-deprecated pytest things +make_check=no From 28ba1d66478d1affaa50dfd0f31e01ab007be18f Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 1 Sep 2022 19:28:47 -0400 Subject: [PATCH 1078/1407] New package: python3-betamax-matchers-0.4.0 --- srcpkgs/python3-betamax-matchers/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/python3-betamax-matchers/template diff --git a/srcpkgs/python3-betamax-matchers/template b/srcpkgs/python3-betamax-matchers/template new file mode 100644 index 000000000000..de0c09642d7a --- /dev/null +++ b/srcpkgs/python3-betamax-matchers/template @@ -0,0 +1,16 @@ +# Template file for 'python3-betamax-matchers' +pkgname=python3-betamax-matchers +version=0.4.0 +revision=1 +wrksrc="${pkgname#python3-}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-betamax python3-requests-toolbelt" +checkdepends="$depends" +short_desc="Group of experimental matchers for Betamax (Python3)" +maintainer="Orphaned " +license="Apache-2.0" +homepage="https://github.com/betamaxpy/betamax_matchers" +changelog="https://raw.githubusercontent.com/betamaxpy/betamax_matchers/master/HISTORY.rst" +distfiles="${PYPI_SITE}/b/betamax-matchers/betamax-matchers-${version}.tar.gz" +checksum=83609d39ac25a7eed8ad3bec426cd15e647c89b4f0f1583ec44a4481bde4171f From 3a4f59a46ab5fca2ef27aaaed357805c5117f967 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 1 Sep 2022 19:28:58 -0400 Subject: [PATCH 1079/1407] python3-github3: update to 3.2.0. --- srcpkgs/python3-github3/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-github3/template b/srcpkgs/python3-github3/template index 5ff03dbac0bb..1ea9a42668c1 100644 --- a/srcpkgs/python3-github3/template +++ b/srcpkgs/python3-github3/template @@ -1,18 +1,20 @@ # Template file for 'python3-github3' pkgname=python3-github3 -version=1.3.0 -revision=5 +version=3.2.0 +revision=1 wrksrc="github3.py-${version}" build_style=python3-module +make_check_args="-k not(test_delete_key)" hostmakedepends="python3-setuptools" -depends="python3-requests python3-uritemplate" +depends="python3-requests python3-uritemplate python3-dateutil python3-PyJWT" +checkdepends="$depends python3-pytest-xdist python3-betamax-matchers" short_desc="Wrapper for GitHub's API (Python3)" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github3py.readthedocs.org" changelog="https://raw.githubusercontent.com/sigmavirus24/github3.py/master/docs/source/release-notes/${version}.rst" distfiles="${PYPI_SITE}/g/github3.py/github3.py-${version}.tar.gz" -checksum=15a115c18f7bfcf934dfef7ab103844eb9f620c586bad65967708926da47cbda +checksum=09b72be1497d346b0968cde8360a0d6af79dc206d0149a63cd3ec86c65c377cc post_install() { vlicense LICENSE From f7756de7c24d63c3cc6ebdaa6d13428bbc40c05a Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 30 Aug 2022 09:20:15 -0400 Subject: [PATCH 1080/1407] phpMyAdmin: update to 5.2.0, fix update check. --- srcpkgs/phpMyAdmin/template | 8 ++++---- srcpkgs/phpMyAdmin/update | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/phpMyAdmin/update diff --git a/srcpkgs/phpMyAdmin/template b/srcpkgs/phpMyAdmin/template index a55d2b5dfe2e..664332adac37 100644 --- a/srcpkgs/phpMyAdmin/template +++ b/srcpkgs/phpMyAdmin/template @@ -1,16 +1,16 @@ # Template file for 'phpMyAdmin' pkgname=phpMyAdmin -version=5.0.4 +version=5.2.0 revision=1 wrksrc="phpMyAdmin-${version}-all-languages" conf_files="/etc/webapps/phpMyAdmin/config.inc.php" -depends="php mysql" +depends="php mariadb" short_desc="Web interface for MySQL and MariaDB" -maintainer="Franc[e]sco " +maintainer="Joel Beckmeyer " license="GPL-2.0-only" homepage="https://www.phpmyadmin.net" distfiles="https://files.phpmyadmin.net/phpMyAdmin/${version}/phpMyAdmin-${version}-all-languages.tar.xz" -checksum=1578c1a08e594da4f4f62e676ccbdbd17784c3de769b094ba42c35bf05c057db +checksum=66da31ca295f06182ac3f2e6e96057dc824c459baedf4b29de6ed0d3be039230 do_install() { vmkdir usr/share/webapps/ diff --git a/srcpkgs/phpMyAdmin/update b/srcpkgs/phpMyAdmin/update new file mode 100644 index 000000000000..444963f5a661 --- /dev/null +++ b/srcpkgs/phpMyAdmin/update @@ -0,0 +1,2 @@ +site="https://www.phpmyadmin.net/home_page/version.txt" +pattern="^\K[\d.]+$" From a5d1dc44cf46e74ba9397807654da71d37d1bd28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Tue, 30 Aug 2022 17:04:51 +0200 Subject: [PATCH 1081/1407] gifski: update to 1.7.2. --- srcpkgs/gifski/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template index b6131123bb44..ae706e1b5ab6 100644 --- a/srcpkgs/gifski/template +++ b/srcpkgs/gifski/template @@ -1,6 +1,6 @@ # Template file for 'gifski' pkgname=gifski -version=1.7.1 +version=1.7.2 revision=1 build_style=cargo configure_args="--features=openmp" @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="AGPL-3.0-only" homepage="https://gif.ski" distfiles="https://github.com/ImageOptim/gifski/archive/${version}.tar.gz" -checksum=3390abe3acc81984bf46eefa52710fa2b517401363291d9ba16f52d290ad2839 +checksum=a686cba9b9874d06ff138249119b796960d30fa06d036ce51df93d8dde6b829f post_install() { vlicense LICENSE From ee896ed833c9508841746fbabeb76acb3db685c5 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 29 Aug 2022 15:29:57 -0400 Subject: [PATCH 1082/1407] ampache: update to 5.5.1. add note about upgrading from 4.x.x to 5.x.x devendor nginx config, upstream has instructions for a bunch of different webservers in their wiki --- srcpkgs/ampache/INSTALL.msg | 5 ++ srcpkgs/ampache/files/nginx-example.conf | 80 ------------------------ srcpkgs/ampache/template | 11 ++-- 3 files changed, 10 insertions(+), 86 deletions(-) create mode 100644 srcpkgs/ampache/INSTALL.msg delete mode 100644 srcpkgs/ampache/files/nginx-example.conf diff --git a/srcpkgs/ampache/INSTALL.msg b/srcpkgs/ampache/INSTALL.msg new file mode 100644 index 000000000000..406c05ff3b0d --- /dev/null +++ b/srcpkgs/ampache/INSTALL.msg @@ -0,0 +1,5 @@ +WARNING: There have been breaking changes from ampache 4.x.x to 5.x.x + +Be sure to check the upstream documentation and make necessary changes: + +https://github.com/ampache/ampache/wiki/Ampache-next-Changes diff --git a/srcpkgs/ampache/files/nginx-example.conf b/srcpkgs/ampache/files/nginx-example.conf deleted file mode 100644 index ced954925819..000000000000 --- a/srcpkgs/ampache/files/nginx-example.conf +++ /dev/null @@ -1,80 +0,0 @@ -server { - listen 80; - server_name FQDN; - charset utf-8; - - root PATH; - index index.php; - - # Rewrite rule for Subsonic backend - if ( !-d $request_filename ) { - rewrite ^/rest/(.*).view$ /rest/index.php?action=$1 last; - rewrite ^/rest/fake/(.+)$ /play/$1 last; - } - - # Rewrite rule for Plex backend - if ( !-d $request_filename ) { - rewrite ^/plex/(.*)$ /plex/index.php?action=$1 last; - } - - # Rewrite rule for Channels - if (!-d $request_filename){ - rewrite ^/channel/([0-9]+)/(.*)$ /channel/index.php?channel=$1&target=$2 last; - } - - # Beautiful URL Rewriting - rewrite ^/play/ssid/(\w+)/type/(\w+)/oid/([0-9]+)/uid/([0-9]+)/name/(.*)$ /play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&name=$5 last; - rewrite ^/play/ssid/(\w+)/type/(\w+)/oid/([0-9]+)/uid/([0-9]+)/client/(.*)/noscrobble/([0-1])/name/(.*)$ /play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&client=$5&noscrobble=$6&name=$7 last; - location /play { - if (!-e $request_filename) { - rewrite ^/play/art/([^/]+)/([^/]+)/([0-9]+)/thumb([0-9]*)\.([a-z]+)$ /image.php?object_type=$2&object_id=$3&auth=$1; - break; - } - - rewrite ^/([^/]+)/([^/]+)(/.*)?$ /play/$3?$1=$2; - rewrite ^/(/[^/]+|[^/]+/|/?)$ /play/index.php last; - break; - } - - location /rest { - limit_except GET POST { - deny all; - } - } - - location /plex { - limit_except GET POST { - deny all; - } - } - - location ^~ /bin/ { - deny all; - return 403; - } - - location ^~ /config/ { - deny all; - return 403; - } - - location / { - limit_except GET POST HEAD{ - deny all; - } - } - - location ~ ^/.*.php { - # PHP config... - } - - # Rewrite rule for WebSocket - location /ws { - rewrite ^/ws/(.*) /$1 break; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - proxy_pass http://127.0.0.1:8100/; - } -} diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template index b54f63865063..fd67feb0d0ec 100644 --- a/srcpkgs/ampache/template +++ b/srcpkgs/ampache/template @@ -1,21 +1,20 @@ # Template file for 'ampache' pkgname=ampache -version=4.2.3 +version=5.5.1 revision=1 create_wrksrc=yes hostmakedepends="unzip" -depends="php mariadb" +depends="php8.1 mariadb" short_desc="Web-based tool for managing your audio/video files" maintainer="Steve Prybylski " license="AGPL-3.0-or-later" homepage="http://ampache.org" distfiles="https://github.com/ampache/ampache/releases/download/${version}/${pkgname}-${version}_all.zip" -checksum=26e5984d5582c0bd1789626c7b07ce86ada86d64e0e5549baac625236a36e5ad -python_version=2 +checksum=3e37839058c263be990915759eecab9b5da3ec324638a7ff7d8094516f56a85c +python_version=3 do_install() { vmkdir usr/share/webapps/${pkgname} cp -rT ${wrksrc} ${DESTDIR}/usr/share/webapps/${pkgname} - vlicense docs/AGPL-LICENSE - vinstall ${FILESDIR}/nginx-example.conf 644 usr/share/doc/${pkgname} + vlicense LICENSE.md } From 3318b9b2d3a97b7b6fc1cdecccac0c21ec8fd5ba Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Sun, 28 Aug 2022 19:01:19 -0500 Subject: [PATCH 1083/1407] gns3-server: update to 2.2.34. --- srcpkgs/gns3-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template index db9075e7a5a7..e660a7e381b1 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -1,6 +1,6 @@ # Template file for 'gns3-server' pkgname=gns3-server -version=2.2.33.1 +version=2.2.34 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -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=f28ca99f8970757bf036801a93ffdb174ea00da02e8d60e87d44cf43e1e72aca +checksum=8bd61a0777df7cf195b2670ab81139f3029d9b33cf329cfa612d2b2ea3def947 # The source archive contains statically linked artifacts for x86_64 # glibc, since this is the only architecture supported by upstream, we From 01ce16303064f35f875094ae76621a2c52c7643c Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Sun, 28 Aug 2022 19:01:24 -0500 Subject: [PATCH 1084/1407] gns3-gui: update to 2.2.34. --- srcpkgs/gns3-gui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template index c8c891272550..d286e40900c5 100644 --- a/srcpkgs/gns3-gui/template +++ b/srcpkgs/gns3-gui/template @@ -1,6 +1,6 @@ # Template file for 'gns3-gui' pkgname=gns3-gui -version=2.2.33.1 +version=2.2.34 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -14,7 +14,7 @@ license="GPL-3.0-or-later" homepage="https://gns3.com" changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" -checksum=2122e6259aa1f9e831a0a8b9a327102d2360b9238966b9475be73d3110dcbca8 +checksum=bf66313a4808fdb1cd9b06c72d34fd9fc4bcf5abe990dfd8de70d8128a2c26dc post_patch() { From 0913cfc36a240603b30b717b9c7c9883cb0bae61 Mon Sep 17 00:00:00 2001 From: Tony Zorman Date: Thu, 1 Sep 2022 08:25:40 +0200 Subject: [PATCH 1085/1407] cgrep: update to 7.0.0 --- srcpkgs/cgrep/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template index 1c54fe367396..9d943300a68c 100644 --- a/srcpkgs/cgrep/template +++ b/srcpkgs/cgrep/template @@ -1,16 +1,15 @@ # Template file for 'cgrep' pkgname=cgrep -version=6.7.1 -revision=3 +version=7.0.0 +revision=1 build_style=haskell-stack -stackage="lts-19.0" makedepends="pcre-devel pkg-config" short_desc="Context-aware grep for source codes" -maintainer="slotThe " +maintainer="Tony Zorman " license="GPL-2.0-or-later" homepage="https://awgn.github.io/cgrep/" -distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz" -checksum=ba38c17ad5e6601c5d6bec371940898b713f74c910f755f5f743a52998ac5efd +distfiles="https://github.com/awgn/cgrep/archive/v${version}.tar.gz" +checksum=87c596447882b3acf0a754ac52ac1b5314961e652708a25ffc49ec5977b1f11a nocross=yes nopie_files="/usr/bin/cgrep" conflicts="codesearch" From dd04a06e984fe30998cd293030aa169df7ea5aa5 Mon Sep 17 00:00:00 2001 From: clyhtsuriva Date: Mon, 5 Sep 2022 12:07:56 +0200 Subject: [PATCH 1086/1407] xmag: update to 1.0.7 --- srcpkgs/xmag/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xmag/template b/srcpkgs/xmag/template index f3f4d7e56f5c..0dc12bcf2f47 100644 --- a/srcpkgs/xmag/template +++ b/srcpkgs/xmag/template @@ -1,16 +1,16 @@ # Template file for 'xmag' pkgname=xmag -version=1.0.6 -revision=3 +version=1.0.7 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libXau-devel libXext-devel libXmu-devel libXaw-devel" short_desc="X utility to Magnify parts of the screen" maintainer="Orphaned " license="MIT" -homepage="http://xorg.freedesktop.org/" -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=87a2bc23b251e2d8f8370d3283a4d6c8dac98a30cb5749a04336cdb55c14e161 +homepage="https://gitlab.freedesktop.org/xorg/app/xmag" +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz" +checksum=009936cc5a2706084079127b26cf55c713767650a34cb69e5682d60e33ce7461 post_install() { vlicense COPYING From e205aa32cf26ff3fef97d8db3b847acc9d663e40 Mon Sep 17 00:00:00 2001 From: clyhtsuriva Date: Mon, 5 Sep 2022 09:55:21 +0200 Subject: [PATCH 1087/1407] anope: update to 2.0.11 --- srcpkgs/anope/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/anope/template b/srcpkgs/anope/template index 77b9d4b4f6d1..eede9de4dab7 100644 --- a/srcpkgs/anope/template +++ b/srcpkgs/anope/template @@ -1,6 +1,6 @@ # Template file for 'anope' pkgname=anope -version=2.0.10 +version=2.0.11 revision=1 build_style=cmake make_cmd=make @@ -11,8 +11,9 @@ short_desc="Set of IRC Services designed for flexibility and ease of use" maintainer="Orphaned " license="GPL-2.0-only" homepage="https://www.anope.org/" +changelog="https://raw.githubusercontent.com/anope/anope/2.0/docs/Changes" distfiles="https://github.com/anope/anope/archive/refs/tags/${version}.tar.gz" -checksum=9ca27ca990c5e67e55a2f2541d05b20c06e612d8fccd89ad49be7dc825a0f0d2 +checksum=be4291e339deaa8017ba9a00e6f5cb16e1ab3f8e00eb7b5df2dc8fa5b03c7919 system_accounts="_anope" make_dirs=" From 0f33c6504d1e06743c5036d3cdecd6fd0e352b4b Mon Sep 17 00:00:00 2001 From: Tony Zorman Date: Thu, 1 Sep 2022 19:57:49 +0200 Subject: [PATCH 1088/1407] hledger: update to 1.27 --- srcpkgs/hledger/files/stack.yaml | 22 ++++++++++++++++++++++ srcpkgs/hledger/template | 7 +++---- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/hledger/files/stack.yaml diff --git a/srcpkgs/hledger/files/stack.yaml b/srcpkgs/hledger/files/stack.yaml new file mode 100644 index 000000000000..b5f41932e272 --- /dev/null +++ b/srcpkgs/hledger/files/stack.yaml @@ -0,0 +1,22 @@ +resolver: lts-19.0 + +packages: +- hledger-lib +- hledger +- hledger-ui +- hledger-web + +extra-deps: +# for hledger-lib: +- breakpoint-0.1.0.0 +# for hledger: +# for hledger-ui: +- brick-1.0 +- bimap-0.5.0 +- text-zipper-0.12 +- vty-5.36 +# for hledger-web: +# for Shake.hs: + +ghc-options: + "$locals": -fplugin Debug.Breakpoint diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template index 32d39207fd82..a1a9ac198adf 100644 --- a/srcpkgs/hledger/template +++ b/srcpkgs/hledger/template @@ -1,17 +1,16 @@ # Template file for 'hledger' pkgname=hledger -version=1.25 +version=1.27 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 " 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=4c947c2a7d243d2a56efc1fa02994a118e995df025a412f6d2daeadfd78338ee +distfiles="https://github.com/simonmichael/hledger/archive/${version}.tar.gz" +checksum=1a3d1d321cf5fb9ae6d214a5a4a71775680a8146cf43f77e523a2e6c0af9d366 nopie_files="/usr/bin/hledger" nocross=yes # Can't yet cross compile Haskell From 2e5a14802ad56a808894eeff82ba8ced94391a86 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 5 Sep 2022 16:07:30 -0700 Subject: [PATCH 1089/1407] Electron-Cash: orphan --- srcpkgs/Electron-Cash/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template index fb0cba1e6c55..fd54dfe07677 100644 --- a/srcpkgs/Electron-Cash/template +++ b/srcpkgs/Electron-Cash/template @@ -1,7 +1,7 @@ # Template file for 'Electron-Cash' pkgname=Electron-Cash version=4.2.10 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-PyQt5-devel-tools" depends="python3-PyQt5 python3-PyQt5-svg python3-qrcode python3-dateutil @@ -10,7 +10,7 @@ depends="python3-PyQt5 python3-PyQt5-svg python3-qrcode python3-dateutil python3-ecdsa python3-pyaes python3-pycryptodomex libbitcoin-secp256k1 libzbar python3-cryptography>=2.6 python3-pathvalidate python3-psutil" short_desc="Lightweight Bitcoin Cash client" -maintainer="Cameron Nemo " +maintainer="Orphaned " license="MIT" homepage="https://electroncash.org" distfiles="https://github.com/Electron-Cash/Electron-Cash/releases/download/${version}/Electron-Cash-${version}.tar.gz" From d455ed3bc7a79b938fcf40998525bd6c11587e3f Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 5 Sep 2022 16:02:28 -0700 Subject: [PATCH 1090/1407] gocloc: update to 0.4.3 --- srcpkgs/gocloc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gocloc/template b/srcpkgs/gocloc/template index 01577bb057d9..8f19edd95c1f 100644 --- a/srcpkgs/gocloc/template +++ b/srcpkgs/gocloc/template @@ -1,16 +1,16 @@ # Template file for 'gocloc' pkgname=gocloc -version=0.4.1 +version=0.4.3 revision=1 build_style=go go_import_path="github.com/hhatto/gocloc" go_package="${go_import_path}/cmd/gocloc" short_desc="Counts lines of source code in many programming languages" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/hhatto/gocloc" distfiles="https://github.com/hhatto/gocloc/archive/v${version}.tar.gz" -checksum=528be5009996b4177936be508aa494c289adddf58e4694b1a36067bda433f783 +checksum=b96a3da5c5ec084107f29c339414774a7bf0c3c71e41ae5101cc48824ab9ecb2 post_install() { vlicense LICENSE From 3e7eb3edd1a6d96a23bf3ec883b8992964bfaabb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Mon, 5 Sep 2022 22:20:44 +0200 Subject: [PATCH 1091/1407] rusty-diceware: update to 0.3.6. --- .../0001-Fix-values-in-test-cases.patch | 38 ------------------- srcpkgs/rusty-diceware/template | 5 ++- 2 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/rusty-diceware/patches/0001-Fix-values-in-test-cases.patch diff --git a/srcpkgs/rusty-diceware/patches/0001-Fix-values-in-test-cases.patch b/srcpkgs/rusty-diceware/patches/0001-Fix-values-in-test-cases.patch deleted file mode 100644 index e9ded5de45c3..000000000000 --- a/srcpkgs/rusty-diceware/patches/0001-Fix-values-in-test-cases.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9f480fcbc9cb7bfb0d0bde8727dbfba9d878b596 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= - -Date: Sun, 4 Sep 2022 14:38:10 +0200 -Subject: [PATCH] Fix values in test cases - -SeedableRng values are "stable", but minor version bumps (which have -happened since these cases were written) are allowed to change those. A -breaking change here was documentated for 0.7. ---- - tests/tests.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/tests.rs b/tests/tests.rs -index d569663..ed4eff4 100644 ---- a/tests/tests.rs -+++ b/tests/tests.rs -@@ -33,7 +33,7 @@ fn make_reinhold_vector() -> Vec { - - #[test] - fn beale_rng_test() { -- let wanted: Vec = vec!["dr", "raced", "pvc", "moon"] -+ let wanted: Vec = vec!["io", "gavel", "beam", "time"] - .into_iter() - .map(BealeWord::new) - .collect(); -@@ -45,7 +45,7 @@ fn beale_rng_test() { - - #[test] - fn reinhold_rng_test() { -- let wanted: Vec = vec!["douse", "qo", "prune", "moan"] -+ let wanted: Vec = vec!["india", "gamma", "bcd", "theme"] - .into_iter() - .map(ReinholdWord::new) - .collect(); --- -2.37.3 - diff --git a/srcpkgs/rusty-diceware/template b/srcpkgs/rusty-diceware/template index f179e7db3eab..23fd72ffd93e 100644 --- a/srcpkgs/rusty-diceware/template +++ b/srcpkgs/rusty-diceware/template @@ -1,6 +1,6 @@ # Template file for 'rusty-diceware' pkgname=rusty-diceware -version=0.3.3 +version=0.3.6 revision=1 wrksrc="${pkgname}-v${version}" build_style=cargo @@ -8,8 +8,9 @@ short_desc="Commandline diceware, sans dice, written in rustlang" maintainer="jcgruenhage " license="AGPL-3.0-only" homepage="https://gitlab.com/yuvallanger/rusty-diceware" +changelog="https://gitlab.com/yuvallanger/rusty-diceware/-/raw/master/CHANGELOG.md" distfiles="https://gitlab.com/yuvallanger/rusty-diceware/-/archive/v${version}/rusty-diceware-v${version}.tar.gz" -checksum=906a082a2b85fe8d1f5db88705704f44a7b5cafcd419a2eccb29e9ccbdff9e0e +checksum=3178f0e238ec71b76f210570c3b063d5a2b27b2b5868ac5ca4eb1d4971559f51 post_install() { vlicense LICENSE From bd83a423f7325853faceb9772eb436b8dea9ab47 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 22 Aug 2022 15:38:57 -0400 Subject: [PATCH 1092/1407] criu: update to 3.17.1. --- srcpkgs/criu/patches/ppc64-musl.patch | 48 +++++++++++++-------------- srcpkgs/criu/patches/sigev-musl.patch | 29 ++++++++++++++++ srcpkgs/criu/template | 14 ++++---- 3 files changed, 59 insertions(+), 32 deletions(-) create mode 100644 srcpkgs/criu/patches/sigev-musl.patch diff --git a/srcpkgs/criu/patches/ppc64-musl.patch b/srcpkgs/criu/patches/ppc64-musl.patch index eaf2a813f190..bf9ae07d248a 100644 --- a/srcpkgs/criu/patches/ppc64-musl.patch +++ b/srcpkgs/criu/patches/ppc64-musl.patch @@ -11,8 +11,8 @@ Get rid of some header conflicts and glibc specific things. #include #include #include -@@ -55,8 +57,8 @@ typedef struct { - #define MSR_TM_ACTIVE(x) ((((x) & MSR_TM) && ((x)&(MSR_TMA|MSR_TMS))) != 0) +@@ -55,8 +57,8 @@ + #define MSR_TM_ACTIVE(x) ((((x)&MSR_TM) && ((x) & (MSR_TMA | MSR_TMS))) != 0) typedef struct { - uint64_t fpregs[NFPREG]; @@ -22,7 +22,7 @@ Get rid of some header conflicts and glibc specific things. uint64_t vsxregs[NVSXREG]; int flags; -@@ -66,8 +68,8 @@ typedef struct { +@@ -66,8 +68,8 @@ uint64_t tfhar, texasr, tfiar; } tm_spr_regs; user_regs_struct_t regs; @@ -43,7 +43,7 @@ Get rid of some header conflicts and glibc specific things. #include #include #include -@@ -57,15 +56,15 @@ static void put_fpu_regs(mcontext_t *mc, uint64_t *fpregs) +@@ -57,15 +56,15 @@ { uint64_t *mcfp = (uint64_t *)mc->fp_regs; @@ -72,7 +72,7 @@ Get rid of some header conflicts and glibc specific things. #include #include -@@ -33,7 +32,7 @@ static UserPpc64FpstateEntry *copy_fp_regs(uint64_t *fpregs) +@@ -33,7 +32,7 @@ return NULL; user_ppc64_fpstate_entry__init(fpe); @@ -81,7 +81,7 @@ Get rid of some header conflicts and glibc specific things. fpe->fpregs = xmalloc(fpe->n_fpregs * sizeof(fpe->fpregs[0])); if (!fpe->fpregs) { xfree(fpe); -@@ -41,7 +40,7 @@ static UserPpc64FpstateEntry *copy_fp_regs(uint64_t *fpregs) +@@ -41,7 +40,7 @@ } /* FPSRC is the last (33th) register in the set */ @@ -90,46 +90,46 @@ Get rid of some header conflicts and glibc specific things. fpe->fpregs[i] = fpregs[i]; return fpe; -@@ -69,7 +68,7 @@ static UserPpc64VrstateEntry *copy_altivec_regs(__vector128 *vrregs) +@@ -69,7 +68,7 @@ user_ppc64_vrstate_entry__init(vse); /* protocol buffer store only 64bit entries and we need 128bit */ -- vse->n_vrregs = (NVRREG-1) * 2; -+ vse->n_vrregs = (ELF_NVRREG-1) * 2; +- vse->n_vrregs = (NVRREG - 1) * 2; ++ vse->n_vrregs = (ELF_NVRREG - 1) * 2; vse->vrregs = xmalloc(vse->n_vrregs * sizeof(vse->vrregs[0])); if (!vse->vrregs) { xfree(vse); -@@ -77,13 +76,13 @@ static UserPpc64VrstateEntry *copy_altivec_regs(__vector128 *vrregs) +@@ -77,13 +76,13 @@ } /* Vectors are 2*64bits entries */ -- for (i = 0; i < (NVRREG-1); i++) { -+ for (i = 0; i < (ELF_NVRREG-1); i++) { - p64 = (uint64_t*) &vrregs[i]; - vse->vrregs[i*2] = p64[0]; - vse->vrregs[i*2 + 1] = p64[1]; +- for (i = 0; i < (NVRREG - 1); i++) { ++ for (i = 0; i < (ELF_NVRREG - 1); i++) { + p64 = (uint64_t *)&vrregs[i]; + vse->vrregs[i * 2] = p64[0]; + vse->vrregs[i * 2 + 1] = p64[1]; } -- p32 = (uint32_t*) &vrregs[NVRREG-1]; -+ p32 = (uint32_t*) &vrregs[ELF_NVRREG-1]; +- p32 = (uint32_t *)&vrregs[NVRREG - 1]; ++ p32 = (uint32_t *)&vrregs[ELF_NVRREG - 1]; vse->vrsave = *p32; return vse; -@@ -95,7 +94,7 @@ static int put_altivec_regs(mcontext_t *mc, UserPpc64VrstateEntry *vse) +@@ -95,7 +94,7 @@ pr_debug("Restoring Altivec registers\n"); -- if (vse->n_vrregs != (NVRREG-1)*2) { -+ if (vse->n_vrregs != (ELF_NVRREG-1)*2) { +- if (vse->n_vrregs != (NVRREG - 1) * 2) { ++ if (vse->n_vrregs != (ELF_NVRREG - 1) * 2) { pr_err("Corrupted Altivec dump data\n"); return -1; } -@@ -104,7 +103,7 @@ static int put_altivec_regs(mcontext_t *mc, UserPpc64VrstateEntry *vse) +@@ -103,7 +102,7 @@ + /* Note that this should only be done in the case MSR_VEC is set but * this is not a big deal to do that in all cases. */ - memcpy(&v_regs->vrregs[0][0], vse->vrregs, -- sizeof(uint64_t) * 2 * (NVRREG-1)); -+ sizeof(uint64_t) * 2 * (ELF_NVRREG-1)); +- memcpy(&v_regs->vrregs[0][0], vse->vrregs, sizeof(uint64_t) * 2 * (NVRREG - 1)); ++ memcpy(&v_regs->vrregs[0][0], vse->vrregs, sizeof(uint64_t) * 2 * (ELF_NVRREG - 1)); /* vscr has been restored with the previous memcpy which copied 32 * 128bits registers + a 128bits field containing the vscr value in * the low part. diff --git a/srcpkgs/criu/patches/sigev-musl.patch b/srcpkgs/criu/patches/sigev-musl.patch new file mode 100644 index 000000000000..f0e256234485 --- /dev/null +++ b/srcpkgs/criu/patches/sigev-musl.patch @@ -0,0 +1,29 @@ +--- /dev/null ++++ b/include/signal_compat.h +@@ -0,0 +1,4 @@ ++#define SIGEV_SIGNAL 0 /* notify via signal */ ++#define SIGEV_NONE 1 /* other notification: meaningless */ ++#define SIGEV_THREAD 2 /* deliver via thread creation */ ++#define SIGEV_THREAD_ID 4 /* deliver to thread */ +--- a/criu/pie/restorer.c ++++ b/criu/pie/restorer.c +@@ -50,6 +50,10 @@ + #include "shmem.h" + #include "restorer.h" + ++#ifndef __GLIBC__ ++#include "signal_compat.h" ++#endif ++ + #ifndef PR_SET_PDEATHSIG + #define PR_SET_PDEATHSIG 1 + #endif +@@ -1067,7 +1071,7 @@ + #ifdef __GLIBC__ + sev._sigev_un._tid = args->posix_timers[i].spt.notify_thread_id; + #else +- sev.sigev_notify_thread_id = args->posix_timers[i].spt.notify_thread_id; ++ sev.sigev_notify_function = args->posix_timers[i].spt.notify_thread_id; + #endif + sev.sigev_value.sival_ptr = args->posix_timers[i].spt.sival_ptr; + diff --git a/srcpkgs/criu/template b/srcpkgs/criu/template index 1807efc4a43f..1a102a36bd2f 100644 --- a/srcpkgs/criu/template +++ b/srcpkgs/criu/template @@ -1,13 +1,14 @@ # Template file for 'criu' pkgname=criu -version=3.14 -revision=4 +version=3.17.1 +revision=1 # i686 unsupported upstream: https://criu.org/32bit_tasks_C/R#Compatible_applications # ppc64 big endian not supported upstream archs="x86_64* aarch64* ppc64le* armv7l*" build_style=gnu-makefile make_use_env=compliant make_build_args="WERROR=0" +make_install_args="LOGROTATEDIR=/etc/logrotate.d LIBDIR=/usr/lib SBINDIR=/usr/bin" hostmakedepends="asciidoc pkg-config xmlto protobuf which" makedepends="libcap-devel libnet-devel libnl3-devel protobuf-c-devel protobuf-devel" @@ -15,14 +16,11 @@ short_desc="Utility to checkpoint/restore a process tree" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-only" homepage="http://criu.org/" -distfiles="https://download.openvz.org/criu/criu-${version}.tar.bz2" -checksum=f63f30188b84e9a611429f732381f27e37c60cde0afc9821600f8597d21e39cb +distfiles="https://github.com/checkpoint-restore/criu/archive/refs/tags/v${version}.tar.gz" +checksum=f90fe2323ed1b84f273dc41dde1a38dd424157a57f713d1ba39094e70f90eca6 nocross="fails to run protobuf internals" -do_install() { - make DESTDIR=${DESTDIR} PREFIX=/usr LOGROTATEDIR=/etc/logrotate.d \ - LIBDIR=/usr/lib SBINDIR=/usr/bin install - rm -rf ${DESTDIR}/usr/lib/systemd +post_install() { vsv criu } From b7ca015f4c88458225a50fa8b8686f412e064803 Mon Sep 17 00:00:00 2001 From: Matthias von Faber Date: Sat, 3 Sep 2022 08:21:02 +0200 Subject: [PATCH 1093/1407] qtractor: update to 0.9.28 --- srcpkgs/qtractor/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template index dfc320865854..79d1937600ea 100644 --- a/srcpkgs/qtractor/template +++ b/srcpkgs/qtractor/template @@ -1,8 +1,8 @@ # Template file for 'qtractor' pkgname=qtractor -version=0.9.27 +version=0.9.28 revision=1 -_clap_tag=1.0.3 +_clap_tag=1.1.1 _vst3sdk_tag=3.7.5_build_44 wrksrc="qtractor-qtractor_${version//./_}" create_wrksrc=yes @@ -27,8 +27,8 @@ 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="e3461b1c752fb6e85591f183042c52f03453c95c79aebb9622248b00f93197dd - 84fef9f2e975177b320ede47365fc8e04a459d34d967eef2afc5a57b6992b0c6 +checksum="988eec4ecba892568d98638264e9369d900213056622c74bba83050dc5334028 + eef67a38df6c20fd4cb79698772d35d30aefc2e1a8d5275a5169f58cd530333e ed359d496796588aa0be86cc902e2472e9624abf6af3a85b2a5711ad069fb9f3 360c51e3fbb33c0bf389175d07f8f09c175120296e9b0e6a4d222663e92bccf8 f34e313c7ff6661401275947a8c3d695d9a2c06c84135c9c8d4939f5316393a7 From 7440907adb181865bf4c2cbc0021953c069ba4ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Wed, 31 Aug 2022 23:45:54 +0200 Subject: [PATCH 1094/1407] i2pd: update to 2.43.0. --- srcpkgs/i2pd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template index 522235bebc17..253e5e4aed9a 100644 --- a/srcpkgs/i2pd/template +++ b/srcpkgs/i2pd/template @@ -1,7 +1,7 @@ # Template file for 'i2pd' pkgname=i2pd -version=2.42.1 -revision=2 +version=2.43.0 +revision=1 build_style=gnu-makefile make_build_args="USE_UPNP=yes" makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel @@ -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=d52b55cf144a6eedbb3433214c035161c07f776090074daba0e5e83c01d09139 +checksum=db1679653491a411dd16fa329488d840296c8f680e0691f9fe0d0e796e5d7bca conf_files=" /etc/i2pd/i2pd.conf From c09d5df5c147eef8a451e6e7e87a29f595562f5a Mon Sep 17 00:00:00 2001 From: Jovan Lanik Date: Fri, 2 Sep 2022 16:17:28 +0200 Subject: [PATCH 1095/1407] gtklock: update to 1.3.5 --- srcpkgs/gtklock/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template index 381e97f874aa..c88fc4ac1c9e 100644 --- a/srcpkgs/gtklock/template +++ b/srcpkgs/gtklock/template @@ -1,6 +1,6 @@ # Template file for 'gtklock' pkgname=gtklock -version=1.3.4 +version=1.3.5 revision=1 build_style=gnu-makefile make_use_env=yes @@ -11,7 +11,7 @@ maintainer="Jovan Lanik " license="GPL-3.0-or-later" homepage="https://github.com/jovanlanik/gtklock" distfiles="https://github.com/jovanlanik/gtklock/archive/refs/tags/v${version}.tar.gz" -checksum=74bd18ba5af082c6f10c125652d799328a169accf22f03efea24f04d9088a174 +checksum=753259cdf4b16dbe2b564a80a919976c2661a028d9d06b22f1da466e615a6766 post_install() { # copying CSS example provided From 9b5abcb2825228736eaa6f9f468b660ae7ba83ea Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 2 Sep 2022 21:21:23 +0200 Subject: [PATCH 1096/1407] ocaml-lablgtk2: remove package gtk2, not used by any other packages --- srcpkgs/ocaml-lablgtk2-gnomecanvas | 1 - srcpkgs/ocaml-lablgtk2-gtksourceview2 | 1 - srcpkgs/ocaml-lablgtk2-gtkspell | 1 - srcpkgs/ocaml-lablgtk2/template | 65 --------------------------- srcpkgs/ocaml-lablgtk2/update | 1 - srcpkgs/removed-packages/template | 4 ++ 6 files changed, 4 insertions(+), 69 deletions(-) delete mode 120000 srcpkgs/ocaml-lablgtk2-gnomecanvas delete mode 120000 srcpkgs/ocaml-lablgtk2-gtksourceview2 delete mode 120000 srcpkgs/ocaml-lablgtk2-gtkspell delete mode 100644 srcpkgs/ocaml-lablgtk2/template delete mode 100644 srcpkgs/ocaml-lablgtk2/update diff --git a/srcpkgs/ocaml-lablgtk2-gnomecanvas b/srcpkgs/ocaml-lablgtk2-gnomecanvas deleted file mode 120000 index 1fb9864be98d..000000000000 --- a/srcpkgs/ocaml-lablgtk2-gnomecanvas +++ /dev/null @@ -1 +0,0 @@ -ocaml-lablgtk2 \ No newline at end of file diff --git a/srcpkgs/ocaml-lablgtk2-gtksourceview2 b/srcpkgs/ocaml-lablgtk2-gtksourceview2 deleted file mode 120000 index 1fb9864be98d..000000000000 --- a/srcpkgs/ocaml-lablgtk2-gtksourceview2 +++ /dev/null @@ -1 +0,0 @@ -ocaml-lablgtk2 \ No newline at end of file diff --git a/srcpkgs/ocaml-lablgtk2-gtkspell b/srcpkgs/ocaml-lablgtk2-gtkspell deleted file mode 120000 index 1fb9864be98d..000000000000 --- a/srcpkgs/ocaml-lablgtk2-gtkspell +++ /dev/null @@ -1 +0,0 @@ -ocaml-lablgtk2 \ No newline at end of file diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template deleted file mode 100644 index 6ff864eb1720..000000000000 --- a/srcpkgs/ocaml-lablgtk2/template +++ /dev/null @@ -1,65 +0,0 @@ -# Template file for 'ocaml-lablgtk2' -pkgname=ocaml-lablgtk2 -version=2.18.10 -revision=5 -wrksrc="lablgtk-${version}" -build_style=gnu-configure -configure_args="--without-glade --without-gnomeui --without-gtksourceview" -make_build_args="world opt" -hostmakedepends="ocaml ocaml-findlib m4 pkg-config" -makedepends="gtk+-devel gtksourceview2-devel libgnomecanvas-devel gtkspell-devel" -short_desc="OCaml interface to GTK2" -maintainer="Tai Chi Minh Ralph Eastwood " -license="LGPL-2.0-or-later" -homepage="http://lablgtk.forge.ocamlcore.org/" -distfiles="https://github.com/garrigue/lablgtk/archive/${version}.tar.gz" -checksum=6f00f6b3114b468eb9e743d27511a6063936f6798f890e44b494f71a5cf95470 -nocross=yes -nopie=yes -disable_parallel_build=yes - -post_configure() { - vsed -i src/Makefile -e "s;CFLAGS = ;& -fcommon ;" -} - -post_install() { - vlicense COPYING -} - -ocaml-lablgtk2-gnomecanvas_package() { - depends="ocaml-lablgtk2 libgnomecanvas" - short_desc+=" - gnomecanvas bindings" - pkg_install() { - vmove "usr/lib/ocaml/lablgtk2/gnoCanvas.*" - vmove "usr/lib/ocaml/lablgtk2/gnomeCanvas.*" - vmove "usr/lib/ocaml/lablgtk2/lablgnomecanvas.*" - vmove usr/lib/ocaml/lablgtk2/liblablgnomecanvas.a - vmove usr/lib/ocaml/lablgtk2/dlllablgnomecanvas.so - } -} - -ocaml-lablgtk2-gtksourceview2_package() { - depends="ocaml-lablgtk2 gtksourceview2" - short_desc+=" - gtksourceview2 bindings" - pkg_install() { - vmove "usr/lib/ocaml/lablgtk2/gSourceView2.*" - vmove "usr/lib/ocaml/lablgtk2/gtkSourceView2.*" - vmove "usr/lib/ocaml/lablgtk2/gtkSourceView2_types.*" - vmove "usr/lib/ocaml/lablgtk2/lablgtksourceview2.*" - vmove "usr/lib/ocaml/lablgtk2/sourceView2Enums.*" - vmove usr/lib/ocaml/lablgtk2/liblablgtksourceview2.a - vmove usr/lib/ocaml/lablgtk2/dlllablgtksourceview2.so - vmove usr/lib/ocaml/lablgtk2/sourceView2_tags.h - } -} - -ocaml-lablgtk2-gtkspell_package() { - depends="ocaml-lablgtk2 gtkspell" - short_desc+=" - gtkspell bindings" - pkg_install() { - vmove "usr/lib/ocaml/lablgtk2/gtkSpell.*" - vmove "usr/lib/ocaml/lablgtk2/lablgtkspell.*" - vmove usr/lib/ocaml/lablgtk2/liblablgtkspell.a - vmove usr/lib/ocaml/lablgtk2/dlllablgtkspell.so - } -} diff --git a/srcpkgs/ocaml-lablgtk2/update b/srcpkgs/ocaml-lablgtk2/update deleted file mode 100644 index f0285e30dc25..000000000000 --- a/srcpkgs/ocaml-lablgtk2/update +++ /dev/null @@ -1 +0,0 @@ -single_directory=yes diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index baab7f738f3b..4a55ec442101 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -293,6 +293,10 @@ replaces=" nvidia340-libs<=340.108_4 nvidia340-opencl<=340.108_4 nvidia340<=340.108_4 + ocaml-lablgtk2-gnomecanvas<=2.18.10_5 + ocaml-lablgtk2-gtksourceview2<=2.18.10_5 + ocaml-lablgtk2-gtkspell<=2.18.10_5 + ocaml-lablgtk2<=2.18.10_5 oce-devel<=0.18.3_1 oce<=0.18.3_1 onionshare<=2.2_5 From 6a42e8f3d12c765533c8eaaf28915b7c8da08129 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Tue, 30 Aug 2022 12:18:54 -0700 Subject: [PATCH 1097/1407] skopeo: update to 1.9.2 --- srcpkgs/skopeo/template | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template index b3106205abb8..58b5009b4237 100644 --- a/srcpkgs/skopeo/template +++ b/srcpkgs/skopeo/template @@ -1,8 +1,9 @@ # Template file for 'skopeo' pkgname=skopeo -version=1.7.0 +version=1.9.2 revision=1 build_style=go +build_helper=qemu go_import_path="github.com/containers/${pkgname}" go_package="${go_import_path}/cmd/${pkgname}" go_build_tags="containers_image_ostree_stub" @@ -10,20 +11,29 @@ hostmakedepends="go-md2man pkg-config" makedepends="device-mapper-devel gpgme-devel libbtrfs-devel" depends="containers.image" short_desc="Utility for operations on container images and image repositories" -maintainer="Cameron Nemo " +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=453bdcce16767696ed71046b60ad7b34358b183b50eb5aa708ced0b5ea2927b1 +checksum=9a321ba75f213e5c46cba7f92073c2437137a56d3140c9ab6e723fb92890f9d0 make_dirs="/var/lib/atomic/sigstore 0755 root root" +_completions="bash zsh fish" post_build() { make docs + local cli=$(find $GOPATH/bin -name skopeo) + for shell in $_completions + do + vtargetrun "$cli" completion "$shell" >"completion.$shell" + done } post_install() { - vinstall completions/bash/skopeo 644 usr/share/bash-completion/completions for m in docs/*.1; do vman "$m" done + for shell in $_completions + do + vcompletion "completion.$shell" "$shell" + done } From 9e836bc9d10bc2c19a152fd75ad7b337d5b8bf66 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 5 Sep 2022 16:17:51 -0700 Subject: [PATCH 1098/1407] atf-rk3399-bl31: update to 2.7 --- srcpkgs/atf-rk3399-bl31/template | 6 +++--- srcpkgs/atf-rk3399-bl31/update | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/atf-rk3399-bl31/update diff --git a/srcpkgs/atf-rk3399-bl31/template b/srcpkgs/atf-rk3399-bl31/template index 234d1b3febb1..c14dcf610e26 100644 --- a/srcpkgs/atf-rk3399-bl31/template +++ b/srcpkgs/atf-rk3399-bl31/template @@ -1,16 +1,16 @@ # Template file for 'atf-rk3399-bl31' pkgname=atf-rk3399-bl31 -version=2.6 +version=2.7 revision=1 archs="aarch64*" wrksrc="trusted-firmware-a-${version}" hostmakedepends="cross-arm-none-eabi" short_desc="ARM Trusted Firmware for Rockchip rk3399 boards (ARMv8, bl31 option)" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="BSD-3-Clause" homepage="https://developer.trustedfirmware.org/dashboard/view/6/" distfiles="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-${version}.tar.gz" -checksum=4e59f02ccb042d5d18c89c849701b96e6cf4b788709564405354b5d313d173f7 +checksum=53422dc649153838e03820330ba17cb10afe3e330ecde0db11e4d5f1361a33e6 nostrip=yes post_patch() { diff --git a/srcpkgs/atf-rk3399-bl31/update b/srcpkgs/atf-rk3399-bl31/update new file mode 100644 index 000000000000..7ba2f720ab16 --- /dev/null +++ b/srcpkgs/atf-rk3399-bl31/update @@ -0,0 +1,2 @@ +site=https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/refs/ +pattern="tag/\?h=v\K[\d\.]+" From e51c0d491db73c34be3e4543df02db6243fad27d Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 5 Sep 2022 18:11:06 -0700 Subject: [PATCH 1099/1407] pinebookpro-uboot: rebuild for new TF-A --- srcpkgs/pinebookpro-uboot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pinebookpro-uboot/template b/srcpkgs/pinebookpro-uboot/template index 38f4c39ff163..cf716f1eb443 100644 --- a/srcpkgs/pinebookpro-uboot/template +++ b/srcpkgs/pinebookpro-uboot/template @@ -2,14 +2,14 @@ pkgname=pinebookpro-uboot reverts="20200212_1 20200212_2" version=2022.04 -revision=1 +revision=2 archs="aarch64*" wrksrc="u-boot-${version}" hostmakedepends="flex bc dtc python3 openssl-devel" makedepends="atf-rk3399-bl31" depends="u-boot-tools" short_desc="U-Boot for Pinebook Pro" -maintainer="Renato Aguiar " +maintainer="Cameron Nemo " license="GPL-2.0-only, BSD-3-Clause" homepage="https://www.denx.de/wiki/U-Boot/" distfiles="https://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2" From 6b69452d0863cae55b8de9b1c584401e0557004d Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 5 Sep 2022 19:10:42 -0700 Subject: [PATCH 1100/1407] atf-rk3328-bl31: update to 2.7 --- srcpkgs/atf-rk3328-bl31/template | 6 +++--- srcpkgs/atf-rk3328-bl31/update | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/atf-rk3328-bl31/update diff --git a/srcpkgs/atf-rk3328-bl31/template b/srcpkgs/atf-rk3328-bl31/template index 89397958a626..df968fbac0c4 100644 --- a/srcpkgs/atf-rk3328-bl31/template +++ b/srcpkgs/atf-rk3328-bl31/template @@ -1,15 +1,15 @@ # Template file for 'atf-rk3328-bl31' pkgname=atf-rk3328-bl31 -version=2.4 +version=2.7 revision=1 archs="aarch64*" wrksrc="trusted-firmware-a-${version}" short_desc="ARM Trusted Firmware for Rockchip rk3328 boards (ARMv8, bl31 option)" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="BSD-3-Clause" homepage="https://developer.trustedfirmware.org/dashboard/view/6/" distfiles="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-${version}.tar.gz" -checksum=bf3eb3617a74cddd7fb0e0eacbfe38c3258ee07d4c8ed730deef7a175cc3d55b +checksum=53422dc649153838e03820330ba17cb10afe3e330ecde0db11e4d5f1361a33e6 nostrip=yes do_build() { diff --git a/srcpkgs/atf-rk3328-bl31/update b/srcpkgs/atf-rk3328-bl31/update new file mode 100644 index 000000000000..7ba2f720ab16 --- /dev/null +++ b/srcpkgs/atf-rk3328-bl31/update @@ -0,0 +1,2 @@ +site=https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/refs/ +pattern="tag/\?h=v\K[\d\.]+" From c18d2052070a3ee252000852bd6ca9be1bc35d7b Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 5 Sep 2022 19:11:04 -0700 Subject: [PATCH 1101/1407] rock64-uboot: update to 2022.07 --- srcpkgs/rock64-uboot/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/rock64-uboot/template b/srcpkgs/rock64-uboot/template index 625660c7706e..4f850c27456f 100644 --- a/srcpkgs/rock64-uboot/template +++ b/srcpkgs/rock64-uboot/template @@ -1,17 +1,17 @@ # Template file for 'rock64-uboot' pkgname=rock64-uboot -version=2020.10 +version=2022.07 revision=1 archs="aarch64*" wrksrc="u-boot-${version}" -hostmakedepends="flex bc python3 swig python3-devel dtc" +hostmakedepends="flex bc dtc python3 openssl-devel swig python3-devel" makedepends="atf-rk3328-bl31" short_desc="Das U-Boot for the Rock64 SBC" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="GPL-2.0-or-later, BSD-3-Clause" homepage="https://www.denx.de/wiki/U-Boot/" distfiles="https://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2" -checksum=0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622 +checksum=92b08eb49c24da14c1adbf70a71ae8f37cc53eeb4230e859ad8b6733d13dcf5e do_configure() { make rock64-rk3328_defconfig From a967a6a7a8d617612bf3993bf7ac99d2469bf4db Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Jul 2022 11:18:06 +0200 Subject: [PATCH 1102/1407] erlang: update to 25.0.4. --- srcpkgs/erlang/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index c12a3851a19c..f141d58c0dcf 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -1,6 +1,6 @@ # Template file for 'erlang' pkgname=erlang -version=24.3.4.1 +version=25.0.4 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=98363e5489356ed4fb3616e44d430b3daf5bb286be800d1c331fba8ef35ca3a0 +checksum=05878cb51a64b33c86836b12a21903075c300409b609ad5e941ddb0feb8c2120 subpackages="erlang-doc" if [ -z "$CROSS_BUILD" ]; then @@ -28,7 +28,6 @@ case "$XBPS_TARGET_MACHINE" in esac pre_configure() { - ./otp_build autoconf if [ "$CROSS_BUILD" ]; then # Build the bootstrap compiler for the host platform. env - PATH=/usr/bin:/usr/sbin ./configure --enable-bootstrap-only From 824922f2417d4e141f033a22c3b21dccad7ebbb3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Jul 2022 11:18:29 +0200 Subject: [PATCH 1103/1407] rebar3: rebuild for erlang-25.0.2. --- srcpkgs/rebar3/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rebar3/template b/srcpkgs/rebar3/template index da3f82deade3..cce9ffb4db68 100644 --- a/srcpkgs/rebar3/template +++ b/srcpkgs/rebar3/template @@ -1,7 +1,7 @@ # Template file for 'rebar3' pkgname=rebar3 version=3.19.0 -revision=1 +revision=2 hostmakedepends=erlang depends="erlang>=22" short_desc="Erlang build tool to compile, test, and release applications" From 97efced61efb901b5e45c8a6d4d2bac881d6a4a7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Jul 2022 11:19:30 +0200 Subject: [PATCH 1104/1407] lfe: rebuild for erlang-25.0.2. --- srcpkgs/lfe/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lfe/template b/srcpkgs/lfe/template index 528ef58467da..04967e48fc96 100644 --- a/srcpkgs/lfe/template +++ b/srcpkgs/lfe/template @@ -1,7 +1,7 @@ # Template file for 'lfe' pkgname=lfe version=2.0.1 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="erlang" depends="erlang" From b8ca7619a713e2a803947189406bbf8083ce0f6f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Jul 2022 11:24:24 +0200 Subject: [PATCH 1105/1407] elixir: rebuild for erlang-25.0.2. --- srcpkgs/elixir/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template index 012c48cddbde..50867e1db30e 100644 --- a/srcpkgs/elixir/template +++ b/srcpkgs/elixir/template @@ -1,7 +1,7 @@ # Template file for 'elixir' pkgname=elixir version=1.14.0 -revision=1 +revision=2 build_style=gnu-makefile make_check_target="test" hostmakedepends="erlang" From 9a70e17c00e775a060107daa8b64ab363f92b86c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 7 Jul 2022 11:28:44 +0200 Subject: [PATCH 1106/1407] ejabberd: update to 22.05. --- srcpkgs/ejabberd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template index 70643ecd550b..c77545190f4f 100644 --- a/srcpkgs/ejabberd/template +++ b/srcpkgs/ejabberd/template @@ -1,6 +1,6 @@ # Template file for 'ejabberd' pkgname=ejabberd -version=21.07 +version=22.05 revision=1 build_style=gnu-configure configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam @@ -15,7 +15,7 @@ maintainer="Toyam Cox " license="GPL-2.0-or-later" homepage="https://www.process-one.net/en/ejabberd/" distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz" -checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e +checksum=b8e93b51ae3cb650a2870fae1b6705404bb155289e97be7e9a54961a9effb959 build_options="sqlite" build_options_default="sqlite" From 0ff89fedd2569f0b0c010d226b44e437e9b7054c Mon Sep 17 00:00:00 2001 From: icp Date: Mon, 22 Aug 2022 13:13:20 +0530 Subject: [PATCH 1107/1407] python3-dateparser: update to 1.1.1. Close: #38833 --- .../patches/fix-python3-regex-incompatibility.patch | 12 ++++++++++++ srcpkgs/python3-dateparser/template | 12 ++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/python3-dateparser/patches/fix-python3-regex-incompatibility.patch diff --git a/srcpkgs/python3-dateparser/patches/fix-python3-regex-incompatibility.patch b/srcpkgs/python3-dateparser/patches/fix-python3-regex-incompatibility.patch new file mode 100644 index 000000000000..536704ccfbf4 --- /dev/null +++ b/srcpkgs/python3-dateparser/patches/fix-python3-regex-incompatibility.patch @@ -0,0 +1,12 @@ +Source: https://github.com/scrapinghub/dateparser/pull/1067 +--- a/dateparser/languages/locale.py ++++ b/dateparser/languages/locale.py +@@ -169,7 +169,7 @@ class Locale: + if normalize: + value = list(map(normalize_unicode, value)) + pattern = '|'.join(sorted(value, key=len, reverse=True)) +- pattern = DIGIT_GROUP_PATTERN.sub(r'?P\d+', pattern) ++ pattern = pattern.replace(r'\d+', r'?P\d+') + pattern = re.compile(r'^(?:{})$'.format(pattern), re.UNICODE | re.IGNORECASE) + relative_dictionary[pattern] = key + return relative_dictionary diff --git a/srcpkgs/python3-dateparser/template b/srcpkgs/python3-dateparser/template index 9d7c54cd818e..8185cc488fcd 100644 --- a/srcpkgs/python3-dateparser/template +++ b/srcpkgs/python3-dateparser/template @@ -1,17 +1,21 @@ # Template file for 'python3-dateparser' pkgname=python3-dateparser -version=1.0.0 -revision=2 +version=1.1.1 +revision=1 wrksrc=dateparser-${version} build_style=python3-module +make_check_args="--ignore tests/test_hijri.py --ignore tests/test_jalali.py + --ignore tests/test_language_detect.py --ignore tests/test_dateparser_data_integrity.py" hostmakedepends="python3-setuptools" -depends="python3-dateutil python3-regex python3-tzlocal" +depends="python3-dateutil python3-pytz python3-regex python3-tzlocal" +checkdepends="${depends} python3-parameterized python3-pytest-xdist" short_desc="Python parser for human readable dates" maintainer="Lorem " license="BSD-3-Clause" homepage="https://github.com/scrapinghub/dateparser" +changelog="https://raw.githubusercontent.com/scrapinghub/dateparser/master/HISTORY.rst" distfiles="${PYPI_SITE}/d/dateparser/dateparser-${version}.tar.gz" -checksum=159cc4e01a593706a15cd4e269a0b3345edf3aef8bf9278a57dac8adf5bf1e4a +checksum=038196b1f12c7397e38aad3d61588833257f6f552baa63a1499e6987fa8d42d9 post_install() { vlicense LICENSE From 63d978eec4795a7256253d6ea60a1a1ed06dd1e0 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, 5 Sep 2022 23:52:25 +0700 Subject: [PATCH 1108/1407] lcov: fix config files installation --- srcpkgs/lcov/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/lcov/template b/srcpkgs/lcov/template index 2d23c19f0cc3..33fb098464f7 100644 --- a/srcpkgs/lcov/template +++ b/srcpkgs/lcov/template @@ -1,9 +1,10 @@ # Template file for 'lcov' pkgname=lcov version=1.15 -revision=1 +revision=2 build_style=gnu-makefile make_check_target=test +make_build_args="CFG_DIR=/etc" hostmakedepends="perl" depends="perl" short_desc="Front-end for GCC's coverage testing tool gcov" @@ -12,3 +13,4 @@ license="GPL-2.0-or-later" homepage="http://ltp.sourceforge.net/coverage/lcov.php" distfiles="https://github.com/linux-test-project/${pkgname}/archive/v${version}.tar.gz" checksum=d88b0718f59815862785ac379aed56974b9edd8037567347ae70081cd4a3542a +conf_files="/etc/lcovrc" From 2b1c00c5f96865362663c0211ef7659d131f94cc 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, 6 Sep 2022 09:34:10 +0700 Subject: [PATCH 1109/1407] python3-vispy: move config to /etc --- srcpkgs/python3-vispy/patches/etc.patch | 11 +++++++++++ srcpkgs/python3-vispy/template | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/python3-vispy/patches/etc.patch diff --git a/srcpkgs/python3-vispy/patches/etc.patch b/srcpkgs/python3-vispy/patches/etc.patch new file mode 100644 index 000000000000..45d197e0d715 --- /dev/null +++ b/srcpkgs/python3-vispy/patches/etc.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -261,7 +261,7 @@ setup( + 'vispy/static/index.js', + 'vispy/static/index.js.map', + ]), +- ('etc/jupyter/nbconfig/notebook.d', ['vispy.json']), ++ ('/etc/jupyter/nbconfig/notebook.d', ['vispy.json']), + ], + include_package_data=True, + package_data={ diff --git a/srcpkgs/python3-vispy/template b/srcpkgs/python3-vispy/template index fbb06c91e0bf..44dcdebcbcd3 100644 --- a/srcpkgs/python3-vispy/template +++ b/srcpkgs/python3-vispy/template @@ -1,7 +1,7 @@ # Template file for 'python3-vispy' pkgname=python3-vispy version=0.6.1 -revision=5 +revision=6 wrksrc="vispy-${version}" build_style=python3-module build_helper=numpy @@ -14,6 +14,7 @@ license="BSD-3-Clause" homepage="http://vispy.org" distfiles="${PYPI_SITE}/v/vispy/vispy-${version}.tar.gz" checksum=8f4cf863a1c6142338d06cf3f824e75373dd45a4ce9a9a133e1c36b662f49aa1 +conf_files="/etc/jupyter/nbconfig/notebook.d/vispy.json" post_install() { vlicense LICENSE.txt From c47b34f5ccfeb7994d4a7f475ea30854b08acc1f 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, 6 Sep 2022 10:31:17 +0700 Subject: [PATCH 1110/1407] 99-pkglint: forbid /usr/etc data files should go to /usr/share, config files should go to /etc --- common/hooks/pre-pkg/99-pkglint.sh | 2 +- common/wrappers/which.sh | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 common/wrappers/which.sh diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh index 325938f5d541..7e40e81f2b42 100644 --- a/common/hooks/pre-pkg/99-pkglint.sh +++ b/common/hooks/pre-pkg/99-pkglint.sh @@ -22,7 +22,7 @@ hook() { fi done - for f in var/run usr/local; do + for f in var/run usr/local usr/etc; do if [ -d ${PKGDESTDIR}/${f} ]; then msg_red "${pkgver}: /${f} directory is not allowed, remove it!\n" error=1 diff --git a/common/wrappers/which.sh b/common/wrappers/which.sh new file mode 100644 index 000000000000..3dc47063b2ee --- /dev/null +++ b/common/wrappers/which.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +ret=0 + +while test $# != 0; do + case "$1" in + -*) ;; + *) command -v "$1" || ret=1 ;; + esac + shift +done + +exit "$ret" From 5d9b9e834093b44b86077081a19e01e72390f6c4 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, 6 Sep 2022 10:33:49 +0700 Subject: [PATCH 1111/1407] build-style/waf3: set config dir to /etc --- common/build-style/waf3.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/common/build-style/waf3.sh b/common/build-style/waf3.sh index 54fd221172b7..c135a13f63a1 100644 --- a/common/build-style/waf3.sh +++ b/common/build-style/waf3.sh @@ -13,6 +13,7 @@ do_configure() { PYTHON=/usr/bin/python3 python3 ${configure_script} configure \ --prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \ + --configdir=/etc \ ${configure_args} ${cross_args} } From 17f53552c6f1bdff9c0a0130998dc425f4be342a 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, 6 Sep 2022 10:35:53 +0700 Subject: [PATCH 1112/1407] ardour: move config to /etc, reduce clone overhead --- srcpkgs/ardour/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template index c2f1c13649f5..e9176413cd7c 100644 --- a/srcpkgs/ardour/template +++ b/srcpkgs/ardour/template @@ -1,12 +1,11 @@ # Template file for 'ardour' pkgname=ardour version=6.9 -revision=1 -_commit="945c8f288077565fe3de32c6ac0cb50e286722e4" +revision=2 build_style=waf3 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy --libjack=weak --optimize --docs --use-external-libs --freedesktop" -hostmakedepends="git python3 graphviz doxygen pkg-config clang perl +hostmakedepends="graphviz doxygen pkg-config clang perl itstool gettext tar readline-devel" makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel @@ -20,6 +19,8 @@ license="GPL-2.0-or-later" homepage="http://ardour.org" CXXFLAGS="-fpermissive" +PATH="/usr/libexec/chroot-git:$PATH" +conf_files="/etc/ardour6/*" case "$XBPS_TARGET_MACHINE" in x86_64*) configure_args+=" --dist-target=x86_64" ;; @@ -34,9 +35,12 @@ esac # Upstream deletes older release tarballs from their site and # GitHub tarballs are empty: https://tracker.ardour.org/view.php?id=7328 do_fetch() { - git clone https://github.com/Ardour/ardour ${wrksrc} + rm -rf ${wrksrc} + git clone \ + --filter=blob:none \ + https://github.com/Ardour/ardour ${wrksrc} cd ${wrksrc} - git checkout ${_commit} + git checkout ${version} } post_install() { From baf355ab42d15dd2d5f77dc50d65fcc44b9e5860 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, 2 Sep 2022 22:25:20 +0700 Subject: [PATCH 1113/1407] New package: sunpinyin-3.0.0rc2 Close #38980 --- common/shlibs | 1 + srcpkgs/ibus-sunpinyin | 1 + srcpkgs/libsunpinyin | 1 + srcpkgs/libsunpinyin-devel | 1 + srcpkgs/sunpinyin/patches/libexecdir.patch | 11 +++ srcpkgs/sunpinyin/patches/pkg-config.patch | 10 ++ srcpkgs/sunpinyin/patches/version.patch | 22 +++++ srcpkgs/sunpinyin/template | 102 +++++++++++++++++++++ 8 files changed, 149 insertions(+) create mode 120000 srcpkgs/ibus-sunpinyin create mode 120000 srcpkgs/libsunpinyin create mode 120000 srcpkgs/libsunpinyin-devel create mode 100644 srcpkgs/sunpinyin/patches/libexecdir.patch create mode 100644 srcpkgs/sunpinyin/patches/pkg-config.patch create mode 100644 srcpkgs/sunpinyin/patches/version.patch create mode 100644 srcpkgs/sunpinyin/template diff --git a/common/shlibs b/common/shlibs index 8b4edbd9ce66..980f4024ca05 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4159,3 +4159,4 @@ libsyncthingmodel.so.1.2.2 syncthingtray-1.2.2_1 libsyncthingconnector.so.1.2.2 syncthingtray-1.2.2_1 libglibutil.so.1 libglibutil-1.0.64_1 libgbinder.so.1 libgbinder-1.1.20_1 +libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1 diff --git a/srcpkgs/ibus-sunpinyin b/srcpkgs/ibus-sunpinyin new file mode 120000 index 000000000000..b816e4b6f020 --- /dev/null +++ b/srcpkgs/ibus-sunpinyin @@ -0,0 +1 @@ +sunpinyin \ No newline at end of file diff --git a/srcpkgs/libsunpinyin b/srcpkgs/libsunpinyin new file mode 120000 index 000000000000..b816e4b6f020 --- /dev/null +++ b/srcpkgs/libsunpinyin @@ -0,0 +1 @@ +sunpinyin \ No newline at end of file diff --git a/srcpkgs/libsunpinyin-devel b/srcpkgs/libsunpinyin-devel new file mode 120000 index 000000000000..b816e4b6f020 --- /dev/null +++ b/srcpkgs/libsunpinyin-devel @@ -0,0 +1 @@ +sunpinyin \ No newline at end of file diff --git a/srcpkgs/sunpinyin/patches/libexecdir.patch b/srcpkgs/sunpinyin/patches/libexecdir.patch new file mode 100644 index 000000000000..09a5c9cb5669 --- /dev/null +++ b/srcpkgs/sunpinyin/patches/libexecdir.patch @@ -0,0 +1,11 @@ +--- a/wrapper/ibus/SConstruct ++++ b/wrapper/ibus/SConstruct +@@ -71,7 +71,7 @@ PassVariables(envvar, env) + + data_dir = env['DATADIR'] + '/ibus-sunpinyin' + icons_dir = env['DATADIR'] + '/ibus-sunpinyin/icons' +-bin_dir = env['LIBEXECDIR'] + '/ibus-sunpinyin' ++bin_dir = env['LIBEXECDIR'] + gettext_package = 'ibus-sunpinyin' + + extra_cflags = ' -DIBUS_SUNPINYIN_LOCALEDIR=\'"%s"\'' % (env['DATADIR'] + '/locale') diff --git a/srcpkgs/sunpinyin/patches/pkg-config.patch b/srcpkgs/sunpinyin/patches/pkg-config.patch new file mode 100644 index 000000000000..b4ee4efd7efb --- /dev/null +++ b/srcpkgs/sunpinyin/patches/pkg-config.patch @@ -0,0 +1,10 @@ +--- a/sunpinyin-2.0.pc.in ++++ b/sunpinyin-2.0.pc.in +@@ -1,6 +1,6 @@ + prefix=@PREFIX@ + exec_prefix=${prefix} +-libdir=@LIBDIR@ ++libdir=${exec_prefix}/lib + includedir=${exec_prefix}/include/sunpinyin-2.0 + + Name: libsunpinyin diff --git a/srcpkgs/sunpinyin/patches/version.patch b/srcpkgs/sunpinyin/patches/version.patch new file mode 100644 index 000000000000..3ca4102f6030 --- /dev/null +++ b/srcpkgs/sunpinyin/patches/version.patch @@ -0,0 +1,22 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -7,7 +7,7 @@ import sys + + import SCons.Errors + +-version = "2.0.4" ++version = "3.0.0-rc2" + abi_major = 3 + abi_minor = 0 + +--- a/wrapper/ibus/SConstruct ++++ b/wrapper/ibus/SConstruct +@@ -14,7 +14,7 @@ sources = ['src/debug.cpp', + locales = ['zh_CN'] + + cflags = '-O2 -g -pipe ' +-version = '2.0.3' ++version = '3.0.0-rc2' + + AddOption('--prefix', dest='prefix', metavar='DIR', + help='installation prefix') diff --git a/srcpkgs/sunpinyin/template b/srcpkgs/sunpinyin/template new file mode 100644 index 000000000000..01b55eb4e36c --- /dev/null +++ b/srcpkgs/sunpinyin/template @@ -0,0 +1,102 @@ +# Template file for 'sunpinyin' +pkgname=sunpinyin +version=3.0.0rc2 +revision=1 +wrksrc="sunpinyin-${version/rc/-rc}" +build_style=scons +hostmakedepends="pkg-config python3 perl gettext" +makedepends="python3-devel sqlite-devel ibus-devel" +short_desc="Statistical language model based Chinese input method" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-or-later, CDDL-1.0" +homepage="https://github.com/sunpinyin/sunpinyin" +# fcitx has this archive, too +_lm_sc=lm_sc.3gm.arpa-20140820.tar.bz2 +_dict=dict.utf8-20131214.tar.bz2 +distfiles="https://github.com/sunpinyin/sunpinyin/archive/refs/tags/v${version/rc/-rc}.tar.gz + https://downloads.sourceforge.net/project/open-gram/$_lm_sc + https://downloads.sourceforge.net/project/open-gram/$_dict" +checksum="6722bd41e58b0a42bf41b7c1cb7707e6adfce810ab35597f938c5df8aa5a0af0 + 751bab7c55ea93a2cedfb0fbb7eb09f67d4da9c2c55496e5f31eb8580f1d1e2f + af70bc2bcd7af7468495774fed9e3a2de434650119fbc3d3388c2bcf7e0acb01" +skip_extraction="$_lm_sc $_dict" +CXXFLAGS="-I../../src" +LDFLAGS="-L." + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" sunpinyin" +fi + +do_configure() { + cat <<-EOF >configure.conf + PREFIX = '/usr' + LIBDIR = '/usr/lib' + DATADIR = '/usr/share' + ENABLE_PLUGINS = True + PYTHON = '/usr/bin/python3' + EOF + cat <<-EOF >wrapper/ibus/configure.conf + PREFIX = '/usr' + LIBDIR = '/usr/lib' + LIBEXECDIR = '/usr/libexec' + DATADIR = '/usr/share' + EOF +} + +post_extract() { + local _f + mkdir -p dict + for _f in $skip_extraction; do + bsdtar -C dict -xf "$XBPS_SRCDISTDIR/sunpinyin-$version/$_f" + done + ln -s ../doc/SLM-inst.mk dict/Makefile +} + +post_build() { + PATH="$PATH:$wrksrc/src" + make -C dict ${makejobs} ENDIANESS="${XBPS_TARGET_ENDIAN}" + PKG_CONFIG_PATH="$wrksrc:/usr/lib/pkgconfig:/usr/share/pkgconfig" + PKG_CONFIG_LIBDIR="$wrksrc:/usr/lib/pkgconfig" + # LDFLAGS+=" -Wl,-rpath-link=$wrksrc" + export PKG_CONFIG_PATH PKG_CONFIG_LIBDIR + cd wrapper/ibus + ln -s ../../libsunpinyin.so.*.* libsunpinyin.so + do_build +} + +post_install() { + PKG_CONFIG_PATH="$wrksrc:/usr/lib/pkgconfig:/usr/share/pkgconfig" + PKG_CONFIG_LIBDIR="$wrksrc:/usr/lib/pkgconfig" + # LDFLAGS+=" -Wl,-rpath-link=$wrksrc" + export PKG_CONFIG_PATH PKG_CONFIG_LIBDIR + cd wrapper/ibus + do_install +} + +libsunpinyin_package() { + short_desc+=" - libraries" + pkg_install() { + vmove "usr/lib/*.so.*" + make -C dict install \ + DESTDIR=${PKGDESTDIR} \ + ENDIANESS="${XBPS_TARGET_ENDIAN}" + } +} + +libsunpinyin-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} + +ibus-sunpinyin_package() { + short_desc+=" - IBus plugin" + pkg_install() { + vmove usr/libexec + vmove "usr/share/ibus*" + vmove usr/share/locale + } +} From eddc92f0a0d84c559335ce0445f7ffd204516a92 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, 6 Sep 2022 17:47:21 +0700 Subject: [PATCH 1114/1407] lcov: need make_install_args too --- srcpkgs/lcov/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/lcov/template b/srcpkgs/lcov/template index 33fb098464f7..06b532ffa2b2 100644 --- a/srcpkgs/lcov/template +++ b/srcpkgs/lcov/template @@ -5,6 +5,7 @@ revision=2 build_style=gnu-makefile make_check_target=test make_build_args="CFG_DIR=/etc" +make_install_args="CFG_DIR=/etc" hostmakedepends="perl" depends="perl" short_desc="Front-end for GCC's coverage testing tool gcov" From afd3e57175fc93059913dd29d519ae886d487856 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, 6 Sep 2022 17:49:32 +0700 Subject: [PATCH 1115/1407] sunpinyin: touch to build --- srcpkgs/sunpinyin/template | 2 -- 1 file changed, 2 deletions(-) diff --git a/srcpkgs/sunpinyin/template b/srcpkgs/sunpinyin/template index 01b55eb4e36c..647be4edb4dc 100644 --- a/srcpkgs/sunpinyin/template +++ b/srcpkgs/sunpinyin/template @@ -57,7 +57,6 @@ post_build() { make -C dict ${makejobs} ENDIANESS="${XBPS_TARGET_ENDIAN}" PKG_CONFIG_PATH="$wrksrc:/usr/lib/pkgconfig:/usr/share/pkgconfig" PKG_CONFIG_LIBDIR="$wrksrc:/usr/lib/pkgconfig" - # LDFLAGS+=" -Wl,-rpath-link=$wrksrc" export PKG_CONFIG_PATH PKG_CONFIG_LIBDIR cd wrapper/ibus ln -s ../../libsunpinyin.so.*.* libsunpinyin.so @@ -67,7 +66,6 @@ post_build() { post_install() { PKG_CONFIG_PATH="$wrksrc:/usr/lib/pkgconfig:/usr/share/pkgconfig" PKG_CONFIG_LIBDIR="$wrksrc:/usr/lib/pkgconfig" - # LDFLAGS+=" -Wl,-rpath-link=$wrksrc" export PKG_CONFIG_PATH PKG_CONFIG_LIBDIR cd wrapper/ibus do_install From 7571b2d1f03e7d6f8d058a785d20f884acc5cade Mon Sep 17 00:00:00 2001 From: icp Date: Sat, 27 Aug 2022 00:48:47 +0530 Subject: [PATCH 1116/1407] New package: python3-pytz_deprecation_shim-0.1.0 --- .../patches/tzdata.patch | 10 ++++++++++ srcpkgs/python3-pytz_deprecation_shim/template | 16 ++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 srcpkgs/python3-pytz_deprecation_shim/patches/tzdata.patch create mode 100644 srcpkgs/python3-pytz_deprecation_shim/template diff --git a/srcpkgs/python3-pytz_deprecation_shim/patches/tzdata.patch b/srcpkgs/python3-pytz_deprecation_shim/patches/tzdata.patch new file mode 100644 index 000000000000..672b27945d42 --- /dev/null +++ b/srcpkgs/python3-pytz_deprecation_shim/patches/tzdata.patch @@ -0,0 +1,10 @@ +--- a/setup.cfg ++++ b/setup.cfg +@@ -33,7 +33,6 @@ packages = pytz_deprecation_shim + install_requires = + backports.zoneinfo;python_version>="3.6" and python_version<"3.9" + python-dateutil;python_version<"3.6" +- tzdata;python_version>="3.6" + python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.* + package_dir = + =src diff --git a/srcpkgs/python3-pytz_deprecation_shim/template b/srcpkgs/python3-pytz_deprecation_shim/template new file mode 100644 index 000000000000..04368a25c89e --- /dev/null +++ b/srcpkgs/python3-pytz_deprecation_shim/template @@ -0,0 +1,16 @@ +# Template file for 'python3-pytz_deprecation_shim' +pkgname=python3-pytz_deprecation_shim +version=0.1.0 +revision=1 +wrksrc="pytz-deprecation-shim-${version}" +build_style=python3-pep517 +hostmakedepends="python3-wheel" +depends="python3" +checkdepends="python3-pytz python3-attrs python3-hypothesis python3-pytest-xdist" +short_desc="Shims to make deprecation of pytz easier" +maintainer="icp " +license="Apache-2.0" +homepage="https://github.com/pganssle/pytz-deprecation-shim" +distfiles="https://github.com/pganssle/pytz-deprecation-shim/archive/refs/tags/${version}.tar.gz" +checksum=b72ff0470c084d70e93174e9881443aba274ef6ec3cc6c4bd88bd0ba64ea8bdd +make_check_pre="env PYTHONPATH=src" From ab76663bae95897110858605e5beb291caccf2e1 Mon Sep 17 00:00:00 2001 From: icp Date: Sat, 27 Aug 2022 00:49:02 +0530 Subject: [PATCH 1117/1407] python3-tzlocal: update to 4.2. --- .../python3-tzlocal/patches/fix-test.patch | 12 +++++++++ srcpkgs/python3-tzlocal/template | 26 +++++++------------ 2 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 srcpkgs/python3-tzlocal/patches/fix-test.patch diff --git a/srcpkgs/python3-tzlocal/patches/fix-test.patch b/srcpkgs/python3-tzlocal/patches/fix-test.patch new file mode 100644 index 000000000000..7b5623df6960 --- /dev/null +++ b/srcpkgs/python3-tzlocal/patches/fix-test.patch @@ -0,0 +1,12 @@ +--- a/tests/test_tzlocal.py ++++ b/tests/test_tzlocal.py +@@ -205,6 +205,9 @@ + + + def test_win32_no_dst(mocker): ++ sys.modules["winreg"] = MagicMock() ++ import tzlocal.win32 ++ + mocker.patch("tzlocal.utils.assert_tz_offset") + valuesmock = mocker.patch("tzlocal.win32.valuestodict") + diff --git a/srcpkgs/python3-tzlocal/template b/srcpkgs/python3-tzlocal/template index bc7ddacaf321..7b40a12dfe4a 100644 --- a/srcpkgs/python3-tzlocal/template +++ b/srcpkgs/python3-tzlocal/template @@ -1,28 +1,20 @@ # Template file for 'python3-tzlocal' pkgname=python3-tzlocal -version=2.1 -revision=4 +version=4.2 +revision=1 wrksrc="tzlocal-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-pytz" -checkdepends="python3-pytz python3-mock" +build_style=python3-pep517 +hostmakedepends="python3-wheel" +depends="python3-pytz_deprecation_shim" +checkdepends="${depends} python3-pytest-mock python3-pytest-xdist" short_desc="Return the tzinfo object for the local timezone (Python 3)" maintainer="Orphaned " license="MIT" homepage="https://github.com/regebro/tzlocal" changelog="https://raw.githubusercontent.com/regebro/tzlocal/master/CHANGES.txt" -distfiles="${PYPI_SITE}/t/tzlocal/tzlocal-${version}.tar.gz" -checksum=643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44 - -post_patch() { - # In tzlocal development tree, below file is a symlink - # Hence, the check correctly report its value - rm -f tests/test_data/symlink_localtime/etc/localtime - ln -s ../usr/share/zoneinfo/Africa/Harare \ - tests/test_data/symlink_localtime/etc/localtime -} +distfiles="https://github.com/regebro/tzlocal/archive/refs/tags/${version}.tar.gz" +checksum=9bbfaedb6083467003bd1a622a412a7b2f1608f45b2d9132bf936f55fe72d65e post_install() { - vlicense LICENSE.txt LICENSE + vlicense LICENSE.txt } From 4fa0eb035868e3ed8c225f5ef791c6a5cd06247d Mon Sep 17 00:00:00 2001 From: icp Date: Sat, 27 Aug 2022 01:29:18 +0530 Subject: [PATCH 1118/1407] remhind: add missing dep, enable tests --- srcpkgs/remhind/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/remhind/template b/srcpkgs/remhind/template index fc490d8f96bb..95822e0a45c7 100644 --- a/srcpkgs/remhind/template +++ b/srcpkgs/remhind/template @@ -1,11 +1,12 @@ # Template file for 'remhind' pkgname=remhind version=0.1.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools python3-gobject-devel python3-cairo-devel" depends="python3-icalendar python3-dateutil python3-gobject python3-toml - python3-tzlocal python3-xdg-variables python3-inotify python3-aionotify" + python3-tzlocal python3-xdg-variables python3-inotify python3-aionotify libnotify" +checkdepends="${depends} python3-freezegun python3-pytest-xdist" short_desc="Notification daemon of events stored in directories" maintainer="Stacy Harper " license="GPL-3.0-only" From 465be592fcb4dc912ee419eeb9708fc406ef8eba Mon Sep 17 00:00:00 2001 From: icp Date: Mon, 29 Aug 2022 01:09:27 +0530 Subject: [PATCH 1119/1407] ripe-atlas-tools: update to 3.0.2. --- srcpkgs/ripe-atlas-tools/template | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/srcpkgs/ripe-atlas-tools/template b/srcpkgs/ripe-atlas-tools/template index dee72787f622..c7f6b72002f4 100644 --- a/srcpkgs/ripe-atlas-tools/template +++ b/srcpkgs/ripe-atlas-tools/template @@ -1,22 +1,27 @@ # Template file for 'ripe-atlas-tools' pkgname=ripe-atlas-tools -version=2.3.0 -revision=4 +version=3.0.2 +revision=1 build_style=python3-module -pycompile_module="ripe/atlas/tools" hostmakedepends="python3-setuptools" -depends=" - python3-tzlocal python3-yaml python3-six python3-dateutil python3-openssl - python3-ripe-atlas-sagan python3-ripe-atlas-cousteau python3-IPy" -short_desc="The official command-line client for RIPE Atlas" +depends="python3-tzlocal python3-yaml python3-dateutil python3-openssl + python3-ripe-atlas-sagan python3-ripe-atlas-cousteau python3-IPy python3-requests" +checkdepends="${depends} python3-Sphinx python3-pytest" +short_desc="Official command-line client for RIPE Atlas" maintainer="johannes " license="GPL-3.0-or-later" homepage="https://github.com/ripe-ncc/ripe-atlas-tools" -distfiles="https://github.com/ripe-ncc/${pkgname}/archive/v${version}.tar.gz" -checksum=29d90c12b27f339cfb4f03d5cb758541f2c67060b1f619079d338b85d8c50931 +changelog="https://raw.githubusercontent.com/RIPE-NCC/ripe-atlas-tools/master/CHANGES.rst" +distfiles="https://github.com/RIPE-NCC/ripe-atlas-tools/archive/refs/tags/v${version}.tar.gz" +checksum=9bc4f17ad77cc3c7b64ca05c18395bc0f2f46fd2d4fde6e14e60c3e02fe1a119 +make_check_pre="env PYTHONPATH=. PATH=scripts:${PATH}" -post_install() { - vinstall ripe-atlas-bash-completion.sh 644 \ - usr/share/bash-completion/completions ripe-atlas-tools +pre_check() { + # hack to make pytest work with namespace packages + rm ripe/atlas/__init__.py + rm ripe/__init__.py } +post_install() { + vcompletion ripe-atlas-bash-completion.sh bash ripe-atlas +} From e395b2d6706956b6ee7313e322bd337d52f7a111 Mon Sep 17 00:00:00 2001 From: icp Date: Mon, 29 Aug 2022 19:10:34 +0530 Subject: [PATCH 1120/1407] python3-tasklib: enable tests Close: #38961 --- srcpkgs/python3-tasklib/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/python3-tasklib/template b/srcpkgs/python3-tasklib/template index 3787fdc764af..6a843cd148d7 100644 --- a/srcpkgs/python3-tasklib/template +++ b/srcpkgs/python3-tasklib/template @@ -4,9 +4,10 @@ version=2.4.3 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-module +make_check_target="tasklib/tests.py" hostmakedepends="python3-setuptools" depends="task python3-tzlocal python3-pytz" -checkdepends="$depends" +checkdepends="${depends} python3-pytest-xdist" short_desc="Library for interacting with taskwarrior databases (Python3)" maintainer="Cullen Ross " license="BSD-3-Clause" From 67b9bc5a3c3bede03e63f6d8b8326d3f55fafbf8 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, 6 Sep 2022 18:32:41 +0700 Subject: [PATCH 1121/1407] update-check: special case for XFCE Archive --- common/xbps-src/shutils/update_check.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh index 40126bc5925e..17fa67fda1d4 100644 --- a/common/xbps-src/shutils/update_check.sh +++ b/common/xbps-src/shutils/update_check.sh @@ -26,6 +26,7 @@ update_check() { case "$distfiles" in # only consider versions those exist in ftp.gnome.org *ftp.gnome.org*) ;; + *archive.xfce.org*) ;; *) printf '%s\n' "$homepage" ;; esac @@ -58,6 +59,7 @@ update_check() { *//gitlab.*|\ *bitbucket.org*|\ *ftp.gnome.org*|\ + *archive.xfce.org*|\ *kernel.org/pub/linux/kernel/*|\ *cran.r-project.org/src/contrib*|\ *rubygems.org*|\ @@ -137,6 +139,9 @@ update_check() { *ftp.gnome.org*|*download.gnome.org*) : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"} url="https://download.gnome.org/sources/$pkgname/cache.json";; + *archive.xfce.org*) + : ${pattern="\Q$pkgname\E-\K((([4-9]|([1-9][0-9]+))\.[0-9]*[02468]\.[0-9.]*[0-9])|([0-3]\.[0-9.]*))(?=.tar)"} + url="https://archive.xfce.org/feeds/project/$pkgname" ;; *kernel.org/pub/linux/kernel/*) rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';; *cran.r-project.org/src/contrib*) From b3ce799398e249c4ca86c8718a4600b250333753 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, 6 Sep 2022 18:34:18 +0700 Subject: [PATCH 1122/1407] update-check: update all gnome case to have both ftp. and download. --- common/xbps-src/shutils/update_check.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh index 17fa67fda1d4..e7193c98ffad 100644 --- a/common/xbps-src/shutils/update_check.sh +++ b/common/xbps-src/shutils/update_check.sh @@ -24,8 +24,8 @@ update_check() { if [ -z "$site" ]; then case "$distfiles" in - # only consider versions those exist in ftp.gnome.org - *ftp.gnome.org*) ;; + # special case those sites provide better source elsewhere + *ftp.gnome.org*|*download.gnome.org*) ;; *archive.xfce.org*) ;; *) printf '%s\n' "$homepage" ;; @@ -58,7 +58,7 @@ update_check() { *github.com*|\ *//gitlab.*|\ *bitbucket.org*|\ - *ftp.gnome.org*|\ + *ftp.gnome.org*|*download.gnome.org*|\ *archive.xfce.org*|\ *kernel.org/pub/linux/kernel/*|\ *cran.r-project.org/src/contrib*|\ @@ -137,7 +137,7 @@ update_check() { url="https://bitbucket.org/$pkgurlname/downloads" rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar)';; *ftp.gnome.org*|*download.gnome.org*) - : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"} + : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=.tar)"} url="https://download.gnome.org/sources/$pkgname/cache.json";; *archive.xfce.org*) : ${pattern="\Q$pkgname\E-\K((([4-9]|([1-9][0-9]+))\.[0-9]*[02468]\.[0-9.]*[0-9])|([0-3]\.[0-9.]*))(?=.tar)"} From 439fe562548ffbb0fba6768fc41bd1df1c590328 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, 6 Sep 2022 18:36:03 +0700 Subject: [PATCH 1123/1407] catfish: update to 4.16.4. --- srcpkgs/catfish/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template index 9c5170152d9c..9bdd7e4779e5 100644 --- a/srcpkgs/catfish/template +++ b/srcpkgs/catfish/template @@ -1,7 +1,7 @@ # Template file for 'catfish' pkgname=catfish -version=4.16.3 -revision=2 +version=4.16.4 +revision=1 build_style=python3-module hostmakedepends="intltool python3-distutils-extra python3-gobject" depends="desktop-file-utils gtk+3 hicolor-icon-theme python3-gobject @@ -11,4 +11,4 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://docs.xfce.org/apps/catfish/start" distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2" -checksum=e9a99a62d10981391508dd43f3cbfa2d50a69bd6b7d1eeef7d30ba4c673dcfda +checksum=6e5c01c534de7a8ce911965c4cd298c5b5d2079e0bc29c91b1e310c9884bb5fc From 70a9dd8beb1b744cf8749052e7f254e8f01c9f78 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, 6 Sep 2022 18:49:34 +0700 Subject: [PATCH 1124/1407] xfce4: remove obsolete update ignore list --- srcpkgs/Thunar/update | 2 +- srcpkgs/exo/update | 1 - srcpkgs/garcon/update | 1 - srcpkgs/libxfce4ui/update | 1 - srcpkgs/libxfce4util/update | 1 - srcpkgs/tumbler/update | 1 - srcpkgs/xfce4-appfinder/update | 1 - srcpkgs/xfce4-dev-tools/update | 1 - srcpkgs/xfce4-panel/update | 1 - srcpkgs/xfce4-power-manager/update | 1 - srcpkgs/xfce4-session/update | 1 - srcpkgs/xfce4-settings/update | 1 - srcpkgs/xfce4-taskmanager/update | 1 - srcpkgs/xfce4-terminal/update | 1 - srcpkgs/xfconf/update | 1 - srcpkgs/xfdesktop/update | 1 - srcpkgs/xfwm4/update | 1 - 17 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 srcpkgs/exo/update delete mode 100644 srcpkgs/garcon/update delete mode 100644 srcpkgs/libxfce4ui/update delete mode 100644 srcpkgs/libxfce4util/update delete mode 100644 srcpkgs/tumbler/update delete mode 100644 srcpkgs/xfce4-appfinder/update delete mode 100644 srcpkgs/xfce4-dev-tools/update delete mode 100644 srcpkgs/xfce4-panel/update delete mode 100644 srcpkgs/xfce4-power-manager/update delete mode 100644 srcpkgs/xfce4-session/update delete mode 100644 srcpkgs/xfce4-settings/update delete mode 100644 srcpkgs/xfce4-taskmanager/update delete mode 100644 srcpkgs/xfce4-terminal/update delete mode 100644 srcpkgs/xfconf/update delete mode 100644 srcpkgs/xfdesktop/update delete mode 100644 srcpkgs/xfwm4/update diff --git a/srcpkgs/Thunar/update b/srcpkgs/Thunar/update index 5636324afbce..809cfc48dd02 100644 --- a/srcpkgs/Thunar/update +++ b/srcpkgs/Thunar/update @@ -1 +1 @@ -ignore="*.*[13579].*" +pkgname=thunar diff --git a/srcpkgs/exo/update b/srcpkgs/exo/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/exo/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/garcon/update b/srcpkgs/garcon/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/garcon/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/libxfce4ui/update b/srcpkgs/libxfce4ui/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/libxfce4ui/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/libxfce4util/update b/srcpkgs/libxfce4util/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/libxfce4util/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/tumbler/update b/srcpkgs/tumbler/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/tumbler/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/xfce4-appfinder/update b/srcpkgs/xfce4-appfinder/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/xfce4-appfinder/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/xfce4-dev-tools/update b/srcpkgs/xfce4-dev-tools/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/xfce4-dev-tools/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/xfce4-panel/update b/srcpkgs/xfce4-panel/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/xfce4-panel/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/xfce4-power-manager/update b/srcpkgs/xfce4-power-manager/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/xfce4-power-manager/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/xfce4-session/update b/srcpkgs/xfce4-session/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/xfce4-session/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/xfce4-settings/update b/srcpkgs/xfce4-settings/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/xfce4-settings/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/xfce4-taskmanager/update b/srcpkgs/xfce4-taskmanager/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/xfce4-taskmanager/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/xfce4-terminal/update b/srcpkgs/xfce4-terminal/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/xfce4-terminal/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/xfconf/update b/srcpkgs/xfconf/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/xfconf/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/xfdesktop/update b/srcpkgs/xfdesktop/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/xfdesktop/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" diff --git a/srcpkgs/xfwm4/update b/srcpkgs/xfwm4/update deleted file mode 100644 index 5636324afbce..000000000000 --- a/srcpkgs/xfwm4/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.*[13579].*" From a2e54b7d62b69fed935b139d8a3ac94d9948b0b4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 5 Sep 2022 13:43:54 -0400 Subject: [PATCH 1125/1407] python3-aiofiles: update to 22.1.0. --- srcpkgs/python3-aiofiles/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-aiofiles/template b/srcpkgs/python3-aiofiles/template index d4c6a5445630..521888de247b 100644 --- a/srcpkgs/python3-aiofiles/template +++ b/srcpkgs/python3-aiofiles/template @@ -1,6 +1,6 @@ # Template file for 'python3-aiofiles' pkgname=python3-aiofiles -version=0.8.0 +version=22.1.0 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-pep517 @@ -13,7 +13,7 @@ license="Apache-2.0" homepage="https://github.com/Tinche/aiofiles" changelog="https://raw.githubusercontent.com/Tinche/aiofiles/master/README.rst" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=1ee866ce57b47e2f5ae2c06c0372458a6eb08131a9b1d7216a234fa0d516d638 +checksum=47b4e8fe8c6d07b85810badcfb38366c567db7add200cef2aeb8376e9c34f46f do_check() { PYTHONPATH=src python3 -m pytest From 7297b8d614a47eb3c225ee8f6e0008519f9b1a98 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 5 Sep 2022 13:45:02 -0400 Subject: [PATCH 1126/1407] python3-executing: update to 1.0.0. --- srcpkgs/python3-executing/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-executing/template b/srcpkgs/python3-executing/template index 72e15ae4b9df..6813ea7a4af5 100644 --- a/srcpkgs/python3-executing/template +++ b/srcpkgs/python3-executing/template @@ -1,6 +1,6 @@ # Template file for 'python3-executing' pkgname=python3-executing -version=0.10.0 +version=1.0.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/alexmojaki/executing" distfiles="${PYPI_SITE}/e/executing/executing-${version}.tar.gz" -checksum=d1cd87c2e371e9966261410c5b3769d6df2f9e4a79a83eebd2662dd3388f9833 +checksum=98daefa9d1916a4f0d944880d5aeaf079e05585689bebd9ff9b32e31dd5e1017 do_check() { PYTHONPATH="$(cd build/lib* && pwd)" python3 tests/test_main.py From c02ee5e12c79a1a09db7dc7b41b2e6c8887bba06 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 5 Sep 2022 13:45:47 -0400 Subject: [PATCH 1127/1407] python3-imageio: update to 2.21.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 eb57ff350f6e..7008256aecd5 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.21.1 +version=2.21.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=fcaf380f00a6b5031c09b486e83ddf2f3ad2548310e76fa9771491f2e6ced40e +checksum=cf7159c99e7724440c856eff711a477936d8987c347c62070de42f0b413e7f68 post_install() { vlicense LICENSE From 244e761b35e83457b89ba84b56c853dd4ea57e9a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 5 Sep 2022 13:50:38 -0400 Subject: [PATCH 1128/1407] python3-pandas: update to 1.4.4. --- srcpkgs/python3-pandas/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template index 572e9961dd4c..4774297b7455 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.3 +version=1.4.4 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=8e9d21e75b7df9934f0f61801a11ff548459a8cb3fe7ada366f2a797e0d651aa +checksum=37d79a0cc428f835197706ea4d3f47c75a2e28ad6a7a0bed174c8513deca55fc pre_build() { # setup.py allows a -j argument to parallelize builds From 2f874f344689bc452a79e6ee1853d4976f794921 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 5 Sep 2022 13:51:08 -0400 Subject: [PATCH 1129/1407] python3-prompt_toolkit: update to 3.0.31. --- srcpkgs/python3-prompt_toolkit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template index 663bb18d5a93..1f3c079e31ca 100644 --- a/srcpkgs/python3-prompt_toolkit/template +++ b/srcpkgs/python3-prompt_toolkit/template @@ -1,6 +1,6 @@ # Template file for 'python3-prompt_toolkit' pkgname=python3-prompt_toolkit -version=3.0.30 +version=3.0.31 revision=1 wrksrc="prompt_toolkit-${version}" build_style=python3-module @@ -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=859b283c50bde45f5f97829f77a4674d1c1fcd88539364f1b28a37805cfd89c0 +checksum=9ada952c9d1787f52ff6d5f3484d0b4df8952787c087edf6a1f7c2cb1ea88148 conflicts="python3-prompt_toolkit2<=2.0.9_4" post_install() { From 826af3f1cab85dc73ef3992fef1eeb4dfe51e256 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 5 Sep 2022 14:27:32 -0400 Subject: [PATCH 1130/1407] python3-scipy: update to 1.9.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 ff611661243e..209911f06609 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.9.0 +version=1.9.1 revision=1 wrksrc="scipy-${version}" build_style=python3-module @@ -17,7 +17,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.gz" -checksum=c0dfd7d2429452e7e94904c6a3af63cbaa3cf51b348bd9d35b42db7e9ad42791 +checksum=26d28c468900e6d5fdb37d2812ab46db0ccd22c63baa095057871faa3a498bc9 build_options="openblas" From 88cbc0f80ca82a758af1451bbcd9fc3ee8c4b7f2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 5 Sep 2022 14:30:06 -0400 Subject: [PATCH 1131/1407] python3-stack_data: update to 0.5.0. --- srcpkgs/python3-stack_data/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-stack_data/template b/srcpkgs/python3-stack_data/template index 7336f4a89c71..e18b3cd67269 100644 --- a/srcpkgs/python3-stack_data/template +++ b/srcpkgs/python3-stack_data/template @@ -1,6 +1,6 @@ # Template file for 'python3-stack_data' pkgname=python3-stack_data -version=0.4.0 +version=0.5.0 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="MIT" homepage="https://github.com/alexmojaki/stack_data" distfiles="${PYPI_SITE}/s/stack_data/stack_data-${version}.tar.gz" -checksum=a90ae7e260f7d15aefeceb46f0a028d4ccb9eb8856475c53e341945342d41ea7 +checksum=715c8855fbf5c43587b141e46cc9d9339cc0d1f8d6e0f98ed0d01c6cb974e29f # Tests require unpackaged dependencies make_check=no From f9d9457d3f4e3d4410badee6da24a0cea5020135 Mon Sep 17 00:00:00 2001 From: matogoro Date: Fri, 1 Jul 2022 16:29:45 -0400 Subject: [PATCH 1132/1407] R: update to 4.2.1. --- srcpkgs/R/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R/template b/srcpkgs/R/template index 20c3f3ba89ba..ce480271de02 100644 --- a/srcpkgs/R/template +++ b/srcpkgs/R/template @@ -1,7 +1,7 @@ # Template file for 'R' pkgname=R -version=4.1.3 -revision=2 +version=4.2.1 +revision=1 build_style=gnu-configure configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R --with-blas$(vopt_if openblas '=openblas') --with-lapack @@ -22,7 +22,7 @@ license="GPL-2.0-or-later" homepage="https://www.r-project.org/" changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html" distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz" -checksum=15ff5b333c61094060b2a52e9c1d8ec55cc42dd029e39ca22abdaa909526fed6 +checksum=4d52db486d27848e54613d4ee977ad952ec08ce17807e1b525b10cd4436c643f nocross=yes shlib_provides="libR.so" make_check=extended From 148e8cb746c41ac6513b878d266c1a59a76b7a53 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 5 Sep 2022 18:32:44 -0700 Subject: [PATCH 1133/1407] python3-lsp-jsonrpc: change maintainer email --- srcpkgs/python3-lsp-jsonrpc/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-lsp-jsonrpc/template b/srcpkgs/python3-lsp-jsonrpc/template index 1455aa108797..395f776c40a6 100644 --- a/srcpkgs/python3-lsp-jsonrpc/template +++ b/srcpkgs/python3-lsp-jsonrpc/template @@ -1,16 +1,17 @@ # Template file for 'python3-lsp-jsonrpc' pkgname=python3-lsp-jsonrpc version=1.0.0 -revision=1 +revision=2 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 " +maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/python-lsp/python-lsp-jsonrpc" +changelog="https://raw.githubusercontent.com/python-lsp/python-lsp-jsonrpc/develop/CHANGELOG.md" distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" checksum=7bec170733db628d3506ea3a5288ff76aa33c70215ed223abdb0d95e957660bd From 538bd3de48cc5ef0513c97ae9a579a7cb25460fd Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 5 Sep 2022 18:33:06 -0700 Subject: [PATCH 1134/1407] python3-lsp-server: update to 1.5.0 --- srcpkgs/python3-lsp-server/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-lsp-server/template b/srcpkgs/python3-lsp-server/template index cda7c928052a..f7bdbdc0dd10 100644 --- a/srcpkgs/python3-lsp-server/template +++ b/srcpkgs/python3-lsp-server/template @@ -1,6 +1,6 @@ # Template file for 'python3-lsp-server' pkgname=python3-lsp-server -version=1.4.1 +version=1.5.0 revision=1 wrksrc="${pkgname/3}-${version}" build_style=python3-module @@ -10,19 +10,21 @@ depends="python3-jedi python3-pluggy python3-lsp-jsonrpc python3-ultrajson 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" + flake8" short_desc="Python implementation of the Language Server Protocol" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/python-lsp/python-lsp-server" +changelog="https://raw.githubusercontent.com/python-lsp/python-lsp-server/develop/CHANGELOG.md" distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" -checksum=be7f83298af9f0951a93972cafc9db04fd7cf5c05f20812515275f0ba70e342f +checksum=e5c094c19925022a27c4068f414b2bb653243f8fb0d768e39735289d7a89380d 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 + --ignore=test/plugins/test_rope_rename.py \ + --ignore=test/plugins/test_yapf_format.py } post_install() { From 5df7afc0f087058b1c577a2ba3202784252a1215 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 6 Aug 2022 04:54:05 +0200 Subject: [PATCH 1135/1407] xbps-src: clean up fetch hook and allow mirroring --- common/environment/build-style/R-cran.sh | 3 +- common/hooks/do-fetch/00-distfiles.sh | 201 ++++++++++++----------- srcpkgs/R-cran-pillar/template | 3 +- 3 files changed, 110 insertions(+), 97 deletions(-) diff --git a/common/environment/build-style/R-cran.sh b/common/environment/build-style/R-cran.sh index ded66793396b..905c3b9dc0c7 100644 --- a/common/environment/build-style/R-cran.sh +++ b/common/environment/build-style/R-cran.sh @@ -4,5 +4,6 @@ wrksrc="${XBPS_BUILDDIR}/${pkgname#R-cran-}" # default to cran if [ -z "$distfiles" ]; then - distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz" + distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz + https://cran.r-project.org/src/contrib/Archive/${pkgname#R-cran-}/${pkgname#R-cran-}_${version//r/-}.tar.gz" fi diff --git a/common/hooks/do-fetch/00-distfiles.sh b/common/hooks/do-fetch/00-distfiles.sh index e2bf54378fe0..5fa394c9c790 100644 --- a/common/hooks/do-fetch/00-distfiles.sh +++ b/common/hooks/do-fetch/00-distfiles.sh @@ -2,24 +2,6 @@ # the $distfiles variable and then verifies its sha256 checksum comparing # its value with the one stored in the $checksum variable. -# Get the checksum for $curfile at index $dfcount -get_cksum() { - local curfile="$1" dfcount="$2" ckcount cksum i - - ckcount=0 - cksum=0 - for i in ${checksum}; do - if [ $dfcount -eq $ckcount -a -n "$i" ]; then - cksum=$i - fi - ckcount=$((ckcount + 1)) - done - if [ -z "$cksum" ]; then - msg_error "$pkgver: cannot find checksum for $curfile.\n" - fi - echo "$cksum" -} - # Return the checksum of the contents of a tarball contents_cksum() { local curfile="$1" cursufx cksum @@ -110,9 +92,7 @@ contents_cksum() { # Verify the checksum for $curfile stored at $distfile and index $dfcount verify_cksum() { - local curfile="$1" distfile="$2" dfcount="$3" filesum cksum - - cksum=$(get_cksum $curfile $dfcount) + local curfile="$1" distfile="$2" cksum="$3" filesum # If the checksum starts with an commercial at (@) it is the contents checksum if [ "${cksum:0:1}" = "@" ]; then @@ -121,7 +101,7 @@ verify_cksum() { filesum=$(contents_cksum "$curfile") if [ "${cksum}" != "$filesum" ]; then echo - msg_red "SHA256 mismatch for '$curfile:'\n@$filesum\n" + msg_red "SHA256 mismatch for '${curfile}:'\n@${filesum}\n" errors=$((errors + 1)) else msg_normal_append "OK.\n" @@ -131,7 +111,7 @@ verify_cksum() { filesum=$(${XBPS_DIGEST_CMD} "$distfile") if [ "$cksum" != "$filesum" ]; then echo - msg_red "SHA256 mismatch for '$curfile:'\n$filesum\n" + msg_red "SHA256 mismatch for '${curfile}:'\n${filesum}\n" errors=$((errors + 1)) else if [ ! -f "$XBPS_SRCDISTDIR/by_sha256/${cksum}_${curfile}" ]; then @@ -145,22 +125,20 @@ verify_cksum() { # Link an existing cksum $distfile for $curfile at index $dfcount link_cksum() { - local curfile="$1" distfile="$2" dfcount="$3" filesum cksum - - cksum=$(get_cksum $curfile $dfcount) - + local curfile="$1" distfile="$2" cksum="$3" if [ -n "$cksum" -a -f "$XBPS_SRCDISTDIR/by_sha256/${cksum}_${curfile}" ]; then ln -f "$XBPS_SRCDISTDIR/by_sha256/${cksum}_${curfile}" "$distfile" msg_normal "$pkgver: using known distfile $curfile.\n" + return 0 fi + return 1 } try_mirrors() { - local curfile="$1" distfile="$2" dfcount="$3" subdir="$4" f="$5" - local filesum cksum basefile mirror path scheme - [ -z "$XBPS_DISTFILES_MIRROR" ] && return + local curfile="$1" distfile="$2" cksum="$3" f="$4" + local filesum basefile mirror path scheme good + [ -z "$XBPS_DISTFILES_MIRROR" ] && return 1 basefile="${f##*/}" - cksum=$(get_cksum $curfile $dfcount) for mirror in $XBPS_DISTFILES_MIRROR; do scheme="file" if [[ $mirror == *://* ]]; then @@ -179,28 +157,80 @@ try_mirrors() { fi if [[ "$mirror" == *voidlinux* ]]; then # For distfiles.voidlinux.* append the subdirectory - mirror="$mirror/$subdir" + mirror="$mirror/$pkgname-$version" fi - msg_normal "$pkgver: fetching distfile '$curfile' from '$mirror'...\n" + msg_normal "$pkgver: fetching distfile '$curfile' from mirror '$mirror'...\n" $fetch_cmd "$mirror/$curfile" # If basefile was not found, but a curfile file may exist, try to fetch it - if [ ! -f "$distfile" -a "$basefile" != "$curfile" ]; then - $fetch_cmd "$mirror/$basefile" - fi + # if [ ! -f "$distfile" -a "$basefile" != "$curfile" ]; then + # msg_normal "$pkgver: fetching distfile '$basefile' from mirror '$mirror'...\n" + # $fetch_cmd "$mirror/$basefile" + # fi [ ! -f "$distfile" ] && continue flock -n ${distfile}.part rm -f ${distfile}.part filesum=$(${XBPS_DIGEST_CMD} "$distfile") - [ "$cksum" == "$filesum" ] && break + if [ "$cksum" == "$filesum" ]; then + return 0 + fi msg_normal "$pkgver: checksum failed - removing '$curfile'...\n" rm -f ${distfile} done + return 1 +} + +try_urls() { + local curfile="$1" + local good= + for i in ${_file_idxs["$curfile"]}; do + local cksum=${_checksums["$i"]} + local url=${_distfiles["$i"]} + + # If distfile does not exist, download it from the original location. + if [[ "$FTP_RETRIES" && "${url}" =~ ^ftp:// ]]; then + max_retries="$FTP_RETRIES" + else + max_retries=1 + fi + for retry in $(seq 1 1 $max_retries); do + if [ ! -f "$distfile" ]; then + if [ "$retry" == 1 ]; then + msg_normal "$pkgver: fetching distfile '$curfile' from '$url'...\n" + else + msg_normal "$pkgver: fetch attempt $retry of $max_retries...\n" + fi + flock "${distfile}.part" $fetch_cmd "$url" + fi + done + + if [ ! -f "$distfile" ]; then + continue + fi + + # distfile downloaded, verify sha256 hash. + flock -n "${distfile}.part" rm -f "${distfile}.part" + verify_cksum "$f" "$distfile" "$cksum" + return 0 + done + return 1 } hook() { local srcdir="$XBPS_SRCDISTDIR/$pkgname-$version" local dfcount=0 dfgood=0 errors=0 max_retries - if [ ! -d "$srcdir" ]; then + local -a _distfiles=($distfiles) + local -a _checksums=($checksum) + local -A _file_idxs + + # Create a map from target file to index in _distfiles/_checksums + for i in ${!_distfiles[@]}; do + f="${_distfiles[$i]}" + curfile="${f#*>}" + curfile="${curfile##*/}" + _file_idxs["$curfile"]+=" $i" + done + + if [[ ! -d "$srcdir" ]]; then mkdir -p -m775 "$srcdir" chgrp $(id -g) "$srcdir" fi @@ -212,87 +242,68 @@ hook() { # Detect bsdtar and GNU tar (in that order of preference) TAR_CMD="$(command -v bsdtar)" - if [ -z "$TAR_CMD" ]; then + if [[ -z "$TAR_CMD" ]]; then TAR_CMD="$(command -v tar)" fi # Detect distfiles with obsolete checksum and purge them from the cache - for f in ${distfiles}; do - curfile="${f#*>}" - curfile="${curfile##*/}" - distfile="$srcdir/$curfile" - - if [ -f "$distfile" ]; then - cksum=$(get_cksum $curfile $dfcount) - if [ "${cksum:0:1}" = "@" ]; then - cksum=${cksum:1} - filesum=$(contents_cksum "$distfile") - else - filesum=$(${XBPS_DIGEST_CMD} "$distfile") - fi - if [ "$cksum" = "$filesum" ]; then - dfgood=$((dfgood + 1)) - else - inode=$(stat "$distfile" --printf "%i") - msg_warn "$pkgver: wrong checksum found for ${curfile} - purging\n" - find ${XBPS_SRCDISTDIR} -inum ${inode} -delete -print + for f in ${!_file_idxs[@]}; do + distfile="$srcdir/$f" + for i in ${_file_idxs["$f"]}; do + if [[ -f $distfile ]]; then + cksum=${_checksums["$i"]} + if [[ ${cksum:0:1} = @ ]]; then + cksum=${cksum:1} + filesum=$(contents_cksum "$distfile") + else + filesum=$(${XBPS_DIGEST_CMD} "$distfile") + fi + if [[ $cksum = $filesum ]]; then + dfgood=$((dfgood + 1)) + else + inode=$(stat "$distfile" --printf "%i") + msg_warn "$pkgver: wrong checksum found for ${curfile} - purging\n" + find ${XBPS_SRCDISTDIR} -inum ${inode} -delete -print + fi fi - fi - dfcount=$((dfcount + 1)) + dfcount=$((dfcount + 1)) + done done # We're done, if all distfiles were found and had good checksums - [ $dfcount -eq $dfgood ] && return + [[ $dfcount -eq $dfgood ]] && return # Download missing distfiles and verify their checksums - dfcount=0 - for f in ${distfiles}; do - curfile="${f#*>}" - curfile="${curfile##*/}" + for curfile in ${!_file_idxs[@]}; do distfile="$srcdir/$curfile" # If file lock cannot be acquired wait until it's available. - while true; do - flock -w 1 ${distfile}.part true - [ $? -eq 0 ] && break + while ! flock -w 1 "${distfile}.part" true; do msg_warn "$pkgver: ${curfile} is already being downloaded, waiting for 1s ...\n" done + + if [[ -f "$distfile" ]]; then + continue + fi + # If distfile does not exist, try to link to it. - if [ ! -f "$distfile" ]; then - link_cksum $curfile $distfile $dfcount + if link_cksum "$curfile" "$distfile" "${_checksums[0]}"; then + continue fi + # If distfile does not exist, download it from a mirror location. - if [ ! -f "$distfile" ]; then - try_mirrors $curfile $distfile $dfcount $pkgname-$version $f - fi - # If distfile does not exist, download it from the original location. - if [[ "$FTP_RETRIES" && "${f}" =~ ^ftp:// ]]; then - max_retries="$FTP_RETRIES" - else - max_retries=1 + if try_mirrors "$curfile" "$distfile" "${_checksums[0]}" "${_distfiles[0]}"; then + continue fi - for retry in $(seq 1 1 $max_retries); do - if [ ! -f "$distfile" ]; then - if [ "$retry" == 1 ]; then - msg_normal "$pkgver: fetching distfile '$curfile'...\n" - else - msg_normal "$pkgver: fetch attempt $retry of $max_retries...\n" - fi - flock "${distfile}.part" $fetch_cmd "$f" - fi - done - if [ ! -f "$distfile" ]; then - msg_error "$pkgver: failed to fetch $curfile.\n" + + if ! try_urls "$curfile"; then + msg_error "$pkgver: failed to fetch '$curfile'.\n" fi - # distfile downloaded, verify sha256 hash. - flock -n ${distfile}.part rm -f ${distfile}.part - verify_cksum $curfile $distfile $dfcount - dfcount=$((dfcount + 1)) done unset TAR_CMD - if [ $errors -gt 0 ]; then + if [[ $errors -gt 0 ]]; then msg_error "$pkgver: couldn't verify distfiles, exiting...\n" fi } diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template index e041a7a7c4b9..d8d381b8e4ac 100644 --- a/srcpkgs/R-cran-pillar/template +++ b/srcpkgs/R-cran-pillar/template @@ -11,4 +11,5 @@ short_desc="Coloured Formatting for Columns" maintainer="Florian Wagner " license="GPL-3.0-or-later" homepage="https://github.com/r-lib/pillar/" -checksum=0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672 +checksum="0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672 + 0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672" From aca39b0cd2bfd7d3568b19e4d2b0a8251c3c8efc Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:15:29 -0800 Subject: [PATCH 1136/1407] R-cran-R6: update to 2.5.1 --- srcpkgs/R-cran-R6/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template index 3c35ffadb069..f68a32f2b334 100644 --- a/srcpkgs/R-cran-R6/template +++ b/srcpkgs/R-cran-R6/template @@ -1,13 +1,14 @@ # Template file for 'R-cran-R6' pkgname=R-cran-R6 -version=2.5.0 +version=2.5.1 revision=1 build_style=R-cran short_desc="Classes with Reference Semantics" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/r-lib/R6" -checksum=aec1af9626ec532cb883b544bf9eff4cb2d89c343c7ce0fa31761ec5a7882e02 +checksum="8d92bd29c2ed7bf15f2778618ffe4a95556193d21d8431a7f75e7e5fc102bf48 + 8d92bd29c2ed7bf15f2778618ffe4a95556193d21d8431a7f75e7e5fc102bf48" post_install() { vlicense LICENSE From 5846792b81b01bce0b92c6bc29fd613c531696bd Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:15:51 -0800 Subject: [PATCH 1137/1407] R-cran-cli: update to 3.3.0 --- srcpkgs/R-cran-cli/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-cli/template b/srcpkgs/R-cran-cli/template index b6c445ea9371..29740c254243 100644 --- a/srcpkgs/R-cran-cli/template +++ b/srcpkgs/R-cran-cli/template @@ -1,15 +1,16 @@ # Template file for 'R-cran-cli' pkgname=R-cran-cli -version=2.3.1 +version=3.3.0 revision=1 build_style=R-cran makedepends="R-cran-assertthat R-cran-glue" depends="R-cran-assertthat R-cran-glue" short_desc="Helpers for Developing Command Line Interfaces" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/r-lib/cli/" -checksum=516ce2de54b4a58afa943f31dfdd925e532b67cf5f91aec355e255637b2406ca +checksum="c3a9ebbcb9017fb9aeda4f7df5ca981e42b169cbd7ce13e592cda2cd74250d63 + c3a9ebbcb9017fb9aeda4f7df5ca981e42b169cbd7ce13e592cda2cd74250d63" post_install() { vlicense LICENSE From aca60972a9a672fc8821745f6d0547ab5be2d500 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:16:05 -0800 Subject: [PATCH 1138/1407] R-cran-colorspace: update to 2.0r3 --- srcpkgs/R-cran-colorspace/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/R-cran-colorspace/template b/srcpkgs/R-cran-colorspace/template index 8490d34fdb58..4d3c2652e41d 100644 --- a/srcpkgs/R-cran-colorspace/template +++ b/srcpkgs/R-cran-colorspace/template @@ -1,13 +1,14 @@ # Template file for 'R-cran-colorspace' pkgname=R-cran-colorspace -version=1.4r1 -revision=2 +version=2.0r3 +revision=1 build_style=R-cran short_desc="Color Space Manipulation" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="BSD-3-Clause" homepage="http://www.hclwizard.org/r-colorspace/" -checksum=693d713a050f8bfecdb7322739f04b40d99b55aed168803686e43401d5f0d673 +checksum="e75681cc4dd6e4b70303fd96a6d4597065dc6bffcaa4ae4244b73ff19016857f + e75681cc4dd6e4b70303fd96a6d4597065dc6bffcaa4ae4244b73ff19016857f" post_install() { vlicense LICENSE From af6a306f427cfb917a6a6406810729b5ad2bc0f8 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:16:22 -0800 Subject: [PATCH 1139/1407] R-cran-cpp11: update to 0.4.2 --- srcpkgs/R-cran-cpp11/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-cpp11/template b/srcpkgs/R-cran-cpp11/template index db827ed635bd..c4c696860df0 100644 --- a/srcpkgs/R-cran-cpp11/template +++ b/srcpkgs/R-cran-cpp11/template @@ -1,13 +1,14 @@ # Template file for 'R-cran-cpp11' pkgname=R-cran-cpp11 -version=0.2.7 +version=0.4.2 revision=1 build_style=R-cran short_desc="Header only, C++11 interface to R's C interface" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/r-lib/cpp11" -checksum=1d4154c0d8ef4b564eea828ebebc836b7dbdc89a0848a840dd98173b07f661d4 +checksum="403ce0bf82358d237176053b0fb1e958cb6bfa4d0fb3555bf5801db6a6939b99 + 403ce0bf82358d237176053b0fb1e958cb6bfa4d0fb3555bf5801db6a6939b99" post_install() { vlicense LICENSE From 8bfb5b35c3f1fdbe18498e4cac15f5d5f616e65c Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:16:35 -0800 Subject: [PATCH 1140/1407] R-cran-crayon: update to 1.5.1 --- srcpkgs/R-cran-crayon/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-crayon/template b/srcpkgs/R-cran-crayon/template index c836f1b82ac2..3046cdce3c32 100644 --- a/srcpkgs/R-cran-crayon/template +++ b/srcpkgs/R-cran-crayon/template @@ -1,13 +1,14 @@ # Template file for 'R-cran-crayon' pkgname=R-cran-crayon -version=1.4.1 +version=1.5.1 revision=1 build_style=R-cran short_desc="Colored Terminal Output" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/r-lib/crayon/" -checksum=08b6e42e748d096960b2f32b7ffe690c25742e29fe14c19d1834cd6ff43029c7 +checksum="c025c73b78a8e88e8e4363c8e1a941da5089a7baea39e59ea5342ab9ebe45df9 + c025c73b78a8e88e8e4363c8e1a941da5089a7baea39e59ea5342ab9ebe45df9" post_install() { vlicense LICENSE From 9e5a1ec004387175923706a7c1ba67db4aadd654 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:16:45 -0800 Subject: [PATCH 1141/1407] R-cran-digest: update to 0.6.29 --- srcpkgs/R-cran-digest/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-digest/template b/srcpkgs/R-cran-digest/template index 0bf4c97052fe..c7144b801335 100644 --- a/srcpkgs/R-cran-digest/template +++ b/srcpkgs/R-cran-digest/template @@ -1,11 +1,12 @@ # Template file for 'R-cran-digest' pkgname=R-cran-digest -version=0.6.27 +version=0.6.29 revision=1 build_style=R-cran short_desc="Create Compact Hash Digests of R Objects" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="GPL-2.0-or-later" homepage="http://dirk.eddelbuettel.com/code/digest.html" changelog="https://github.com/eddelbuettel/digest/raw/master/ChangeLog" -checksum=f485f75122907da24c41d4a62c91a232f0c371befd2f77e973342a1bef00253f +checksum="792c1f14a4c8047745152f5e45ce7351978af8d770c29d2ea39c7acd5d619cd9 + 792c1f14a4c8047745152f5e45ce7351978af8d770c29d2ea39c7acd5d619cd9" From 2c11c4df79b5298c70d1e901eafb311d4c981f0f Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:16:56 -0800 Subject: [PATCH 1142/1407] R-cran-dplyr: update to 1.0.9 --- srcpkgs/R-cran-dplyr/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-dplyr/template b/srcpkgs/R-cran-dplyr/template index 46e0fe526326..0dfd7f990819 100644 --- a/srcpkgs/R-cran-dplyr/template +++ b/srcpkgs/R-cran-dplyr/template @@ -1,6 +1,6 @@ # Template file for 'R-cran-dplyr' pkgname=R-cran-dplyr -version=1.0.5 +version=1.0.9 revision=1 build_style=R-cran makedepends="R-cran-ellipsis R-cran-generics R-cran-glue R-cran-lifecycle @@ -10,10 +10,11 @@ depends="R-cran-ellipsis R-cran-generics R-cran-glue>=1.3.2 R-cran-lifecycle>=1.0.0 R-cran-magrittr>=1.5 R-cran-R6 R-cran-rlang>=0.4.10 R-cran-tibble>=2.1.3 R-cran-tidyselect>=1.1.0 R-cran-vctrs>=0.3.5" short_desc="Grammar of Data Manipulation for R" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="MIT" homepage="https://dplyr.tidyverse.org/" -checksum=7541a09c66ecb40736e25bc9ec9591f26ec4ee67c99823b4ac855760b5c96e70 +checksum="e2e1f7312618b4e32ada9a1da79cef32eaec12acd408c973a6b069c6be4fb46b + e2e1f7312618b4e32ada9a1da79cef32eaec12acd408c973a6b069c6be4fb46b" post_install() { vlicense LICENSE From 19e84b6cb3a8fe74bd16fed34393cd51336f06c7 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:17:08 -0800 Subject: [PATCH 1143/1407] R-cran-ellipsis: update to 0.3.2 --- srcpkgs/R-cran-ellipsis/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/R-cran-ellipsis/template b/srcpkgs/R-cran-ellipsis/template index 0e9f695fcec7..12e10542af68 100644 --- a/srcpkgs/R-cran-ellipsis/template +++ b/srcpkgs/R-cran-ellipsis/template @@ -1,12 +1,13 @@ # Template file for 'R-cran-ellipsis' pkgname=R-cran-ellipsis -version=0.3.1 -revision=2 +version=0.3.2 +revision=1 build_style=R-cran makedepends="R-cran-rlang" depends="R-cran-rlang>=0.3.0" short_desc="Tools for making ... safer" -maintainer="Orphaned " +maintainer="Cameron Nemo " license="GPL-3.0-only" homepage="https://ellipsis.r-lib.org/" -checksum=4f8a15158dfc27cdc0f7554c7a61e92b02e4d70bfc3d968f01a99da2189b75db +checksum="a90266e5eb59c7f419774d5c6d6bd5e09701a26c9218c5933c9bce6765aa1558 + a90266e5eb59c7f419774d5c6d6bd5e09701a26c9218c5933c9bce6765aa1558" From 216a1e2f12ce0d7ac2f4c5ae06a2b4e2f553b512 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:17:21 -0800 Subject: [PATCH 1144/1407] R-cran-fansi: update to 1.0.3 --- srcpkgs/R-cran-fansi/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template index a10f86c52f5e..b0b9e9dbff70 100644 --- a/srcpkgs/R-cran-fansi/template +++ b/srcpkgs/R-cran-fansi/template @@ -1,10 +1,11 @@ # Template file for 'R-cran-fansi' pkgname=R-cran-fansi -version=0.4.2 +version=1.0.3 revision=1 build_style=R-cran short_desc="ANSI Control Sequence Aware String Functions" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="GPL-2.0-or-later" homepage="https://cran.r-project.org/web/packages/fansi/index.html" -checksum=a2edf06cf8b91333a5df4990d50cdb35a63aa4b63c8c8ddf5bedcb499daafc44 +checksum="86a7b83d8c9d28baebbde310cd0b459d0950a9c7ff1a6276ce5858f6a89bc06a + 86a7b83d8c9d28baebbde310cd0b459d0950a9c7ff1a6276ce5858f6a89bc06a" From e8d660f5878a449808bbd72c3e837fe04030243b Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:17:32 -0800 Subject: [PATCH 1145/1407] R-cran-farver: update to 2.1.1 --- srcpkgs/R-cran-farver/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/R-cran-farver/template b/srcpkgs/R-cran-farver/template index 370c2330df8a..35c0238b4e49 100644 --- a/srcpkgs/R-cran-farver/template +++ b/srcpkgs/R-cran-farver/template @@ -1,13 +1,14 @@ # Template file for 'R-cran-farver' pkgname=R-cran-farver -version=2.0.3 -revision=2 +version=2.1.1 +revision=1 build_style=R-cran short_desc="High Performance Colour Space Manipulation" -maintainer="Orphaned " +maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/thomasp85/farver" -checksum=0e1590df79ec6078f10426411b96216b70568a4eaf3ffd84ca723add0ed8e5cc +checksum="0dcfda6ca743f465372790bcff1bcbc6a7145fdac1c682b021f654e8c6c996ce + 0dcfda6ca743f465372790bcff1bcbc6a7145fdac1c682b021f654e8c6c996ce" post_install() { vlicense LICENSE From e340892b76ed3058702f2b727b1727180d4e83fe Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:17:41 -0800 Subject: [PATCH 1146/1407] R-cran-generics: update to 0.1.3 --- srcpkgs/R-cran-generics/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/R-cran-generics/template b/srcpkgs/R-cran-generics/template index 0d3797c2cddc..d77cdc63360d 100644 --- a/srcpkgs/R-cran-generics/template +++ b/srcpkgs/R-cran-generics/template @@ -1,10 +1,11 @@ # Template file for 'R-cran-generics' pkgname=R-cran-generics -version=0.1.0 +version=0.1.3 revision=1 build_style=R-cran short_desc="Common generic S3 methods " maintainer="luhann " license="GPL-2.0-only" homepage="https://github.com/r-lib/generics" -checksum=ab71d1bdbb66c782364c61cede3c1186d6a94c03635f9af70d926e2c1ac88763 +checksum="75046163bfa8b8a4f4214c1b689e796207f6447182f2e5062cf570302387d053 + 75046163bfa8b8a4f4214c1b689e796207f6447182f2e5062cf570302387d053" From 12cf435b1b001fb2e2c25f79b04f3608db4a4523 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:17:51 -0800 Subject: [PATCH 1147/1407] R-cran-glue: update to 1.6.2 --- srcpkgs/R-cran-glue/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-glue/template b/srcpkgs/R-cran-glue/template index 33a22e9c8dc7..3ed8437147ab 100644 --- a/srcpkgs/R-cran-glue/template +++ b/srcpkgs/R-cran-glue/template @@ -1,13 +1,14 @@ # Template file for 'R-cran-glue' pkgname=R-cran-glue -version=1.4.2 +version=1.6.2 revision=1 build_style=R-cran short_desc="Interpreted String Literals" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/tidyverse/glue/" -checksum=9f7354132a26e9a876428fa87629b9aaddcd558f9932328e6ac065b95b8ef7ad +checksum="9da518f12be584c90e75fe8e07f711ee3f6fc0d03d817f72c25dc0f66499fdbf + 9da518f12be584c90e75fe8e07f711ee3f6fc0d03d817f72c25dc0f66499fdbf" post_install() { vlicense LICENSE From c7eab9638ed6dd6bfaefea6378c30d25be20eeac Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:17:59 -0800 Subject: [PATCH 1148/1407] R-cran-isoband: update to 0.2.5 --- srcpkgs/R-cran-isoband/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/R-cran-isoband/template b/srcpkgs/R-cran-isoband/template index dd88c5e9d570..b0e1d1d2fc2f 100644 --- a/srcpkgs/R-cran-isoband/template +++ b/srcpkgs/R-cran-isoband/template @@ -1,13 +1,14 @@ # Template file for 'R-cran-isoband' pkgname=R-cran-isoband -version=0.2.4 +version=0.2.5 revision=1 build_style=R-cran short_desc="Generate Isolines and Isobands from Regularly Spaced Elevation Grids" maintainer="Luke Hannan " license="MIT" homepage="https://github.com/wilkelab/isoband" -checksum=96d5bbdbfa4ead40bf30cec5a0d525b6a6b0f21eb92d179289ce2c4459bf387c +checksum="46f53fa066f0966f02cb2bf050190c0d5e950dab2cdf565feb63fc092c886ba5 + 46f53fa066f0966f02cb2bf050190c0d5e950dab2cdf565feb63fc092c886ba5" post_install() { vlicense LICENSE From 1863e07450efd86afbd394c7d093619f0c97ff6b Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:18:11 -0800 Subject: [PATCH 1149/1407] R-cran-labeling: update to 0.4.2 --- srcpkgs/R-cran-labeling/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/R-cran-labeling/template b/srcpkgs/R-cran-labeling/template index 4ec70142e3d9..d4567c0f8974 100644 --- a/srcpkgs/R-cran-labeling/template +++ b/srcpkgs/R-cran-labeling/template @@ -1,13 +1,14 @@ # Template file for 'R-cran-labeling' pkgname=R-cran-labeling -version=0.3 -revision=2 +version=0.4.2 +revision=1 build_style=R-cran short_desc="Axis Labeling" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="MIT" homepage="https://cran.r-project.org/web/packages/labeling/" -checksum=0d8069eb48e91f6f6d6a9148f4e2dc5026cabead15dd15fc343eff9cf33f538f +checksum="e022d79276173e0d62bf9e37d7574db65ab439eb2ae1833e460b1cff529bd165 + e022d79276173e0d62bf9e37d7574db65ab439eb2ae1833e460b1cff529bd165" post_install() { vlicense LICENSE From 13089d5a159aabfdb8773abbdc4ea2a6d83ec4df Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:18:27 -0800 Subject: [PATCH 1150/1407] R-cran-lifecycle: update to 1.0.1 --- srcpkgs/R-cran-lifecycle/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-lifecycle/template b/srcpkgs/R-cran-lifecycle/template index e3a2af69c4e6..8ba75db113a5 100644 --- a/srcpkgs/R-cran-lifecycle/template +++ b/srcpkgs/R-cran-lifecycle/template @@ -1,15 +1,16 @@ # Template file for 'R-cran-lifecycle' pkgname=R-cran-lifecycle -version=1.0.0 +version=1.0.1 revision=1 build_style=R-cran makedepends="R-cran-glue R-cran-rlang" depends="R-cran-glue R-cran-rlang" short_desc="Manage the Life Cycle of your Package Functions" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/r-lib/lifecycle" -checksum=03334ab213f2ad49a49e184e73f2051e04d35d43f562db903e68243cd2ec0f8e +checksum="1da76e1c00f1be96ca34e122ae611259430bf99d6a1b999fdef70c00c30f7ba0 + 1da76e1c00f1be96ca34e122ae611259430bf99d6a1b999fdef70c00c30f7ba0" post_install() { vlicense LICENSE From d0846ef589c1941086fa572171aaaf380cfec822 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:18:56 -0800 Subject: [PATCH 1151/1407] R-cran-magrittr: update to 2.0.3 --- srcpkgs/R-cran-magrittr/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-magrittr/template b/srcpkgs/R-cran-magrittr/template index 1e4ecaa43834..a7e77b259bcd 100644 --- a/srcpkgs/R-cran-magrittr/template +++ b/srcpkgs/R-cran-magrittr/template @@ -1,13 +1,14 @@ # Template file for 'R-cran-magrittr' pkgname=R-cran-magrittr -version=2.0.1 +version=2.0.3 revision=1 build_style=R-cran short_desc="Forward-Pipe Operator for R" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="MIT" homepage="https://cran.r-project.org/web/packages/magrittr/index.html" -checksum=75c265d51cc2b34beb27040edb09823c7b954d3990a7a931e40690b75d4aad5f +checksum="a2bff83f792a1acb801bfe6330bb62724c74d5308832f2cb6a6178336ace55d2 + a2bff83f792a1acb801bfe6330bb62724c74d5308832f2cb6a6178336ace55d2" post_install() { vlicense LICENSE From 7760a6b15dab2526c7cfc74c6515539c47014026 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:19:06 -0800 Subject: [PATCH 1152/1407] R-cran-pillar: update to 1.7.0 --- srcpkgs/R-cran-pillar/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template index d8d381b8e4ac..c7a529db88fa 100644 --- a/srcpkgs/R-cran-pillar/template +++ b/srcpkgs/R-cran-pillar/template @@ -1,6 +1,6 @@ # Template file for 'R-cran-pillar' pkgname=R-cran-pillar -version=1.5.1 +version=1.7.0 revision=1 build_style=R-cran makedepends="R-cran-cli R-cran-crayon R-cran-ellipsis R-cran-lifecycle @@ -8,8 +8,8 @@ makedepends="R-cran-cli R-cran-crayon R-cran-ellipsis R-cran-lifecycle depends="R-cran-cli R-cran-crayon R-cran-ellipsis R-cran-lifecycle R-cran-rlang R-cran-utf8 R-cran-fansi R-cran-vctrs" short_desc="Coloured Formatting for Columns" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/r-lib/pillar/" -checksum="0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672 - 0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672" +checksum="7841f89658cc8935568c0ff24dc480b4481bac896de2f6447050abc4360a13bb + 7841f89658cc8935568c0ff24dc480b4481bac896de2f6447050abc4360a13bb" From ad6ceb06d98f37d75268bdf4977a74ed38fa2383 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:19:18 -0800 Subject: [PATCH 1153/1407] R-cran-rlang: update to 1.0.4 --- srcpkgs/R-cran-rlang/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template index 73a4a65e4e9b..885949f969eb 100644 --- a/srcpkgs/R-cran-rlang/template +++ b/srcpkgs/R-cran-rlang/template @@ -1,10 +1,11 @@ # Template file for 'R-cran-rlang' pkgname=R-cran-rlang -version=0.4.10 +version=1.0.4 revision=1 build_style=R-cran short_desc="Functions for Base Types and Core R and 'Tidyverse' Features" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://rlang.r-lib.org/" -checksum=07530270c4c199f2b7efc5d57a476d99babd9d0c3388a02bb7d57fe312da3576 +checksum="1fb789d46c6a855ce37eba63c353b85aa600c4a2a7ca6075f2632540b42a8696 + 1fb789d46c6a855ce37eba63c353b85aa600c4a2a7ca6075f2632540b42a8696" From 21484b3cf414118ab9872d567a7916348e774d3b Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:19:28 -0800 Subject: [PATCH 1154/1407] R-cran-svglite: update to 2.1.0 --- srcpkgs/R-cran-svglite/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-svglite/template b/srcpkgs/R-cran-svglite/template index 90557ae178aa..deaea819d563 100644 --- a/srcpkgs/R-cran-svglite/template +++ b/srcpkgs/R-cran-svglite/template @@ -1,12 +1,13 @@ # Template file for 'R-cran-svglite' pkgname=R-cran-svglite -version=2.0.0 +version=2.1.0 revision=1 build_style=R-cran makedepends="R-cran-systemfonts R-cran-cpp11 libpng-devel" depends="R-cran-systemfonts" short_desc="Lightweight svg graphics device for R" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="GPL-2.0-or-later" homepage="https://svglite.r-lib.org" -checksum=76e625fe172a5b7ce99a67b6d631b037b3f7f0021cfe15f2e15e8851b89defa5 +checksum="ad40f590c7e80ae83001a3826b6e8394ba733446ed51fd55faeda974ab839c9b + ad40f590c7e80ae83001a3826b6e8394ba733446ed51fd55faeda974ab839c9b" From 420be2a7a6b8bca45384bd45618d2b761cb0ba89 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:19:38 -0800 Subject: [PATCH 1155/1407] R-cran-systemfonts: update to 1.0.4 --- srcpkgs/R-cran-systemfonts/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-systemfonts/template b/srcpkgs/R-cran-systemfonts/template index b779dd8d8ebf..a477c6dbcc79 100644 --- a/srcpkgs/R-cran-systemfonts/template +++ b/srcpkgs/R-cran-systemfonts/template @@ -1,15 +1,16 @@ # Template file for 'R-cran-systemfonts' pkgname=R-cran-systemfonts -version=1.0.2 +version=1.0.4 revision=1 build_style=R-cran hostmakedepends="pkg-config" makedepends="fontconfig-devel freetype-devel R-cran-cpp11" short_desc="System Native Font Handling in R" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/r-lib/systemfonts" -checksum=21ac96412846e06a4062362b159213cb9d83bd60fdf03aa235992b6c49fb36a9 +checksum="ef766c75b942f147d382664a00d6a4930f1bfe0cce9d88943f571682a85a84c0 + ef766c75b942f147d382664a00d6a4930f1bfe0cce9d88943f571682a85a84c0" post_install() { vlicense LICENSE From ff30b4655e9aea6b40fa4346e688e64548ac3aa2 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:19:51 -0800 Subject: [PATCH 1156/1407] R-cran-tibble: update to 3.1.7 --- srcpkgs/R-cran-tibble/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-tibble/template b/srcpkgs/R-cran-tibble/template index 048d739f793e..e7c030604b4f 100644 --- a/srcpkgs/R-cran-tibble/template +++ b/srcpkgs/R-cran-tibble/template @@ -1,6 +1,6 @@ # Template file for 'R-cran-tibble' pkgname=R-cran-tibble -version=3.1.0 +version=3.1.7 revision=1 build_style=R-cran makedepends="R-cran-ellipsis @@ -10,10 +10,11 @@ depends="R-cran-ellipsis R-cran-fansi R-cran-lifecycle R-cran-magrittr R-cran-pillar R-cran-rlang R-cran-pkgconfig R-cran-vctrs" short_desc="Simple Data Frames" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="MIT" homepage="http://tibble.tidyverse.org/" -checksum=959e28dea05181a7cd43a744028892261bda4c7ec78ad35fb148d144dcf5154e +checksum="e1a50891f476803526960b4c4d736a72e7d9c3d366946744a02d6347f591c872 + e1a50891f476803526960b4c4d736a72e7d9c3d366946744a02d6347f591c872" post_install() { vlicense LICENSE From bcbc68f11d0ed0d0094482c74491bffba95ab738 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:20:04 -0800 Subject: [PATCH 1157/1407] R-cran-tidyselect: update to 1.1.2 --- srcpkgs/R-cran-tidyselect/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-tidyselect/template b/srcpkgs/R-cran-tidyselect/template index e7cd851913e6..6755ab433e86 100644 --- a/srcpkgs/R-cran-tidyselect/template +++ b/srcpkgs/R-cran-tidyselect/template @@ -1,13 +1,14 @@ # Template file for 'R-cran-tidyselect' pkgname=R-cran-tidyselect -version=1.1.0 +version=1.1.2 revision=1 build_style=R-cran makedepends="R-cran-ellipsis R-cran-glue R-cran-purrr R-cran-rlang R-cran-vctrs" depends="R-cran-ellipsis R-cran-glue>=1.3.0 R-cran-purrr>=0.3.2 R-cran-rlang>=0.4.6 R-cran-vctrs>=0.2.2" short_desc="Backend for selecting functions of the tidyverse" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://tidyselect.r-lib.org/" -checksum=e635ed381fb53f7a53c3fa36bb33e134a3273d272367de2a8d909c821be93893 +checksum="0389a3b15417954a30d6d692f6ebdd3d0f318cb94a5c9b05365df2f4ea1d8270 + 0389a3b15417954a30d6d692f6ebdd3d0f318cb94a5c9b05365df2f4ea1d8270" From aaa8fe2c39dcb939114ec1eaa917224fab31e11d Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:20:15 -0800 Subject: [PATCH 1158/1407] R-cran-utf8: update to 1.2.2 --- srcpkgs/R-cran-utf8/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/R-cran-utf8/template b/srcpkgs/R-cran-utf8/template index 55923b13fa51..ee32436be4da 100644 --- a/srcpkgs/R-cran-utf8/template +++ b/srcpkgs/R-cran-utf8/template @@ -1,10 +1,11 @@ # Template file for 'R-cran-utf8' pkgname=R-cran-utf8 -version=1.1.4 -revision=2 +version=1.2.2 +revision=1 build_style=R-cran short_desc="Unicode Text Processing" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/patperry/r-utf8/" -checksum=f6da9cadfc683057d45f54b43312a359cf96ec2731c0dda18a8eae31d1e31e54 +checksum="a71aee87d43a9bcf29249c7a5a2e9ca1d2a836e8d5ee3a264d3062f25378d8f4 + a71aee87d43a9bcf29249c7a5a2e9ca1d2a836e8d5ee3a264d3062f25378d8f4" From a947325603a2c8d4a003069691b8418c0d90da48 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:20:35 -0800 Subject: [PATCH 1159/1407] R-cran-vctrs: update to 0.4.1 --- srcpkgs/R-cran-vctrs/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/R-cran-vctrs/template b/srcpkgs/R-cran-vctrs/template index 2246112ef700..9fff406c16b8 100644 --- a/srcpkgs/R-cran-vctrs/template +++ b/srcpkgs/R-cran-vctrs/template @@ -1,12 +1,13 @@ # Template file for 'R-cran-vctrs' pkgname=R-cran-vctrs -version=0.3.6 +version=0.4.1 revision=1 build_style=R-cran -makedepends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot" -depends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot" +makedepends="R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-cli" +depends="R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-cli" short_desc="Vector Helpers" -maintainer="Orphaned " +maintainer="Cameron Nemo " license="GPL-3.0-only" homepage="https://github.com/r-lib/vctrs" -checksum=df7d368c9f2d2ad14872ba2a09821ec4f5a8ad77c81a0b05e1f440e5ffebad25 +checksum="9676881e009aa1217818f326338e8b35dd9a9438918f8b1ac249f4c8afe460dd + 9676881e009aa1217818f326338e8b35dd9a9438918f8b1ac249f4c8afe460dd" From 331aba987d10d62fb4748d5a5f225951b7c8845b Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:20:46 -0800 Subject: [PATCH 1160/1407] R-cran-viridisLite: update to 0.4.0 --- srcpkgs/R-cran-viridisLite/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/R-cran-viridisLite/template b/srcpkgs/R-cran-viridisLite/template index c0b759859975..a825ef5d5694 100644 --- a/srcpkgs/R-cran-viridisLite/template +++ b/srcpkgs/R-cran-viridisLite/template @@ -1,13 +1,14 @@ # Template file for 'R-cran-viridisLite' pkgname=R-cran-viridisLite -version=0.3.0 -revision=2 +version=0.4.0 +revision=1 build_style=R-cran short_desc="Default Color Maps from 'matplotlib' (Lite Version)" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="MIT" homepage="https://github.com/sjmgarnier/viridisLite" -checksum=780ea12e7c4024d5ba9029f3a107321c74b8d6d9165262f6e64b79e00aa0c2af +checksum="849955dc8ad9bc52bdc50ed4867fd92a510696fc8294e6971efa018437c83c6a + 849955dc8ad9bc52bdc50ed4867fd92a510696fc8294e6971efa018437c83c6a" post_install() { vlicense LICENSE From 358c6baa4f3321d6eec2416d201ed2ef5dccab27 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 12 Mar 2022 16:21:00 -0800 Subject: [PATCH 1161/1407] R-cran-withr: update to 2.5.0 --- srcpkgs/R-cran-withr/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R-cran-withr/template b/srcpkgs/R-cran-withr/template index 60285166a63f..0461f1cbd9f7 100644 --- a/srcpkgs/R-cran-withr/template +++ b/srcpkgs/R-cran-withr/template @@ -1,10 +1,11 @@ # Template file for 'R-cran-withr' pkgname=R-cran-withr -version=2.4.1 +version=2.5.0 revision=1 build_style=R-cran short_desc="Run Code 'With' Temporarily Modified Global State" -maintainer="Florian Wagner " +maintainer="Cameron Nemo " license="GPL-2.0-or-later" homepage="http://withr.r-lib.org/" -checksum=5f5ed9058d51b676f8b170b32bc0952ace6790e038f2b6d6860c5bb94f67178f +checksum="37317b3ed790a08407072993a05ab255f6305f95a12a16e0e28aa6aa80fc8bc0 + 37317b3ed790a08407072993a05ab255f6305f95a12a16e0e28aa6aa80fc8bc0" From 96607380fc8a52d1de78c9d7a67de2346a0ce78e Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sun, 17 Jul 2022 14:48:59 -0700 Subject: [PATCH 1162/1407] R-cran-ggplot2: update to 3.3.6 --- srcpkgs/R-cran-ggplot2/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template index ddf1e5bb6038..6f758342cadf 100644 --- a/srcpkgs/R-cran-ggplot2/template +++ b/srcpkgs/R-cran-ggplot2/template @@ -1,6 +1,6 @@ # Template file for 'R-cran-ggplot2' pkgname=R-cran-ggplot2 -version=3.3.5 +version=3.3.6 revision=1 build_style=R-cran makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband @@ -11,4 +11,5 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics" maintainer="Florian Wagner " license="GPL-2.0-only" homepage="https://ggplot2.tidyverse.org/" -checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea +checksum="bfcb4eb92a0fcd3fab713aca4bb25e916e05914f2540271a45522ad7e43943a9 + bfcb4eb92a0fcd3fab713aca4bb25e916e05914f2540271a45522ad7e43943a9" From 92da0aecc2419b6fa2c985621806948958082ca7 Mon Sep 17 00:00:00 2001 From: Toby Merz Date: Fri, 5 Aug 2022 11:30:12 +0200 Subject: [PATCH 1163/1407] git-secret: update to 0.5.0. --- srcpkgs/git-secret/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/git-secret/template b/srcpkgs/git-secret/template index 34b1275685d6..8babd9c5a9ff 100644 --- a/srcpkgs/git-secret/template +++ b/srcpkgs/git-secret/template @@ -1,7 +1,7 @@ # Template file for 'git-secret' pkgname=git-secret -version=0.4.0 -revision=2 +version=0.5.0 +revision=1 build_style=gnu-makefile make_check_target=test depends="bash gawk gnupg coreutils git" @@ -11,7 +11,7 @@ maintainer="shizonic " license="MIT" homepage="http://git-secret.io/" distfiles="https://github.com/sobolevn/git-secret/archive/v${version}.tar.gz" -checksum=ae17bfda88eb77e8f07c5f16d833792a3a14adc9c5d2bbc840f28538c62f08ba +checksum=1cba04a59c8109389079b479c1bf5719b595e799680e10d35ce9aa091cb752af do_install() { vbin git-secret From b7c35a78e46b5e2193d33b5a2754c61b1f001681 Mon Sep 17 00:00:00 2001 From: Mat Boehlke Date: Mon, 5 Sep 2022 18:37:00 -0500 Subject: [PATCH 1164/1407] mg: update to 20220614. Add missing libmd makedepend, fix compilation issue, and use the appropriate build style. --- srcpkgs/mg/template | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/srcpkgs/mg/template b/srcpkgs/mg/template index 8bb7fd00185e..f05da33e9443 100644 --- a/srcpkgs/mg/template +++ b/srcpkgs/mg/template @@ -1,30 +1,20 @@ # Template file for 'mg' pkgname=mg -version=20210314 +version=20220614 revision=1 +build_style=gnu-makefile +make_install_args="mandir=/usr/share/man" hostmakedepends="pkg-config" -makedepends="libbsd-devel ncurses-devel" +makedepends="libbsd-devel libmd-devel ncurses-devel" short_desc="Micro GNU/emacs" maintainer="Orphaned " license="Public Domain" homepage="https://github.com/hboetes/mg" distfiles="https://github.com/hboetes/mg/archive/${version}.tar.gz" -checksum=6820e76a0e27d9a744624d421b3b30b0030140c2a817df1310b25c3abe397106 +checksum=d3bc16baba82457c4f60ecd258762ee2ed848064f79729fe92e29bfd181af121 CFLAGS="-DTCSASOFT=0" case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS+=" -DREG_STARTEND=0";; esac - -do_configure() { - sed -i "s,\(BSD_CPPFLAGS:=\).*,\1 -isystem ${XBPS_CROSS_BASE}/usr/include/bsd -DLIBBSD_OVERLAY,g" GNUmakefile - sed -i "s,\(BSD_LIBS:=\).*,\1 -lbsd,g" GNUmakefile -} -do_build() { - make CC="$CC" CFLAGS="$CFLAGS" prefix=/usr ${makejobs} -} -do_install() { - vmkdir usr/bin - make install prefix=/usr bindir=/usr/bin mandir=/usr/share/man DESTDIR=${DESTDIR} -} From 71bc623dd15cccaa1107f453e78ff5f1999ae039 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 4 Sep 2022 05:08:09 -0400 Subject: [PATCH 1165/1407] common/travis/xpkgdiff.sh: use newly-added arguments it works without this, but it uses repo-default by default, so this should maybe speed some things up. --- common/travis/xpkgdiff.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh index a36fd76e5d88..7caabe4b0b71 100755 --- a/common/travis/xpkgdiff.sh +++ b/common/travis/xpkgdiff.sh @@ -2,9 +2,10 @@ # # xpkgdiff.sh -export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo XBPS_HOSTDIR="$HOME/hostdir" +export XBPS_DISTDIR=/hostrepo XBPS_HOSTDIR="$HOME/hostdir" export DIFF='diff --unified=0 --report-identical-files --suppress-common-lines --color=always --label REPO --label BUILT' +ARGS="-a $2 -R https://repo-ci.voidlinux.org/current" while read -r pkg; do for subpkg in $(xsubpkg $pkg); do @@ -12,11 +13,11 @@ while read -r pkg; do --repository=$HOME/hostdir/binpkgs/nonfree \ -i "$subpkg" >&/dev/null; then /bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m" - xpkgdiff -f $subpkg + xpkgdiff $ARGS -f $subpkg /bin/echo -e "\x1b[34mMetadata Diff of $subpkg:\x1b[0m" - xpkgdiff -S $subpkg + xpkgdiff $ARGS -S $subpkg /bin/echo -e "\x1b[34mDependency Diff of $subpkg:\x1b[0m" - xpkgdiff -x $subpkg + xpkgdiff $ARGS -x $subpkg else /bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m" fi From df6b45c90f070bc5291a99046d7aeaced0f5ae9c 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, 6 Sep 2022 22:55:29 +0700 Subject: [PATCH 1166/1407] wrappers: remove which Accidentally added in c22acb3072, (99-pkglint: forbid /usr/etc, 2022-09-06) --- common/wrappers/which.sh | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 common/wrappers/which.sh diff --git a/common/wrappers/which.sh b/common/wrappers/which.sh deleted file mode 100644 index 3dc47063b2ee..000000000000 --- a/common/wrappers/which.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -ret=0 - -while test $# != 0; do - case "$1" in - -*) ;; - *) command -v "$1" || ret=1 ;; - esac - shift -done - -exit "$ret" From 33d9ac7a0bd25945e55fb9bdf448b5b0212902df 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, 6 Sep 2022 23:02:53 +0700 Subject: [PATCH 1167/1407] R: rebuild for which path --- srcpkgs/R/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/R/template b/srcpkgs/R/template index ce480271de02..dce3b0428e8a 100644 --- a/srcpkgs/R/template +++ b/srcpkgs/R/template @@ -1,12 +1,13 @@ # Template file for 'R' pkgname=R version=4.2.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R --with-blas$(vopt_if openblas '=openblas') --with-lapack --enable-R-shlib --with-tcltk --enable-memory-profiling + ac_cv_path_WHICH=/usr/bin/which LIBnn=lib" hostmakedepends="gcc-fortran pkg-config perl less which tar" makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel From b79d864ff8369a25c7146ed26798f0ce4a6594fe Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 3 Sep 2022 22:56:11 +0200 Subject: [PATCH 1168/1407] gcab: update to 1.5. --- srcpkgs/gcab/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gcab/template b/srcpkgs/gcab/template index 671cd5839393..10be928f333d 100644 --- a/srcpkgs/gcab/template +++ b/srcpkgs/gcab/template @@ -1,25 +1,25 @@ # Template file for 'gcab' pkgname=gcab -version=1.4 -revision=2 +version=1.5 +revision=1 build_style=meson build_helper=gir configure_args="$(vopt_bool gir introspection) -Ddocs=false" -hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)" +hostmakedepends="glib-devel gettext pkg-config $(vopt_if gir vala)" makedepends="libglib-devel $(vopt_if gir vala)" short_desc="GObject library to create cabinet files" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/msitools" +changelog="https://gitlab.gnome.org/GNOME/gcab/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz" -checksum=67a5fa9be6c923fbc9197de6332f36f69a33dadc9016a2b207859246711c048f +checksum=46bf7442491faa4148242b9ec2a0786a5f6e9effb1b0566e5290e8cc86f00f0c build_options="gir" build_options_default="gir" - gcab-devel_package() { - depends="${sourcepkg}>=${version}_${revision} glib-devel" + depends="${sourcepkg}>=${version}_${revision} libglib-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From 0373f81bb8b8e29383b53fc5e0cf9f2c3f16973e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 9 Jul 2022 12:31:16 +0200 Subject: [PATCH 1169/1407] gobject-introspection: update to 1.72.0. --- .../patches/meson-0.61.patch | 294 ------------------ srcpkgs/gobject-introspection/template | 10 +- 2 files changed, 6 insertions(+), 298 deletions(-) delete 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 deleted file mode 100644 index 44bf409b1164..000000000000 --- a/srcpkgs/gobject-introspection/patches/meson-0.61.patch +++ /dev/null @@ -1,294 +0,0 @@ -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 - diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index 3fd8c7fb51e6..22f1e0fa0920 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -1,20 +1,20 @@ # Template file for 'gobject-introspection' pkgname=gobject-introspection -version=1.70.0 +version=1.72.0 revision=1 build_style=meson pycompile_dirs="usr/lib/${pkgname}/giscanner" hostmakedepends="flex pkg-config" # won't run tests with cairo to avoid cyclical deps -makedepends="libffi-devel libglib-devel - python3-devel python3-Mako python3-Markdown" +makedepends="libffi-devel libglib-devel python3-devel python3-Mako + python3-Markdown" depends="libgirepository-devel python3-Mako python3-Markdown" short_desc="Introspection system for GObject-based libraries" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GObjectIntrospection" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a +checksum=02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc python_version=3 if [ "$CROSS_BUILD" ]; then @@ -26,6 +26,8 @@ if [ "$CROSS_BUILD" ]; then fi post_install() { + rm ${DESTDIR}/usr/lib/gobject-introspection/giscanner/doctemplates/*/meson.build + # Install our wrappers system-wide, they are required for building all other # gobject-based packages. vbin ${FILESDIR}/g-ir-scanner-qemuwrapper From b0cd636a6fb6ece81a85f1972b32dd8635ad6d99 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 17 Feb 2022 13:25:21 -0500 Subject: [PATCH 1170/1407] New package: vaultwarden-1.25.2 --- srcpkgs/vaultwarden/files/vaultwarden/log/run | 1 + srcpkgs/vaultwarden/files/vaultwarden/run | 6 ++++ srcpkgs/vaultwarden/patches/config.patch | 35 +++++++++++++++++++ srcpkgs/vaultwarden/template | 25 +++++++++++++ 4 files changed, 67 insertions(+) create mode 120000 srcpkgs/vaultwarden/files/vaultwarden/log/run create mode 100644 srcpkgs/vaultwarden/files/vaultwarden/run create mode 100644 srcpkgs/vaultwarden/patches/config.patch create mode 100644 srcpkgs/vaultwarden/template diff --git a/srcpkgs/vaultwarden/files/vaultwarden/log/run b/srcpkgs/vaultwarden/files/vaultwarden/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/vaultwarden/files/vaultwarden/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/vaultwarden/files/vaultwarden/run b/srcpkgs/vaultwarden/files/vaultwarden/run new file mode 100644 index 000000000000..ff5d0c6af46d --- /dev/null +++ b/srcpkgs/vaultwarden/files/vaultwarden/run @@ -0,0 +1,6 @@ +#!/bin/sh +[ -r ./conf ] && . ./conf +ENV_FILE=${ENV_FILE:-/etc/vaultwarden.conf} +export ENV_FILE + +exec chpst -u _vaultwarden:_vaultwarden vaultwarden diff --git a/srcpkgs/vaultwarden/patches/config.patch b/srcpkgs/vaultwarden/patches/config.patch new file mode 100644 index 000000000000..36114bee2474 --- /dev/null +++ b/srcpkgs/vaultwarden/patches/config.patch @@ -0,0 +1,35 @@ +configure several paths to sane/expected locations + +diff --git a/.env.template b/.env.template +index 66a0434..cebac33 100644 +--- a/.env.template ++++ b/.env.template +@@ -10,7 +10,7 @@ + ## vaultwarden. + + ## Main data folder +-# DATA_FOLDER=data ++DATA_FOLDER=/var/lib/vaultwarden + + ## Database URL + ## When using SQLite, this is the path to the DB file, default to %DATA_FOLDER%/db.sqlite3 +@@ -61,8 +61,8 @@ + # ICON_CACHE_NEGTTL=259200 + + ## Web vault settings +-# WEB_VAULT_FOLDER=web-vault/ +-# WEB_VAULT_ENABLED=true ++# WEB_VAULT_FOLDER=/usr/share/webapps/vaultwarden-web ++WEB_VAULT_ENABLED=false + + ## Enables websocket notifications + # WEBSOCKET_ENABLED=false +@@ -117,7 +117,7 @@ + # LOG_TIMESTAMP_FORMAT="%Y-%m-%d %H:%M:%S.%3f" + + ## Logging to file +-# LOG_FILE=/path/to/log ++# LOG_FILE=/var/log/vaultwarden.log + + ## Logging to Syslog + ## This requires extended logging diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template new file mode 100644 index 000000000000..5d46f1b4f867 --- /dev/null +++ b/srcpkgs/vaultwarden/template @@ -0,0 +1,25 @@ +# Template file for 'vaultwarden' +pkgname=vaultwarden +version=1.25.2 +revision=1 +build_style=cargo +configure_args="--features sqlite,mysql,postgresql" +hostmakedepends="pkg-config" +makedepends="openssl-devel libmysqlclient-devel postgresql-libs-devel + sqlite-devel" +short_desc="Unofficial Bitwarden compatible server written in Rust" +maintainer="Joel Beckmeyer " +license="GPL-3.0-or-later" +homepage="https://github.com/dani-garcia/vaultwarden" +distfiles="https://github.com/dani-garcia/vaultwarden/archive/${version}.tar.gz" +checksum=f4afc2d8aa7aa59dd1ae16497b6a7f9b412ff426a24868e3081054e611d4824d + +system_accounts="_vaultwarden" +_vaultwarden_homedir="/var/lib/vaultwarden" + +make_dirs="/var/lib/vaultwarden 0750 _vaultwarden _vaultwarden" + +post_install() { + vsconf .env.template vaultwarden.conf + vsv vaultwarden +} From 0dce9265b02d6740e15912f77f254b0007a3217f Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Sat, 26 Mar 2022 20:55:52 -0400 Subject: [PATCH 1171/1407] New package: vaultwarden-web-2022.8.1 --- srcpkgs/vaultwarden-web/template | 39 ++++++++++++++++++++++++++++++++ srcpkgs/vaultwarden-web/update | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 srcpkgs/vaultwarden-web/template create mode 100644 srcpkgs/vaultwarden-web/update diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template new file mode 100644 index 000000000000..557c3e195256 --- /dev/null +++ b/srcpkgs/vaultwarden-web/template @@ -0,0 +1,39 @@ +# Template file for 'vaultwarden-web' +pkgname=vaultwarden-web +version=2022.8.1 +revision=1 +_patch_ver=2022.8.0 +create_wrksrc=yes +build_wrksrc="clients-web-v${version}" +hostmakedepends="git nodejs" +short_desc="Web vault builds for vaultwarden" +maintainer="Joel Beckmeyer " +license="GPL-3.0-or-later" +homepage="https://github.com/dani-garcia/bw_web_builds" +distfiles="https://github.com/bitwarden/clients/archive/web-v${version}.tar.gz + https://raw.githubusercontent.com/dani-garcia/bw_web_builds/master/patches/v${_patch_ver}.patch" +checksum="9dff38f13d8be047fe0fd6426bda3c409bb222b787bd6b21a3559f5d29255a92 + 1199bcf5edb0cad2e0fc1e839b5bdc690565d6af5b32cc1c38348f0b13c69ee9" + +post_extract() { + mv v$_patch_ver.patch ${build_wrksrc} +} + +post_patch() { + patch -Np1 -i v$_patch_ver.patch +} + +do_configure() { + npm ci --ignore-scripts +} + +do_build() { + cd apps/web + npm run dist:oss:selfhost +} + +do_install() { + cd apps/web + vmkdir usr/share/webapps/vaultwarden-web + vcopy build/* usr/share/webapps/vaultwarden-web +} diff --git a/srcpkgs/vaultwarden-web/update b/srcpkgs/vaultwarden-web/update new file mode 100644 index 000000000000..7d10386dd670 --- /dev/null +++ b/srcpkgs/vaultwarden-web/update @@ -0,0 +1,2 @@ +pkgname=bw_web +site="https://github.com/dani-garcia/bw_web_builds/releases" From 9021af93de100e82ec9ab270975e09f25fd7a222 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 1 Sep 2022 09:00:31 -0500 Subject: [PATCH 1172/1407] delta: update to 0.14.0. --- srcpkgs/delta/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template index c2b99cff7dc7..f5ca36d7ef1e 100644 --- a/srcpkgs/delta/template +++ b/srcpkgs/delta/template @@ -1,6 +1,6 @@ # Template file for 'delta' pkgname=delta -version=0.13.0 +version=0.14.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=5a0ba70a094a7884beb6f1efd4d155861e4b3e3584c452cabbce1607f8eb0f30 +checksum=7d1ab2949d00f712ad16c8c7fc4be500d20def9ba70394182720a36d300a967c post_patch() { # fixes an indexmap error when cross compiling From 51f1cd09a28e460bda51b8049f1843112a0c7b23 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 1 Sep 2022 09:08:40 -0500 Subject: [PATCH 1173/1407] mongo-c-driver: update to 1.23.0. --- srcpkgs/mongo-c-driver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template index 1ce86e8b47fa..b81ab6f2cba4 100644 --- a/srcpkgs/mongo-c-driver/template +++ b/srcpkgs/mongo-c-driver/template @@ -1,6 +1,6 @@ # Template file for 'mongo-c-driver' pkgname=mongo-c-driver -version=1.22.1 +version=1.23.0 revision=1 build_style=cmake configure_args="-DENABLE_TESTS=OFF" @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://mongoc.org" distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz" -checksum=762735344e848bb2f100154ed2f7b0f8c9b25e37eafb2b79b54bf99c15a7c318 +checksum=2b91d6a9c1a80ec82c5643676e44f1a9edf3849c7f25d490e1b5587eb408ad93 mongo-c-driver-devel_package() { short_desc+=" - development files" From 6896680e7250210e4bacae4d1e24793c3a00b368 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 1 Sep 2022 09:15:06 -0500 Subject: [PATCH 1174/1407] evtx: update to 0.8.0. --- srcpkgs/evtx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evtx/template b/srcpkgs/evtx/template index 905059bd1d28..fc36fd6ab48e 100644 --- a/srcpkgs/evtx/template +++ b/srcpkgs/evtx/template @@ -1,6 +1,6 @@ # Template file for 'evtx' pkgname=evtx -version=0.7.2 +version=0.8.0 revision=1 build_style=cargo short_desc="Parser for the Windows XML Event Log (EVTX) format" @@ -8,4 +8,4 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://github.com/omerbenamram/evtx" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=31967e3b175a7e0ad4a5d786418066bde66d5ddd4d48626312f59f5081c61ca6 +checksum=910c6062696c8748256d6afc90983ef802026e291a241f376e1bd74352218620 From b6f4523c1c160300c4ba969109b0cae1c2fd970b Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 1 Sep 2022 22:01:20 +0530 Subject: [PATCH 1175/1407] jc: update to 1.21.2. Closes: #39036 [via git-merge-pr] --- srcpkgs/jc/template | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template index bb0fa14f25bd..5163d73b96f5 100644 --- a/srcpkgs/jc/template +++ b/srcpkgs/jc/template @@ -1,6 +1,6 @@ # Template file for 'jc' pkgname=jc -version=1.20.4 +version=1.21.2 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -10,5 +10,13 @@ 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=8eee7fc5565f127ef73a3562abcf150063d86f060d10d85ef37a0527f5b2747d +changelog="https://raw.githubusercontent.com/kellyjonbrazil/jc/master/CHANGELOG" +distfiles="https://github.com/kellyjonbrazil/jc/archive/refs/tags/v${version}.tar.gz" +checksum=7d230cad5651673812daa424cb9ace354d2c66605ddf37b3e4ebe6905d5f51b6 + +post_install() { + vman man/jc.1 + vlicense LICENSE.md + vcompletion completions/jc_bash_completion.sh bash jc + vcompletion completions/jc_bash_completion.sh zsh _jc +} From ac720ed61c46c668df787d4ae6410501b303d242 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 6 Sep 2022 20:58:54 +0200 Subject: [PATCH 1176/1407] deluge: specify HOME in deluge-web service Otherwise the deluge-web service tries to load its config from /root and fails because of missing permissions. --- srcpkgs/deluge/files/deluge-web/run | 1 + srcpkgs/deluge/template | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/deluge/files/deluge-web/run b/srcpkgs/deluge/files/deluge-web/run index b90477d7a458..9f56a76bdae8 100644 --- a/srcpkgs/deluge/files/deluge-web/run +++ b/srcpkgs/deluge/files/deluge-web/run @@ -1,3 +1,4 @@ #!/bin/sh sv check deluged >/dev/null || exit 1 +HOME=/var/lib/deluge exec chpst -u deluge:deluge deluge-web -d 2>&1 diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template index bdb186148072..8124c09f0ca3 100644 --- a/srcpkgs/deluge/template +++ b/srcpkgs/deluge/template @@ -1,7 +1,7 @@ # Template file for 'deluge' pkgname=deluge version=2.0.5 -revision=1 +revision=2 build_style=python3-module # TODO package python3-slimit to minify javascript hostmakedepends="intltool python3-setuptools python3-wheel" From 644df97b474563fe8e73544fff58b69a9f25b8d4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 6 Sep 2022 15:40:15 -0400 Subject: [PATCH 1177/1407] kanshi: update to 1.3.0. --- srcpkgs/kanshi/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/kanshi/template b/srcpkgs/kanshi/template index fecd26211946..6707312b5684 100644 --- a/srcpkgs/kanshi/template +++ b/srcpkgs/kanshi/template @@ -1,16 +1,17 @@ # Template file for 'kanshi' pkgname=kanshi -version=1.2.0 +version=1.3.0 revision=1 +wrksrc="${pkgname}-v${version}" build_style=meson hostmakedepends="pkg-config scdoc wayland-devel" makedepends="wayland-devel" short_desc="Output profiles automatically enabled/disabled on hotplug" maintainer="Stacy Harper " license="MIT" -homepage="https://github.com/emersion/kanshi" -distfiles="https://github.com/emersion/kanshi/archive/v${version}.tar.gz" -checksum=144428b9e79209b853c4b38a5efb6f16d581a2b9cb96e419b3b0a0f5914bcad4 +homepage="https://wayland.emersion.fr/kanshi/" +distfiles="https://git.sr.ht/~emersion/kanshi/archive/v${version}.tar.gz" +checksum=67a4fe896d97b7fbd3fcc51aab0fae550b4130b2df2b1df2a4d0e8d3221fe604 post_install() { vlicense LICENSE From 80c085758a81a5fca5e0a549adeac8b616ff24b1 Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Tue, 6 Sep 2022 12:02:27 -0500 Subject: [PATCH 1178/1407] fcft: update to 3.1.4. --- srcpkgs/fcft/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template index 3bdb382c1376..ba04d153008b 100644 --- a/srcpkgs/fcft/template +++ b/srcpkgs/fcft/template @@ -1,6 +1,6 @@ # Template file for 'fcft' pkgname=fcft -version=3.1.3 +version=3.1.4 revision=1 wrksrc=$pkgname build_style=meson @@ -16,7 +16,7 @@ license="MIT" homepage="https://codeberg.org/dnkl/fcft" changelog="https://codeberg.org/dnkl/fcft/raw/branch/master/CHANGELOG.md" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=d9bff464ae5c31fbaad0fb8a50b6db2fc168c48aae169d005066ad358b9d432d +checksum=37363f7af0430161902b8d194016366b0fbca3b8353ee26b70c5b7ad8e9602c8 build_options="textshaping" build_options_default="textshaping" From a11a2e56e6df9c70f6e1c80b411f444c96928c85 Mon Sep 17 00:00:00 2001 From: luan-adao Date: Tue, 6 Sep 2022 14:26:31 -0300 Subject: [PATCH 1179/1407] font-awesome6: update to 6.2.0. --- srcpkgs/font-awesome6/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/font-awesome6/template b/srcpkgs/font-awesome6/template index d72c51ac6104..f237da8a53a8 100644 --- a/srcpkgs/font-awesome6/template +++ b/srcpkgs/font-awesome6/template @@ -1,6 +1,6 @@ # Template file for 'font-awesome6' pkgname=font-awesome6 -version=6.1.2 +version=6.2.0 revision=1 wrksrc="fontawesome-free-${version}-desktop" hostmakedepends="font-util" @@ -10,7 +10,7 @@ license="OFL-1.1" homepage="https://fontawesome.com/" changelog="https://fontawesome.com/docs/changelog/" distfiles="https://github.com/FortAwesome/Font-Awesome/releases/download/${version}/fontawesome-free-${version}-desktop.zip" -checksum=5511986794e283546ffb93a1f5715e4fc60db6bb490df1abd335ad3b8a3a72f4 +checksum=c81b76ee7cd89e0cd2125a430ee95d5e2b8ae22e0289658f1f82d70ec39955fd font_dirs="/usr/share/fonts/OTF" do_install() { From e8850e9d94ace7ceb57c626a22f510bb6b1cd9b8 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 6 Sep 2022 23:51:40 -0400 Subject: [PATCH 1180/1407] vaultwarden-web: touch for i686 rebuild previous run ran out of open files https://build.voidlinux.org/builders/i686_builder/builds/39238/steps/shell_3/logs/stdio --- srcpkgs/vaultwarden-web/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template index 557c3e195256..766535ff0f2b 100644 --- a/srcpkgs/vaultwarden-web/template +++ b/srcpkgs/vaultwarden-web/template @@ -1,4 +1,4 @@ -# Template file for 'vaultwarden-web' +# Template file for 'vaultwarden-web' pkgname=vaultwarden-web version=2022.8.1 revision=1 From 0e9851e66ce223241a0d8f010d12f35391b3fe3c Mon Sep 17 00:00:00 2001 From: icp Date: Tue, 6 Sep 2022 19:35:43 +0530 Subject: [PATCH 1181/1407] no-more-secrets: update to 1.0.1. --- srcpkgs/no-more-secrets/patches/fix-musl.patch | 15 +++++++++++++++ srcpkgs/no-more-secrets/template | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/no-more-secrets/patches/fix-musl.patch diff --git a/srcpkgs/no-more-secrets/patches/fix-musl.patch b/srcpkgs/no-more-secrets/patches/fix-musl.patch new file mode 100644 index 000000000000..0ae751d7294f --- /dev/null +++ b/srcpkgs/no-more-secrets/patches/fix-musl.patch @@ -0,0 +1,15 @@ +--- a/src/nmstermio.c ++++ b/src/nmstermio.c +@@ -296,7 +296,11 @@ + static int state = 1; + + if (!isatty(STDIN_FILENO)) { ++#ifdef __GLIBC__ + stdin = freopen("/dev/tty", "r", stdin); ++#else ++ freopen("/dev/tty", "r", stdin); ++#endif + } + + if (s == 0) { + diff --git a/srcpkgs/no-more-secrets/template b/srcpkgs/no-more-secrets/template index 2ba485e29d3d..55a7241f5d23 100644 --- a/srcpkgs/no-more-secrets/template +++ b/srcpkgs/no-more-secrets/template @@ -1,6 +1,6 @@ # Template file for 'no-more-secrets' pkgname=no-more-secrets -version=0.3.3 +version=1.0.1 revision=1 build_style=gnu-makefile make_build_target="all" @@ -9,7 +9,7 @@ maintainer="Alex Childs " license="GPL-3.0-or-later" homepage="https://github.com/bartobri/no-more-secrets" distfiles="https://github.com/bartobri/no-more-secrets/archive/v${version}.tar.gz" -checksum=cfcf408768c6b335780e46a84fbc121a649c4b87e0564fc972270e96630efdce +checksum=4422e59bb3cf62bca3c73d1fdae771b83aab686cd044f73fe14b1b9c2af1cb1b do_install() { for f in nms sneakers; do From 788157124883956886ca00645db182171026b527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 7 Sep 2022 10:41:41 +0700 Subject: [PATCH 1182/1407] linux5.19: update to 5.19.7. --- srcpkgs/linux5.19/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.19/template b/srcpkgs/linux5.19/template index 53a6108e5f3d..eceab61d457e 100644 --- a/srcpkgs/linux5.19/template +++ b/srcpkgs/linux5.19/template @@ -1,6 +1,6 @@ # Template file for 'linux5.19' pkgname=linux5.19 -version=5.19.6 +version=5.19.7 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="ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8 - 529ef98eb4463c48e276240de679c3dd37093a61cd7b55ae3fe4ba052045f844" + 1763f41c372d889788986c111394ac9a03a5b3b4eccbc7794c7da2f8dc8e2675" skip_extraction="patch-${version}.xz" python_version=3 From 1ab6e3c8be50761236ab247a0cd140fe208e039c Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 1 Sep 2022 00:30:38 +0530 Subject: [PATCH 1183/1407] New package: python3-path-16.4.0 --- srcpkgs/python3-path/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/python3-path/template diff --git a/srcpkgs/python3-path/template b/srcpkgs/python3-path/template new file mode 100644 index 000000000000..e4a30558a5a8 --- /dev/null +++ b/srcpkgs/python3-path/template @@ -0,0 +1,20 @@ +# Template file for 'python3-path' +pkgname=python3-path +version=16.4.0 +revision=1 +wrksrc="path-${version}" +build_style=python3-pep517 +hostmakedepends="python3-wheel python3-setuptools_scm" +depends="python3" +checkdepends="python3-pytest-xdist" +short_desc="Python module for object-oriented file system path manipulation" +maintainer="icp " +license="MIT" +homepage="https://github.com/jaraco/path" +changelog="https://raw.githubusercontent.com/jaraco/path/main/CHANGES.rst" +distfiles="${PYPI_SITE}/p/path/path-${version}.tar.gz" +checksum=baf2e757c4b19be8208f9e67e48fb475b4a577d5613590ce46693bdbdf082f52 + +post_install() { + vlicense LICENSE +} From e62d00387b968a4b280f0c2c3ec7bb056bae4063 Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 1 Sep 2022 00:30:42 +0530 Subject: [PATCH 1184/1407] python3-jaraco.collections: update to 3.5.2. --- srcpkgs/python3-jaraco.collections/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jaraco.collections/template b/srcpkgs/python3-jaraco.collections/template index c7d643a4f92f..a2837b11066d 100644 --- a/srcpkgs/python3-jaraco.collections/template +++ b/srcpkgs/python3-jaraco.collections/template @@ -1,18 +1,19 @@ # Template file for 'python3-jaraco.collections' pkgname=python3-jaraco.collections -version=3.5.1 +version=3.5.2 revision=1 wrksrc="jaraco.collections-${version}" build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-jaraco.classes python3-jaraco.text" +checkdepends="${depends} python3-pytest-xdist" 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=b04f00bd4b3c4fc4ba5fe1baf8042c0efd192b13e386830ea23fff77bb69dc88 +checksum=072b93eb35f9e48508485755534e66a34ef1cc84af291fd27f39b44d4c0dd2c3 post_install() { vlicense LICENSE From 072621e5b7cbdd8d849f39f757598cac804b874d Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 1 Sep 2022 00:30:54 +0530 Subject: [PATCH 1185/1407] python3-CherryPy: update to 18.8.0. --- srcpkgs/python3-CherryPy/template | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/srcpkgs/python3-CherryPy/template b/srcpkgs/python3-CherryPy/template index 44d83c9b3ada..5ee9191d5851 100644 --- a/srcpkgs/python3-CherryPy/template +++ b/srcpkgs/python3-CherryPy/template @@ -1,22 +1,31 @@ # Template file for 'python3-CherryPy' pkgname=python3-CherryPy -version=18.6.0 -revision=4 +version=18.8.0 +revision=1 wrksrc="CherryPy-${version}" build_style=python3-module -hostmakedepends="python3-setuptools_scm" -depends="python3-setuptools python3-Cheroot python3-portend +make_check_args="--ignore cherrypy/test/test_session.py + --deselect cherrypy/test/test_states.py::ServerStateTests::test_2_KeyboardInterrupt" +hostmakedepends="python3-wheel python3-setuptools_scm" +depends="python3-more-itertools python3-Cheroot python3-portend python3-zc.lockfile python3-jaraco.collections" +checkdepends="${depends} python3-path python3-requests + python3-requests-toolbelt python3-pytest" short_desc="Object-oriented HTTP framework (Python3)" maintainer="bra1nwave " license="BSD-3-Clause" -homepage="https://cherrypy.org/" -changelog="https://raw.githubusercontent.com/cherrypy/cherrypy/master/CHANGES.rst" +homepage="https://cherrypy.dev" +changelog="https://raw.githubusercontent.com/cherrypy/cherrypy/main/CHANGES.rst" distfiles="${PYPI_SITE}/C/CherryPy/CherryPy-${version}.tar.gz" -checksum=56608edd831ad00991ae585625e0206ed61cf1a0850e4b2cc48489fb2308c499 +checksum=9b48cfba8a2f16d5b6419cc657e6d51db005ba35c5e3824e4728bb03bbc7ef9b alternatives="cherrypy:cherryd:/usr/bin/cherryd3" +pre_check() { + rm pytest.ini +} + post_install() { + rm -r ${DESTDIR}/${py3_sitelib}/cherrypy/{test,tutorial} mv ${DESTDIR}/usr/bin/cherryd{,3} vlicense LICENSE.md } From 1ab248d8398bf7a4d1278206acc4457354517df5 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 7 Sep 2022 03:50:47 -0400 Subject: [PATCH 1186/1407] qtutilities: update to 6.8.0. --- srcpkgs/qtutilities/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template index 8ccb0e5d76ef..7c30d8246726 100644 --- a/srcpkgs/qtutilities/template +++ b/srcpkgs/qtutilities/template @@ -1,6 +1,6 @@ # Template file for 'qtutilities' pkgname=qtutilities -version=6.7.0 +version=6.8.0 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" @@ -12,7 +12,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=1ac2fe87f90de9b9ebc5e471ffb799c66e07234be0134def6a8be821a1cf2204 +checksum=76ac459271f596bfda46f4293adfb49fa3088c011d06737c9ab7f8bb32cde9d2 pre_check() { ninja -C build tests From dd304f8b91474478e701d7df17deb367009f1e3a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 7 Sep 2022 03:51:01 -0400 Subject: [PATCH 1187/1407] cpp-utilities: update to 5.19.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 349cd8f4d7cb..5e4a4c8dc437 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.18.0 +version=5.19.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=8c194160bf3ff6548741fc8ca4c7378694763a12256eeb59da8e15c01a0681fd +checksum=845362bd91d3e1ecb6bf3fc18492dda1d48458f35380dd79351ea7bb36804be0 cpp-utilities-devel_package() { short_desc+=" - development files" From 728bef51b98c9aea3deec135054bab09fa6a762c Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 7 Sep 2022 03:51:29 -0400 Subject: [PATCH 1188/1407] syncthingtray: update to 1.2.3. --- common/shlibs | 6 +++--- srcpkgs/syncthingtray/template | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index 980f4024ca05..92cdda93eca8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4154,9 +4154,9 @@ libopensmtpd.so.0 libopensmtpd-0.7_1 libiio.so.0 libiio-0.23_1 libqtforkawesome.so.0.0.4 qtforkawesome-0.0.4_1 libqtquickforkawesome.so.0.0.4 qtforkawesome-0.0.4_1 -libsyncthingwidgets.so.1.2.2 syncthingtray-1.2.2_1 -libsyncthingmodel.so.1.2.2 syncthingtray-1.2.2_1 -libsyncthingconnector.so.1.2.2 syncthingtray-1.2.2_1 +libsyncthingwidgets.so.1.2.3 syncthingtray-1.2.3_1 +libsyncthingmodel.so.1.2.3 syncthingtray-1.2.3_1 +libsyncthingconnector.so.1.2.3 syncthingtray-1.2.3_1 libglibutil.so.1 libglibutil-1.0.64_1 libgbinder.so.1 libgbinder-1.1.20_1 libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1 diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template index f445aa92db1e..7c49025c8258 100644 --- a/srcpkgs/syncthingtray/template +++ b/srcpkgs/syncthingtray/template @@ -1,7 +1,7 @@ # Template file for 'syncthingtray' pkgname=syncthingtray -version=1.2.2 -revision=2 +version=1.2.3 +revision=1 build_style=cmake configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF -DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none)" @@ -17,7 +17,7 @@ maintainer="classabbyamp " license="GPL-2.0-or-later" homepage="https://github.com/Martchus/syncthingtray" distfiles="https://github.com/Martchus/syncthingtray/archive/refs/tags/v${version}.tar.gz" -checksum=0f556e30091ffc06e7e489c5e09e5460401c28fd1e8318b68cb6066ead7fe7a1 +checksum=acf6a91a176334658211fff1742ca8bb8517071d3058e84a7c7c8627aa5c01cc # requires weird port-binding shenanigans that may not work on ipv6 # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=syncthingtray#n50 From a8f1bc2162b914b2b5d90b361cb67c77bf3419df Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 7 Sep 2022 04:47:42 -0400 Subject: [PATCH 1189/1407] rofi: update to 1.7.5. --- srcpkgs/rofi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rofi/template b/srcpkgs/rofi/template index d6c3e9b11361..1aee65c0943e 100644 --- a/srcpkgs/rofi/template +++ b/srcpkgs/rofi/template @@ -1,6 +1,6 @@ # Template file for 'rofi' pkgname=rofi -version=1.7.4 +version=1.7.5 revision=1 build_style=gnu-configure hostmakedepends="autoconf automake flex glib-devel pkg-config which" @@ -12,7 +12,7 @@ maintainer="classabbyamp " license="MIT" homepage="https://github.com/davatorium/rofi" distfiles="https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.xz" -checksum=1922e7dec6d591335384e4b14e94e592d96be1e4ff07f1506e9c3c367da62cdf +checksum=caffcf66d165cb32b748c1db7f229d6d75da58c1685eb17455f65c60e8220c8d if [ "$XBPS_CHECK_PKGS" ]; then makedepends+=" check-devel" From 05630e57669ac7fffa046d3fa321d03cca746578 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 7 Sep 2022 10:55:31 +0200 Subject: [PATCH 1190/1407] syncthing: update to 1.21.0. --- srcpkgs/syncthing/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template index ef38f99c3ba5..0ad05ca98eba 100644 --- a/srcpkgs/syncthing/template +++ b/srcpkgs/syncthing/template @@ -1,6 +1,6 @@ # Template file for 'syncthing' pkgname=syncthing -version=1.20.4 +version=1.21.0 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=0a2a26188d30bcb92a14c7f795790df9f44157118248dc4c9faca42967ce7ce7 +checksum=ea7506249b407da930fdf8c7ce5f2f74940a2ad20f57d58b1b36d2b63aeebe69 pre_build() { GOARCH= go generate \ From e69da97ee1ad8168abceb39c61502957996fc01c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 7 Sep 2022 17:32:15 +0700 Subject: [PATCH 1191/1407] linux5.19: update arm64 config --- srcpkgs/linux5.19/files/arm64-dotconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.19/files/arm64-dotconfig b/srcpkgs/linux5.19/files/arm64-dotconfig index 7189dede07df..8ec92673a762 100644 --- a/srcpkgs/linux5.19/files/arm64-dotconfig +++ b/srcpkgs/linux5.19/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.19.2 Kernel Configuration +# Linux/arm64 5.19.7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -383,6 +383,7 @@ CONFIG_ARM64_ERRATUM_2067961=y CONFIG_ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE=y CONFIG_ARM64_ERRATUM_2253138=y CONFIG_ARM64_ERRATUM_2224489=y +CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2064142=y CONFIG_ARM64_ERRATUM_2038923=y CONFIG_ARM64_ERRATUM_1902691=y @@ -9362,7 +9363,6 @@ CONFIG_VIRTIO=y CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y -# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_VDPA=m From 6dc4028d22a87143e4cd502b2c0d83106cf10bf5 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 7 Sep 2022 16:24:23 +0200 Subject: [PATCH 1192/1407] entr: update to 5.2. --- srcpkgs/entr/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/entr/template b/srcpkgs/entr/template index 0b53ee97da7e..2c590353fddf 100644 --- a/srcpkgs/entr/template +++ b/srcpkgs/entr/template @@ -1,7 +1,7 @@ # Template file for 'entr' pkgname=entr -version=5.1 -revision=2 +version=5.2 +revision=1 build_style=gnu-makefile short_desc="Utility for running arbitrary commands when files change" maintainer="Andrea Brancaleoni " @@ -9,7 +9,7 @@ license="ISC" homepage="https://eradman.com/entrproject/" changelog="https://raw.githubusercontent.com/eradman/entr/master/NEWS" distfiles="https://eradman.com/entrproject/code/entr-${version}.tar.gz" -checksum=0f87f577bce87641c525addb9bcc60bbaa579fe981dab759043e3ce1556dbb92 +checksum=237e309d46b075210c0e4cb789bfd0c9c777eddf6cb30341c3fe3dbcc658c380 post_extract() { case "$XBPS_TARGET_MACHINE" in From 2b83206f91fe1cf5bf15be677cd50756ba976e14 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 7 Sep 2022 16:24:55 +0200 Subject: [PATCH 1193/1407] kubernetes: update to 1.25.0. --- srcpkgs/kubernetes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index f3078993efb1..8c15b82dd642 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -1,6 +1,6 @@ # Template file for 'kubernetes' pkgname=kubernetes -version=1.23.10 +version=1.25.0 revision=1 archs="x86_64* ppc64le*" build_style=go @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://kubernetes.io" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=0199f4c948f1f686d850eee97a4d49e7ae3614aff4eff7794f499c065d721267 +checksum=80d560410896686b9c1f71f4fb9b5f8e8328d297d4d87bb0a545f766870f8f41 nocross=yes system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" From c634385ca14354da6eb617b30b672199aeec8f80 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 7 Sep 2022 16:45:07 +0200 Subject: [PATCH 1194/1407] perl-Template-Toolkit: update to 3.101. --- srcpkgs/perl-Template-Toolkit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Template-Toolkit/template b/srcpkgs/perl-Template-Toolkit/template index 24712b0359a2..6c5175e48ae0 100644 --- a/srcpkgs/perl-Template-Toolkit/template +++ b/srcpkgs/perl-Template-Toolkit/template @@ -1,6 +1,6 @@ # Template file for 'perl-Template-Toolkit' pkgname=perl-Template-Toolkit -version=3.100 +version=3.101 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -12,4 +12,4 @@ maintainer="Andrea Brancaleoni " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Template-Toolkit" distfiles="${CPAN_SITE}/Template/Template-Toolkit-${version}.tar.gz" -checksum=cec7c20af57ed4b0d8131599a41027f56e22b544c8083704afad6a13cd483ffc +checksum=d2a32dd6c21e4b37c6a93df8087ca9e880cfae613a3e5efaea307b0bdcaedb58 From 70506ae9b0bd78697f53bcf5f734cc8c8480974b Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 7 Sep 2022 16:45:30 +0200 Subject: [PATCH 1195/1407] terraform: update to 1.2.8. --- srcpkgs/terraform/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template index aceae9264505..43dbdc7e3489 100644 --- a/srcpkgs/terraform/template +++ b/srcpkgs/terraform/template @@ -1,6 +1,6 @@ # Template file for 'terraform' pkgname=terraform -version=1.2.4 +version=1.2.8 revision=1 build_style=go go_import_path="github.com/hashicorp/$pkgname" @@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni " license="MPL-2.0" homepage="https://www.terraform.io/" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=7d2f50449ddf87b6207b435a661ff3d6e3a9342f64d747211da7a558f8483997 +checksum=46b4f3295781ead715f1f579f369ae78d9771a28ba855dcc91a21ef629c92cd6 From 8bbbc7c19c6d2549677c79d3128f5ac4ce12e478 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 7 Sep 2022 16:48:32 +0200 Subject: [PATCH 1196/1407] terragrunt: update to 0.38.9. --- srcpkgs/terragrunt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template index 321c6033279a..81a10e06eb24 100644 --- a/srcpkgs/terragrunt/template +++ b/srcpkgs/terragrunt/template @@ -1,6 +1,6 @@ # Template file for 'terragrunt' pkgname=terragrunt -version=0.38.2 +version=0.38.9 revision=1 build_style=go go_import_path="github.com/gruntwork-io/terragrunt" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/gruntwork-io/terragrunt" distfiles="$homepage/archive/v$version.tar.gz" -checksum=8362c0e23f9547c3ff95454e8b4c7176b6d2d4273e5def8f50e6cab4604abe02 +checksum=5f3952de7474dc0d14d620e0f61b51c98070b7053e7b015bbf9f981ed7990fa7 post_install() { vlicense LICENSE.txt From f1f867f531a630fa17686884d0d8d3ce683cc6cb Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 7 Sep 2022 16:50:03 +0200 Subject: [PATCH 1197/1407] thermald: update to 2.5. --- srcpkgs/thermald/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template index 98a3f1f1705e..58b71f623fa7 100644 --- a/srcpkgs/thermald/template +++ b/srcpkgs/thermald/template @@ -1,7 +1,7 @@ # Template file for 'thermald' pkgname=thermald -version=2.4.9 -revision=2 +version=2.5 +revision=1 archs="i686* x86_64*" wrksrc="thermal_daemon-${version}" build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later" homepage="https://github.com/intel/thermal_daemon" distfiles="https://github.com/intel/thermal_daemon/archive/v${version}.tar.gz" -checksum=fb793a2bfaae2e544ef62801075419587b0c045041c69eeafbf61959cce07fdb +checksum=e6515678ce8ff37978a453e1617a087a40ba3a31809a42c1768b6f816e564cc9 conf_files='/etc/thermald/*' if [ "$CROSS_BUILD" ]; then From 934791c01b28ad481c4ea60e6053ac13ff9573c3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 7 Sep 2022 10:27:11 -0400 Subject: [PATCH 1198/1407] python3: update to 3.10.7. --- srcpkgs/python3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index 89bbd831c10b..3cb53a43f1bc 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.6 +version=3.10.7 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=f795ff87d11d4b0c7c33bc8851b0c28648d8a4583aa2100a98c22b4326b6d3f3 +checksum=6eed8415b7516fb2f260906db5d48dd4c06acc0cb24a7d6cc15296a604dcdc48 alternatives=" python:idle:/usr/bin/idle${version%.*} From eb158aa172010c7ca8d5bc95da774398262a1705 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 7 Sep 2022 10:27:56 -0400 Subject: [PATCH 1199/1407] python3-tkinter: update to 3.10.7. --- 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 cd125f0c3ced..89bca4de5bf2 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.6 +version=3.10.7 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=f795ff87d11d4b0c7c33bc8851b0c28648d8a4583aa2100a98c22b4326b6d3f3 +checksum=6eed8415b7516fb2f260906db5d48dd4c06acc0cb24a7d6cc15296a604dcdc48 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3" From 29b0a63e63d7ccd1d02fcc2dc72193016b172d9d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 7 Sep 2022 10:29:09 -0400 Subject: [PATCH 1200/1407] python3-ipython: update to 8.5.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 676294f4bfee..b391aa19d168 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.4.0 +version=8.5.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=f2db3a10254241d9b447232cec8b424847f338d9d36f9a577a6192c332a46abd +checksum=097bdf5cd87576fd066179c9f7f208004f7a6864ee1b20f37d346c0bcb099f84 conflicts="python-ipython<=5.8.0_2" do_check() { From deb4c1e451fa5024b0ba326c6f1a3e8ced787fc3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 7 Sep 2022 10:29:21 -0400 Subject: [PATCH 1201/1407] tagparser: update to 11.5.0. --- srcpkgs/tagparser/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template index c6e902bf74dc..176ec2e36812 100644 --- a/srcpkgs/tagparser/template +++ b/srcpkgs/tagparser/template @@ -1,6 +1,6 @@ # Template file for 'tagparser' pkgname=tagparser -version=11.4.0 +version=11.5.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=a58ebf69f05008cb18ac9e4d630ae0f572c02bf399acb4bb1ca257d0cb47411a +checksum=361401093cd8855ba11403f10658e843417d00894c1af82b720cd106b9d814d2 tagparser-devel_package() { short_desc+=" - development files" From 6e8b86eaa5d3cdd9c1bc1da28fed27450651a312 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 7 Sep 2022 10:29:55 -0400 Subject: [PATCH 1202/1407] tageditor: update to 3.7.5. --- srcpkgs/tageditor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template index 7faeed0e15ed..b9d0bd21ebb2 100644 --- a/srcpkgs/tageditor/template +++ b/srcpkgs/tageditor/template @@ -1,6 +1,6 @@ # Template file for 'tageditor' pkgname=tageditor -version=3.7.4 +version=3.7.5 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=d57d9d243680b5a4ce66d8c546cb15c5df6b1a63c403dee9e373d2f4767e469e +checksum=e989d3ea6ad109d94aa3e4ccbf2b7bd62b8fe844a3bd9d3540700ff7e08ecba3 build_options="qt webengine webkit script" build_options_default="qt" From 4294b64d8156913054ae4f3a41e92fc8042afcde Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 7 Sep 2022 21:14:23 +0200 Subject: [PATCH 1203/1407] firefox: update to 104.0.2. --- srcpkgs/firefox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 3931cc220053..f75728d1462b 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=104.0 +version=104.0.2 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=1a294a651dc6260f9a72a3ab9f10e7792a4ab41a9cfa8527ad3dd9979cdc98ce +checksum=72bba06f04e7745f6b02951906413eb1c15a7e253e06e373302162c6219f286a lib32disabled=yes From 1ebae5c91c21d1150f85f189b6401548f4120bbd Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 7 Sep 2022 21:14:29 +0200 Subject: [PATCH 1204/1407] firefox-i18n: update to 104.0.2. --- 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 a44081991a7e..56337a2a6222 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=104.0 +version=104.0.2 revision=1 build_style=meta short_desc="Firefox language packs" @@ -140,99 +140,99 @@ _pkgtmpl() { } } -checksum="28c4a4f463763f68eda9e251375677aad44d72d7c667fce97532827dd8dd555f - 3676f7cbfe5e15ab4b632447a035717cb5a9b664166f655d5c0a0cafeeb6189b - 289f736d954d3c318bca52022c4a05539b70b74d6fd53e1cad57a0346aaefc9a - 6216cbd48ca2ab88da15bba1f48a5b42db3226fe5283b73184d44ebef507be93 - 2a8186384950c3e718176a7a33d1ac27e14d1937869d0b3dea4ebb0373f8d0c4 - 15065110b91226e79fdd05d977e61cc8e973bef41d9ff2a429c3fe23de426c08 - ae841850a061adf244e01e6f7d1f1c2ec67f5925314584e5b3c586e0509fccdc - 4d87c184b3a63492ab2d556bd5aa444389626ed6691edcb8613567a3bfe117be - 08794f56ad3baa5fc80a13c8e50de2371fb8b386ab9ebeb26351268637dd31ef - 4d1bd3ac8594fe42f3a74b04af1c299547884bdacb80c9a0c09d3b5cf62778af - c839ee2d229f61f44105f5b4f54f7adfa3bb71089a3620f668222611e456fb7e - 74db16fbe66cc0e9d39318861cf29477d20f77d8260fe1ca0ce166718d74944b - 13601e0ae3cf57ad55129f942c3d3d39805364811f7861f6374c08f5f39cacb0 - ba8668128a908643b51f17ce8415083f94feedff0a446d50575ae19b76af3325 - 193dc7fc72517043ce8a9898e15646646ab7a25c8d69bcfd7b0c4b39593ae0c9 - 590ddbc2e8ab1e817eb852046626c480ffb70d42af2176f22e47530b1de88b91 - 8fb296231617c39f216989c9001784f1330a4d9abc77039cfa441ff78145eeba - ba14dde13a3a2404164f37c6b613a91961f90a8fefd299650d4f8afda5d3fb32 - f045455455cebe4ca8e38b8ec8a18773ededffc1f039e85940d94144f6e097a9 - 9f35b20e85c3fe582938295ad39d0b5c517f36a469b3835d0f40463ceafe8f96 - 522d007632474b8bbf535818c7b38478b45deee9e99c3c70f753bd45cc32070e - 139b4322570e73f7b2c2153f0cc3f509c939de36a0c900b5f0333ef9b74be192 - c4acc839a1bb55272c655d3dc1cd3a3772246eee9818c96e3a300b7fd14330c6 - 055a6c5009a9e550674f5e4e91249a34b211049c502afe5ae3b53492160d5b6e - 92204b1c55b7998315458ca837ee0cd124e0f50ffa535f84b6fb3152c30215fc - 78d6a53a60077b7d36ea191a58103f473076529fdfd5652e7fe1e0b9f6b47120 - 030ac4876d800b3c65e8c095119ea6e265e958b745da7f194c1a877f246680f6 - 9b2b0eeafb165d5bf2949b3acbc322e2d9e52336e219ae66ee1405fe9ff51310 - 31634eef443337ee07a5c8bcf8f6c383e4a721b36eb21f0a1d1159563535782e - e40d1f38706d8ff7d022fa0f6594d492bf5eb385a9fdc3fe5a3907764aecd56f - 5badf3065eba897d1830b2e80ccd9531655c35981d14cf565345c0f5a6d35fe0 - 774f56a9f1cc80b233da4daf22cefc2583d6c11d28bec2271ac5ab3a4a4925ee - 16cfde878e2d3bb85cec906792b1e53e76e2efdbc73640956514e9c40f02dbe5 - 807e0f1769d944d11169a36da60d85bd64ff56da6b91f49122c78131cf90f406 - 8a8fa07c3218552a11d48dfb8a6a1026643cead5fe4bd172790bbaf03689249e - 46603cfd9926169725699a8cbb173bda2a75399758861b97afd1df8f7d5b59d1 - 25915fbf10043c2a7b40807385e951eb23446294774c45deea63e72452ef01f5 - 17ea2c55f49116db4510f4427a6ec92ced0884ce65c2b4c1c5af9d015d4476d1 - 203ed3e7acd68b76528fa62d1670fa771457519bca12804275e2c6565ff1c460 - b5555879af449535442cbb81b01c155d502fa2e12ce052dc78ceaad9d0dee635 - 58dc7b73a2cf22c3095ebf99e89a3dc51677c6aed0d0a6d9b85c9e3d187c2352 - 4be5cd694c48b93673622ac6f0c59824dbcec5042ee66b1d0e89d49c5cd49dbc - e209beb29b262465e845b1f38bf23a2fc65af356d29816bfdbc5b5a3d4cbcba3 - 936eafe625d32051efb20244850c5116972afc544620a3c33d2d151b4442d5c8 - 2bae04718b2b9fa1c8233ee59d90e8d1b18123fa0f8e01faac8d9f94dac7d60c - 6c07be1b338367bfdb9a928f7ab093247c2ea1104a8b4259658a6e0131b8412e - a0ced4537f73cfcb9413b1d013587ba17f620affa138abe1204c552f8b1099da - 7cafa415c221b0e9c08e52780b23d4da849e25addd7205c5416fe533f2de1b31 - d504bbb1a1570abdc6b479d52ac1b41afb58ddc57fa038b9f4c9462116a7730f - b804fd92d110a62189eed511c62bb665c91c526be7f13321d358eb5f36674726 - 93bf000ffa85de98f78ba8c8c5ac7514be6cedacd87e7fa1d10f8d86923b3314 - 7349593f3837c982bae546b905eef350ebf0e0274407744e4084291f9730828e - 82ee500147d99891985ff9ba8c1563d194d2736b2efaea82c73c0a8cd499c9ad - a96aeaa5f22478d47519e7db26f720a47fd534d98413536a615dac6ce358daa8 - d0681253933a56c0a094fca3cfbfe7b8a257c2c5185cea25c066193b15766795 - 4c6e654d99eed7e3e58284f974cf9b04958dbe6154674f70eb6dbaef2adda1aa - 75db480f706c984838faf6f4a94a9cf2292c97e7ef2d005e7dfa7e87a175972a - a956de4d1894419ea1f12bc4d4b1eae0724763a29e6a29ec712e527efc1b2211 - f1171f214b33b6081b6f61e9301df292fd983173da75645a69ecb56d0090716f - 949f0140ae41118f7fbef8dcec11af051cf4d3ac25d65f4a568681d2517ce7a6 - 416f3590cb9cc97da9026b42125782d4267ff835c02c18dbb40541fe281f41d6 - 15c0f69ade9de3fd05a381690147778cbee34088b67c90141206b98643422cdc - 43eff51a68ebb8f9a0505cfddf72d272acab9a218df63dab71ea11646ae9f055 - 7d719675b10ad992345df1910c4459d97b6e95dee4b77b12bc33ff6fe2e4413f - bb93bd2019557ad4d40953d72bec8761fe9329d7c90abf58161f5d1730bb69e5 - d60ef8c275ca62165a975148d52bcc3a05ee0ef5fe53de954f540117e2397122 - 07b0ffb0990cc5cf9110746cad70f5b4f3efe08d94af4de882d71de9a382f21d - cc6246f49f8eadc7e22f7b5e60b21f660e39a22973e59007683c114475957dd4 - 771582f45d7418595b6cefc36ad6efeefd1454535a85ea230971813fe16f301d - 89473bb826ef3cd74b3cdd369bb17641169bb45d5e3c0259bd6f8ea2c2f28b3b - 83eefb78c864d2c4c90e4a5b84c146ded01bb1b4dd4acbfc4a3d5ca75b8feba4 - a9f83bf7b2fbe87f2b99cc5a729fa817d326c56e7363352fbc90d89d8212cc46 - 3941d11fe0f127703f8e235690eddb4a43a17921f34bdc5c9bba046f822aa770 - 51823a48d453d3ae6af662f07a464259406614aaa343b6210bb4d1c18dc906da - 690be435460bc32987391e6fc60a2e55404bd463de05cdd5ecb409067e20f6c4 - 6eb8d28368a6ed4904a0a997463442241fbf44a5085a2e5510ca7c4c7ee9390a - 39c2a6d8fe0cbe5bbf7bd170034e1ef4b3b6445e4b4bc98b4213e0820ed3c7c1 - 52ac4bdefc0a1c18f44b3dc1371c03c676320583596f9dfa62b5c2990961713e - 2ba5715e933430d89bffe8b4df1c61999e736b6f6c3c4f73f5e4d37cd06632e7 - 7b002917f3cff42fef2fbe64c2694c79988278aac58feefa6635f7ede26eb85d - 1eb3d5e08cc38208bb277bd7f7e27627de070f550f06da41fa8cac9da9ec0da5 - caf8baf9cf4b8a892c5f15195965bd695853110680e0c72ac83b3e1804527561 - 337f3a693bed0e7359bde5a3365ff0fc6991b404a5fe1b2bbc2caba4e7cf44c3 - 2a0b9b6febccc2c7157895f4fd404e3c9b6f97ebaf3e4cd0c32523bba7c762f4 - 0e2cc417b5f87ed9beff382f6a2210b4da94527aff0f94e599e689a96ba60a32 - 12bd72d91885ee67b8fb83302e8fca6a0068a9ca79b8931621193782ee0874b5 - b4022b09a569276df5064d3d984564ac78bc6048867da48121a665b14c7ce83d - 3657a362fafcd8b80e6138c227fbfde027174c97a3af36a37bea4b038c865606 - 22479abf947e2ed205c6d10b33612f737f55b14e06663da3c6ebd1cb28cd9367 - 08eaf9e7ce70214a6ef56f65178f2efdccf1816b00858270e928dfcc30ccf7f2 - 71bbdd9c18ebd0957b0aa04574f437980c176d2b0f46f45978bb7dfe05b18ad8 - c68fd85aad4bd2eba4167e745875b78b1f67637b36f0b78a7a8f60b976153b8c - 23f628bf0ffdf12d859e70d90b1ea077b9b6782c5f4edc7f4349cf28ac2f3e20 - 62ca1eda6b2a385164e2600cf89a16d1f278c10eabae2db750166a93825d3a57 - a3d0acafe9b9caab0cdbaf0d37b1a0577561e573398d9c993578d20a0f926a0a - 34f9092fd5ffd9232bd132afd1c96ecd66c80bc348c5beb8cf41e01365507875" +checksum="56c6e626cf8a68317a8c85c4bd0042fdd8bfda5e1cc9a6437e5afae2dc1a649b + 686c80fdedd1b3e6fe36c04acd7ad773c75f3dacdc713835a27125013a8140d8 + 840cd7ba6a1d760673094ab9fdeb1b88099afed66ae02765b4ebdb2ed874bbe9 + 4f11fbdc9fa32743ebf469b9f142b7f33c843149c697184a2deb851361262df6 + 8bb59311265a4596c46b8357c1b602fc206877bfc13976f1c11de8e886ab3757 + a6b755232bdca0804a1e0a8f98e98562ad7b08138590865e5678d2582315e1d2 + ca7e2264a0d92201173d7f40c661919e75d611b6d43ae458f4289b072cbc3b2c + b64102aac920b29f48b212e5d589e7576f7e25b9861eb8277aad895c0729ad5e + 31b5c70deb174897a215b9cfbfb0caf900c5acb482b6570745266c73bdcf1a76 + 336fdb9bc401a71581b9a09687c7c86387edc2c1dcdcf1de1817cc3cc33f710c + f33ac54003d1a0fcc3e4e0146b131c7c986c1f1a70b313e2e0e389f693c9c83b + 540b344de1cb81c8b78355de9cd45d9e900024c0c99dfa4793263fb7586e205c + 57ef8b46e18ea491b81cc4d2b4f1c19556669fabb10ece018ae1f4ba1c70ac0d + 93bc459f02b92c5077bce0d216d2fc994cc979832c0ce24d9b077831052a621f + a76e6d37ed3fb26a8136bec5be8f9d21cb55096246a4c6b253b284491d1cbb30 + 76d64a204b44cf074644867f638928a3a4a49ee45f1e0da3ad749cb6a55b2480 + e5df73cf380393707227008879ec2e511e6b9f24f9eae7111617e3a5f0877c0f + 18e03b9025be4381b2f29c9cad5bd0295e4994813071390f4d4f6f01b0b93c79 + 9923e3f28b98553c58f3ddf24c779a7b58f99995ecf9ef8b7924767d3e0b40ff + df197a0d28bc07abb6711268663e0307f354787a4e62e36955bdbb03537cb7d1 + 2e5f37bd081b558726ad2579d9c6f0469afc37ae3c89c8c06b44b83afb1b3fae + f512a33b02fa6a72b1b6f963bf28431729c404787ccfd9ae96331affe9a696d2 + 67e85f347040ac773a2a946dde0483f91e19b6f86edc4e84b6d355d486912313 + f5f88969a0b98c768843db68ec528b2387e34acdbeee58d6a56551ac57ee2ecd + 3f272cc005ab8a8e0f449c17d6f127be53d74c0fe2506bab89169e70e60ed728 + c3b485a9938a041b91d0f4670d2683d35657b79650d9de7099870013ad0709d5 + 4170bd2da40a42044204bf5e2d5ea5e46e939ffdea9e2a852ce8f5ba09cc346d + 9c09b94126e24ae8d1f6ca10a035382ffdb5ca53e8a6ea06b19a6e49d3293b57 + 9e1acb7cdecf527806238ce344ecd149e9834457670534ff61792921cd647c55 + 90f0f7e41b65c550165cd21a1ac4f839ed089dba58af8b391358d3ed36825b26 + 88858b4a4bb4499d449a21e7fa5510da182e366f47b1bd13441edc7696a41a7a + 08176fbf3a75759e9a470e43773a2e5ef807658ef4c25a11552a9cebb48255d2 + 9743e28351548845bc39db3cd9fe5d423e8ec4fdc73afebf0076ae5b364d12d8 + d273cee85a7b9fa7d6736d3474ad2b07b07a241d1fb8344c7c6344a27e1211da + d02101cb48fad2c9961f5d6cb41da9ed96b04727d0fc209bd897eea8dab36cb7 + add4495fb36aaeab4ea4f1c5e429ab33db6c6d95c07cb72f45daf029eb376ed6 + 7dd2af2fae3b05a4f4f4c024b4f7f4b2afcb23388616e0b5a2f9a4e565ec4b03 + 07cabc052143856ab39f5bb7026f7eaafa20078850b6d6dd0e706f583648e75a + 70128ce9561033f7fa65366e03eab9c701c3056863192ef2a96b5b8b3d1182d9 + e9c89c046ad1acc43d9a33e932a6adb6f0e4aec3730b50eaa1076e19779fccf0 + 2a19552b61da26616865c2328b9de3e2ed9d5fd6dc01f062ee30b730b4e1a427 + 458a88cb7ca0a4076ed1ce7bee670b8cf3b1e7a0ceeb23d27715361d5dfc9f86 + cc8d3a52f91081d02da1552636d31ddd8eb296732f037a7394f02ecce96b4011 + a16f1e018ac32ffe3a1ffd18f1f68ac2675cf62c31d39c5e3d37c6d4c49745b5 + 52f59b7674f1123b834a98adb3a5637394cabbd255b95553c4a5f46cd16e3d51 + 359850f002c9ad375e47d2d1e091ec1b6a324dc3d795e81d85e0aeb7ddf8e9a9 + 99b85635f8ea47a4584be00d0597c23b130457d14f859f8761e9090d20b0148f + 566a2992719d9e478702b4f16e7cac74a5fefa97387b4d577d9e79ba8f1de2fe + 5cb57f443354146205665ebc8992344a01067ef6ac59c7abb7cfdbf134696530 + f9f40413626841af4e9c198c901c8ac2261eb36d78a204001a0ada904419b68c + 707525a6a2d96701691b037ac00d465d725c7e23455de385c6329f930f44eb32 + 88c9bfa868e1e4ff6cff773bc1b8c88fd29dfd24809d701ba37875c4425780c8 + c6f74cb370344f779d742b374490444b3ecdfe5c8dbed7ff642f33f22b3afc87 + 3bc4e4bd073737a7d8a2848144be2d8b3c57a8f20f0eeb79077f4bfc68a0b128 + 9f5d49ee0c6c621d0a35a546298058549f81f8c8543b7c8f77794c4d3c349a5a + 56221fbbaaa7624889673ccb3e1dde4397244fc186506a001c9092d07e48a74e + fa02af73c16840520e7a7b40eae21f946aa4cfa5000025be3143a8623cee3d6a + b7f4c076123a0ecc1566dbf90aec68a2f04777f0a5789aa5a6954b0bf882bfc8 + 49e05572fada652dab6e7ae91c9e159cceb6ab29497a3502325ece10a339384b + eac93a9ff5875a3a702a1fdf8317419fdb66ca57ea1da9fcae531483dababfba + 319b5e51444f1ffd6381a01ebdde28f8d52cdd6e6ca407bb4789db6740f54395 + 2d39f5423f5aabb068190b03b7d26ec87948039659c60f39d1064ed37ced9966 + c8d220ea905405dd18315639c4dc1c033a93aa320edbd7ef8a64a596c6004848 + 793aa905f84c541f7616e421d84afca8131a5f42d4209370a21df511d84be2ee + 6d44b60c2bb9748273bc1260bb16182d8e955b286ae6f518d11195b17ead8d2b + 93aa6034e7356fe9d47287f98e843252ff332088e7afba3b780e05123d2e58bb + e561ce7f059d4feb91566a33d80e1dfb19f4df6bdf5d8663213ba59f483db0b2 + 925cf0af3eaf22c0d47394a9650541ff6ba1dbc1615613bfde4d014d13ae6ab5 + 33f9f497d9e9b4f8a4c3f8fa825400ec9b7223db7b4012c86067e5a8e389b1be + 39d092027919a0d6f995ccfe2818e7ae68b5990e89a6d8425cb7405bda38b159 + 730c6b0e606fa23ff21485b9b871117ae11ed3cf7ddd7c2773ce9e4179213926 + db8c9b613c0e290a865cbedfe03259553afc41cd6be754e9152011987ff7c711 + 282e7391d292c010259bcff307891c94ab0348b72ba55e83be1e22fcda662abc + e05c04527667fa649528c7d568d695afb40651cfb0e45721c5cfb30d97a61fe8 + 4da1f5f4bad7aaf0a264929f396e2e043b13e6bed39291cabdce9bfa94ef4e9f + 196c38742397e2d8ef4ce08460d5b07be11c903c4ea293ea2be129da8982b004 + 1556f924e7d082ab97c7c0b8c6741acb662fa60314ef0b69da646abf4c26257a + 906dc8096ee00fe04dd9a5574b19d68e1d23c49f2cdc4052b9df20436a922915 + c52de458802d102a7166fe6e5dffdc5173bb1d031e860ca66e9114454d8ba50d + b3236b5bc7022aeeafd84e63a62d32bb6eb950a8866ec7cc3419e84dda44e1f6 + f52e7032654adaca34d3515e6c551c2e0134fc89e44af51e6dfd273010fefb4d + 42c90d28af48e89b230597ca99dd032072b88430f2e9787a6c23c12cd8bc1d77 + 2b9a9d812d0dbe9bb025b56e8e070e0127b546e437efaa57d7d486451d5a9ef4 + 9c9b2c82f515378c8d13cc3407252fe2e80a57bed72ad2a0b3c20a450267a386 + 14394e2f4c7e9e43ea582edf00908cc355bc695c9b9a4882acdcc9d99fa2c19f + 8b100b70d2dba7142b688002a6cc5d60878871917414a3bc4bfc2ac67f1e2231 + 034a460e28ead46ab29c4c3517a90de79e4d7f534158857fed695f94b201b1ae + 1aa24cc33f657833698d737414030a5b5d2b984e02c7c536dd8fdfe2a33159a1 + 896c9b0cd44fbd0eba9c133ac9a347331272cdff743ecdd793e787797f718ca2 + 84f1b3992c0c86fd152a7ebca19d3162b6c408e8d1476f3bd35880bde261da45 + dc374e5d39d8dfc44c35d35545ce1ec3f4309992315ed4c8ffeec5dda25eb451 + 66341169cba7ef9b9499f780dfa48f7442a139bed1e7f315f8c33e4110c3e574 + d7e09d0188a70430c4c147aab27eb5060df5a0d276ddc3bc1e2dd38ef57dd896 + 76a3e671a8287ff74ec87fee989ab710b3549604729f137d2dc969d030dc60ac + 8986db52d806e6d2b88b2477a0eddebcdb44b7e4d3133002739bae34b3163864 + 4728062f9ebb97ff45a3ea3e783f87a36a49eaec9b342c936437f4fa383d433a" From 2549098663475f9dcd3e5668e43453dd0d9fd062 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Wed, 7 Sep 2022 18:40:03 +0200 Subject: [PATCH 1205/1407] android-tools: update to 31.0.3p2. * Added e2fsdroid and ext2simg * Fixed build with GCC 12 * Bumped minimum required CMake version to 3.13 --- srcpkgs/android-tools/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template index 61bdec9958b0..8413d1e0cc10 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=5 +version=31.0.3p2 +revision=1 archs="armv* aarch64* x86_64* i686* ppc64le*" build_style=cmake hostmakedepends="perl go protobuf pkg-config" @@ -13,7 +13,7 @@ maintainer="John " license="Apache-2.0, ISC, GPL-2.0-only, MIT" homepage="http://developer.android.com/tools/help/adb.html" distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz" -checksum=0ef69f919d58a2bdff2083d2e83a9ef38df079ec82651b2544e9e48086df5ab8 +checksum=2e1274d625368f57128477c2cda8474489443cc56e8738cb71919412a2872fca if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From c77f5e73f38d4f117f375905622e6fcb9101d8c3 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Wed, 7 Sep 2022 09:40:47 +0200 Subject: [PATCH 1206/1407] bat: update to 0.22.0 --- srcpkgs/bat/template | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template index 11e11a56fd68..9c172d7dac8c 100644 --- a/srcpkgs/bat/template +++ b/srcpkgs/bat/template @@ -1,6 +1,6 @@ # Template file for 'bat' pkgname=bat -version=0.21.0 +version=0.22.0 revision=1 build_style=cargo hostmakedepends="cmake llvm clang" @@ -9,12 +9,19 @@ short_desc="Cat(1) clone with syntax highlighting and Git integration" 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=3dff1e52d577d0a105f4afe3fe7722a4a2b8bb2eb3e7a6a5284ac7add586a3ee +changelog="https://raw.githubusercontent.com/sharkdp/bat/master/CHANGELOG.md" +distfiles="https://github.com/sharkdp/bat/archive/refs/tags/v${version}.tar.gz" +checksum=bec63bffc315bda7b65d472a19833e14bbaff4d251cedf8bfc77c82a00b77bfc + +# skip problematic doctests on i686 +case "$XBPS_TARGET_MACHINE" in + i686) make_check_args="-- --skip src/";; + *) ;; +esac post_patch() { # fixes an indexmap error when cross compiling - cargo update --package autocfg --precise 1.1.0 + cargo update --package autocfg@1.0.1 --precise 1.1.0 } pre_build() { From c5127c853328460fc14f17b308eb00b43110774f Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Sat, 3 Sep 2022 11:52:26 +0200 Subject: [PATCH 1207/1407] slack-desktop: update to 4.28.171 --- srcpkgs/slack-desktop/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template index b78a5abb3960..0b322cb0213a 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.27.156 +version=4.28.171 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=ff1b43fbff8a1ad3ebe2f4099bc65ccefa723f17cc070d0e13b8734f31614acd +checksum=aec1d7fcd2cb191d1766c83709ce868cd2baad273d5263365e47e3ab0b09655e restricted=yes repository="nonfree" nopie=yes @@ -21,7 +21,7 @@ do_extract() { } do_install() { - vlicense usr/share/doc/slack-desktop/copyright + vlicense usr/share/doc/slack-desktop/OPEN_SOURCE_LICENSE_ATTRIBUTIONS vinstall usr/share/applications/slack.desktop 644 usr/share/applications vinstall usr/share/pixmaps/slack.png 644 usr/share/pixmaps mkdir ${DESTDIR}/usr/bin From 70c1b2ca9a64a794c67241f6f20aaff09012b83c Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Wed, 7 Sep 2022 10:41:19 +0200 Subject: [PATCH 1208/1407] hyperfine: update to 1.15.0 --- srcpkgs/hyperfine/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hyperfine/template b/srcpkgs/hyperfine/template index f93002ddf70e..9aa41dbb2f6d 100644 --- a/srcpkgs/hyperfine/template +++ b/srcpkgs/hyperfine/template @@ -1,6 +1,6 @@ # Template file for 'hyperfine' pkgname=hyperfine -version=1.14.0 +version=1.15.0 revision=1 build_style=cargo short_desc="Command-line benchmarking tool" @@ -9,7 +9,7 @@ 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=59018c22242dd2ad2bd5fb4a34c0524948b7921d02aa79419ccec4c1ffd3da14 +checksum=b1a7a11a1352cdb549cc098dd9caa6c231947cc4dd9cd91ec25072d6d2978172 post_install() { vlicense LICENSE-MIT From a0e5f56895da0d1db5cf0c011fe86b9290495d9f Mon Sep 17 00:00:00 2001 From: icp Date: Wed, 7 Sep 2022 15:43:36 +0530 Subject: [PATCH 1209/1407] python3-jaraco.logging: update to 3.1.2. --- srcpkgs/python3-jaraco.logging/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jaraco.logging/template b/srcpkgs/python3-jaraco.logging/template index 9339cd4e9f76..f74e8eab5e22 100644 --- a/srcpkgs/python3-jaraco.logging/template +++ b/srcpkgs/python3-jaraco.logging/template @@ -1,6 +1,6 @@ # Template file for 'python3-jaraco.logging' pkgname=python3-jaraco.logging -version=3.1.0 +version=3.1.2 revision=1 wrksrc="jaraco.logging-${version}" build_style=python3-pep517 @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/jaraco/jaraco.logging" changelog="https://raw.githubusercontent.com/jaraco/jaraco.logging/main/CHANGES.rst" distfiles="${PYPI_SITE}/j/jaraco.logging/jaraco.logging-${version}.tar.gz" -checksum=150dc8701207b28bc65a16f0e91c07250a8d1b9da324ce674c0e375774944f13 +checksum=93a70b8b3767779ad6c7b56ee98579ced77b69f16abbcae749f62c2c59e67931 post_install() { vlicense LICENSE From ee25280f4b843e2f216d8eb6b8befcccf57bad54 Mon Sep 17 00:00:00 2001 From: icp Date: Wed, 7 Sep 2022 21:17:51 +0530 Subject: [PATCH 1210/1407] lua-language-server: update to 3.5.5. --- srcpkgs/lua-language-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua-language-server/template b/srcpkgs/lua-language-server/template index 98ef93b870b5..f96bc01d3ec1 100644 --- a/srcpkgs/lua-language-server/template +++ b/srcpkgs/lua-language-server/template @@ -1,6 +1,6 @@ # Template file for 'lua-language-server' pkgname=lua-language-server -version=3.5.3 +version=3.5.5 revision=1 create_wrksrc=yes hostmakedepends="ninja" @@ -10,7 +10,7 @@ license="MIT" homepage="https://github.com/sumneko/lua-language-server" changelog="https://raw.githubusercontent.com/sumneko/lua-language-server/master/changelog.md" distfiles="https://github.com/sumneko/lua-language-server/releases/download/${version}/lua-language-server-${version}-submodules.zip" -checksum=f370f55e1af6ae9421596afc08b9fbaa56d76d980dda0393d3091cee7aa2a17f +checksum=a56bc318667792d224dd91b31c1343fd64053154c5e8c9ed209f0eb8444d33ef do_build() { ninja -C 3rd/luamake -f compile/ninja/linux.ninja From 4a9862ecec23537ff4ad1f5db635b2c8416733c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Fri, 2 Sep 2022 09:29:33 +0200 Subject: [PATCH 1211/1407] crispy-doom: update to 5.12.0. --- srcpkgs/crispy-doom/template | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template index acd3fd216a33..6c8ea335d079 100644 --- a/srcpkgs/crispy-doom/template +++ b/srcpkgs/crispy-doom/template @@ -1,20 +1,28 @@ # Template file for 'crispy-doom' pkgname=crispy-doom -version=5.11.1 +version=5.12.0 revision=1 wrksrc="crispy-doom-crispy-doom-${version}" build_style=gnu-configure -hostmakedepends="autoconf automake pkg-config" +hostmakedepends="autoconf automake pkg-config python3" makedepends="SDL2-devel SDL2_mixer-devel SDL2_net-devel libsamplerate-devel libpng-devel" short_desc="Limit-removing enhanced-resolution Doom source port" maintainer="Benjamín Albiñana " license="GPL-2.0-or-later" homepage="https://github.com/fabiangreffrath/crispy-doom" distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz" -checksum=7c5bb36393dec39b9732e53963dadd6bcc3bd193370c4ec5b1c0121df3b38faa +checksum=d85d6e76aa949385458b7702e6fb594996745b94032ffb13e1790376eeecb462 CFLAGS="-fcommon" pre_configure() { autoreconf -fi } + +post_install() { + #Rename default.cfg(5), hexen.cfg(5) and heretic.cfg(5) man pages to avoid conflict + #with chocolate-doom + mv ${DESTDIR}/usr/share/man/man5/default.cfg.5 ${DESTDIR}/usr/share/man/man5/crispy_default.cfg.5 + mv ${DESTDIR}/usr/share/man/man5/hexen.cfg.5 ${DESTDIR}/usr/share/man/man5/crispy_hexen.cfg.5 + mv ${DESTDIR}/usr/share/man/man5/heretic.cfg.5 ${DESTDIR}/usr/share/man/man5/crispy_heretic.cfg.5 +} From 4d297875671ec5b12c9099fac639430f3789dbfb Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 5 Sep 2022 19:39:01 -0400 Subject: [PATCH 1212/1407] rpi-firmware: add firmware for zero 2w --- srcpkgs/rpi-firmware/template | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template index ed8529716065..62d809b840ce 100644 --- a/srcpkgs/rpi-firmware/template +++ b/srcpkgs/rpi-firmware/template @@ -4,7 +4,7 @@ _gitshort="${_githash:0:7}" pkgname=rpi-firmware version=20220823 -revision=1 +revision=2 archs="armv6l* armv7l* aarch64*" wrksrc="firmware-${_githash}" provides="linux-firmware-broadcom-${version}_${revision}" @@ -58,6 +58,16 @@ do_install() { $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm + # Firmware for rpi zero 2w wifi chip + for f in bin txt clm_blob; do + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436-sdio.${f} + vinstall brcmfmac43436-sdio.${f} 0644 usr/lib/firmware/brcm + done + for f in bin txt; do + $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43436s-sdio.${f} + vinstall brcmfmac43436s-sdio.${f} 0644 usr/lib/firmware/brcm + done + # Firmware for rpi4/rpi400 wifi chip for f in bin txt clm_blob; do $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43456-sdio.${f} From bfbeb0bbb5d0654c6c1ef0602cf8b0ed96558930 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Sun, 4 Sep 2022 09:20:01 +0200 Subject: [PATCH 1213/1407] AusweisApps2: update to 1.24.1. --- srcpkgs/AusweisApp2/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template index c6753ed80682..7c55bbe79b0a 100644 --- a/srcpkgs/AusweisApp2/template +++ b/srcpkgs/AusweisApp2/template @@ -1,8 +1,9 @@ # Template file for 'AusweisApp2' pkgname=AusweisApp2 -version=1.22.6 +version=1.24.1 revision=1 build_style=cmake +build_helper=qemu hostmakedepends="pkg-config qt5-qmake qt5-host-tools" makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-websockets-devel qt5-declarative-devel qt5-quickcontrols2-devel openssl-devel pcsclite-devel" @@ -12,4 +13,4 @@ maintainer="Justin Jagieniak " license="EUPL-1.2" homepage="https://www.ausweisapp.bund.de/ausweisapp2/" distfiles="https://github.com/Governikus/AusweisApp2/releases/download/${version}/AusweisApp2-${version}.tar.gz" -checksum=3665502eb9fa5811c58ffd1952e15589216bcaaf88c63458ac5930c9ad588945 +checksum=ff3672db30a5156031b7bf85fd272f2aadc2d3458963c8dcead2c00f6da42042 From 75913a5d8410ff5ad99bf44fb156cbbd9cf2f4de Mon Sep 17 00:00:00 2001 From: Hugo Machet Date: Wed, 7 Sep 2022 10:10:45 +0200 Subject: [PATCH 1214/1407] kak-lsp: update to 14.0.0. --- srcpkgs/kak-lsp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kak-lsp/template b/srcpkgs/kak-lsp/template index 75a4a6088ae9..e7c4414a2ed4 100644 --- a/srcpkgs/kak-lsp/template +++ b/srcpkgs/kak-lsp/template @@ -1,6 +1,6 @@ # Template file for 'kak-lsp' pkgname=kak-lsp -version=13.0.0 +version=14.0.0 revision=1 build_style=cargo short_desc="Language Server Protocol client for Kakoune" @@ -9,7 +9,7 @@ license="Unlicense" homepage="https://github.com/kak-lsp/kak-lsp" changelog="https://raw.githubusercontent.com/kak-lsp/kak-lsp/master/CHANGELOG.md" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=4e56232d999de3d914ebb8e44c499ebfcdca5e3f0bebeb3a213d46086ba7e141 +checksum=bd46846df0e9c587a9ea3deb1d976f4fc6ddd741061b2bdea4c1fb032e429901 post_install() { vlicense UNLICENSE From 41c8fff2db8bdf6596ea6af7f2ede79432a7a2cb Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 24 Jul 2022 18:53:49 -0700 Subject: [PATCH 1215/1407] New package: umockdev-0.17.13 --- common/shlibs | 1 + srcpkgs/libumockdev | 1 + srcpkgs/libumockdev-devel | 1 + srcpkgs/umockdev-devel | 1 + srcpkgs/umockdev/template | 44 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 48 insertions(+) create mode 120000 srcpkgs/libumockdev create mode 120000 srcpkgs/libumockdev-devel create mode 120000 srcpkgs/umockdev-devel create mode 100644 srcpkgs/umockdev/template diff --git a/common/shlibs b/common/shlibs index 92cdda93eca8..1861098750b4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -217,6 +217,7 @@ libgirepository-everything-1.0.so libgirepository-1.30_1 libgirepository-1.0.so.1 libgirepository-1.30_1 libudev.so.1 eudev-libudev-1.6_1 libgudev-1.0.so.0 libgudev-230_1 +libumockdev.so.0 libumockdev-0.17.6_1 libext2fs.so.2 e2fsprogs-libs-1.41.5_1 libcom_err.so.2 e2fsprogs-libs-1.41.5_1 libe2p.so.2 e2fsprogs-libs-1.41.5_1 diff --git a/srcpkgs/libumockdev b/srcpkgs/libumockdev new file mode 120000 index 000000000000..6ea0730d6c1c --- /dev/null +++ b/srcpkgs/libumockdev @@ -0,0 +1 @@ +umockdev \ No newline at end of file diff --git a/srcpkgs/libumockdev-devel b/srcpkgs/libumockdev-devel new file mode 120000 index 000000000000..6ea0730d6c1c --- /dev/null +++ b/srcpkgs/libumockdev-devel @@ -0,0 +1 @@ +umockdev \ No newline at end of file diff --git a/srcpkgs/umockdev-devel b/srcpkgs/umockdev-devel new file mode 120000 index 000000000000..6ea0730d6c1c --- /dev/null +++ b/srcpkgs/umockdev-devel @@ -0,0 +1 @@ +umockdev \ No newline at end of file diff --git a/srcpkgs/umockdev/template b/srcpkgs/umockdev/template new file mode 100644 index 000000000000..7dc2f5126958 --- /dev/null +++ b/srcpkgs/umockdev/template @@ -0,0 +1,44 @@ +# Template file for 'umockdev' +pkgname=umockdev +version=0.17.13 +revision=1 +build_style=meson +hostmakedepends="pkg-config vala" +makedepends="vala-devel eudev-libudev-devel libpcap-devel gobject-introspection" +checkdepends="eudev which gphoto2 libgudev-devel python3-gobject usbutils xz" +short_desc="Mock hardware devices for creating unit tests and bug reporting" +maintainer="oreo639 " +license="LGPL-2.1-or-later" +homepage="https://github.com/martinpitt/umockdev" +distfiles="https://github.com/martinpitt/umockdev/releases/download/${version}/umockdev-${version}.tar.xz" +checksum=6c6ebf6e6209b6a49746e0d91a448d027b54271bab82ed70a132ecf294ca13cf + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" gobject-introspection qemu-user-static" +fi + +umockdev-devel_package() { + depends="umockdev>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove /usr/share/gir-1.0/ + vmove /usr/share/vala/vapi/ + } +} + +libumockdev_package() { + short_desc+=" - library" + pkg_install() { + vmove /usr/lib/*.so.* + } +} + +libumockdev-devel_package() { + depends="libumockdev>=${version}_${revision}" + short_desc+=" - library development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove /usr/lib/*.so + } +} From d0b3d3a18d487f384e498ba1de21f7e5a6c7ceb9 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 24 Jul 2022 18:54:55 -0700 Subject: [PATCH 1216/1407] iio-sensor-proxy: update to 3.4. --- .../files/iio-sensor-proxy/run | 2 +- srcpkgs/iio-sensor-proxy/template | 30 ++++++++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run b/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run index 63277320d304..5d3c8e9747ca 100755 --- a/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run +++ b/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run @@ -1,2 +1,2 @@ #!/bin/sh -exec iio-sensor-proxy +exec /usr/libexec/iio-sensor-proxy diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template index 203fda432c3c..d76a6f58b327 100644 --- a/srcpkgs/iio-sensor-proxy/template +++ b/srcpkgs/iio-sensor-proxy/template @@ -1,23 +1,33 @@ # Template file for 'iio-sensor-proxy' pkgname=iio-sensor-proxy -version=3.3 +version=3.4 revision=1 build_style=meson -configure_args="-Dsystemdsystemunitdir=false" -hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool" -makedepends="libgudev-devel gtk+3-devel" -checkdepends="dbus python3-dbus python3-psutil" +configure_args="-Dsystemdsystemunitdir=/usr/lib/systemd/system/ + -Dgeoclue-user=_geoclue2" +hostmakedepends="pkg-config glib-devel libxml2" +makedepends="libgudev-devel polkit-devel" +checkdepends="python3-dbusmock python3-psutil umockdev-devel gtk+3-devel" short_desc="IIO accelerometer sensor to input device proxy" 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=3f761f3603b3c5b76125f96a48d4001c24f368b6021ba1e06414cac6a5d17c44 +changelog="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/raw/master/NEWS" +distfiles="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=9339af3bc83994a43ab25231a8ffe9ada6d9afbc16edc44d575dd9f2a69ede3c -do_check() { - dbus-run-session ninja -C build test +if [ "$XBPS_CHECK_PKGS" ]; then +configure_args+=" -Dtests=true -Dgtk-tests=true" +fi + +post_patch() { + # Tests expect a fr_FR.UTF-8 locale + vsed -i -e "/env\['LC_NUMERIC'\]/d" tests/integration-test.py + vsed -i -e 's/scale: 0,000010,0,000010,0,000010/scale: 0.000010,0.000010,0.000010/g' \ + -e 's/scale 0,000001,0,000001,0,000001/scale 0.000001,0.000001,0.000001/g' \ + tests/integration-test.py } + post_install() { vsv iio-sensor-proxy - mv $DESTDIR/usr/libexec/* $DESTDIR/usr/bin } From e47068272faa88f3d8465539b0b8be44a87c87d7 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 21 Aug 2022 21:31:40 -0700 Subject: [PATCH 1217/1407] openjdk7-bootstrap: fix build for gcc12 --- .../files/dist_patches_glibc.txt | 1 + .../files/dist_patches_musl.txt | 1 + .../icedtea-pointer-comparison-gcc12.patch | 31 +++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 srcpkgs/openjdk7-bootstrap/files/icedtea-pointer-comparison-gcc12.patch diff --git a/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt b/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt index c76c56855441..8061756dfc0c 100644 --- a/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt +++ b/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt @@ -6,3 +6,4 @@ icedtea-jdk-no-soname.patch icedtea-jdk-xattr.patch icedtea-jdk-sysctl_h.patch icedtea-cpio.patch +icedtea-pointer-comparison-gcc12.patch diff --git a/srcpkgs/openjdk7-bootstrap/files/dist_patches_musl.txt b/srcpkgs/openjdk7-bootstrap/files/dist_patches_musl.txt index 21812517c7c2..8b35d9c46989 100644 --- a/srcpkgs/openjdk7-bootstrap/files/dist_patches_musl.txt +++ b/srcpkgs/openjdk7-bootstrap/files/dist_patches_musl.txt @@ -11,3 +11,4 @@ icedtea-jdk-musl.patch icedtea-jdk-no-soname.patch icedtea-jdk-xattr.patch icedtea-cpio.patch +icedtea-pointer-comparison-gcc12.patch diff --git a/srcpkgs/openjdk7-bootstrap/files/icedtea-pointer-comparison-gcc12.patch b/srcpkgs/openjdk7-bootstrap/files/icedtea-pointer-comparison-gcc12.patch new file mode 100644 index 000000000000..c809553443e7 --- /dev/null +++ b/srcpkgs/openjdk7-bootstrap/files/icedtea-pointer-comparison-gcc12.patch @@ -0,0 +1,31 @@ +--- openjdk.orig/hotspot/src/share/vm/opto/lcm.cpp ++++ openjdk/hotspot/src/share/vm/opto/lcm.cpp +@@ -60,7 +60,7 @@ + // Check whether val is not-null-decoded compressed oop, + // i.e. will grab into the base of the heap if it represents NULL. + static bool accesses_heap_base_zone(Node *val) { +- if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops. ++ if (Universe::narrow_oop_base() > (address)0) { // Implies UseCompressedOops. + if (val && val->is_Mach()) { + if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) { + // This assumes all Decodes with TypePtr::NotNull are matched to nodes that +--- openjdk.orig/hotspot/src/share/vm/runtime/virtualspace.cpp ++++ openjdk/hotspot/src/share/vm/runtime/virtualspace.cpp +@@ -527,7 +527,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz + (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && + Universe::narrow_oop_use_implicit_null_checks()) ? + lcm(os::vm_page_size(), alignment) : 0) { +- if (base() > 0) { ++ if (base() > (char*)0) { + MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); + } + +@@ -546,7 +546,7 @@ ReservedHeapSpace::ReservedHeapSpace(con + (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && + Universe::narrow_oop_use_implicit_null_checks()) ? + lcm(os::vm_page_size(), prefix_align) : 0) { +- if (base() > 0) { ++ if (base() > (char*)0) { + MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); + } + From 925a9ee24feb5245e229ecadb0dcafb9ef927ce7 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Mon, 22 Aug 2022 22:31:03 -0700 Subject: [PATCH 1218/1407] doxygen: fix build for gcc 12 --- srcpkgs/doxygen/patches/compat-gcc12.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/doxygen/patches/compat-gcc12.patch diff --git a/srcpkgs/doxygen/patches/compat-gcc12.patch b/srcpkgs/doxygen/patches/compat-gcc12.patch new file mode 100644 index 000000000000..666744a1dceb --- /dev/null +++ b/srcpkgs/doxygen/patches/compat-gcc12.patch @@ -0,0 +1,22 @@ +From 5198966c8d5fec89116d025c74934ac03ea511fa Mon Sep 17 00:00:00 2001 +From: Dimitri van Heesch +Date: Fri, 6 May 2022 09:55:16 +0200 +Subject: [PATCH] issue #9312: Build: cache.h:53:14: error: 'exchange' is not a + member of 'std' + +--- + src/cache.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/cache.h b/src/cache.h +index 0ff3092ed5..e218eb27d2 100644 +--- a/src/cache.h ++++ b/src/cache.h +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + + /*! Fixed size cache for value type V using keys of type K. From 1a6a2a0e0ebaef804f7095a8ab06e7b6306aa724 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Mon, 22 Aug 2022 22:34:15 -0700 Subject: [PATCH 1219/1407] xf86-video-vmware: fix build for gcc12 --- .../patches/fix-compat-gcc12.patch | 30 +++++++++++++++++++ srcpkgs/xf86-video-vmware/template | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xf86-video-vmware/patches/fix-compat-gcc12.patch diff --git a/srcpkgs/xf86-video-vmware/patches/fix-compat-gcc12.patch b/srcpkgs/xf86-video-vmware/patches/fix-compat-gcc12.patch new file mode 100644 index 000000000000..ff839f16e628 --- /dev/null +++ b/srcpkgs/xf86-video-vmware/patches/fix-compat-gcc12.patch @@ -0,0 +1,30 @@ +From 77b8183b3395333d5d4c73e25c2d011748f15eda Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sun, 8 May 2022 03:00:10 +0000 +Subject: [PATCH] vmwgfx: fix missing array notation + + Fixes error identified by gcc-12.1.0 compiler + +make + CC libvmwgfx_la-vmwgfx_tex_video.lo +vmwgfx_tex_video.c: In function 'stop_video': +vmwgfx_tex_video.c:240:20: error: the comparison will always evaluate as 'true' for the address of 'yuv' will never be NULL [-Werror=address] + 240 | if (priv->yuv[i]) { + | ^~~~ +--- + vmwgfx/vmwgfx_tex_video.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c +index acc2b56..480a5f1 100644 +--- a/vmwgfx/vmwgfx_tex_video.c ++++ b/vmwgfx/vmwgfx_tex_video.c +@@ -237,7 +237,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown) + + for (i=0; i<3; ++i) { + for (j=0; j<2; ++j) { +- if (priv->yuv[i]) { ++ if (priv->yuv[j][i]) { + xa_surface_destroy(priv->yuv[j][i]); + priv->yuv[j][i] = NULL; + } diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template index e7e8e2947256..14264e1415be 100644 --- a/srcpkgs/xf86-video-vmware/template +++ b/srcpkgs/xf86-video-vmware/template @@ -1,7 +1,7 @@ # Template file for 'xf86-video-vmware' pkgname=xf86-video-vmware version=13.3.0 -revision=3 +revision=4 archs="i686* x86_64*" build_style=gnu-configure configure_args="--enable-vmwarectrl-client" From 1145b5546bb81754855f3b1b4e601776436c963b Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Mon, 22 Aug 2022 23:32:16 -0700 Subject: [PATCH 1220/1407] openssh: relax warnings for gcc12 --- srcpkgs/openssh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index 02a2dec35f42..e0f5b0945e67 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -40,7 +40,7 @@ if [ "$build_option_ldns" -a -z "$build_option_ssl" ]; then broken="option 'ldns' requires option 'ssl'" fi -CFLAGS="-Wno-format-truncation -Wno-stringop-truncation" +CFLAGS="-Wno-format-truncation -Wno-stringop-truncation -Wno-maybe-uninitialized" case $XBPS_TARGET_MACHINE in i686-musl) From 3edc686bfa167f04ce671174733b6f1687aaa13c Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 20:13:32 -0700 Subject: [PATCH 1221/1407] grub: fix build for binutils 2.36 --- .../patches/fix-compat-binutils-2.36.patch | 96 +++++++++++++++++++ srcpkgs/grub/template | 7 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/grub/patches/fix-compat-binutils-2.36.patch diff --git a/srcpkgs/grub/patches/fix-compat-binutils-2.36.patch b/srcpkgs/grub/patches/fix-compat-binutils-2.36.patch new file mode 100644 index 000000000000..d92a91e3253e --- /dev/null +++ b/srcpkgs/grub/patches/fix-compat-binutils-2.36.patch @@ -0,0 +1,96 @@ +From b98275138bf4fc250a1c362dfd2c8b1cf2421701 Mon Sep 17 00:00:00 2001 +From: Michael Chang +Date: Tue, 28 Sep 2021 13:50:47 +0800 +Subject: build: Fix build error with binutils 2.36 + +The following procedure to build xen/pvgrub is broken. + + git clone https://git.savannah.gnu.org/git/grub.git + cd grub + ./bootstrap + mkdir build-xen + cd build-xen + ../configure --with-platform=xen + make + +It fails with the message: + + /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld: + section .note.gnu.property VMA [0000000000400158,0000000000400187] + overlaps section .bss VMA [000000000000f000,000000000041e1af] + +The most significant factor is that new assembler (GNU as) generates the +.note.gnu.property section as default. This note section overlaps with +.bss because it doesn't reposition with -Wl,-Ttext,0 with which the base +address of .text section is set, rather the address of .note.gnu.property +is calculated for some reason from 0x400000 where the ELF executable +defaults to start. + +Using -Ttext-segment doesn't help either, though it is said to set the +address of the first byte of the text segment according to "man ld". +What it actually does is to override the default 0x400000, aka the image +base address, to something else. The entire process can be observed in +the default linker script used by gcc [1]. Therefore we can't expect it +to achieve the same thing as -Ttext given that the first segment where +.text resides is offset by SIZEOF_HEADERS plus some sections may be +preceding it within the first segment. The end result is .text always +has to start with non-zero address with -Wl,-Ttext-segment,0 if using +default linker script. + +It is also worth mentioning that binutils upstream apparently doesn't +seem to consider this as a bug [2] and proposed to use -Wl,-Ttext-segment,0 +which is not fruitful as what has been tested by Gentoo [3]. + +As long as GRUB didn't use ISA information encoded in .note.gnu.property, +we can safely drop it via -Wa,-mx86-used-note=no assembler option to +fix the linker error above. + +This is considered a better approach than using custom linker script to +drop the .note.gnu.property section because object file manipulation can +also be hampered one way or the other in that linker script may not be +helpful. See also this commit removing the section in the process of objcopy. + + 6643507ce build: Fix GRUB i386-pc build with Ubuntu gcc + +[1] In /usr/lib64/ldscripts/elf_x86_64.x or use 'gcc -Wl,--verbose ...' + PROVIDE (__executable_start = SEGMENT_START("text-segment", 0x400000)); + . = SEGMENT_START("text-segment", 0x400000) + SIZEOF_HEADERS; +[2] https://sourceware.org/bugzilla/show_bug.cgi?id=27377 +[3] https://bugs.gentoo.org/787221 + +Signed-off-by: Michael Chang +Reviewed-by: Daniel Kiper +--- + configure.ac | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +(limited to 'configure.ac') + +diff --git a/configure.ac b/configure.ac +index eeb5d22..8d1c81a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -840,6 +840,20 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p + TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow" + fi + ++if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then ++ AC_CACHE_CHECK([whether -Wa,-mx86-used-note works], [grub_cv_cc_mx86_used_note], [ ++ CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no -Werror" ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], ++ [grub_cv_cc_mx86_used_note=yes], ++ [grub_cv_cc_mx86_used_note=no]) ++ ]) ++ ++ if test "x$grub_cv_cc_mx86_used_note" = xyes; then ++ TARGET_CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no" ++ TARGET_CCASFLAGS="$TARGET_CCASFLAGS -Wa,-mx86-used-note=no" ++ fi ++fi ++ + # GRUB doesn't use float or doubles at all. Yet some toolchains may decide + # that floats are a good fit to run instead of what's written in the code. + # Given that floating point unit is disabled (if present to begin with) +-- +cgit v1.1 + diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index b1826c38a884..b4d3b07af620 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -2,7 +2,8 @@ pkgname=grub version=2.06 revision=2 -hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man" +hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man + automake gettext-devel-tools" makedepends="libusb-compat-devel ncurses-devel freetype-devel liblzma-devel device-mapper-devel fuse-devel" depends="os-prober" @@ -43,6 +44,10 @@ case "$XBPS_TARGET_MACHINE" in ;; esac +pre_configure() { + autoreconf -fi +} + do_configure() { # workaround for https://savannah.gnu.org/bugs/?60458 # some more info: https://www.linuxquestions.org/questions/showthread.php?p=6257712 From e00dd07f7333abb7dccc32a60f327afeb96c3649 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 22:35:21 -0700 Subject: [PATCH 1222/1407] libwpd: fix build for gcc12 --- srcpkgs/libwpd/patches/fix-compat-gcc12.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/libwpd/patches/fix-compat-gcc12.patch diff --git a/srcpkgs/libwpd/patches/fix-compat-gcc12.patch b/srcpkgs/libwpd/patches/fix-compat-gcc12.patch new file mode 100644 index 000000000000..6ebce2463d16 --- /dev/null +++ b/srcpkgs/libwpd/patches/fix-compat-gcc12.patch @@ -0,0 +1,11 @@ +diff -rup libwpd-0.10.3.orig/src/lib/WPXTable.h libwpd-0.10.3/src/lib/WPXTable.h +--- libwpd-0.10.3.orig/src/lib/WPXTable.h 2022-08-23 22:32:45.332593795 -0700 ++++ libwpd-0.10.3/src/lib/WPXTable.h 2022-08-23 22:32:59.500651211 -0700 +@@ -37,6 +37,7 @@ + #define _WPXTABLE_H + + #include ++#include + + struct WPXTableCell + { From 9979858fc6ade06fbea34c0c4b0eed587376c770 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 22:13:44 -0700 Subject: [PATCH 1223/1407] linux-tools: fix build for binutils 2.39 --- .../patches/binutils-add-compat-check.patch | 103 ++++++++++++ .../patches/binutils-disasm-compat.patch | 102 ++++++++++++ .../bpf_jit_disasm-binutils-2.39.patch | 104 ++++++++++++ .../patches/bpftool-binutils-2.39.patch | 149 ++++++++++++++++++ .../patches/perf-binutils-2.39.patch | 114 ++++++++++++++ 5 files changed, 572 insertions(+) create mode 100644 srcpkgs/linux-tools/patches/binutils-add-compat-check.patch create mode 100644 srcpkgs/linux-tools/patches/binutils-disasm-compat.patch create mode 100644 srcpkgs/linux-tools/patches/bpf_jit_disasm-binutils-2.39.patch create mode 100644 srcpkgs/linux-tools/patches/bpftool-binutils-2.39.patch create mode 100644 srcpkgs/linux-tools/patches/perf-binutils-2.39.patch diff --git a/srcpkgs/linux-tools/patches/binutils-add-compat-check.patch b/srcpkgs/linux-tools/patches/binutils-add-compat-check.patch new file mode 100644 index 000000000000..e4e7ece9635e --- /dev/null +++ b/srcpkgs/linux-tools/patches/binutils-add-compat-check.patch @@ -0,0 +1,103 @@ +From cfd59ca91467056bb2c36907b2fa67b8e1af9952 Mon Sep 17 00:00:00 2001 +From: Andres Freund +Date: Sun, 31 Jul 2022 18:38:27 -0700 +Subject: [PATCH] tools build: Add feature test for init_disassemble_info API + changes + +binutils changed the signature of init_disassemble_info(), which now causes +compilation failures for tools/{perf,bpf}, e.g. on debian unstable. + +Relevant binutils commit: + + https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07 + +This commit adds a feature test to detect the new signature. Subsequent +commits will use it to fix the build failures. + +Signed-off-by: Andres Freund +Acked-by: Quentin Monnet +Cc: Alexei Starovoitov +Cc: Ben Hutchings +Cc: Jiri Olsa +Cc: Quentin Monnet +Cc: Sedat Dilek +Cc: bpf@vger.kernel.org +Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de +Link: https://lore.kernel.org/r/20220801013834.156015-2-andres@anarazel.de +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/build/Makefile.feature | 1 + + tools/build/feature/Makefile | 4 ++++ + tools/build/feature/test-all.c | 4 ++++ + tools/build/feature/test-disassembler-init-styled.c | 13 +++++++++++++ + 4 files changed, 22 insertions(+) + create mode 100644 tools/build/feature/test-disassembler-init-styled.c + +diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature +index 888a0421d43b96..8f6578e4d3249e 100644 +--- a/tools/build/Makefile.feature ++++ b/tools/build/Makefile.feature +@@ -70,6 +70,7 @@ FEATURE_TESTS_BASIC := \ + libaio \ + libzstd \ + disassembler-four-args \ ++ disassembler-init-styled \ + file-handle + + # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list +diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile +index 7c2a17e23c30ac..c3059739318a95 100644 +--- a/tools/build/feature/Makefile ++++ b/tools/build/feature/Makefile +@@ -18,6 +18,7 @@ FILES= \ + test-libbfd.bin \ + test-libbfd-buildid.bin \ + test-disassembler-four-args.bin \ ++ test-disassembler-init-styled.bin \ + test-reallocarray.bin \ + test-libbfd-liberty.bin \ + test-libbfd-liberty-z.bin \ +@@ -248,6 +249,9 @@ $(OUTPUT)test-libbfd-buildid.bin: + $(OUTPUT)test-disassembler-four-args.bin: + $(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes + ++$(OUTPUT)test-disassembler-init-styled.bin: ++ $(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes ++ + $(OUTPUT)test-reallocarray.bin: + $(BUILD) + +diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c +index 5ffafb967b6e49..957c02c7b163b5 100644 +--- a/tools/build/feature/test-all.c ++++ b/tools/build/feature/test-all.c +@@ -166,6 +166,10 @@ + # include "test-disassembler-four-args.c" + #undef main + ++#define main main_test_disassembler_init_styled ++# include "test-disassembler-init-styled.c" ++#undef main ++ + #define main main_test_libzstd + # include "test-libzstd.c" + #undef main +diff --git a/tools/build/feature/test-disassembler-init-styled.c b/tools/build/feature/test-disassembler-init-styled.c +new file mode 100644 +index 00000000000000..f1ce0ec3bee9d3 +--- /dev/null ++++ b/tools/build/feature/test-disassembler-init-styled.c +@@ -0,0 +1,13 @@ ++// SPDX-License-Identifier: GPL-2.0 ++#include ++#include ++ ++int main(void) ++{ ++ struct disassemble_info info; ++ ++ init_disassemble_info(&info, stdout, ++ NULL, NULL); ++ ++ return 0; ++} diff --git a/srcpkgs/linux-tools/patches/binutils-disasm-compat.patch b/srcpkgs/linux-tools/patches/binutils-disasm-compat.patch new file mode 100644 index 000000000000..1a6cc0e6d97c --- /dev/null +++ b/srcpkgs/linux-tools/patches/binutils-disasm-compat.patch @@ -0,0 +1,102 @@ +From a45b3d6926231c3d024ea0de4f7bd967f83709ee Mon Sep 17 00:00:00 2001 +From: Andres Freund +Date: Sun, 31 Jul 2022 18:38:29 -0700 +Subject: tools include: add dis-asm-compat.h to handle version differences + +binutils changed the signature of init_disassemble_info(), which now causes +compilation failures for tools/{perf,bpf}, e.g. on debian unstable. + +Relevant binutils commit: + + https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07 + +This commit introduces a wrapper for init_disassemble_info(), to avoid +spreading #ifdef DISASM_INIT_STYLED to a bunch of places. Subsequent +commits will use it to fix the build failures. + +It likely is worth adding a wrapper for disassember(), to avoid the already +existing DISASM_FOUR_ARGS_SIGNATURE ifdefery. + +Signed-off-by: Andres Freund +Signed-off-by: Ben Hutchings +Acked-by: Quentin Monnet +Cc: Alexei Starovoitov +Cc: Ben Hutchings +Cc: Jiri Olsa +Cc: Quentin Monnet +Cc: Sedat Dilek +Cc: bpf@vger.kernel.org +Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de +Link: https://lore.kernel.org/r/20220801013834.156015-4-andres@anarazel.de +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/include/tools/dis-asm-compat.h | 55 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 55 insertions(+) + create mode 100644 tools/include/tools/dis-asm-compat.h + +(limited to 'tools/include/tools/dis-asm-compat.h') + +diff --git a/tools/include/tools/dis-asm-compat.h b/tools/include/tools/dis-asm-compat.h +new file mode 100644 +index 0000000000000..70f331e23ed3d +--- /dev/null ++++ b/tools/include/tools/dis-asm-compat.h +@@ -0,0 +1,55 @@ ++/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */ ++#ifndef _TOOLS_DIS_ASM_COMPAT_H ++#define _TOOLS_DIS_ASM_COMPAT_H ++ ++#include ++#include ++ ++/* define types for older binutils version, to centralize ifdef'ery a bit */ ++#ifndef DISASM_INIT_STYLED ++enum disassembler_style {DISASSEMBLER_STYLE_NOT_EMPTY}; ++typedef int (*fprintf_styled_ftype) (void *, enum disassembler_style, const char*, ...); ++#endif ++ ++/* ++ * Trivial fprintf wrapper to be used as the fprintf_styled_func argument to ++ * init_disassemble_info_compat() when normal fprintf suffices. ++ */ ++static inline int fprintf_styled(void *out, ++ enum disassembler_style style, ++ const char *fmt, ...) ++{ ++ va_list args; ++ int r; ++ ++ (void)style; ++ ++ va_start(args, fmt); ++ r = vfprintf(out, fmt, args); ++ va_end(args); ++ ++ return r; ++} ++ ++/* ++ * Wrapper for init_disassemble_info() that hides version ++ * differences. Depending on binutils version and architecture either ++ * fprintf_func or fprintf_styled_func will be called. ++ */ ++static inline void init_disassemble_info_compat(struct disassemble_info *info, ++ void *stream, ++ fprintf_ftype unstyled_func, ++ fprintf_styled_ftype styled_func) ++{ ++#ifdef DISASM_INIT_STYLED ++ init_disassemble_info(info, stream, ++ unstyled_func, ++ styled_func); ++#else ++ (void)styled_func; ++ init_disassemble_info(info, stream, ++ unstyled_func); ++#endif ++} ++ ++#endif /* _TOOLS_DIS_ASM_COMPAT_H */ +-- +cgit + diff --git a/srcpkgs/linux-tools/patches/bpf_jit_disasm-binutils-2.39.patch b/srcpkgs/linux-tools/patches/bpf_jit_disasm-binutils-2.39.patch new file mode 100644 index 000000000000..01221fad3a4a --- /dev/null +++ b/srcpkgs/linux-tools/patches/bpf_jit_disasm-binutils-2.39.patch @@ -0,0 +1,104 @@ +From 96ed066054abf11c7d3e106e3011a51f3f1227a3 Mon Sep 17 00:00:00 2001 +From: Andres Freund +Date: Sun, 31 Jul 2022 18:38:31 -0700 +Subject: [PATCH] tools bpf_jit_disasm: Fix compilation error with new binutils + +binutils changed the signature of init_disassemble_info(), which now causes +compilation to fail for tools/bpf/bpf_jit_disasm.c, e.g. on debian +unstable. + +Relevant binutils commit: + + https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07 + +Wire up the feature test and switch to init_disassemble_info_compat(), +which were introduced in prior commits, fixing the compilation failure. + +I verified that bpf_jit_disasm can still disassemble bpf programs, both +with the old and new dis-asm.h API. With old binutils there's no change in +output before/after this patch. When comparing the output from old +binutils (2.35) to new bintuils with the patch (upstream snapshot) there +are a few output differences, but they are unrelated to this patch. An +example hunk is: + + f4: mov %r14,%rsi + f7: mov %r15,%rdx + fa: mov $0x2a,%ecx + - ff: callq 0xffffffffea8c4988 + + ff: call 0xffffffffea8c4988 + 104: test %rax,%rax + 107: jge 0x0000000000000110 + 109: xor %eax,%eax + - 10b: jmpq 0x0000000000000073 + + 10b: jmp 0x0000000000000073 + 110: cmp $0x16,%rax + +However, I had to use an older kernel to generate the bpf_jit_enabled = +2 output, as that has been broken since 5.18 / 1022a5498f6f745c ("bpf, +x86_64: Use bpf_jit_binary_pack_alloc"). + + https://lore.kernel.org/20220703030210.pmjft7qc2eajzi6c@alap3.anarazel.de + +Signed-off-by: Andres Freund +Acked-by: Quentin Monnet +Cc: Alexei Starovoitov +Cc: Ben Hutchings +Cc: Daniel Borkmann +Cc: Jiri Olsa +Cc: Quentin Monnet +Cc: Sedat Dilek +Cc: bpf@vger.kernel.org +Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de +Link: https://lore.kernel.org/r/20220801013834.156015-6-andres@anarazel.de +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/bpf/Makefile | 5 ++++- + tools/bpf/bpf_jit_disasm.c | 5 ++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile +index b11cfc86a3d021..664601ab1705ab 100644 +--- a/tools/bpf/Makefile ++++ b/tools/bpf/Makefile +@@ -34,7 +34,7 @@ else + endif + + FEATURE_USER = .bpf +-FEATURE_TESTS = libbfd disassembler-four-args ++FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled + FEATURE_DISPLAY = libbfd disassembler-four-args + + check_feat := 1 +@@ -56,6 +56,9 @@ endif + ifeq ($(feature-disassembler-four-args), 1) + CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE + endif ++ifeq ($(feature-disassembler-init-styled), 1) ++CFLAGS += -DDISASM_INIT_STYLED ++endif + + $(OUTPUT)%.yacc.c: $(srctree)/tools/bpf/%.y + $(QUIET_BISON)$(YACC) -o $@ -d $< +diff --git a/tools/bpf/bpf_jit_disasm.c b/tools/bpf/bpf_jit_disasm.c +index c8ae9580472814..a90a5d110f9255 100644 +--- a/tools/bpf/bpf_jit_disasm.c ++++ b/tools/bpf/bpf_jit_disasm.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #define CMD_ACTION_SIZE_BUFFER 10 + #define CMD_ACTION_READ_ALL 3 +@@ -64,7 +65,9 @@ static void get_asm_insns(uint8_t *image, size_t len, int opcodes) + assert(bfdf); + assert(bfd_check_format(bfdf, bfd_object)); + +- init_disassemble_info(&info, stdout, (fprintf_ftype) fprintf); ++ init_disassemble_info_compat(&info, stdout, ++ (fprintf_ftype) fprintf, ++ fprintf_styled); + info.arch = bfd_get_arch(bfdf); + info.mach = bfd_get_mach(bfdf); + info.buffer = image; diff --git a/srcpkgs/linux-tools/patches/bpftool-binutils-2.39.patch b/srcpkgs/linux-tools/patches/bpftool-binutils-2.39.patch new file mode 100644 index 000000000000..1e55c40011be --- /dev/null +++ b/srcpkgs/linux-tools/patches/bpftool-binutils-2.39.patch @@ -0,0 +1,149 @@ +From 600b7b26c07a070d0153daa76b3806c1e52c9e00 Mon Sep 17 00:00:00 2001 +From: Andres Freund +Date: Sun, 31 Jul 2022 18:38:33 -0700 +Subject: [PATCH] tools bpftool: Fix compilation error with new binutils + +binutils changed the signature of init_disassemble_info(), which now causes +compilation to fail for tools/bpf/bpftool/jit_disasm.c, e.g. on debian +unstable. + +Relevant binutils commit: + + https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07 + +Wire up the feature test and switch to init_disassemble_info_compat(), +which were introduced in prior commits, fixing the compilation failure. + +I verified that bpftool can still disassemble bpf programs, both with an +old and new dis-asm.h API. There are no output changes for plain and json +formats. When comparing the output from old binutils (2.35) +to new bintuils with the patch (upstream snapshot) there are a few output +differences, but they are unrelated to this patch. An example hunk is: + + 2f: pop %r14 + 31: pop %r13 + 33: pop %rbx + - 34: leaveq + - 35: retq + + 34: leave + + 35: ret + +Signed-off-by: Andres Freund +Acked-by: Quentin Monnet +Cc: Alexei Starovoitov +Cc: Ben Hutchings +Cc: Jiri Olsa +Cc: Quentin Monnet +Cc: Sedat Dilek +Cc: bpf@vger.kernel.org +Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de +Link: https://lore.kernel.org/r/20220801013834.156015-8-andres@anarazel.de +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/bpf/bpftool/Makefile | 5 +++- + tools/bpf/bpftool/jit_disasm.c | 42 +++++++++++++++++++++++++++------- + 2 files changed, 38 insertions(+), 9 deletions(-) + +diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile +index c6d2c77d02524a..436e671b2657d4 100644 +--- a/tools/bpf/bpftool/Makefile ++++ b/tools/bpf/bpftool/Makefile +@@ -62,7 +62,7 @@ CLANG ?= clang + LLVM_STRIP ?= llvm-strip + + FEATURE_USER = .bpftool +-FEATURE_TESTS = libbfd disassembler-four-args reallocarray zlib libcap \ ++FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled reallocarray zlib libcap \ + clang-bpf-co-re + FEATURE_DISPLAY = libbfd disassembler-four-args zlib libcap \ + clang-bpf-co-re +@@ -117,6 +117,9 @@ endif + ifeq ($(feature-disassembler-four-args), 1) + CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE + endif ++ifeq ($(feature-disassembler-init-styled), 1) ++ CFLAGS += -DDISASM_INIT_STYLED ++endif + + LIBS = $(LIBBPF) -lelf -lz + LIBS_BOOTSTRAP = $(LIBBPF_BOOTSTRAP) -lelf -lz +diff --git a/tools/bpf/bpftool/jit_disasm.c b/tools/bpf/bpftool/jit_disasm.c +index 24734f2249d6ec..aaf99a0168c90b 100644 +--- a/tools/bpf/bpftool/jit_disasm.c ++++ b/tools/bpf/bpftool/jit_disasm.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include "json_writer.h" + #include "main.h" +@@ -39,15 +40,12 @@ static void get_exec_path(char *tpath, s + } + + static int oper_count; +-static int fprintf_json(void *out, const char *fmt, ...) ++static int printf_json(void *out, const char *fmt, va_list ap) + { +- va_list ap; + char *s; + +- va_start(ap, fmt); + if (vasprintf(&s, fmt, ap) < 0) + return -1; +- va_end(ap); + + if (!oper_count) { + int i; +@@ -73,6 +71,32 @@ static int fprintf_json(void *out, const char *fmt, ...) + return 0; + } + ++static int fprintf_json(void *out, const char *fmt, ...) ++{ ++ va_list ap; ++ int r; ++ ++ va_start(ap, fmt); ++ r = printf_json(out, fmt, ap); ++ va_end(ap); ++ ++ return r; ++} ++ ++static int fprintf_json_styled(void *out, ++ enum disassembler_style style __maybe_unused, ++ const char *fmt, ...) ++{ ++ va_list ap; ++ int r; ++ ++ va_start(ap, fmt); ++ r = printf_json(out, fmt, ap); ++ va_end(ap); ++ ++ return r; ++} ++ + void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes, + const char *arch, const char *disassembler_options, + const struct btf *btf, +@@ -99,11 +123,13 @@ void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes, + assert(bfd_check_format(bfdf, bfd_object)); + + if (json_output) +- init_disassemble_info(&info, stdout, +- (fprintf_ftype) fprintf_json); ++ init_disassemble_info_compat(&info, stdout, ++ (fprintf_ftype) fprintf_json, ++ fprintf_json_styled); + else +- init_disassemble_info(&info, stdout, +- (fprintf_ftype) fprintf); ++ init_disassemble_info_compat(&info, stdout, ++ (fprintf_ftype) fprintf, ++ fprintf_styled); + + /* Update architecture info for offload. */ + if (arch) { diff --git a/srcpkgs/linux-tools/patches/perf-binutils-2.39.patch b/srcpkgs/linux-tools/patches/perf-binutils-2.39.patch new file mode 100644 index 000000000000..3484330f7286 --- /dev/null +++ b/srcpkgs/linux-tools/patches/perf-binutils-2.39.patch @@ -0,0 +1,114 @@ +From 83aa0120487e8bc3f231e72c460add783f71f17c Mon Sep 17 00:00:00 2001 +From: Andres Freund +Date: Sun, 31 Jul 2022 18:38:30 -0700 +Subject: [PATCH] tools perf: Fix compilation error with new binutils + +binutils changed the signature of init_disassemble_info(), which now causes +compilation failures for tools/perf/util/annotate.c, e.g. on debian +unstable. + +Relevant binutils commit: + + https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07 + +Wire up the feature test and switch to init_disassemble_info_compat(), +which were introduced in prior commits, fixing the compilation failure. + +I verified that perf can still disassemble bpf programs by using bpftrace +under load, recording a perf trace, and then annotating the bpf "function" +with and without the changes. With old binutils there's no change in output +before/after this patch. When comparing the output from old binutils (2.35) +to new bintuils with the patch (upstream snapshot) there are a few output +differences, but they are unrelated to this patch. An example hunk is: + + 1.15 : 55:mov %rbp,%rdx + 0.00 : 58:add $0xfffffffffffffff8,%rdx + 0.00 : 5c:xor %ecx,%ecx + - 1.03 : 5e:callq 0xffffffffe12aca3c + + 1.03 : 5e:call 0xffffffffe12aca3c + 0.00 : 63:xor %eax,%eax + - 2.18 : 65:leaveq + - 2.82 : 66:retq + + 2.18 : 65:leave + + 2.82 : 66:ret + +Signed-off-by: Andres Freund +Acked-by: Quentin Monnet +Cc: Alexei Starovoitov +Cc: Ben Hutchings +Cc: Jiri Olsa +Cc: Sedat Dilek +Cc: bpf@vger.kernel.org +Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de +Link: https://lore.kernel.org/r/20220801013834.156015-5-andres@anarazel.de +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/perf/Makefile.config | 8 ++++++++ + tools/perf/util/annotate.c | 7 ++++--- + 2 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config +index d3c254c0f5c611..23648ea54e8d3d 100644 +--- a/tools/perf/Makefile.config ++++ b/tools/perf/Makefile.config +@@ -298,6 +298,7 @@ FEATURE_CHECK_LDFLAGS-libpython := $(PYTHON_EMBED_LDOPTS) + FEATURE_CHECK_LDFLAGS-libaio = -lrt + + FEATURE_CHECK_LDFLAGS-disassembler-four-args = -lbfd -lopcodes -ldl ++FEATURE_CHECK_LDFLAGS-disassembler-init-styled = -lbfd -lopcodes -ldl + + CORE_CFLAGS += -fno-omit-frame-pointer + CORE_CFLAGS += -ggdb3 +@@ -818,13 +819,16 @@ else + ifeq ($(feature-libbfd-liberty), 1) + EXTLIBS += -lbfd -lopcodes -liberty + FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -ldl ++ FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -ldl + else + ifeq ($(feature-libbfd-liberty-z), 1) + EXTLIBS += -lbfd -lopcodes -liberty -lz + FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -lz -ldl ++ FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -lz -ldl + endif + endif + $(call feature_check,disassembler-four-args) ++ $(call feature_check,disassembler-init-styled) + endif + + ifeq ($(feature-libbfd-buildid), 1) +@@ -1044,6 +1048,10 @@ ifeq ($(feature-disassembler-four-args), 1) + CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE + endif + ++ifeq ($(feature-disassembler-init-styled), 1) ++ CFLAGS += -DDISASM_INIT_STYLED ++endif ++ + ifeq (${IS_64_BIT}, 1) + ifndef NO_PERF_READ_VDSO32 + $(call feature_check,compile-32) +diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c +index 82cc396ef516c4..2c6a485c3de5d9 100644 +--- a/tools/perf/util/annotate.c ++++ b/tools/perf/util/annotate.c +@@ -1676,6 +1676,7 @@ fallback: + #define PACKAGE "perf" + #include + #include ++#include + + static int symbol__disassemble_bpf(struct symbol *sym, + struct annotate_args *args) +@@ -1762,9 +1763,9 @@ static int symbol__disassemble_bpf(struct symbol *sym, + ret = errno; + goto out; + } +- init_disassemble_info(&info, s, +- (fprintf_ftype) fprintf); +- ++ init_disassemble_info_compat(&info, s, ++ (fprintf_ftype) fprintf, ++ fprintf_styled); + info.arch = bfd_get_arch(bfdf); + info.mach = bfd_get_mach(bfdf); + From 0f7c49110a574dc24087290b39f64df25ba26b85 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Mon, 15 Aug 2022 11:26:37 -0700 Subject: [PATCH 1224/1407] llvm12: fix build for glibc 2.36 --- .../compiler-rt-sanitizer-glibc-2.36.patch | 59 +++++++++++++++++++ srcpkgs/llvm12/template | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/llvm12/patches/compiler-rt-sanitizer-glibc-2.36.patch diff --git a/srcpkgs/llvm12/patches/compiler-rt-sanitizer-glibc-2.36.patch b/srcpkgs/llvm12/patches/compiler-rt-sanitizer-glibc-2.36.patch new file mode 100644 index 000000000000..e5f24dab8935 --- /dev/null +++ b/srcpkgs/llvm12/patches/compiler-rt-sanitizer-glibc-2.36.patch @@ -0,0 +1,59 @@ +From 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 Mon Sep 17 00:00:00 2001 +From: Fangrui Song +Date: Mon, 11 Jul 2022 12:53:34 -0700 +Subject: [PATCH] [sanitizer] Remove #include to resolve + fsconfig_command/mount_attr conflict with glibc 2.36 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It is generally not a good idea to mix usage of glibc headers and Linux UAPI +headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers). In glibc +since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h +defines `fsconfig_command` which conflicts with linux/mount.h: + + .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum fsconfig_command’ + +Remove #include which pulls in linux/mount.h. Expand its 4 macros manually. +Android sys/mount.h doesn't define BLKBSZGET and it still needs linux/fs.h. +In the long term we should move Linux specific definitions to sanitizer_platform_limits_linux.cpp +but this commit is easy to cherry pick into older compiler-rt releases. + +Fix https://github.com/llvm/llvm-project/issues/56421 + +Reviewed By: #sanitizers, vitalybuka, zatrazz + +Differential Revision: https://reviews.llvm.org/D129471 +--- + .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +index 4bd425435d56d..3a94b260686f1 100644 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -73,7 +73,9 @@ + #include + #include + #include ++#if SANITIZER_ANDROID + #include ++#endif + #include + #include + #include +@@ -876,10 +878,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; + unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; + #endif +- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; +- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; +- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; +- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; ++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); ++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); ++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); ++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); + unsigned IOCTL_GIO_CMAP = GIO_CMAP; + unsigned IOCTL_GIO_FONT = GIO_FONT; + unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP; diff --git a/srcpkgs/llvm12/template b/srcpkgs/llvm12/template index 7ce18028e4a3..8fc32d8f5258 100644 --- a/srcpkgs/llvm12/template +++ b/srcpkgs/llvm12/template @@ -1,7 +1,7 @@ # Template file for 'llvm12' pkgname=llvm12 version=12.0.1 -revision=2 +revision=3 wrksrc="llvm-project-${version}.src" build_wrksrc=llvm build_style=cmake From 6ddf101e07fd7a0b4447d77ebad35a5ab4c89de4 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 19:40:13 -0700 Subject: [PATCH 1225/1407] syslinux: fix build for glibc 2.36 --- .../patches/fix-build-with-glibc-2.36.patch | 30 +++++++++++++++++++ srcpkgs/syslinux/template | 4 +-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/syslinux/patches/fix-build-with-glibc-2.36.patch diff --git a/srcpkgs/syslinux/patches/fix-build-with-glibc-2.36.patch b/srcpkgs/syslinux/patches/fix-build-with-glibc-2.36.patch new file mode 100644 index 000000000000..1303be56c127 --- /dev/null +++ b/srcpkgs/syslinux/patches/fix-build-with-glibc-2.36.patch @@ -0,0 +1,30 @@ +--- a/linux/syslinux.c ++++ b/linux/syslinux.c +@@ -45,7 +45,6 @@ + #include + #include + #include +-#include + + #include "linuxioctl.h" + +--- a/libinstaller/syslxcom.c ++++ b/libinstaller/syslxcom.c +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + #include + + #include "linuxioctl.h" +--- a/extlinux/main.c ++++ b/extlinux/main.c +@@ -40,7 +40,6 @@ + #include + #include + #include +-#include + #include + + #include "linuxioctl.h" diff --git a/srcpkgs/syslinux/template b/srcpkgs/syslinux/template index b45c35819552..5dad28e380a8 100644 --- a/srcpkgs/syslinux/template +++ b/srcpkgs/syslinux/template @@ -1,7 +1,8 @@ # Template file for 'syslinux' pkgname=syslinux version=6.03 -revision=7 +revision=8 +archs="i686* x86_64*" hostmakedepends="perl python nasm" makedepends="gnu-efi-libs libuuid-devel" short_desc="Boot loader for the Linux operating system" @@ -10,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project" distfiles="${KERNEL_SITE}/utils/boot/${pkgname}/${pkgname}-${version}.tar.xz" checksum=26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e -archs="i686* x86_64*" nopie=yes pre_build() { From be24a2d719b75bcc0082526c0cab8e1ff09b80d3 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 19:48:50 -0700 Subject: [PATCH 1226/1407] efivar: fix build for glibc 2.36 --- .../patches/fix-compat-glibc-2.36.patch | 55 +++++++++++++++++++ srcpkgs/efivar/template | 8 +-- 2 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/efivar/patches/fix-compat-glibc-2.36.patch diff --git a/srcpkgs/efivar/patches/fix-compat-glibc-2.36.patch b/srcpkgs/efivar/patches/fix-compat-glibc-2.36.patch new file mode 100644 index 000000000000..fcc83aef20cf --- /dev/null +++ b/srcpkgs/efivar/patches/fix-compat-glibc-2.36.patch @@ -0,0 +1,55 @@ +From bc65d63ebf8fe6ac8a099ff15ca200986dba1565 Mon Sep 17 00:00:00 2001 +From: Robbie Harwood +Date: Thu, 28 Jul 2022 16:11:24 -0400 +Subject: [PATCH] Fix glibc 2.36 build (mount.h conflicts) + +glibc has decided that sys/mount.h and linux/mount.h are no longer +usable at the same time. This broke the build, since linux/fs.h itself +includes linux/mount.h. For now, fix the build by only including +sys/mount.h where we need it. + +See-also: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E +Resolves: #227 +Signed-off-by: Robbie Harwood +--- + src/gpt.c | 1 + + src/linux.c | 1 + + src/util.h | 1 - + 3 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/gpt.c b/src/gpt.c +index 1eda0497..21413c3b 100644 +--- a/src/gpt.c ++++ b/src/gpt.c +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/linux.c b/src/linux.c +index 47e45ae4..1780816f 100644 +--- a/src/linux.c ++++ b/src/linux.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/util.h b/src/util.h +index 3300666f..1e67e447 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -23,7 +23,6 @@ + #include + #include + #include +-#include + #include + #include + #include diff --git a/srcpkgs/efivar/template b/srcpkgs/efivar/template index 39be825fab29..9a21d44175b9 100644 --- a/srcpkgs/efivar/template +++ b/srcpkgs/efivar/template @@ -1,8 +1,11 @@ # Template file for 'efivar' pkgname=efivar version=37 -revision=1 +revision=2 build_style=gnu-makefile +make_build_args="libdir=/usr/lib" +make_build_target="all test" +make_install_args="libdir=/usr/lib" hostmakedepends="pkg-config" short_desc="Tools to manipulate EFI variables" maintainer="Orphaned " @@ -10,9 +13,6 @@ license="LGPL-2.1-or-later" homepage="https://github.com/rhinstaller/efivar" distfiles="https://github.com/rhboot/efivar/releases/download/${version}/efivar-${version}.tar.bz2" checksum=3c67feb93f901b98fbb897d5ca82931a6698b5bcd6ac34f0815f670d77747b9f -make_build_args="libdir=/usr/lib" -make_build_target="all test" -make_install_args="libdir=/usr/lib" CFLAGS="-D_GNU_SOURCE -Wno-error=address-of-packed-member" From cf0306488ab62f4cf14aa4eff2ef6d56092a230f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 18 Aug 2022 18:13:50 -0700 Subject: [PATCH 1227/1407] btrfs-progs: update to 5.19. --- srcpkgs/btrfs-progs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index f6c53d8587e1..292d5110106b 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -1,6 +1,6 @@ # Template file for 'btrfs-progs' pkgname=btrfs-progs -version=5.18.1 +version=5.19 revision=1 wrksrc="${pkgname}-v${version}" build_style=gnu-configure @@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later" homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page" changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES" distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz" -checksum=6e98a75ccff52e9354daa1ad284c614c490f844273a2fa524cbac9eb841c7255 +checksum=1fbcf06e4b2f80e7a127fd687ed4625a5b74fa674fe212c836ff70e0edfcccf9 # Most of the tests depend on `mount` and `fallocate` commands, which are not # presented in chroot-util-linux make_check=no From 9186c1ef0b767ed2ee0769e2f583f674703e0b73 Mon Sep 17 00:00:00 2001 From: akierig Date: Wed, 7 Sep 2022 20:13:32 -0500 Subject: [PATCH 1228/1407] Signal-Desktop: update to 5.58.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 a69f86dd28f9..b2234b340093 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.57.0 +version=5.58.0 revision=1 # Signal officially only supports x86_64 (also due to Electron) # x86_64-musl fails because of its dependency on 'node-gyp' which depends on a glibc specific extension @@ -13,7 +13,7 @@ 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=eeb2a8cfcfb8410fc7ee901cb1b7994421844fb7af1e52b9faad6151b32b152b +checksum=448f15709f20cb6ea549819fed011dcd9f24683247cd55d826e89d6fc8ad822c nostrip_files="signal-desktop" post_extract() { From d4b7dc1046dace87bef944e631a1384f551f5c86 Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Thu, 8 Sep 2022 09:18:42 +0700 Subject: [PATCH 1229/1407] qownnotes: update to 22.8.4 --- srcpkgs/qownnotes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template index 5f4646d0bc20..aedbfd2b7c83 100644 --- a/srcpkgs/qownnotes/template +++ b/srcpkgs/qownnotes/template @@ -1,6 +1,6 @@ # Template file for 'qownnotes' pkgname=qownnotes -version=22.7.6 +version=22.8.4 revision=1 build_style=qmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" @@ -13,7 +13,7 @@ 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=d2f0b6f62714495dd14387535ab34c0cf94d1679c5db4a257ef87bb855b7771b +checksum=cfb266b3a812b5f87e57d5002cd05000931baad9fefbf353b2caa05407dc79e5 pre_build() { vsed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri From 76a2bbfe1bd5216133f7c3d785e69202853f2445 Mon Sep 17 00:00:00 2001 From: icp Date: Fri, 2 Sep 2022 01:07:13 +0530 Subject: [PATCH 1230/1407] python3-poetry-core: update to 1.1.0. --- srcpkgs/python3-poetry-core/template | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-poetry-core/template b/srcpkgs/python3-poetry-core/template index a657d7130146..9c099f80a870 100644 --- a/srcpkgs/python3-poetry-core/template +++ b/srcpkgs/python3-poetry-core/template @@ -1,18 +1,25 @@ # Template file for 'python3-poetry-core' pkgname=python3-poetry-core -version=1.0.7 +version=1.1.0 revision=1 wrksrc="poetry-core-${version}" -build_style="python3-module" -make_install_target="poetry_core-${version}-*-*-*.whl" -hostmakedepends="python3-wheel" +build_style="python3-pep517" +make_check_args="--deselect tests/masonry/builders/test_sdist.py::test_default_with_excluded_data + --deselect tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data" depends="python3" +checkdepends="python3-devel python3-virtualenv python3-pyrsistent python3-pytest-mock git" short_desc="Poetry PEP 517 Build Backend & Core Utilities" maintainer="Kye Shi " license="MIT" homepage="https://github.com/python-poetry/poetry-core" -distfiles="${PYPI_SITE}/p/poetry-core/poetry-core-${version}.tar.gz" -checksum="98c11c755a16ef6c5673c22ca94a3802a7df4746a0853a70b6fae8b9f5cac206" +changelog="https://raw.githubusercontent.com/python-poetry/poetry-core/main/CHANGELOG.md" +distfiles="https://github.com/python-poetry/poetry-core/archive/refs/tags/${version}.tar.gz" +checksum=44535d5c20e20189041714a45758774f713e4a53c3db071dca11a59d32aeba44 +make_check_pre="env PYTHONPATH=src" + +pre_check() { + rm -r tests/integration +} post_install() { vlicense LICENSE From f3fdcf411deca989d0ef02eb0555b1acffa56830 Mon Sep 17 00:00:00 2001 From: icp Date: Fri, 2 Sep 2022 22:39:39 +0530 Subject: [PATCH 1231/1407] python3-hypercorn: update to 0.14.1. --- srcpkgs/python3-hypercorn/template | 13 ++++++------- srcpkgs/python3-hypercorn/update | 2 -- 2 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 srcpkgs/python3-hypercorn/update diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template index 2133a767d49c..05ceb3a2e0d4 100644 --- a/srcpkgs/python3-hypercorn/template +++ b/srcpkgs/python3-hypercorn/template @@ -1,21 +1,20 @@ # Template file for 'python3-hypercorn' pkgname=python3-hypercorn -version=0.13.2 +version=0.14.3 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-pep517 -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 python3-tomli $depends" +checkdepends="python3-pytest-asyncio python3-trio $depends" short_desc="Python ASGI server based on hyper and inspired by gunicorn" maintainer="Andrew J. Hesford " license="MIT" -homepage="https://gitlab.com/pgjones/hypercorn" -changelog="https://gitlab.com/pgjones/hypercorn/-/blob/master/CHANGELOG.rst" -distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz" -checksum=f08bf9cbd9d813f4cd29bb5398b064176b4639dcc430dd1d366a389dae4ca280 +homepage="https://github.com/pgjones/hypercorn" +changelog="https://raw.githubusercontent.com/pgjones/hypercorn/main/CHANGELOG.rst" +distfiles="https://github.com/pgjones/hypercorn/archive/refs/tags/${version}.tar.gz" +checksum=1af65061783adb4c85b4bfe9b7c9f684b904cd6885c06d787868276647810e6f do_check() { vsed -i pyproject.toml -e '/addopts/d' diff --git a/srcpkgs/python3-hypercorn/update b/srcpkgs/python3-hypercorn/update deleted file mode 100644 index 6b8926d40dec..000000000000 --- a/srcpkgs/python3-hypercorn/update +++ /dev/null @@ -1,2 +0,0 @@ -site="${homepage}/-/tags/" -pattern="${pkgname#*-}-\K[\d.]*(?=\.tar)" From 605fc189fe9ece674b159faf8e719b35707187a6 Mon Sep 17 00:00:00 2001 From: icp Date: Fri, 2 Sep 2022 01:47:02 +0530 Subject: [PATCH 1232/1407] python3-quart: update to 0.18.0. --- srcpkgs/python3-quart/template | 16 ++++++++-------- srcpkgs/python3-quart/update | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 srcpkgs/python3-quart/update diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template index 1033468c7c82..c5d3d92822f8 100644 --- a/srcpkgs/python3-quart/template +++ b/srcpkgs/python3-quart/template @@ -1,21 +1,21 @@ # Template file for 'python3-quart' pkgname=python3-quart -version=0.17.0 +version=0.18.0 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python3-pep517 -make_install_target="Quart-${version}-*-*-*.whl" +make_install_target="quart-${version}-*-*-*.whl" hostmakedepends="python3-poetry-core" -depends="python3-aiofiles python3-hypercorn python3-click python3-toml +depends="python3-aiofiles python3-hypercorn python3-click python3-MarkupSafe python3-blinker python3-itsdangerous python3-Jinja2 python3-Werkzeug" -checkdepends="python3-pytest-asyncio python3-hypothesis python3-mock unzip $depends" +checkdepends="python3-pytest-asyncio python3-hypothesis python3-mock python3-dotenv unzip $depends" short_desc="Python asyncio ASGI web framework with Flask API" maintainer="Andrew J. Hesford " 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=1f879256b09daa4f7e9a141e90746f11103ce1f3a386f9480709e1d982768a9a +homepage="https://quart.palletsprojects.com/en/latest/" +changelog="https://raw.githubusercontent.com/pallets/quart/main/CHANGES.rst" +distfiles="https://github.com/pallets/quart/archive/refs/tags/${version}.tar.gz" +checksum=f462bd0c793c34dff71ba3a9956b809e905072595a17541a991a9574f6bd0762 do_check() { # Tests require dist-info on the package, which is only in the wheel. diff --git a/srcpkgs/python3-quart/update b/srcpkgs/python3-quart/update deleted file mode 100644 index 6b8926d40dec..000000000000 --- a/srcpkgs/python3-quart/update +++ /dev/null @@ -1,2 +0,0 @@ -site="${homepage}/-/tags/" -pattern="${pkgname#*-}-\K[\d.]*(?=\.tar)" From dbc1729bff259c2a0fc541029917d2fdfc6be632 Mon Sep 17 00:00:00 2001 From: icp Date: Tue, 6 Sep 2022 00:20:25 +0530 Subject: [PATCH 1233/1407] python3-pytest-httpserver: update to 1.0.5. --- srcpkgs/python3-pytest-httpserver/template | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template index 8238f5d82c8f..bb5e84559f32 100644 --- a/srcpkgs/python3-pytest-httpserver/template +++ b/srcpkgs/python3-pytest-httpserver/template @@ -1,18 +1,24 @@ # Template file for 'python3-pytest-httpserver' pkgname=python3-pytest-httpserver -version=1.0.4 +version=1.0.5 revision=1 wrksrc=pytest-httpserver-${version} build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-pytest python3-Werkzeug" +checkdepends="${depends} python3-MarkupSafe python3-requests" short_desc="HTTP server for pytest" maintainer="mobinmob " 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=164ec7aa21b776d441bdb2fddb85b92a8a0a0cd7ad5d1d5210430d23b2624a4d +checksum=932843df9fa584e6a664b2e7a21dec4ddf9507c235a78853f21e00b111352395 + +do_check() { + python3 -m pip install --no-deps --target test pytest_httpserver-${version}-*-*-*.whl + PYTHONPATH=test python3 -m pytest tests +} post_install() { vlicense LICENSE From a490f9b522d05b62fb8e90f874385e92f841f489 Mon Sep 17 00:00:00 2001 From: amak Date: Sun, 4 Sep 2022 15:44:18 +1000 Subject: [PATCH 1234/1407] libnpupnp: update to 5.0.0 --- common/shlibs | 2 +- srcpkgs/libnpupnp/template | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 1861098750b4..db2cc399d3de 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2083,7 +2083,7 @@ libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1 libnpth.so.0 npth-1.1_1 -libnpupnp.so.4 libnpupnp-4.0.2_1 +libnpupnp.so.9 libnpupnp-5.0.0_1 libglfw.so.3 glfw-3.0.4_1 libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1 libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_2 diff --git a/srcpkgs/libnpupnp/template b/srcpkgs/libnpupnp/template index b86c60a925af..fc3b31046507 100644 --- a/srcpkgs/libnpupnp/template +++ b/srcpkgs/libnpupnp/template @@ -1,6 +1,6 @@ # Template file for 'libnpupnp' pkgname=libnpupnp -version=4.2.2 +version=5.0.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -9,8 +9,9 @@ short_desc="UPnP library based on libupnp, but extensively rewritten" maintainer="amak " license="BSD-3-Clause" homepage="https://www.lesbonscomptes.com/upmpdcli/npupnp-doc/libnpupnp.html" +changelog="https://www.lesbonscomptes.com/upmpdcli/pages/releases.html" distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${version}.tar.gz" -checksum=cb3968773d30e2bfc765547df514fdc8927b9a37ecccca2e260ee8b612e756bc +checksum=2e5648cf180a425ef57b8c9c0d9dbd77f0314487ea0e0a85ebc6c3ef87cab05b post_install() { vlicense COPYING From df6344ef79f27577d58fbbae966372e5c5ede685 Mon Sep 17 00:00:00 2001 From: amak Date: Sun, 4 Sep 2022 15:49:45 +1000 Subject: [PATCH 1235/1407] libupnpp: update to 0.22.2 --- common/shlibs | 2 +- srcpkgs/libupnpp/template | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index db2cc399d3de..9b3c4ac5125c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1419,7 +1419,7 @@ libgpaste-gtk4.so.0 libgpaste-42.1_1 libthreadutil.so.6 libupnp-1.6.18_1 libupnp.so.17 libupnp-1.14.0_1 libixml.so.11 libupnp-1.14.0_1 -libupnpp.so.11 libupnpp-0.21.0_1 +libupnpp.so.12 libupnpp-0.22.2_1 libgeocode-glib.so.0 geocode-glib-3.10.0_1 libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1 libpotrace.so.0 libpotrace-1.11_1 diff --git a/srcpkgs/libupnpp/template b/srcpkgs/libupnpp/template index 96592395c455..ccac1cf6dc90 100644 --- a/srcpkgs/libupnpp/template +++ b/srcpkgs/libupnpp/template @@ -1,6 +1,6 @@ # Template file for 'libupnpp' pkgname=libupnpp -version=0.21.0 +version=0.22.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -9,8 +9,9 @@ short_desc="C++ wrapper for libnpupnp" maintainer="amak " license="LGPL-2.1-or-later" homepage="https://www.lesbonscomptes.com/upmpdcli" +changelog="https://www.lesbonscomptes.com/upmpdcli/pages/releases.html" distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-${version}.tar.gz" -checksum=e43dbe5020ed25152aaec71b325dd80498e72038da5aeb50ed7dd51e213cd903 +checksum=90338c19383333fd4eeec8a866a8c4add1754ef9a6a720ddd9af97e6754ff849 libupnpp-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From ee22ffbfc10cbb6ef32ac1b04aa7166d3e16c993 Mon Sep 17 00:00:00 2001 From: amak Date: Sun, 4 Sep 2022 15:53:51 +1000 Subject: [PATCH 1236/1407] upmpdcli: update to 1.5.20 --- srcpkgs/upmpdcli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template index abd66d3d0047..7b7c081b033b 100644 --- a/srcpkgs/upmpdcli/template +++ b/srcpkgs/upmpdcli/template @@ -1,6 +1,6 @@ # Template file for 'upmpdcli' pkgname=upmpdcli -version=1.5.19 +version=1.5.20 revision=1 build_style=gnu-configure hostmakedepends="pkg-config tar" @@ -11,7 +11,7 @@ license="LGPL-2.1-or-later" homepage="https://www.lesbonscomptes.com/upmpdcli" changelog="https://www.lesbonscomptes.com/upmpdcli/pages/releases.html" distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${version}.tar.gz" -checksum=67fa1f5c06fecd404f3414b25a070c9deabe917241ed6881b7a8e41e8379ed09 +checksum=c6879fee99f8f289717fdceb5de3ac7669b225c333c1db80e66cafca8360f134 python_version=3 system_accounts="_upmpdcli" From fbbc3c39f22e2e4a49cb68f51e216beb6f9083e5 Mon Sep 17 00:00:00 2001 From: amak Date: Sun, 4 Sep 2022 16:02:36 +1000 Subject: [PATCH 1237/1407] mpd: rebuild for libnpupnp-5.0.0_1 --- srcpkgs/mpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index 536e06c891c9..c3dee3b1c0b5 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd version=0.23.9 -revision=1 +revision=2 build_style=meson configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled From 63afa66e521abd6062c00f89673e65f58add0a7f Mon Sep 17 00:00:00 2001 From: Chloris Date: Thu, 8 Sep 2022 08:24:22 +0200 Subject: [PATCH 1238/1407] source-sans-pro: update to 3.046. --- srcpkgs/source-sans-pro/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/source-sans-pro/template b/srcpkgs/source-sans-pro/template index 6a2e59e8d654..a38598f244f3 100644 --- a/srcpkgs/source-sans-pro/template +++ b/srcpkgs/source-sans-pro/template @@ -1,15 +1,15 @@ # Template file for 'source-sans-pro' pkgname=source-sans-pro -version=3.028 +version=3.046 revision=1 -wrksrc="source-sans-pro-${version}R" +wrksrc="source-sans-${version}R" depends="font-util" short_desc="Sans serif font family for user interface environments" maintainer="WantToHelp " license="OFL-1.1" -homepage="https://adobe-fonts.github.io/source-sans-pro/" -distfiles="https://github.com/adobe-fonts/source-sans-pro/archive/${version}R.tar.gz" -checksum=12faf267e40f1be46daf44afce47facd6efb996e2f2f5abe0a3dde161d54e251 +homepage="https://adobe-fonts.github.io/source-sans/" +distfiles="https://github.com/adobe-fonts/source-sans/archive/${version}R.tar.gz" +checksum=7a0a3a0c9ff2740380eddc28a53b4b0dc99491da5f900f4add5af2d1a18e06bc font_dirs="/usr/share/fonts/OTF /usr/share/fonts/TTF" do_install() { From 116e5d83b17595cb6abce9e85cfa2c8b563fe938 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 6 Sep 2022 11:24:41 +0200 Subject: [PATCH 1239/1407] lnav: update to 0.11.0. --- srcpkgs/lnav/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template index a4e86c5b7940..e2f08415e84d 100644 --- a/srcpkgs/lnav/template +++ b/srcpkgs/lnav/template @@ -1,18 +1,19 @@ # Template file for 'lnav' pkgname=lnav -version=0.10.1 +version=0.11.0 revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake openssh zlib-devel" makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel pcre-devel readline-devel sqlite-devel zlib-devel" +checkdepends="tar" short_desc="Log file navigator" maintainer="Leah Neukirchen " license="BSD-2-Clause" homepage="http://lnav.org/" -distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz" -checksum=4af855a463493105ae0746fc0da80304a689b5394eb6abfeede4dd843127c8bc +distfiles="https://github.com/tstack/lnav/archive/v${version}.tar.gz" +checksum=d35ee5ae710315bc92a58f1307980046ca45ed8aa5505769c3a706601fd64a9c if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" @@ -22,7 +23,7 @@ pre_configure() { ./autogen.sh } pre_build() { - make -C src/tools bin2c \ + make -C tools bin2c \ CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \ CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \ LDFLAGS= LIBS= From c0d1b6c2e9f7abd00e7ad4d13c7c82aacf68dd3b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 6 Sep 2022 11:25:55 +0200 Subject: [PATCH 1240/1407] bzip3: update to 1.1.5. --- srcpkgs/bzip3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bzip3/template b/srcpkgs/bzip3/template index 10cd3adcadfe..ddf863404065 100644 --- a/srcpkgs/bzip3/template +++ b/srcpkgs/bzip3/template @@ -1,6 +1,6 @@ # Template file for 'bzip3' pkgname=bzip3 -version=1.1.4 +version=1.1.5 revision=1 build_style=gnu-configure short_desc="Better and stronger spiritual successor to bzip2" @@ -9,7 +9,7 @@ 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=4948c4cd62a995346a03087fc35183d7b9289a9cade491b6bb005d1dd80ab108 +checksum=b77e4145a7c4e8b570d5586e4840fe20d308e09857278c90f031d9c39eb3c49c bzip3-devel_package() { short_desc+=" - development files" From fe4ea6c2928888a4f0e6840d720184dc3734dcfa Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 6 Sep 2022 11:27:00 +0200 Subject: [PATCH 1241/1407] perl-Plack: update to 1.0050. --- srcpkgs/perl-Plack/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Plack/template b/srcpkgs/perl-Plack/template index b99cfb1d8422..84f0793ca2de 100644 --- a/srcpkgs/perl-Plack/template +++ b/srcpkgs/perl-Plack/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Plack' pkgname=perl-Plack -version=1.0049 +version=1.0050 revision=1 wrksrc="Plack-${version}" build_style=perl-module @@ -17,4 +17,4 @@ maintainer="Leah Neukirchen " homepage="https://metacpan.org/release/Plack" license="Artistic-1.0-Perl, GPL-1.0-or-later" distfiles="${CPAN_SITE}/Plack/Plack-${version}.tar.gz" -checksum=b5728e84d52a41598f60f108f0aebc75dcbc70b0c362f3a175177fca547c0418 +checksum=d2651ade82ebbff7abe0a3a189fc932dadc4779186ce89468e56d0189eaa6ed4 From b2c7dee9786d1433c100678a982ebbdda92149e2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 8 Sep 2022 12:50:56 +0200 Subject: [PATCH 1242/1407] z3: update to 4.11.2. --- srcpkgs/z3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index b23e8f82e904..eab732c1dba3 100644 --- a/srcpkgs/z3/template +++ b/srcpkgs/z3/template @@ -1,6 +1,6 @@ # Template file for 'z3' pkgname=z3 -version=4.11.0 +version=4.11.2 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=afa761ee2c00b66afcf7f77ccf3f9820f97142bba988040ba56ed876443b811c +checksum=e3a82431b95412408a9c994466fad7252135c8ed3f719c986cd75c8c5f234c7e build_options="ocaml" desc_option_ocaml="Enable support for OCaml bindings" From 2ba23520462ce4f9bd0ebed26067d568662430cd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 8 Sep 2022 13:19:00 +0200 Subject: [PATCH 1243/1407] kpartx: update to 0.9.1. --- srcpkgs/kpartx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpartx/template b/srcpkgs/kpartx/template index 36e40492c202..d41ada34b7f5 100644 --- a/srcpkgs/kpartx/template +++ b/srcpkgs/kpartx/template @@ -1,6 +1,6 @@ # Template file for 'kpartx' pkgname=kpartx -version=0.9.0 +version=0.9.1 revision=1 wrksrc="multipath-tools-${version}" build_wrksrc=kpartx @@ -12,6 +12,6 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="http://christophe.varoqui.free.fr/" distfiles="https://github.com/opensvc/multipath-tools/archive/refs/tags/${version}.tar.gz" -checksum=d6d1d819a53d076a91828ede42d9786451a471c4b71ca3fd25d04ad5413e3f95 +checksum=0e856814aa4b2a24eddd918f4be812af40c28956f48b198f51b73e47d0da0d73 LDFLAGS="-ldevmapper" CFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLIBDM_API_COOKIE -I../libmultipath" From e7d4c48b5eede872507338bfc7e19daa23846e14 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 8 Sep 2022 13:22:11 +0200 Subject: [PATCH 1244/1407] linux5.10: update to 5.10.142. --- 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 0f242d510500..e1f2ec736fa9 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.138 +version=5.10.142 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="dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43 - 2cf2caf3819b046c7cc04ee3e02260f3ef1fe904a63dd6e2d00f1efd8276c8f2" + 957a0172bfd882f6196a1cc6f6a6ecc1cf08faa5839fd5f3f33ead25807d3821" python_version=3 skip_extraction="patch-${version}.xz" From bb2c0afc172d33ebd7d0e194521bc3021364ace5 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 8 Sep 2022 13:25:57 +0200 Subject: [PATCH 1245/1407] linux5.15: update to 5.15.67. --- srcpkgs/linux5.15/files/arm64-dotconfig | 6 ++++-- srcpkgs/linux5.15/template | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig index f0f723ce9867..46006f930e53 100644 --- a/srcpkgs/linux5.15/files/arm64-dotconfig +++ b/srcpkgs/linux5.15/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.47 Kernel Configuration +# Linux/arm64 5.15.67 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -371,6 +371,7 @@ CONFIG_ARM64_ERRATUM_1286807=y CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_ERRATUM_1508412=y +CONFIG_ARM64_ERRATUM_2441009=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -724,6 +725,7 @@ CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y CONFIG_HAVE_NMI=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y @@ -11334,7 +11336,6 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO_BLAKE2B=m -CONFIG_CRYPTO_BLAKE2S=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_POLY1305=m @@ -11549,6 +11550,7 @@ CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_SM4=m # end of Crypto library routines +CONFIG_LIB_MEMNEQ=y CONFIG_CRC_CCITT=y CONFIG_CRC16=y CONFIG_CRC_T10DIF=y diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template index 1c7f26959f53..a3b41f8b44ca 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.63 +version=5.15.67 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 - 9ac380863b5f4510ab2c09776b912629948a26698b4b633cabc80aca3a53afb2" + 2af2af357eb2ee2ee91edd1969a920377dcf28c9c0c06abd4006500e61140bc5" skip_extraction="patch-${version}.xz" python_version=3 From 2a26e0e4180d6155fde7da9f3fcfd54e3f44a4eb Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 8 Sep 2022 14:05:29 -0500 Subject: [PATCH 1246/1407] volk: update to 2.5.2. --- srcpkgs/volk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template index 25bb89e31427..f8f27f45b5e5 100644 --- a/srcpkgs/volk/template +++ b/srcpkgs/volk/template @@ -1,6 +1,6 @@ # Template file for 'volk' pkgname=volk -version=2.5.1 +version=2.5.2 revision=1 _cpu_features_gitrev="69d39934e83be9a0133d2850f15f5debd5eba06f" build_style=cmake @@ -12,7 +12,7 @@ license="GPL-3.0-or-later" homepage="http://libvolk.org/" distfiles="https://github.com/gnuradio/volk/archive/v${version}.tar.gz https://github.com/google/cpu_features/archive/${_cpu_features_gitrev}.tar.gz" -checksum="a935d284e6ea33fb6885a504e963bc4b92c170529a4268adf39a34c86e067e8d +checksum="fb447b8053f574a72697a26f08d51fb70d3b54b4e90e72b705138f8bc7ae6722 eec63919535abcf029f6fce1bca1192e67a5f5701d067d24094a54378c7f9563" case "$XBPS_TARGET_MACHINE" in From bea553fa6de61aaf069a3e8c3d87e269e51aa9ba Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 8 Sep 2022 14:06:14 -0500 Subject: [PATCH 1247/1407] sqlmap: update to 1.6.9. --- srcpkgs/sqlmap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template index 312a20b710ee..37a976150990 100644 --- a/srcpkgs/sqlmap/template +++ b/srcpkgs/sqlmap/template @@ -1,6 +1,6 @@ # Template file for 'sqlmap' pkgname=sqlmap -version=1.6.8 +version=1.6.9 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=35c51f4bd6f5cb8dd8efee4cf87d49bc7e7311ed6f42ffdd038394f7f98e69a2 +checksum=bccf1bea6ce44777a860ecbcaa83773889de023aeb51266cdbe961b7dc7732ba python_version=3 do_install() { From 4d46cb81181e034e02da1b9fdfcf03b64733ae0b Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 8 Sep 2022 14:34:01 -0500 Subject: [PATCH 1248/1407] volk: update cpu_features --- srcpkgs/volk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template index f8f27f45b5e5..dff042f32d1e 100644 --- a/srcpkgs/volk/template +++ b/srcpkgs/volk/template @@ -2,7 +2,7 @@ pkgname=volk version=2.5.2 revision=1 -_cpu_features_gitrev="69d39934e83be9a0133d2850f15f5debd5eba06f" +_cpu_features_gitrev="188d0d3c383689cdb6bb70dc6da2469faec84f61" build_style=cmake hostmakedepends="pkg-config python3-cheetah3 git python3-Mako python3-six" makedepends="python3-cheetah3 python3-devel python3-Mako python3-six" @@ -13,7 +13,7 @@ homepage="http://libvolk.org/" distfiles="https://github.com/gnuradio/volk/archive/v${version}.tar.gz https://github.com/google/cpu_features/archive/${_cpu_features_gitrev}.tar.gz" checksum="fb447b8053f574a72697a26f08d51fb70d3b54b4e90e72b705138f8bc7ae6722 - eec63919535abcf029f6fce1bca1192e67a5f5701d067d24094a54378c7f9563" + ef383c81e84e7ce56eeb9207ded6937f0aefd6747c319d8d3265e6d9be164db1" case "$XBPS_TARGET_MACHINE" in armv6l*) From 8916275208e74a65353821bf842fed79eaeb6726 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 8 Sep 2022 15:45:25 -0400 Subject: [PATCH 1249/1407] LimeSuite: update to 22.09.0. --- common/shlibs | 2 +- srcpkgs/LimeSuite/template | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 9b3c4ac5125c..bd9890ed7846 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4127,7 +4127,7 @@ librz_syscall.so.0.4 rizin-0.4.0_1 librz_type.so.0.4 rizin-0.4.0_1 librz_util.so.0.4 rizin-0.4.0_1 libaravis-0.8.so.0 libaravis-0.8.21_1 -libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1 +libLimeSuite.so.22.09-1 LimeSuite-22.09.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 diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template index 11e0af2aa637..f7caba84c2fe 100644 --- a/srcpkgs/LimeSuite/template +++ b/srcpkgs/LimeSuite/template @@ -1,6 +1,6 @@ # Template file for 'LimeSuite' pkgname=LimeSuite -version=20.10.0 +version=22.09.0 revision=1 build_style=cmake build_helper=cmake-wxWidgets-gtk3 @@ -31,9 +31,10 @@ short_desc="Driver and GUI for LimeSDR/LMS7002M-based SDR platforms" maintainer="classabbyamp " license="Apache-2.0" homepage="https://myriadrf.org/projects/lime-suite/" +changelog="https://raw.githubusercontent.com/myriadrf/LimeSuite/master/Changelog.txt" distfiles="https://github.com/myriadrf/LimeSuite/archive/refs/tags/v${version}.tar.gz" -checksum=f6d79dc67cb52a5aea839d1dc00e65f85367cb2c275d77f149833d32cf79b467 -shlib_provides="libLimeSuite.so.20.10-1" +checksum=521e45298e1ffd0fd65006598e1edf37bd92a13667afaab262582fc681f1cf16 +shlib_provides="libLimeSuite.so.22.09-1" build_options="octave" desc_option_octave="Enable the LimeSuite Octave plugin" From 6995a969ec465d3c3b70b0f817de12a03f545d87 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, 8 Aug 2022 17:18:10 +0700 Subject: [PATCH 1250/1407] python3-pyqt6: update to 6.3.1. --- srcpkgs/python3-pyqt6-connectivity | 1 + srcpkgs/python3-pyqt6-connectivity-devel | 1 + srcpkgs/python3-pyqt6-multimedia | 1 + srcpkgs/python3-pyqt6-multimedia-devel | 1 + srcpkgs/python3-pyqt6-position | 1 + srcpkgs/python3-pyqt6-position-devel | 1 + srcpkgs/python3-pyqt6-remoteobjects | 1 + srcpkgs/python3-pyqt6-remoteobjects-devel | 1 + srcpkgs/python3-pyqt6-sensors | 1 + srcpkgs/python3-pyqt6-sensors-devel | 1 + srcpkgs/python3-pyqt6-serialport | 1 + srcpkgs/python3-pyqt6-serialport-devel | 1 + srcpkgs/python3-pyqt6-webchannel | 1 + srcpkgs/python3-pyqt6-webchannel-devel | 1 + srcpkgs/python3-pyqt6-websockets | 1 + srcpkgs/python3-pyqt6-websockets-devel | 1 + srcpkgs/python3-pyqt6/template | 183 +++++++++++++++++++++- 17 files changed, 195 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/python3-pyqt6-connectivity create mode 120000 srcpkgs/python3-pyqt6-connectivity-devel create mode 120000 srcpkgs/python3-pyqt6-multimedia create mode 120000 srcpkgs/python3-pyqt6-multimedia-devel create mode 120000 srcpkgs/python3-pyqt6-position create mode 120000 srcpkgs/python3-pyqt6-position-devel create mode 120000 srcpkgs/python3-pyqt6-remoteobjects create mode 120000 srcpkgs/python3-pyqt6-remoteobjects-devel create mode 120000 srcpkgs/python3-pyqt6-sensors create mode 120000 srcpkgs/python3-pyqt6-sensors-devel create mode 120000 srcpkgs/python3-pyqt6-serialport create mode 120000 srcpkgs/python3-pyqt6-serialport-devel create mode 120000 srcpkgs/python3-pyqt6-webchannel create mode 120000 srcpkgs/python3-pyqt6-webchannel-devel create mode 120000 srcpkgs/python3-pyqt6-websockets create mode 120000 srcpkgs/python3-pyqt6-websockets-devel diff --git a/srcpkgs/python3-pyqt6-connectivity b/srcpkgs/python3-pyqt6-connectivity new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-connectivity @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-connectivity-devel b/srcpkgs/python3-pyqt6-connectivity-devel new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-connectivity-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-multimedia b/srcpkgs/python3-pyqt6-multimedia new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-multimedia @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-multimedia-devel b/srcpkgs/python3-pyqt6-multimedia-devel new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-multimedia-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-position b/srcpkgs/python3-pyqt6-position new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-position @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-position-devel b/srcpkgs/python3-pyqt6-position-devel new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-position-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-remoteobjects b/srcpkgs/python3-pyqt6-remoteobjects new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-remoteobjects @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-remoteobjects-devel b/srcpkgs/python3-pyqt6-remoteobjects-devel new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-remoteobjects-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-sensors b/srcpkgs/python3-pyqt6-sensors new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-sensors @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-sensors-devel b/srcpkgs/python3-pyqt6-sensors-devel new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-sensors-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-serialport b/srcpkgs/python3-pyqt6-serialport new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-serialport @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-serialport-devel b/srcpkgs/python3-pyqt6-serialport-devel new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-serialport-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-webchannel b/srcpkgs/python3-pyqt6-webchannel new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-webchannel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-webchannel-devel b/srcpkgs/python3-pyqt6-webchannel-devel new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-webchannel-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-websockets b/srcpkgs/python3-pyqt6-websockets new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-websockets @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6-websockets-devel b/srcpkgs/python3-pyqt6-websockets-devel new file mode 120000 index 000000000000..dd603d682349 --- /dev/null +++ b/srcpkgs/python3-pyqt6-websockets-devel @@ -0,0 +1 @@ +python3-pyqt6 \ No newline at end of file diff --git a/srcpkgs/python3-pyqt6/template b/srcpkgs/python3-pyqt6/template index a4a2a0ed36d7..d9c4b139d7de 100644 --- a/srcpkgs/python3-pyqt6/template +++ b/srcpkgs/python3-pyqt6/template @@ -1,15 +1,21 @@ # Template file for 'python3-pyqt6' pkgname=python3-pyqt6 -version=6.1.1 -revision=2 +version=6.3.1 +revision=1 wrksrc=PyQt6-$version build_style=sip-build build_helper=qemu configure_args="--confirm-license --dbus $XBPS_CROSS_BASE/usr/include/dbus-1.0" hostmakedepends="qt6-base-devel qt6-declarative-devel qt6-tools-devel qt6-quick3d-devel qt6-shadertools-devel qt6-svg-devel python3-dbus + qt6-webchannel-devel qt6-multimedia-devel qt6-location-devel + qt6-remoteobjects-devel qt6-sensors-devel qt6-serialport-devel + qt6-connectivity-devel qt6-websockets-devel python3-PyQt-builder pkg-config" makedepends="qt6-base-devel qt6-declarative-devel qt6-tools-devel + qt6-webchannel-devel qt6-multimedia-devel qt6-location-devel + qt6-remoteobjects-devel qt6-sensors-devel qt6-serialport-devel + qt6-connectivity-devel qt6-websockets-devel qt6-quick3d-devel qt6-shadertools-devel qt6-svg-devel python3-dbus-devel" depends="python3-pyqt6-sip" short_desc="Python 3 bindings for Qt6" @@ -17,9 +23,8 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-only" homepage="https://www.riverbankcomputing.com/software/pyqt/" distfiles="$PYPI_SITE/P/PyQt6/PyQt6-$version.tar.gz" -checksum=8775244fa73f94bfe8ae7672b624e2a903a22bc35d7ea42dd830949e2f9e43c7 +checksum=8cc6e21dbaf7047d1fc897e396ccd9710a12f2ef976563dad65f06017d2c9757 lib32disabled=yes -patch_args=-Np1 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" @@ -325,7 +330,177 @@ python3-pyqt6-devel_package() { python3-pyqt6-test-devel>=${version}_${revision} python3-pyqt6-widgets-devel>=${version}_${revision} python3-pyqt6-xml-devel>=${version}_${revision} + python3-pyqt6-websockets-devel>=${version}_${revision} + python3-pyqt6-webchannel-devel>=${version}_${revision} + python3-pyqt6-multimedia-devel>=${version}_${revision} + python3-pyqt6-position-devel>=${version}_${revision} + python3-pyqt6-remoteobjects-devel>=${version}_${revision} + python3-pyqt6-sensors-devel>=${version}_${revision} + python3-pyqt6-serialport-devel>=${version}_${revision} + python3-pyqt6-connectivity-devel>=${version}_${revision} python3-pyqt6-devel-tools>=${version}_${revision}" build_style=meta short_desc="${short_desc} - development files" } + +python3-pyqt6-websockets_package() { + lib32disabled=yes + short_desc+=" - WebSockets" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtWebSockets.*" + } +} + +python3-pyqt6-websockets-devel_package() { + lib32disabled=yes + short_desc+=" - WebSockets - development files" + depends="python3-pyqt6-websockets>=${version}_${revision} + python3-pyqt6-core-devel>=${version}_${revision} + qt6-websockets-devel" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtWebSockets" + } +} + +python3-pyqt6-webchannel_package() { + lib32disabled=yes + short_desc+=" - WebChannel" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtWebChannel.*" + } +} + +python3-pyqt6-webchannel-devel_package() { + lib32disabled=yes + short_desc+=" - WebChannel - development files" + depends="python3-pyqt6-webchannel>=${version}_${revision} + python3-pyqt6-core-devel>=${version}_${revision} + qt6-webchannel-devel" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtWebChannel" + } +} + +python3-pyqt6-multimedia_package() { + lib32disabled=yes + short_desc+=" - Multimedia" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtMultimedia*" + } +} + +python3-pyqt6-multimedia-devel_package() { + lib32disabled=yes + short_desc+=" - Multimedia - development files" + depends="python3-pyqt6-multimedia>=${version}_${revision} + python3-pyqt6-core-devel>=${version}_${revision} + qt6-multimedia-devel" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtMultimedia*" + } +} + +python3-pyqt6-position_package() { + lib32disabled=yes + short_desc+=" - Position" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtPositioning*" + } +} + +python3-pyqt6-position-devel_package() { + lib32disabled=yes + short_desc+=" - Position - development files" + depends="python3-pyqt6-position>=${version}_${revision} + python3-pyqt6-core-devel>=${version}_${revision} + qt6-location-devel" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtPositioning" + } +} + +python3-pyqt6-remoteobjects_package() { + lib32disabled=yes + short_desc+=" - RemoteObjects" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtRemoteObjects*" + } +} + +python3-pyqt6-remoteobjects-devel_package() { + lib32disabled=yes + short_desc+=" - RemoteObjects - development files" + depends="python3-pyqt6-remoteobjects>=${version}_${revision} + python3-pyqt6-core-devel>=${version}_${revision} + qt6-remoteobjects-devel" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtRemoteObjects" + } +} + +python3-pyqt6-sensors_package() { + lib32disabled=yes + short_desc+=" - Sensors" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtSensors*" + } +} + +python3-pyqt6-sensors-devel_package() { + lib32disabled=yes + short_desc+=" - Sensors - development files" + depends="python3-pyqt6-sensors>=${version}_${revision} + python3-pyqt6-core-devel>=${version}_${revision} + qt6-sensors-devel" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtSensors" + } +} + +python3-pyqt6-serialport_package() { + lib32disabled=yes + short_desc+=" - SerialPort" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtSerialPort*" + } +} + +python3-pyqt6-serialport-devel_package() { + lib32disabled=yes + short_desc+=" - SerialPort - development files" + depends="python3-pyqt6-serialport>=${version}_${revision} + python3-pyqt6-core-devel>=${version}_${revision} + qt6-serialport-devel" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtSerialPort" + } +} + +python3-pyqt6-connectivity_package() { + lib32disabled=yes + short_desc+=" - Connectivity" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/QtBluetooth*" + vmove "${py3_sitelib}/PyQt6/QtNfc*" + } +} + +python3-pyqt6-connectivity-devel_package() { + lib32disabled=yes + short_desc+=" - Connectivity - development files" + depends="python3-pyqt6-connectivity>=${version}_${revision} + python3-pyqt6-core-devel>=${version}_${revision} + qt6-connectivity-devel" + pkg_install() { + vmove "${py3_sitelib}/PyQt6/bindings/QtBluetooth" + vmove "${py3_sitelib}/PyQt6/bindings/QtNfc" + } +} From c45cee0536d095d1e071cc0e356be9552615d882 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, 8 Aug 2022 17:17:56 +0700 Subject: [PATCH 1251/1407] python3-pyqt6-3d: update to 6.3.0. --- srcpkgs/python3-pyqt6-3d/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pyqt6-3d/template b/srcpkgs/python3-pyqt6-3d/template index 7e22e6371aab..87a7a2cc8382 100644 --- a/srcpkgs/python3-pyqt6-3d/template +++ b/srcpkgs/python3-pyqt6-3d/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyqt6-3d' pkgname=python3-pyqt6-3d -version=6.1.1 -revision=2 +version=6.3.0 +revision=1 wrksrc=PyQt6_3D-$version build_style=sip-build hostmakedepends="python3-pyqt6-gui-devel qt6-3d-devel @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-only" homepage="https://www.riverbankcomputing.com/software/pyqt3d/" distfiles="$PYPI_SITE/P/PyQt6-3D/PyQt6_3D-${version}.tar.gz" -checksum=f0277c04ac62f065cdd3f740a2149d260a5909e51df9fbb63e5ed83cebbe44f4 +checksum=fab024b7fb3245d9b463029e0000f46cff95f0bdab603b875fabcaa53d9fe63f lib32disabled=yes python3-pyqt6-3d-devel_package() { From 628d1651b6c74fcaece642e09ea1c4e049fdf68c 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, 8 Aug 2022 17:17:59 +0700 Subject: [PATCH 1252/1407] python3-pyqt6-charts: update to 6.3.1. --- srcpkgs/python3-pyqt6-charts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pyqt6-charts/template b/srcpkgs/python3-pyqt6-charts/template index a186b2a04f5d..7562158608fc 100644 --- a/srcpkgs/python3-pyqt6-charts/template +++ b/srcpkgs/python3-pyqt6-charts/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyqt6-charts' pkgname=python3-pyqt6-charts -version=6.1.1 -revision=2 +version=6.3.1 +revision=1 wrksrc=PyQt6_Charts-$version build_style=sip-build hostmakedepends="qt6-charts-devel python3-pyqt6-widgets-devel @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-only" homepage="https://www.riverbankcomputing.com/software/pyqtchart/" distfiles="$PYPI_SITE/P/PyQt6-Charts/PyQt6_Charts-${version}.tar.gz" -checksum=258416a5c8148cc824dede64b37ede08f14e1f90ef7e3c11e411b1b03268fee2 +checksum=e6bbb17a3d5503508cb28a7b8f44dfedd659c43ff62adb64182a004fbd968f2f lib32disabled=yes python3-pyqt6-charts-devel_package() { From 3934ef7207aea54566fb139486b382a75a6cce2b 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, 8 Aug 2022 17:18:02 +0700 Subject: [PATCH 1253/1407] python3-pyqt6-networkauth: update to 6.3.0. --- srcpkgs/python3-pyqt6-networkauth/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pyqt6-networkauth/template b/srcpkgs/python3-pyqt6-networkauth/template index ec12b9491d6e..fe06b663c95f 100644 --- a/srcpkgs/python3-pyqt6-networkauth/template +++ b/srcpkgs/python3-pyqt6-networkauth/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyqt6-networkauth' pkgname=python3-pyqt6-networkauth -version=6.1.1 -revision=2 +version=6.3.0 +revision=1 wrksrc=PyQt6_NetworkAuth-$version build_style=sip-build hostmakedepends="python3-pyqt6-network-devel qt6-networkauth-devel @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-only" homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/" distfiles="$PYPI_SITE/P/PyQt6-NetworkAuth/PyQt6_NetworkAuth-${version}.tar.gz" -checksum=1590118cef920adcef55022246994d5dfcc64cb7504bdd17eac92ffeb4a21dbe +checksum=b1434b349e0820649341accf78689e9efd2c73543ed7d5474f660aaea2708454 lib32disabled=yes python3-pyqt6-networkauth-devel_package() { From 49a6987fa3ee4ebed557347ca498c28952f19900 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, 8 Aug 2022 17:18:05 +0700 Subject: [PATCH 1254/1407] python3-pyqt6-sip: update to 13.4.0. --- srcpkgs/python3-pyqt6-sip/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pyqt6-sip/template b/srcpkgs/python3-pyqt6-sip/template index 57547a3f64f7..8d85178c4c3a 100644 --- a/srcpkgs/python3-pyqt6-sip/template +++ b/srcpkgs/python3-pyqt6-sip/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyqt6-sip' pkgname=python3-pyqt6-sip -version=13.1.0 -revision=2 +version=13.4.0 +revision=1 wrksrc="PyQt6_sip-$version" build_style=python3-module hostmakedepends="python3-devel python3-setuptools sip" @@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-only, GPL-3.0-only, custom:SIP" homepage="https://www.riverbankcomputing.com/software/sip/" distfiles="${PYPI_SITE}/P/PyQt6_sip/PyQt6_sip-${version}.tar.gz" -checksum=7c31073fe8e6cb8a42e85d60d3a096700a9047c772b354d6227dfe965566ec8a +checksum=6d87a3ee5872d7511b76957d68a32109352caf3b7a42a01d9ee20032b350d979 lib32disabled=yes post_extract() { From acfafc0ba638ed8614b4c0430b6fb748814db931 Mon Sep 17 00:00:00 2001 From: skmpz Date: Thu, 8 Sep 2022 20:12:33 +0400 Subject: [PATCH 1255/1407] tree: update to 2.0.4. --- srcpkgs/tree/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/tree/template b/srcpkgs/tree/template index e933b423102a..773da0945b21 100644 --- a/srcpkgs/tree/template +++ b/srcpkgs/tree/template @@ -1,16 +1,16 @@ # Template file for 'tree' pkgname=tree -version=2.0.3 +version=2.0.4 revision=1 +wrksrc="unix-tree-${version}" build_style=gnu-makefile short_desc="Recursive directory listing program" maintainer="Orphaned " license="GPL-2.0-or-later" -homepage="http://mama.indstate.edu/users/ice/tree" -changelog="http://mama.indstate.edu/users/ice/tree/changes.html" -distfiles="http://deb.debian.org/debian/pool/main/t/tree/tree_${version}.orig.tar.gz" -#distfiles="http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz" -checksum=ba14e77b5f9dc7f8250c3f702ec5b6be2f93cd0fa87311bab3239676866a3b1d +homepage="https://mama.indstate.edu/users/ice/tree" +changelog="https://mama.indstate.edu/users/ice/tree/changes.html" +distfiles="https://gitlab.com/OldManProgrammer/unix-tree/-/archive/${version}/unix-tree-${version}.tar.gz" +checksum=c51b3a758fcbc25c7f88316491db5ac6926d032f45af96687297a95a3b7b15de do_install() { make MANDIR=${DESTDIR}/usr/share/man DESTDIR=${DESTDIR}/usr/bin install From a40264b96b69d88e5c26f4d951083c0d15984ba4 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Fri, 9 Sep 2022 14:28:54 +0200 Subject: [PATCH 1256/1407] flannel: update to 0.19.2. --- srcpkgs/flannel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template index ac272d9fcaef..a88e8144eaee 100644 --- a/srcpkgs/flannel/template +++ b/srcpkgs/flannel/template @@ -1,6 +1,6 @@ # Template file for 'flannel' pkgname=flannel -version=0.18.1 +version=0.19.2 revision=1 build_style=go short_desc="Etcd backed network fabric for containers" @@ -10,7 +10,7 @@ license="Apache-2.0" go_import_path="github.com/coreos/flannel" homepage="https://$go_import_path" distfiles="$homepage/archive/v${version}.tar.gz" -checksum=d93651bb2b6c9f9de3f223731ba6c434e7e8f3d87e1aa9dc8c3b69fd3a8a16f6 +checksum=6868ec82c712d4f8aab56a9d060433894de6f2efcd0f317556487b4e7cf75727 post_extract() { ln -s $wrksrc vendor/$go_import_path From fc46bd4adb4d8705655cb8d7b3f796ae6007dc4e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 9 Sep 2022 19:46:16 +0200 Subject: [PATCH 1257/1407] perl-PPR: update to 0.001006. --- srcpkgs/perl-PPR/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-PPR/template b/srcpkgs/perl-PPR/template index 7c11c950948c..93ba3d8c7292 100644 --- a/srcpkgs/perl-PPR/template +++ b/srcpkgs/perl-PPR/template @@ -1,6 +1,6 @@ # Template file for 'perl-PPR' pkgname=perl-PPR -version=0.001004 +version=0.001006 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/PPR" distfiles="${CPAN_SITE}/Sub/DCONWAY/PPR-${version}.tar.gz" -checksum=14ff444af83af60a5b91920ff5db0ab60effc65ec93d186617659050a7492f77 +checksum=7bfc403f00021e7dcb949f2b088c52c87b252731eb448b854a08543996598a60 From 95f66001594e42607a9a83edf748305328870ad3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 9 Sep 2022 20:16:09 +0200 Subject: [PATCH 1258/1407] babashka: update to 0.9.162. --- srcpkgs/babashka/template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template index f27ad4415538..10defef41cc4 100644 --- a/srcpkgs/babashka/template +++ b/srcpkgs/babashka/template @@ -1,6 +1,6 @@ # Template file for 'babashka' pkgname=babashka -version=0.9.161 +version=0.9.162 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=78bcad1db9211ad8804b7bd961fb9d701d1ec64c +_sci_commit=c34609904c9323caf33a9ffacda13da85072f4d1 _babashka_curl_commit=8a27e6060a739c7580cc89ba2bfddf48881e7178 -_babashka_nrepl_commit=0fba78aaa783d0f103533f035c8c5717ce4ac314 +_babashka_nrepl_commit=c8c8a766e026d5f87e0968a179dad70e13aa13ee _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712 -_process_commit=4392dfffa76fd3eebed891f7b5f688710d4c4ec9 +_process_commit=87d627a774dbf06505ae5eaa968e8ed7a7505bf1 _pods_commit=93081b75e66fb4c4d161f89e714c6b9e8d55c8d5 -_deps_clj_commit=65c1b5ecc0dbf12dee5f082cd5d325fcaa811cc4 -_fs_commit=6c5e180d52136e68671e15b639e55fbc14e85969 +_deps_clj_commit=0d9754fb1f2cfc49abc6d9d27e95c414b824016d +_fs_commit=32a65e81ddbc212608bf30501834a0ba367a9a82 _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="91b3010363bfeab8625d70611fdb56264c6d112bd2cbf351a55838b22b544fca - 5e32b45f9bd918d3e99411cbad2e4ccfd06b4b68184e6019052e4cb687ef1464 +checksum="bf7cde8fdca9a13dc34f4cb7cf446be43d2c48a5fe8ec1aff21f8502c1b57118 + 618e1b84f3bd075937c2755f587df114eaa687179cf0e417ca30840981a21045 d8e57bc67f237a5cfea90a6c38f9e303c1591250624087e348600af72e8910fa - 9d497f5e4ccfdf70cbaa6061e612fab664ec19e1a83d8e95952eeccc93fa8662 + e4db40ecf1c388122b8d33aeeaa9d5423289d843e9b566db92532fe40e388d3a 9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b - 4f2d1d178e07478591ea56cbce86626ee30b89f83fa117e3de196f908f226e66 + 149000edd85c4bbddceab1edecd7ecf5fb89d5e7a4671e2c7d5478d187908e1f 4ed022dac3500a91c537027fc7eb72cdd6bc808d2b9473157fd63eb05c789d5c - c95718b45455d3851fccb7663dba7b8e5e7b12034b75f33d4c5e2f9a39871c01 - a59a44c519e5a24a5d38f4325deeeee6ef42c1ce49d974411fa56f98ebfc3558 + d040bcb0408eec3f2797c968c54067bf0d1b38ab8dc42b71a98d8121d2dc17dd + 857ef91401705d95d4d6b489aa7369ad17dfd64fbbf9a85d142d8f323c73066e bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709" nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio" From fe85f710585657ef0fab254731e91a04bb8ffc67 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 9 Sep 2022 22:17:53 +0200 Subject: [PATCH 1259/1407] xbps-src: try to fix multiple distfiles --- common/hooks/do-fetch/00-distfiles.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/common/hooks/do-fetch/00-distfiles.sh b/common/hooks/do-fetch/00-distfiles.sh index 5fa394c9c790..3d9f80162b4e 100644 --- a/common/hooks/do-fetch/00-distfiles.sh +++ b/common/hooks/do-fetch/00-distfiles.sh @@ -208,7 +208,7 @@ try_urls() { # distfile downloaded, verify sha256 hash. flock -n "${distfile}.part" rm -f "${distfile}.part" - verify_cksum "$f" "$distfile" "$cksum" + verify_cksum "$curfile" "$distfile" "$cksum" return 0 done return 1 @@ -239,7 +239,6 @@ hook() { # Disable trap on ERR; the code is smart enough to report errors and abort. trap - ERR - # Detect bsdtar and GNU tar (in that order of preference) TAR_CMD="$(command -v bsdtar)" if [[ -z "$TAR_CMD" ]]; then @@ -276,6 +275,8 @@ hook() { # Download missing distfiles and verify their checksums for curfile in ${!_file_idxs[@]}; do distfile="$srcdir/$curfile" + set -- ${_file_idxs["$curfile"]} + i="$1" # If file lock cannot be acquired wait until it's available. while ! flock -w 1 "${distfile}.part" true; do @@ -287,12 +288,12 @@ hook() { fi # If distfile does not exist, try to link to it. - if link_cksum "$curfile" "$distfile" "${_checksums[0]}"; then + if link_cksum "$curfile" "$distfile" "${_checksums[$i]}"; then continue fi # If distfile does not exist, download it from a mirror location. - if try_mirrors "$curfile" "$distfile" "${_checksums[0]}" "${_distfiles[0]}"; then + if try_mirrors "$curfile" "$distfile" "${_checksums[$i]}" "${_distfiles[$i]}"; then continue fi From 47cf1e66cb3fdce2373062285d23bee97b7ba385 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 5 Sep 2022 13:08:18 -0400 Subject: [PATCH 1260/1407] mdocml: hide architecture selector in void.css this has no meaning for void, so let's hide it also http -> https for homepage/distfiles --- srcpkgs/mdocml/files/void.css | 5 +++++ srcpkgs/mdocml/template | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mdocml/files/void.css b/srcpkgs/mdocml/files/void.css index 89a9fb4b3211..17bb533d10c0 100644 --- a/srcpkgs/mdocml/files/void.css +++ b/srcpkgs/mdocml/files/void.css @@ -54,3 +54,8 @@ nav#void-nav ul li a:hover,nav#void-nav ul li a:focus { background-color:#000; text-decoration:none } + +/** Hide architecture selector **/ +select[name="arch"] { + display: none; +} diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template index bd9d81fe28d5..af276779493a 100644 --- a/srcpkgs/mdocml/template +++ b/srcpkgs/mdocml/template @@ -1,7 +1,7 @@ # Template file for 'mdocml' pkgname=mdocml version=1.14.6 -revision=4 +revision=5 wrksrc="mandoc-${version}" build_style=configure make_build_args="all man.cgi" @@ -14,8 +14,8 @@ conf_files="/etc/man.conf" short_desc="UNIX manpage compiler toolset (mandoc)" maintainer="Leah Neukirchen " license="ISC" -homepage="http://mandoc.bsd.lv" -distfiles="http://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz" +homepage="https://mandoc.bsd.lv" +distfiles="https://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz" checksum=8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c provides="man-0_1" From 8fa50ff69e60be4cba03980188abb827d3c11b68 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 7 Sep 2022 10:50:39 +0300 Subject: [PATCH 1261/1407] go: update to 1.19.1. --- srcpkgs/go/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/go/template b/srcpkgs/go/template index a5fce0f153b6..967d15ff9c00 100644 --- a/srcpkgs/go/template +++ b/srcpkgs/go/template @@ -1,6 +1,6 @@ # Template file for 'go' pkgname=go -version=1.19 +version=1.19.1 revision=1 create_wrksrc=yes build_wrksrc=go @@ -12,7 +12,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=9419cc70dc5a2523f29a77053cafff658ed21ef3561d9b6b020280ebceab28b9 +checksum=27871baa490f3401414ad793fba49086f6c855b1c584385ed7771e1204c7e179 nostrip=yes noverifyrdeps=yes From 8784a0684acaa11068095ffe1518708829e685fe Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 9 Sep 2022 23:00:08 -0500 Subject: [PATCH 1262/1407] xmandump: revbump for go1.19.1. --- srcpkgs/xmandump/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template index 8ca5f3a280db..11d3fdcc06d8 100644 --- a/srcpkgs/xmandump/template +++ b/srcpkgs/xmandump/template @@ -1,7 +1,7 @@ # Template file for 'xmandump' pkgname=xmandump version=0.2.3 -revision=1 +revision=2 build_style=go go_import_path="github.com/void-linux/xmandump" go_package="${go_import_path}/cmd/xmandump" From 4904a4fb0627da9eefcd4783fa11ed4833c7e56e Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 10 Sep 2022 08:47:49 +0200 Subject: [PATCH 1263/1407] linux5.4: update to 5.4.212. --- 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 84cbe25c3f96..c0226020145b 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.211 +version=5.4.212 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=bfb43241b72cd55797af68bea1cebe630d37664c0f9a99b6e9263a63a67e2dec +checksum=09c72e3dd85df773eb52e53e25c556d132958bd775b0ed6985a6b1ac21c9cfc2 python_version=3 nodebug=yes # -dbg package is generated below manually From cc67c0b090c4cbecf8176158e00653f829eefe41 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 10 Sep 2022 08:51:28 +0200 Subject: [PATCH 1264/1407] linux4.19: update to 4.19.257. --- 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 5244c53cab44..29085895edef 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.256 +version=4.19.257 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=67de95c6080b5730bf14227478cfc3e4db807941d8a881d9824c25059b3ff549 +checksum=eadd13aa70f37cdf50eef45c5964bd7146d353b61a1fd026d4fa0b2a68a3ea47 python_version=3 nodebug=yes # -dbg package is generated below manually From 640bd3cf4eb011cf461136cd89a0ad15823d1cdb Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 10 Sep 2022 08:56:50 +0200 Subject: [PATCH 1265/1407] libkdcraw5: update to 22.08.1. --- srcpkgs/libkdcraw5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template index b8e655ad2ab4..fab0515ab50b 100644 --- a/srcpkgs/libkdcraw5/template +++ b/srcpkgs/libkdcraw5/template @@ -1,6 +1,6 @@ # Template file for 'libkdcraw5' pkgname=libkdcraw5 -version=22.08.0 +version=22.08.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=2aad043bef260df4a8cae20cd47ec94a67e0a62b03b375788d1e45afdc07b6cf +checksum=0e0ef769c831255ce40200eb7e61b2781af01746f7cf2480c565020d7e43848b libkdcraw5-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 5c456cea88abfec8940bf833c50071f370c87ccf Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 10 Sep 2022 09:24:05 +0200 Subject: [PATCH 1266/1407] gwenview: update to 22.08.1. --- srcpkgs/gwenview/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template index a149852045e9..221847a30799 100644 --- a/srcpkgs/gwenview/template +++ b/srcpkgs/gwenview/template @@ -1,6 +1,6 @@ # Template file for 'gwenview' pkgname=gwenview -version=22.08.0 +version=22.08.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=447d1e8a0c19476fc2879a4e406d7d6af79b59f9e2c7aad28f70d484789ff716 +checksum=5b4593c50395f4088cb1aa434346558f5c73e2b2ec6a74a50a2bba834adf2a9c From af0276b515394dce646cc090ca6f2a44d68d5d4e Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Sat, 10 Sep 2022 17:04:19 +0700 Subject: [PATCH 1267/1407] qownnotes: update to 22.9.0 --- srcpkgs/qownnotes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template index aedbfd2b7c83..75d1dde09eff 100644 --- a/srcpkgs/qownnotes/template +++ b/srcpkgs/qownnotes/template @@ -1,6 +1,6 @@ # Template file for 'qownnotes' pkgname=qownnotes -version=22.8.4 +version=22.9.0 revision=1 build_style=qmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" @@ -13,7 +13,7 @@ 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=cfb266b3a812b5f87e57d5002cd05000931baad9fefbf353b2caa05407dc79e5 +checksum=3d368e131056c7b613755a430d2c273eedefb75d987e1dbf156db1c27841f560 pre_build() { vsed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri From d51484c2356c41f9aaa9ce8083a6349eefa5ee8c Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Sat, 10 Sep 2022 17:10:09 +0700 Subject: [PATCH 1268/1407] papirus-icon-theme: update to 20220910 --- srcpkgs/papirus-icon-theme/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template index dc4a492fe4de..78bb6038fd15 100644 --- a/srcpkgs/papirus-icon-theme/template +++ b/srcpkgs/papirus-icon-theme/template @@ -1,13 +1,13 @@ # Template file for 'papirus-icon-theme' pkgname=papirus-icon-theme -version=20220808 +version=20220910 revision=1 short_desc="SVG icon theme for Linux, based on Paper Icon Set" maintainer="Giuseppe Fierro " license="GPL-3.0-or-later" homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme" distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz" -checksum=79885ffa464734a49ee73e60eaf78a0cf9c7d2cf310664a8b7c5c90c403644b1 +checksum=e236c96bc53105770029718158353adb79e76b18f2847ac1bb5dc5e87b09e22e do_install() { vmkdir usr/share/icons From 6b692b7e31a7cf99c3aea10d8f650ed9958e197e Mon Sep 17 00:00:00 2001 From: Philipp David Date: Fri, 9 Sep 2022 17:19:22 +0200 Subject: [PATCH 1269/1407] PolyMC: update to 1.4.2. --- srcpkgs/PolyMC/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template index fd8da7afb88a..23267f588719 100644 --- a/srcpkgs/PolyMC/template +++ b/srcpkgs/PolyMC/template @@ -1,6 +1,6 @@ # Template file for 'PolyMC' pkgname=PolyMC -version=1.4.1 +version=1.4.2 revision=1 build_style=cmake configure_args="-DLauncher_BUILD_PLATFORM=Void @@ -14,7 +14,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=c7f893e2f8641abcb3bd7fe2ffeda1c7d99ff7e8774c76f9b53f6629e83eab2f +checksum=a66f25e0389815d2419a5b3aa1b85a390f14bbf3997c55c7da1ce4507b5aa511 if [ -z "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DBUILD_TESTING=0" From 39807353b2803db4f03b741cf2053f41accea75e Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 9 Sep 2022 19:38:04 +0200 Subject: [PATCH 1270/1407] transifex-cli: update to 1.3.1 --- srcpkgs/transifex-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/transifex-cli/template b/srcpkgs/transifex-cli/template index c8d753ad7226..6784e523c9f4 100644 --- a/srcpkgs/transifex-cli/template +++ b/srcpkgs/transifex-cli/template @@ -1,6 +1,6 @@ # Template file for 'transifex-cli' pkgname=transifex-cli -version=1.3.0 +version=1.3.1 revision=1 wrksrc="cli-${version}" build_style=go @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://github.com/transifex/cli" changelog="https://github.com/transifex/cli/releases" distfiles="https://github.com/transifex/cli/archive/refs/tags/v${version}.tar.gz" -checksum=e1cbf24e4c0dcb08d3d13c543e36156b50d420e6cc6198f30fba354016f4fd32 +checksum=07ce01795f0905ea424dca6a4f17d2ec85f253770905d16b15f434b31acb793f post_install() { mv ${DESTDIR}/usr/bin/{cli,transifex} From 369005a4560dadcd4fb6fe959fd8a5e7dadcf811 Mon Sep 17 00:00:00 2001 From: Karel Balej Date: Thu, 8 Sep 2022 08:36:42 +0200 Subject: [PATCH 1271/1407] mtxclient: update to 0.8.2. --- common/shlibs | 2 +- srcpkgs/mtxclient/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index bd9890ed7846..3654a4e81c0a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -422,7 +422,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.8.0 mtxclient-0.8.0_1 +libmatrix_client.so.0.8.2 mtxclient-0.8.2_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 12fea54d3fd5..6c404f3eb5b1 100644 --- a/srcpkgs/mtxclient/template +++ b/srcpkgs/mtxclient/template @@ -1,7 +1,7 @@ # Template file for 'mtxclient' pkgname=mtxclient -version=0.8.0 -revision=2 +version=0.8.2 +revision=1 build_style=cmake configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF" hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ 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=65de02107abf30f22aa419d0ad3e112638b655a6513a3ca6dd066adb7dd6ec05 +checksum=4caa12ddf954b9492d1ec9b6ca32ef0fc6478555f229db074d43bc5cc29a9c89 post_install() { vlicense LICENSE From fb6ea725b5bcc312a85f746fa21ceddf85151e56 Mon Sep 17 00:00:00 2001 From: Karel Balej Date: Thu, 8 Sep 2022 08:37:35 +0200 Subject: [PATCH 1272/1407] nheko: update to 0.10.1. --- srcpkgs/nheko/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template index 8e41e9e1f2f0..115fa2e70a4d 100644 --- a/srcpkgs/nheko/template +++ b/srcpkgs/nheko/template @@ -1,7 +1,7 @@ # Template file for 'nheko' pkgname=nheko -version=0.10.0 -revision=2 +version=0.10.1 +revision=1 build_style=cmake hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc" makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel @@ -16,7 +16,7 @@ license="GPL-3.0-or-later" 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=52ef68808fcfc4cd48e19fc45156b0d045a1c0b697cac23aa7ca2cdd8bacd865 +checksum=f9d94ecff541a49f38def91baadf751f9b41e319478f10aa66c4c827727fb5fd case "$XBPS_TARGET_MACHINE" in armv*-musl) From 1cf592540c21748bfda645f82650e038dca52837 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 9 Sep 2022 19:24:11 +0200 Subject: [PATCH 1273/1407] zellij: update to 0.31.4 --- srcpkgs/zellij/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template index 0bd0fa123995..cc1566544fca 100644 --- a/srcpkgs/zellij/template +++ b/srcpkgs/zellij/template @@ -1,6 +1,6 @@ # Template file for 'zellij' pkgname=zellij -version=0.31.3 +version=0.31.4 revision=1 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset @@ -14,8 +14,8 @@ maintainer="Marcin Puc " license="MIT" homepage="https://zellij.dev" changelog="https://raw.githubusercontent.com/zellij-org/zellij/main/CHANGELOG.md" -distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz" -checksum=61949cc0c44b11082e6a4347d50910c576b1f131daa054a17ed153a6fd0e8b20 +distfiles="https://github.com/zellij-org/zellij/archive/refs/tags/v${version}.tar.gz" +checksum=286b08523457cdadee89bb1839f8d08ac402af00f3e27063520a7ed9ee7afc8a post_build() { ZELLIJ="target/${RUST_TARGET}/release/zellij" From da68744fdda28f2e5f910945bdf66b075e01a81b Mon Sep 17 00:00:00 2001 From: icp Date: Fri, 9 Sep 2022 21:03:43 +0530 Subject: [PATCH 1274/1407] cheat: update to 4.3.3. --- srcpkgs/cheat/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template index 032c0d78b8ec..9cc2e0d9ffad 100644 --- a/srcpkgs/cheat/template +++ b/srcpkgs/cheat/template @@ -1,6 +1,6 @@ # Template file for 'cheat' pkgname=cheat -version=4.2.3 +version=4.3.3 revision=1 build_style=go go_import_path="github.com/cheat/cheat/cmd/cheat" @@ -8,8 +8,8 @@ short_desc="Create and view interactive cheatsheets on the command-line" maintainer="bra1nwave " license="MIT" homepage="https://github.com/cheat/cheat" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=9624160ba542fb51bbd959d8c68b76f82ea324a6186d8d6d544b0efd8c9cc8ca +distfiles="https://github.com/cheat/cheat/archive/refs/tags/${version}.tar.gz" +checksum=6a1739b71d436f45dc7c028ec79863a34e30cc13da7159bf23604b77f43faaf2 post_install() { vman doc/cheat.1 From 6b8d8fecb74b56a47459b9a439414807df6a81ea Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 8 Sep 2022 22:48:57 +0530 Subject: [PATCH 1275/1407] dust: update to 0.8.3. --- srcpkgs/dust/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dust/template b/srcpkgs/dust/template index 4ef1733f05b6..4dcdc139c197 100644 --- a/srcpkgs/dust/template +++ b/srcpkgs/dust/template @@ -1,6 +1,6 @@ # Template file for 'dust' pkgname=dust -version=0.8.1 +version=0.8.3 revision=1 build_style=cargo short_desc="More intuitive version of du" @@ -8,8 +8,12 @@ maintainer="Neel " license="Apache-2.0" homepage="https://github.com/bootandy/dust" distfiles="https://github.com/bootandy/dust/archive/v${version}.tar.gz" -checksum=9f3b5e93c62bb54139479ac4396549fc62389ac9a7d300b088cdf51cd0e90e22 +checksum=1e07203546274276503a4510adcf5dc6eacd5d1e20604fcd55a353b3b63c1213 post_install() { + vcompletion completions/dust.bash bash + vcompletion completions/dust.fish fish + vcompletion completions/_dust zsh + vsconf config/config.toml vdoc README.md } From 1a9578359bb77067174ff3b677bf103592ed9c9d Mon Sep 17 00:00:00 2001 From: icp Date: Thu, 8 Sep 2022 22:42:04 +0530 Subject: [PATCH 1276/1407] StyLua: update to 0.14.3. --- srcpkgs/StyLua/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template index 6009e9bdbfd7..ff3283d76d43 100644 --- a/srcpkgs/StyLua/template +++ b/srcpkgs/StyLua/template @@ -1,6 +1,6 @@ # Template file for 'StyLua' pkgname=StyLua -version=0.14.2 +version=0.14.3 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=606c37b84110739c375339aefeedc74a9906e59c4f559e112fc0948c13728a7b +checksum=d56d7f9ca7302047ecb5c92eb60436fcc2ee6dcb8c4b0f21d6d0f2c5461a9769 build_options="lua52 luau" build_options_default="lua52 luau" From 3d718f64afb4a505914e159b2aaad0e46cd4835a Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 9 Sep 2022 10:23:12 -0400 Subject: [PATCH 1277/1407] dendrite: update to 0.9.7. --- srcpkgs/dendrite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template index a6af572446b1..02342e6abed8 100644 --- a/srcpkgs/dendrite/template +++ b/srcpkgs/dendrite/template @@ -1,6 +1,6 @@ # Template file for 'dendrite' pkgname=dendrite -version=0.9.6 +version=0.9.7 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=408adccc67545a91bab5a533bf8be6eb9773025290013c2f0adb8bcbad124af1 +checksum=6ad48db81af45c2b2010fa44a78479ae643777597d162ac8719abbac4a3ce009 system_accounts="_dendrite" _dendrite_homedir="/var/lib/dendrite" From 973d979d59181b810f33b678bd881b2526b10b7e Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Thu, 8 Sep 2022 20:49:58 -0400 Subject: [PATCH 1278/1407] libnma: update to 1.10.0 --- srcpkgs/libnma/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template index 13ce6f353dca..76857fa9e854 100644 --- a/srcpkgs/libnma/template +++ b/srcpkgs/libnma/template @@ -1,6 +1,6 @@ # Template file for 'libnma' pkgname=libnma -version=1.8.40 +version=1.10.0 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=870a75f8d4641ed0d90f836aea6ff511224bde97ffd56d608ade2e9b5acb2b22 +checksum=76a172c55269709bf166d18a3abcb615a73718de3c2b00f428f8bd6e4936ee9f replaces="libnm-gtk>=0" if [ "$CROSS_BUILD" ]; then From db3b4e8dcf745e2615130d9fa3f384d4636e49ce Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Thu, 8 Sep 2022 20:49:12 -0400 Subject: [PATCH 1279/1407] starship: update to 1.10.3 --- srcpkgs/starship/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template index 0a8e73cef9b1..ab62cd306577 100644 --- a/srcpkgs/starship/template +++ b/srcpkgs/starship/template @@ -1,6 +1,6 @@ # Template file for 'starship' pkgname=starship -version=1.10.1 +version=1.10.3 revision=1 build_style=cargo build_helper=qemu @@ -12,7 +12,7 @@ maintainer="cinerea0 " license="ISC" homepage="https://starship.rs" distfiles="https://github.com/starship/starship/archive/refs/tags/v${version}.tar.gz" -checksum=0dcf3a087748c241207a8c86a8c7b6e4d5558916d22deb4348942797d58c3ed9 +checksum=39c5f8f88a8aa6d32575ddb26017572f2683fae129b9be5442acbae74019ea5e post_build() { STARSHIP="target/${RUST_TARGET}/release/starship" From a800899a99a680365c6d2bbe952c6e9f70753180 Mon Sep 17 00:00:00 2001 From: Jovan Lanik Date: Fri, 9 Sep 2022 01:56:30 +0200 Subject: [PATCH 1280/1407] gtklock: update to 1.3.6 --- srcpkgs/gtklock/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template index c88fc4ac1c9e..eadc1162bc09 100644 --- a/srcpkgs/gtklock/template +++ b/srcpkgs/gtklock/template @@ -1,6 +1,6 @@ # Template file for 'gtklock' pkgname=gtklock -version=1.3.5 +version=1.3.6 revision=1 build_style=gnu-makefile make_use_env=yes @@ -11,7 +11,7 @@ maintainer="Jovan Lanik " license="GPL-3.0-or-later" homepage="https://github.com/jovanlanik/gtklock" distfiles="https://github.com/jovanlanik/gtklock/archive/refs/tags/v${version}.tar.gz" -checksum=753259cdf4b16dbe2b564a80a919976c2661a028d9d06b22f1da466e615a6766 +checksum=ddc39721e0fc4e2bfb18c17bb5f158af79934f376258137dc78b144ff84c1650 post_install() { # copying CSS example provided From 34d6a25e6197423512abe8fb39217561ca1772cf Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 10 Sep 2022 15:52:52 +0300 Subject: [PATCH 1281/1407] rssguard: update to 4.2.4. --- srcpkgs/rssguard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template index 795552068999..2a2325f6cd60 100644 --- a/srcpkgs/rssguard/template +++ b/srcpkgs/rssguard/template @@ -1,6 +1,6 @@ # Template file for 'rssguard' pkgname=rssguard -version=4.2.3 +version=4.2.4 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=b883e6fa1a9c0e5c6f39735da055146a7876264197a7a6e8f1244f0db34fb98a +checksum=523e61b4e0a05ea587d8b66c030cd452a51f8030d54b9dd2f4127527eb25a2d9 post_install() { # Install rssguard icon manually From 94ac0f13602f9b00503d102326ba0cc69bcc7c0e Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 9 Sep 2022 12:33:54 +0000 Subject: [PATCH 1282/1407] boost: disable long double math subpackages on glibc ppc --- srcpkgs/boost/template | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index 0d103e335b52..ea11e85a7080 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -32,7 +32,7 @@ replaces="libboost_program_options1.72>=0 libboost_math_c99f1.72>=0 subpackages="libboost_program_options1.80 libboost_math_c99f1.80 libboost_stacktrace_basic1.80 libboost_stacktrace_noop1.80 - libboost_iostreams1.80 libboost_math_tr1l1.80 libboost_filesystem1.80 + libboost_iostreams1.80 libboost_filesystem1.80 libboost_chrono1.80 libboost_math_tr1f1.80 libboost_wave1.80 libboost_graph1.80 libboost_locale1.80 libboost_regex1.80 libboost_fiber1.80 libboost_type_erasure1.80 libboost_coroutine1.80 @@ -40,11 +40,21 @@ subpackages="libboost_program_options1.80 libboost_math_c99f1.80 boost-python3-1.80 libboost_log_setup1.80 boost-devel libboost_json1.80 libboost_timer1.80 libboost_system1.80 libboost_unit_test_framework1.80 libboost_serialization1.80 libboost_math_tr11.80 boost-build - libboost_math_c99l1.80 libboost_contract1.80 libboost_nowide1.80 + libboost_contract1.80 libboost_nowide1.80 libboost_date_time1.80 libboost_log1.80 libboost_random1.80 libboost_thread1.80 libboost_container1.80 boost-jam libboost_wserialization1.80 libboost_context1.80" +# on glibc ppc, boost.math disables long double stuff because of +# non-ieee754-conforming long double type (IBM double-double) +# +# this does not affect musl (where long double is 64-bit) +# +case "$XBPS_TARGET_MACHINE" in + ppc64le|ppc64|ppc) ;; + *) subpackages+=" libboost_math_c99l1.80 libboost_math_tr1l1.80";; +esac + if [ -z "$CROSS_BUILD" ]; then subpackages+=" libboost_stacktrace_addr2line1.80" fi From 3d3438d7f78605e4a5a50087d3b88df878091e72 Mon Sep 17 00:00:00 2001 From: q66 Date: Sat, 10 Sep 2022 13:24:53 +0000 Subject: [PATCH 1283/1407] vaultwarden: restrict archs (ring) --- srcpkgs/vaultwarden/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template index 5d46f1b4f867..d263cf9b1a1d 100644 --- a/srcpkgs/vaultwarden/template +++ b/srcpkgs/vaultwarden/template @@ -2,6 +2,7 @@ pkgname=vaultwarden version=1.25.2 revision=1 +archs="x86_64* i686* aarch64* arm*" # ring build_style=cargo configure_args="--features sqlite,mysql,postgresql" hostmakedepends="pkg-config" From 9458a7aa9daeed8c9cd394297f31fbb2ffb20105 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 24 Oct 2021 19:25:52 +0200 Subject: [PATCH 1284/1407] m4: update to 1.4.19. --- srcpkgs/m4/patches/fix-glibc-2.27.patch | 167 ------------------------ srcpkgs/m4/template | 22 ++-- 2 files changed, 8 insertions(+), 181 deletions(-) delete mode 100644 srcpkgs/m4/patches/fix-glibc-2.27.patch diff --git a/srcpkgs/m4/patches/fix-glibc-2.27.patch b/srcpkgs/m4/patches/fix-glibc-2.27.patch deleted file mode 100644 index 59d33cff164d..000000000000 --- a/srcpkgs/m4/patches/fix-glibc-2.27.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 5 Mar 2018 10:56:29 -0800 -Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Daniel P. Berrangé in: -https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html -* lib/fbufmode.c (fbufmode): -* lib/fflush.c (clear_ungetc_buffer_preserving_position) -(disable_seek_optimization, rpl_fflush): -* lib/fpending.c (__fpending): -* lib/fpurge.c (fpurge): -* lib/freadable.c (freadable): -* lib/freadahead.c (freadahead): -* lib/freading.c (freading): -* lib/freadptr.c (freadptr): -* lib/freadseek.c (freadptrinc): -* lib/fseeko.c (fseeko): -* lib/fseterr.c (fseterr): -* lib/fwritable.c (fwritable): -* lib/fwriting.c (fwriting): -Check _IO_EOF_SEEN instead of _IO_ftrylockfile. -* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: -Define if not already defined. - -[yann.morin.1998@free.fr: partially backport from upstream gnulib] -Signed-off-by: "Yann E. MORIN" - ---- - lib/fflush.c | 6 +++--- - lib/fpending.c | 2 +- - lib/fpurge.c | 2 +- - lib/freadahead.c | 2 +- - lib/freading.c | 2 +- - lib/fseeko.c | 4 ++-- - lib/stdio-impl.h | 6 ++++++ - 7 files changed, 15 insertions(+), 9 deletions(-) - -diff --git a/lib/fflush.c b/build-aux/gnulib/lib/fflush.c -index 983ade0ff..a6edfa105 100644 ---- a/lib/fflush.c -+++ b/lib/fflush.c -@@ -33,7 +33,7 @@ - #undef fflush - - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ - static void -@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) - - #endif - --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) - - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) - if (stream == NULL || ! freading (stream)) - return fflush (stream); - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - -diff --git a/lib/fpending.c b/build-aux/gnulib/lib/fpending.c -index c84e3a5b4..789f50e4e 100644 ---- a/lib/fpending.c -+++ b/lib/fpending.c -@@ -32,7 +32,7 @@ __fpending (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return fp->_IO_write_ptr - fp->_IO_write_base; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -diff --git a/lib/fpurge.c b/build-aux/gnulib/lib/fpurge.c -index b1d417c7a..3aedcc373 100644 ---- a/lib/fpurge.c -+++ b/lib/fpurge.c -@@ -62,7 +62,7 @@ fpurge (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ -diff --git a/lib/freadahead.c b/build-aux/gnulib/lib/freadahead.c -index c2ecb5b28..23ec76ee5 100644 ---- a/lib/freadahead.c -+++ b/lib/freadahead.c -@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *); - size_t - freadahead (FILE *fp) - { --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) -diff --git a/lib/freading.c b/build-aux/gnulib/lib/freading.c -index 73c28acdd..c24d0c88a 100644 ---- a/lib/freading.c -+++ b/lib/freading.c -@@ -31,7 +31,7 @@ freading (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); -diff --git a/lib/fseeko.c b/build-aux/gnulib/lib/fseeko.c -index 0101ab55f..193f4e8ce 100644 ---- a/lib/fseeko.c -+++ b/lib/fseeko.c -@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -diff --git a/lib/stdio-impl.h b/build-aux/gnulib/lib/stdio-impl.h -index 78d896e9f..05c5752a2 100644 ---- a/lib/stdio-impl.h -+++ b/lib/stdio-impl.h -@@ -18,6 +18,12 @@ - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ - --- -2.14.1 - - diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template index 78f3dae6184a..a25de6b89e32 100644 --- a/srcpkgs/m4/template +++ b/srcpkgs/m4/template @@ -1,17 +1,17 @@ # Template file for 'm4' pkgname=m4 -version=1.4.18 -revision=2 +version=1.4.19 +revision=1 bootstrap=yes -replaces="chroot-m4>=0" build_style=gnu-configure configure_args="--enable-changeword --enable-threads" short_desc="GNU version of UNIX m4 macro language processor" -homepage="https://www.gnu.org/software/m4/" -license="GPL-3.0-or-later" maintainer="Enno Boland " +license="GPL-3.0-or-later" +homepage="https://www.gnu.org/software/m4/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07 +checksum=63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96 +replaces="chroot-m4>=0" if [ "$XBPS_TARGET_LIBC" = musl ]; then export ac_cv_lib_error_at_line=no @@ -27,13 +27,7 @@ fi pre_check() { case "$XBPS_TARGET_MACHINE" in - *-musl* ) - # Disable locale tests that fail on musl - sed -i '/test-localename$(EXEEXT)/d' tests/Makefile - sed -i '/test-mbrtowc5.sh/d' tests/Makefile - - # Fails because test-localename doesn't work on musl - sed -i '/test-localeconv$(EXEEXT)/d' tests/Makefile - ;; + # Disable tests that fail on musl + *-musl) sed -i '/test-getcwd.sh/d' tests/Makefile ;; esac } From fb06b93d0ad0e50c151a75e31ab3447de4f264da Mon Sep 17 00:00:00 2001 From: q66 Date: Sat, 10 Sep 2022 13:46:55 +0000 Subject: [PATCH 1285/1407] boost: also disable long double stuff on ppcle --- srcpkgs/boost/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index ea11e85a7080..57ad72b545f9 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -51,7 +51,7 @@ subpackages="libboost_program_options1.80 libboost_math_c99f1.80 # this does not affect musl (where long double is 64-bit) # case "$XBPS_TARGET_MACHINE" in - ppc64le|ppc64|ppc) ;; + ppc64le|ppc64|ppc|ppcle) ;; *) subpackages+=" libboost_math_c99l1.80 libboost_math_tr1l1.80";; esac From 379e16509884145e8a5510f877add6adb70c2ee9 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 10 Sep 2022 17:01:16 +0200 Subject: [PATCH 1286/1407] perl-Exporter-Tiny: update to 1.004001. --- srcpkgs/perl-Exporter-Tiny/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Exporter-Tiny/template b/srcpkgs/perl-Exporter-Tiny/template index 31b4e80ce160..cdf0049e455f 100644 --- a/srcpkgs/perl-Exporter-Tiny/template +++ b/srcpkgs/perl-Exporter-Tiny/template @@ -1,6 +1,6 @@ # Template file for 'perl-Exporter-Tiny' pkgname=perl-Exporter-Tiny -version=1.004000 +version=1.004001 revision=1 wrksrc="Exporter-Tiny-${version}" build_style=perl-module @@ -12,4 +12,4 @@ maintainer="Leah Neukirchen " homepage="https://metacpan.org/release/Exporter-Tiny" license="Artistic-1.0-Perl, GPL-1.0-or-later" distfiles="${CPAN_SITE}/Exporter/Exporter-Tiny-${version}.tar.gz" -checksum=7f7b3b4fbe923355317243cd434d2319ffbad81c98cf8c8e189a6943b42bfeca +checksum=4cb9c2676f34e32bd987bd7880b06a2475b530c77606c3c2bed255f904d1825b From 26600bbabe49c586ab5fc71bca078b6cbe56d3ee Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 10 Sep 2022 17:02:27 +0200 Subject: [PATCH 1287/1407] python3-pipenv: update to 2022.9.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 02b930df57ea..5bb6859086f9 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.8.24 +version=2022.9.8 revision=1 wrksrc="pipenv-${version}" build_style=python3-pep517 @@ -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=edbff81766d4328115b28738df0e5240cb2299a34ff0c60d524ad2855df18c69 +checksum=b6dfff06dea56e3bade92fc267c2da1f0807c5c7b0903eef6115fdb899c2b4b6 conflicts="python-pipenv>=0" make_check=no # tests are not contained in release tarball From 56a68fbc576ddf29303cab4dff3900af3be29017 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 10 Sep 2022 17:03:15 +0200 Subject: [PATCH 1288/1407] python3-boto3: update to 1.24.70. --- 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 c57a02f2fc2f..fce7f778a064 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.33 +version=1.24.70 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=873369a6b11334756f38ca0f310104e83c793c64a95d3b75581f2792582650d3 +checksum=36b10590e30ea8edb0745b3c44b5b14b79de86c5cc3323ede5ca71cc7be70d33 post_install() { vlicense LICENSE From 315a10d2ed4683e8951fb1459f89e4fce9a22df0 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 10 Sep 2022 17:07:27 +0200 Subject: [PATCH 1289/1407] rsync: update to 3.2.6. --- srcpkgs/rsync/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template index d1f275ffc2ac..d8bf5bb6f2ec 100644 --- a/srcpkgs/rsync/template +++ b/srcpkgs/rsync/template @@ -1,6 +1,6 @@ # Template file for 'rsync' pkgname=rsync -version=3.2.5 +version=3.2.6 revision=1 build_style=gnu-configure configure_args="--with-included-zlib=no --with-rrsync" @@ -14,7 +14,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=2ac4d21635cdf791867bc377c35ca6dda7f50d919a58be45057fd51600c69aba +checksum=fb3365bab27837d41feaf42e967c57bd3a47bc8f10765a3671efd6a3835454d3 # Force enable IPv6 on musl - upstream bug https://bugzilla.samba.org/show_bug.cgi?id=10715 CFLAGS="-DINET6" From 15db0f4322c5e61a3b3f468666a5636d1b6dd697 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 10 Sep 2022 17:08:52 +0200 Subject: [PATCH 1290/1407] xdaliclock: update to 2.47. --- srcpkgs/xdaliclock/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdaliclock/template b/srcpkgs/xdaliclock/template index a5b052e0373e..26fddf312842 100644 --- a/srcpkgs/xdaliclock/template +++ b/srcpkgs/xdaliclock/template @@ -1,6 +1,6 @@ # Template file for 'xdaliclock' pkgname=xdaliclock -version=2.46 +version=2.47 revision=1 build_wrksrc=X11 build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="X11" homepage="http://www.jwz.org/xdaliclock/" distfiles="http://www.jwz.org/xdaliclock/xdaliclock-${version}.tar.gz" -checksum=320b49e673068697d2ac6dd84771f243bda215305817285fc21e52efc24162e4 +checksum=d4992ff62ba5bf263e6f92abc83afcb3ebfc2d4f7985c562ecf250b0bd6b50be do_install() { make install install_prefix=${DESTDIR} From c3c2521a19fc7edec56fb03834c37ca235c08462 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 10 Sep 2022 18:03:26 +0200 Subject: [PATCH 1291/1407] xscreensaver: update to 6.05. --- srcpkgs/xscreensaver/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template index 723bccd5460c..6c20aa4379d7 100644 --- a/srcpkgs/xscreensaver/template +++ b/srcpkgs/xscreensaver/template @@ -1,15 +1,15 @@ # Template file for 'xscreensaver' pkgname=xscreensaver -version=6.04 -revision=3 +version=6.05 +revision=1 build_style=gnu-configure configure_args="--with-pam --with-login-manager --includedir=${XBPS_CROSS_BASE}/include --libdir=${XBPS_CROSS_BASE}/lib" conf_files="/etc/pam.d/xscreensaver" -hostmakedepends="bc intltool pkg-config" +hostmakedepends="bc glib-devel intltool pkg-config" makedepends="glu-devel libXi-devel libXinerama-devel libXmu-devel libXpm-devel - libXrandr-devel libglade-devel pam-devel gdk-pixbuf-xlib-devel elogind-devel" + libXrandr-devel pam-devel gdk-pixbuf-xlib-devel elogind-devel gtk+3-devel" depends="perl perl-LWP" short_desc="Screen saver and locker for the X Window System" maintainer="Leah Neukirchen " @@ -17,7 +17,7 @@ license="MIT" homepage="https://www.jwz.org/xscreensaver/" changelog="https://www.jwz.org/xscreensaver/changelog.html" distfiles="https://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz" -checksum=787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152 +checksum=659334aef54297f4dd7e1c7d5be8ec073b0d0b76ccd2ef0bcaca817476a38195 # marbling.c: In function 'fade': incompatible type for argument 1 of 'vqdmulhq_s16' CFLAGS=-flax-vector-conversions From 2b2677f0d461bd9f1da92f5d956a61ac8c364636 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 10 Sep 2022 18:16:31 +0200 Subject: [PATCH 1292/1407] xscreensaver: update to 6.05. --- srcpkgs/xscreensaver/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template index 6c20aa4379d7..b68dd1b2fa3b 100644 --- a/srcpkgs/xscreensaver/template +++ b/srcpkgs/xscreensaver/template @@ -28,7 +28,7 @@ pre_configure() { do_install() { vmkdir etc/pam.d - make install_prefix=${DESTDIR} install + make install_prefix=${DESTDIR} GTK_DATADIR=/usr/share install rm ${DESTDIR}/usr/share/man/man6/xscreensaver-systemd.6 ln -s /usr/libexec/xscreensaver/xscreensaver-text ${DESTDIR}/usr/bin/xscreensaver-text echo "NotShowIn=KDE;GNOME;" >> ${DESTDIR}/usr/share/applications/xscreensaver-settings.desktop From a135c58304f1e129466223861cccd07976ddab0a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 10 Sep 2022 18:28:13 +0200 Subject: [PATCH 1293/1407] New package: fontmatrix-0.9.100 --- srcpkgs/fontmatrix/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/fontmatrix/template diff --git a/srcpkgs/fontmatrix/template b/srcpkgs/fontmatrix/template new file mode 100644 index 000000000000..6ff4e79767db --- /dev/null +++ b/srcpkgs/fontmatrix/template @@ -0,0 +1,21 @@ +# Template file for 'fontmatrix' +pkgname=fontmatrix +version=0.9.100 +revision=1 +build_style=cmake +hostmakedepends="qt5-host-tools qt5-qmake qt5-tools" +makedepends="qt5-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql + qt5-plugin-sqlite qt5-plugin-tds qt5-svg-devel qt5-tools-devel + qt5-webkit-devel" +short_desc="Font management application" +maintainer="Leah Neukirchen " +license="GPL-2.0-or-later" +homepage="https://github.com/fontmatrix/fontmatrix" +#changelog="" +distfiles="https://github.com/fontmatrix/fontmatrix/archive/refs/tags/v${version}.tar.gz" +checksum=241021e24b0e2cdbc4bdf516d41ddfd23675a5a098bdaa0f7564d866cd292659 + +if [ "$XBPS_TARGET_LIBC" = musl ]; then + makedepends+=" libexecinfo-devel" + configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo" +fi From c3314f236779aab5c4e584445c2790cbc06f04ff Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 10 Sep 2022 12:05:36 -0500 Subject: [PATCH 1294/1407] xmandump: update to 0.2.4. --- srcpkgs/xmandump/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template index 11d3fdcc06d8..399d881150b6 100644 --- a/srcpkgs/xmandump/template +++ b/srcpkgs/xmandump/template @@ -1,7 +1,7 @@ # Template file for 'xmandump' pkgname=xmandump -version=0.2.3 -revision=2 +version=0.2.4 +revision=1 build_style=go go_import_path="github.com/void-linux/xmandump" go_package="${go_import_path}/cmd/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=d8c356bd2722558e9bfe1e55aefc0c44f6aecb52e998f4e7608e544a90cd6d89 +checksum=4544b52dc9a6c2057593f3579dfe284e305d72e1fbfee6cc622f0c7616261042 post_install() { vlicense LICENSE.txt LICENSE From 7c1e63eff2a8d3a8cc2819f0cb65d36ee865f20a Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sat, 10 Sep 2022 13:24:58 -0500 Subject: [PATCH 1295/1407] ghostwriter: update to 2.1.5. --- srcpkgs/ghostwriter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template index 1819e06fdfc7..f6c46b86756f 100644 --- a/srcpkgs/ghostwriter/template +++ b/srcpkgs/ghostwriter/template @@ -1,6 +1,6 @@ # Template file for 'ghostwriter' pkgname=ghostwriter -version=2.1.4 +version=2.1.5 revision=1 build_style=qmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" @@ -12,7 +12,7 @@ maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="http://wereturtle.github.io/ghostwriter" distfiles="https://github.com/wereturtle/ghostwriter/archive/${version}.tar.gz" -checksum=cbc1b06c5725031d147869c22bad4c263d67e87e5b3284c5cbfe35af2f29dcde +checksum=e35e31c6544280e77c6e58f86c4b36acbc64f4aaccd21a8c67409411125857e4 case "$XBPS_TARGET_MACHINE" in armv5tel*) broken="qtwebengine not built for this platform";; From d135cd40c9991a2181e3a25c23670c3e751dc7be Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 8 Sep 2022 14:02:35 -0500 Subject: [PATCH 1296/1407] surgescript: update to 0.5.6. --- common/shlibs | 2 +- srcpkgs/surgescript/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 3654a4e81c0a..de889fceaf6c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -838,7 +838,7 @@ liblua5.1.so.5.1 lua51-5.1.5_1 liblua5.2.so.5.2 lua52-5.2.4_2 liblua5.3.so.5.3 lua53-5.3.5_4 liblua5.4.so.5.4 lua54-5.4.0_1 -libsurgescript.so.0.5.5 surgescript-0.5.5_1 +libsurgescript.so.0.5.6 surgescript-0.5.6_1 libburn.so.4 libburn-0.7.2_1 libKF5Auth.so.5 kauth-5.26.0_1 libKF5AuthCore.so.5 kauth-5.56.0_1 diff --git a/srcpkgs/surgescript/template b/srcpkgs/surgescript/template index 771677d82d98..3206b3813f00 100644 --- a/srcpkgs/surgescript/template +++ b/srcpkgs/surgescript/template @@ -1,6 +1,6 @@ # Template file for 'surgescript' pkgname=surgescript -version=0.5.5 +version=0.5.6 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -9,7 +9,7 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://opensurge2d.org/" distfiles="http://github.com/alemart/surgescript/archive/v${version}.tar.gz" -checksum=c9f59131d5cd921a11fb1335fe93bd754f4b1eefa1ed95aaa0343a28437f3f78 +checksum=c72274c6a055d863c9f6cbc278ddd5c2fffc02203fc322ac970d97dfe165186f surgescript-devel_package() { short_desc+=" - development files" From 96130405373b7a96cb7df19ed71ff32033a3b583 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 8 Sep 2022 14:02:43 -0500 Subject: [PATCH 1297/1407] opensurge: update to 0.6.0.1. --- srcpkgs/opensurge/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template index f39fb0028075..a055cf2fa347 100644 --- a/srcpkgs/opensurge/template +++ b/srcpkgs/opensurge/template @@ -1,6 +1,6 @@ # Template file for 'opensurge' pkgname=opensurge -version=0.5.2.1 +version=0.6.0.1 revision=1 build_style=cmake hostmakedepends="surgescript pkg-config" @@ -10,7 +10,7 @@ maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="https://opensurge2d.org/" distfiles="https://github.com/alemart/opensurge/archive/v${version}.tar.gz" -checksum=27764a82d97b54026c90044fbc31ea4a61f7836568020b869e63376322a155af +checksum=9f025deed0af0192a759508aac40e3e4e1171a53804beae878a1d03da3d011c5 replaces="opensurge-data>=0" pre_configure() { From e323cdec1cfe7d4e499b53c69a0f64a78cc9c418 Mon Sep 17 00:00:00 2001 From: q66 Date: Sat, 10 Sep 2022 18:57:37 +0000 Subject: [PATCH 1298/1407] rstudio: fix build --- srcpkgs/rstudio/patches/fix-build.patch | 34 +++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 srcpkgs/rstudio/patches/fix-build.patch diff --git a/srcpkgs/rstudio/patches/fix-build.patch b/srcpkgs/rstudio/patches/fix-build.patch new file mode 100644 index 000000000000..da91b9baf593 --- /dev/null +++ b/srcpkgs/rstudio/patches/fix-build.patch @@ -0,0 +1,34 @@ +Ref: https://www.mail-archive.com/commit@lists.opensuse.org/msg43991.html + +From 872e2806f74e922a25e0f9586faa6624883728ca Mon Sep 17 00:00:00 2001 +From: Kevin Ushey +Date: Wed, 21 Jul 2021 19:56:34 -0700 +Subject: [PATCH] support compilation with r-devel + +--- + src/cpp/r/session/RSession.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/cpp/r/session/RSession.cpp b/src/cpp/r/session/RSession.cpp +index 0066a61c1b6..6c5f986f6a0 100644 +--- a/src/cpp/r/session/RSession.cpp ++++ b/src/cpp/r/session/RSession.cpp +@@ -68,6 +68,9 @@ + + #include + ++extern "C" { ++int Rf_countContexts(int, int); ++} + #define CTXT_BROWSER 16 + + // get rid of windows TRUE and FALSE definitions +@@ -493,7 +496,7 @@ bool isSuspendable(const std::string& currentPrompt) + + return true; + } +- ++ + + bool browserContextActive() + { From c60f539c068e8330bb14e7f5f1d80460823fd36f Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Sat, 10 Sep 2022 20:37:14 +0200 Subject: [PATCH 1299/1407] gdu: update to 5.16.0. --- srcpkgs/gdu/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template index 0746e56c151f..1e80647aa231 100644 --- a/srcpkgs/gdu/template +++ b/srcpkgs/gdu/template @@ -1,6 +1,6 @@ # Template file for 'gdu' pkgname=gdu -version=5.15.0 +version=5.16.0 revision=1 build_style=go go_import_path="github.com/dundee/gdu/v5/cmd/gdu" @@ -11,7 +11,7 @@ maintainer="Daniel Lewan " license="MIT" homepage="https://github.com/dundee/gdu" distfiles="https://github.com/dundee/gdu/archive/v${version}.tar.gz" -checksum=4cbbaea0bc46853bde0508b8a9c5f9fdc95dd45ff21a2eb5c5adeb9917cb95b3 +checksum=266bd635d3b5a676f23dd0a9a599d7eb54ac56d5b6aa4ace044b9a3763cf9783 post_install() { vman gdu.1 From 632069568d2c7080e8fe9b5c07cf0fef11bde4b2 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 24 Jul 2022 19:18:53 -0700 Subject: [PATCH 1300/1407] New package: power-profiles-daemon-0.12. --- .../files/power-profiles-daemon/run | 2 ++ srcpkgs/power-profiles-daemon/template | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run create mode 100644 srcpkgs/power-profiles-daemon/template diff --git a/srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run b/srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run new file mode 100644 index 000000000000..d34cc6b20a29 --- /dev/null +++ b/srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/libexec/power-profiles-daemon diff --git a/srcpkgs/power-profiles-daemon/template b/srcpkgs/power-profiles-daemon/template new file mode 100644 index 000000000000..07dc66d6818d --- /dev/null +++ b/srcpkgs/power-profiles-daemon/template @@ -0,0 +1,23 @@ +# Template file for 'power-profiles-daemon' +pkgname=power-profiles-daemon +version=0.12 +revision=1 +build_style=meson +configure_args="-Dsystemdsystemunitdir=/usr/lib/systemd/system/" +hostmakedepends="pkg-config glib-devel" +makedepends="libglib-devel libgudev-devel upower0-devel polkit-devel" +checkdepends="python3-dbusmock umockdev-devel" +short_desc="Makes power profiles handling available over D-Bus" +maintainer="oreo639 " +license="GPL-3.0-or-later" +homepage="https://gitlab.freedesktop.org/hadess/power-profiles-daemon" +distfiles="https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/archive/${version}/power-profiles-daemon-${version}.tar.gz" +checksum=4c01dc51cd734403af868cff2d13923c83076c477d7f02c601f3a5127dd82a18 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -Dtests=true" +fi + +post_install() { + vsv power-profiles-daemon +} From 72f6b32f87ac13459192a44b1f8429ba1af12e39 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 10 Sep 2022 15:40:01 -0500 Subject: [PATCH 1301/1407] xmandump: update to 0.2.5. --- srcpkgs/xmandump/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template index 399d881150b6..59ad9180aeee 100644 --- a/srcpkgs/xmandump/template +++ b/srcpkgs/xmandump/template @@ -1,6 +1,6 @@ # Template file for 'xmandump' pkgname=xmandump -version=0.2.4 +version=0.2.5 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=4544b52dc9a6c2057593f3579dfe284e305d72e1fbfee6cc622f0c7616261042 +checksum=262e17f4da48fea1feead4a7a9827f2d44efde4bbe0d149a725674e118eabf69 post_install() { vlicense LICENSE.txt LICENSE From 1bcbeff2294b1d76519a9eec28d1da460586a0ad Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 10 Sep 2022 15:57:03 +0300 Subject: [PATCH 1302/1407] skype: update to 8.88.0.401. --- srcpkgs/skype/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index 75372bd40651..a0fc9ca58c17 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.87.0.406 +version=8.88.0.401 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=31ef8d78d729b1acf4897126454f79e8aa55a8b274643aa3d9114bb24639a814 +checksum=f51876283dffef982d930eeb9e5d683bcf7d003e2dd7b19506b67730c70808f3 repository="nonfree" nostrip="yes" From 84839ed033741306e43338a7bb106bef5c1c5d7b Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 10 Sep 2022 15:17:52 +0300 Subject: [PATCH 1303/1407] opera: update to 90.0.4480.84. --- srcpkgs/opera/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index 7c329d0a8da0..a004a82a051a 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=90.0.4480.54 +version=90.0.4480.84 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=dd9c2b049e0c2180435c68264f87e3f046f07828014a1444de88322510bafd45 +checksum=b541d6e6d336da9ff0561f494e61f4f5e712eaea744852c3591aca8c4d79ff03 repository="nonfree" nostrip=yes From d7ab2cb470aee3b63b0874cb892b9567183c9186 Mon Sep 17 00:00:00 2001 From: lemmi Date: Sat, 10 Sep 2022 22:46:11 +0200 Subject: [PATCH 1304/1407] libmysofa: update to 1.2.1. --- srcpkgs/libmysofa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libmysofa/template b/srcpkgs/libmysofa/template index 0413c645f0f5..eb6e322dc543 100644 --- a/srcpkgs/libmysofa/template +++ b/srcpkgs/libmysofa/template @@ -1,6 +1,6 @@ # Template file for 'libmysofa' pkgname=libmysofa -version=1.2 +version=1.2.1 revision=1 build_style=cmake configure_args="-DBUILD_TESTS=OFF" @@ -11,7 +11,7 @@ maintainer="lemmi " license="BSD-3-Clause" homepage="https://github.com/hoene/libmysofa" distfiles="https://github.com/hoene/libmysofa/archive/v${version}.tar.gz" -checksum=7638dec8ba2b5408cf32ab41d37cb29460095c4b2161a860480c122e71806ba9 +checksum=94cb02e488de4dc0860c8d23b29d93d290bb0a004d4aa17e1642985bba158ee9 post_install() { vlicense LICENSE From 3dcc7ef9ddc5454ba140c00c677847e3855a3e31 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 10 Sep 2022 16:27:41 +0200 Subject: [PATCH 1305/1407] gtk4: update to 4.8.0. * move more example applications to -demo * move build tools to -devel now the gtk4 package is 19MB when installed instead of 42MB --- srcpkgs/gtk4/template | 51 +++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index 03aa34b7e52d..242ebffea6c4 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,6 +1,6 @@ # Template file for 'gtk4' pkgname=gtk4 -version=4.6.7 +version=4.8.0 revision=1 wrksrc="gtk-${version}" build_style=meson @@ -30,9 +30,10 @@ short_desc="GIMP ToolKit (v4)" maintainer="Michal Vasilek " license="LGPL-2.1-or-later" homepage="https://www.gtk.org/" -changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-6/NEWS" +#changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-8/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/main/NEWS" distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz" -checksum=effd2e7c4b5e2a5c7fad43e0f24adea68baa4092abb0b752caff278e6bb010e8 +checksum=c8d6203437d1e359d83124dc591546d403f67e3b00544e53dd50a9baacdcbd7f # Package build options build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker" @@ -59,6 +60,13 @@ gtk4-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { + vmove usr/bin/gtk4-builder-tool + vmove usr/share/man/man1/gtk4-builder-tool.1 + vmove usr/bin/gtk4-encode-symbolic-svg + vmove usr/share/man/man1/gtk4-encode-symbolic-svg.1 + vmove usr/bin/gtk4-query-settings + vmove usr/share/man/man1/gtk4-query-settings.1 + vmove usr/share/gtk-4.0/valgrind vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" @@ -71,29 +79,44 @@ gtk4-devel_package() { gtk4-demo_package() { short_desc+=" - demonstration application" pkg_install() { - vmove usr/bin/gtk4-demo - vmove usr/bin/gtk4-widget-factory - vmove usr/bin/gtk4-demo-application - vmove usr/share/gtk-4.0/gtk4builder.rng - vmove usr/share/glib-2.0/schemas/org.gtk.Demo4.gschema.xml - # gtk3-icon-browser is in main package, # keep gtk4-icon-browser in main package too - vmove usr/share/man/man1/gtk4-demo-application.1 + vmove usr/bin/gtk4-demo vmove usr/share/applications/org.gtk.Demo4.desktop + vmove usr/share/glib-2.0/schemas/org.gtk.Demo4.gschema.xml vmove usr/share/icons/hicolor/scalable/apps/org.gtk.Demo4.svg vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.Demo4-symbolic.svg vmove usr/share/man/man1/gtk4-demo.1 + vmove usr/share/metainfo/org.gtk.Demo4.appdata.xml + + vmove usr/share/gtk-4.0/gtk4builder.rng + + vmove usr/bin/gtk4-demo-application + vmove usr/share/man/man1/gtk4-demo-application.1 + + vmove usr/bin/gtk4-widget-factory + vmove usr/share/man/man1/gtk4-widget-factory.1 + vmove usr/share/applications/org.gtk.WidgetFactory4.desktop + vmove usr/share/icons/hicolor/scalable/apps/org.gtk.WidgetFactory4.svg + vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg + vmove usr/share/metainfo/org.gtk.WidgetFactory4.appdata.xml + vmove usr/bin/gtk4-print-editor vmove usr/share/applications/org.gtk.PrintEditor4.desktop vmove usr/share/icons/hicolor/scalable/apps/org.gtk.PrintEditor4.svg vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.PrintEditor4-symbolic.svg vmove usr/share/icons/hicolor/scalable/apps/org.gtk.PrintEditor4.Devel.svg - vmove usr/share/applications/org.gtk.WidgetFactory4.desktop - vmove usr/share/icons/hicolor/scalable/apps/org.gtk.WidgetFactory4.svg - vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg - vmove usr/share/man/man1/gtk4-widget-factory.1 + vmove usr/share/metainfo/org.gtk.PrintEditor4.appdata.xml + + vmove usr/bin/gtk4-node-editor + vmove usr/share/applications/org.gtk.gtk4.NodeEditor.desktop + vmove usr/share/icons/hicolor/scalable/apps/org.gtk.gtk4.NodeEditor.Devel.svg + vmove usr/share/icons/hicolor/scalable/apps/org.gtk.gtk4.NodeEditor.svg + vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.gtk4.NodeEditor-symbolic.svg + vmove usr/share/man/man1/gtk4-node-editor.1 + vmove usr/share/metainfo/org.gtk.gtk4.NodeEditor.appdata.xml + } } From b54a00d3dafd16cd5e926b4cccb6f395244523e1 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Sat, 10 Sep 2022 16:55:45 -0400 Subject: [PATCH 1306/1407] gotify-server: update to 2.1.6. --- srcpkgs/gotify-server/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template index d48b32a2a843..59cd68e1a650 100644 --- a/srcpkgs/gotify-server/template +++ b/srcpkgs/gotify-server/template @@ -1,7 +1,7 @@ # Template file for 'gotify-server' pkgname=gotify-server -version=2.1.5 -revision=2 +version=2.1.6 +revision=1 wrksrc="server-$version" build_style=go go_import_path="github.com/gotify/server/v2" @@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer " license="MIT" homepage="https://gotify.net" distfiles="https://github.com/gotify/server/archive/v${version}.tar.gz" -checksum=ca5724a7782fbb297ba28952790f6a31688c0944acd463192f0ce570a37df039 +checksum=16df2f979b0a8cb0875dc30faf6c588263a43f30d6383ef86763aaa49be97af3 conf_files="/etc/gotify/config.yml" system_accounts="_gotify" From 2cff8c8ad257d8f44bc3ef3ef287b0c08811aa66 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sat, 10 Sep 2022 22:59:39 +0200 Subject: [PATCH 1307/1407] bat: update to 0.22.1 --- srcpkgs/bat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template index 9c172d7dac8c..5714d4199572 100644 --- a/srcpkgs/bat/template +++ b/srcpkgs/bat/template @@ -1,6 +1,6 @@ # Template file for 'bat' pkgname=bat -version=0.22.0 +version=0.22.1 revision=1 build_style=cargo hostmakedepends="cmake llvm clang" @@ -11,7 +11,7 @@ license="Apache-2.0, MIT" homepage="https://github.com/sharkdp/bat" changelog="https://raw.githubusercontent.com/sharkdp/bat/master/CHANGELOG.md" distfiles="https://github.com/sharkdp/bat/archive/refs/tags/v${version}.tar.gz" -checksum=bec63bffc315bda7b65d472a19833e14bbaff4d251cedf8bfc77c82a00b77bfc +checksum=25e45debf7c86794281d63a51564feefa96fdfdf575381e3adc5c06653ecaeca # skip problematic doctests on i686 case "$XBPS_TARGET_MACHINE" in From 0fdcfd2940266e5a81ddc9b56b3a398b2dca9287 Mon Sep 17 00:00:00 2001 From: lonxwolx Date: Tue, 6 Sep 2022 12:43:28 +0800 Subject: [PATCH 1308/1407] betterlockscreen: update to 4.0.4. betterlockscreen: update to 4.0.4 --- srcpkgs/betterlockscreen/patches/use-loginctl.patch | 8 +++----- srcpkgs/betterlockscreen/template | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/srcpkgs/betterlockscreen/patches/use-loginctl.patch b/srcpkgs/betterlockscreen/patches/use-loginctl.patch index b2f67eb8bdb7..fbee7bb3b249 100644 --- a/srcpkgs/betterlockscreen/patches/use-loginctl.patch +++ b/srcpkgs/betterlockscreen/patches/use-loginctl.patch @@ -1,12 +1,10 @@ --- a/betterlockscreen +++ b/betterlockscreen -@@ -965,6 +965,6 @@ done +@@ -968,6 +968,6 @@ echof header "Betterlockscreen" # Activate lockscreen [[ $runsuspend ]] || lockargs+=(-n) [[ $runlock ]] && lockselect "$lockstyle" && \ - { [[ $runsuspend ]] && systemctl suspend; } + { [[ $runsuspend ]] && loginctl suspend; } - --exit 0 -\ No newline at end of file -+exit 0 + + exit 0 diff --git a/srcpkgs/betterlockscreen/template b/srcpkgs/betterlockscreen/template index 5de5ae4c67b6..2052595c5b40 100644 --- a/srcpkgs/betterlockscreen/template +++ b/srcpkgs/betterlockscreen/template @@ -1,14 +1,14 @@ # Template file for 'betterlockscreen' pkgname=betterlockscreen -version=4.0.3 -revision=2 +version=4.0.4 +revision=1 depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb xset" short_desc="Sweet looking lockscreen for linux system" maintainer="Aleksander Zien " license="MIT" homepage="https://github.com/pavanjadhaw/betterlockscreen" distfiles="https://github.com/pavanjadhaw/betterlockscreen/archive/refs/tags/v${version}.tar.gz" -checksum=d96fd64f1c94c91fec5d26b9665ba68f7f130c8a8612978ad9edbfa859710671 +checksum=608b56989eea0b45c0f88bdc9e3c7742430f809a1bcd60d558eb6af99aeecc91 do_install() { vbin betterlockscreen From da2d226f321c081eeda882b32a39da673dd275ac Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 10 Sep 2022 16:15:02 +0300 Subject: [PATCH 1309/1407] stremio-shell: update to 4.4.159. --- srcpkgs/stremio-shell/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template index 5e74be56b18e..5e498162abdf 100644 --- a/srcpkgs/stremio-shell/template +++ b/srcpkgs/stremio-shell/template @@ -1,8 +1,8 @@ # Template file for 'stremio-shell' pkgname=stremio-shell -version=4.4.142 -revision=3 -_singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8 +version=4.4.159 +revision=1 +_singleapplication_hash=f1e15081dc57a9c03f7f4f165677f18802e1437a _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef build_style=qmake hostmakedepends="qt5-host-tools qt5-qmake" @@ -20,11 +20,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz https://dl.strem.io/four/v${version}/server.js https://dl.strem.io/four/v${version}/stremio.asar" -checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab - b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32 +checksum="aca0e5bf026e31399571f5cdc1485cbb2540e7ad7b981f10adb0e87ee47b9af5 + ddab4bec60e4221580f8bb65ac200619bd2d1c9144a8ac7dccc0c78ea4667dc2 e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4 - 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b - 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c" + c31c98fe4cd8158523c45685ba2a949cffd3fc0f06dffef66797d07e3a2bbbee + d01ba5d69cf0e94f3d44c8e4ed5b10eaab67e83398a7d86f86f378ade59cf8f9" skip_extraction="server.js stremio.asar" post_extract() { From 901247dbe28e4131529de820b24740b233e48e17 Mon Sep 17 00:00:00 2001 From: Costea Adrian Nicolae Date: Sat, 10 Sep 2022 23:27:43 +0300 Subject: [PATCH 1310/1407] libXft: update to 2.3.6 --- srcpkgs/libXft/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template index 263597769d19..f4600e648680 100644 --- a/srcpkgs/libXft/template +++ b/srcpkgs/libXft/template @@ -1,6 +1,6 @@ # Template file for 'libXft' pkgname=libXft -version=2.3.4 +version=2.3.6 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel" short_desc="Library for configuring and customizing font access" maintainer="Orphaned " license="MIT" -homepage="https://www.x.org" -distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2" -checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd +homepage="https://gitlab.freedesktop.org/xorg/lib/libxft" +distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.gz" +checksum=b7e59f69e0bbabe9438088775f7e5a7c16a572e58b11f9722519385d38192df5 post_install() { vlicense COPYING From 5a9dd61531dc34862fcf2d47aa05398ded0b046b Mon Sep 17 00:00:00 2001 From: icp Date: Wed, 7 Sep 2022 14:45:59 +0530 Subject: [PATCH 1311/1407] python3-bottle: update to 0.12.23. --- srcpkgs/python3-bottle/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-bottle/template b/srcpkgs/python3-bottle/template index fd54b47fde51..fa7856f3e4d7 100644 --- a/srcpkgs/python3-bottle/template +++ b/srcpkgs/python3-bottle/template @@ -1,17 +1,20 @@ # Template file for 'python3-bottle' pkgname=python3-bottle -version=0.12.19 -revision=2 +version=0.12.23 +revision=1 wrksrc="bottle-${version}" build_style=python3-module +make_check_args="--deselect test/test_sendfile.py::TestSendFile::test_invalid" hostmakedepends="python3-setuptools" depends="python3" +checkdepends="${depends} python3-Mako python3-Jinja2 python3-pytest-xdist" short_desc="Fast and simple WSGI-framework for small web-applications (Python3)" maintainer="Aluísio Augusto Silva Gonçalves " license="MIT" -homepage="http://bottlepy.org" +homepage="https://bottlepy.org" +changelog="https://raw.githubusercontent.com/bottlepy/bottle/master/docs/changelog.rst" distfiles="${PYPI_SITE}/b/bottle/bottle-${version}.tar.gz" -checksum=a9d73ffcbc6a1345ca2d7949638db46349f5b2b77dac65d6494d45c23628da2c +checksum=683de3aa399fb26e87b274dbcf70b1a651385d459131716387abdc3792e04167 post_install() { vlicense LICENSE From 20c5ea25cee5fd894d18f5c362478b19b261e60c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 10 Sep 2022 20:45:13 +0200 Subject: [PATCH 1312/1407] polari: fix dependencies * remove mozjs78 from checkdepends - polari only needs mozjs because of gjs and gjs already depends on mozjs (currently v91) * add missing, drop unused dependencies * use the gir build helper --- srcpkgs/polari/template | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template index 53233e83acd3..8471ee141e0f 100644 --- a/srcpkgs/polari/template +++ b/srcpkgs/polari/template @@ -1,13 +1,13 @@ # Template file for 'polari' pkgname=polari version=41.0 -revision=1 +revision=2 build_style=meson -hostmakedepends="pkg-config itstool gobject-introspection gettext glib-devel" -makedepends="gjs-devel gspell-devel gtk+3-devel libsecret-devel - libsoup-gnome-devel telepathy-glib-devel telepathy-logger-devel" -depends="gspell telepathy-idle telepathy-logger telepathy-mission-control" -checkdepends="appstream-glib desktop-file-utils mozjs78" +build_helper="gir" +hostmakedepends="pkg-config itstool gettext glib-devel" +makedepends="gjs-devel telepathy-logger-devel telepathy-glib-devel" +depends="telepathy-logger telepathy-glib libsecret gtk4" +checkdepends="appstream-glib desktop-file-utils" short_desc="GNOME IRC client" maintainer="Orphaned " license="GPL-2.0-or-later" @@ -15,7 +15,3 @@ 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 - -if [ "$CROSS_BUILD" ] ; then - hostmakedepends+=" glib-devel prelink-cross qemu-user-static" -fi From a87dd1f3ed4689031e8a92cf22205cf2476fa266 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 25 Jul 2022 17:38:55 +0200 Subject: [PATCH 1313/1407] hooks/99-pkglint.sh: error if /usr/share/man/man/ is used --- common/hooks/pre-pkg/99-pkglint.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh index 7e40e81f2b42..0042f0cca007 100644 --- a/common/hooks/pre-pkg/99-pkglint.sh +++ b/common/hooks/pre-pkg/99-pkglint.sh @@ -108,6 +108,11 @@ hook() { error=1 fi + if [[ -d ${PKGDESTDIR}/usr/share/man/man ]]; then + msg_red "${pkgver}: /usr/share/man/man is forbidden, use /usr/share/man.\n" + error=1 + fi + if [ -d ${PKGDESTDIR}/usr/doc ]; then msg_red "${pkgver}: /usr/doc is forbidden. Use /usr/share/doc.\n" error=1 From 9d9be9bdb9446ee4e82a1be469752f1d6d83148a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 25 Jul 2022 17:39:27 +0200 Subject: [PATCH 1314/1407] coturn: fix man page paths Use build_style=configure as this is not a gnu-configure script. Specifically the --manprefix argument works different in gnu configure. --- srcpkgs/coturn/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template index edfb526f4967..b55bd58fdb22 100644 --- a/srcpkgs/coturn/template +++ b/srcpkgs/coturn/template @@ -1,9 +1,12 @@ # Template file for 'coturn' pkgname=coturn version=4.5.1.3 -revision=3 -build_style=gnu-configure -configure_args="--libdir=/usr/lib" +revision=4 +build_style=configure +configure_args=" + --prefix=/usr + --manprefix=/usr/share + --sysconfdir=/etc" conf_files="/etc/turnserver.conf" makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel postgresql-libs-devel libmariadbclient-devel" From 9ba4b499a4ba74845a2ff123250d60e04d6b54ed Mon Sep 17 00:00:00 2001 From: icp Date: Wed, 7 Sep 2022 21:52:30 +0530 Subject: [PATCH 1315/1407] python3-pyppmd: update to 1.0.0. --- srcpkgs/python3-pyppmd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template index 649457c535c7..353358d46d74 100644 --- a/srcpkgs/python3-pyppmd/template +++ b/srcpkgs/python3-pyppmd/template @@ -1,6 +1,6 @@ # Template file for 'python3-pyppmd' pkgname=python3-pyppmd -version=0.18.3 +version=1.0.0 revision=1 wrksrc="pyppmd-${version}" build_style=python3-module @@ -8,11 +8,11 @@ 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" +checkdepends="python3-pytest-xdist python3-hypothesis" short_desc="Python interface for PPM variation H and I.2" maintainer="Joel Beckmeyer " license="LGPL-2.0-or-later" homepage="https://codeberg.org/miurahr/pyppmd" changelog="https://codeberg.org/miurahr/pyppmd/raw/branch/main/Changelog.rst" distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz" -checksum=6c74ce28213044e33a595279019e8d71512d5d8188826d106df9083f2b3006c4 +checksum=075c9bd297e3b0a87dd7aeabca7fee668218acbe69ecc1c6511064558de8840f From ef7c4828e88cd9a82192f4500d08d4da770ef7d8 Mon Sep 17 00:00:00 2001 From: icp Date: Fri, 9 Sep 2022 22:16:31 +0530 Subject: [PATCH 1316/1407] ncpamixer: update to 1.3.3.3. --- srcpkgs/ncpamixer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ncpamixer/template b/srcpkgs/ncpamixer/template index 93d4b91a97e1..418126589a83 100644 --- a/srcpkgs/ncpamixer/template +++ b/srcpkgs/ncpamixer/template @@ -1,6 +1,6 @@ # Template file for 'ncpamixer' pkgname=ncpamixer -version=1.3.3.1 +version=1.3.3.3 revision=1 build_wrksrc=src build_style=cmake @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="MIT" homepage="https://github.com/fulhax/ncpamixer" distfiles="https://github.com/fulhax/ncpamixer/archive/${version}.tar.gz" -checksum=b2c797a90c92aa931052c5ac89a79fbc30f76d5e2a5b773ef68edf057c34b060 +checksum=396099897460bcde2db72134e6652fe9717375fa45300ba2251d284658d3044a post_install() { vlicense ../LICENSE From 4804307cbecfadee4a3140a99d215afdfe4a3a63 Mon Sep 17 00:00:00 2001 From: icp Date: Tue, 6 Sep 2022 21:18:24 +0530 Subject: [PATCH 1317/1407] ytcc: update to 2.6.0. --- srcpkgs/ytcc/template | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/srcpkgs/ytcc/template b/srcpkgs/ytcc/template index 99a0c9b91122..494070eb7259 100644 --- a/srcpkgs/ytcc/template +++ b/srcpkgs/ytcc/template @@ -1,19 +1,26 @@ # Template file for 'ytcc' pkgname=ytcc -version=1.8.2 -revision=5 +version=2.6.0 +revision=1 build_style=python3-module -hostmakedepends="gettext python3-setuptools" -depends="python3-SQLAlchemy python3-feedparser python3-lxml python3-youtube-dl - mpv" +hostmakedepends="python3-setuptools" +depends="mpv yt-dlp python3-click python3-wcwidth" +checkdepends="${depends} python3-pytest" short_desc="Cmdline tool to track your youtube channels" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/woefe/ytcc" distfiles="https://github.com/woefe/ytcc/archive/v${version}.tar.gz" -checksum=360db561bb0278b7f326fe3da9b012e738e1eceec9031c66b3749207f8091283 +checksum=3d69104a20b9a6861a2663a0ffcbd6054fe05a62caccf2126c0b0cf3a446dbec + +do_check() { + PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest -m "not flaky" test +} post_install() { - vinstall completions/fish/ytcc.fish 0644 usr/share/fish/vendor_completions.d - vinstall completions/zsh/_ytcc 0644 usr/share/zsh/site-functions + vcompletion scripts/completions/bash/ytcc.completion.sh bash + vcompletion scripts/completions/fish/ytcc.fish fish + vcompletion scripts/completions/zsh/_ytcc zsh + mv ${DESTDIR}/usr/bin/ytccf{.sh,} + vman doc/ytcc.1 } From 27e9f4a2231e7e259c37c9df4f9c4bc066ccbc56 Mon Sep 17 00:00:00 2001 From: ketlrznt Date: Fri, 9 Sep 2022 10:44:52 +0800 Subject: [PATCH 1318/1407] v2ray: update to 5.1.0. --- ...equest-API-changed-since-go1.17-1370.patch | 47 ------------------- srcpkgs/v2ray/template | 13 +++-- 2 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch 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 deleted file mode 100644 index 2a35b075f0a0..000000000000 --- a/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 index f1a46054c205..95a2578c44c9 100644 --- a/srcpkgs/v2ray/template +++ b/srcpkgs/v2ray/template @@ -1,19 +1,19 @@ # Template file for 'v2ray' pkgname=v2ray -version=4.44.0 +version=5.1.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 -buildid=" +go_import_path="github.com/v2fly/v2ray-core/v5" +go_ldflags="-X github.com/v2fly/v2ray-core/v5.codename=$pkgname + -X github.com/v2fly/v2ray-core/v5.version=$version + -X github.com/v2fly/v2ray-core/v5.build=$SOURCE_DATE_EPOCH -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 +checksum=b3dbd2bbee9486999b81d1968545c5a6caa7b0f4726a7259939f1bda54fcf5ea conf_files="/etc/v2ray/config.json" system_accounts="_v2ray" @@ -23,7 +23,6 @@ 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() { From 04affcbea668025411e9237380d09df364d54978 Mon Sep 17 00:00:00 2001 From: Chloris Date: Fri, 9 Sep 2022 13:31:04 +0200 Subject: [PATCH 1319/1407] luakit: update to 2.3.1. --- srcpkgs/luakit/patches/Makefile.patch | 13 +++++++------ srcpkgs/luakit/template | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/luakit/patches/Makefile.patch b/srcpkgs/luakit/patches/Makefile.patch index c1a5293e879a..f573ecc30924 100644 --- a/srcpkgs/luakit/patches/Makefile.patch +++ b/srcpkgs/luakit/patches/Makefile.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2018-12-30 16:13:10.512451500 -0600 -+++ b/Makefile 2018-12-30 16:15:27.507448741 -0600 +--- a/Makefile 2022-08-30 17:17:46.000000000 +0200 ++++ b/Makefile 2022-09-09 13:20:16.288047152 +0200 @@ -17,7 +17,7 @@ # Must be kept in sync with doc/docgen.ld DOC_SRCS = $(filter-out lib/markdown.lua lib/lousy/init.lua,$(shell for d in doc/luadoc lib common/clib; do find $$d -type f; done)) tests/lib.lua @@ -9,7 +9,7 @@ options: @echo luakit build options: -@@ -79,27 +79,10 @@ +@@ -80,28 +80,11 @@ luakit.1.gz: luakit.1 @gzip -c $< > $@ @@ -27,13 +27,14 @@ - rm -rf doc/apidocs doc/html luakit $(OBJS) $(EXT_OBJS) $(TSRC) $(THEAD) buildopts.h luakit.1 luakit.1.gz luakit.so - install: all - install -d $(DESTDIR)$(PREFIX)/share/luakit/ - install -d $(DESTDIR)$(DOCDIR) $(DESTDIR)$(DOCDIR)/classes $(DESTDIR)$(DOCDIR)/modules $(DESTDIR)$(DOCDIR)/pages + install -d $(DESTDIR)$(DOCDIR)/classes + install -d $(DESTDIR)$(DOCDIR)/modules + install -d $(DESTDIR)$(DOCDIR)/pages install -m644 README.md AUTHORS COPYING.GPLv3 $(DESTDIR)$(DOCDIR) - install -m644 doc/apidocs/classes/* $(DESTDIR)$(DOCDIR)/classes - install -m644 doc/apidocs/modules/* $(DESTDIR)$(DOCDIR)/modules - install -m644 doc/apidocs/pages/* $(DESTDIR)$(DOCDIR)/pages - install -m644 doc/apidocs/*.html $(DESTDIR)$(DOCDIR) - install -d $(DESTDIR)$(PREFIX)/share/luakit/lib $(DESTDIR)$(PREFIX)/share/luakit/lib/lousy $(DESTDIR)$(PREFIX)/share/luakit/lib/lousy/widget + install -d $(DESTDIR)$(PREFIX)/share/luakit/lib/lousy/widget install -m644 lib/*.* $(DESTDIR)$(PREFIX)/share/luakit/lib install -m644 lib/lousy/*.* $(DESTDIR)$(PREFIX)/share/luakit/lib/lousy diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template index 4fa00bb75712..efd9cb5a5106 100644 --- a/srcpkgs/luakit/template +++ b/srcpkgs/luakit/template @@ -1,7 +1,7 @@ # Template file for 'luakit' pkgname=luakit reverts="2017.08.10_1" -version=2.3 +version=2.3.1 revision=1 conf_files="/etc/xdg/luakit/*.lua" hostmakedepends="pkg-config LuaJIT" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://luakit.github.io/" changelog="https://github.com/luakit/luakit/blob/develop/CHANGELOG.md" distfiles="https://github.com/luakit/luakit/archive/${version}.tar.gz" -checksum=c7026b4f0bdfa44f43798b80f87548d3e7ad56f5b923fc43b9c712bf18496095 +checksum=138fed1eaccab801fae8c32ff2bec6cbcd864a9f527c5c77ad1de402ce1a130e CFLAGS="-fcommon" From 81dab2b8d9d0adecf9678ffd4d7f6bc8d77fdce9 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 9 Sep 2022 19:58:31 +0200 Subject: [PATCH 1320/1407] cocogitto: update to 5.2.0 --- srcpkgs/cocogitto/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template index f6d1c7423d8c..46d294f3ea8e 100644 --- a/srcpkgs/cocogitto/template +++ b/srcpkgs/cocogitto/template @@ -1,18 +1,19 @@ # Template file for 'cocogitto' pkgname=cocogitto -version=5.1.0 +version=5.2.0 revision=1 build_style=cargo build_helper=qemu hostmakedepends="pkg-config" makedepends="libgit2-devel" +depends="gnupg" short_desc="Conventional Commits toolbox" maintainer="Marcin Puc " license="MIT" homepage="https://github.com/cocogitto/cocogitto" changelog="https://raw.githubusercontent.com/cocogitto/cocogitto/main/CHANGELOG.md" -distfiles="https://github.com/cocogitto/cocogitto/archive/${version}.tar.gz" -checksum=662bb909c6468124ad19a90bc07a4f24345167486bd19542375ead7a8f20de02 +distfiles="https://github.com/cocogitto/cocogitto/archive/refs/tags/${version}.tar.gz" +checksum=99f9dee05597d7721f6d046dbfefba5cb8d1c4ae22ced415f724affb3a6bd0cc # Test suite is not atomic, relies on user environment such as git user configuration make_check=no From a42cc7561f338953eac0cef903ab2498a3e54888 Mon Sep 17 00:00:00 2001 From: Mate GABRI Date: Tue, 30 Aug 2022 22:37:55 +1000 Subject: [PATCH 1321/1407] kops: update to 1.24.2 --- srcpkgs/kops/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template index f3e6ec5f4b03..4c2745e19a70 100644 --- a/srcpkgs/kops/template +++ b/srcpkgs/kops/template @@ -1,6 +1,6 @@ # Template file for 'kops' pkgname=kops -version=1.23.2 +version=1.24.2 revision=1 archs="x86_64*" build_wrksrc=src/k8s.io/kops @@ -25,14 +25,14 @@ do_fetch() { do_build() { export GOPATH="$wrksrc" - make + make kops - ../../../bin/kops completion bash > completion.bash - ../../../bin/kops completion zsh | sed -n '/#compdef/,$p' > completion.zsh + ${wrksrc}/src/k8s.io/kops/.build/dist/linux/amd64/kops completion bash > completion.bash + ${wrksrc}/src/k8s.io/kops/.build/dist/linux/amd64/kops completion zsh | sed -n '/#compdef/,$p' > completion.zsh } do_install() { - vbin ../../../bin/kops + vbin ${wrksrc}/src/k8s.io/kops/.build/dist/linux/amd64/kops vinstall completion.bash 644 usr/share/bash-completion/completions kops vinstall completion.zsh 644 usr/share/zsh/site-functions _kops } From f5d8b25c4673f2c69bd255ad8eb991b1c1e46ff1 Mon Sep 17 00:00:00 2001 From: RunningDroid Date: Wed, 7 Sep 2022 23:14:20 -0400 Subject: [PATCH 1322/1407] python3-jq: update to 1.2.3. --- srcpkgs/python3-jq/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template index 52702247c217..443318c6bbd7 100644 --- a/srcpkgs/python3-jq/template +++ b/srcpkgs/python3-jq/template @@ -1,6 +1,6 @@ # Template file for 'python3-jq' pkgname=python3-jq -version=1.2.2 +version=1.2.3 revision=1 wrksrc="${pkgname#*-}.py-${version}" build_style=python3-module @@ -11,8 +11,9 @@ short_desc="Python bindings for jq" maintainer="RunningDroid " license="BSD-2-Clause" homepage="https://pypi.org/project/jq/" +changelog="https://raw.githubusercontent.com/mwilliamson/jq.py/master/CHANGELOG.rst" distfiles="https://github.com/mwilliamson/jq.py/archive/${version}.tar.gz" -checksum=0b926078855b6daee6e8ae5366ebf11c06911195abae643a7cdd37fce087fa0e +checksum=52392e001cd90769d68f4e46821c645e277b9c1db01528a6bbc9d1875b81fcf5 pre_build() { cython jq.pyx From 6116f8ca9689201cde967726d7f9fcad693671db Mon Sep 17 00:00:00 2001 From: chili-b Date: Wed, 7 Sep 2022 19:50:50 -0400 Subject: [PATCH 1323/1407] blueman: update to 2.3.2. --- srcpkgs/blueman/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template index 2d3979cd7c54..3219136c08c8 100644 --- a/srcpkgs/blueman/template +++ b/srcpkgs/blueman/template @@ -1,20 +1,20 @@ # Template file for 'blueman' pkgname=blueman -version=2.2.5 +version=2.3.2 revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="intltool iproute2 pkg-config python3-Cython" makedepends="gtk+3-devel libbluetooth-devel python3-devel python3-gobject-devel startup-notification-devel" -depends="bluez libnotify python3-gobject libappindicator" +depends="bluez libnotify python3-gobject" short_desc="GTK+ Bluetooth Manager" maintainer="Frank Steinborn " license="GPL-3.0-or-later" homepage="https://github.com/blueman-project/blueman" changelog="https://raw.githubusercontent.com/blueman-project/blueman/main/CHANGELOG.md" distfiles="https://github.com/blueman-project/blueman/releases/download/${version}/blueman-${version}.tar.xz" -checksum=c9f3c0a94dc7c80bd32304bb25fded214fe30b7018e9ef46b2fcbd1d803c7c7c +checksum=84cf7d7fd1738751c77e0605f72e4cdd4b723078a7768fe3f35309993a0350ae if [ "$CROSS_BUILD" ]; then hostmakedepends+=" glib-devel python3-devel" From 92ffb18d971f4b73690d0fe46024ad37f45d0e5c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:11 +0200 Subject: [PATCH 1324/1407] attica: update to 5.97.0. --- srcpkgs/attica/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template index 8e614bad3e72..92b42718d9f8 100644 --- a/srcpkgs/attica/template +++ b/srcpkgs/attica/template @@ -1,6 +1,6 @@ # Template file for 'attica' pkgname=attica -version=5.96.0 +version=5.97.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=e7fecc846d4d383d7b719aa9de22b95a31ab1c98375f0d784bb790e696168ff6 +checksum=c5f82aac64fc59376eaca14190e7a31d3697b41f9468375f43ef0890573b3832 do_check() { cd build From b22b545f435f22c4fc8f11195ce6f035ddc652be Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:12 +0200 Subject: [PATCH 1325/1407] baloo5: update to 5.97.0. --- srcpkgs/baloo5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template index 47e8fc0fea5d..c5bce40ed8f1 100644 --- a/srcpkgs/baloo5/template +++ b/srcpkgs/baloo5/template @@ -1,6 +1,6 @@ # Template file for 'baloo5' pkgname=baloo5 -version=5.96.0 +version=5.97.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=d418d9ca3e700a148f0109e4ca4a2ade5b81d8f21cfcdbbfc9ed6dd86bed97c5 +checksum=1f869c0eecca5b27bac4b51a29f5782725f2123430946e6a8f1fcc56beba5968 do_check() { cd build From 67b02bb87a2775d42f54d3e5fffece27f0802958 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:13 +0200 Subject: [PATCH 1326/1407] bluez-qt5: update to 5.97.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 54a26d74a4b5..8023b0dde4ec 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.96.0 +version=5.97.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=8272bfb469559e16758a1743a508c488168e2f47770fb25d2bd72abb12ae8779 +checksum=033a9fd5f3a8bcf54649bae79dbad036f8c4cf74683809c1c908807270e6ea99 do_check() { cd build From 5663581aae004b2ece2fff2586f4b2d5305dc4b2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:15 +0200 Subject: [PATCH 1327/1407] breeze-icons: update to 5.97.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 e73c4d6dad75..3b9d7f6a6f09 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.96.0 +version=5.97.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=43a02e6111c87686e24ba570078f31e77af105a5e2eea490f6d375e3f11047c6 +checksum=6eae442282779802c348e91080132d52b0229288cc8793b2aaa6f906e39171a3 nostrip=yes if [ -z "$CROSS_BUILD" ]; then From a5e3b6672184cf5557ac147bf8b53ce5c48d9ef6 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:16 +0200 Subject: [PATCH 1328/1407] extra-cmake-modules: update to 5.97.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 8203390ca035..652bdcac8948 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.96.0 +version=5.97.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=bdb54407b2e2c9bc1e5b54825818d6807b5b5cc94b173dd272ef1354dc96fdd9 +checksum=9ed235f3dad82ba67dc61eeab12536b6d5936c036d32d7e7d2f38a17b9efc50a python_version=3 do_check() { From bc480c7990e13958f3b6ecb8b75a4123c76f95ce Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:18 +0200 Subject: [PATCH 1329/1407] frameworkintegration: update to 5.97.0. --- srcpkgs/frameworkintegration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template index e99f35ddc052..7ef29d2fa71c 100644 --- a/srcpkgs/frameworkintegration/template +++ b/srcpkgs/frameworkintegration/template @@ -1,6 +1,6 @@ # Template file for 'frameworkintegration' pkgname=frameworkintegration -version=5.96.0 +version=5.97.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=69bece6b66542cfd3985046af1f63174ed909e34fe5a3c972506e250a0c1f1a6 +checksum=3b6822538383ae4a152498c09024c02c03c97742e40a1fe3bdb08eb5ed4332eb frameworkintegration-devel_package() { short_desc+=" - development" From 0c975b99c97507093a42eba0e97d2723747acdca Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:19 +0200 Subject: [PATCH 1330/1407] kactivities5-stats: update to 5.97.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 ac2f90acfef2..1bf74cc57443 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.96.0 +version=5.97.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=da9c220a6cf7c8ec64db4cca1f642066f9c403c904bea3802efd9f55cab6ca51 +checksum=e8a6c3b02dc9c3d9c250d44fa4b5a2e6c553bc8c0457e23ce7664274cdb88bdb if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" From 83175a8fece64ffd4c3326ffea5c9edaec31b73f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:21 +0200 Subject: [PATCH 1331/1407] kactivities5: update to 5.97.0. --- srcpkgs/kactivities5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template index f28218142058..9663370ada8a 100644 --- a/srcpkgs/kactivities5/template +++ b/srcpkgs/kactivities5/template @@ -1,6 +1,6 @@ # Template file for 'kactivities5' pkgname=kactivities5 -version=5.96.0 +version=5.97.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=53cf05c948acb4203042b24fa09719e279d30098976809a061198868f698263c +checksum=d12dbb6e6ff62244eb090027a00f72a4816358b1a18d7b96df8371865a06cf37 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools" From ae56c92845c01fc1fc016df3e12e4744adf2829c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:22 +0200 Subject: [PATCH 1332/1407] kapidox: update to 5.97.0. --- srcpkgs/kapidox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template index bb70b09c226a..91e333d0f76f 100644 --- a/srcpkgs/kapidox/template +++ b/srcpkgs/kapidox/template @@ -1,6 +1,6 @@ # Template file for 'kapidox' pkgname=kapidox -version=5.96.0 +version=5.97.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=9147997567bcaca5248e0d8827675d36570a4f932c8386acf4a047a67927b0f0 +checksum=9d8fc3011350c2a4cb421153cd67990f3e69c0cd7226b9d9f1956460360be965 post_install() { vlicense LICENSES/BSD-2-Clause.txt From 8b60b29c953c180510d3edc80941ff2f571cf9bf Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:24 +0200 Subject: [PATCH 1333/1407] karchive: update to 5.97.0. --- srcpkgs/karchive/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template index f633d76b1d01..b973d1203030 100644 --- a/srcpkgs/karchive/template +++ b/srcpkgs/karchive/template @@ -1,6 +1,6 @@ # Template file for 'karchive' pkgname=karchive -version=5.96.0 +version=5.97.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=c5f5dec93a296a411cf2e44f4b626da316699f04ec574e634310f622040e2aaf +checksum=1bff8249ddbb5a38916c9e145e5027de3f18a14772e7a8bdd4a954fae7ca8d92 karchive-devel_package() { short_desc+=" - development" From 1b6d5d5ea7edb777305488cc3a63f5799667a08d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:25 +0200 Subject: [PATCH 1334/1407] kauth: update to 5.97.0. --- srcpkgs/kauth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template index e37a18cdbca0..fd6f51b98eb7 100644 --- a/srcpkgs/kauth/template +++ b/srcpkgs/kauth/template @@ -1,6 +1,6 @@ # Template file for 'kauth' pkgname=kauth -version=5.96.0 +version=5.97.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=a9d7372aa8c984fe9693efcec1dba0daf76070c41301ca8d1120af45403123c2 +checksum=d74dc553b3628657241d6e7129b17a38e5fd3b26b21de000390382c871ca42f5 do_check() { cd build From 935e594db6fb6145697b936c91efb87edd72c97b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:26 +0200 Subject: [PATCH 1335/1407] kbookmarks: update to 5.97.0. --- srcpkgs/kbookmarks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template index 13b22d4f3423..2a0f1dec5c34 100644 --- a/srcpkgs/kbookmarks/template +++ b/srcpkgs/kbookmarks/template @@ -1,6 +1,6 @@ # Template file for 'kbookmarks' pkgname=kbookmarks -version=5.96.0 +version=5.97.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=64a12cf0e16a3b457d89df4a327d0acae73c3030ef9918fa7036f7cad1b33e8c +checksum=776dac6741d15dd02593891ad1b5d9ca3598df5edb3d431ed9e8c1386ae16b6a kbookmarks-devel_package() { short_desc+=" - development" From 4ea5ec778bbc2a08ff6c7ee4d00f10b3f4a7e498 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:28 +0200 Subject: [PATCH 1336/1407] kcalendarcore: update to 5.97.0. --- srcpkgs/kcalendarcore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template index 0900f557e08a..507ed734073d 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.96.0 +version=5.97.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=b3e84dc29df6bc6e87ef5d44de4dad19a5eadebe25e8c4ed798f6c30908b3ea0 +checksum=d8a7ae053f0620e51e36b04a29240425f293077bad5a8298ed9c09ce97f4e690 replaces="kcalcore>=0" do_check() { From 6a06ae86d1a4b35669a0426f93c32df3a67dfeb5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:29 +0200 Subject: [PATCH 1337/1407] kcmutils: update to 5.97.0. --- srcpkgs/kcmutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template index 7a67da5a4a4f..e51ea0886cdb 100644 --- a/srcpkgs/kcmutils/template +++ b/srcpkgs/kcmutils/template @@ -1,6 +1,6 @@ # Template file for 'kcmutils' pkgname=kcmutils -version=5.96.0 +version=5.97.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=88819fe343776a1819eecddbe2caa936ea2e9fbbfd2a155c46b82525e748ce6d +checksum=ad1907b5347a907cfa2ff0ef37432d4f1f6b6abbaac2866b75a590b8926a5a75 kcmutils-devel_package() { short_desc+=" - development" From 7d77bb0cc371aa7914bf0d8a5fa178b7997252bc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:30 +0200 Subject: [PATCH 1338/1407] kcodecs: update to 5.97.0. --- srcpkgs/kcodecs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template index ff64bd733de2..24b35e000a0c 100644 --- a/srcpkgs/kcodecs/template +++ b/srcpkgs/kcodecs/template @@ -1,6 +1,6 @@ # Template file for 'kcodecs' pkgname=kcodecs -version=5.96.0 +version=5.97.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=7147e4ae29082f5403e21cb7940b3546c094192095f22ed6c5c3fdda25374614 +checksum=63e6e517a80395faea285968fd13f5e477a7437cb28c7028e9e678fc068d2670 kcodecs-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From b7caa3d712859184b910b16a1d5e2d9765fbc349 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:32 +0200 Subject: [PATCH 1339/1407] kcompletion: update to 5.97.0. --- srcpkgs/kcompletion/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template index df3d07a39d67..0a421f359dd2 100644 --- a/srcpkgs/kcompletion/template +++ b/srcpkgs/kcompletion/template @@ -1,6 +1,6 @@ # Template file for 'kcompletion' pkgname=kcompletion -version=5.96.0 +version=5.97.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=b2f146a49649e15943f4caeee4968bf5298ad932b306dc8c75f888efaa68b9ca +checksum=6ab1e04ed3cc83f28a88224a661e5cd6a097e1a7d305987320dd8bd0c37b9ea6 kcompletion-devel_package() { short_desc+=" - development" From a9bffe7e6a5e233e7d028da0181223b4ebe06fab Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:33 +0200 Subject: [PATCH 1340/1407] kconfig: update to 5.97.0. --- srcpkgs/kconfig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template index 89ce602ea98e..6fbb971aedb2 100644 --- a/srcpkgs/kconfig/template +++ b/srcpkgs/kconfig/template @@ -1,6 +1,6 @@ # Template file for 'kconfig' pkgname=kconfig -version=5.96.0 +version=5.97.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=1ffa71145390ea34356cd8fe676794cb9b5bc3db9e1bb1b01be8a42e6aef48f5 +checksum=90fe770c7f9c3a933b4e1f3576cf70c15d1db70b86bc9cfa9e4ad289e053f62d do_check() { cd build From 02c1a34edf6d4deb695c1bbcb50cedc2abc3e91d Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:35 +0200 Subject: [PATCH 1341/1407] kconfigwidgets: update to 5.97.0. --- srcpkgs/kconfigwidgets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template index 93b176268136..4f6020ae4e7d 100644 --- a/srcpkgs/kconfigwidgets/template +++ b/srcpkgs/kconfigwidgets/template @@ -1,6 +1,6 @@ # Template file for 'kconfigwidgets' pkgname=kconfigwidgets -version=5.96.0 +version=5.97.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=1482f42562be8db93c9161acf2b24fa839f05bc893f22f02a3c1e972e733b210 +checksum=20c6016c06a0d24a97af5cd36ed319eee918af051a62265f3f51c7c1c6c58428 kconfigwidgets-devel_package() { short_desc+=" - development" From d0aaaff5517822db247935efa09f003a8aae2733 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:36 +0200 Subject: [PATCH 1342/1407] kcontacts: update to 5.97.0. --- srcpkgs/kcontacts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template index 61cbfe938008..aae8cb2d1b0a 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.96.0 +version=5.97.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=4154c406fec42171a91a5d30fcd8456f6809eac04178fa2cf3f8384cd9e1b51c +checksum=b8196901ec5febcbfe961eb7a57ba41f3a5ed99a74a674c0a8fb5113eb93d908 kcontacts-devel_package() { short_desc+=" - development" From 2642926685146a36a5df851c0d5f37dbafa9f0e6 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:38 +0200 Subject: [PATCH 1343/1407] kcoreaddons: update to 5.97.0. --- srcpkgs/kcoreaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template index 43225032cf8f..526b99f8617e 100644 --- a/srcpkgs/kcoreaddons/template +++ b/srcpkgs/kcoreaddons/template @@ -1,6 +1,6 @@ # Template file for 'kcoreaddons' pkgname=kcoreaddons -version=5.96.0 +version=5.97.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=d21a4c9aa79caa87f543c46ef71a2e290a768edd861e901ea50a452d80fcb5d8 +checksum=09403513873e4fc3d9d2d13fb486d9cce0bc6bd5fde0b1c7b2481e0a404202aa post_install() { vsed -e 's;${_IMPORT_PREFIX};/usr;g' \ From 269fdae345f7379f3a42d797ec8f005bb9ed6e08 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:39 +0200 Subject: [PATCH 1344/1407] kcrash: update to 5.97.0. --- srcpkgs/kcrash/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template index b4321a6b205b..b8c50876757f 100644 --- a/srcpkgs/kcrash/template +++ b/srcpkgs/kcrash/template @@ -1,6 +1,6 @@ # Template file for 'kcrash' pkgname=kcrash -version=5.96.0 +version=5.97.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=659bae2b46e40ae58a19564b18169149d7680df577f7fd0e7db2704a201d5c17 +checksum=ef71248d1d30c1848ab5f553d38c3230f1fe7b0888b2ee8eebfba72d02a8f5c6 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons" From a920c5ac0495f71cd064c9fde5ed0157c21eb5ac Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:40 +0200 Subject: [PATCH 1345/1407] kdav: update to 5.97.0. --- srcpkgs/kdav/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template index 3b94643648a7..ede7f391bf15 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.96.0 +version=5.97.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=94872e54c483ddf02d220b074285f979ad634f85a4c3fa8854e93952275a11ff +checksum=d58d8435eef1f57f0e7d207d63e002e29e0067e2621c522dfcba6f5df4fca5db kdav-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${makedepends}" From b888bd0a6f39809a8b4822ca88f3227b04bcf90a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:42 +0200 Subject: [PATCH 1346/1407] kdbusaddons: update to 5.97.0. --- srcpkgs/kdbusaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template index 3749f87b5f86..64aca60142ed 100644 --- a/srcpkgs/kdbusaddons/template +++ b/srcpkgs/kdbusaddons/template @@ -1,6 +1,6 @@ # Template file for 'kdbusaddons' pkgname=kdbusaddons -version=5.96.0 +version=5.97.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=7e50d4fa9e9d4882a7eaa7bc310aa0c099c4e7de10f53da686ec711b14680ef8 +checksum=13c7e82914bf1e594fcaafe8a1cfdb4607bc75a58a10b5a04fead84fe412122d do_check() { cd build From 96b00dd96878cfae623dcf44b7ac4c3221b74e74 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:43 +0200 Subject: [PATCH 1347/1407] kdeclarative: update to 5.97.0. --- srcpkgs/kdeclarative/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template index 90bcc0ab9c3c..e5ee36e8a8f1 100644 --- a/srcpkgs/kdeclarative/template +++ b/srcpkgs/kdeclarative/template @@ -1,6 +1,6 @@ # Template file for 'kdeclarative' pkgname=kdeclarative -version=5.96.0 +version=5.97.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=6494d2cfa5df46f98b8a8e9a0ffaead11a5cbe2b35084515a9b150f0c21099f4 +checksum=be68d2983643616e257d7a4cc07f87e5e2219abc3ce9cf5500e0fc9e46185a70 do_check() { cd build From 1cefd409fc25e8b660d4878c05ce758071ae4713 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:44 +0200 Subject: [PATCH 1348/1407] kded: update to 5.97.0. --- srcpkgs/kded/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template index 0b5f0e3fa4d1..f8563ba7be12 100644 --- a/srcpkgs/kded/template +++ b/srcpkgs/kded/template @@ -1,6 +1,6 @@ # Template file for 'kded' pkgname=kded -version=5.96.0 +version=5.97.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=63bdf191aade3b02261b30c8a5e7f6ab9d3f6c765b4cffec254b3ed1d9f68074 +checksum=4bdc348378f794aef9bc4f5dcae5a5d5a781a43bae64fdb9c8a04717e15ff6a7 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools" From b806df5a17afbda5346b42a8203c630abc392615 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:46 +0200 Subject: [PATCH 1349/1407] kdelibs4support: update to 5.97.0. --- srcpkgs/kdelibs4support/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template index 0e3cc4fdcbb5..789f4f9356ff 100644 --- a/srcpkgs/kdelibs4support/template +++ b/srcpkgs/kdelibs4support/template @@ -1,6 +1,6 @@ # Template file for 'kdelibs4support' pkgname=kdelibs4support -version=5.96.0 +version=5.97.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=a7268e00b0691d930d69e86970c5300a98d8657f13d181dfcc35fcf0c24bc9a1 +checksum=1adfdd09e61dd183de1dfbd1cd24e26ef69ab6429a0cfc292992a7f240244111 if [ "$CROSS_BUILD" ]; then # gettaddrinfo runtime test is always fine (can't be achieved in crossbuild) From 894c26c95973fdd048d573f8ffa532691f9a37a8 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:47 +0200 Subject: [PATCH 1350/1407] kdesignerplugin: update to 5.97.0. --- srcpkgs/kdesignerplugin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template index 77d366d82e53..62c33ca3948c 100644 --- a/srcpkgs/kdesignerplugin/template +++ b/srcpkgs/kdesignerplugin/template @@ -1,6 +1,6 @@ # Template file for 'kdesignerplugin' pkgname=kdesignerplugin -version=5.96.0 +version=5.97.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=09e6017565a747c039bc1b1079f65ef4367474733ff21891a006c4964353ad31 +checksum=28077f1a1b416c2e19f7b8fae1a96d1bde6e4dd8c90905adbe87bb1f2df3fd20 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools kgendesignerplugin kdoctools" From 752382a74b0a74bc81b530ddafcf55ca0659090c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:49 +0200 Subject: [PATCH 1351/1407] kdesu: update to 5.97.0. --- srcpkgs/kdesu/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template index a7e384522466..ce413df2ff2d 100644 --- a/srcpkgs/kdesu/template +++ b/srcpkgs/kdesu/template @@ -1,6 +1,6 @@ # Template file for 'kdesu' pkgname=kdesu -version=5.96.0 +version=5.97.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=72437597e32d19f170d1441c607e353ccbd125fe6608d041e8fa64e92e9752f2 +checksum=652eb62f3a1f5600b15b1e42ff4d2542ccc9786244b58b73baa4511964d64fb3 kdesu-devel_package() { short_desc+=" - development" From 057070aa25f0c7255da69927ee7778dcb4b3a56f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:50 +0200 Subject: [PATCH 1352/1407] kdewebkit: update to 5.97.0. --- srcpkgs/kdewebkit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template index 2aca496a6d89..b0c5cb0bc424 100644 --- a/srcpkgs/kdewebkit/template +++ b/srcpkgs/kdewebkit/template @@ -1,6 +1,6 @@ # Template file for 'kdewebkit' pkgname=kdewebkit -version=5.96.0 +version=5.97.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=6eb9acf03372396ae6135e8e52ffb98c6d9b1a870ef002637f91204db2b21651 +checksum=ee24fa1f7ef215d34110e10f3f27470f25f926a00c4d37024db69af3165332b6 kdewebkit-devel_package() { short_desc+=" - development" From a7b13a78b8de7a10de6ee95fc819910b2f2ddb63 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:52 +0200 Subject: [PATCH 1353/1407] kdnssd: update to 5.97.0. --- srcpkgs/kdnssd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template index 8fb59da2f5b8..fa9db95b23dd 100644 --- a/srcpkgs/kdnssd/template +++ b/srcpkgs/kdnssd/template @@ -1,6 +1,6 @@ # Template file for 'kdnssd' pkgname=kdnssd -version=5.96.0 +version=5.97.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=1c1c5f6da522a639f974e71fa2364c00d52cebbaf619e2f4606b48ff88c172b4 +checksum=4d04d691c813217abc26c15654f8068687487ad6e644b57d45de19b0c8e2b452 kdnssd-devel_package() { short_desc+=" - development" From 693c863b05b5ca306a6774224bdade896a60dfd4 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:53 +0200 Subject: [PATCH 1354/1407] kdoctools: update to 5.97.0. --- srcpkgs/kdoctools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template index bc1190ef35b0..ed7b968be6d6 100644 --- a/srcpkgs/kdoctools/template +++ b/srcpkgs/kdoctools/template @@ -1,6 +1,6 @@ # Template file for 'kdoctools' pkgname=kdoctools -version=5.96.0 +version=5.97.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=0b8101ee828fd5127bf213d740838e093a4d7b054407400041c9d9bada41d312 +checksum=61ac72b2d338cddc6da57b9097287303117e0d49ccd1c717f69f38ac01150af6 if [ "$CROSS_BUILD" ]; then configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper" From cbe84c8e74ee257b19f2d3dbbdef0a807d43faaa Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:55 +0200 Subject: [PATCH 1355/1407] kemoticons: update to 5.97.0. --- srcpkgs/kemoticons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template index 6b254932dfde..e2ae26dfc2b9 100644 --- a/srcpkgs/kemoticons/template +++ b/srcpkgs/kemoticons/template @@ -1,6 +1,6 @@ # Template file for 'kemoticons' pkgname=kemoticons -version=5.96.0 +version=5.97.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=e5b823df8ea2e350877e652075830f17464600345b06ba66e05e99b67957650d +checksum=e25afceabb2cd35ae6f38b9e2d40c88d6ec20077b700971cec08147a6041310a if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" From 9c1579e54638e6ab098a3de2ce98f871a06f59d8 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:56 +0200 Subject: [PATCH 1356/1407] kfilemetadata5: update to 5.97.0. --- srcpkgs/kfilemetadata5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template index b827fed5f549..067d698448a2 100644 --- a/srcpkgs/kfilemetadata5/template +++ b/srcpkgs/kfilemetadata5/template @@ -1,6 +1,6 @@ # Template file for 'kfilemetadata5' pkgname=kfilemetadata5 -version=5.96.0 +version=5.97.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=7809a54aadf8a37a73652e16fcf152e5230581502c4252cb75070083a9aa036a +checksum=3f2fd85176d7550de8f0af31ba90976b6b50ed277f7c881d1666e082edd07021 kfilemetadata5-devel_package() { short_desc+=" - development" From 7d0dfc85f2a3db425d72f93c35cbea8b0520c79b Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:57 +0200 Subject: [PATCH 1357/1407] kglobalaccel: update to 5.97.0. --- srcpkgs/kglobalaccel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template index aa4989643a2d..507caacb3b3f 100644 --- a/srcpkgs/kglobalaccel/template +++ b/srcpkgs/kglobalaccel/template @@ -1,6 +1,6 @@ # Template file for 'kglobalaccel' pkgname=kglobalaccel -version=5.96.0 +version=5.97.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=388ad7d490ba91c3bbf04e73312d9482bfdc6beb80b711418d42f88e7c75a4eb +checksum=e5c4d3538228279aae7a6f3183e2a24c0c1ccabd95cdb0693eaa343599e7ab31 kglobalaccel-devel_package() { short_desc+=" - development" From 0c5fb22fc2d8c7216585e04d75144da22dd2bfd3 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:28:59 +0200 Subject: [PATCH 1358/1407] kguiaddons: update to 5.97.0. --- srcpkgs/kguiaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template index b3821e4707b1..96ccc9d6801f 100644 --- a/srcpkgs/kguiaddons/template +++ b/srcpkgs/kguiaddons/template @@ -1,6 +1,6 @@ # Template file for 'kguiaddons' pkgname=kguiaddons -version=5.96.0 +version=5.97.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner @@ -14,7 +14,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=7bb9b94fdacd43e3f6d68986cb20ac6d0470e2a46ca813167268ffcd68b21309 +checksum=fb78595f0f98435f87047d662b1e124ea2cd5edd279dbccb857d4d8f06967582 build_options="wayland x11" build_options_default="wayland x11" From 3ccc8d94eb87a85fdea5be97fdc048ecf3b165ac Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:29:00 +0200 Subject: [PATCH 1359/1407] kholidays: update to 5.97.0. --- srcpkgs/kholidays/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template index 29e98e8b56ac..eb47fae5893e 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.96.0 +version=5.97.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=93d8b152a1fdd8afb9bba127fdcf149be0626bfcf3a220fbd7d2f0d0c5448d65 +checksum=728f7a777c49b2748eac98a82fb8532a806804064bad0e1f2c17ea5cf7c9b82c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" From b4d19379ea4d5e60e175a86a457bd57469d0be65 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:29:02 +0200 Subject: [PATCH 1360/1407] khtml: update to 5.97.0. --- srcpkgs/khtml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template index 3b72d53ca481..3d95b82425e6 100644 --- a/srcpkgs/khtml/template +++ b/srcpkgs/khtml/template @@ -1,6 +1,6 @@ # Template file for 'khtml' pkgname=khtml -version=5.96.0 +version=5.97.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=fd42854be6bf8532a46561ef5db439f024a908f13fbf23bb30099942fe188951 +checksum=6c16493749a28bb76fdd2d31158a60fc02016ac3a45316581ea5824fc619bb91 khtml-devel_package() { short_desc+=" - development" From fa0b24281e54fdb1dd549e8577d26387600e08a4 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:29:03 +0200 Subject: [PATCH 1361/1407] ki18n: update to 5.97.0. --- srcpkgs/ki18n/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template index dcfab0170512..79c1cf0e9186 100644 --- a/srcpkgs/ki18n/template +++ b/srcpkgs/ki18n/template @@ -1,6 +1,6 @@ # Template file for 'ki18n' pkgname=ki18n -version=5.96.0 +version=5.97.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=fe815cb7994f757ff92cae0ae5b739909a94d01c7272752cc56cf627db423ecb +checksum=032f6d6f78c815ab2630a559ebf4c4a3737147fb35f327d213a171acf6f81e1e ki18n-devel_package() { short_desc+=" - development" From f56c1166970c028ee7c3142dd2da4a5e094ff9de Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:29:05 +0200 Subject: [PATCH 1362/1407] kiconthemes: update to 5.97.0. --- srcpkgs/kiconthemes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template index abf1db222fa0..0c30efab5a79 100644 --- a/srcpkgs/kiconthemes/template +++ b/srcpkgs/kiconthemes/template @@ -1,6 +1,6 @@ # Template file for 'kiconthemes' pkgname=kiconthemes -version=5.96.0 +version=5.97.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=4f43f28249d4753d07dece4b879fb83f2d0a8217bba861d4b9dd5dd74d493571 +checksum=94f1c6a8aeabfe5b3f2db4bb308546e4941afbc3ba8743c00ed746b360aa9a11 kiconthemes-devel_package() { short_desc+=" - development" From c8ac7dafb158b363b2f846fa706704bce084ca0f Mon Sep 17 00:00:00 2001 From: John Date: Sun, 21 Aug 2022 13:29:06 +0200 Subject: [PATCH 1363/1407] kidletime: update to 5.97.0. --- srcpkgs/kidletime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template index ff475fd4b136..bb6d1fc5fc57 100644 --- a/srcpkgs/kidletime/template +++ b/srcpkgs/kidletime/template @@ -1,6 +1,6 @@ # Template file for 'kidletime' pkgname=kidletime -version=5.96.0 +version=5.97.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=addac76557acfcdcaf61068db204964176c6c33a14ce79daa215267b80d9f18e +checksum=35a10914c694a03e2f45b969edd87dc8dc72fb30c44947dd8dfa3b45efc5042b kidletime-devel_package() { short_desc+=" - development" From b359b13e2a243239a31c77d00bd0e763d8d1b249 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:41:43 +0200 Subject: [PATCH 1364/1407] kimageformats: update to 5.97.0. --- srcpkgs/kimageformats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template index 5be3109a6510..5c94e5e35022 100644 --- a/srcpkgs/kimageformats/template +++ b/srcpkgs/kimageformats/template @@ -1,6 +1,6 @@ # Template file for 'kimageformats' pkgname=kimageformats -version=5.96.0 +version=5.97.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=a5ce354ef2d0146609e0a681e74da078b0592195e304d45670e5e698d5167435 +checksum=eb83362fb98b2a9eba02c434fe5ab137a29f9a33101553adeb3e12d88bc05211 From 57335ae74a8aacd6d7a32694cb9f22d33782f6ed Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:17 +0200 Subject: [PATCH 1365/1407] kinit: update to 5.97.0. --- srcpkgs/kinit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template index 6c7b74ee3489..6d5e7dd3dc78 100644 --- a/srcpkgs/kinit/template +++ b/srcpkgs/kinit/template @@ -1,6 +1,6 @@ # Template file for 'kinit' pkgname=kinit -version=5.96.0 +version=5.97.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=b88dd3dd97791f4c786e89d9bd771675070d030f889c90104b5b8aca2240fdf8 +checksum=5856ac46acb27be6e5dba041d2cc24b6f430c49379cc97b116d8c0dd40444ca5 kinit-devel_package() { short_desc+=" - development" From 50a619ab7bc974c3243762fb597f09dd2866bc37 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:19 +0200 Subject: [PATCH 1366/1407] kio: update to 5.97.0. --- srcpkgs/kio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template index 2ed4456a8b6b..44fdfe1a47c2 100644 --- a/srcpkgs/kio/template +++ b/srcpkgs/kio/template @@ -1,6 +1,6 @@ # Template file for 'kio' pkgname=kio -version=5.96.0 +version=5.97.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=95983904cd01c31b7fffbf615765485029192b2352f6672b8b7386cb0e7ebb76 +checksum=cc9b80507a8eb49470b9352c4171ab194cc6ab3cb6e80793d6c7a05181675887 do_check() { : # Pain to get working in limited enviroment, excpects e.g. real disks From 111f7284e94b16174e0b100288558f5e80da338b Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:21 +0200 Subject: [PATCH 1367/1407] kirigami2: update to 5.97.0. --- srcpkgs/kirigami2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template index b6d5818386e0..3ad1ef903748 100644 --- a/srcpkgs/kirigami2/template +++ b/srcpkgs/kirigami2/template @@ -1,6 +1,6 @@ # Template file for 'kirigami2' pkgname=kirigami2 -version=5.96.0 +version=5.97.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=7be27fbf33d6690dc3e23dae33f58f0c68a97b902a27298858c050691326398a +checksum=449edf327ecce026443bbf30552ba86b4fe94806d2f5ce3fa19491e1aef0d604 kirigami2-devel_package() { short_desc+=" - development" From ef821073843608e94eaf14864b5c4eddff5a7877 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:23 +0200 Subject: [PATCH 1368/1407] kitemmodels: update to 5.97.0. --- srcpkgs/kitemmodels/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template index 2e40b1cab4e0..a5338e062362 100644 --- a/srcpkgs/kitemmodels/template +++ b/srcpkgs/kitemmodels/template @@ -1,6 +1,6 @@ # Template file for 'kitemmodels' pkgname=kitemmodels -version=5.96.0 +version=5.97.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=5b30a75b34e5d6fd39689f49b408af2e19c557454b4db0ffff07b4f5b673d3c8 +checksum=7c5d1bab28b864dd4f9a9cdecfbc35d90ca94965ed0f6c79eead6d8aa854b46f kitemmodels-devel_package() { short_desc+=" - development" From 820c80344a6d4f058602d6be7b95b3194e17ba5d Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:24 +0200 Subject: [PATCH 1369/1407] kitemviews: update to 5.97.0. --- srcpkgs/kitemviews/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template index 531de65f0a5b..9146eabd5925 100644 --- a/srcpkgs/kitemviews/template +++ b/srcpkgs/kitemviews/template @@ -1,6 +1,6 @@ # Template file for 'kitemviews' pkgname=kitemviews -version=5.96.0 +version=5.97.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=8b9a6404b5a84c9142008c3fe840c7ba4a3fbf8f77253a5105e4512ecd1726f3 +checksum=c59916d5f181aa5ff44f4cf4f6bf18a0f179056f00cf33d03328951f1c1dfbbd kitemviews-devel_package() { short_desc+=" - development" From c6edf0d3f2fa92d349c47356457592d5a1ca9434 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:26 +0200 Subject: [PATCH 1370/1407] kjobwidgets: update to 5.97.0. --- srcpkgs/kjobwidgets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template index dbd572477151..590b2e9f83db 100644 --- a/srcpkgs/kjobwidgets/template +++ b/srcpkgs/kjobwidgets/template @@ -1,6 +1,6 @@ # Template file for 'kjobwidgets' pkgname=kjobwidgets -version=5.96.0 +version=5.97.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=b4090c614f64ef7567c560c402ad05c81d4c5ba10c9522021247064ced4e30f0 +checksum=c9cd2ec18416a7b70dd2e480298bbec55c419446afa66eeb0cddfc5e97cc429b kjobwidgets-devel_package() { short_desc+=" - development" From 5bfa0b3941bb9ebe266b54bd9603f8acb71e9de8 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:28 +0200 Subject: [PATCH 1371/1407] kjs: update to 5.97.0. --- srcpkgs/kjs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template index e8caed873e54..30455a710134 100644 --- a/srcpkgs/kjs/template +++ b/srcpkgs/kjs/template @@ -1,6 +1,6 @@ # Template file for 'kjs' pkgname=kjs -version=5.96.0 +version=5.97.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=77ef6424f79229ff9b5c59a26c77b66e08c0a2b1cf8271c78aebc3b2af940e4a +checksum=0e59e1d757819943d76e1df8af3f2cbf586b0104aafa8ee7b8b4ea82987bdcf8 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs" From 8f5b07aecbf14f0ad0d5e2f6c3b713a9bac7daec Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:30 +0200 Subject: [PATCH 1372/1407] kjsembed: update to 5.97.0. --- srcpkgs/kjsembed/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template index d8d252b85d37..638d0447349f 100644 --- a/srcpkgs/kjsembed/template +++ b/srcpkgs/kjsembed/template @@ -1,6 +1,6 @@ # Template file for 'kjsembed' pkgname=kjsembed -version=5.96.0 +version=5.97.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=000ee3f2965f8f783e0e54f526fc505686b45c833f53d73515fae1b0890510fd +checksum=bd4f24188691631d4d42d11bd58322afd8780a149f46f3cdf496eabed9ed401f if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools" From fc648a4f734907b1d49decb0273f3e4f0ebfe8d7 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:31 +0200 Subject: [PATCH 1373/1407] kmediaplayer: update to 5.97.0. --- srcpkgs/kmediaplayer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template index 6c6f29e9a60c..51034408dcf9 100644 --- a/srcpkgs/kmediaplayer/template +++ b/srcpkgs/kmediaplayer/template @@ -1,6 +1,6 @@ # Template file for 'kmediaplayer' pkgname=kmediaplayer -version=5.96.0 +version=5.97.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=cc9c3134d46b6da4fb6555dcfd68b8d31d8ee59c0900b2bc596781f809541463 +checksum=7a4abbf691db541fbaa058c9d3235db6235e4d2c8f16672d85b16a94fe2c0c92 kmediaplayer-devel_package() { short_desc+=" - development" From 3b22a518bcb96ae0020ef719257dfa76e7dfbdc5 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:33 +0200 Subject: [PATCH 1374/1407] knewstuff: update to 5.97.0. --- srcpkgs/knewstuff/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template index 4ba9c7322672..2ee87b48f611 100644 --- a/srcpkgs/knewstuff/template +++ b/srcpkgs/knewstuff/template @@ -1,6 +1,6 @@ # Template file for 'knewstuff' pkgname=knewstuff -version=5.96.0 +version=5.97.0 revision=1 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules gettext @@ -13,7 +13,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=ecb980e21b0906d4f0f5f1d49909a450f1aef440762207a5cb114f4c39209a4e +checksum=d727bbddcebd49a29c2d2e8a8315e40092bf044e85c1ba6c3a0bf07efdfa894c knewstuff-devel_package() { short_desc+=" - development" From 09e38df771e0d1f17b02f9af1c92aa0b19e72a2b Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:35 +0200 Subject: [PATCH 1375/1407] knotifications: update to 5.97.0. --- srcpkgs/knotifications/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template index df50056110f9..7e7bc42d38c1 100644 --- a/srcpkgs/knotifications/template +++ b/srcpkgs/knotifications/template @@ -1,6 +1,6 @@ # Template file for 'knotifications' pkgname=knotifications -version=5.96.0 +version=5.97.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=12933ae33e511b6a37fb3b0dc896248ffdd2ef007e2fc4dd05757fc8a8c7cb85 +checksum=e36364141e715b2b06e583f3f991fa4dcd627822d2887b76b9cc98653dc0d41f knotifications-devel_package() { short_desc+=" - development" From 62f772f367e5f9f2cf95f3a51be599538727d83b Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:37 +0200 Subject: [PATCH 1376/1407] knotifyconfig: update to 5.97.0. --- srcpkgs/knotifyconfig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template index b0423582f3ca..5070493d0ea8 100644 --- a/srcpkgs/knotifyconfig/template +++ b/srcpkgs/knotifyconfig/template @@ -1,6 +1,6 @@ # Template file for 'knotifyconfig' pkgname=knotifyconfig -version=5.96.0 +version=5.97.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=a2b9fd0dfbb7cd5b535ceb58788f42823cea2fadf30de4ceb43a9bfb0fe16c25 +checksum=1bda7bb052c6316058cf93d2d6f0a79da0f71aa8ed633f5cd0e7874908738dfa knotifyconfig-devel_package() { short_desc+=" - development" From ef9945732391f392f4787b3816d4c4a7d01120d4 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:38 +0200 Subject: [PATCH 1377/1407] kpackage: update to 5.97.0. --- srcpkgs/kpackage/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template index 5c779a978f68..2e4e42e35bcb 100644 --- a/srcpkgs/kpackage/template +++ b/srcpkgs/kpackage/template @@ -1,6 +1,6 @@ # Template file for 'kpackage' pkgname=kpackage -version=5.96.0 +version=5.97.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=0d694ebc7227fc1b5d9cc0f91d3e82926c833870433dc8f6baea1085ef8f5d3f +checksum=2c1dd7b2ecf54a5356e89037977703f9d15970dab0e3ac455f969e6d1741410e post_install() { vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \ From 9412a35055b1e75fbf09213a8b7632c998b6bdf8 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:40 +0200 Subject: [PATCH 1378/1407] kparts: update to 5.97.0. --- srcpkgs/kparts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template index 7ba1a9c3247e..077722d115c8 100644 --- a/srcpkgs/kparts/template +++ b/srcpkgs/kparts/template @@ -1,6 +1,6 @@ # Template file for 'kparts' pkgname=kparts -version=5.96.0 +version=5.97.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=02daf869ec02218343601a115b0ee20663e37e8682528dd2e1cd0e7aa29fc82c +checksum=ef833d4a5165445c148186da0d7c977a72d1606cf07fcf6ff8e9d4c48e532551 do_check() { : # test can not find packages assets?! From 92055292763efc70dac485bf226991fcc8f1b5ef Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:42 +0200 Subject: [PATCH 1379/1407] kpeople: update to 5.97.0. --- srcpkgs/kpeople/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template index 4fecb55b6172..f775f8ca45fe 100644 --- a/srcpkgs/kpeople/template +++ b/srcpkgs/kpeople/template @@ -1,6 +1,6 @@ # Template file for 'kpeople' pkgname=kpeople -version=5.96.0 +version=5.97.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=ab84002eb7033f4cbc53eeca900844a139ae8fe20c4083592f7526d5e1036c60 +checksum=7b201ab2f1dabce12d4a97041ad20b35891fc65ad7cc88c006b132b8dc6dc2bb do_check() { cd build From 34fb66830ee4e17ca3dda575ba4469da30f66d19 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:43 +0200 Subject: [PATCH 1380/1407] kplotting: update to 5.97.0. --- srcpkgs/kplotting/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template index 000c7136ed0b..a59d1bd137f0 100644 --- a/srcpkgs/kplotting/template +++ b/srcpkgs/kplotting/template @@ -1,6 +1,6 @@ # Template file for 'kplotting' pkgname=kplotting -version=5.96.0 +version=5.97.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=090e3b25fd2bfcb37f5a9369163460300a57eef705198dae8decb79181111dfb +checksum=5ed2e16b632ac1dc99a1f278de3ef76f4a2e4bc8989b6876621a9b7a1716ea0e kplotting-devel_package() { short_desc+=" - development" From 82ea6e42235a4aa13e90fb5235b16a19b1d03b18 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:45 +0200 Subject: [PATCH 1381/1407] kpty: update to 5.97.0. --- srcpkgs/kpty/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template index 6d0452a776d2..0e708bf378f8 100644 --- a/srcpkgs/kpty/template +++ b/srcpkgs/kpty/template @@ -1,6 +1,6 @@ # Template file for 'kpty' pkgname=kpty -version=5.96.0 +version=5.97.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=3732905762c4956e7af08b925c81e55bb4fced92ebf7ed3929866d88cdde5c97 +checksum=87c5a63d9d2984fa9ab439d89e5d6f51744185a3e3f5e33b5d84cc18e8280ac4 kpty-devel_package() { short_desc+=" - development" From 0905f811839751a68e38dfd355cffc3960f18513 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:47 +0200 Subject: [PATCH 1382/1407] kquickcharts: update to 5.97.0. --- srcpkgs/kquickcharts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template index 0cabeb6e79e5..06d17b78f224 100644 --- a/srcpkgs/kquickcharts/template +++ b/srcpkgs/kquickcharts/template @@ -1,6 +1,6 @@ # Template file for 'kquickcharts' pkgname=kquickcharts -version=5.96.0 +version=5.97.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=72e096dad12cadeb2f89bebebdf906d5312dc2f8479ff36750ae8b33bbaba9e9 +checksum=c12a245bfe92b92be4a8af4c12234ee55270b3b148720097c58b6f388a9f5fec do_check() { cd build From 0f8dd7c4fae4eeee1d4bbf8b3c6b72c7e7fbe229 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:49 +0200 Subject: [PATCH 1383/1407] kross: update to 5.97.0. --- srcpkgs/kross/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template index 038a6f65004d..69026683b406 100644 --- a/srcpkgs/kross/template +++ b/srcpkgs/kross/template @@ -1,6 +1,6 @@ # Template file for 'kross' pkgname=kross -version=5.96.0 +version=5.97.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=a23ae44d5f0177186e88aebfcc3d9b1b837fc4c9d126272e9b079504a578bb0d +checksum=ba60156428496628046d99d5fe33bfdfbb4d29cb1ae82dd9014202dceda18304 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From 9e672f03c30e151a2122d9ffd5a4718c7ac92d40 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:51 +0200 Subject: [PATCH 1384/1407] krunner: update to 5.97.0. --- srcpkgs/krunner/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template index c94b179cea70..fb0f49a09f34 100644 --- a/srcpkgs/krunner/template +++ b/srcpkgs/krunner/template @@ -1,6 +1,6 @@ # Template file for 'krunner' pkgname=krunner -version=5.96.0 +version=5.97.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=935efb9ec69d9c99208e6a4b3ff3dcb6f5c773acd332846a4d60d5c461b5a271 +checksum=295fb5f03c7c806bed68b358f4de517ad8a8758c9abd10f5761f3f0b39d8ad29 do_check() { cd build From c62d8dc19edaf5ba77a2ef12304fd408bf717af1 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:52 +0200 Subject: [PATCH 1385/1407] kservice: update to 5.97.0. --- srcpkgs/kservice/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template index 1c4daf079641..85710aad6c38 100644 --- a/srcpkgs/kservice/template +++ b/srcpkgs/kservice/template @@ -1,6 +1,6 @@ # Template file for 'kservice' pkgname=kservice -version=5.96.0 +version=5.97.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=ed99b8ad1ed141fbd38ef1bd0cba5045839c181f3a3d5a672c6a215fcb50e3fd +checksum=6d0016a801edbd2989a13a3cf460b1164663c9b205ced8f9242f256a1b3e202e if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools" From 3125811b497bb88d9d932b0dacc25261d13c29dd Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:54 +0200 Subject: [PATCH 1386/1407] ksolid: update to 5.97.0. --- srcpkgs/ksolid/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template index ad86c174fe76..20123967ddf3 100644 --- a/srcpkgs/ksolid/template +++ b/srcpkgs/ksolid/template @@ -1,6 +1,6 @@ # Template file for 'ksolid' pkgname=ksolid -version=5.96.0 +version=5.97.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=9104542fec59bbfbd2b493d990a04849347d5ce10948a5bdf0bc9e17187dc448 +checksum=84c0ad4678c2ef6563db8a1dd907a8b9c4a2e8db7afc691a24b27189d6a24c9d libksolid_package() { short_desc+=" - runtime library" From 69b0a0fdeaa0f169f5ebd8e1dc65eb37481a774f Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:56 +0200 Subject: [PATCH 1387/1407] ktexteditor: update to 5.97.0. --- srcpkgs/ktexteditor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template index 2ccde63469fe..581b4c90ea92 100644 --- a/srcpkgs/ktexteditor/template +++ b/srcpkgs/ktexteditor/template @@ -1,6 +1,6 @@ # Template file for 'ktexteditor' pkgname=ktexteditor -version=5.96.0 +version=5.97.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=03857b651e8a1fd89285f4a3271b257976d4b92b981d13e00a637ae68de8321c +checksum=8b728bf715ce19725e63fa8a19171f9b61ee85425f0fd4e64669d16fc6811c0a do_check() { cd build From 30187ce5759df897f221d08df9c4993c6bdfdc04 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:44:58 +0200 Subject: [PATCH 1388/1407] ktextwidgets: update to 5.97.0. --- srcpkgs/ktextwidgets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template index 3fc31c1d8145..d107cb032690 100644 --- a/srcpkgs/ktextwidgets/template +++ b/srcpkgs/ktextwidgets/template @@ -1,6 +1,6 @@ # Template file for 'ktextwidgets' pkgname=ktextwidgets -version=5.96.0 +version=5.97.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=f2fe2c61b5574466d19c6bca4779ac2da3cf9650b19bfef94246248c2b264bed +checksum=bd42fb15833fcfb4f739999d525b27b55c16eec8e5dec8a6ec2d7a1b9c288acf ktextwidgets-devel_package() { short_desc+=" - development" From 3a0c76e1664de6ecd8112640d27d92919d5adc68 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:00 +0200 Subject: [PATCH 1389/1407] kunitconversion: update to 5.97.0. --- srcpkgs/kunitconversion/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template index c3b33d416764..6bb215e23c14 100644 --- a/srcpkgs/kunitconversion/template +++ b/srcpkgs/kunitconversion/template @@ -1,6 +1,6 @@ # Template file for 'kunitconversion' pkgname=kunitconversion -version=5.96.0 +version=5.97.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=6f9ceaf755fbfb61d427f5a4ee2ed06042b6a0c4991380d5b7c1f297c2189ae2 +checksum=dbf85e140736132f89f01b939627aa40c40ef2f7913addd63d7e7ba3e6a957df kunitconversion-devel_package() { short_desc+=" - development" From 99d82e1ff7cc79e3a1a7d942271fe1460d818453 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:02 +0200 Subject: [PATCH 1390/1407] kwallet: update to 5.97.0. --- srcpkgs/kwallet/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template index 304f480dcb50..8449862ea282 100644 --- a/srcpkgs/kwallet/template +++ b/srcpkgs/kwallet/template @@ -1,19 +1,20 @@ # Template file for 'kwallet' pkgname=kwallet -version=5.96.0 +version=5.97.0 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=ON" hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-host-tools qt5-qmake python3 kdoctools" makedepends="kdoctools-devel gpgmepp-devel libgcrypt-devel - kservice-devel knotifications-devel kiconthemes-devel" + kservice-devel knotifications-devel kiconthemes-devel + gpgmeqt-devel qca-qt5-devel" short_desc="KDE Safe desktop-wide storage for passwords" 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=58066886622996a602568f6f92239e0e315593751a44d0c35ece987818084666 +checksum=ab9b78b0c6aba461de6247974b7e60239cd2a52a1c2c6d67b92e466c7597d821 kwallet-devel_package() { short_desc+=" - development" From 192b0eef890441b8b09e458959330b5f1c7f67a4 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:03 +0200 Subject: [PATCH 1391/1407] kwayland: update to 5.97.0. --- srcpkgs/kwayland/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template index 28af451e9bef..223a54c10db2 100644 --- a/srcpkgs/kwayland/template +++ b/srcpkgs/kwayland/template @@ -1,6 +1,6 @@ # Template file for 'kwayland' pkgname=kwayland -version=5.96.0 +version=5.97.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=eb1f4eb5a3891be41d4534f4617ff396b0933a2de7ee17dce6bbf37b63d49635 +checksum=e571016c89cccd5ae1a455c8f2abe59f8edab787e3cd7a165059bf365130ca3c kwayland-devel_package() { short_desc+=" - development" From 7c3476bc5610cc7cfaece01acc621455ed1b3b95 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:06 +0200 Subject: [PATCH 1392/1407] kwidgetsaddons: update to 5.97.0. --- srcpkgs/kwidgetsaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template index 23620c63be26..1570a0f9f685 100644 --- a/srcpkgs/kwidgetsaddons/template +++ b/srcpkgs/kwidgetsaddons/template @@ -1,6 +1,6 @@ # Template file for 'kwidgetsaddons' pkgname=kwidgetsaddons -version=5.96.0 +version=5.97.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=39a163c1e5fb1cee8de063f7b1eae279ecb2f11319594f815554298c6c9eebc5 +checksum=7ac0c7e429036829fb430bc762ee58cb54f35c5ef955371f74fdd42376b6ac17 do_check() { cd build From bec22d5a775d93eb9ba5bc303ca5f0340c21afbd Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:07 +0200 Subject: [PATCH 1393/1407] kwindowsystem: update to 5.97.0. --- srcpkgs/kwindowsystem/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template index 554ea124e7fb..da4451cb39f1 100644 --- a/srcpkgs/kwindowsystem/template +++ b/srcpkgs/kwindowsystem/template @@ -1,6 +1,6 @@ # Template file for 'kwindowsystem' pkgname=kwindowsystem -version=5.96.0 +version=5.97.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=fd773e38bb971e30e9f09583560c2d44638c4d47223ef37176cdd23ae81f8bc6 +checksum=b822a796379a1ce03a4a9fad64aa6289ba7abd84e3b137af31d8043b9c5efef1 kwindowsystem-devel_package() { short_desc+=" - development" From b1a464b34a3dff29acd6e798f69abdf1ae583ce6 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:09 +0200 Subject: [PATCH 1394/1407] kxmlgui: update to 5.97.0. --- srcpkgs/kxmlgui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template index fed75b87b755..89f48bac1348 100644 --- a/srcpkgs/kxmlgui/template +++ b/srcpkgs/kxmlgui/template @@ -1,6 +1,6 @@ # Template file for 'kxmlgui' pkgname=kxmlgui -version=5.96.0 +version=5.97.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=33acae1c4814bf1b584608392a0a184ccb8b42c420c7ff057c95b0cb9f133fc2 +checksum=baf17929d6aabc11f6c9f8ac5402388846bf7c1d65d6896008c60d953218adf5 do_check() { cd build From 6d750436ff942f9309066ef8a1a30111c55ecdd5 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:11 +0200 Subject: [PATCH 1395/1407] kxmlrpcclient: update to 5.97.0. --- srcpkgs/kxmlrpcclient/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template index d8269107bd99..e0bf24cda5d1 100644 --- a/srcpkgs/kxmlrpcclient/template +++ b/srcpkgs/kxmlrpcclient/template @@ -1,6 +1,6 @@ # Template file for 'kxmlrpcclient' pkgname=kxmlrpcclient -version=5.96.0 +version=5.97.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=5cbd3dbe9c6885b3f9ab4bc1845cc7bd4a040cfaecbad7efc1875bbbd9cf35cb +checksum=495a886b6bd134be578f37c0ad169a178f95dcbfd073e95d1579a0f493fbd309 post_install() { vlicense LICENSES/BSD-2-Clause.txt From 86c1563e6bab33354e60addd325349f77d07abbb Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:13 +0200 Subject: [PATCH 1396/1407] modemmanager-qt5: update to 5.97.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 f5d0b1ab8dd9..5e8d28160e07 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.96.0 +version=5.97.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=0dd6f0e3ee3aa4ddc974e376b3fd1e3ebebdb6e1377dea8e67480ca903c471e5 +checksum=938001d0d28c9d51cbc8fcdf45aefb2028c227e33037f98fb89ed6214936e561 do_check() { cd build From 1ead785b328c38bcb739aaeb06f63a9918db724d Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:15 +0200 Subject: [PATCH 1397/1407] networkmanager-qt5: update to 5.97.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 a23a0df5d65d..14c34f80b8ae 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.96.0 +version=5.97.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=dffd2c9df0121003ee8059b1aff657b58bf12dde4fc2b9d2d30a00ca817fdbbf +checksum=8556ad0ee255ce2947aad623db90848f7cfb0034368b0193f86af40499fa6c81 do_check() { cd build From 8cdb186c456ed70125e532244025378941c9d0ec Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:53 +0200 Subject: [PATCH 1398/1407] oxygen-icons5: update to 5.97.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 657f1a02493e..218d151d88bf 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.96.0 +version=5.97.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=0557a74daac4ad59bfd80626593aed2f91e3bd12782367f458cfc792bf916eb8 +checksum=554b6df8204654aee941f378c941277f81998522c6c67659625f16200225f9fa conflicts="oxygen-icons>=0" oxygen-icons_package() { From d44747d3007428ce7dba7d565a61866a46c856a7 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:55 +0200 Subject: [PATCH 1399/1407] plasma-framework: update to 5.97.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 c41280978310..945aa01b537d 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.96.0 +version=5.97.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=0236ea39448299d9c861cf8da2582baeec7ccfd4660406c47abec70bcedebe92 +checksum=73987d498bd231d984dbaad9fb94e38e32441635464ffeacbfcd089a7695b527 do_check() { cd build From 6034ac18a483523cf119db4a6ba481521aeab4d9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:55 +0200 Subject: [PATCH 1400/1407] prison: update to 5.97.0. --- srcpkgs/prison/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template index 307f00f56645..1baf8bc7c9ed 100644 --- a/srcpkgs/prison/template +++ b/srcpkgs/prison/template @@ -1,6 +1,6 @@ # Template file for 'prison' pkgname=prison -version=5.96.0 +version=5.97.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=ba2785b054e36950a4561786bcff9fdb80bcc5a0122d1cee403326e95746f4cf +checksum=a6f04ff1b9823c43881da38091a87970dba6d79a0f3a8103146fc2b03aaf531b post_install() { vlicense LICENSES/BSD-3-Clause.txt From 577b25c9799d3ca7ce54bb37600f5fcee4e548a7 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:57 +0200 Subject: [PATCH 1401/1407] purpose: update to 5.97.0. --- srcpkgs/purpose/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template index ec81fcb15a63..914b06ed4110 100644 --- a/srcpkgs/purpose/template +++ b/srcpkgs/purpose/template @@ -1,6 +1,6 @@ # Template file for 'purpose' pkgname=purpose -version=5.96.0 +version=5.97.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=7940d70bb6f9ef6fcd9af621096bccb2622680cffcb681ea0b312ec6741b513e +checksum=83fed8d56231a11fc1e39a04aef8caf84408c51a5806b633bf18895d5481519f do_check() { cd build From 1d44d0d2922fc1228cf65184391d231fceeea9a1 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:45:59 +0200 Subject: [PATCH 1402/1407] qqc2-desktop-style: update to 5.97.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 96951afd57e7..b32064b3c181 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.96.0 +version=5.97.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=087d2a38a52a96fd3cf6662fa31a7500f3251847f5bf5185b2496b4e46dbc939 +checksum=466967eec3b10a3e0eb0c2e1f09b9c23ff0f08399563d112c7bec26061f134a6 qqc2-desktop-style-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From e3038aca5ef978fdd55e371d58b8d64b1df82ae3 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:46:01 +0200 Subject: [PATCH 1403/1407] sonnet: update to 5.97.0. --- srcpkgs/sonnet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template index 7157f92fce6b..90550fc18872 100644 --- a/srcpkgs/sonnet/template +++ b/srcpkgs/sonnet/template @@ -1,6 +1,6 @@ # Template file for 'sonnet' pkgname=sonnet -version=5.96.0 +version=5.97.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=046a20e5070b108cc515645bf9121cd5ed6515a6f3e5879783887a379b9e0f44 +checksum=a392739767e7f56cc3d951f0e55f1fa1d36a9f48e1b601b825212b50a1941193 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" sonnet" From 605cab8dbbb1b7c9079a4536c8a2408513d62228 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:46:02 +0200 Subject: [PATCH 1404/1407] syndication: update to 5.97.0. --- srcpkgs/syndication/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template index 162f2dce34c8..0063d79b983a 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.96.0 +version=5.97.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=a4b1dbf8c0eed15eab9f520512fee6271b07fac0745c2b1fc6ccae49ed6fc0e0 +checksum=560262fe64af2891e457b4b123330be03bbf2bbb3b3fc29b657ee19fa3ae9d61 syndication-devel_package() { short_desc+=" - development" From 748ef88fb09fc0c54ecb100f4afe8504909956a0 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:46:05 +0200 Subject: [PATCH 1405/1407] syntax-highlighting: update to 5.97.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 5ac8032996f2..ef6a8f5f5be0 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.96.0 +version=5.97.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=1affa16519f04e0a05f37fda67acce2ac943e74eb8322591896765d7e1cbd79c +checksum=e88b9691ffead9cbfb11ae43c497114c7695e1e455e78dad30743c90ab50a99d if [ "$CROSS_BUILD" ]; then hostmakedepends+=" syntax-highlighting" From 759f4ae2fbfb5aed251ef805762ded8f7d6542bf Mon Sep 17 00:00:00 2001 From: John Date: Sat, 10 Sep 2022 22:46:08 +0200 Subject: [PATCH 1406/1407] threadweaver: update to 5.97.0. --- srcpkgs/threadweaver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template index 58f53c35a76e..7d4429aa9d9a 100644 --- a/srcpkgs/threadweaver/template +++ b/srcpkgs/threadweaver/template @@ -1,6 +1,6 @@ # Template file for 'threadweaver' pkgname=threadweaver -version=5.96.0 +version=5.97.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=78b5cf0b8d5937ac998c3b6f73926bdd483688b758da800126ff0b56f9b25252 +checksum=46975d03feea09c41ac369fd076d7b2c92ad4468a81f48c2eeff622eabfc408f threadweaver-devel_package() { short_desc+=" - development" From e33d21a248814fe69dfcb4151170d2b299b2e003 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 10 Sep 2022 18:17:20 -0500 Subject: [PATCH 1407/1407] xmandump: update to 0.2.6. --- srcpkgs/xmandump/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template index 59ad9180aeee..7e1e04875bbf 100644 --- a/srcpkgs/xmandump/template +++ b/srcpkgs/xmandump/template @@ -1,6 +1,6 @@ # Template file for 'xmandump' pkgname=xmandump -version=0.2.5 +version=0.2.6 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=262e17f4da48fea1feead4a7a9827f2d44efde4bbe0d149a725674e118eabf69 +checksum=d799957d02e27375f06e0fbce75fe5e3091c75aec22adb5132b703debae0601b post_install() { vlicense LICENSE.txt LICENSE