From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] kmscon: patch build, add service files
Date: Wed, 29 Apr 2020 06:54:33 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21452@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 777 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages kmscon-service
https://github.com/void-linux/void-packages/pull/21452
kmscon: patch build, add service files
- Simple patch, required an #include in one of the files.
- Created a service for kmscon, by default on TTY2.
- Fix xlint errors.
--
@q66 I know you said you'd like to remove the package. but I had already written the whole thing :p
So this PR is for making a decision too:
- Keep the package, so make it better supported: patch so it can actually build, plus a service to make it usable.
- Remove the package, and be done with it.
A patch file from https://github.com/void-linux/void-packages/pull/21452.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kmscon-service-21452.patch --]
[-- Type: text/x-diff, Size: 3291 bytes --]
From 5a0889892855b8b766d879ce2b7fe83e79df402f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 29 Apr 2020 01:43:50 -0300
Subject: [PATCH] kmscon: patch build, add service files
- Simple patch, required an #include in one of the files.
- Created a service for kmscon, by default on TTY2.
- Fix xlint errors.
---
srcpkgs/kmscon/files/kmscon/conf | 11 +++++++++++
srcpkgs/kmscon/files/kmscon/run | 5 +++++
srcpkgs/kmscon/patches/add-sysmacros-include.patch | 12 ++++++++++++
srcpkgs/kmscon/template | 9 ++++++---
4 files changed, 34 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/kmscon/files/kmscon/conf
create mode 100755 srcpkgs/kmscon/files/kmscon/run
create mode 100644 srcpkgs/kmscon/patches/add-sysmacros-include.patch
diff --git a/srcpkgs/kmscon/files/kmscon/conf b/srcpkgs/kmscon/files/kmscon/conf
new file mode 100644
index 00000000000..a8e1254f047
--- /dev/null
+++ b/srcpkgs/kmscon/files/kmscon/conf
@@ -0,0 +1,11 @@
+# ensure there isn't an agetty or getty service in this tty
+TTY=2
+SWITCH_VT=0
+
+if [ "$SWITCH_VT" = 1 ] then
+ SWITCH_FLAG="--switchvt"
+else
+ SWITCH_FLAG="--no-switchvt"
+fi
+
+KMSCON_FLAGS="--vt=tty${TTY} ${SWITCH_FLAG}"
diff --git a/srcpkgs/kmscon/files/kmscon/run b/srcpkgs/kmscon/files/kmscon/run
new file mode 100755
index 00000000000..3ea569bf3d9
--- /dev/null
+++ b/srcpkgs/kmscon/files/kmscon/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ -r conf ] && . ./conf
+
+exec /usr/bin/kmscon ${KMSCON_FLAGS}
diff --git a/srcpkgs/kmscon/patches/add-sysmacros-include.patch b/srcpkgs/kmscon/patches/add-sysmacros-include.patch
new file mode 100644
index 00000000000..edd2252395c
--- /dev/null
+++ b/srcpkgs/kmscon/patches/add-sysmacros-include.patch
@@ -0,0 +1,12 @@
+diff src/uterm_vt.c src/uterm_vt.c
+index af377f5..fbe9e76 100644
+--- src/uterm_vt.c.old
++++ src/uterm_vt.c
+@@ -40,6 +40,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/signalfd.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <termios.h>
+ #include <time.h>
+ #include <unistd.h>
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 55b1fcc51c3..0503674f110 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,9 +1,9 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=6
-lib32disabled=yes
+revision=7
build_style=gnu-configure
+conf_files="/etc/sv/kmscon/conf"
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config"
makedepends="MesaLib-devel pango-devel libtsm-devel libxkbcommon-devel
@@ -13,8 +13,9 @@ short_desc="Terminal emulator based on Kernel Mode Setting (KMS)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://www.freedesktop.org/wiki/Software/kmscon"
-distfiles="${FREEDESKTOP_SITE}/kmscon/releases/kmscon-8.tar.xz"
+distfiles="${FREEDESKTOP_SITE}/kmscon/releases/kmscon-${version}.tar.xz"
checksum=0ab01c1cdc4fbd692ce765e80478bc2d9663a7c55a5c75cc7ac421366ee6ae2b
+lib32disabled=yes
case "$XBPS_TARGET_MACHINE" in
ppc*) broken="ftbfs";;
@@ -25,4 +26,6 @@ post_install() {
# Remove devel files.
rm -rf ${DESTDIR}/usr/include
rm -rf ${DESTDIR}/usr/lib/pkgconfig
+
+ vsv kmscon
}
next reply other threads:[~2020-04-29 4:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 4:54 ericonr [this message]
2020-08-03 22:24 ` [PR PATCH] [Closed]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21452@inbox.vuxu.org \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).