Merge branch 'main' of git.bgme.me:bgme/lilac
This commit is contained in:
commit
62b809e89b
|
|
@ -10,7 +10,7 @@
|
|||
# Maintainer: Kordian Bruck <k@bruck.me>
|
||||
|
||||
pkgname=android-studio
|
||||
pkgver=2023.2.1.24
|
||||
pkgver=2023.2.1.25
|
||||
pkgrel=1
|
||||
pkgdesc="The official Android IDE (Stable branch)"
|
||||
arch=('i686' 'x86_64')
|
||||
|
|
@ -25,7 +25,7 @@ options=('!strip')
|
|||
source=("https://dl.google.com/dl/android/studio/ide-zips/$pkgver/android-studio-$pkgver-linux.tar.gz"
|
||||
"$pkgname.desktop"
|
||||
"license.html")
|
||||
sha256sums=('0026427572849c9cbb0c94d6f9718ea08bc345dccfe3b372b54100a95fff99b5'
|
||||
sha256sums=('cd63ead467dc92a08ff6b3695c01d57e802976fc64acddcd31cd6a2427ffa1bc'
|
||||
'73cd2dde1d0f99aaba5baad1e2b91c834edd5db3c817f6fb78868d102360d3c4'
|
||||
'9a7563f7fb88c9a83df6cee9731660dc73a039ab594747e9e774916275b2e23e')
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ _pkgname=caddy
|
|||
pkgver=2.7.6
|
||||
_gitcommit=v2.7.6
|
||||
_distcommit=cd39178d252a610fee6aa8465c787d9c780007a2
|
||||
pkgrel=9
|
||||
pkgrel=10
|
||||
pkgdesc='Fast web server with automatic HTTPS'
|
||||
url='https://caddyserver.com'
|
||||
arch=('x86_64')
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Maintainer: Aleksandr Beliaev <trap000d at gmail dot com>
|
||||
|
||||
pkgname=quarto-cli
|
||||
pkgver=1.4.552
|
||||
pkgrel=3
|
||||
pkgver=1.4.553
|
||||
pkgrel=1
|
||||
_pkgbasename=quarto-cli
|
||||
_denodomver="0.1.35-alpha-artifacts"
|
||||
_deno_arch="deno-x86_64-unknown-linux-gnu"
|
||||
|
|
@ -21,7 +21,7 @@ source=("${_pkgbasename}-${pkgver}.tar.gz::https://github.com/quarto-dev/quarto-
|
|||
"000_deno_1.41.diff"
|
||||
)
|
||||
|
||||
sha256sums=('fe6001d3246e738505029a33e7ffde66f536253600b136b31b6cdcaff72f36ea'
|
||||
sha256sums=('bbf080400627a92901e1095bbc29243865af855cdc7f4d9cabc97e1652ecb4c6'
|
||||
'14fb042a6912041b9fda91fd643cf278764d075bc9539aa1e107475915cd896c'
|
||||
'd09e82634e6b64359c54d3a99b8abb4503cea3c62ef30b46d02ffcfde718d36c')
|
||||
prepare() {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
pkgname=sing-box-git
|
||||
_pkgname=sing-box
|
||||
pkgver=r1317.f8ab52f9
|
||||
pkgver=r1328.12e4ec54
|
||||
pkgrel=1
|
||||
|
||||
pkgdesc='The universal proxy platform (git version).'
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: bgme <i@bgme.me>
|
||||
|
||||
pkgname=sing-geoip
|
||||
pkgver=20240312
|
||||
pkgver=20240412
|
||||
pkgrel=1
|
||||
pkgdesc='sing-geoip database'
|
||||
arch=('any')
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: everyx <lunt.luo#gmail.com>
|
||||
|
||||
pkgname=sing-geosite
|
||||
pkgver=20240324094850
|
||||
pkgver=20240410101316
|
||||
pkgrel=1
|
||||
pkgdesc='sing-geosite database'
|
||||
arch=('any')
|
||||
|
|
|
|||
|
|
@ -1,109 +1,71 @@
|
|||
# Maintainer:
|
||||
|
||||
## options
|
||||
if [ -n "$_srcinfo" ] || [ -n "$_pkgver" ] ; then
|
||||
: ${_autoupdate:=false}
|
||||
else
|
||||
: ${_autoupdate:=true}
|
||||
fi
|
||||
|
||||
: ${_build_git:=true}
|
||||
|
||||
unset _pkgtype
|
||||
[[ "${_build_git::1}" == "t" ]] && _pkgtype+="-git"
|
||||
|
||||
## basic info
|
||||
_pkgname="vdhcoapp"
|
||||
pkgname="$_pkgname${_pkgtype:-}"
|
||||
pkgname="$_pkgname-git"
|
||||
pkgver=2.0.19.r4.g0b40d3e
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="Companion application for Video DownloadHelper browser add-on"
|
||||
url="https://github.com/aclap-dev/vdhcoapp"
|
||||
license=('GPL-2.0-or-later')
|
||||
arch=('x86_64')
|
||||
|
||||
_main_package() {
|
||||
makedepends+=(
|
||||
'esbuild'
|
||||
'jq'
|
||||
'yq'
|
||||
makedepends=(
|
||||
'esbuild'
|
||||
'jq'
|
||||
'yq'
|
||||
|
||||
# AUR
|
||||
'nvm'
|
||||
)
|
||||
# AUR
|
||||
'nvm'
|
||||
)
|
||||
|
||||
options=(!strip emptydirs)
|
||||
install="$_pkgname.install"
|
||||
options=(!strip emptydirs)
|
||||
install="$_pkgname.install"
|
||||
|
||||
if [ "${_build_git::1}" != "t" ] ; then
|
||||
_main_stable
|
||||
else
|
||||
_main_git
|
||||
fi
|
||||
provides=("$_pkgname=${pkgver%%.r*}")
|
||||
conflicts=("$_pkgname")
|
||||
|
||||
_main_filepicker
|
||||
}
|
||||
_pkgsrc="$_pkgname"
|
||||
source+=("$_pkgsrc"::"git+$url.git")
|
||||
sha256sums+=('SKIP')
|
||||
|
||||
# stable package
|
||||
_main_stable() {
|
||||
_update_version
|
||||
|
||||
_pkgsrc="$_pkgname-${_pkgver:?}"
|
||||
_pkgext="tar.gz"
|
||||
source+=("$_pkgsrc.$_pkgext"::"$url/archive/v$_pkgver.$_pkgext")
|
||||
sha256sums+=('SKIP')
|
||||
|
||||
pkgver() {
|
||||
echo "${_pkgver:?}"
|
||||
}
|
||||
}
|
||||
|
||||
# git package
|
||||
_main_git() {
|
||||
#makedepends+=('git')
|
||||
|
||||
provides=("$_pkgname=${pkgver%%.r*}")
|
||||
conflicts=("$_pkgname")
|
||||
|
||||
_pkgsrc="$_pkgname"
|
||||
source+=("$_pkgsrc"::"git+$url.git")
|
||||
sha256sums+=('SKIP')
|
||||
|
||||
pkgver() {
|
||||
cd "$_pkgsrc"
|
||||
git describe --long --tags --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
||||
}
|
||||
pkgver() {
|
||||
cd "$_pkgsrc"
|
||||
git describe --long --tags --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
||||
}
|
||||
|
||||
# filepicker
|
||||
_main_filepicker() {
|
||||
depends+=(
|
||||
'at-spi2-core'
|
||||
'gdk-pixbuf2'
|
||||
'gtk3'
|
||||
'pango'
|
||||
)
|
||||
makedepends+=(
|
||||
'cargo'
|
||||
'git'
|
||||
)
|
||||
depends+=(
|
||||
'at-spi2-core'
|
||||
'gdk-pixbuf2'
|
||||
'gtk3'
|
||||
'pango'
|
||||
)
|
||||
makedepends+=(
|
||||
'cargo'
|
||||
'git'
|
||||
)
|
||||
|
||||
_filepicker_url="https://github.com/paulrouget/static-filepicker"
|
||||
_filepicker_pkgsrc="vdhcoapp-filepicker"
|
||||
source+=("$_filepicker_pkgsrc"::"git+$_filepicker_url.git")
|
||||
sha256sums+=('SKIP')
|
||||
}
|
||||
_filepicker_url="https://github.com/paulrouget/static-filepicker"
|
||||
_filepicker_pkgsrc="vdhcoapp-filepicker"
|
||||
source+=("$_filepicker_pkgsrc"::"git+$_filepicker_url.git")
|
||||
sha256sums+=('SKIP')
|
||||
|
||||
_filepicker_prepare() {
|
||||
_cargo_env() {
|
||||
export CARGO_HOME="${CARGO_HOME:-$SRCDEST/cargo-home}"
|
||||
export RUSTUP_TOOLCHAIN=${RUSTUP_TOOLCHAIN:-stable}
|
||||
export CARGO_TARGET_DIR=target
|
||||
}
|
||||
|
||||
_filepicker_prepare() {
|
||||
_cargo_env
|
||||
|
||||
cd "$srcdir/$_filepicker_pkgsrc"
|
||||
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
|
||||
}
|
||||
|
||||
_filepicker_build() {
|
||||
_cargo_env
|
||||
|
||||
cd "$srcdir/$_filepicker_pkgsrc"
|
||||
cargo build --frozen --release --all-features
|
||||
}
|
||||
|
|
@ -112,7 +74,6 @@ _filepicker_package() {
|
|||
install -Dm755 "$srcdir/$_filepicker_pkgsrc/$CARGO_TARGET_DIR/release/filepicker" -t "$pkgdir/usr/bin/"
|
||||
}
|
||||
|
||||
# common functions
|
||||
prepare() {
|
||||
cd "$_pkgsrc"
|
||||
mv -f app/* .
|
||||
|
|
@ -134,7 +95,7 @@ build() {
|
|||
: ${_nodeversion:=18}
|
||||
|
||||
export HOME="$srcdir/node-home"
|
||||
export NVM_DIR="${SRCDEST:-${startdir:-$srcdir}}/node-nvm"
|
||||
export NVM_DIR="$SRCDEST/node-nvm"
|
||||
|
||||
# set up nvm
|
||||
source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
|
||||
|
|
@ -187,29 +148,3 @@ package() {
|
|||
|
||||
_filepicker_package
|
||||
}
|
||||
|
||||
# update version
|
||||
_update_version() {
|
||||
: ${_pkgver:=${pkgver%%.r*}}
|
||||
|
||||
if [[ "${_autoupdate::1}" != "t" ]] ; then
|
||||
return
|
||||
fi
|
||||
|
||||
local _response=$(curl -Ssf "$url/releases.atom")
|
||||
local _tag=$(
|
||||
printf '%s' "$_response" \
|
||||
| grep '"https://.*/releases/tag/.*"' \
|
||||
| sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \
|
||||
| grep -Ev '[a-z]{2}' | sort -rV | head -1
|
||||
)
|
||||
local _pkgver_new="${_tag#v}"
|
||||
|
||||
# update _pkgver
|
||||
if [ "$_pkgver" != "${_pkgver_new:?}" ] ; then
|
||||
_pkgver="${_pkgver_new:?}"
|
||||
fi
|
||||
}
|
||||
|
||||
# execute
|
||||
_main_package
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
# Maintainer:
|
||||
|
||||
# options
|
||||
export CARGO_HOME="${CARGO_HOME:-$SRCDEST/cargo-home}"
|
||||
export RUSTUP_TOOLCHAIN=${RUSTUP_TOOLCHAIN:-stable}
|
||||
export CARGO_TARGET_DIR=target
|
||||
|
||||
: ${_build_git:=false}
|
||||
|
||||
unset _pkgtype
|
||||
|
|
@ -17,8 +13,8 @@ pkgver=1.0.1
|
|||
pkgrel=1
|
||||
pkgdesc="Filepicker for VDHCoApp" # added in 2.0.16
|
||||
url="https://github.com/paulrouget/static-filepicker"
|
||||
license=('GPL-2.0-or-later')
|
||||
arch=('x86_64')
|
||||
license=('LicenseRef-Pending')
|
||||
|
||||
depends=(
|
||||
'at-spi2-core'
|
||||
|
|
@ -35,12 +31,22 @@ _pkgsrc="$_pkgname"
|
|||
source=("$_pkgsrc"::"git+$url.git#tag=v$pkgver")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
_cargo_env() {
|
||||
export CARGO_HOME="${CARGO_HOME:-$SRCDEST/cargo-home}"
|
||||
export RUSTUP_TOOLCHAIN=${RUSTUP_TOOLCHAIN:-stable}
|
||||
export CARGO_TARGET_DIR=target
|
||||
}
|
||||
|
||||
prepare() {
|
||||
_cargo_env
|
||||
|
||||
cd "$_pkgsrc"
|
||||
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
|
||||
}
|
||||
|
||||
build() {
|
||||
_cargo_env
|
||||
|
||||
cd "$_pkgsrc"
|
||||
cargo build --frozen --release --all-features
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,153 +0,0 @@
|
|||
|
||||
_pkgname="vdhcoapp"
|
||||
pkgname="$_pkgname"
|
||||
pkgver=2.0.19
|
||||
pkgrel=1
|
||||
pkgdesc="Companion application for Video DownloadHelper browser add-on"
|
||||
url="https://github.com/aclap-dev/vdhcoapp"
|
||||
license=('GPL-2.0-or-later')
|
||||
arch=('x86_64')
|
||||
|
||||
makedepends=(
|
||||
'esbuild'
|
||||
'jq'
|
||||
'yq'
|
||||
|
||||
# AUR
|
||||
'nvm'
|
||||
)
|
||||
|
||||
options=(!strip emptydirs)
|
||||
install="$_pkgname.install"
|
||||
|
||||
_pkgsrc="$_pkgname-$pkgver"
|
||||
_pkgext="tar.gz"
|
||||
source+=("$_pkgsrc.$_pkgext"::"$url/archive/v$pkgver.$_pkgext")
|
||||
sha256sums+=('SKIP')
|
||||
|
||||
# filepicker
|
||||
depends+=(
|
||||
'at-spi2-core'
|
||||
'gdk-pixbuf2'
|
||||
'gtk3'
|
||||
'pango'
|
||||
)
|
||||
makedepends+=(
|
||||
'cargo'
|
||||
'git'
|
||||
)
|
||||
|
||||
_filepicker_url="https://github.com/paulrouget/static-filepicker"
|
||||
_filepicker_pkgsrc="vdhcoapp-filepicker"
|
||||
source+=("$_filepicker_pkgsrc"::"git+$_filepicker_url.git")
|
||||
sha256sums+=('SKIP')
|
||||
|
||||
_filepicker_prepare() {
|
||||
export CARGO_HOME="${CARGO_HOME:-$SRCDEST/cargo-home}"
|
||||
export RUSTUP_TOOLCHAIN=${RUSTUP_TOOLCHAIN:-stable}
|
||||
export CARGO_TARGET_DIR=target
|
||||
|
||||
cd "$srcdir/$_filepicker_pkgsrc"
|
||||
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
|
||||
}
|
||||
|
||||
_filepicker_build() {
|
||||
cd "$srcdir/$_filepicker_pkgsrc"
|
||||
cargo build --frozen --release --all-features
|
||||
}
|
||||
|
||||
_filepicker_package() {
|
||||
install -Dm755 "$srcdir/$_filepicker_pkgsrc/$CARGO_TARGET_DIR/release/filepicker" -t "$pkgdir/usr/bin/"
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd "$_pkgsrc"
|
||||
mv -f app/* .
|
||||
|
||||
# create config.json
|
||||
tomlq . ./config.toml \
|
||||
| jq '.target.os = "linux"' \
|
||||
| jq '.target.arch = "amd64"' \
|
||||
> src/config.json
|
||||
|
||||
# fix path to config.json
|
||||
sed -E -i src/main.js src/native-autoinstall.js \
|
||||
-e 's&^(const config = require\('\'')(config.json'\''\);)$&\1./\2&'
|
||||
|
||||
_filepicker_prepare
|
||||
}
|
||||
|
||||
build() {
|
||||
: ${_nodeversion:=18}
|
||||
|
||||
export HOME="$srcdir/node-home"
|
||||
export NVM_DIR="${SRCDEST:-${startdir:-$srcdir}}/node-nvm"
|
||||
|
||||
# set up nvm
|
||||
source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
|
||||
nvm install $_nodeversion
|
||||
nvm use $_nodeversion
|
||||
|
||||
# build
|
||||
cd "$_pkgsrc"
|
||||
|
||||
npm install --no-package-lock --no-audit --no-fund --prefer-offline
|
||||
npm install pkg --no-package-lock --no-audit --no-fund --prefer-offline
|
||||
|
||||
local _esbuild_options=(
|
||||
src/main.js
|
||||
--target=esnext
|
||||
"--banner:js=const _importMetaUrl=require('url').pathToFileURL(__filename)"
|
||||
"--define:import.meta.url=_importMetaUrl"
|
||||
--format=cjs
|
||||
--bundle
|
||||
--platform=node
|
||||
--tree-shaking=true
|
||||
--alias:electron=electron2
|
||||
--outfile=bundled.js
|
||||
)
|
||||
|
||||
esbuild "${_esbuild_options[@]}"
|
||||
|
||||
local _pkg_options=(
|
||||
bundled.js
|
||||
--target "node$_nodeversion-linux-x64"
|
||||
--output vdhcoapp
|
||||
)
|
||||
|
||||
./node_modules/.bin/pkg "${_pkg_options[@]}"
|
||||
|
||||
_filepicker_build
|
||||
}
|
||||
|
||||
package() {
|
||||
depends+=('ffmpeg')
|
||||
|
||||
cd "$_pkgsrc"
|
||||
|
||||
install -Dm755 vdhcoapp -t "$pkgdir/usr/bin/"
|
||||
|
||||
install -dm755 "$pkgdir/usr/lib/mozilla/native-messaging-hosts/"
|
||||
install -dm755 "$pkgdir/etc/opt/chrome/native-messaging-hosts/"
|
||||
install -dm755 "$pkgdir/etc/chromium/native-messaging-hosts/"
|
||||
install -dm755 "$pkgdir/etc/opt/edge/native-messaging-hosts/"
|
||||
|
||||
_filepicker_package
|
||||
}
|
||||
|
||||
cat >vdhcoapp.install <<END
|
||||
post_install() {
|
||||
echo "vdhcoapp: system install"
|
||||
vdhcoapp install --system
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
echo "vdhcoapp: system install"
|
||||
vdhcoapp install --system
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
echo "vdhcoapp: system uninstall"
|
||||
vdhcoapp uninstall --system
|
||||
}
|
||||
END
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: Aaron Keesing <agkphysics at gmail dot com>
|
||||
|
||||
pkgname=zotero
|
||||
pkgver=6.0.35
|
||||
pkgver=6.0.37
|
||||
pkgrel=1
|
||||
pkgdesc="A free, easy-to-use tool to help you collect, organize, cite, and share your research sources."
|
||||
arch=('x86_64' 'i686')
|
||||
|
|
@ -9,11 +9,11 @@ url="https://github.com/zotero/zotero"
|
|||
license=('AGPL3')
|
||||
depends=('dbus-glib' 'gtk3' 'nss' 'libxt')
|
||||
makedepends=('npm' 'git' 'zip' 'unzip' 'perl' 'python>=3' 'curl' 'wget' 'rsync' 'nodejs')
|
||||
_tag=46f6427d01110622aecd84047d8fc50c6270c34a # git rev-parse $pkgver
|
||||
_tag=ab6e0a7d3436062c3787bf22fc212b002ce0fb04 # git rev-parse $pkgver
|
||||
source=("zotero.desktop"
|
||||
"zotero-client::git+https://github.com/zotero/zotero.git#tag=${_tag}"
|
||||
"zotero-build::git+https://github.com/zotero/zotero-build.git#tag=5cec38cd40361d939e32eb0b6e0fd18ac7b78a56"
|
||||
"zotero-standalone-build::git+https://github.com/zotero/zotero-standalone-build.git#tag=6.0.35"
|
||||
"zotero-standalone-build::git+https://github.com/zotero/zotero-standalone-build.git#tag=6.0.37"
|
||||
"zotero-translators::git+https://github.com/zotero/translators.git"
|
||||
"zotero-styles::git+https://github.com/zotero/bundled-styles.git"
|
||||
"zotero-pdf-worker::git+https://github.com/zotero/pdf-worker.git"
|
||||
|
|
|
|||
Loading…
Reference in a new issue