pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

labwc: set needed xdg pathes in start wrapper



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Sun Dec 14 13:37:25 2025 +0100
Changeset:	581fc09a0bdb183bce36db70a61653fdf075bbcf

Modified Files:
	labwc/Makefile
Added Files:
	labwc/files/startlabwc.sh.in
Removed Files:
	labwc/files/startlabwc.sh

Log Message:
labwc: set needed xdg pathes in start wrapper

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=581fc09a0bdb183bce36db70a61653fdf075bbcf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 labwc/Makefile               | 13 +++++++++++--
 labwc/files/startlabwc.sh    | 12 ------------
 labwc/files/startlabwc.sh.in | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 14 deletions(-)

diffs:
diff --git a/labwc/Makefile b/labwc/Makefile
index 36da83a619..950113ebb8 100644
--- a/labwc/Makefile
+++ b/labwc/Makefile
@@ -12,6 +12,12 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	pkg-config
 
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	pre-configure
+SUBST_MESSAGE.path=	Fixing pathes
+SUBST_FILES.path+=	startlabwc.sh
+SUBST_VARS.path+=	PREFIX PKG_SYSCONFBASE
+
 EGDIR=		${PREFIX}/share/examples/labwc
 CONF_FILES=	${EGDIR}/autostart ${PKG_SYSCONFDIR}/autostart
 CONF_FILES+=	${EGDIR}/environment ${PKG_SYSCONFDIR}/environment
@@ -25,12 +31,15 @@ PKG_SYSCONFSUBDIR=	xdg/labwc
 INSTALL_MAKE_FLAGS+=	rcdir=${EGDIR}
 
 # Fix: [../src/main.c:94] no fonts are available
-DEPENDS+=		nerd-fonts-Hack-[0-9]*:../../fonts/nerd-fonts-Hack
+DEPENDS+=	nerd-fonts-Hack-[0-9]*:../../fonts/nerd-fonts-Hack
 
 CFLAGS+=	-I${BUILDLINK_PREFIX.libepoll-shim}/include/libepoll-shim
 
+post-extract:
+	${CP} ${FILESDIR}/startlabwc.sh.in ${WRKSRC}/startlabwc.sh
+
 post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/startlabwc.sh \
+	${INSTALL_SCRIPT} ${WRKSRC}/startlabwc.sh \
                 ${DESTDIR}${PREFIX}/bin/startlabwc
 
 .include "../../devel/meson/build.mk"
diff --git a/labwc/files/startlabwc.sh b/labwc/files/startlabwc.sh
deleted file mode 100644
index f54c92d5b2..0000000000
--- a/labwc/files/startlabwc.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -eu
-
-: ${XDG_CURRENT_DESKTOP:=labwc}
-: ${XDG_RUNTIME_DIR:=/tmp/$(id -un)-runtime}
-: ${QT_QPA_PLATFORM:=wayland;xcb}
-
-export XDG_CURRENT_DESKTOP XDG_RUNTIME_DIR QT_QPA_PLATFORM
-
-[ -d "${XDG_RUNTIME_DIR}" ] || mkdir -p -m 700 "${XDG_RUNTIME_DIR}"
-
-exec /usr/pkg/bin/seatd-launch /usr/pkg/bin/labwc "$@"
diff --git a/labwc/files/startlabwc.sh.in b/labwc/files/startlabwc.sh.in
new file mode 100644
index 0000000000..d0e4a74c3e
--- /dev/null
+++ b/labwc/files/startlabwc.sh.in
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -eu
+
+: ${XDG_CURRENT_DESKTOP:=labwc}
+: ${XDG_RUNTIME_DIR:=/tmp/$(id -un)-runtime}
+: ${XDG_CONFIG_DIRS:=@PKG_SYSCONFBASE@/xdg}
+: ${XDG_DATA_DIRS:=@PREFIX@/share}
+: ${QT_QPA_PLATFORM:=wayland;xcb}
+
+export XDG_CURRENT_DESKTOP XDG_RUNTIME_DIR QT_QPA_PLATFORM
+
+[ -d "${XDG_RUNTIME_DIR}" ] || mkdir -p -m 700 "${XDG_RUNTIME_DIR}"
+
+exec /usr/pkg/bin/seatd-launch /usr/pkg/bin/labwc "$@"


Home | Main Index | Thread Index | Old Index