From adbc58f9c2f46e9e76944985bb14629057ca995e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=A5=D1=80?= =?UTF-8?q?=D0=B0=D0=BC=D0=BE=D0=B2?= Date: Thu, 26 Sep 2024 13:44:11 +0300 Subject: [PATCH 1/5] revolt-desktop-git --- revolt-desktop-git/alr.sh | 53 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 revolt-desktop-git/alr.sh diff --git a/revolt-desktop-git/alr.sh b/revolt-desktop-git/alr.sh new file mode 100644 index 0000000..c907e2e --- /dev/null +++ b/revolt-desktop-git/alr.sh @@ -0,0 +1,53 @@ +name='revolt-desktop-git' +version='1.0.7.r13.g2373e7d' +release='1' +epoch='1' +desc='Open source user-first chat platform.' +homepage='https://revolt.chat' +maintainer="Евгений Храмов " +architectures=('amd64') +licenses='AGPL3' +provides=('revolt-desktop-git' 'revolt-desktop') +conflicts=('revolt-desktop-git' 'revolt-desktop') + +deps=('electron22') + +sources=( + ""git+https://github.com/revoltchat/desktop.git"" +) + +checksums=( + 'SKIP' +) + +version() { + cd "$srcdir/desktop" + git-version +} + +build() { + cd "$srcdir/desktop" + + electronDist=/usr/lib/electron22 + electronVer=$(${electronDist}/electron --version | tail -c +2) + + sed -i '/ "electron": /d' ./package.json + HOME="$srcdir/.electron-gyp" npm install --cache "${srcdir}/npm-cache" + npm run build:bundle + + ./node_modules/.bin/electron-builder -l dir -c.electronDist=$electronDist -c.electronVersion=$electronVer +} + +package() { + cd "$srcdir/desktop" + + install-binary -dm755 "${pkgdir}/usr/lib/${name%-git}" + cp -dr --no-preserve=ownership dist/linux-unpacked/resources/* "${pkgdir}/usr/lib/${name%-git}/" + + install -Dm644 build/icons/icon.png "$pkgdir/usr/share/pixmaps/${name%-git}.png" + + install -dm755 "${pkgdir}/usr/bin" "revolt-desktop" + + install -Dm755 "revolt-desktop.sh" "$pkgdir/usr/bin/${name%-git}" + install -Dm644 "revolt-desktop.desktop" -t "$pkgdir/usr/share/applications" +} From 8404757d609a6caa0d0f050bc60118fbce46d4b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=A5=D1=80?= =?UTF-8?q?=D0=B0=D0=BC=D0=BE=D0=B2?= Date: Thu, 26 Sep 2024 19:36:30 +0300 Subject: [PATCH 2/5] go-bin 1.23.1 --- go-bin/alr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go-bin/alr.sh b/go-bin/alr.sh index a156d66..f0682f5 100644 --- a/go-bin/alr.sh +++ b/go-bin/alr.sh @@ -1,5 +1,5 @@ name="go-bin" -version='1.23.0' +version='1.23.1' release='1' desc="Compiler and tools for the Go programming language" desc_ru="Компилятор и инструменты для языка программирования Go" From c2c6bd870f3101dda7eaff374063600752d5057a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=A5=D1=80?= =?UTF-8?q?=D0=B0=D0=BC=D0=BE=D0=B2?= Date: Thu, 26 Sep 2024 19:49:05 +0300 Subject: [PATCH 3/5] python-poetry --- discord-bin/alr.sh | 3 +- gitea/alr.sh | 4 +- python-poetry/alr.sh | 92 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 python-poetry/alr.sh diff --git a/discord-bin/alr.sh b/discord-bin/alr.sh index d93a97b..1d44cc3 100755 --- a/discord-bin/alr.sh +++ b/discord-bin/alr.sh @@ -5,7 +5,8 @@ desc='Discord (popular voice + video app) using the system provided electron for homepage='https://discord.com/' maintainer="Евгений Храмов " architectures=('amd64') -license=('custom') provides=('discord') +license=('custom') +provides=('discord') conflicts=('discord') deps=('gconf-service' 'gconf2-common' 'libc++1' 'libxtst6' 'libxss1' 'libstdc++6' 'libnss3' 'libnspr4' 'libnotify4' 'libgconf-2-4' 'libatomic1' 'libasound2' 'libc6' 'libappindicator1') diff --git a/gitea/alr.sh b/gitea/alr.sh index d601d33..0252eb2 100644 --- a/gitea/alr.sh +++ b/gitea/alr.sh @@ -17,7 +17,7 @@ build_deps=( 'go' 'nodejs' 'npm' - 'poetry' + 'python-poetry' 'openssh' 'pam-devel' ) @@ -26,7 +26,7 @@ build_deps_almalinux=( 'go' 'nodejs' 'npm' - 'python3-poetry-core' + 'python-poetry' 'openssh' 'pam-devel' ) diff --git a/python-poetry/alr.sh b/python-poetry/alr.sh new file mode 100644 index 0000000..09f21f3 --- /dev/null +++ b/python-poetry/alr.sh @@ -0,0 +1,92 @@ +_pkgname="poetry" + +name='python-poetry' +version='1.8.3' +release='1' +desc='Python dependency management and packaging made easy' +homepage='https://python-poetry.org' +maintainer="Евгений Храмов " +architectures=('all') +license=('MIT') +provides=('poetry') +conflicts=('poetry') + +_deps=(build + cachecontrol + cachy + cleo + crashtest + dulwich + filelock + html5lib + installer + jsonschema + keyring + lockfile + packaging + pexpect + pkginfo + platformdirs + poetry-core + poetry-plugin-export + pyproject-hooks + requests + requests-toolbelt + shellingham + tomlkit + trove-classifiers + urllib3 + virtualenv) +deps=(python + "${_deps[@]/#/python-}") +build_deps=(python-deepdiff # not mentioned but required + python-psutil # for python-pytest-xdist + python-httpretty + python-pip # not mentioned but required + python-pytest + python-pytest-mock + python-pytest-randomly + python-pytest-xdist) +opt_deps=('python-pip: to use pip with virtual environments') + +_archive="$_pkgname-$pkgver" +source=("https://github.com/$pkgname/$_pkgname/archive/$pkgver/$_archive.tar.gz") +sha256sums=('4da8d1b19cfb50536c6b54e984b88cec3bc1203f9749d5f4958db5cbb0c7b7bc') + +prepare() { + cd "$_archive" + # Unpin crashtest which we have packaged at 0.4.0 + # https://bugs.archlinux.org/task/75733 + # Also unpin requests-toolbelt + # https://github.com/python-poetry/poetry/pull/7893 + sed -i -e '/^crashtest/s/\^/>=/' -e '/^requests-toolbelt/s/,<0.11.0//' pyproject.toml +} + +build() { + local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + cd "$_archive" + python -m build -wn + # install to tmp dir for tests and generate completions + python -m installer --destdir=test_dir dist/*.whl + export PYTHONPATH="$PWD/test_dir/$site_packages:$PYTHONPATH" + export PATH="$PWD/test_dir/usr/bin:$PATH" + poetry completions bash > poetry.bash + poetry completions zsh > poetry.zsh + poetry completions fish > poetry.fish +} + +check() { + local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + cd "$_archive" + export PYTHONPATH="$PWD/test_dir/$site_packages:$PYTHONPATH" + pytest -vv tests +} + +package() { + cd "$_archive" + python -m installer -d "$pkgdir" dist/*.whl + install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE + install -vDm 644 $_pkgname.bash "$pkgdir/usr/share/bash-completion/completions/$_pkgname" + install -vDm 644 $_pkgname.zsh "$pkgdir/usr/share/zsh/site-functions/_$_pkgname" + install -vDm 644 $_pkgname.fish -t "$pkgdir/usr/share/fish/vendor_completions.d/" +} From 06e5b8c828cbb44a48c33895a9189c48366e0993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=A5=D1=80?= =?UTF-8?q?=D0=B0=D0=BC=D0=BE=D0=B2?= Date: Sat, 28 Sep 2024 14:05:45 +0300 Subject: [PATCH 4/5] python-poetry --- python-poetry/alr.sh | 136 +++++++++++++++++++++++++++---------------- 1 file changed, 87 insertions(+), 49 deletions(-) diff --git a/python-poetry/alr.sh b/python-poetry/alr.sh index 09f21f3..279a975 100644 --- a/python-poetry/alr.sh +++ b/python-poetry/alr.sh @@ -1,5 +1,3 @@ -_pkgname="poetry" - name='python-poetry' version='1.8.3' release='1' @@ -11,50 +9,90 @@ license=('MIT') provides=('poetry') conflicts=('poetry') -_deps=(build - cachecontrol - cachy - cleo - crashtest - dulwich - filelock - html5lib - installer - jsonschema - keyring - lockfile - packaging - pexpect - pkginfo - platformdirs - poetry-core - poetry-plugin-export - pyproject-hooks - requests - requests-toolbelt - shellingham - tomlkit - trove-classifiers - urllib3 - virtualenv) -deps=(python - "${_deps[@]/#/python-}") -build_deps=(python-deepdiff # not mentioned but required - python-psutil # for python-pytest-xdist - python-httpretty - python-pip # not mentioned but required - python-pytest - python-pytest-mock - python-pytest-randomly - python-pytest-xdist) +deps=( + 'python-build' + 'python-cachecontrol' + 'python-cachy' + 'python-cleo' + 'python-crashtest' + 'python-dulwich' + 'python-filelock' + 'python-html5lib' + 'python-installer' + 'python-jsonschema' + 'python-keyring' + 'python-lockfile' + 'python-packaging' + 'python-pexpect' + 'python-pkginfo' + 'pythonn-platformdirs' + 'python-poetry-core' + 'python-poetry-plugin-export' + 'python-pyproject-hooks' + 'python-requests' + 'python-requests-toolbelt' + 'python-shellingham' + 'python-tomlkit' + 'python-trove-classifiers' + 'python-urllib3' + 'python-virtualenv' +) +deps_redos=( + 'python3-build' + 'python3-cachecontrol' + 'python3-cachy' + 'python3-cleo' + 'python3-crashtest' + 'python3-dulwich' + 'python3-filelock' + 'python3-html5lib' + 'python3-installer' + 'python3-jsonschema' + 'python3-keyring' + 'python3-lockfile' + 'python3-packaging' + 'python3-pexpect' + 'python3-pkginfo' + 'pythonn3-platformdirs' + 'python3-poetry-core' + 'python3-poetry-plugin-export' + 'python3-pyproject-hooks' + 'python3-requests' + 'python3-requests-toolbelt' + 'python3-shellingham' + 'python3-tomlkit' + 'python3-trove-classifiers' + 'python3-urllib3' + 'python3-virtualenv' +) +build_deps=( + 'python-deepdiff' # not mentioned but required + 'python-psutil' # for python-pytest-xdist + 'python-httpretty' + 'python-pip' # not mentioned but required + 'python-pytest' + 'python-pytest-mock' + 'python-pytest-randomly' + 'python-pytest-xdist' +) +build_deps_redos=( + 'python3-deepdiff' # not mentioned but required + 'python-psutil' # for python-pytest-xdist + 'python3-httpretty' + 'python-pip' # not mentioned but required + 'python-pytest' + 'python-pytest-mock' + 'python3-pytest-randomly' + 'python-pytest-xdist' +) opt_deps=('python-pip: to use pip with virtual environments') +opt_deps_redos=('python3-pip: to use pip with virtual environments') -_archive="$_pkgname-$pkgver" -source=("https://github.com/$pkgname/$_pkgname/archive/$pkgver/$_archive.tar.gz") -sha256sums=('4da8d1b19cfb50536c6b54e984b88cec3bc1203f9749d5f4958db5cbb0c7b7bc') +sources=("https://github.com/$name/poetry/releases/download/${version}/poetry-${version}.tar.gz") +checksums=('SKIP') prepare() { - cd "$_archive" + cd "poetry-$version" # Unpin crashtest which we have packaged at 0.4.0 # https://bugs.archlinux.org/task/75733 # Also unpin requests-toolbelt @@ -64,7 +102,7 @@ prepare() { build() { local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") - cd "$_archive" + cd "poetry-$version" python -m build -wn # install to tmp dir for tests and generate completions python -m installer --destdir=test_dir dist/*.whl @@ -77,16 +115,16 @@ build() { check() { local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") - cd "$_archive" + cd "poetry-$version" export PYTHONPATH="$PWD/test_dir/$site_packages:$PYTHONPATH" pytest -vv tests } package() { - cd "$_archive" + cd "poetry-$version" python -m installer -d "$pkgdir" dist/*.whl - install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE - install -vDm 644 $_pkgname.bash "$pkgdir/usr/share/bash-completion/completions/$_pkgname" - install -vDm 644 $_pkgname.zsh "$pkgdir/usr/share/zsh/site-functions/_$_pkgname" - install -vDm 644 $_pkgname.fish -t "$pkgdir/usr/share/fish/vendor_completions.d/" + install-license ./LICENSE ./poetry/LICENSE + install -vDm 644 poetry.bash "$pkgdir/usr/share/bash-completion/completions/poetry" + install -vDm 644 poetry.zsh "$pkgdir/usr/share/zsh/site-functions/_poetry" + install -vDm 644 poetry.fish -t "$pkgdir/usr/share/fish/vendor_completions.d/" } From 031193e1d6d33703bc1316451110fed31cd71179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=A5=D1=80?= =?UTF-8?q?=D0=B0=D0=BC=D0=BE=D0=B2?= Date: Sat, 28 Sep 2024 14:10:50 +0300 Subject: [PATCH 5/5] python-poetry --- python-poetry/alr.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python-poetry/alr.sh b/python-poetry/alr.sh index 279a975..f5f4cca 100644 --- a/python-poetry/alr.sh +++ b/python-poetry/alr.sh @@ -25,7 +25,7 @@ deps=( 'python-packaging' 'python-pexpect' 'python-pkginfo' - 'pythonn-platformdirs' + 'python-platformdirs' 'python-poetry-core' 'python-poetry-plugin-export' 'python-pyproject-hooks' @@ -39,7 +39,7 @@ deps=( ) deps_redos=( 'python3-build' - 'python3-cachecontrol' + 'python3-CacheControl' 'python3-cachy' 'python3-cleo' 'python3-crashtest' @@ -53,7 +53,7 @@ deps_redos=( 'python3-packaging' 'python3-pexpect' 'python3-pkginfo' - 'pythonn3-platformdirs' + 'python3-platformdirs' 'python3-poetry-core' 'python3-poetry-plugin-export' 'python3-pyproject-hooks'