CVS commit: pkgsrc/x11/lxqt-panel

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Apr 26 03:05:51 UTC 2020

Modified Files:
        pkgsrc/x11/lxqt-panel: Makefile PLIST distinfo
        pkgsrc/x11/lxqt-panel/patches: patch-panel_CMakeLists.txt

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


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/lxqt-panel/Makefile \
    pkgsrc/x11/lxqt-panel/PLIST pkgsrc/x11/lxqt-panel/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/lxqt-panel/patches/patch-panel_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-panel/Makefile
diff -u pkgsrc/x11/lxqt-panel/Makefile:1.1 pkgsrc/x11/lxqt-panel/Makefile:1.2
--- pkgsrc/x11/lxqt-panel/Makefile:1.1  Sat Apr 25 01:57:55 2020
+++ pkgsrc/x11/lxqt-panel/Makefile      Sun Apr 26 03:05:50 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2020/04/25 01:57:55 gutteridge Exp $
+# $NetBSD: Makefile,v 1.2 2020/04/26 03:05:50 gutteridge Exp $
 
 DISTNAME=      lxqt-panel-0.14.1
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  https://downloads.lxqt.org/downloads/lxqt-panel/0.14.1/
 EXTRACT_SUFX=  .tar.xz
Index: pkgsrc/x11/lxqt-panel/PLIST
diff -u pkgsrc/x11/lxqt-panel/PLIST:1.1 pkgsrc/x11/lxqt-panel/PLIST:1.2
--- pkgsrc/x11/lxqt-panel/PLIST:1.1     Sat Apr 25 01:57:55 2020
+++ pkgsrc/x11/lxqt-panel/PLIST Sun Apr 26 03:05:50 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/04/25 01:57:55 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/04/26 03:05:50 gutteridge Exp $
 bin/lxqt-panel
 include/lxqt/ilxqtpanel.h
 include/lxqt/ilxqtpanelplugin.h
@@ -11,6 +11,7 @@ man/man1/lxqt-panel.1
 share/desktop-directories/lxqt-leave.directory
 share/desktop-directories/lxqt-settings.directory
 share/examples/lxqt/xdg/autostart/lxqt-panel.desktop
+share/examples/lxqt/xdg/lxqt/panel.conf
 share/examples/lxqt/xdg/menus/lxqt-applications.menu
 share/lxqt/lxqt-panel/colorpicker.desktop
 share/lxqt/lxqt-panel/desktopswitch.desktop
@@ -24,7 +25,6 @@ share/lxqt/lxqt-panel/taskbar.desktop
 share/lxqt/lxqt-panel/tray.desktop
 share/lxqt/lxqt-panel/volume.desktop
 share/lxqt/lxqt-panel/worldclock.desktop
-share/lxqt/panel.conf
 share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_ca.qm
 share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_cy.qm
 share/lxqt/translations/lxqt-panel/colorpicker/colorpicker_da.qm
Index: pkgsrc/x11/lxqt-panel/distinfo
diff -u pkgsrc/x11/lxqt-panel/distinfo:1.1 pkgsrc/x11/lxqt-panel/distinfo:1.2
--- pkgsrc/x11/lxqt-panel/distinfo:1.1  Sat Apr 25 01:57:55 2020
+++ pkgsrc/x11/lxqt-panel/distinfo      Sun Apr 26 03:05:51 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2020/04/25 01:57:55 gutteridge Exp $
+$NetBSD: distinfo,v 1.2 2020/04/26 03:05:51 gutteridge Exp $
 
 SHA1 (lxqt-panel-0.14.1.tar.xz) = 757fc18e72f33b3cbec4d468f6f95bd3c10d202f
 RMD160 (lxqt-panel-0.14.1.tar.xz) = 2d140a1b203e236198b109e5e9c0c3477efdb2b4
 SHA512 (lxqt-panel-0.14.1.tar.xz) = e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687
 Size (lxqt-panel-0.14.1.tar.xz) = 439252 bytes
-SHA1 (patch-panel_CMakeLists.txt) = 0decf86477d432237a65b879caf62c8a688163b7
+SHA1 (patch-panel_CMakeLists.txt) = 503d92f919776787cf797ef40ab4f054a2709ed3

Index: pkgsrc/x11/lxqt-panel/patches/patch-panel_CMakeLists.txt
diff -u pkgsrc/x11/lxqt-panel/patches/patch-panel_CMakeLists.txt:1.1 pkgsrc/x11/lxqt-panel/patches/patch-panel_CMakeLists.txt:1.2
--- pkgsrc/x11/lxqt-panel/patches/patch-panel_CMakeLists.txt:1.1        Sat Apr 25 01:57:55 2020
+++ pkgsrc/x11/lxqt-panel/patches/patch-panel_CMakeLists.txt    Sun Apr 26 03:05:51 2020
@@ -1,9 +1,11 @@
-$NetBSD: patch-panel_CMakeLists.txt,v 1.1 2020/04/25 01:57:55 gutteridge Exp $
+$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
@@ -15,3 +17,12 @@ https://github.com/lxqt/lxqt/issues/1075
  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