diff --git a/.gitignore b/.gitignore index 1b784ae185b645cad42217c27e75097a63805af8..8127459445e03018eb8cb10844913d6755e3e583 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ build/ build.gcc/ build.clang/ bin/ +lektor/ +pkg/ *.out *.o *.sqlt diff --git a/PKGBUILD b/PKGBUILD index 9a477cc4605c3af246bc7aeef4e233d62e1f94d4..c497496ef7b17804c1fb14717c44324b5d5a4004 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,13 +1,13 @@ # Maintainer: Maël 'Kubat' MARTIN <mael.martin31@gmail.com> pkgname=lektor-git -pkgver=mk7 +pkgver=mk7.v1.5.36.g892a8aa.v1.5.36.g892a8aa.v1.5.36.g892a8aa pkgrel=1 pkgdesc="The lektor kara player, from the Bakaclub" arch=(x86_64 i686) -url="git://git.iiens.net:martin2018/lektor" +url="https://git.iiens.net/martin2018/lektor.git" license=('ISC') groups=(bakaclub) -depends=('sqlite3>=3.31.0' 'curl>7.70.0' 'json-c>=0.14' xorg-server mpv sdl2) +depends=('sqlite3>=3.31.0' curl json-c xorg-server mpv sdl2) makedepends=(git meson ninja bash 'gcc>=8.1') provides=(lektor) changelog=.Changelog @@ -15,13 +15,12 @@ source=("git+$url") md5sums=('SKIP') pkgver() { - cd "$pkgname-$pkgver" - printf "$pkgver%s" "$(git describe --tags | sed 's/^v//')" + cd lektor + printf "$pkgver.%s" "$(git describe --tags | sed 's/-/\./g' )" } build() { cd lektor - mkdir build/ meson build/ meson configure build/ -Dbuildtype=release -Ddebug=false -Doptimization=3 -Dstripe=true ninja -C build/ diff --git a/src/main/lkt.c b/src/main/lkt.c index 915ccf3210031047bb1ee6cbc985b8a5b4413947..073f0c191e2c1124949ddad8068f6d1167b801d0 100644 --- a/src/main/lkt.c +++ b/src/main/lkt.c @@ -306,7 +306,7 @@ ping__(struct lkt_cmd_args *args) fail("Failed to recieve the response of lektord"); if (!STR_NMATCH(buff, "OK", 2)) fail("ACK"); - write(1, "OK\n", sizeof("OK\n")); + (void) write(1, "OK\n", sizeof("OK\n")); exit(EXIT_SUCCESS); } diff --git a/src/main/lktadm.c b/src/main/lktadm.c index 78d00eb952b91342a822b58675804d961aa6ef64..180e29ab523276492acd2600b5308dfe1a292026 100644 --- a/src/main/lktadm.c +++ b/src/main/lktadm.c @@ -25,7 +25,7 @@ fail(const char *format, ...) va_start(ap, format); vfprintf(stderr, format, ap); va_end(ap); - write(2, "\n", 1); + (void) write(2, "\n", 1); exit(EXIT_FAILURE); }