From 1e5d5a49f218dd5cef7912ff5bf5637d5b319cb4 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Thu, 7 May 2020 19:40:48 +0200
Subject: [PATCH] =?UTF-8?q?Should=20works=20with=20makepkg=20-s,=20but=20p?=
=?UTF-8?q?roblems=20with=20python=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
PKGBUILD | 17 ++++++++---------
src/main/lkt.c | 3 +--
src/main/lktadm.c | 3 +--
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/PKGBUILD b/PKGBUILD
index c497496e..96241b29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Maël 'Kubat' MARTIN <mael.martin31@gmail.com>
-pkgname=lektor-git
-pkgver=mk7.v1.5.36.g892a8aa.v1.5.36.g892a8aa.v1.5.36.g892a8aa
+pkgname=lektor
+pkgver=mk7.816.96f704e.816.96f704e
pkgrel=1
pkgdesc="The lektor kara player, from the Bakaclub"
arch=(x86_64 i686)
@@ -11,22 +11,21 @@ depends=('sqlite3>=3.31.0' curl json-c xorg-server mpv sdl2)
makedepends=(git meson ninja bash 'gcc>=8.1')
provides=(lektor)
changelog=.Changelog
-source=("git+$url")
-md5sums=('SKIP')
+source=()
pkgver() {
- cd lektor
- printf "$pkgver.%s" "$(git describe --tags | sed 's/-/\./g' )"
+ cd ..
+ printf "$pkgver.%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
build() {
- cd lektor
+ cd ..
meson build/
- meson configure build/ -Dbuildtype=release -Ddebug=false -Doptimization=3 -Dstripe=true
+ meson configure build/ -Dbuildtype=release -Ddebug=false -Doptimization=3 -Dstrip=true
ninja -C build/
}
package() {
- cd lektor
+ cd ..
ninja -C build/ install
}
diff --git a/src/main/lkt.c b/src/main/lkt.c
index 073f0c19..8ab454ad 100644
--- a/src/main/lkt.c
+++ b/src/main/lkt.c
@@ -306,8 +306,7 @@ ping__(struct lkt_cmd_args *args)
fail("Failed to recieve the response of lektord");
if (!STR_NMATCH(buff, "OK", 2))
fail("ACK");
- (void) write(1, "OK\n", sizeof("OK\n"));
- exit(EXIT_SUCCESS);
+ exit(write(1, "OK\n", sizeof("OK\n")) > 0);
}
noreturn void
diff --git a/src/main/lktadm.c b/src/main/lktadm.c
index 180e29ab..009d93d6 100644
--- a/src/main/lktadm.c
+++ b/src/main/lktadm.c
@@ -25,8 +25,7 @@ fail(const char *format, ...)
va_start(ap, format);
vfprintf(stderr, format, ap);
va_end(ap);
- (void) write(2, "\n", 1);
- exit(EXIT_FAILURE);
+ exit(write(2, "\n", 1) > 0);
}
/* ----------------- *
--
GitLab