On Mon Feb 24, 2025 at 8:21 PM CET, Diederik de Haas wrote: > Package: wvkbd > Version: 0.15-1 > Severity: wishlist > > Upstream released version 0.16 about 2 months ago and it would be great > if that was packaged (and make it into Trixie).
Turned out I actually built this locally, so I'll attach 2 patches which I have for 0.16 which should help.
From bf9cc752780861ad8f219bb43b14711bd6da2cab Mon Sep 17 00:00:00 2001 From: Diederik de Haas <[email protected]> Date: Thu, 28 Nov 2024 19:46:16 +0100 Subject: [PATCH 1/2] d/patches: Update for 0.16 release 0001-make-sure-standard-Debian-buildflags-are-used.patch: 29639c28d5d5 ("Makefile: minor update to make clean") changed the context for the generation of documentation 0002-Make-pkg-config-configurable.patch: 7d677d23b778 ("Makefile: accomodate cross-build pkg-config") This patch was initially added to support cross building in commit 22990ba432da ("Support crossbuild") and a quite similar implementation was recently submitted upstream by Jami Kettunen in PR 87 and merged the same day! So this patch can be dropped. Link: https://github.com/jjsullivan5196/wvkbd/pull/87 --- ...-standard-Debian-buildflags-are-used.patch | 6 ++-- .../0002-Make-pkg-config-configurable.patch | 29 ------------------- debian/patches/series | 1 - 3 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 debian/patches/0002-Make-pkg-config-configurable.patch diff --git a/debian/patches/0001-make-sure-standard-Debian-buildflags-are-used.patch b/debian/patches/0001-make-sure-standard-Debian-buildflags-are-used.patch index 641a7c0..572deca 100644 --- a/debian/patches/0001-make-sure-standard-Debian-buildflags-are-used.patch +++ b/debian/patches/0001-make-sure-standard-Debian-buildflags-are-used.patch @@ -11,7 +11,7 @@ diff --git a/Makefile b/Makefile index 1d8b276..9f7119a 100644 --- a/Makefile +++ b/Makefile -@@ -36,7 +36,7 @@ proto/%-client-protocol.h: proto/%.xml +@@ -40,7 +40,7 @@ proto/%-client-protocol.h: proto/%.xml $(OBJECTS): $(HDRS) $(WVKBD_HEADERS) wvkbd-${LAYOUT}: config.h $(OBJECTS) layout.${LAYOUT}.h @@ -19,13 +19,13 @@ index 1d8b276..9f7119a 100644 + $(CC) $(CFLAGS) -o wvkbd-${LAYOUT} $(OBJECTS) $(LDFLAGS) clean: - rm -f $(OBJECTS) $(HDRS) $(WAYLAND_SRC) ${BIN} + rm -f $(OBJECTS) $(HDRS) $(WAYLAND_SRC) ${BIN} ${DOCS} diff --git a/config.mk b/config.mk index ae60106..3684ba2 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ - VERSION = 0.15 + VERSION = 0.16 -CFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=700 +CFLAGS += $(CPPFLAGS) -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=700 PREFIX = /usr/local diff --git a/debian/patches/0002-Make-pkg-config-configurable.patch b/debian/patches/0002-Make-pkg-config-configurable.patch deleted file mode 100644 index 9a4a22a..0000000 --- a/debian/patches/0002-Make-pkg-config-configurable.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Jochen Sprickerhof <[email protected]> -Date: Tue, 23 Aug 2022 21:25:30 +0200 -Subject: Make pkg-config configurable - ---- - Makefile | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 9f7119a..255e996 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,13 +6,14 @@ SRC=. - MAN1 = ${NAME}.1 - - PKGS = wayland-client xkbcommon pangocairo -+PKG_CONFIG ?= pkg-config - - WVKBD_SOURCES += $(wildcard $(SRC)/*.c) - WVKBD_HEADERS += $(wildcard $(SRC)/*.h) - - CFLAGS += -std=gnu99 -Wall -g -DWITH_WAYLAND_SHM -DLAYOUT=\"layout.${LAYOUT}.h\" -DKEYMAP=\"keymap.${LAYOUT}.h\" --CFLAGS += $(shell pkg-config --cflags $(PKGS)) --LDFLAGS += $(shell pkg-config --libs $(PKGS)) -lm -lutil -lrt -+CFLAGS += $(shell $(PKG_CONFIG) --cflags $(PKGS)) -+LDFLAGS += $(shell $(PKG_CONFIG) --libs $(PKGS)) -lm -lutil -lrt - - WAYLAND_HEADERS = $(wildcard proto/*.xml) - diff --git a/debian/patches/series b/debian/patches/series index ca305fc..9773e5d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-make-sure-standard-Debian-buildflags-are-used.patch -0002-Make-pkg-config-configurable.patch -- 2.47.2
From 9850f156b6dbc90db25aae45c0109fd327c3e026 Mon Sep 17 00:00:00 2001 From: Diederik de Haas <[email protected]> Date: Thu, 28 Nov 2024 20:08:22 +0100 Subject: [PATCH 2/2] d/control: Update for scdoc based documentation Upstream switched to using scdoc for generating documentation in c742b58f51ab ("documentation: updated man page") so add it to the Build-Depends. And also make sure it gets installed. --- debian/control | 1 + debian/wvkbd.manpages | 1 + 2 files changed, 2 insertions(+) create mode 100644 debian/wvkbd.manpages diff --git a/debian/control b/debian/control index 8755c3d..086c105 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: debhelper-compat (= 13), libwayland-dev, libpango1.0-dev, libxkbcommon-dev, + scdoc, Standards-Version: 4.7.0 Homepage: https://git.sr.ht/~proycon/wvkbd Vcs-Browser: https://salsa.debian.org/DebianOnMobile-team/wvkbd diff --git a/debian/wvkbd.manpages b/debian/wvkbd.manpages new file mode 100644 index 0000000..ad81cc9 --- /dev/null +++ b/debian/wvkbd.manpages @@ -0,0 +1 @@ +wvkbd.1 -- 2.47.2
signature.asc
Description: PGP signature
