pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
LXQt components, fix bulk build errors
Module Name: pkgsrc-wip
Committed By: pin <voidpin%protonmail.com@localhost>
Pushed By: pin
Date: Mon Feb 10 08:11:03 2020 +0100
Changeset: 12af2d02fa7e58d54d0c3d6218f056ea97e11424
Modified Files:
lximage-qt/Makefile
lxqt-config/Makefile
lxqt-powermanagement/PLIST
lxqt-runner/Makefile
obconf-qt/Makefile
pcmanfm-qt/Makefile
Log Message:
LXQt components, fix bulk build errors
Thanks to David H. Gutteridge for setting-up a sandboxed
bulk build and pointing these out to me.
Everything should build now. If someone else has time
please test.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=12af2d02fa7e58d54d0c3d6218f056ea97e11424
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lximage-qt/Makefile | 1 +
lxqt-config/Makefile | 3 +++
lxqt-powermanagement/PLIST | 2 +-
lxqt-runner/Makefile | 2 +-
obconf-qt/Makefile | 1 +
pcmanfm-qt/Makefile | 1 +
6 files changed, 8 insertions(+), 2 deletions(-)
diffs:
diff --git a/lximage-qt/Makefile b/lximage-qt/Makefile
index f459993399..8e5a42c0d6 100644
--- a/lximage-qt/Makefile
+++ b/lximage-qt/Makefile
@@ -21,6 +21,7 @@ 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
.include "../../x11/qt5-qtx11extras/buildlink3.mk"
.include "../../wip/libfm-qt/buildlink3.mk"
diff --git a/lxqt-config/Makefile b/lxqt-config/Makefile
index 0bebf0c145..071b72863e 100644
--- a/lxqt-config/Makefile
+++ b/lxqt-config/Makefile
@@ -19,6 +19,9 @@ CMAKE_ARG_PATH= ..
CMAKE_ARGS+= -DWITH_INPUT=OFF
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/lxqt-config \
+ -L${PREFIX}/lib/lxqt-config/
+
pre-configure:
${MKDIR} -p ${WRKSRC}/build
diff --git a/lxqt-powermanagement/PLIST b/lxqt-powermanagement/PLIST
index ad98b72c2c..6d3f6294c1 100644
--- a/lxqt-powermanagement/PLIST
+++ b/lxqt-powermanagement/PLIST
@@ -2,7 +2,7 @@
bin/lxqt-config-powermanagement
bin/lxqt-powermanagement
share/applications/lxqt-config-powermanagement.desktop
-share/examples/lxqt-powermanagement/xdg/autostart/lxqt-powermanagement.desktop
+share/examples/lxqt/xdg/autostart/lxqt-powermanagement.desktop
share/icons/hicolor/scalable/devices/laptop-lid.svg
share/lxqt/translations/lxqt-config-powermanagement/lxqt-config-powermanagement_ar.qm
share/lxqt/translations/lxqt-config-powermanagement/lxqt-config-powermanagement_ca.qm
diff --git a/lxqt-runner/Makefile b/lxqt-runner/Makefile
index b13141f0fc..c88f06cd45 100644
--- a/lxqt-runner/Makefile
+++ b/lxqt-runner/Makefile
@@ -24,5 +24,5 @@ TOOL_DEPENDS+= lxqt-build-tools-[0-9]*:../../wip/lxqt-build-tools
TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
.include "../../wip/lxqt-globalkeys/buildlink3.mk"
-.include "../../wip/muparser/buildlink3.mk"
+.include "../../math/muparser/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/obconf-qt/Makefile b/obconf-qt/Makefile
index 7b14dcf750..ac13f39ac6 100644
--- a/obconf-qt/Makefile
+++ b/obconf-qt/Makefile
@@ -23,6 +23,7 @@ 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
.include "../../x11/qt5-qtx11extras/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/pcmanfm-qt/Makefile b/pcmanfm-qt/Makefile
index 466227ab87..5d5c5fbd97 100644
--- a/pcmanfm-qt/Makefile
+++ b/pcmanfm-qt/Makefile
@@ -21,6 +21,7 @@ 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+= lxmenu-data-[0-9]*:../../sysutils/lxmenu-data
.include "../../x11/qt5-qtbase/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index