[BACK]Return to patch-panel_CMakeLists.txt CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / x11 / lxqt-panel / patches

File: [cvs.NetBSD.org] / pkgsrc / x11 / lxqt-panel / patches / patch-panel_CMakeLists.txt (download)

Revision 1.2, Sun Apr 26 03:05:51 2020 UTC (7 months ago) by gutteridge
Branch: MAIN
CVS Tags: pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, HEAD
Changes since 1.1: +11 -0 lines

lxqt-panel: fix location of default panel settings config

Place the panel settings configuration file where the rest of LXQt (as
configured in pkgsrc presently) expects it to be, so fallbacks work if
a user doesn't already have a custom configuration defined. (Ride
previous commits of LXQt earlier today; this doesn't merit a recursive
dependency bump.)

$NetBSD: patch-panel_CMakeLists.txt,v 1.2 2020/04/26 03:05:51 gutteridge Exp $

Work around undefined symbol issue (which would cause the panel to fail
to run if the volume plugin was enabled), as discussed in:
https://github.com/lxqt/lxqt/issues/1075

Install fallback .conf files to a consistent location.

--- panel/CMakeLists.txt.orig	2019-02-25 22:16:30.000000000 +0000
+++ panel/CMakeLists.txt
@@ -55,6 +55,8 @@ set(LIBRARIES
     lxqt
 )
 
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Xlinker --export-dynamic")
+
 file(GLOB CONFIG_FILES resources/*.conf)
 
 ############################################
@@ -104,7 +106,7 @@ target_link_libraries(${PROJECT}
 )
 
 install(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
-install(FILES ${CONFIG_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/lxqt)
+install(FILES ${CONFIG_FILES} DESTINATION ${LXQT_ETC_XDG_DIR}/lxqt)
 install(FILES ${PUB_HEADERS} DESTINATION include/lxqt)
 install(FILES
     man/lxqt-panel.1