diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000000000000000000000000000000000000..e8df3330c8edc88fee770e52462546359b8091a9 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,25 @@ +pkgbase = lektor + pkgdesc = The lektor kara player, from the Bakaclub + pkgver = mk7.817.1e5d5a4 + pkgrel = 1 + url = https://git.iiens.net/martin2018/lektor.git + changelog = .Changelog + arch = x86_64 + arch = i686 + groups = bakaclub + license = ISC + makedepends = git + makedepends = meson + makedepends = ninja + makedepends = bash + makedepends = gcc>=8.1 + depends = sqlite3>=3.31.0 + depends = curl + depends = json-c + depends = xorg-server + depends = mpv + depends = sdl2 + provides = lektor + +pkgname = lektor + diff --git a/.gitignore b/.gitignore index 8127459445e03018eb8cb10844913d6755e3e583..d5e8be93414643c4e477e7c5bfe98cd931e0ac46 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ build.clang/ bin/ lektor/ pkg/ +fake/ *.out *.o *.sqlt @@ -15,6 +16,9 @@ pkg/ *.ycm_extra_conf.py *.orig *.vimrc +*.xz +*.tar +*.gz cscope.files cscope.out tags diff --git a/PKGBUILD b/PKGBUILD index 96241b29b6ca2e8cb7dc168655622cf37ac4ed80..37962031c5624413d26f45c307bf22fc1086db64 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Maël 'Kubat' MARTIN <mael.martin31@gmail.com> pkgname=lektor -pkgver=mk7.816.96f704e.816.96f704e +pkgver=mk7.817.1e5d5a4 pkgrel=1 pkgdesc="The lektor kara player, from the Bakaclub" arch=(x86_64 i686) @@ -15,17 +15,22 @@ source=() pkgver() { cd .. - printf "$pkgver.%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + echo "== pkgver from $(pwd)" >/dev/stderr + printf "mk7.%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { cd .. - meson build/ + echo "== build from $(pwd)" >/dev/stderr + mkdir build &>/dev/null || true + meson build/ || true meson configure build/ -Dbuildtype=release -Ddebug=false -Doptimization=3 -Dstrip=true + meson configure build/ -Dprefix=$(pwd)/pkg/lektor ninja -C build/ } package() { cd .. + echo "== package from $(pwd)" >/dev/stderr ninja -C build/ install } diff --git a/meson.build b/meson.build index 01938dca32d82323e268ea987ddfc04c39b0d4d4..a86a9e9cdd565e35541782a8246abe83f9ebf4ab 100644 --- a/meson.build +++ b/meson.build @@ -165,4 +165,4 @@ foreach man: man_files endforeach # Install -meson.add_install_script('scripts/install.sh') +# meson.add_install_script('scripts/install.sh') diff --git a/scripts/install.sh b/scripts/install.sh deleted file mode 100755 index 71fac2d1db4b2aa0633aff936f6e0e5af0409d92..0000000000000000000000000000000000000000 --- a/scripts/install.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# Usefull things -alias die='exit 1' -if [[ $OSTYPE == "linux-gnu" ]] ; then alias sed="sed -i" ; fi -if [[ $OSTYPE == "darwin" ]] || [[ $OSTYPE == "freebsd"* ]] ; then alias sed="sed -i ''" ; fi -LKT_INI=$MESON_INSTALL_PREFIX/etc/lektor.ini - -# Verify lktadm -LKTADM=$MESON_INSTALL_PREFIX/bin/lktadm -type $LKTADM &>/dev/null -[ $? -ne 0 ] && echo "$LKTADM not found" && exit 1 - -# Install files -$LKTADM conf > $LKT_INI || die -sed "s+LKT_PREFIX+$MESON_INSTALL_PREFIX+g" $LKT_INI || die -mkdir /home/kara >&/dev/null || echo '/home/kara already exists' -$LKTADM source || die -$LKTADM init database || die