pkgsrc-WIP-changes archive

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

lxqt-build-tools and libqtxdg, clean-up



Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Thu Jan 30 10:18:57 2020 +0100
Changeset:	9795985baa8e0301081f42b06fee1ef1b0ab5034

Modified Files:
	libqtxdg/Makefile
	libqtxdg/buildlink3.mk
	lxqt-build-tools/Makefile

Log Message:
lxqt-build-tools and libqtxdg, clean-up

Adjust path. Remove unnecessary dependencies.

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

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

diffstat:
 libqtxdg/Makefile         | 4 ++--
 libqtxdg/buildlink3.mk    | 1 -
 lxqt-build-tools/Makefile | 4 +++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diffs:
diff --git a/libqtxdg/Makefile b/libqtxdg/Makefile
index 2bc0784100..c95b1c30eb 100644
--- a/libqtxdg/Makefile
+++ b/libqtxdg/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	x11
 MASTER_SITES=	https://downloads.lxqt.org/downloads/libqtxdg/3.4.0/
 EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	voidpin%protonmail.com@localhost
 HOMEPAGE=	https://lxqt.org/
 COMMENT=	Qt implementation of freedesktop.org xdg specs
 LICENSE=	gnu-lgpl-v2.1
@@ -23,8 +23,8 @@ pre-configure:
 	${MKDIR} -p ${WRKSRC}/build
 
 TOOL_DEPENDS+=	lxqt-build-tools-[0-9]*:../../wip/lxqt-build-tools
+TOOL_DEPENDS+=	qt5-qttools-[0-9]*:../../x11/qt5-qttools
 DEPENDS+=	qt5-qtbase-[0-9]*:../../x11/qt5-qtbase
 
-.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libqtxdg/buildlink3.mk b/libqtxdg/buildlink3.mk
index af8129fb27..c36ca35517 100644
--- a/libqtxdg/buildlink3.mk
+++ b/libqtxdg/buildlink3.mk
@@ -8,7 +8,6 @@ LIBQTXDG_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libqtxdg+=	libqtxdg>=3.4.0
 BUILDLINK_PKGSRCDIR.libqtxdg?=		../../wip/libqtxdg
 
-.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
 .endif	# LIBQTXDG_BUILDLINK3_MK
 
diff --git a/lxqt-build-tools/Makefile b/lxqt-build-tools/Makefile
index e5403c0295..0f55cdda43 100644
--- a/lxqt-build-tools/Makefile
+++ b/lxqt-build-tools/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel
 MASTER_SITES=	https://downloads.lxqt.org/downloads/lxqt-build-tools/0.6.0/
 EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	voidpin%protonmail.com@localhost
 HOMEPAGE=	https://lxqt.org/
 COMMENT=	LXQt build tools
 LICENSE=	modified-bsd
@@ -17,6 +17,8 @@ USE_LANGUAGES=	c c++
 CONFIGURE_DIRS=	build
 CMAKE_ARG_PATH=	..
 
+CMAKE_ARGS+=	-DLXQT_ETC_XDG_DIR=${PREFIX}/share/examples/lxqt
+
 INSTALLATION_DIRS+=	bin
 
 pre-configure:


Home | Main Index | Thread Index | Old Index