backports/*: sync with 3.19 testing #278

Merged
ayakael merged 40 commits from 3.19-initial into edge 2023-11-24 22:35:29 +00:00
60 changed files with 200 additions and 2079 deletions

View file

@ -65,6 +65,12 @@ build-x86_64:
tags:
- apk-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME-x86_64
build-aarch64:
extends: .build
when: always
tags:
- apk-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME-aarch64
build-ppc64le:
extends: .build
when: manual

View file

@ -1,42 +0,0 @@
# Maintainer: psykose <alice@ayaya.dev>
pkgname=cargo-auditable
pkgver=0.6.1
pkgrel=1
pkgdesc="Cargo wrapper for embedding auditing data"
url="https://github.com/rust-secure-code/cargo-auditable"
arch="all"
license="MIT OR Apache-2.0"
makedepends="cargo"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v$pkgver.tar.gz
lock.patch
"
options="net"
prepare() {
default_prepare
cargo fetch --target="$CTARGET" --locked
}
build() {
msg "building cargo auditable"
cargo build --release --frozen
msg "rebuilding with cargo-auditable itself"
PATH="$PATH:$PWD/target/release" \
cargo auditable build --release --frozen
}
check() {
cargo test --frozen
}
package() {
install -Dm755 target/release/cargo-auditable -t "$pkgdir"/usr/bin/
install -Dm644 cargo-auditable/cargo-auditable.1 -t "$pkgdir"/usr/share/man/man1/
}
sha512sums="
191b6ef15436bd3c6a9b4666e80de5a085afe00f8ee3793040fc5e5f78eecc25d45e556fe8279b600f362b46cbecae6c6f7e21060ea0d2344f459817749f4616 cargo-auditable-0.6.1.tar.gz
9fa1b61897559fd9d4da8c43fa69b76b04f9a4dfedeb1973b096948e7684b16c2142bada7f7d2e8f9aa80e483b40aa662c45f6eaa87d3fa213d1e53816e9aaad lock.patch
"

View file

@ -1,13 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index 00969c9..5caabbd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -72,7 +72,7 @@ dependencies = [
[[package]]
name = "cargo-auditable"
-version = "0.6.0"
+version = "0.6.1"
dependencies = [
"auditable-info",
"auditable-serde",

View file

@ -1,39 +0,0 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: psykose <alice@ayaya.dev>
pkgname=catch2-3
pkgver=3.3.2
pkgrel=0
arch="all"
url="https://github.com/catchorg/Catch2"
pkgdesc="A modern, C++-native, header-only, test framework for unit-tests (v3)"
license="BSL-1.0"
makedepends="
cmake
python3
samurai
"
source="https://github.com/catchorg/Catch2/archive/v$pkgver/catch2-v$pkgver.tar.gz"
subpackages="$pkgname-doc"
builddir="$srcdir/Catch2-$pkgver"
build() {
cmake -B build -G Ninja \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib
cmake --build build
}
check() {
cd build
# ApprovalTests is broken https://github.com/catchorg/Catch2/issues/1780
CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "ApprovalTests"
}
package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
3d0c5666509a19be54ea0c48a3c8e1c4a951a2d991a7c9f7fe6d326661464538f1ab9dc573b1b2647f49fb6bef45bbd866142a4ce0fba38545ad182b8d55f61f catch2-v3.3.2.tar.gz
"

View file

@ -1,68 +0,0 @@
Author: Holger Jaekel <holger.jaekel@gmx.de>
Summary: ignore googletest, glog, and benchmark from the third-party folder
----
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@
# C++ standard can be overridden when this is used as a sub-project.
if(NOT CMAKE_CXX_STANDARD)
# This project requires C++11.
- set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
endif(NOT CMAKE_CXX_STANDARD)
@@ -187,26 +187,8 @@
# CPU cycles on the CI.
set(BUILD_TESTING_SAVED "${BUILD_TESTING}")
set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
- add_subdirectory("third_party/glog" EXCLUDE_FROM_ALL)
set(BUILD_TESTING "${BUILD_TESTING_SAVED}" CACHE BOOL "" FORCE)
- # glog triggers deprecation warnings on OSX.
- # https://github.com/google/glog/issues/185
- if(CRC32C_HAVE_NO_DEPRECATED)
- set_property(TARGET glog APPEND PROPERTY COMPILE_OPTIONS -Wno-deprecated)
- endif(CRC32C_HAVE_NO_DEPRECATED)
-
- # glog triggers sign comparison warnings on gcc.
- if(CRC32C_HAVE_NO_SIGN_COMPARE)
- set_property(TARGET glog APPEND PROPERTY COMPILE_OPTIONS -Wno-sign-compare)
- endif(CRC32C_HAVE_NO_SIGN_COMPARE)
-
- # glog triggers unused parameter warnings on clang.
- if(CRC32C_HAVE_NO_UNUSED_PARAMETER)
- set_property(TARGET glog
- APPEND PROPERTY COMPILE_OPTIONS -Wno-unused-parameter)
- endif(CRC32C_HAVE_NO_UNUSED_PARAMETER)
-
set(CRC32C_TESTS_BUILT_WITH_GLOG 1)
endif(CRC32C_USE_GLOG)
@@ -314,17 +296,6 @@
set(install_gtest OFF)
set(install_gmock OFF)
- # This project is tested using GoogleTest.
- add_subdirectory("third_party/googletest")
-
- # GoogleTest triggers a missing field initializers warning.
- if(CRC32C_HAVE_NO_MISSING_FIELD_INITIALIZERS)
- set_property(TARGET gtest
- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
- set_property(TARGET gmock
- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
- endif(CRC32C_HAVE_NO_MISSING_FIELD_INITIALIZERS)
-
add_executable(crc32c_tests "")
target_sources(crc32c_tests
PRIVATE
@@ -385,7 +356,6 @@
# This project uses Google benchmark for benchmarking.
set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
set(BENCHMARK_ENABLE_EXCEPTIONS OFF CACHE BOOL "" FORCE)
- add_subdirectory("third_party/benchmark")
target_link_libraries(crc32c_bench benchmark)
if(CRC32C_USE_GLOG)

View file

@ -1,45 +0,0 @@
# Contributor: Holger Jaekel <holger.jaekel@gmx.de>
# Maintainer: Holger Jaekel <holger.jaekel@gmx.de>
pkgname=crc32c
pkgver=1.1.2
pkgrel=0
pkgdesc="CRC32C implementation with support for CPU-specific acceleration instructions"
url="https://github.com/google/crc32c"
arch="all"
license="BSD-3-Clause"
makedepends="cmake samurai"
checkdepends="benchmark-dev glog-dev gtest-dev"
subpackages="$pkgname-dev"
source="crc32c-$pkgver.tar.gz::https://github.com/google/crc32c/archive/$pkgver.tar.gz
10-third-party.patch"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
cmake -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=None \
-DCRC32C_BUILD_TESTS="$(want_check && echo ON || echo OFF)" \
-DCRC32C_BUILD_BENCHMARKS="$(want_check && echo ON || echo OFF)" \
-DCRC32C_USE_GLOG="$(want_check && echo ON || echo OFF)" \
-DCRC32C_INSTALL=ON \
$CMAKE_CROSSOPTS .
cmake --build build
}
check() {
cd build
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
./crc32c_bench
}
package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196 crc32c-1.1.2.tar.gz
1f83e03d53271ee65a21e04c57392313003227a71a8c6de1fcf6c5d9041eaeb3cd08a9d4b86a610b80c06589cd06d36ae5e224d109256300b05fa65d638beddb 10-third-party.patch
"

View file

@ -1,20 +0,0 @@
# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
pkgname=font-parisienne
pkgver=1
pkgrel=1
pkgdesc="Parisienne is a casual connecting script inspired by a 1960s Bra advertisement"
url="https://fonts.google.com/specimen/Parisienne"
arch="noarch"
license="OFL-1.1"
source="Parisienne-$pkgver.zip::https://fonts.google.com/download?family=Parisienne"
options="!check" # No code to test
builddir="$srcdir/"
package() {
install -Dm644 ./Parisienne-Regular.ttf -t "$pkgdir"/usr/share/fonts/parisienne
}
sha512sums="
a5099b4952b26c31bc1aa363318b4a13a3c156712e58b601534a6530780bc1938420970a50a3a22cbf3f4dff647660b3cafdc4d05a4c86b86a8d21a7bb5efab0 Parisienne-1.zip
"

View file

@ -1,373 +0,0 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
#
# secfixes:
# 2.40.1-r0:
# - CVE-2023-25652
# - CVE-2023-25815
# - CVE-2023-29007
# 2.39.2-r0:
# - CVE-2023-22490
# - CVE-2023-23946
# 2.39.1-r0:
# - CVE-2022-41903
# - CVE-2022-23521
# 2.38.1-r0:
# - CVE-2022-39253
# - CVE-2022-39260
# 2.37.1-r0:
# - CVE-2022-29187
# 2.35.2-r0:
# - CVE-2022-24765
# 2.30.2-r0:
# - CVE-2021-21300
# 2.26.2-r0:
# - CVE-2020-11008
# 2.26.1-r0:
# - CVE-2020-5260
# 2.24.1-r0:
# - CVE-2019-1348
# - CVE-2019-1349
# - CVE-2019-1350
# - CVE-2019-1351
# - CVE-2019-1352
# - CVE-2019-1353
# - CVE-2019-1354
# - CVE-2019-1387
# - CVE-2019-19604
# 2.19.1-r0:
# - CVE-2018-17456
# 2.17.1-r0:
# - CVE-2018-11233
# - CVE-2018-11235
# 2.14.1-r0:
# - CVE-2017-1000117
# 0:
# - CVE-2021-29468
# - CVE-2021-46101
pkgname=git
pkgver=2.41.0
pkgrel=2
pkgdesc="Distributed version control system"
url="https://www.git-scm.com/"
arch="all"
license="GPL-2.0-only"
makedepends="
curl-dev
expat-dev
file
openssl-dev>3
pcre2-dev
perl-dev
perl-error
xmlto
zlib-dev
"
# note that order matters
subpackages="
$pkgname-dbg
$pkgname-bash-completion
$pkgname-prompt::noarch
perl-$pkgname-svn:_perl_git_svn:noarch
perl-$pkgname:_perl_git:noarch
$pkgname-svn::noarch
$pkgname-email
$pkgname-fast-import:_fast_import:noarch
$pkgname-cvs::noarch
$pkgname-daemon
$pkgname-daemon-openrc:daemon_openrc
$pkgname-scalar
$pkgname-gitweb::noarch
$pkgname-subtree::noarch
$pkgname-diff-highlight:diff_highlight:noarch
$pkgname-perl:_git_perl:noarch
"
source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
git-daemon.initd
git-daemon.confd
fix-t4219-with-sticky-bit.patch
"
options="$options !check" # a few need updated for perl 5.38
_gitcoredir=/usr/libexec/git-core
if [ -z "$BOOTSTRAP" ]; then
# we need tcl and tk to be built before git due to git-gui and gitk
makedepends="$makedepends asciidoc python3-dev tcl tk libsecret-dev glib-dev"
subpackages="$subpackages
$pkgname-doc
$pkgname-p4::noarch
$pkgname-gui::noarch
$pkgname-gitk::noarch
$pkgname-subtree-doc:subtree_doc:noarch
$pkgname-credential-libsecret:credential_libsecret
"
fi
case "$CARCH" in
s390x)
# todo: they fail with strange between-test email mismatches
options="$options !check"
;;
esac
prepare() {
default_prepare
cat >> config.mak <<-EOF
NO_GETTEXT=YesPlease
NO_SVN_TESTS=YesPlease
NO_REGEX=YesPlease
NO_SYS_POLL_H=1
ICONV_OMITS_BOM=Yes
INSTALL_SYMLINKS=1
CC=${CC:-cc}
CXX=${CC:-c++}
CFLAGS=$CFLAGS -flto=auto
LDFLAGS=$LDFLAGS -flto=auto
USE_LIBPCRE2=YesPlease
PYTHON_PATH=/usr/bin/python3
EOF
if [ -n "$BOOTSTRAP" ]; then
cat >> config.mak <<-EOF
NO_PYTHON=YesPlease
NO_TCLTK=YesPlease
EOF
fi
}
build() {
make prefix=/usr \
DESTDIR="$pkgdir" \
perllibdir="$(_perl_config vendorlib)" \
all
make -C contrib/subtree prefix=/usr DESTDIR="$pkgdir"
make -C contrib/diff-highlight prefix=/usr DESTDIR="$pkgdir"
if [ -z "$BOOTSTRAP" ]; then
# generate manpages outside of package()
make prefix=/usr man
make prefix=/usr -C contrib/credential/libsecret
fi
}
check() {
make -C t prefix=/usr DESTDIR="$pkgdir" \
perlibdir="$(_perl_config vendorlib)" \
all
}
package() {
if [ -z "$BOOTSTRAP" ]; then
local install_man=install-man
fi
make prefix=/usr \
DESTDIR="$pkgdir" \
INSTALLDIRS=vendor \
perllibdir="$(_perl_config vendorlib)" \
install \
$install_man
make -C contrib/subtree install prefix=/usr DESTDIR="$pkgdir"
mkdir -p "$pkgdir"/var/git
install -Dm755 "$srcdir"/git-daemon.initd "$pkgdir"/etc/init.d/git-daemon
install -Dm644 "$srcdir"/git-daemon.confd "$pkgdir"/etc/conf.d/git-daemon
install -Dm755 contrib/diff-highlight/diff-highlight -t "$pkgdir"/usr/bin/
install -Dm644 contrib/completion/git-completion.bash \
"$pkgdir"/usr/share/bash-completion/completions/git
install -Dm644 contrib/completion/git-prompt.sh \
"$pkgdir"/usr/share/git-core/git-prompt.sh
if [ -z "$BOOTSTRAP" ]; then
install -Dm755 contrib/credential/libsecret/git-credential-libsecret "$pkgdir"/usr/libexec/git-core
fi
}
prompt() {
pkgdesc="bash and zsh prompt integration for Git"
depends="git=$pkgver-r$pkgrel"
amove usr/share/git-core/git-prompt.sh
}
_perl_git_svn() {
pkgdesc="Perl interface to Git::SVN"
depends="git=$pkgver-r$pkgrel perl-git=$pkgver-r$pkgrel"
local vendorlib=$(_perl_config vendorlib)
amove $vendorlib/Git/SVN*
}
_perl_git() {
pkgdesc="Perl interface to Git"
depends="git=$pkgver-r$pkgrel perl-error"
local i
for i in "$(_perl_config vendorlib)" "$(_perl_config vendorarch)"; do
[ -d "$pkgdir/$i" ] || continue
amove $i
done
}
email() {
pkgdesc="Git tools for sending email"
depends="perl perl-git=$pkgver-r$pkgrel perl-net-smtp-ssl perl-authen-sasl"
amove $_gitcoredir/*email*
amove $_gitcoredir/*imap*
}
svn() {
pkgdesc="Subversion support for git"
depends="
perl
perl-git-svn=$pkgver-r$pkgrel
perl-subversion
perl-term-readkey
"
amove $_gitcoredir/git-svn
}
cvs() {
pkgdesc="Git tools for importing CVS repositories"
depends="perl perl-git=$pkgver-r$pkgrel cvs perl-dbd-sqlite"
amove usr/bin/git-cvs*
amove $_gitcoredir/*cvs*
}
_fast_import() {
pkgdesc="Git backend for fast Git data importers"
depends="git=$pkgver-r$pkgrel"
amove $_gitcoredir/git-fast-import
}
p4() {
pkgdesc="Git tools for working with Perforce depots"
depends="git=$pkgver-r$pkgrel git-fast-import=$pkgver-r$pkgrel"
amove $_gitcoredir/*p4*
amove $_gitcoredir/mergetools/*p4*
}
daemon() {
pkgdesc="Git protocol daemon"
depends="git=$pkgver-r$pkgrel"
amove $_gitcoredir/git-daemon
amove $_gitcoredir/git-http-backend
amove $_gitcoredir/git-shell
}
daemon_openrc() {
pkgdesc="Git protocol daemon"
default_openrc
depends="git-daemon=$pkgver-r$pkgrel $depends_openrc"
install_if="openrc $pkgname-daemon=$pkgver-r$pkgrel"
}
gitweb() {
pkgdesc="Simple web interface to git repositories"
depends="git=$pkgver-r$pkgrel perl"
amove $_gitcoredir/git-instaweb
amove usr/share/gitweb
}
subtree() {
depends="git=$pkgver-r$pkgrel"
pkgdesc="Split git repository into subtrees"
amove $_gitcoredir/git-subtree
}
subtree_doc() {
pkgdesc="Split git repository into subtrees (documentation)"
depends=""
install_if="docs git-subtree=$pkgver-r$pkgrel"
cd "$builddir"/contrib/subtree
make install-man prefix=/usr DESTDIR="$subpkgdir"
gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1
}
gui() {
pkgdesc="GUI interface for git"
depends="git=$pkgver-r$pkgrel tcl tk"
amove usr/share/git-gui
amove $_gitcoredir/git-citool
amove $_gitcoredir/git-gui
amove $_gitcoredir/git-gui--askpass
}
gitk() {
pkgdesc="Gitk interface for git"
depends="git=$pkgver-r$pkgrel tcl tk"
amove usr/share/gitk
amove usr/bin/gitk
}
diff_highlight() {
pkgdesc="diff highlight for git"
depends="git=$pkgver-r$pkgrel perl"
amove usr/bin/diff-highlight
}
credential_libsecret() {
pkgdesc="libsecret-based credential helper"
depends="git=$pkgver-r$pkgrel"
amove usr/libexec/git-core/git-credential-libsecret
}
scalar() {
pkgdesc="Git scalar monorepo tool"
depends="git=$pkgver-r$pkgrel"
amove usr/bin/scalar
amove usr/libexec/git-core/scalar
}
# catch-the-rest of stuff that needs perl
_git_perl() {
pkgdesc="Additional Git commands that requires perl"
depends="git=$pkgver-r$pkgrel perl-git=$pkgver-r$pkgrel perl"
install_if="git=$pkgver-r$pkgrel perl"
mkdir -p "$subpkgdir"/usr/lib
cd "$pkgdir"
find . -type f -print0 | xargs -0 file --mime-type | grep perl | cut -d: -f1 | while read -r f; do
amove "$f"
done
find "$subpkgdir" -name perllocal.pod -delete
}
# Prints values of the Config.pm variable $1.
_perl_config() {
perl -e "use Config; print \$Config{$1};"
}
sha512sums="
a215bc6d89afbddd56adac901c24ea2b7f98a37bf6a6a2756893947012ffaa850e76247a3445a5ab13ab5a462f39986fec33eed086148aba5eb554dc1799fee0 git-2.41.0.tar.xz
89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd
fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd
be5d568fc5b8b84c9afb97b31e471e41f32ccfe188eba0588ea0ef98b2d96c2ce4b2c1a3d70e88205aa4f6667f850b3f32c13bbb149ecddbf670344c162a4e25 fix-t4219-with-sticky-bit.patch
"

View file

@ -1,48 +0,0 @@
The last test of t4129 creates a directory and expects its setgid bit
(g+s) to be off. But this makes the test fail when the parent directory
has the bit set, as setgid's state is inherited by newly created
subdirectories. Make the test more robust by accepting the presence of
the setgid bit on the created directory. We only allow 'S' (setgid on
but no executable permission) and not 's' (setgid on with executable
permission) because the previous 'umask 0077' shouldn't allow the second
scenario to happen.
Note that only subdirectories inherit this bit, so we don't have to make
the same change for the regular file that is also created by this test.
But checking the permissions using grep instead of test_cmp makes the
test a little simpler, so let's use it for the regular file as well.
Also note that the sticky bit (+t) and the setuid bit (u+s) are not
inherited, so we don't have to worry about those.
Reported-by: Kevin Daudt <me@ikke.info>
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
---
t/t4129-apply-samemode.sh | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
index 41818d8315..3818398ca9 100755
--- a/t/t4129-apply-samemode.sh
+++ b/t/t4129-apply-samemode.sh
@@ -90,12 +90,10 @@ test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree
rm -rf d f1 &&
git apply patch-f1-and-f2.txt &&
- echo "-rw-------" >f1_mode.expected &&
- echo "drwx------" >d_mode.expected &&
- test_modebits f1 >f1_mode.actual &&
- test_modebits d >d_mode.actual &&
- test_cmp f1_mode.expected f1_mode.actual &&
- test_cmp d_mode.expected d_mode.actual
+ test_modebits f1 >f1_mode &&
+ test_modebits d >d_mode &&
+ grep "^-rw-------$" f1_mode &&
+ grep "^drwx--[-S]---$" d_mode
)
'
--
2.29.2

View file

@ -1,19 +0,0 @@
# conf.d file for git-daemon
#
# Please check man 1 git-daemon for more information about the options
# git-daemon accepts. You MUST edit this to include your repositories you wish
# to serve.
#
# Some of the meaningful options are:
# --syslog --- Enables syslog logging
# --verbose --- Enables verbose logging
# --export-all --- Exports all repositories
# --port=XXXX --- Starts in port XXXX instead of 9418
#
GITDAEMON_OPTS="--syslog --base-path=/var/git"
# To run an anonymous git safely, the following user should be able to only
# read your Git repositories. It should not be able to write to anywhere on
# your system, esp. not the repositories.
GIT_USER="nobody"
GIT_GROUP="nobody"

View file

@ -1,13 +0,0 @@
#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
pidfile="/var/run/git-daemon.pid"
command="/usr/bin/git"
command_args="daemon ${GITDAEMON_OPTS}"
start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
depend() {
use logger
}

View file

@ -1,76 +0,0 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=kicad
pkgver=7.0.7
pkgrel=0
pkgdesc="Cross Platform and Open Source Electronics Design Automation Suite"
url="https://www.kicad.org/"
# No support for s390x/riscv64 in libcontext (shipped with kicad)
# 32-bit arm: memory alignment access error in tests
arch="all !armhf !armv7 !riscv64 !s390x"
license="GPL-3.0-or-later"
makedepends="
boost-dev
cairo-dev
chrpath
cmake
curl-dev
glew-dev
glm-dev
ngspice-dev
opencascade-dev
py3-wxpython
python3-dev
samurai
swig
unixodbc-dev
wxwidgets-dev
zlib-dev
"
depends="python3"
subpackages="$pkgname-doc"
source="
https://gitlab.com/kicad/code/kicad/-/archive/$pkgver/kicad-$pkgver.tar.gz
"
provides="$pkgname-opencascade=$pkgver-r$pkgrel"
replaces="$pkgname-opencascade"
build() {
# XXX: GLIBCXX_ASSERTIONS causes link errors and symbols are missing
# -DKICAD_STDLIB_LIGHT_DEBUG also enables this, maybe that works instead
CFLAGS="$CFLAGS -O2" \
CXXFLAGS="$CXXFLAGS -U_GLIBCXX_ASSERTIONS -O2" \
cmake -B build -G Ninja -Wno-dev \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DKICAD_USE_EGL=ON \
-DKICAD_SCRIPTING_WXPYTHON=ON \
-DKICAD_USE_BUNDLED_GLEW=ON
# build order workaround
cmake --build build --target common/pcb_lexer.h
cmake --build build
}
check() {
ctest --test-dir build --output-on-failure \
-E '(qa_eeschema|qa_common|qa_pcbnew)'
}
package() {
DESTDIR="$pkgdir" cmake --install build
local sitedir=$(python3 -c "import site; print(site.getsitepackages()[0])")
chrpath -d "$pkgdir/$sitedir"/_pcbnew.so
}
doc() {
default_doc
amove usr/share/kicad/demos
}
sha512sums="
f3c00e682b658de042e5d7c0bf8ebc8a27a078a38e49620b385c818a02667e7d9366a7b44fe8531412c0b02ca3e9a542a69a7c69006740e059c1ce5a4f7fdff3 kicad-7.0.7.tar.gz
"

View file

@ -1,46 +0,0 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=lib3mf
pkgver=2.2.0
pkgrel=0
pkgdesc="A C++ implementation of the 3D Manufacturing Format file standard"
url="https://github.com/3MFConsortium/lib3mf"
# "Generating hourglass API bindings and implementation stub" fail on ARM, s390x, and ppc64le
arch="all !armv7 !armhf !aarch64 !s390x !ppc64le"
license="BSD-2-Clause"
subpackages="$pkgname-dev"
makedepends="
cmake
libzip-dev
ninja
util-linux-dev
zlib-dev
"
source="$pkgname-$pkgver.tar.gz::https://github.com/3MFConsortium/lib3mf/archive/v$pkgver.tar.gz"
options="!check" # Unit tests requires source code of googletest, which is git submodule but not included in the release
build() {
cmake -B build \
-G Ninja \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_INCLUDEDIR=include/lib3mf \
-DCMAKE_INSTALL_LIBDIR=lib \
-DUSE_INCLUDED_ZLIB=OFF \
-DUSE_INCLUDED_LIBZIP=OFF \
-DLIB3MF_TESTS=FALSE
cmake --build build
}
package() {
DESTDIR="$pkgdir" cmake --install build
# fix Cflags in lib3mf.pc
sed -e 's!Cflags: -I${includedir}!Cflags: -I${includedir} -I${includedir}/Bindings/C -I${includedir}/Bindings/Cpp!' \
-i "$pkgdir"/usr/lib/pkgconfig/lib3mf.pc
# some packages expect lib3MF.pc instead of lib3mf.pc
ln -s lib3mf.pc "$pkgdir"/usr/lib/pkgconfig/lib3MF.pc
}
sha512sums="
2a9ee92312396b8966967a7ed696c58c69a77438f94432ad071659adc8c9d12fba34a3cf3d8c8d3ad3b26c12c9a89f4d8645e6f396987dc05b04952b004a1f07 lib3mf-2.2.0.tar.gz
"

View file

@ -1,70 +0,0 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=ngspice
pkgver=37
pkgrel=0
pkgdesc="open source spice simulator for electric and electronic circuits"
url="https://ngspice.sourceforge.net/"
arch="all"
license="BSD-3-Clause"
makedepends="libxaw-dev libedit-dev readline-dev"
depends="python3"
subpackages="$pkgname-doc $pkgname-dev"
source="
https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/old-releases/$pkgver/ngspice-$pkgver.tar.gz
$pkgname.pc
"
prepare() {
default_prepare
sed -e "s/@PKGVER@/$pkgver/" -i "$srcdir"/$pkgname.pc
# a lot of tests fail because of unexpected "No compatibility mode selected!"
# this replaces them with no-op makefiles
echo -e "check: ;\nall: ;\ninstall: ;" > tests/regression/Makefile.in
echo -e "check: ;\nall: ;\ninstall: ;" > tests/xspice/Makefile.in
}
build() {
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--with-readline=yes \
--enable-xspice \
--enable-cider \
--enable-openmp \
--with-ngshared
make
# build the binary ngspice, which is only build without --with-ngshared
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--with-readline=yes \
--enable-xspice \
--enable-cider \
--enable-openmp
make
}
check() {
make check
}
package() {
make DESTDIR="$pkgdir" install
install -Dm755 src/.libs/libngspice.so.0.0.4 "$pkgdir"/usr/lib/libngspice.so.0.0.4
install -Dm644 src/include/ngspice/sharedspice.h "$pkgdir"/usr/include/ngspice/sharedspice.h
ln -s "libngspice.so.0.0.4" "$pkgdir/usr/lib/libngspice.so.0"
ln -s "libngspice.so.0.0.4" "$pkgdir/usr/lib/libngspice.so"
install -Dm644 "$srcdir"/ngspice.pc "$pkgdir"/usr/lib/pkgconfig/ngspice.pc
}
sha512sums="
d49f7e78d3dd17ac8ea03d79dfbe8a9cf57c012395285cc0c0cf379e0c0c81f11cad68d5366dc2d2478959ed197e4d43380fbc15baf44f987f20ad00f1ee04ca ngspice-37.tar.gz
211321d3c56f06a58ce500807284657294beef1e712c2ce3e9b2253e622c6882cf1f1233fa18427902cac5bd9d31f48c7be64a03bc6e2705d3f10f4752c41b7c ngspice.pc
"

View file

@ -1,12 +0,0 @@
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include/ngspice
modules=1
Name: ngspice
Version: @PKGVER@
Description: Open Source Spice Simulator for Electric and Electronic Circuits.
Requires:
Libs: -L${libdir} -lngspice
Cflags: -I${includedir}

View file

@ -1,70 +0,0 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=opencascade
pkgver=7.6.3
pkgrel=1
pkgdesc="An SDK for development of applications dealing with 3D CAD data"
url="https://dev.opencascade.org/"
# s390x blocked by vtk -> netcdf
arch="all !s390x"
license="LGPL-2.1-only"
makedepends="
cmake
doxygen
freeimage-dev
freetype-dev
libtbb
libtbb-dev
libxi-dev
libxmu-dev
mesa-dev
ninja
tk
tk-dev
vtk-dev
"
subpackages="$pkgname-doc $pkgname-dev"
# remove updatecache on next update
source="$pkgname-$pkgver-updatecache.tar.gz::https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V${pkgver//./_}.tar.gz
no_mallinfo.patch
no_feenableexcept.patch
cmake_fix_install_dir.patch
cmake_add_buildtype_none.patch
no_backtrace.patch
fix-tbb-2021.patch
x11vtkconflict.patch
"
builddir="$srcdir/OCCT-${pkgver//./_}"
options="!check" # No tests provided :-/
build() {
# Disabling ffmpeg for now, as VTK already uses ffmpeg in version 5, while OCC only
# builds with ffmpeg4 right now. vtk-dev depends on ffmpeg-dev which conflics with
# ffmpeg4-dev. Once patched to build with ffmpeg-dev (not ffmpeg4-dev), ffmpeg support
# should be re-enabled.
cmake -B build -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DUSE_GL2PS=OFF \
-DUSE_FREEIMAGE=ON \
-DUSE_FFMPEG=OFF \
-DUSE_VTK=ON \
-DUSE_TBB=ON \
-D3RDPARTY_VTK_INCLUDE_DIR=/usr/include/vtk-9.2/
cmake --build build
}
package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
bdcdc79ce5bf1df4d7a4b90a4ce33fabf5fefeb75f33d58c571014c5cff9e4e2d444a518b741002654e29f0b50babad852b10636c3c888afb49628e1752abca7 opencascade-7.6.3-updatecache.tar.gz
e04cb898ec16c57ea5f2e9e79f6616153b7f6e4ddcad815f5d28898a692e26e1054a8f3321e6ee8616a915b10d45927f5e596c4f096c5333be910eaea751cce3 no_mallinfo.patch
b039b8fce696bfd0f53309a72adab4065780bf1755da6208040157e9383deb0061ad8927a6f160730f431cbebe3fdd1eaa7967b38da4a245a8d9306042d97629 no_feenableexcept.patch
10481f153adf1db55111d68da49dae1885a50e745d3a978f6316b5b13a3f2d7de6a2ed6a3c60c20ef967ea65c16b372da03bf2665ffe4493ad6fe329a3abf368 cmake_fix_install_dir.patch
4bdedc8f0e011530115777cddeeb898750242999725347c3392d8858e5cc9543c791814aa41e1543c575a6a79b0b32fd72970bb83c8948fe42f33993244db1cf cmake_add_buildtype_none.patch
86dceb6e8309e18f5ea72ce2e3524ff08dc761ffe76557d62a1a4f2824ca0e2f9dfc194cae22164aaaf5ad9a15a6ec0f1fef443241aa2ccb0a2140de217c8a90 no_backtrace.patch
80a5fdfec8159bfcfa2dce8f6635c8567eef64b0b142046ed2b7fc7a77849d14ae9b588b04daf5b5789d18130cbc40c5396af22787f38d8cd425f9f53d1fff9c fix-tbb-2021.patch
8f5abf58f4a1b84aee99c75bbaeb2267655f306b6a3e12600a4db34201106dd380c7e30e37d4db81841be8ba9455604a10bfaa6e50e73801097ce141840f3d8e x11vtkconflict.patch
"

View file

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c6a41b..ff973e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/adm/cmake")
set (CMAKE_SUPPRESS_REGENERATION TRUE)
-set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
+set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo None CACHE INTERNAL "" FORCE)
# macro: include patched file if it exists
macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)

View file

@ -1,30 +0,0 @@
Fixes:
> CMake Error at cmake_install.cmake:8340 (configure_file):
> configure_file Problem configuring file
First posted on Arch Linux
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b445de..1c6a41b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1122,7 +1122,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
endforeach()
# install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
foreach (OCCT_MODULE ${OCCT_MODULES})
if (BUILD_MODULE_${OCCT_MODULE})
diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
index 8220ecd..d1ceea6 100644
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -598,7 +598,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
"cmake_policy(PUSH)
cmake_policy(SET CMP0007 NEW)
string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+ file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
file (REMOVE \"\${TARGET_FILENAME}\")

View file

@ -1,45 +0,0 @@
X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FOSD%2FOSD_Parallel_TBB.cxx;h=0b9022b57630b98a47ed090eff8233c5d15148bb;hp=2344a6ca2df9c2d01c8a73579060c9cb44d3d789;hb=740833a6a88e481f474783c426b6f6311ed586d3;hpb=20095306111bc6e035c001e719231a894bdd6882
diff --git a/src/OSD/OSD_Parallel_TBB.cxx b/src/OSD/OSD_Parallel_TBB.cxx
index 2344a6ca2d..0b9022b576 100644
--- a/src/OSD/OSD_Parallel_TBB.cxx
+++ b/src/OSD/OSD_Parallel_TBB.cxx
@@ -25,7 +25,9 @@ Standard_DISABLE_DEPRECATION_WARNINGS
#include <tbb/parallel_for.h>
#include <tbb/parallel_for_each.h>
#include <tbb/blocked_range.h>
-#include <tbb/task_scheduler_init.h>
+#if TBB_VERSION_MAJOR < 2021
+ #include <tbb/task_scheduler_init.h>
+#endif
Standard_ENABLE_DEPRECATION_WARNINGS
//=======================================================================
@@ -38,12 +40,16 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
const FunctorInterface& theFunctor,
Standard_Integer theNbItems)
{
+#if TBB_VERSION_MAJOR >= 2021
+ // task_scheduler_init is removed,
+ // exceptions are captured without proxy tbb::captured_exception object
+ (void )theNbItems;
+ tbb::parallel_for_each (theBegin, theEnd, theFunctor);
+#else
try
{
const Handle(OSD_ThreadPool)& aThreadPool = OSD_ThreadPool::DefaultPool();
- const Standard_Integer aNbThreads = theNbItems > 0 ?
- aThreadPool->NbDefaultThreadsToLaunch() : -1;
-
+ const Standard_Integer aNbThreads = theNbItems > 0 ? aThreadPool->NbDefaultThreadsToLaunch() : -1;
tbb::task_scheduler_init aScheduler (aNbThreads);
tbb::parallel_for_each (theBegin, theEnd, theFunctor);
}
@@ -51,6 +57,7 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
{
throw Standard_ProgramError (anException.what());
}
+#endif
}
#endif /* HAVE_TBB */

View file

@ -1,63 +0,0 @@
--- ./src/Standard/Standard_StackTrace.cxx
+++ ./src/Standard/Standard_StackTrace.cxx
@@ -30,7 +30,6 @@
#elif defined(__QNX__)
//#include <backtrace.h> // requires linking to libbacktrace
#elif !defined(_WIN32) && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
- #include <execinfo.h>
#elif defined(_WIN32) && !defined(OCCT_UWP)
#include <Standard_WarningsDisable.hxx>
@@ -314,51 +313,6 @@
return false;
#endif
#else
- const int aTopSkip = theNbTopSkip + 1; // skip this function call and specified extra number
- int aNbTraces = theNbTraces + aTopSkip;
- void** aStackArr = (void** )alloca (sizeof(void*) * aNbTraces);
- if (aStackArr == NULL)
- {
- return false;
- }
-
- aNbTraces = ::backtrace (aStackArr, aNbTraces);
- if (aNbTraces <= 1)
- {
- return false;
- }
-
- aNbTraces -= aTopSkip;
- char** aStrings = ::backtrace_symbols (aStackArr + aTopSkip, aNbTraces);
- if (aStrings == NULL)
- {
- return false;
- }
-
- const size_t aLenInit = strlen (theBuffer);
- size_t aLimit = (size_t) theBufferSize - aLenInit - 1;
- if (aLimit > 14)
- {
- strcat (theBuffer, "\n==Backtrace==");
- aLimit -= 14;
- }
- for (int aLineIter = 0; aLineIter < aNbTraces; ++aLineIter)
- {
- const size_t aLen = strlen (aStrings[aLineIter]);
- if (aLen + 1 >= aLimit)
- {
- break;
- }
-
- strcat (theBuffer, "\n");
- strcat (theBuffer, aStrings[aLineIter]);
- aLimit -= aLen + 1;
- }
- free (aStrings);
- if (aLimit > 14)
- {
- strcat (theBuffer, "\n=============");
- }
- return true;
+ return false;
#endif
}

View file

@ -1,41 +0,0 @@
musl does not provice feenableexcept and fedisableexcept. Those calls have
only been used on linux so far. This patch extends the #ifdef logic to only use
them on Linux if additionally glibc is used.
--- occt-V7_4_0-org/src/OSD/OSD_signal.cxx
+++ occt-V7_4_0/src/OSD/OSD_signal.cxx
@@ -678,7 +678,7 @@
// POSIX threads
#include <pthread.h>
-#ifdef __linux__
+#ifdef __linux__ && defined(__GLIBC__)
#include <cfenv>
//#include <fenv.h>
#endif
@@ -793,7 +793,7 @@
case SIGFPE:
sigaddset(&set, SIGFPE);
sigprocmask(SIG_UNBLOCK, &set, NULL) ;
-#ifdef __linux__
+#ifdef __linux__ && defined(__GLIBC__)
OSD::SetFloatingSignal (Standard_True);
#endif
#if (!defined (__sun)) && (!defined(SOLARIS))
@@ -914,7 +914,7 @@
//=======================================================================
void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
{
-#if defined (__linux__)
+#if defined (__linux__) && defined(__GLIBC__)
feclearexcept (FE_ALL_EXCEPT);
if (theFloatingSignal)
{
@@ -947,7 +947,7 @@
//=======================================================================
Standard_Boolean OSD::ToCatchFloatingSignals()
{
-#if defined (__linux__)
+#if defined (__linux__) && defined(__GLIBC__)
return (fegetexcept() & _OSD_FPX) != 0;
#else
return Standard_False;

View file

@ -1,61 +0,0 @@
--- ./src/OSD/OSD_MemInfo.cxx.old
+++ ./src/OSD/OSD_MemInfo.cxx
@@ -35,6 +35,9 @@
#include <sstream>
#include <fstream>
+#include <sys/time.h>
+#include <sys/resource.h>
+
#include <OSD_MemInfo.hxx>
#if defined(__EMSCRIPTEN__)
@@ -161,18 +164,22 @@
|| IsActive (MemWorkingSetPeak))
{
// /proc/%d/status is not emulated - get more info from mallinfo()
- const struct mallinfo aMI = mallinfo();
+ // mallinfo() not available with musl. We use getrusage to approximate it
+ // with the maximum resident set size
+ struct rusage ru = { .ru_maxrss = 0 };
+ getrusage(RUSAGE_SELF, &ru);
if (IsActive (MemHeapUsage))
{
- myCounters[MemHeapUsage] = aMI.uordblks;
+ myCounters[MemHeapUsage] = ru.ru_maxrss;
}
if (IsActive (MemWorkingSet))
{
- myCounters[MemWorkingSet] = aMI.uordblks;
+ myCounters[MemWorkingSet] = ru.ru_maxrss;
}
if (IsActive (MemWorkingSetPeak))
{
- myCounters[MemWorkingSetPeak] = aMI.usmblks;
+ //usmblks is always 0
+ myCounters[MemWorkingSetPeak] = 0;
}
}
if (IsActive (MemVirtual))
@@ -182,18 +189,9 @@
#elif (defined(__linux__) || defined(__linux))
if (IsActive (MemHeapUsage))
{
- #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
- #if __GLIBC_PREREQ(2,33)
- #define HAS_MALLINFO2
- #endif
- #endif
-
- #ifdef HAS_MALLINFO2
- const struct mallinfo2 aMI = mallinfo2();
- #else
- const struct mallinfo aMI = mallinfo();
- #endif
- myCounters[MemHeapUsage] = aMI.uordblks;
+ struct rusage ru = { .ru_maxrss = 0 };
+ getrusage(RUSAGE_SELF, &ru);
+ myCounters[MemHeapUsage] = ru.ru_maxrss;
}
if (!IsActive (MemVirtual)

View file

@ -1,19 +0,0 @@
--- ./src/IVtkDraw/IVtkDraw_Interactor.cxx.orig
+++ ./src/IVtkDraw/IVtkDraw_Interactor.cxx
@@ -27,6 +27,16 @@
#undef AllValues
#endif
+// Prevent naming collisions between X11
+// and VTK versions 9.2.0 and above.
+// X11 is included through glx
+#ifdef Status
+#undef Status
+#endif
+#ifdef Success
+#undef Success
+#endif
+
#include <vtkXRenderWindowInteractor.h>
#include <vtkXOpenGLRenderWindow.h>
#endif

View file

@ -1,34 +0,0 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=opencsg
pkgver=1.4.2
pkgrel=2
pkgdesc="A library that does image-based CSG rendering using OpenGL"
url="http://www.opencsg.org/"
arch="all"
license="GPL-2.0-only"
subpackages="$pkgname-dev $pkgname-example"
makedepends="glew-dev freeglut-dev"
source="http://www.opencsg.org/OpenCSG-$pkgver.tar.gz"
builddir="$srcdir/OpenCSG-$pkgver"
build() {
make -j1
}
check() {
make check
}
package() {
for folder in src example; do
sed -e 's/\/usr\/local\//\/usr\//g' -i $folder/Makefile
make INSTALL_ROOT="$pkgdir" install -j 1 -C $folder
done
}
example() {
mkdir -p "$subpkgdir"/usr/
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
sha512sums="fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778 OpenCSG-1.4.2.tar.gz"

View file

@ -1,34 +0,0 @@
# Automatically generated by apkbuild-cpan, template 3
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=perl-file-homedir
#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
_pkgreal=File-HomeDir
pkgver=1.006
pkgrel=0
pkgdesc="Find your home and other directories on any platform"
url="https://metacpan.org/release/File-HomeDir/"
arch="noarch"
license="GPL-1.0-or-later OR Artistic-1.0-Perl"
depends="perl perl-file-which"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/File-HomeDir-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
build() {
export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
make
}
check() {
export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
make test
}
package() {
make DESTDIR="$pkgdir" install
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
sha512sums="1ea90d68ed059ef5e890f6afb1280673dd5a597956f282c4ae8b4471c1751aa3cb2fcbe9caa6b2976937d11fd7233aa85a2dea611f87c79e0ddd1a501ceb890d File-HomeDir-1.006.tar.gz"

View file

@ -1,36 +0,0 @@
# Contributor: TBK <alpine@jjtc.eu>
# Maintainer: Andy Postnikov <apostnikov@gmail.com>
pkgname=php81-pecl-mcrypt
_extname=mcrypt
pkgver=1.0.6
pkgrel=0
pkgdesc="Provides PHP 8.1 bindings for the unmaintained libmcrypt - PECL"
url="https://pecl.php.net/package/mcrypt"
arch="all"
license="PHP-3.01"
depends="php81-common"
makedepends="php81-dev libmcrypt-dev"
source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
builddir="$srcdir/$_extname-$pkgver"
build() {
phpize81
./configure --prefix=/usr --with-php-config=php-config81
make
}
check() {
# rm -f tests/mcrypt_rijndael128_128BitKey.phpt # fails
make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
}
package() {
make INSTALL_ROOT="$pkgdir" install
local _confdir="$pkgdir"/etc/php81/conf.d
install -d $_confdir
echo "extension=$_extname" > $_confdir/$_extname.ini
}
sha512sums="
506d5eb5b52aea6d48ab1800326fdd46af7992511bd9ac6604bb090d3724e058c936265da064cd6188bc0445d646a3678a7540498925ae7d119f821b2bd43880 php-pecl-mcrypt-1.0.6.tgz
"

View file

@ -1,38 +0,0 @@
# Contributor: TBK <alpine@jjtc.eu>
# Maintainer: Andy Postnikov <apostnikov@gmail.com>
pkgname=php82-pecl-mcrypt
_extname=mcrypt
pkgver=1.0.6
pkgrel=0
pkgdesc="Provides PHP 8.2 bindings for the unmaintained libmcrypt - PECL"
url="https://pecl.php.net/package/mcrypt"
arch="all"
license="PHP-3.01"
_phpv=82
_php=php$_phpv
depends="$_php-common"
makedepends="$_php-dev libmcrypt-dev"
source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
builddir="$srcdir/$_extname-$pkgver"
build() {
phpize$_phpv
./configure --prefix=/usr --with-php-config=php-config$_phpv
make
}
check() {
# rm -f tests/mcrypt_rijndael128_128BitKey.phpt # fails
make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
}
package() {
make INSTALL_ROOT="$pkgdir" install
local _confdir="$pkgdir"/etc/$_php/conf.d
install -d $_confdir
echo "extension=$_extname" > $_confdir/$_extname.ini
}
sha512sums="
506d5eb5b52aea6d48ab1800326fdd46af7992511bd9ac6604bb090d3724e058c936265da064cd6188bc0445d646a3678a7540498925ae7d119f821b2bd43880 php-pecl-mcrypt-1.0.6.tgz
"

View file

@ -1,6 +1,6 @@
# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
pkgname=py3-a2wsgi
pkgver=1.7.0
pkgver=1.8.0
pkgrel=0
pkgdesc="Convert WSGI app to ASGI app or ASGI app to WSGI app"
url="https://github.com/abersheeran/a2wsgi"
@ -10,9 +10,7 @@ depends="python3"
makedepends="py3-gpep517 py3-pdm-backend py3-wheel"
checkdepends="py3-pytest py3-httpx py3-pytest-asyncio"
subpackages="$pkgname-pyc"
source="https://github.com/abersheeran/a2wsgi/archive/refs/tags/v$pkgver/a2wsgi-$pkgver.tar.gz
pdm-backend.patch
"
source="https://github.com/abersheeran/a2wsgi/archive/refs/tags/v$pkgver/a2wsgi-$pkgver.tar.gz"
builddir="$srcdir/a2wsgi-$pkgver"
case "$CARCH" in
@ -22,22 +20,21 @@ esac
build() {
gpep517 build-wheel \
--wheel-dir dist \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
check() {
python3 -m venv --clear --without-pip --system-site-packages testenv
testenv/bin/python3 -m installer dist/*.whl
testenv/bin/python3 -m pytest
python3 -m venv --clear --without-pip --system-site-packages .testenv
.testenv/bin/python3 -m installer .dist/*.whl
.testenv/bin/python3 -m pytest
}
package() {
python3 -m installer -d "$pkgdir" \
dist/*.whl
.dist/*.whl
}
sha512sums="
010776279c7f2ceaa580395c226788ea72e14726cde8e3adb8304e9bd887d55736c5985ebd8055dfd48a15632543497e10163040ba677ffeddbd3d2e02e24440 a2wsgi-1.7.0.tar.gz
bb60783941b7308a82a87b058c571067ad4c26f3b605e717c87dca9f52f9457a1e72ba9ca56556ea3fb63789cbdcca46a67bfadf2bd4873d713ffbcfd3190a9c pdm-backend.patch
0c3a45ea279e2c104a52a7b70780de7a055312e857b712b534020a2c9f43b62b5d60639b5ce721c5e3717f0315c58496134813772613135b22111905df10d5ad a2wsgi-1.8.0.tar.gz
"

View file

@ -1,8 +1,8 @@
# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=py3-cbor2
pkgver=5.4.6
pkgrel=1
pkgver=5.5.0
pkgrel=0
pkgdesc="encoding and decoding for CBOR (RFC 8949)"
url="https://github.com/agronholm/cbor2"
arch="all"
@ -11,12 +11,14 @@ depends="
python3
"
makedepends="
py3-gpep517
py3-setuptools
py3-setuptools_scm
py3-wheel
python3-dev
"
checkdepends="
py3-hypothesis
py3-pytest
py3-pytest-cov
py3-tomli
@ -26,17 +28,22 @@ source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/
builddir="$srcdir/"cbor2-$pkgver
build() {
python3 setup.py build
gpep517 build-wheel \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
check() {
PYTHONPATH="$(echo "$PWD"/build/lib.linux*)" pytest
python3 -m venv --clear --without-pip --system-site-packages .testenv
.testenv/bin/python3 -m installer .dist/*.whl
.testenv/bin/python3 -m pytest
}
package() {
python3 setup.py install --skip-build --root="$pkgdir"
python3 -m installer -d "$pkgdir" \
.dist/*.whl
}
sha512sums="
44fb3e2e2249c79b1454487670d53eb672ffae4c22374d2a2bb9e314ac15470e4e7913e4eb1981a8bd4d722e6827328dde7e57c5f0556843e951c4723ae5bd8e py3-cbor2-5.4.6.tar.gz
64b9ef0e358ac02113f85a2e633ed52900c4d5d6c89f889d9322f181e29fbdf9462663b5eaec7a255d5e6d47c82c4902cb7ff56999251c5ec070c7b610e615b3 py3-cbor2-5.5.0.tar.gz
"

View file

@ -2,10 +2,9 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=py3-codespell
_pkgname=${pkgname#py3-}
pkgver=2.2.4
pkgrel=1
pkgver=2.2.6
pkgrel=0
pkgdesc="Fix common misspellings in text files, primarily source code"
options="!check" # No testsuite
url="https://github.com/codespell-project/codespell/"
arch="noarch"
license="GPL-2.0-only"
@ -15,7 +14,7 @@ makedepends="
py3-setuptools_scm
py3-wheel
"
checkdepends="py3-pytest"
checkdepends="py3-pytest-cov"
depends="py3-chardet"
subpackages="$pkgname-pyc"
source="$pkgname-$pkgver.tar.gz::https://github.com/codespell-project/codespell/archive/refs/tags/v$pkgver.tar.gz"
@ -24,15 +23,23 @@ builddir="$srcdir"/$_pkgname-$pkgver
build() {
SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver \
gpep517 build-wheel \
--wheel-dir dist \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
check() {
python3 -m venv --clear --without-pip --system-site-packages .testenv
.testenv/bin/python3 -m installer .dist/*.whl
# tests want to run bin/codespell
PATH="$builddir/.testenv/bin:$PATH" .testenv/bin/python3 -m pytest
}
package() {
python3 -m installer -d "$pkgdir" \
dist/*.whl
.dist/*.whl
}
sha512sums="
fcf303af14d7f6c081c07a37376ac2c7068b89890073f81414cf9e30638681138f78b5b04bfe5282193bbaa83162b7b73a4e25e71b73b7f9cc0a5f5c623b5786 py3-codespell-2.2.4.tar.gz
37a6fbcf196447e8204a973499c6b3f7efda67e3caaaa707897da438c602834f91ca49b95020d2c03dcb95528c03451a2d9cfe145b2a24e88615c4a5418a4d2b py3-codespell-2.2.6.tar.gz
"

View file

@ -1,35 +0,0 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=py3-deepmerge
pkgver=1.1.0
pkgrel=0
pkgdesc="A toolset to deeply merge python dictionaries"
url="https://github.com/toumorokoshi/deepmerge"
arch="noarch"
license="MIT"
depends="python3"
makedepends="
py3-gpep517
py3-installer
py3-setuptools
py3-wheel
"
checkdepends="py3-pytest"
subpackages="$pkgname-pyc"
source="https://pypi.python.org/packages/source/d/deepmerge/deepmerge-$pkgver.tar.gz"
options="!check" # No tests
builddir="$srcdir/deepmerge-$pkgver"
build() {
gpep517 build-wheel \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
package() {
python3 -m installer -d "$pkgdir" .dist/*.whl
}
sha512sums="
9facde604ee02271ad49d9a14e88fa23690c41728c3c350594533725c2e38803cc75f9345ff19bb63ceb318ea7c58a46ed0d6091682560509401206c8b4e8537 deepmerge-1.1.0.tar.gz
"

View file

@ -1,43 +0,0 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=py3-docker-py
pkgver=6.1.3
pkgrel=0
pkgdesc="Python library for the Docker Engine API"
url="https://github.com/docker/docker-py"
arch="noarch"
license="Apache-2.0"
options="!check" # no docker avail
depends="
py3-packaging
py3-requests
py3-urllib3
py3-websocket-client
"
makedepends="
py3-gpep517
py3-setuptools
py3-setuptools_scm
py3-wheel
"
subpackages="$pkgname-pyc"
source="$pkgname-$pkgver.tar.gz::https://github.com/docker/docker-py/archive/$pkgver.tar.gz"
builddir="$srcdir/docker-py-$pkgver"
provides="docker-py=$pkgver-r$pkgrel"
replaces="docker-py"
build() {
export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
gpep517 build-wheel \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
package() {
python3 -m installer --destdir="$pkgdir" .dist/*.whl
}
sha512sums="
ba6ade2487afb8f68606b7d78c0f0dc83ffde622444a9598a5c647d0176695171040c5d1115fb8db6d97cb062a24d552d043274a56923b0eae0f64d98cb92c30 py3-docker-py-6.1.3.tar.gz
"

View file

@ -1,7 +1,7 @@
# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
# Contributor: lauren n. liberda <lauren@selfisekai.rocks>
# Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
pkgname=py3-flask-limiter
pkgver=3.3.1
pkgver=3.5.0
pkgrel=0
pkgdesc="Rate Limiting extension for Flask"
url="https://github.com/alisaifee/flask-limiter"
@ -45,6 +45,6 @@ package() {
}
sha512sums="
b3656c0ddf381694e710ecef91e610c87f30337b717100f46dcb3c0eb0a58f02073328af4187edc12f5aaeab54f03f0cefe666193e6e08a2da8c1a4f771a4597 flask-limiter-3.3.1.tar.gz
f97fd830fd0bbb2186c82451643413420be93872ed17d71d20c830a76ec3aee999bcda3a07b9d27d4602ef5fcd33f78888dc5d75c220eae5cb83ef02853151e6 flask-limiter-3.5.0.tar.gz
1b90e9134076cda249695d5ea741db9d205a2ae452c7d6edfe01eb37a221ce6f64b0e8ddcdbbee9b0e0fb16a28e5eabf14f1c1e41e965c7e3b93ea4f42caf553 our-std-is-good-enough.patch
"

View file

@ -6,7 +6,7 @@ pkgver=0.18.0
pkgrel=5
pkgdesc="Fuzzy string matching in python"
url="https://github.com/seatgeek/fuzzywuzzy"
# arch="noarch" blocked by levenshtein
arch="noarch"
license="GPL-2.0-only"
depends="python3 py3-levenshtein"
makedepends="py3-setuptools"

View file

@ -1,8 +1,8 @@
# Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
pkgname=py3-gitlab
_pyname=${pkgname/py3/python}
pkgver=3.14.0
pkgrel=1
pkgver=4.1.1
pkgrel=0
pkgdesc="Python wrapper for Gitlab's API"
url="https://github.com/python-gitlab/python-gitlab"
arch="noarch"
@ -17,32 +17,31 @@ makedepends="
py3-sphinxcontrib-autoprogram
py3-myst-parser
"
checkdepends="py3-pytest py3-responses"
checkdepends="py3-pytest py3-responses py3-build"
subpackages="$pkgname-doc $pkgname-pyc"
source="$pkgname-$pkgver.tar.gz::https://github.com/python-gitlab/python-gitlab/archive/refs/tags/v$pkgver.tar.gz"
builddir="$srcdir/$_pyname-$pkgver"
build() {
gpep517 build-wheel \
--wheel-dir dist \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
sphinx-build -W -b man docs/ man/
}
check() {
sed -i "s|/usr/bin/false|/bin/false|g" tests/unit/test_config.py
python3 -m venv --clear --without-pip --system-site-packages testenv
testenv/bin/python3 -m installer dist/*.whl
testenv/bin/python3 -m pytest --ignore=tests/functional/
python3 -m venv --clear --without-pip --system-site-packages .testenv
.testenv/bin/python3 -m installer .dist/*.whl
.testenv/bin/python3 -m pytest --ignore=tests/functional/
}
package() {
python3 -m installer -d "$pkgdir" \
dist/*.whl
.dist/*.whl
install -Dm644 man/$_pyname.1 \
"$pkgdir"/usr/share/man/man1/$_pyname.1
}
sha512sums="
01a41e6f4b9e316672b83270fce6fc30e69e9a0047644d04b27587eebda06dc2c575649367d9dc99b84782e940f236a07098a78d7c7662b555fd901e32d35176 py3-gitlab-3.14.0.tar.gz
a536204fde999f570156498fffbdf357727279492740989aa02e2747473a8f492136a2eaff5a0c90ffc82081879d9b75891c76c6fcd00b6a53b81a8f0fd20045 py3-gitlab-4.1.1.tar.gz
"

View file

@ -1,36 +0,0 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=py3-hatch-fancy-pypi-readme
_pkgname=${pkgname/py3-/}
pkgver=23.1.0
pkgrel=1
pkgdesc="Fancy PyPI READMEs with Hatch"
url="https://github.com/hynek/hatch-fancy-pypi-readme"
arch="noarch"
license="MIT"
makedepends="py3-gpep517 py3-installer py3-hatchling py3-hatch-vcs"
checkdepends="py3-pytest"
subpackages="$pkgname-pyc"
source="$pkgname-$pkgver.tar.gz::https://github.com/hynek/hatch-fancy-pypi-readme/archive/refs/tags/$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
gpep517 build-wheel \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
check() {
python3 -m venv --clear --without-pip --system-site-packages .testenv
.testenv/bin/python3 -m installer .dist/*.whl
.testenv/bin/python3 -m pytest -k 'not test_end_to_end.py'
}
package() {
python3 -m installer -d "$pkgdir" \
.dist/*.whl
}
sha512sums="
a26b8205877815292c7c65380f3fff43a3222ec5044556a29fb0b570f0822b548f8f4403cb6a800044671692806b257ecee5f9ec0f3efb597e9a5780a8885424 py3-hatch-fancy-pypi-readme-23.1.0.tar.gz
"

View file

@ -1,17 +1,16 @@
# Contributor: Michał Polański <michal@polanski.me>
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=py3-httptools
pkgver=0.5.0
pkgrel=3
pkgver=0.6.1
pkgrel=0
pkgdesc="Fast HTTP parser"
url="https://github.com/MagicStack/httptools"
license="MIT"
arch="all !riscv64" # llhttp
depends="python3"
arch="all"
makedepends="py3-setuptools python3-dev cython http-parser-dev llhttp-dev"
checkdepends="py3-pytest py3-aiohttp py3-openssl py3-psutil"
subpackages="$pkgname-pyc"
source="$pkgname-$pkgver.tar.gz::https://github.com/MagicStack/httptools/archive/v$pkgver/py3-httptools-$pkgver.tar.gz"
source="https://github.com/MagicStack/httptools/archive/v$pkgver/py3-httptools-$pkgver.tar.gz"
builddir="$srcdir/httptools-$pkgver"
build() {
@ -28,5 +27,5 @@ package() {
}
sha512sums="
f7db490d74fb0b8d57c452c7f5c252a506c2173a80349317016a05e5c343fc203ffe038453fedd14963b46dd5b6efdf46f6173855d10145fa1404bbb6beccb42 py3-httptools-0.5.0.tar.gz
28dc7e91dd15d9b26b1136428b8de2aaaaa3746d40aafce8e4f8ee68ec4b7f7e95a2677904810e34cd2aa1dd3738c43eef7497cbb751648d41929dc38927c426 py3-httptools-0.6.1.tar.gz
"

View file

@ -2,30 +2,36 @@
# Maintainer: prspkt <prspkt@protonmail.com>
pkgname=py3-jwcrypto
_pkgname=jwcrypto
pkgver=0.8
pkgrel=4
pkgver=1.5.0
pkgrel=1
pkgdesc="Python module implementing JOSE Web standards"
url="https://github.com/latchset/jwcrypto"
arch="noarch"
license="LGPL-3.0-only"
depends="python3 py3-cryptography py3-six"
makedepends="py3-setuptools"
depends="python3 py3-deprecated py3-cryptography"
makedepends="py3-gpep517 py3-setuptools py3-wheel"
checkdepends="py3-pytest"
subpackages="$pkgname-doc $pkgname-pyc"
source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir"/$_pkgname-$pkgver
builddir="$srcdir/$_pkgname-$pkgver"
build() {
python3 setup.py build
gpep517 build-wheel \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
check() {
cd "$builddir"/$_pkgname
py.test-3
python3 -m venv --clear --without-pip --system-site-packages .testenv
.testenv/bin/python3 -m installer .dist/*.whl
.testenv/bin/python3 -m pytest
}
package() {
python3 setup.py install --skip-build --root="$pkgdir"
python3 -m installer -d "$pkgdir" \
.dist/*.whl
}
sha512sums="e8dc62d6159e5722a572e049c41edc8e31fe0d022aa47987ab6720c7057cbac2f98cec5d35af1ea02f6bc6efde769810fde4b868e019956b138cfac529cc027d jwcrypto-0.8.tar.gz"
sha512sums="
8cb638203de32c5d63cc567069fc0ccf2195bb9a1f9783b747e7b77d38fb01d9512e82406f925010f70e4b7e73c8d699e0c32c5c89ee71cb99dd594a7e84c47e jwcrypto-1.5.0.tar.gz
"

View file

@ -1,14 +1,13 @@
# Contributor: Galen Abell <galen@galenabell.com>
# Maintainer: Galen Abell <galen@galenabell.com>
pkgname=py3-levenshtein
pkgver=0.21.0
pkgver=0.23.0
pkgrel=0
pkgdesc="Python extension for computing string edit distances and similarities"
url="https://github.com/maxbachmann/Levenshtein"
# fix me
# arch="all"
arch="all"
license="GPL-2.0-only"
depends="python3 py3-rapidfuzz"
depends="py3-rapidfuzz"
makedepends="
cmake
cython
@ -25,22 +24,22 @@ builddir="$srcdir/Levenshtein-$pkgver"
build() {
gpep517 build-wheel \
--wheel-dir dist \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
check() {
python3 -m venv --clear --without-pip --system-site-packages testenv
testenv/bin/python3 -m installer \
dist/Levenshtein*.whl
testenv/bin/python3 -m pytest
python3 -m venv --clear --without-pip --system-site-packages .testenv
.testenv/bin/python3 -m installer \
.dist/Levenshtein*.whl
.testenv/bin/python3 -m pytest
}
package() {
python3 -m installer -d "$pkgdir" \
dist/Levenshtein*.whl
.dist/Levenshtein*.whl
}
sha512sums="
bb1cf70497e89db5b427eb4ac79708d205fc9edfc9588d30c63ef6e3e77b9369c8892edc31c32cb135d54947e8eedb770d06a7d5c6f8743d44378d7d1a12d459 py3-levenshtein-0.21.0.tar.gz
137116f337f576534bf2c12dc49d35f81a3b267eb613e5e6cca6cb80e5701dd0adbfd97c1cec4ea8f1bb4dee2bc67deeb19553474348ea78af4e05b79ce01fdf py3-levenshtein-0.23.0.tar.gz
"

View file

@ -1,7 +1,7 @@
# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
# Contributor: lauren n. liberda <lauren@selfisekai.rocks>
# Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
pkgname=py3-pathvalidate
pkgver=3.1.0
pkgver=3.2.0
pkgrel=0
pkgdesc="Python library to sanitize/validate a string such as filenames/file-paths/etc"
url="https://github.com/thombashi/pathvalidate"
@ -31,5 +31,5 @@ package() {
}
sha512sums="
8f1d9905c5183ab66f20b9bbd69db0f0547ffde07333a36425f66b76191de47236bf1e0809b0cf4d181ea6714aeaef03e1b05dc1d6599e0d359cb96cdbec5db4 pathvalidate-3.1.0.tar.gz
d1b0e49028bc5497558d9a0c15b4e3c301cacb439bebccffc467fc23001854877dbc81a214cc6eb34c5a905a88c4f9394f5865a4de42f354b2450a3bfe10bb9e pathvalidate-3.2.0.tar.gz
"

View file

@ -1,43 +0,0 @@
# Contributor: omni <omni+alpine@hack.org>
# Maintainer: omni <omni+alpine@hack.org>
pkgname=py3-psycopg
pkgver=3.1.10
pkgrel=0
pkgdesc="PostgreSQL adapter for python"
options="!check" # Requires running database
url="https://www.psycopg.org/"
arch="all"
license="LGPL-2.0-or-later"
# TODO: Remove py3-typing-extensions after upgrading python3 to 3.11
makedepends="
libpq-dev
py3-gpep517
py3-setuptools
py3-wheel
python3-dev
"
subpackages="$pkgname-pyc"
source="https://files.pythonhosted.org/packages/source/p/psycopg/psycopg-$pkgver.tar.gz
typing-ext.patch
"
builddir="$srcdir/psycopg-$pkgver"
build() {
gpep517 build-wheel \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
check() {
make check
}
package() {
python3 -m installer -d "$pkgdir" \
.dist/*.whl
}
sha512sums="
9aad13a487e8b7e945a044d0b19e0e2cf14e87d3ffc6a03dd3fbf608886b056708fb700678f3d415ab1c19a8cb48a7a685729d0a3d43992beaae00f640b94669 psycopg-3.1.10.tar.gz
eea6e80ae5c15398425fbebd662eca480daa69cab217b1b15db096e5cf830192d4a9b2f1f6cbaf2e85871a5994beec7db41778242df9ef3766164165b253c9c1 typing-ext.patch
"

View file

@ -1,201 +0,0 @@
diff --git a/psycopg/_compat.py b/psycopg/_compat.py
index 7dbae79..b3f2a1c 100644
--- a/psycopg/_compat.py
+++ b/psycopg/_compat.py
@@ -11,12 +11,11 @@ from typing import Any, Awaitable, Generator, Optional, Sequence, Union, TypeVar
# NOTE: TypeAlias cannot be exported by this module, as pyright special-cases it.
# For this raisin it must be imported directly from typing_extension where used.
# See https://github.com/microsoft/pyright/issues/4197
-from typing_extensions import TypeAlias
if sys.version_info >= (3, 8):
- from typing import Protocol
+ from typing import Protocol, TypeAlias
else:
- from typing_extensions import Protocol
+ from typing import Protocol
T = TypeVar("T")
FutureT: TypeAlias = Union["asyncio.Future[T]", Generator[Any, None, T], Awaitable[T]]
@@ -52,12 +51,12 @@ else:
if sys.version_info >= (3, 10):
from typing import TypeGuard
else:
- from typing_extensions import TypeGuard
+ from typing import TypeGuard
if sys.version_info >= (3, 11):
from typing import LiteralString
else:
- from typing_extensions import LiteralString
+ from typing import LiteralString
__all__ = [
"Counter",
diff --git a/psycopg/_pipeline.py b/psycopg/_pipeline.py
index c818d86..ef9358e 100644
--- a/psycopg/_pipeline.py
+++ b/psycopg/_pipeline.py
@@ -7,7 +7,7 @@ commands pipeline management
import logging
from types import TracebackType
from typing import Any, List, Optional, Union, Tuple, Type, TypeVar, TYPE_CHECKING
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from . import pq
from . import errors as e
diff --git a/psycopg/_preparing.py b/psycopg/_preparing.py
index f60c0cb..cdf403f 100644
--- a/psycopg/_preparing.py
+++ b/psycopg/_preparing.py
@@ -7,7 +7,7 @@ Support for prepared statements
from enum import IntEnum, auto
from typing import Iterator, Optional, Sequence, Tuple, TYPE_CHECKING
from collections import OrderedDict
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from . import pq
from ._compat import Deque
diff --git a/psycopg/_struct.py b/psycopg/_struct.py
index 28a6084..a57ddf6 100644
--- a/psycopg/_struct.py
+++ b/psycopg/_struct.py
@@ -6,7 +6,7 @@ Utility functions to deal with binary structs.
import struct
from typing import Callable, cast, Optional, Tuple
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from .abc import Buffer
from . import errors as e
diff --git a/psycopg/_transform.py b/psycopg/_transform.py
index 19bd6ae..a4e3baf 100644
--- a/psycopg/_transform.py
+++ b/psycopg/_transform.py
@@ -7,7 +7,7 @@ Helper object to transform values between Python and PostgreSQL
from typing import Any, Dict, List, Optional, Sequence, Tuple
from typing import DefaultDict, TYPE_CHECKING
from collections import defaultdict
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from . import pq
from . import postgres
diff --git a/psycopg/_typeinfo.py b/psycopg/_typeinfo.py
index 52d5ca7..30cba21 100644
--- a/psycopg/_typeinfo.py
+++ b/psycopg/_typeinfo.py
@@ -9,7 +9,7 @@ information to the adapters if needed.
from enum import Enum
from typing import Any, Dict, Iterator, Optional, overload
from typing import Sequence, Tuple, Type, TypeVar, Union, TYPE_CHECKING
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from . import errors as e
from .abc import AdaptContext, Query
diff --git a/psycopg/abc.py b/psycopg/abc.py
index 80c8fbf..6d84bf9 100644
--- a/psycopg/abc.py
+++ b/psycopg/abc.py
@@ -7,7 +7,7 @@ Protocol objects representing different implementations of the same classes.
from typing import Any, Callable, Generator, Mapping
from typing import List, Optional, Sequence, Tuple, TypeVar, Union
from typing import TYPE_CHECKING
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from . import pq
from ._enums import PyFormat as PyFormat
diff --git a/psycopg/connection.py b/psycopg/connection.py
index 78ad577..a620da3 100644
--- a/psycopg/connection.py
+++ b/psycopg/connection.py
@@ -14,7 +14,7 @@ from weakref import ref, ReferenceType
from warnings import warn
from functools import partial
from contextlib import contextmanager
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from . import pq
from . import errors as e
--- a/psycopg/errors.py
+++ b/psycopg/errors.py
@@ -21,7 +21,7 @@ DBAPI-defined Exceptions are defined in
from dataclasses import dataclass, field, fields
from typing import Any, Callable, Dict, List, NoReturn, Optional, Sequence, Tuple, Type
from typing import Union, TYPE_CHECKING
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from asyncio import CancelledError
from .pq.abc import PGconn, PGresult
diff --git a/psycopg/pq/abc.py b/psycopg/pq/abc.py
index 9c45f64..c28c57c 100644
--- a/psycopg/pq/abc.py
+++ b/psycopg/pq/abc.py
@@ -6,7 +6,7 @@ Protocol objects to represent objects exposed by different pq implementations.
from typing import Any, Callable, List, Optional, Sequence, Tuple
from typing import Union, TYPE_CHECKING
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from ._enums import Format, Trace
from .._compat import Protocol
diff --git a/psycopg/rows.py b/psycopg/rows.py
index cb28b57..68fd23b 100644
--- a/psycopg/rows.py
+++ b/psycopg/rows.py
@@ -8,7 +8,7 @@ import functools
from typing import Any, Callable, Dict, List, Optional, NamedTuple, NoReturn
from typing import TYPE_CHECKING, Sequence, Tuple, Type, TypeVar
from collections import namedtuple
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from . import pq
from . import errors as e
diff --git a/psycopg/types/enum.py b/psycopg/types/enum.py
index d3c7387..e602b0e 100644
--- a/psycopg/types/enum.py
+++ b/psycopg/types/enum.py
@@ -4,7 +4,7 @@ Adapters for the enum type.
from enum import Enum
from typing import Any, Dict, Generic, Optional, Mapping, Sequence
from typing import Tuple, Type, TypeVar, Union, cast
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from .. import postgres
from .. import errors as e
diff --git a/psycopg/types/hstore.py b/psycopg/types/hstore.py
index e1ab1d5..eaa8dfc 100644
--- a/psycopg/types/hstore.py
+++ b/psycopg/types/hstore.py
@@ -6,7 +6,7 @@ Dict to hstore adaptation
import re
from typing import Dict, List, Optional
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from .. import errors as e
from .. import postgres
diff --git a/psycopg/types/net.py b/psycopg/types/net.py
index 2f2c05b..fc8271b 100644
--- a/psycopg/types/net.py
+++ b/psycopg/types/net.py
@@ -5,7 +5,7 @@ Adapters for network types.
# Copyright (C) 2020 The Psycopg Team
from typing import Callable, Optional, Type, Union, TYPE_CHECKING
-from typing_extensions import TypeAlias
+from typing import TypeAlias
from .. import postgres
from ..pq import Format

View file

@ -1,7 +1,7 @@
# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=py3-rapidjson
pkgver=1.10
pkgver=1.12
pkgrel=0
pkgdesc="Python3 wrapper around RapidJSON"
url="https://github.com/python-rapidjson/python-rapidjson"
@ -11,9 +11,11 @@ depends="
python3
"
makedepends="
py3-gpep517
py3-setuptools
rapidjson-dev
py3-wheel
python3-dev
rapidjson-dev
"
checkdepends="
py3-pytest
@ -22,10 +24,17 @@ checkdepends="
source="$pkgname-$pkgver.tar.gz::https://github.com/python-rapidjson/python-rapidjson/archive/refs/tags/v$pkgver.tar.gz"
builddir="$srcdir/"python-rapidjson-$pkgver
prepare() {
default_prepare
# workaround setup.py complaining about "sources not found"
mkdir -v rapidjson/include
}
build() {
python3 setup.py \
--rj-include-dir=/usr/include/rapidjson \
build
gpep517 build-wheel \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
check() {
@ -38,14 +47,10 @@ check() {
}
package() {
python3 setup.py \
--rj-include-dir=/usr/include/rapidjson \
install \
--skip-build \
--prefix=/usr \
--root="$pkgdir"
python3 -m installer -d "$pkgdir" \
.dist/*.whl
}
sha512sums="
cc77ea42e50f132771dfe6e0d9724204e39155e212f6e39b2ff4ccbdf1885dcedb5f50583d9da400c4d25eec9c66163c328b28534560e8a50847558ae0f43183 py3-rapidjson-1.10.tar.gz
15d021491c64db53352830d8f3f62c8b48476fcb001f97c174bcbb9053d973eb135ceb92f14290a58f6ad6c5dfb24d02f6385c8cad70f4a74f5a5726aa0728e7 py3-rapidjson-1.12.tar.gz
"

View file

@ -21,19 +21,19 @@ options="!check" # no tests
build() {
gpep517 build-wheel \
--wheel-dir dist \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
check() {
python3 -m venv --clear --without-pip --system-site-packages testenv
testenv/bin/python3 -m installer dist/*.whl
testenv/bin/python3 -m unittest discover
python3 -m venv --clear --without-pip --system-site-packages .testenv
.testenv/bin/python3 -m installer .dist/*.whl
.testenv/bin/python3 -m unittest discover
}
package() {
python3 -m installer -d "$pkgdir" \
dist/*.whl
.dist/*.whl
}
sha512sums="

View file

@ -1,7 +1,7 @@
# Maintainer:
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=py3-vine
pkgver=5.0.0
pkgrel=0
pkgrel=2
pkgdesc="futures and promises implementation for python"
url="https://github.com/celery/vine"
arch="noarch"
@ -9,6 +9,7 @@ license="BSD-3-Clause"
depends="python3"
makedepends="py3-setuptools"
checkdepends="py3-pytest py3-case py3-nose"
subpackages="$pkgname-pyc"
source="https://files.pythonhosted.org/packages/source/v/vine/vine-$pkgver.tar.gz"
builddir="$srcdir/vine-$pkgver"

View file

@ -1,43 +0,0 @@
# Contributor: Celeste <cielesti@protonmail.com>
# Maintainer: Celeste <cielesti@protonmail.com>
pkgname=py3-whitenoise
pkgver=6.5.0
pkgrel=0
pkgdesc="Radically simplified static file serving for Python web apps"
url="https://whitenoise.readthedocs.io/"
arch="noarch"
license="MIT"
depends="py3-brotli"
makedepends="
py3-gpep517
py3-setuptools
py3-wheel
"
checkdepends="
py3-django
py3-pytest
py3-requests"
subpackages="$pkgname-pyc"
source="https://github.com/evansd/whitenoise/archive/$pkgver/py3-whitenoise-$pkgver.tar.gz"
builddir="$srcdir/whitenoise-$pkgver"
build() {
gpep517 build-wheel \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
check() {
python3 -m venv --clear --without-pip --system-site-packages .testenv
.testenv/bin/python3 -m installer .dist/*.whl
.testenv/bin/python3 -m pytest
}
package() {
python3 -m installer -d "$pkgdir" \
.dist/*.whl
}
sha512sums="
2fefff9e89e05905ebacc73234a52c1c22f6c4202b354dec11177dd784f45ac6a954061659f5c3344d41a373e3fc8b911830df8a3e51326ec8a2a80d45268315 py3-whitenoise-6.5.0.tar.gz
"

View file

@ -1,62 +0,0 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
_pkgname=wxPython
pkgname=py3-wxpython
pkgver=4.2.0
pkgrel=4
pkgdesc="Cross-platform GUI toolkit for the Python language"
url="https://wxpython.org/"
arch="all"
license="custom:wxWidgets"
depends="
python3
py3-numpy
py3-pillow
py3-six
"
makedepends="
py3-setuptools
py3-sip
python3-dev
wxwidgets-dev
"
checkdepends="py3-pytest py3-pytest-xdist xvfb-run"
subpackages="$pkgname-doc $pkgname-lang $pkgname-pyc"
source="https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-$pkgver.tar.gz
no-attrdict.patch
no-stacktrace.patch
"
builddir="$srcdir"/$_pkgname-$pkgver
# Not all unit tests are passing. Some due to missing features of xvfb where the
# tests are running in (GL, display settings). Some are checking features that
# have not been provided in this package. Disabling failing unit tests to track
# regressions would be nice, but I do not have the time for that now
options="!check !spdx"
build() {
export CPPFLAGS="$CPPFLAGS -flto=auto"
python3 build.py build --use_syswx --release -j${JOBS:-1}
}
check() {
xvfb-run -a pytest
}
package() {
python3 build.py install --destdir="$pkgdir"
install -Dm 644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
find "$pkgdir"/usr/lib -type f -exec chmod 644 {} \;
}
lang() {
pkgdesc="translations for $pkgname"
install_if="lang $pkgname=$pkgver-r$pkgrel"
amove usr/lib/python3*/site-packages/wx/locale
}
sha512sums="
9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f wxPython-4.2.0.tar.gz
ac7004cf6280242af3e6265d69ac909f7c1fcd37d9da625704f1e0ea23be76821cd259c48bf589380b6e84f9fdfc28d6372dfb155188a48a49e3361731e7461f no-attrdict.patch
ebd45621684603ca5e481d2a32e9ddf7de8dcd8c9f49745bd1e8509f6c118361d59d092032a541d56cbbe69f00f307dd507d511b425f14c733379e1f4b627719 no-stacktrace.patch
"

View file

@ -1,18 +0,0 @@
this is a very abandoned python module, easier to just patch in this
diff --git a/buildtools/config.py b/buildtools/config.py
index 20a2fd9d..fa16befd 100644
--- a/buildtools/config.py
+++ b/buildtools/config.py
@@ -27,7 +27,11 @@ from distutils.dep_util import newer
import distutils.sysconfig
-from attrdict import AttrDict
+class AttrDict(dict):
+ def __getattr__(self, attr):
+ return self[attr]
+ def __setattr__(self, attr, value):
+ self[attr] = value
runSilently = False

View file

@ -1,12 +0,0 @@
we have no stacktraces in wxwidgets
--- a/sip/cpp/sip_corewxAppTraits.cpp
+++ b/sip/cpp/sip_corewxAppTraits.cpp
@@ -471,7 +471,7 @@
PyErr_Clear();
Py_BEGIN_ALLOW_THREADS
- sipRes = new ::wxString((sipSelfWasArg ? sipCpp-> ::wxAppTraits::GetAssertStackTrace() : sipCpp->GetAssertStackTrace()));
+ sipRes = new ::wxString("");
Py_END_ALLOW_THREADS
if (PyErr_Occurred())

View file

@ -1,7 +1,7 @@
# Maintainer:
pkgname=rapidfuzz
pkgver=2.0.0
pkgrel=1
pkgver=2.2.3
pkgrel=0
pkgdesc="Rapid fuzzy string matching in C++ using the Levenshtein Distance"
url="https://github.com/maxbachmann/rapidfuzz-cpp"
arch="all"
@ -38,5 +38,5 @@ package() {
}
sha512sums="
02af141b123545303d634ffe84fbe83e635f06c9ffa3a6506661e53beb22fe7221942b3e46d33b2a49ef929c5de9acfb00c48cb5685c760506c5fcf37c716f9a rapidfuzz-2.0.0.tar.gz
5ef4833334ccc3309d43ae4a2644eb57fa2a382b797c791b150b8d78451d7e6d57a8af23d0b7645eecfe539a128d2d8585e2a7380b6772b23cf8fd71d6a7f38b rapidfuzz-2.2.3.tar.gz
"

View file

@ -1,8 +1,8 @@
# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
# Contributor: lauren n. liberda <lauren@selfisekai.rocks>
# Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
pkgname=signal-desktop
pkgver=6.18.1
pkgrel=1
pkgver=6.39.1
pkgrel=0
pkgdesc="A messaging app for simple private communication with friends"
url="https://github.com/signalapp/Signal-Desktop/"
# same as electron
@ -18,21 +18,29 @@ depends="
"
makedepends="
alsa-lib-dev
aom-dev
brotli-dev
bsd-compat-headers
cargo
cargo-auditable
cbindgen
clang-dev
cmake
crc32c-dev
dav1d-dev
electron-dev
electron-tasje
ffmpeg-dev
git-lfs
glib-dev
gn
jsoncpp-dev
libavif-dev
libjpeg-turbo-dev
libepoxy-dev
libevent-dev
libvpx-dev
libwebp-dev
lld
llvm-dev
mesa-dev
@ -40,7 +48,6 @@ makedepends="
npm
openh264-dev
openssl-dev
opus-dev
pipewire-dev
protoc
pulseaudio-dev
@ -54,36 +61,35 @@ makedepends="
options="net !check"
# follow signal-desktop package.json -> @signalapp/libsignal-client
_libsignalver=0.22.0
_libsignalver=0.32.1
# follow signal-desktop package.json -> @signalapp/ringrtc
_ringrtcver=2.26.4
_ringrtcver=2.34.1
# follow ringrtc (on version above) -> config/version.properties -> webrtc.version
# downloading tarball generated with abuild snapshot (with gclient dependencies fetched)
_webrtcver=5481c
_webrtcver=5845i
# follow @signalapp/better-sqlite3 (on version in package.json) -> deps/download.js -> TOKENIZER_VERSION
# last bsqlite version: 8.4.3
# last bsqlite version: 8.5.2
_stokenizerver=0.2.1
source="
https://github.com/signalapp/Signal-Desktop/archive/refs/tags/v$pkgver/Signal-Desktop-$pkgver.tar.gz
https://github.com/signalapp/libsignal/archive/refs/tags/v$_libsignalver/libsignal-$_libsignalver.tar.gz
https://github.com/signalapp/ringrtc/archive/refs/tags/v$_ringrtcver/ringrtc-$_ringrtcver.tar.gz
https://s3.sakamoto.pl/lnl-aports-snapshots/webrtc-$_webrtcver.tar.xz
https://s3.sakamoto.pl/lnl-aports-snapshots/webrtc-$_webrtcver.tar.zst
https://github.com/signalapp/Signal-FTS5-Extension/archive/refs/tags/v$_stokenizerver/stokenizer-$_stokenizerver.tar.gz
bettersqlite-use-system-sqlcipher.patch
libsignal-too-new-clang.patch
libsignal-fix-build-rust-1.69.patch
libsignal-auditable.patch
signal-disable-updates.patch
signal-update-links.patch
signal-tasje-whatever-the-fuck-is-ignore-doing-here.patch
signal-show-window-please.patch
ringrtc-webrtc-renamed.patch
webrtc-shared-like-my-wife.patch
webrtc-use-alpine-target.patch
webrtc-clang-debug-info.patch
webrtc-gcc13.patch
signal-desktop
@ -105,7 +111,7 @@ export CPPFLAGS="$CPPFLAGS -D__DATE__= -D__TIME__= -D__TIMESTAMP__="
export CARGO_PROFILE_RELEASE_OPT_LEVEL=2
export CARGO_PROFILE_RELEASE_STRIP="symbols"
export RUSTFLAGS="$RUSTFLAGS -C linker=clang -C link-arg=-fuse-ld=lld"
export RUSTFLAGS="$RUSTFLAGS -C linker=clang"
export YARN_CACHE_FOLDER="$srcdir/.yarn"
@ -118,7 +124,7 @@ snapshot() {
rm -rf src
rm -rf webrtc-$_webrtcver
rm -f webrtc-$_webrtcver.tar
rm -f webrtc-$_webrtcver.tar.xz
rm -f webrtc-$_webrtcver.tar.zst
echo "
solutions = [{
@ -153,10 +159,14 @@ target_cpu_only = True
--exclude-vcs \
webrtc-$_webrtcver
xz -T0 -e -9 -vv -k webrtc-$_webrtcver.tar
zstd --ultra --long -22 -T4 -vv webrtc-$_webrtcver.tar
}
# manual patches
default_prepare() { :; }
prepare() {
default_prepare
msg "Applying patches"
for x in $source; do
case "$x" in
@ -186,27 +196,36 @@ prepare() {
(
cd "$srcdir"/webrtc-$_webrtcver
# opus - https://github.com/signalapp/opus/commit/593419e833acab4d15b4901fe156177fb7315468
local use_system="
brotli
crc32c
dav1d
ffmpeg
fontconfig
freetype
harfbuzz-ng
icu
jsoncpp
libaom
libavif
libdrm
libevent
libjpeg
libpng
libvpx
libwebp
libxml
libxslt
openh264
opus
re2
snappy
woff2
zlib
"
for _lib in $use_system; do
for _lib in $use_system libjpeg_turbo; do
msg "Removing buildscripts for system provided $_lib"
find . -type f -path "*third_party/$_lib/*" \
find . -type f -path "*{third_party,ringrtc}/$_lib/*" \
\! -path "*third_party/$_lib/chromium/*" \
\! -path "*third_party/$_lib/google/*" \
\! -path './base/third_party/icu/*' \
@ -316,15 +335,15 @@ build() {
)
(
cd "$srcdir"/ringrtc-$_ringrtcver/src/rust
cd "$srcdir"/ringrtc-$_ringrtcver
msg "Building libringrtc"
OUTPUT_DIR="$srcdir"/ringrtc-$_ringrtcver/out \
cargo auditable build --features electron --release
cargo auditable build --features electron --release -p ringrtc
mkdir -p ../node/build/linux
cp -fv ../../out/release/libsignaldeswebrtc.so ../node/build/linux/libsignaldeswebrtc.so
cp -fv target/release/libringrtc.so ../node/build/linux/libringrtc-$chromium_arch.node
mkdir -p src/node/build/linux
cp -fv out/release/libsignaldeswebrtc.so src/node/build/linux/libsignaldeswebrtc.so
cp -fv target/release/libringrtc.so src/node/build/linux/libringrtc-$chromium_arch.node
)
(
@ -416,15 +435,6 @@ build() {
utf-8-validate bufferutil fs-xattr \
--nodedir=/usr/include/electron/node_headers --build-from-source
# unnecessary/unused native modules, blobs
find node_modules -type d -path '**/prebuilds' \
\! -path 'node_modules/@signalapp/libsignal-client/prebuilds' -exec rm -r {} \+
find node_modules -type d -path '**/build/*/obj.target' -exec rm -r {} \+
rm -r 'node_modules/@signalapp/libsignal-client/build/'
find node_modules/@signalapp/better-sqlite3 -type f -path 'build/**/*' \
\! -path 'build/Release/better_sqlite3.node' -delete
rm -r 'node_modules/@signalapp/better-sqlite3/tokenizer'
SIGNAL_ENV=production \
tasje pack
}
@ -439,7 +449,7 @@ package() {
install -Dm644 resources/app.asar "$pkgdir"/usr/lib/$pkgname/app.asar
cp -r resources/app.asar.unpacked "$pkgdir"/usr/lib/$pkgname/app.asar.unpacked
install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
install -Dm644 signal.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
# this should be in /usr/lib/signal-desktop. however, it does not simply work and I stopped to care
install -Dm755 "$srcdir"/ringrtc-$_ringrtcver/out/release/libsignaldeswebrtc.so "$pkgdir"/usr/lib/libsignaldeswebrtc.so
@ -452,21 +462,20 @@ package() {
}
sha512sums="
e9adc32f15f0f62bfd23adf0de46dea12433e93a585b9ba9fbdbd4000c17b88ddcbf9b65038f2ae232d1b591c9fe3b04e6ced3598a449bffe3b0123ce0c8d3af Signal-Desktop-6.18.1.tar.gz
9483c8d302728d6caa123f1fb9a977c7cb3aea09ecd1d2cfb3b19f2f2c66f884c41e37642c89db4eeeb0d607fddf281ba27ba4bd0a90e43b972d0cbc607e1483 libsignal-0.22.0.tar.gz
684405e325a5c9cc0446b4e8ab949e888bf699f20f8a7bd64cb741c712b6d42b79d87a518720f6393ab667c9bef442dbb85404128302a41c8caf4d33711bb41e ringrtc-2.26.4.tar.gz
ef35942c377a2681ebdea2b68c6d3af0712cd866d143b50479b1e03de274c324b57059ea9f88b5c20d08c3b5b2b0aad8aed52e713aa2eb3da45b642d1aaae418 webrtc-5481c.tar.xz
dc15b9693f22c0e71a1ceebe2bb967b6034dc2e3e1ced1e9be7eeca30e9253ed4c4baa49c6f87536c55118cabf2bc16d6f65f7f1bfcb73640eeb9a9942406dad Signal-Desktop-6.39.1.tar.gz
855f053a1329d12e20f254f607db0c0db9f6e1a3eb10061996da75805bf462a5dee0f4f841ec679980c77da87d600f92a21cd643c36d44e017cb3cbf57003b09 libsignal-0.32.1.tar.gz
ba6cdfeeadab0bec9a10a0ce9bc19a58a060e8dc5b0007e59c38011454bebf112fda0bdc291cc3e995b3e1d468b96a1a85c840b058ed0f57f5cccb3050600dbc ringrtc-2.34.1.tar.gz
1d61be0ff5358251760d7916aced3e4a957c183f9f5313ebff266987d99ada4adec8d4d95a9a94a14539e4f182c3fb6fb574937494afb7a3ae1e9ad9c11871de webrtc-5845i.tar.zst
84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28 stokenizer-0.2.1.tar.gz
be5b4e823543b79175a12314f10c6326d9f0d59f470136962daed4665887006acc05b48b40dc1b67747396d8f6f7d23be298c1e110ccdd35ff9b09d5e6b80bab bettersqlite-use-system-sqlcipher.patch
78be44ef201d9e6e127979a496f7244c8d93e936f85ad8753fea1646e6142f8a0dbff705ba612c8c724d19e6a9e89ccae254719326021818e04cccef452fc308 libsignal-too-new-clang.patch
f2b39498192744fadb7e2b969979653a5bd84af0befcc0a9b2ac60f63a487cc2d0d90a0345c7e884c84b3759c62f07d97c576ef1e2b271bdd993893e26a45c5c libsignal-fix-build-rust-1.69.patch
90d47914e30f095515c47c9ef7c763a7a2583a281228d6ea7e2a3444be670b3ae506c82b4fcea8a228f88f688a43c23c8dcef52b65805d2105287234550718a5 libsignal-auditable.patch
60a45285d885922f5c21f64b761a10efbee9081baf3efa4c8c13abc6a43dc4d27662ed10e239b0fa2071ab9e3a0dbbb4b11d6e3d26fe2b74a19f39e72b74a5bd signal-disable-updates.patch
d50eb5724502df9ea4d795db8cfc27af767c25168d7db2af512e615be7cc2ca290210a9ae78e1abb153c0198677e858ad3d74926c958099d0319295e7d9e7f1d signal-update-links.patch
ae91177b9df6bd5ac5cdbe28e6b591138d2c4b057dde84596ac89fc46e94bf713da18f652346486ebb1c88e7035d595b757b099b160aafa2c7cf103dfb2db8ab signal-tasje-whatever-the-fuck-is-ignore-doing-here.patch
646d303fe58cae3f0896ae0275a66695b902fae6ddde7c568cc9798157dee9f45ceff907bc951fadc4c511d512a73d114b4e4f7c8914e2311c63929d29e1621a signal-show-window-please.patch
ab51b8fdcda1d8811213d2c5d8cb5d8457b478a02e23ce40f36b38ec56d45a3bd7a2d184720c27046f98a27771551cfad93c1290fe93856cc02695d318b33e47 ringrtc-webrtc-renamed.patch
9d92389637cdda83a0a7039fa6c52516d7bc491d0b1e42d5374b9d1f4fa7b9c930642f2dca896da17a2dc3344fa1bb97434c8dddd0539a4fedfd0dec809fc875 webrtc-shared-like-my-wife.patch
354f516a74c5491727afe084ef7688b3e1359d230daa720ffc30b33d3ea7579c9f37a50fbdc5fe2e8dc5322e42a0a39e4ae3449d4cf5b77daed2229bd743028c webrtc-use-alpine-target.patch
209a606c0fa5ee517df4b8492932f20761dced3324e05a669fdf47c06a175aa5d5900e54e822ccd39fd57edfa4e689537e34a3b26918cc5da7a41633f5a1f162 webrtc-gcc13.patch
679b286d8f9f682d4de41402ffa6834d3085981ca5458cf0e02d3faa0c3c05b17f61b49b07b7fa42d9f91e737dc2f4e6086978332bb4111f8e9d3107736147ef webrtc-clang-debug-info.patch
83fe8a7d8514018f8b5c217d3513345842f6037e6877cd5129479f03d91729b32621e814b4bdb0906df1fe825146bc7f1f72664434985e5e93f6df641a019420 webrtc-gcc13.patch
87534e7b5ad7365509eab75629e6bd1a9ed61ee92f7e358405a0abaf0df57de14623fb3894eb082f8785422e5c087e1c50f9e2e5cafbb2529591fd7bf447f7f5 signal-desktop
"

View file

@ -0,0 +1,11 @@
--- ./node/build_node_bridge.py.orig
+++ ./node/build_node_bridge.py
@@ -63,7 +63,7 @@
out_dir = options.out_dir.strip('"') or os.path.join('build', configuration_name)
- cmdline = ['cargo', 'build', '--target', cargo_target, '-p', 'libsignal-node']
+ cmdline = ['cargo', 'auditable', 'build', '--target', cargo_target, '-p', 'libsignal-node']
if configuration_name == 'Release':
cmdline.append('--release')
print("Running '%s'" % (' '.join(cmdline)))

View file

@ -0,0 +1,11 @@
--- ./build/config/compiler/BUILD.gn.orig
+++ ./build/config/compiler/BUILD.gn
@@ -765,7 +765,7 @@
# toolchain has this flag.
# We only use one version of LLVM within a build so there's no need to
# upgrade debug info, which can be expensive since it runs the verifier.
- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
+ #ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
}
}

View file

@ -8,23 +8,3 @@
#include <string>
--- ./rtc_base/third_party/base64/base64.h.orig
+++ ./rtc_base/third_party/base64/base64.h
@@ -12,6 +12,7 @@
#ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
#define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
+#include <stdint.h>
#include <string>
#include <vector>
--- ./third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h.orig
+++ ./third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h
@@ -16,6 +16,7 @@
#define ABSL_STRINGS_INTERNAL_DAMERAU_LEVENSHTEIN_DISTANCE_H_
#include <numeric>
+#include <stdint.h>
#include <vector>
#include "absl/strings/string_view.h"

View file

@ -1,56 +0,0 @@
# Contributor: wener <wenermail@gmail.com>
# Maintainer: wener <wenermail@gmail.com>
pkgname=sqlcipher
pkgver=4.5.4
pkgrel=1
pkgdesc="SQLCipher is an SQLite extension that provides 256 bit AES encryption of database files."
url="https://www.zetetic.net/sqlcipher/"
arch="all"
license="BSD-3-Clause"
makedepends="openssl-dev>3 tcl-dev readline-dev zlib-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-tcl"
source="$pkgname-$pkgver.tar.gz::https://github.com/sqlcipher/sqlcipher/archive/v$pkgver.tar.gz"
build() {
export CFLAGS="$CFLAGS \
-DSQLITE_HAS_CODEC \
-DSQLCIPHER_TEST \
-DSQLITE_ENABLE_COLUMN_METADATA \
-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT \
"
export LDFLAGS="$LDFLAGS -lcrypto"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
--enable-tempstore=yes \
--enable-fts5
make
}
check() {
make testfixture
./testfixture test/sqlcipher.test
}
package() {
make DESTDIR="$pkgdir" install
install -Dm0644 sqlcipher.1 \
"$pkgdir"/usr/share/man/man1/sqlcipher.1
}
tcl() {
pkgdesc="SQLCipher library (tcl bindings)"
amove usr/lib/tcl*
}
sha512sums="
deb592d6f27e7cc02bd641bb8f6e07b242f0dc6c7d8732e7a1e70e457eadd487add7d95c881fe9afbff516f4641a6e603473e47c63afa8396a0ddf007a5818fd sqlcipher-4.5.4.tar.gz
"

View file

@ -1,21 +1,22 @@
# Maintainer: psykose <alice@ayaya.dev>
# Contributor: psykose <alice@ayaya.dev>
# Maintainer: Antoien Martin (ayakael) <dev@ayakael.net>
pkgname=py3-click-repl
pkgver=0.2.0
pkgrel=1
pkgver=0.3.0
pkgrel=2
pkgdesc="Subcommand REPL for click apps"
url="https://github.com/click-contrib/click-repl"
arch="noarch"
license="MIT"
depends="python3 py3-six py3-click py3-prompt_toolkit"
depends="python3 py3-click py3-prompt_toolkit"
makedepends="py3-gpep517 py3-setuptools py3-wheel"
checkdepends="py3-pytest"
checkdepends="py3-pytest py3-pytest-cov"
subpackages="$pkgname-pyc"
source="$pkgname-$pkgver.tar.gz::https://github.com/click-contrib/click-repl/archive/refs/tags/$pkgver.tar.gz"
builddir="$srcdir/click-repl-$pkgver"
build() {
gpep517 build-wheel \
--wheel-dir dist \
--wheel-dir .dist \
--output-fd 3 3>&1 >&2
}
@ -26,9 +27,9 @@ check() {
package() {
python3 -m installer -d "$pkgdir" \
dist/*.whl
.dist/*.whl
}
sha512sums="
888ef2d4082cbecbdab70d707296b20d3dcc0a13fe06ef103fbe04a3f29381fe0f3284c2eb38c6d3eb8b026063cba470a519524e98b9eadd06a5946c669ffc3b py3-click-repl-0.2.0.tar.gz
4135cfd4a0b041d9e6446b4c938bb5863d851703f47f204cd78fc9e5ae6b7fd71215abbf08863d9a5cdb664f92df5fca2380a6efa7ddeb67dd6c9b1d4f210f65 py3-click-repl-0.3.0.tar.gz
"