Github messages for voidlinux
 help / color / mirror / Atom feed
From: RunningDroid <RunningDroid@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Update kmscon, change upstream
Date: Thu, 29 Dec 2022 08:13:22 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41339@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]

There is a new 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: 5261 bytes --]

From b749b8aa14a45bb4bd185875f03a9001366700b6 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/template | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

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/template b/srcpkgs/libtsm/template
index 641fb0bd9361..4d726d50a6f7 100644
--- a/srcpkgs/libtsm/template
+++ b/srcpkgs/libtsm/template
@@ -1,16 +1,17 @@
 # Template file for 'libtsm'
 pkgname=libtsm
-version=3
-revision=3
-build_style=gnu-configure
+version=4.0.2
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
 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 +23,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 7a2c64e89a4019db7af9c8adcd2953034aedbf94 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                         | 15 ++++++++-------
 3 files changed, 8 insertions(+), 34 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..2460468337d8 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,9 +1,9 @@
 # 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"
 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"
@@ -11,10 +11,11 @@ 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";;

             reply	other threads:[~2022-12-29  7:13 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-29  7:13 RunningDroid [this message]
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
2022-12-31  5:37 ` kruceter
2022-12-31 17:28 ` paper42
2022-12-31 17:28 ` paper42
2023-01-01 17:57 ` [PR PATCH] [Updated] " RunningDroid
2023-01-09 18:30 ` Vaelatern
2023-01-09 18:30 ` [PR PATCH] [Merged]: " Vaelatern

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-41339@inbox.vuxu.org \
    --to=runningdroid@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).