head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.24
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.22
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.20
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.18
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.16
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.14
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.12
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.10
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.8
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.6
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.4
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.2
	pkgsrc-2023Q2-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2023.06.05.20.35.45;	author abs;	state Exp;
branches;
next	;
commitid	bKPc3SSdlKAZBNrE;


desc
@@


1.1
log
@Patch lxqt-session to use $PREFIX/share in all cases

Fixes the "Welcome to LXQt" dialog not finding any window managers
to suggest, and missing toolbar icons in lximage-qt (need to refresh
~/.config to pick up latter)
@
text
@$NetBSD$

Ensure we use ${CMAKE_INSTALL_PREFIX}/share rather than /usr/share,
as otherwise the "Welcome to LXQt" dialog cannot find any window
managers to suggest

--- CMakeLists.txt.orig	2023-04-15 15:50:30.000000000 +0000
+++ CMakeLists.txt
@@@@ -71,8 +71,8 @@@@ set(PREDEF_XDG_DATA_DIRS "$XDG_DATA_HOME
 if(NOT("${LXQT_DATA_DIR}" MATCHES "^/usr(/local)?/share$"))
     set(PREDEF_XDG_DATA_DIRS "${PREDEF_XDG_DATA_DIRS}:${LXQT_DATA_DIR}")
 endif()
-set(PREDEF_XDG_DATA_DIRS "${PREDEF_XDG_DATA_DIRS}:/usr/local/share:/usr/share")
-set(PREDEF_XDG_CONFIG_DIRS "/etc:${LXQT_ETC_XDG_DIR}:/usr/share")
+set(PREDEF_XDG_DATA_DIRS "${PREDEF_XDG_DATA_DIRS}:/usr/local/share:${CMAKE_INSTALL_PREFIX}/share")
+set(PREDEF_XDG_CONFIG_DIRS "/etc:${LXQT_ETC_XDG_DIR}:${CMAKE_INSTALL_PREFIX}/share")
 configure_file(startlxqt.in startlxqt @@ONLY)
 install(PROGRAMS
     "${CMAKE_CURRENT_BINARY_DIR}/startlxqt"
@