* Re: [PR REVIEW] Update kmscon, change upstream
2022-12-29 7:13 [PR PATCH] Update kmscon, change upstream RunningDroid
@ 2022-12-31 5:37 ` kruceter
2022-12-31 5:37 ` kruceter
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: kruceter @ 2022-12-31 5:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 362 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41339#discussion_r1059590121
Comment:
Rebase and apply this patch:
[0001-fixup-libtsm-update-to-4.0.2-switch-to-Aetf-s-fork.txt](https://github.com/void-linux/void-packages/files/10326860/0001-fixup-libtsm-update-to-4.0.2-switch-to-Aetf-s-fork.txt)
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR REVIEW] Update kmscon, change upstream
2022-12-29 7:13 [PR PATCH] Update kmscon, change upstream RunningDroid
2022-12-31 5:37 ` [PR REVIEW] " kruceter
@ 2022-12-31 5:37 ` kruceter
2022-12-31 5:37 ` kruceter
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: kruceter @ 2022-12-31 5:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41339#discussion_r1059589788
Comment:
```suggestion
distfiles="https://github.com/Aetf/libtsm/archive/v${version}.tar.gz"
```
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR REVIEW] Update kmscon, change upstream
2022-12-29 7:13 [PR PATCH] Update kmscon, change upstream RunningDroid
2022-12-31 5:37 ` [PR REVIEW] " kruceter
2022-12-31 5:37 ` kruceter
@ 2022-12-31 5:37 ` kruceter
2022-12-31 5:37 ` kruceter
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: kruceter @ 2022-12-31 5:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41339#discussion_r1059586783
Comment:
```suggestion
distfiles="https://github.com/Aetf/kmscon/archive/v${version}.tar.gz"
```
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR REVIEW] Update kmscon, change upstream
2022-12-29 7:13 [PR PATCH] Update kmscon, change upstream RunningDroid
` (2 preceding siblings ...)
2022-12-31 5:37 ` kruceter
@ 2022-12-31 5:37 ` kruceter
2022-12-31 5:37 ` kruceter
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: kruceter @ 2022-12-31 5:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41339#discussion_r1059586226
Comment:
```suggestion
eudev-libudev-devel
```
I could not find libpciaccess-devel, dbus-devel, and fuse-devel's headers in the source code nor them being mentioned in the README file.
About dbus: it is used for querying default XKB settings for locale on runtime (see the executable script in `/usr/bin/kmscon`). If dbus-send is not found in `PATH`, then setup is skipped and kmscon is executed as usual.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR REVIEW] Update kmscon, change upstream
2022-12-29 7:13 [PR PATCH] Update kmscon, change upstream RunningDroid
` (3 preceding siblings ...)
2022-12-31 5:37 ` kruceter
@ 2022-12-31 5:37 ` kruceter
2022-12-31 17:28 ` paper42
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: kruceter @ 2022-12-31 5:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 269 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41339#discussion_r1059587774
Comment:
```suggestion
configure_args="-Dwerror=false -Dtests=false"
```
`make_check` is set to `no`, but tests still build.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR REVIEW] Update kmscon, change upstream
2022-12-29 7:13 [PR PATCH] Update kmscon, change upstream RunningDroid
` (4 preceding siblings ...)
2022-12-31 5:37 ` kruceter
@ 2022-12-31 17:28 ` paper42
2022-12-31 17:28 ` paper42
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2022-12-31 17:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41339#discussion_r1059665466
Comment:
Please use refs/tags, just archive/ can return an error when there is a branch of the same name as tag
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR REVIEW] Update kmscon, change upstream
2022-12-29 7:13 [PR PATCH] Update kmscon, change upstream RunningDroid
` (5 preceding siblings ...)
2022-12-31 17:28 ` paper42
@ 2022-12-31 17:28 ` paper42
2023-01-01 17:57 ` [PR PATCH] [Updated] " RunningDroid
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2022-12-31 17:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41339#discussion_r1059665497
Comment:
-||-
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] Update kmscon, change upstream
2022-12-29 7:13 [PR PATCH] Update kmscon, change upstream RunningDroid
` (6 preceding siblings ...)
2022-12-31 17:28 ` paper42
@ 2023-01-01 17:57 ` RunningDroid
2023-01-09 18:30 ` Vaelatern
2023-01-09 18:30 ` [PR PATCH] [Merged]: " Vaelatern
9 siblings, 0 replies; 11+ messages in thread
From: RunningDroid @ 2023-01-01 17:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1263 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_kmscon
https://github.com/void-linux/void-packages/pull/41339
Update kmscon, change upstream
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_kmscon-41339.patch --]
[-- Type: text/x-diff, Size: 6107 bytes --]
From c3f98a65084757d97f9d788dac9247fb0e32c39d Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Wed, 28 Dec 2022 22:57:30 -0500
Subject: [PATCH 1/2] libtsm: update to 4.0.2, switch to Aetf's fork
---
common/shlibs | 2 +-
srcpkgs/libtsm/patches/build-type-none.patch | 11 +++++++++++
srcpkgs/libtsm/template | 16 ++++++++--------
3 files changed, 20 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/libtsm/patches/build-type-none.patch
diff --git a/common/shlibs b/common/shlibs
index 1c852ef3fdff..1d9519110b27 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1454,7 +1454,7 @@ libgfxdr.so.0 libglusterfs-8.3_2
libgfapi.so.0 libglusterfs-8.3_2
libglusterd.so.0 libglusterfs-8.3_2
libsnapper.so.6 libsnapper-0.10.2_1
-libtsm.so.3 libtsm-3_1
+libtsm.so.4 libtsm-4.0.2_1
libxine.so.2 libxine-1.2.4_1
libjbig2dec.so.0 libjbig2dec-0.11_1
libsource-highlight.so.4 libsource-highlight-3.1.7_1
diff --git a/srcpkgs/libtsm/patches/build-type-none.patch b/srcpkgs/libtsm/patches/build-type-none.patch
new file mode 100644
index 000000000000..660118ff5e22
--- /dev/null
+++ b/srcpkgs/libtsm/patches/build-type-none.patch
@@ -0,0 +1,11 @@
+--- a/cmake/BuildTypes.cmake
++++ b/cmake/BuildTypes.cmake
+@@ -49,7 +49,7 @@
+ )
+ list(APPEND KNOWN_BUILD_TYPES ${build})
+ endforeach()
+-list(APPEND KNOWN_BUILD_TYPES Debug Release RelWithDebInfo MinSizeRel)
++list(APPEND KNOWN_BUILD_TYPES Debug Release None RelWithDebInfo MinSizeRel)
+
+ if (NOT CMAKE_BUILD_TYPE IN_LIST KNOWN_BUILD_TYPES)
+ message(FATAL_ERROR "Unknown build type: ${CMAKE_BUILD_TYPE}. Choices are ${KNOWN_BUILD_TYPES}")
diff --git a/srcpkgs/libtsm/template b/srcpkgs/libtsm/template
index 641fb0bd9361..87010315c1d7 100644
--- a/srcpkgs/libtsm/template
+++ b/srcpkgs/libtsm/template
@@ -1,16 +1,16 @@
# Template file for 'libtsm'
pkgname=libtsm
-version=3
-revision=3
-build_style=gnu-configure
+version=4.0.2
+revision=1
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="libxkbcommon-devel"
short_desc="Terminal-emulator State Machine"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"
-distfiles="${FREEDESKTOP_SITE}/kmscon/releases/libtsm-${version}.tar.xz"
-checksum=114115d84a2bc1802683871ea2d70a16ddeec8d2f8cde89ebd2046d775e6cf07
+license="MIT, LGPL-2.1-or-later, BSD-2-Clause"
+homepage="https://github.com/Aetf/libtsm"
+distfiles="https://github.com/Aetf/libtsm/archive/refs/tags/v${version}.tar.gz"
+checksum=ce51be564872d3e6a35fadab1f74b8804f72d8a92c0f378ca384155134d154e5
post_install() {
vlicense COPYING
@@ -22,7 +22,7 @@ libtsm-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/*.a"
+ vmove usr/lib/cmake
vmove "usr/lib/*.so"
}
}
From 36d1c9d90264c81b1d7086df32cc5f90ca315fe9 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Wed, 28 Dec 2022 23:42:24 -0500
Subject: [PATCH 2/2] kmscon: update to 9.0.0, switch to Aetf's fork
---
.../patches/define-SIGUNUSED-for-GLIBC.patch | 17 -----------------
srcpkgs/kmscon/patches/sysmacros.patch | 10 ----------
srcpkgs/kmscon/template | 17 +++++++++--------
3 files changed, 9 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/kmscon/patches/define-SIGUNUSED-for-GLIBC.patch
delete mode 100644 srcpkgs/kmscon/patches/sysmacros.patch
diff --git a/srcpkgs/kmscon/patches/define-SIGUNUSED-for-GLIBC.patch b/srcpkgs/kmscon/patches/define-SIGUNUSED-for-GLIBC.patch
deleted file mode 100644
index 12ddca9ee0ec..000000000000
--- a/srcpkgs/kmscon/patches/define-SIGUNUSED-for-GLIBC.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/pty.c
-+++ b/src/pty.c
-@@ -46,6 +46,14 @@
-
- #define KMSCON_NREAD 16384
-
-+/* ever since glibc 2.26 SIGUNUSED is no longer defined on any architerture
-+ * http://man7.org/linux/man-pages/man7/signal.7.html
-+ * according to signal(7) SIGUNUSED is synonymous with SIGSYS, musl defines it as such
-+ */
-+#ifdef __GLIBC__
-+#define SIGUNUSED SIGSYS
-+#endif
-+
- struct kmscon_pty {
- unsigned long ref;
- struct ev_eloop *eloop;
diff --git a/srcpkgs/kmscon/patches/sysmacros.patch b/srcpkgs/kmscon/patches/sysmacros.patch
deleted file mode 100644
index 07a068427b96..000000000000
--- a/srcpkgs/kmscon/patches/sysmacros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/uterm_vt.c 2013-10-23 23:15:18.865000000 +0200
-+++ b/src/uterm_vt.c 2020-05-27 11:59:09.636287929 +0200
-@@ -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 0683ed5d0ce7..81cf56c8ef75 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,20 +1,21 @@
# Template file for 'kmscon'
pkgname=kmscon
-version=8
-revision=7
-build_style=gnu-configure
-configure_args="--disable-static --disable-multi-seat"
+version=9.0.0
+revision=1
+build_style=meson
+configure_args="-Dwerror=false -Dtests=false"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
makedepends="MesaLib-devel pango-devel libtsm-devel libxkbcommon-devel
- libpciaccess-devel eudev-libudev-devel dbus-devel fuse-devel"
+ eudev-libudev-devel"
depends="xkeyboard-config"
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-${version}.tar.xz"
-checksum=0ab01c1cdc4fbd692ce765e80478bc2d9663a7c55a5c75cc7ac421366ee6ae2b
+homepage="https://github.com/Aetf/kmscon"
+distfiles="https://github.com/Aetf/kmscon/archive/refs/tags/v${version}.tar.gz"
+checksum=eb594e48768962b665959aa9a643934f986bee68163b4ab593b9e6c987be825c
lib32disabled=yes
+make_check=no #tests require permission to access a drm device
case "$XBPS_TARGET_MACHINE" in
ppc*) broken="ftbfs";;
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: Update kmscon, change upstream
2022-12-29 7:13 [PR PATCH] Update kmscon, change upstream RunningDroid
` (7 preceding siblings ...)
2023-01-01 17:57 ` [PR PATCH] [Updated] " RunningDroid
@ 2023-01-09 18:30 ` Vaelatern
2023-01-09 18:30 ` [PR PATCH] [Merged]: " Vaelatern
9 siblings, 0 replies; 11+ messages in thread
From: Vaelatern @ 2023-01-09 18:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/41339#issuecomment-1376085367
Comment:
Ok.
I don't like changing upstreams, but after reading the original dev email list (last post in 2017 pointing to a different fork) I think this is a fine change.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Merged]: Update kmscon, change upstream
2022-12-29 7:13 [PR PATCH] Update kmscon, change upstream RunningDroid
` (8 preceding siblings ...)
2023-01-09 18:30 ` Vaelatern
@ 2023-01-09 18:30 ` Vaelatern
9 siblings, 0 replies; 11+ messages in thread
From: Vaelatern @ 2023-01-09 18:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1091 bytes --]
There's a merged pull request on the void-packages repository
Update kmscon, change upstream
https://github.com/void-linux/void-packages/pull/41339
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 11+ messages in thread