upg vala valgrind qt6-base python-pytest pacman-contrib meson mesa-amber mdds librewolf jsoncpp

This commit is contained in:
joborun linux 2022-05-03 23:34:50 +03:00
parent 4baa64d5a5
commit ad2131d427
30 changed files with 311 additions and 138 deletions

View File

@ -8,7 +8,7 @@
pkgbase=jsoncpp
pkgname=('jsoncpp' 'jsoncpp-doc')
pkgver=1.9.5
pkgrel=01
pkgrel=02
pkgdesc='C++ library for interacting with JSON'
url='https://github.com/open-source-parsers/jsoncpp'
arch=('x86_64')
@ -28,6 +28,7 @@ build() {
ninja -C build
echo "Building static library..."
CXXFLAGS="$CXXFLAGS -ffat-lto-objects" \
arch-meson --default-library static build-static
ninja -C build-static
@ -72,3 +73,4 @@ package_jsoncpp-doc() {
license=('MIT' 'custom:Public_Domain')
sha256sums=(f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2) # jsoncpp-1.9.5.tar.gz

View File

@ -6,7 +6,7 @@
pkgbase=jsoncpp
pkgname=('jsoncpp' 'jsoncpp-doc')
pkgver=1.9.5
pkgrel=1
pkgrel=2
pkgdesc='C++ library for interacting with JSON'
url='https://github.com/open-source-parsers/jsoncpp'
arch=('x86_64')
@ -29,6 +29,7 @@ build() {
ninja -C build
echo "Building static library..."
CXXFLAGS="$CXXFLAGS -ffat-lto-objects" \
arch-meson --default-library static build-static
ninja -C build-static

View File

@ -2,3 +2,5 @@ doxygen
graphviz
python
meson

View File

@ -1,5 +1,5 @@
real 0m40.411s
user 0m56.788s
sys 0m4.930s
real 0m50.746s
user 1m5.712s
sys 0m4.327s

View File

@ -9,7 +9,7 @@ pkgname=librewolf
provides=($pkgname-bin $pkgname)
conflicts=($pkgname-bin $pkgname)
pkgver=99.0.1
pkgrel=01
pkgrel=04
pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
arch=(x86_64)
options=(!emptydirs)
@ -17,7 +17,7 @@ install=librewolf.install
makedepends=(zstd sh)
proj_id=12875785
url=https://gitlab.com/api/v4/projects/$proj_id/packages/generic/librewolf/$pkgver-1
source=($url/$pkgname-$pkgver-1-x86_64.pkg.tar.zst{,.sig}
source=($url/$pkgname-$pkgver-4-x86_64.pkg.tar.zst{,.sig}
librewolf.install)
package() {
@ -38,6 +38,6 @@ license=(MPL GPL LGPL)
validpgpkeys=(031F7104E932F7BD7416E7F6D2845E1305D6E801) # <1813007-ohfp@users.noreply.gitlab.com>
sha256sums=(cf7c0aea675b90f63c882548ba19b214a10d90d6920a621287e4454b20810fd9 # librewolf-99.0.1-1-x86_64.pkg.tar.zst
a0f715b7200ab2d8e5b6059f39c14b8d9f3c6c744cf16a7b0bcb5142eecf79c0 # librewolf-99.0.1-1-x86_64.pkg.tar.zst.sig
sha256sums=(5c12e438b10d08d17ac00fab4b443f78bbfe2c1dcdd7bc03fd297c818a96f60e # librewolf-99.0.1-4-x86_64.pkg.tar.zst
e1d03e071616ce477ebc951eae67331331bd8d7186baa78eacc5c958d641230c # librewolf-99.0.1-4-x86_64.pkg.tar.zst.sig
c3d94f33b96944e80b6fe84e36eaa9b4179ab144fe7aa58c5aa2efae0e2004b9) # librewolf.install

View File

@ -4,7 +4,7 @@ pkgname=librewolf-bin
provides=(${pkgname//-bin/""})
conflicts=(${pkgname//-bin/""})
pkgver=99.0.1
pkgrel=1
pkgrel=4
pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
arch=(x86_64 aarch64)
license=(MPL GPL LGPL)
@ -30,9 +30,9 @@ _uploadpath_sig_aarch64=${_base_url}/${pkgname//-bin/""}-${pkgver}-${pkgrel}-aar
_uploadpath_sig_x86_64=${_base_url}/${pkgname//-bin/""}-${pkgver}-${pkgrel}-x86_64.pkg.tar.zst.sig
source_aarch64=("${_uploadpath_aarch64}" "${_uploadpath_sig_aarch64}")
source_x86_64=("${_uploadpath_x86_64}" "${_uploadpath_sig_x86_64}")
sha256sums_x86_64=('cf7c0aea675b90f63c882548ba19b214a10d90d6920a621287e4454b20810fd9'
sha256sums_x86_64=('5c12e438b10d08d17ac00fab4b443f78bbfe2c1dcdd7bc03fd297c818a96f60e'
'SKIP')
sha256sums_aarch64=('ced27d8b50d6f0b6aecbf0a07e88ce2590614ad8d6f85bd65849c2ebf1cacdfd'
sha256sums_aarch64=('263b9b29aac7f89a9bd60c11b0b27cc7eb23235a0adf9f8e52f67d676b6614a6'
'SKIP')
package() {

View File

@ -7,7 +7,7 @@
pkgname=mdds
pkgver=2.0.2
pkgrel=1
pkgrel=01
pkgdesc="A collection of multi-dimensional data structures and indexing algorithms"
arch=('any')
url="https://gitlab.com/mdds/mdds"
@ -38,3 +38,4 @@ license=('MIT')
# checksums listed there - https://gitlab.com/mdds/mdds/-/releases
sha256sums=(1f8c165695f5d2e4375bab32a0f1507868dee3de0a20d524770078ba3c6c10bf) # mdds-2.0.2.tar.xz

View File

@ -1,4 +1,4 @@
boost
automake
autoconf

View File

@ -8,7 +8,7 @@
pkgname=mesa-amber
pkgdesc="classic OpenGL (non-Gallium3D) drivers -no ZSTD"
pkgver=21.3.8
pkgrel=02
pkgrel=04
arch=('x86_64')
makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
'libxdamage' 'wayland' 'wayland-protocols' 'elfutils' 'llvm'
@ -56,8 +56,7 @@ build() {
package() {
depends=('libglvnd')
conflicts=('mesa')
provides=("mesa-${pkgver}")
provides=("mesa=${pkgver}" "opengl-driver")
DESTDIR="${pkgdir}" meson install -C build
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE

View File

@ -6,7 +6,7 @@
pkgname=mesa-amber
pkgdesc="classic OpenGL (non-Gallium3D) drivers"
pkgver=21.3.8
pkgrel=2
pkgrel=4
arch=('x86_64')
makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
'libxdamage' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm'
@ -54,10 +54,11 @@ build() {
ninja -C build
meson compile -C build
}
package() {
depends=('libglvnd')
conflicts=('mesa')
provides=("mesa-${pkgver}")
provides=("mesa=${pkgver}" "opengl-driver")
DESTDIR="${pkgdir}" meson install -C build

View File

@ -1,5 +1,5 @@
real ''m+-.626s
user 54m37.956s
sys 1m56.101s
real 9m45.510s
user 27m25.514s
sys 1m23.693s

View File

@ -1,11 +1,12 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=meson
pkgver=0.62.0
pkgver=0.62.1
pkgrel=01
pkgdesc='High productivity build system'
url='https://mesonbuild.com/'
@ -19,7 +20,7 @@ checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt5-base' '
'python-pytest-xdist' 'python2-setuptools' 'ldc' 'rust-bindgen' 'cuda' 'hotdoc')
source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
skip-test.diff
0001-Skip-broken-tests.patch
arch-meson
jobo-meson)
@ -27,7 +28,7 @@ prepare() {
cd ${pkgname}-${pkgver}
## Arch: Our containers do not allow sanitizers to run
patch -Np1 -i ../skip-test.diff
patch -Np1 -i ../0001-Skip-broken-tests.patch
}
build() {
@ -66,9 +67,8 @@ license=('Apache')
validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # Jussi Pakkanen <jpakkane@gmail.com>
sha256sums=(06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb # meson-0.62.0.tar.gz
55caf1a136f958c44c2b5771f8614ecf4f22fd1f726fff2f775b271354150714 # meson-0.62.0.tar.gz.asc
c57d93219cadd192d48eb24eedd1859d5949f1da30bd2d2d2c96b285eee2d259 # skip-test.diff
sha256sums=(a0f5caa1e70da12d5e63aa6a9504273759b891af36c8d87de381a4ed1380e845 # meson-0.62.1.tar.gz
6e0693c606a72ebe777f6e9f1a5c95c89cf7a43d3786a58455e1faab82ef7555 # meson-0.62.1.tar.gz.asc
2c705c917c1690bda95962858b73e118c3be22a825765845cddcbdf26b960820 # 0001-Skip-broken-tests.patch
ac3387ed5759cc512b1f2a4e5b3dd940274b02f943a7e5d644792ee714e6b95e # arch-meson
b2aeae2787cf8f3ffb8778ee7f1a434895b1512bc0bdb33528c4cb2aeb067904) # jobo-meson

View File

@ -3,7 +3,7 @@
# Contributor: Anatol Pomozov <anatol dot pomozov at gmail>
pkgname=meson
pkgver=0.62.0
pkgver=0.62.1
pkgrel=1
pkgdesc='High productivity build system'
url='https://mesonbuild.com/'
@ -17,19 +17,17 @@ checkdepends=('gcc-objc' 'vala' 'rust' 'gcc-fortran' 'mono' 'boost' 'qt5-base' '
'libwmf' 'valgrind' 'cmake' 'netcdf-fortran' 'openmpi' 'nasm' 'gnustep-base' 'libelf'
'python-pytest-xdist' 'python2-setuptools' 'ldc' 'rust-bindgen' 'cuda' 'hotdoc')
source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
skip-test.diff
0001-Skip-broken-tests.patch
arch-meson)
sha512sums=('96cbcc9ce731b856a89fa96a3929570627cb87a5f2079d7d087f5a7e7c5c59db15f2ab544f11d128b568dd7f12739617e3fd79d6bcb4e995f9cd5a6f9de9fabb'
sha512sums=('52d2d06c27275b824046164403908be8555faed33aef862940623cef3e4f84b4c9b8d461c291642e6ea2c0db30b2ec4a99f46bde5d54945a26c1dbeca219cc32'
'SKIP'
'201e1d19d4acedadc0ed38a6ec56b90266cd7caf72db46869282489e5d52be949f7794b53bbf5ccc328ce902a90b8cebe59716ca2b2493eeaef26821e44557dc'
'd94c5b102835704e38ae778f0d420b30b4acf64f4321304ad63472a3fb044fcdc2fcb18edf47e239678534e107b6b892ee5328f0840d6649e10201bcf072e8f8'
'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # Jussi Pakkanen <jpakkane@gmail.com>
prepare() {
cd ${pkgname}-${pkgver}
# Our containers do not allow sanitizers to run
patch -Np1 -i ../skip-test.diff
patch -Np1 -i ../0001-Skip-broken-tests.patch
}
build() {

View File

@ -47,3 +47,5 @@ gettext
gtk3
netcdf
python-pytest-forked

View File

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=pacman-contrib
pkgver=1.4.0
pkgrel=05
pkgver=1.5.0
pkgrel=01
pkgdesc="Contributed scripts and tools for pacman systems w/o systemd"
url="https://gitlab.archlinux.org/pacman/pacman-contrib"
arch=('x86_64')
@ -19,17 +19,15 @@ optdepends=('diffutils: for pacdiff'
'mlocate: for pacdiff --locate'
'sudo: privilege elevation for several scripts'
'vim: default merge program for pacdiff')
source=("$url/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz"
'0001-pactree-fix-compilation-with-pacman-6.patch')
source=("$url/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz")
prepare() {
cd pacman-contrib-v$pkgver
patch --forward --strip=1 --input=../0001-pactree-fix-compilation-with-pacman-6.patch
cd $pkgname-v$pkgver
./autogen.sh
}
build() {
cd pacman-contrib-v$pkgver
cd $pkgname-v$pkgver
./configure \
--prefix=/usr \
@ -39,14 +37,15 @@ build() {
}
check() {
make -C pacman-contrib-v$pkgver check
cd $pkgname-v$pkgver
make check
}
package() {
cd pacman-contrib-v$pkgver
cd $pkgname-v$pkgver
make DESTDIR="$pkgdir" install
rm -rf $pkgdir/usr/lib
# rm -rf $pkgdir/usr/lib/systemd
rm -rf $pkgdir/usr/lib
}
#---- license gpg-key sha256sums ----
@ -56,6 +55,8 @@ license=('GPL')
validpgpkeys=('5134EF9EAF65F95B6BB1608E50FB9B273A9D0BB5' # Johannes Löthberg <johannes@kyriasis.com>
'04DC3FB1445FECA813C27EFAEA4F7B321A906AD9') # Daniel M. Capella <polyzen@archlinux.org>
sha256sums=(c97b2889ab012feaa1882865af9cfeb2406c9045757d2e73b5903277472ce6a2 # pacman-contrib-v1.4.0.tar.gz
774d27532a91e2fe490ccc8d21c2d1d4d2a2dbfc8678a8406abb8bb8f9e6626c) # 0001-pactree-fix-compilation-with-pacman-6.patch
b2sums=('1cfe87ad9b520d8851f3d7ec9e1f1f788210951ed167ad09486c64fa6b4321b1d473009d3f911b8066a65a88818254fabbbe4dcd34de63505e40a8b739d3ba7a')
sha256sums=(c9b521348d04df512b12ccc010d3f64302dc077ad5104485f6e8695f116e828d) # pacman-contrib-v1.5.0.tar.gz

View File

@ -2,14 +2,12 @@
# Maintainer: Daniel M. Capella <polyzen@archlinux.org>
pkgname=pacman-contrib
pkgver=1.4.0
pkgrel=4
pkgdesc="Contributed scripts and tools for pacman systems"
url="https://gitlab.archlinux.org/pacman/pacman-contrib"
pkgver=1.5.0
pkgrel=1
pkgdesc='Contributed scripts and tools for pacman systems'
arch=('x86_64')
url=https://gitlab.archlinux.org/pacman/pacman-contrib
license=('GPL')
depends=('fakeroot' 'pacman' 'perl')
makedepends=('asciidoc')
optdepends=('diffutils: for pacdiff'
@ -17,24 +15,18 @@ optdepends=('diffutils: for pacdiff'
'mlocate: for pacdiff --locate'
'sudo: privilege elevation for several scripts'
'vim: default merge program for pacdiff')
source=("$url/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz"
'0001-pactree-fix-compilation-with-pacman-6.patch')
sha256sums=('c97b2889ab012feaa1882865af9cfeb2406c9045757d2e73b5903277472ce6a2'
'774d27532a91e2fe490ccc8d21c2d1d4d2a2dbfc8678a8406abb8bb8f9e6626c')
source=("$url/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz")
b2sums=('1cfe87ad9b520d8851f3d7ec9e1f1f788210951ed167ad09486c64fa6b4321b1d473009d3f911b8066a65a88818254fabbbe4dcd34de63505e40a8b739d3ba7a')
#validpgpkeys=('5134EF9EAF65F95B6BB1608E50FB9B273A9D0BB5' # Johannes Löthberg <johannes@kyriasis.com>
# '04DC3FB1445FECA813C27EFAEA4F7B321A906AD9') # Daniel M. Capella <polyzen@archlinux.org>
prepare() {
cd pacman-contrib-v$pkgver
patch --forward --strip=1 --input=../0001-pactree-fix-compilation-with-pacman-6.patch
cd $pkgname-v$pkgver
./autogen.sh
}
build() {
cd pacman-contrib-v$pkgver
cd $pkgname-v$pkgver
./configure \
--prefix=/usr \
--sysconfdir=/etc \
@ -43,12 +35,12 @@ build() {
}
check() {
make -C pacman-contrib-v$pkgver check
cd $pkgname-v$pkgver
make check
}
package() {
cd pacman-contrib-v$pkgver
cd $pkgname-v$pkgver
make DESTDIR="$pkgdir" install
}

110
pacman-contrib/configure vendored Normal file
View File

@ -0,0 +1,110 @@
`configure' configures pacman-contrib 1.4.0 to adapt to many kinds of systems.
Usage: src/pacman-contrib-v1.5.0/configure [OPTION]... [VAR=VALUE]...
To assign environment variables (e.g., CC, CFLAGS...), specify them as
VAR=VALUE. See below for descriptions of some of the useful variables.
Defaults for the options are specified in brackets.
Configuration:
-h, --help display this help and exit
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
-q, --quiet, --silent do not print `checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for `--cache-file=config.cache'
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or `..']
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[/usr/local]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[PREFIX]
By default, `make install' will install all the files in
`/usr/local/bin', `/usr/local/lib' etc. You can specify
an installation prefix other than `/usr/local' using `--prefix',
for instance `--prefix=$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
--datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
--datadir=DIR read-only architecture-independent data [DATAROOTDIR]
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/pacman-contrib]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
--psdir=DIR ps documentation [DOCDIR]
Program names:
--program-prefix=PREFIX prepend PREFIX to installed program names
--program-suffix=SUFFIX append SUFFIX to installed program names
--program-transform-name=PROGRAM run sed PROGRAM on installed program names
Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-silent-rules less verbose build output (undo: "make V=1")
--disable-silent-rules verbose build output (undo: "make V=0")
--disable-doc prevent make from looking at doc/ dir
--enable-debug enable debugging support
--enable-warningflags enable extra compiler warning flags
--enable-git-version enable use of git version in version string if
available
--enable-dependency-tracking
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-root-dir=PATH set the location of the root operating directory
--with-vim-dir=PATH set the location of the vim runtime file directory
Some influential environment variables:
CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
PKG_CONFIG path to pkg-config utility
PKG_CONFIG_PATH
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
LIBARCHIVE_CFLAGS
C compiler flags for LIBARCHIVE, overriding pkg-config
LIBARCHIVE_LIBS
linker flags for LIBARCHIVE, overriding pkg-config
LIBALPM_CFLAGS
C compiler flags for LIBALPM, overriding pkg-config
LIBALPM_LIBS
linker flags for LIBALPM, overriding pkg-config
LIBMAKEPKGDIR
value of libmakepkgdir for libmakepkg, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <pacman-contrib@lists.archlinux.org>.

View File

@ -5,13 +5,13 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=python-pytest
pkgver=6.2.5
pkgrel=03
pkgver=7.1.2
pkgrel=01
pkgdesc="Simple powerful testing with Python"
arch=('any')
url="https://pytest.org/"
depends=('python-attrs' 'python-iniconfig' 'python-packaging' 'python-pluggy'
'python-py' 'python-toml')
'python-py' 'python-tomli')
makedepends=('python-setuptools')
checkdepends=('python-argcomplete' 'python-hypothesis' 'python-mock'
'python-nose' 'python-requests' 'python-xmlschema'
@ -21,14 +21,13 @@ checkdepends=('python-argcomplete' 'python-hypothesis' 'python-mock'
'python-pytest-xdist' 'python-twisted' 'anything-sync-daemon')
source=("https://files.pythonhosted.org/packages/source/p/pytest/pytest-$pkgver.tar.gz")
# Remove dep on setuptools_scm and workaround test failures
# Remove dep on setuptools_scm
prepare() {
cd pytest-$pkgver
sed -i "/^\[metadata\]/a version = $pkgver
/setuptools-scm/d" setup.cfg
sed -i '/setuptools-scm\|wheel/d
/\[tool.setuptools_scm\]/,/^$/d
/_pytest.warning_types.PytestUnknownMarkWarning/a \ "ignore:Creating a LegacyVersion has been deprecated and will be removed in the next major release:DeprecationWarning",' pyproject.toml
/\[tool.setuptools_scm\]/,/^$/d' pyproject.toml
}
build() {
@ -36,12 +35,13 @@ build() {
python setup.py build
}
#check() {
# cd pytest-$pkgver
# python -m venv --system-site-packages test-env
# test-env/bin/python setup.py install --optimize=1 --skip-build
# test-env/bin/python -m pytest
#}
check() {
cd pytest-$pkgver
python -m venv --system-site-packages test-env
test-env/bin/python setup.py install --optimize=1 --skip-build
test-env/bin/python -m pytest
}
# tests fail "asd not defined" installed anything-sync-daemon to help it, one test passed one still fails??
#
@ -51,10 +51,10 @@ package() {
install -D -m644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
}
#---- license gpg-key sha256sums ----
license=('MIT')
sha256sums=('131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89')
b2sums=('9dfc87279617be58353566009325f929e6fa53d54fd4c665a75f3b359ab5415972d745a680eb85ab21ca9eaec84450bc1decd50566b0ccdf90d7551f3d03ee70')
sha256sums=(131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89) # pytest-6.2.5.tar.gz
license=('MIT')
b2sums=('c59e477ba52f2ff6f9885b91bbdc9b70dd4ffced3902417cd2e8cf28ba778e92ab5738f1be4d1c8c5c41c7140ac56622b6d44261d618426ae39fd00026bf139c')
sha256sums=(a06a0425453864a270bc45e71f783330a7428defb4230fb5e6a731fde06ecd45) # pytest-7.1.2.tar.gz

View File

@ -3,14 +3,14 @@
# Contributor: Felix Kaiser <felix.kaiser@fxkr.net>
pkgname=python-pytest
pkgver=6.2.5
pkgrel=3
pkgver=7.1.2
pkgrel=1
pkgdesc="Simple powerful testing with Python"
arch=('any')
license=('MIT')
url="https://pytest.org/"
depends=('python-attrs' 'python-iniconfig' 'python-packaging' 'python-pluggy'
'python-py' 'python-toml')
'python-py' 'python-tomli')
makedepends=('python-setuptools')
checkdepends=('python-argcomplete' 'python-hypothesis' 'python-mock'
'python-nose' 'python-requests' 'python-xmlschema'
@ -19,17 +19,16 @@ checkdepends=('python-argcomplete' 'python-hypothesis' 'python-mock'
'python-jinja' 'python-numpy' 'python-pexpect' 'python-pygments'
'python-pytest-xdist' 'python-twisted')
source=("https://files.pythonhosted.org/packages/source/p/pytest/pytest-$pkgver.tar.gz")
sha256sums=('131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89')
b2sums=('9dfc87279617be58353566009325f929e6fa53d54fd4c665a75f3b359ab5415972d745a680eb85ab21ca9eaec84450bc1decd50566b0ccdf90d7551f3d03ee70')
sha256sums=('a06a0425453864a270bc45e71f783330a7428defb4230fb5e6a731fde06ecd45')
b2sums=('c59e477ba52f2ff6f9885b91bbdc9b70dd4ffced3902417cd2e8cf28ba778e92ab5738f1be4d1c8c5c41c7140ac56622b6d44261d618426ae39fd00026bf139c')
# Remove dep on setuptools_scm and workaround test failures
# Remove dep on setuptools_scm
prepare() {
cd pytest-$pkgver
sed -i "/^\[metadata\]/a version = $pkgver
/setuptools-scm/d" setup.cfg
sed -i '/setuptools-scm\|wheel/d
/\[tool.setuptools_scm\]/,/^$/d
/_pytest.warning_types.PytestUnknownMarkWarning/a \ "ignore:Creating a LegacyVersion has been deprecated and will be removed in the next major release:DeprecationWarning",' pyproject.toml
/\[tool.setuptools_scm\]/,/^$/d' pyproject.toml
}
build() {

View File

@ -6,7 +6,7 @@ python-mock
python-iniconfig
python-pluggy
python-py
python-toml
python-tomli
python-nose
python-requests
python-xmlschema

View File

@ -2,12 +2,13 @@
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=qt6-base
_qtver=6.3.0
pkgver=${_qtver/-/}
pkgrel=01
pkgrel=03
arch=(x86_64)
url='https://www.qt.io'
pkgdesc='A cross-platform application and UI framework'
@ -28,10 +29,12 @@ groups=(qt6)
#options=(debug) # uncomment this to have qt6-base-debug produced
_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
qtbug-102177.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=94751cbf
qt6-base-cflags.patch
qt6-base-nostrip.patch)
prepare() {
patch -d $_pkgfn -p1 < qtbug-102177.patch # Fix crashes in QtCreator
patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake
@ -81,5 +84,8 @@ package() {
license=(GPL3 LGPL3 FDL custom)
sha256sums=(b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99 # qtbase-everywhere-src-6.3.0.tar.xz
cc71e75acbda998a1f8f25ad3abe380886eef34899063344ead4df6a46efbcc9 # qtbug-102177.patch
5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qt6-base-cflags.patch
4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094) # qt6-base-nostrip.patch

View File

@ -5,7 +5,7 @@
pkgname=qt6-base
_qtver=6.3.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=3
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@ -27,15 +27,18 @@ groups=(qt6)
options=(debug)
_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
qtbug-102177.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=94751cbf
qt6-base-cflags.patch
qt6-base-nostrip.patch)
sha256sums=('b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99'
'cc71e75acbda998a1f8f25ad3abe380886eef34899063344ead4df6a46efbcc9'
'5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
'4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
prepare() {
patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake
patch -d $_pkgfn -p1 < qtbug-102177.patch # Fix crashes in QtCreator
}
build() {

View File

@ -33,3 +33,5 @@ freetds
xmlstarlet
cmake
jsoncpp

View File

@ -0,0 +1,68 @@
From 94751cbfb54f98cf1b1be14c6e22a8b93547a177 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 31 Mar 2022 11:34:29 +0200
Subject: Ensure that readAllStandardError() doesn't crash on assert
Ensure that it's safe to call readAllStandardError()
when process channel mode is set to MergedChannels.
Task-number: QTBUG-102177
Task-number: QTCREATORBUG-27196
Change-Id: I01073255d9347dee4654d602802a12d341372b73
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit b49f7e064c648f7de9782f1a5bbd652429db8e5b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
src/corelib/io/qprocess.cpp | 14 ++++++++++----
tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 10 ++++++++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 3378412502..6d85d1e87e 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -1942,10 +1942,16 @@ QByteArray QProcess::readAllStandardOutput()
*/
QByteArray QProcess::readAllStandardError()
{
- ProcessChannel tmp = readChannel();
- setReadChannel(StandardError);
- QByteArray data = readAll();
- setReadChannel(tmp);
+ Q_D(QProcess);
+ QByteArray data;
+ if (d->processChannelMode == MergedChannels) {
+ qWarning("QProcess::readAllStandardError: Called with MergedChannels");
+ } else {
+ ProcessChannel tmp = readChannel();
+ setReadChannel(StandardError);
+ data = readAll();
+ setReadChannel(tmp);
+ }
return data;
}
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index 80005a7284..16b7dc666f 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -1082,6 +1082,16 @@ void tst_QProcess::mergedChannels()
QVERIFY(process.waitForStarted(5000));
+ {
+ QCOMPARE(process.write("abc"), qlonglong(3));
+ while (process.bytesAvailable() < 6)
+ QVERIFY(process.waitForReadyRead(5000));
+ QCOMPARE(process.readAllStandardOutput(), QByteArray("aabbcc"));
+ QTest::ignoreMessage(QtWarningMsg,
+ "QProcess::readAllStandardError: Called with MergedChannels");
+ QCOMPARE(process.readAllStandardError(), QByteArray());
+ }
+
for (int i = 0; i < 100; ++i) {
QCOMPARE(process.write("abc"), qlonglong(3));
while (process.bytesAvailable() < 6)
--
cgit v1.2.1

View File

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=vala
pkgver=0.54.7
pkgver=0.56.1
pkgrel=01
pkgdesc='Compiler for the GObject type system'
url='https://wiki.gnome.org/Projects/Vala'
@ -17,7 +17,9 @@ checkdepends=(dbus libx11 gobject-introspection)
provides=(valadoc libvala-${pkgver%.*}.so libvaladoc-${pkgver%.*}.so)
conflicts=(valadoc)
replaces=(valadoc)
_commit=1a4aac8f53b388220bf291f0814e0724e003dca8 # tags/0.54.7^0
#options=(debug) ## uncomment this to have the debug package produced
_commit=ef23c1bd93e5c4f3e52f87ef98e3cf7a833a18d9 # tags/0.56.1^0
source=("git+https://gitlab.gnome.org/GNOME/vala.git#commit=$_commit")
pkgver() {

View File

@ -4,7 +4,7 @@
# Contributor: Timm Preetz <timm@preetz.us>
pkgname=vala
pkgver=0.54.7
pkgver=0.56.1
pkgrel=1
pkgdesc='Compiler for the GObject type system'
url='https://wiki.gnome.org/Projects/Vala'
@ -16,7 +16,8 @@ checkdepends=(dbus libx11 gobject-introspection)
provides=(valadoc libvala-${pkgver%.*}.so libvaladoc-${pkgver%.*}.so)
conflicts=(valadoc)
replaces=(valadoc)
_commit=1a4aac8f53b388220bf291f0814e0724e003dca8 # tags/0.54.7^0
options=(debug)
_commit=ef23c1bd93e5c4f3e52f87ef98e3cf7a833a18d9 # tags/0.56.1^0
source=("git+https://gitlab.gnome.org/GNOME/vala.git#commit=$_commit")
sha256sums=('SKIP')

View File

@ -9,4 +9,6 @@ autoconf-archive
libx11
gobject-introspection
automake
bison byacc
bison
byacc

View File

@ -1,12 +1,13 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=valgrind
pkgver=3.18.1
pkgrel=03
pkgver=3.19.0
pkgrel=01
pkgdesc='Tool to help find memory-management problems in programs'
arch=('x86_64')
url='http://valgrind.org/'
@ -19,9 +20,7 @@ provides=('valgrind-multilib')
replaces=('valgrind-multilib')
options=('!emptydirs' '!strip')
source=(https://sourceware.org/pub/valgrind/valgrind-${pkgver}.tar.bz2{,.asc}
valgrind-3.7.0-respect-flags.patch
valgrind-3.18.1-glibc-2.35.patch)
valgrind-3.7.0-respect-flags.patch)
options=(!lto) # https://bugs.kde.org/show_bug.cgi?id=338252
prepare() {
@ -29,9 +28,6 @@ prepare() {
patch -Np1 < ../valgrind-3.7.0-respect-flags.patch
sed -i 's|sgml/docbook/xsl-stylesheets|xml/docbook/xsl-stylesheets-1.79.2-nons|' docs/Makefile.am
# https://sourceware.org/git/?p=valgrind.git;a=commitdiff;h=1024237358
patch -p1 -i "${srcdir}"/valgrind-3.18.1-glibc-2.35.patch
autoreconf -ifv
}
@ -110,17 +106,7 @@ validpgpkeys=(
EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A # Mark Wielaard <mjw@gnu.org>
)
sha512sums=('a03b5cd7eafab4a1cea07f46464c1546ae1cb3d106649626b1e55658badf90e58d1f3854a38a33d5dffd8237f5555ae7e1f27a4b40e06254f87825c7fc61b59b'
'SKIP'
'e0cec39381cefeca09ae4794cca309dfac7c8693e6315e137e64f5c33684598726d41cfbb4edf764fe985503b13ff596184ca5fc32b159d500ec092e4cf8838c'
'7ea1bb314c9da0cc7ad5779facb953ece38ae2c9a541d1af1fd044eb01f44c51acbdfc9cc1667ad96ed21475d35b3416884011eecd2ceab97126d5123c2827f9')
b2sums=('a98322e4c12ae1bc495659217bd398b85e459288e775ba5f543b9ce1faa5bdfc17791178c0e7b9703a31588cc4c7cbde814b7a43b2ec76e7362e2aeeb100d935'
'SKIP'
'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a'
'2fd0865716de0690cdc468f1cb81fa5b830be450525c46e97821d263d0547158aee6ab3c954081564b3821e47143e01d9f9b07f9589e2000bd02132ef5e9de97')
sha256sums=(00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5 # valgrind-3.18.1.tar.bz2
b81173e5bf6580ad52d2c98b0a3c937cf467a703bf049686d15a6397535a063d # valgrind-3.18.1.tar.bz2.asc
4e6be3a1799c17a6e843ab1966a3a68ac0ffa83d4b2230ce1b607518c42a31a2 # valgrind-3.7.0-respect-flags.patch
8be6cad05e4bdf3e10e1faf10f02d761c86a2104b3c587c279beb1c3f96b675d) # valgrind-3.18.1-glibc-2.35.patch
sha256sums=(dd5e34486f1a483ff7be7300cc16b4d6b24690987877c3278d797534d6738f02 # valgrind-3.19.0.tar.bz2
ea11f3437e50d370fee28649151a2f24c6b7e3cfd788364bdd2c7fee08154e31 # valgrind-3.19.0.tar.bz2.asc
4e6be3a1799c17a6e843ab1966a3a68ac0ffa83d4b2230ce1b607518c42a31a2) # valgrind-3.7.0-respect-flags.patch
# 8be6cad05e4bdf3e10e1faf10f02d761c86a2104b3c587c279beb1c3f96b675d) # valgrind-3.18.1-glibc-2.35.patch

View File

@ -3,8 +3,8 @@
# Contributor: Allan McRae <allan@archlinux.org>
pkgname=valgrind
pkgver=3.18.1
pkgrel=3
pkgver=3.19.0
pkgrel=1
pkgdesc='Tool to help find memory-management problems in programs'
arch=('x86_64')
license=('GPL')
@ -18,20 +18,17 @@ provides=('valgrind-multilib')
replaces=('valgrind-multilib')
options=('!emptydirs' '!strip')
source=(https://sourceware.org/pub/valgrind/valgrind-${pkgver}.tar.bz2{,.asc}
valgrind-3.7.0-respect-flags.patch
valgrind-3.18.1-glibc-2.35.patch)
valgrind-3.7.0-respect-flags.patch)
validpgpkeys=(
0E9FFD0C16A1856CF9C7C690BA0166E698FA6035 # Julian Seward <jseward@acm.org>
EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A # Mark Wielaard <mjw@gnu.org>
)
sha512sums=('a03b5cd7eafab4a1cea07f46464c1546ae1cb3d106649626b1e55658badf90e58d1f3854a38a33d5dffd8237f5555ae7e1f27a4b40e06254f87825c7fc61b59b'
sha512sums=('f720a89dc4c4989cc5714bff9efe97529f71990bcfad7a92b889ce099c4326d6da07fa4d5fbab2e9125e20f352354f6178471e49e419b613a3c82c2a1c667ab2'
'SKIP'
'e0cec39381cefeca09ae4794cca309dfac7c8693e6315e137e64f5c33684598726d41cfbb4edf764fe985503b13ff596184ca5fc32b159d500ec092e4cf8838c'
'7ea1bb314c9da0cc7ad5779facb953ece38ae2c9a541d1af1fd044eb01f44c51acbdfc9cc1667ad96ed21475d35b3416884011eecd2ceab97126d5123c2827f9')
b2sums=('a98322e4c12ae1bc495659217bd398b85e459288e775ba5f543b9ce1faa5bdfc17791178c0e7b9703a31588cc4c7cbde814b7a43b2ec76e7362e2aeeb100d935'
'e0cec39381cefeca09ae4794cca309dfac7c8693e6315e137e64f5c33684598726d41cfbb4edf764fe985503b13ff596184ca5fc32b159d500ec092e4cf8838c')
b2sums=('d3ccd25789ec4d87a0ddab58d8098246a33a083505b42adaa94ee3af659cbe073e516bc98163ef56233e6cd9de2125839b71ee443fbc0db6557dcb35a6c05280'
'SKIP'
'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a'
'2fd0865716de0690cdc468f1cb81fa5b830be450525c46e97821d263d0547158aee6ab3c954081564b3821e47143e01d9f9b07f9589e2000bd02132ef5e9de97')
'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a')
options=(!lto) # https://bugs.kde.org/show_bug.cgi?id=338252
prepare() {
@ -39,9 +36,6 @@ prepare() {
patch -Np1 < ../valgrind-3.7.0-respect-flags.patch
sed -i 's|sgml/docbook/xsl-stylesheets|xml/docbook/xsl-stylesheets-1.79.2-nons|' docs/Makefile.am
# https://sourceware.org/git/?p=valgrind.git;a=commitdiff;h=1024237358
patch -p1 -i "${srcdir}"/valgrind-3.18.1-glibc-2.35.patch
autoreconf -ifv
}

View File

@ -6,3 +6,4 @@ docbook-xsl
docbook-sgml
autoconf
automake