pkgsrc-WIP-changes archive

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

Final fixes on qt5ct



Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Fri Dec 13 13:39:36 2019 +0100
Changeset:	32fdd3a7bc86120b8a88750ac47d521e56023b8f

Modified Files:
	qt5ct/MESSAGE
	qt5ct/Makefile
	qt5ct/PLIST
Removed Files:
	qt5ct/TODO

Log Message:
Final fixes on qt5ct

Thanks to @kamil for the revision of the package
Everything is fixed, feel free to import to pkgsrc

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

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

diffstat:
 qt5ct/MESSAGE  |  2 +-
 qt5ct/Makefile | 15 ++++-----------
 qt5ct/PLIST    |  4 ++++
 qt5ct/TODO     |  8 --------
 4 files changed, 9 insertions(+), 20 deletions(-)

diffs:
diff --git a/qt5ct/MESSAGE b/qt5ct/MESSAGE
index 099271f2b5..0b57f8705b 100644
--- a/qt5ct/MESSAGE
+++ b/qt5ct/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE, Exp $
+$NetBSD: MESSAGE,v 1.1 2019/12/13 12:35:30 pin Exp $
 
 To use qt5ct add the line
 'export QT_QPA_PLARFORMTHEME=qt5ct'
diff --git a/qt5ct/Makefile b/qt5ct/Makefile
index 66c2769767..748796cfa0 100644
--- a/qt5ct/Makefile
+++ b/qt5ct/Makefile
@@ -13,22 +13,15 @@ LICENSE=		2-clause-bsd
 USE_TOOLS=		pkg-config
 USE_LANGUAGES=		c c++
 
-WRKSRC=         	${WRKDIR}/${DISTNAME}
-
-QTDIR=			/usr/pkg/qt5
-MAKE_ENV+=		QTPREFIX=${QTDIR}
-QMAKE=			${QTPREFIX}/bin/qmake
-CONFIGURE_ENV+=		QMAKE=${QMAKE}
-CONFIGURE_ARGS+= 	QMAKE
+INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
 do-configure:
-	(cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile)
+	cd ${WRKSRC} && \
+	${SETENV} ${CONFIGURE_ENV} \
+	${QTDIR}/bin/qmake -o Makefile PREFIX=${PREFIX}
 
 TOOL_DEPENDS+=		qt5-qttools-[0-9]*:../../x11/qt5-qttools
 
-post-install:
-	(mv /usr/bin/qt5ct /usr/pkg/bin && mv /usr/share/qt5ct /usr/pkg/share)
-
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/qt5ct/PLIST b/qt5ct/PLIST
index 5e3fee75cf..552b0c5e4a 100644
--- a/qt5ct/PLIST
+++ b/qt5ct/PLIST
@@ -1,5 +1,8 @@
 @comment $NetBSD$
 bin/qt5ct
+qt5/plugins/platformthemes/libqt5ct.so
+qt5/plugins/styles/libqt5ct-style.so
+share/applications/qt5ct.desktop
 share/qt5ct/colors/airy.conf
 share/qt5ct/colors/darker.conf
 share/qt5ct/colors/dusk.conf
@@ -11,3 +14,4 @@ share/qt5ct/qss/scrollbar-simple.qss
 share/qt5ct/qss/sliders-simple.qss
 share/qt5ct/qss/tooltip-simple.qss
 share/qt5ct/qss/traynotification-simple.qss
+
diff --git a/qt5ct/TODO b/qt5ct/TODO
deleted file mode 100644
index fb89464f8a..0000000000
--- a/qt5ct/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
---The package builds, installs and works as intended.
-
---make print-PLIST gives no output?
-Fixed PLIST manually. Don't know if this acceptable?
-
---What's the correct way to fix the install path?
-My post-install hack feels ugly.
-Is this acceptable?


Home | Main Index | Thread Index | Old Index