pkgsrc-WIP-changes archive

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

lxqt-config-0.14.1, self-reviewed



Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Thu Jan 16 16:44:42 2020 +0100
Changeset:	e9c51d3bc2cac1cb235b3bf66dbaf9ac33484275

Modified Files:
	lxqt-config/Makefile
	lxqt-config/PLIST
	lxqt-config/distinfo
Removed Files:
	lxqt-config/patches/patch-CMakeLists.txt

Log Message:
lxqt-config-0.14.1, self-reviewed

Remove unnecessary lines. Remove patches.
Allow lxqt-appearance to build.

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

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

diffstat:
 lxqt-config/Makefile                     | 16 +++++--
 lxqt-config/PLIST                        | 82 +++++++++++++++++++++++++++++++-
 lxqt-config/distinfo                     |  1 -
 lxqt-config/patches/patch-CMakeLists.txt | 20 --------
 4 files changed, 93 insertions(+), 26 deletions(-)

diffs:
diff --git a/lxqt-config/Makefile b/lxqt-config/Makefile
index e656671317..77fa0a66f2 100644
--- a/lxqt-config/Makefile
+++ b/lxqt-config/Makefile
@@ -17,7 +17,18 @@ USE_LANGUAGES=	c c++
 CONFIGURE_DIRS=	build
 CMAKE_ARG_PATH=	..
 
-CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
+CMAKE_ARGS+=	-DWITH_INPUT=OFF
+
+EGDIR=			share/examples/lxqt
+PKG_SYSCONFSUBDIR=	xdg
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/menus
+CONF_FILES=		${EGDIR}/xdg/menus/lxqt-config.menu \
+			${PKG_SYSCONFDIR}/menus/lxqt-config.menu
+
+SUBST_CLASSES+=		conf
+SUBST_FILES.conf=	src/CMakeLists.txt
+SUBST_SED.conf=		-e 's,$${LXQT_ETC_XDG_DIR}/,${EGDIR}/xdg/,'
+SUBST_STAGE.conf=	pre-configure
 
 INSTALLATION_DIRS+=	bin lib
 
@@ -27,9 +38,6 @@ pre-configure:
 TOOL_DEPENDS+=	lxqt-build-tools-[0-9]*:../../wip/lxqt-build-tools
 DEPENDS+=	lxqt-themes-[0-9]*:../../wip/lxqt-themes
 
-post-install:
-	${RM} -rf ${DESTDIR}${PREFIX}/etc/xdg/menus/lxqt-config.menu
-
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/lxqt-config/PLIST b/lxqt-config/PLIST
index e4b2d0f3de..a417c5d30a 100644
--- a/lxqt-config/PLIST
+++ b/lxqt-config/PLIST
@@ -1,17 +1,63 @@
 @comment $NetBSD$
 bin/lxqt-config
+bin/lxqt-config-appearance
 bin/lxqt-config-brightness
 bin/lxqt-config-file-associations
 bin/lxqt-config-locale
 bin/lxqt-config-monitor
+lib/lxqt-config/liblxqt-config-cursor.so
+man/man1/lxqt-config-appearance.1
+man/man1/lxqt-config-mouse.1
 man/man1/lxqt-config.1
+share/applications/lxqt-config-appearance.desktop
 share/applications/lxqt-config-brightness.desktop
 share/applications/lxqt-config-file-associations.desktop
 share/applications/lxqt-config-locale.desktop
 share/applications/lxqt-config-monitor.desktop
 share/applications/lxqt-config.desktop
+share/examples/lxqt/xdg/menus/lxqt-config.menu
 share/icons/hicolor/48x48/apps/brightnesssettings.svg
 share/lxqt/icons/monitor.svg
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_ar.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_ca.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_cs.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_cy.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_da.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_de.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_el.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_en_GB.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_eo.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_es.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_es_VE.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_eu.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_fi.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_fr.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_gl.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_he.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_hu.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_ia.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_id.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_it.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_ja.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_ko.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_lt.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_nb_NO.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_nl.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_pl.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_pt.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_pt_BR.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_ro_RO.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_ru.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_sk.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_sl.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_sr%latin.qm@localhost
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_sr_BA.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_sr_RS.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_th_TH.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_tr.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_uk.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_zh_CN.qm
+share/lxqt/translations/lxqt-config-appearance/lxqt-config-appearance_zh_TW.qm
 share/lxqt/translations/lxqt-config-brightness/lxqt-config-brightness_ar.qm
 share/lxqt/translations/lxqt-config-brightness/lxqt-config-brightness_ca.qm
 share/lxqt/translations/lxqt-config-brightness/lxqt-config-brightness_cs.qm
@@ -38,6 +84,41 @@ share/lxqt/translations/lxqt-config-brightness/lxqt-config-brightness_ru.qm
 share/lxqt/translations/lxqt-config-brightness/lxqt-config-brightness_tr.qm
 share/lxqt/translations/lxqt-config-brightness/lxqt-config-brightness_uk.qm
 share/lxqt/translations/lxqt-config-brightness/lxqt-config-brightness_zh_CN.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_ar.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_ca.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_cs.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_cy.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_da.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_de.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_el.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_en_GB.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_eo.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_es.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_es_VE.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_eu.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_fi.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_fr.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_gl.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_he.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_hu.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_id.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_it.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_ja.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_lt.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_lv.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_nb_NO.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_nl.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_pl.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_pt.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_pt_BR.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_ro_RO.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_ru.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_sl.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_th_TH.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_tr.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_uk.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_zh_CN.qm
+share/lxqt/translations/lxqt-config-cursor/lxqt-config-cursor_zh_TW.qm
 share/lxqt/translations/lxqt-config-file-associations/lxqt-config-file-associations_ar.qm
 share/lxqt/translations/lxqt-config-file-associations/lxqt-config-file-associations_ca.qm
 share/lxqt/translations/lxqt-config-file-associations/lxqt-config-file-associations_cs.qm
@@ -149,4 +230,3 @@ share/lxqt/translations/lxqt-config/lxqt-config_tr.qm
 share/lxqt/translations/lxqt-config/lxqt-config_uk.qm
 share/lxqt/translations/lxqt-config/lxqt-config_zh_CN.qm
 share/lxqt/translations/lxqt-config/lxqt-config_zh_TW.qm
-@pkgdir lib
diff --git a/lxqt-config/distinfo b/lxqt-config/distinfo
index 06422d8aaa..ec005a81ec 100644
--- a/lxqt-config/distinfo
+++ b/lxqt-config/distinfo
@@ -4,4 +4,3 @@ SHA1 (lxqt-config-0.14.1.tar.xz) = 8dff03769f0ffc2127755a362f2b638561b38582
 RMD160 (lxqt-config-0.14.1.tar.xz) = 3f9cb87548a0758f56d64b5de133b1f48dad41c8
 SHA512 (lxqt-config-0.14.1.tar.xz) = 747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f
 Size (lxqt-config-0.14.1.tar.xz) = 293304 bytes
-SHA1 (patch-CMakeLists.txt) = 6be753b2683c1e1133d7faed5118b965679ebf7d
diff --git a/lxqt-config/patches/patch-CMakeLists.txt b/lxqt-config/patches/patch-CMakeLists.txt
deleted file mode 100644
index d8d686b76b..0000000000
--- a/lxqt-config/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-Allow the package to build on platforms that don't
-support libudev and libinput
-
---- CMakeLists.txt.orig	2019-02-24 00:16:01.000000000 +0000
-+++ CMakeLists.txt
-@@ -9,10 +9,10 @@ project(lxqt-config)
- set(LXQT_CONFIG_PROJECT "${PROJECT_NAME}")
- 
- option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
--option(WITH_APPEARANCE "Build the 'lxqt-config-appearance'" ON)
-+option(WITH_APPEARANCE "Build the 'lxqt-config-appearance'" OFF)
- option(WITH_BRIGHTNESS "Build the 'lxqt-config-brightness'" ON)
- option(WITH_FILE_ASSOCIATIONS "Build the 'lxqt-config-file-associations'" ON)
--option(WITH_INPUT "Build the 'lxqt-config-input'" ON)
-+option(WITH_INPUT "Build the 'lxqt-config-input'" OFF)
- option(WITH_LOCALE "Build the 'lxqt-config-locale'" ON)
- option(WITH_MONITOR "Build the 'lxqt-config-monitor'" ON)
- option(WITH_TOUCHPAD "Build touchpad settings" ON)


Home | Main Index | Thread Index | Old Index