CVS commit: pkgsrc/x11/lxqt-session

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Mon Jun  5 20:35:45 UTC 2023

Modified Files:
        pkgsrc/x11/lxqt-session: Makefile distinfo
Added Files:
        pkgsrc/x11/lxqt-session/patches: patch-CMakeLists.txt

Log Message:
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)


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/lxqt-session/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/lxqt-session/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/lxqt-session/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/x11/lxqt-session/Makefile
diff -u pkgsrc/x11/lxqt-session/Makefile:1.27 pkgsrc/x11/lxqt-session/Makefile:1.28
--- pkgsrc/x11/lxqt-session/Makefile:1.27       Mon May 22 21:00:48 2023
+++ pkgsrc/x11/lxqt-session/Makefile    Mon Jun  5 20:35:45 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2023/05/22 21:00:48 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2023/06/05 20:35:45 abs Exp $
 
 DISTNAME=      lxqt-session-1.3.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=lxqt/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}

Index: pkgsrc/x11/lxqt-session/distinfo
diff -u pkgsrc/x11/lxqt-session/distinfo:1.14 pkgsrc/x11/lxqt-session/distinfo:1.15
--- pkgsrc/x11/lxqt-session/distinfo:1.14       Tue Apr 18 12:01:18 2023
+++ pkgsrc/x11/lxqt-session/distinfo    Mon Jun  5 20:35:45 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.14 2023/04/18 12:01:18 pin Exp $
+$NetBSD: distinfo,v 1.15 2023/06/05 20:35:45 abs Exp $
 
 BLAKE2s (lxqt-session-1.3.0.tar.xz) = a4d8c959daa0498fc53dfb01ae77566fa20ac85d187567f304439ba728c061a8
 SHA512 (lxqt-session-1.3.0.tar.xz) = 4ad358ad8a01fe6df697cb4dc19abee7ed9b37dce13022e2fc1b309a5adbb942c69fc4de401fbc16e51394d38482a98bf2f5ebcc0a64194e03bd714691ad96db
 Size (lxqt-session-1.3.0.tar.xz) = 186860 bytes
+SHA1 (patch-CMakeLists.txt) = c1e1e86f8339753228d707fdd2e5773a30dc80fd
 SHA1 (patch-autostart_CMakeLists.txt) = a791cc51e03e794e1bf81bf0d6f8462ba11e2e84

Added files:

Index: pkgsrc/x11/lxqt-session/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/x11/lxqt-session/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Mon Jun  5 20:35:45 2023
+++ pkgsrc/x11/lxqt-session/patches/patch-CMakeLists.txt        Mon Jun  5 20:35:45 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2023/06/05 20:35:45 abs Exp $
+
+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"