diff --git a/mk/sysdep/qt5-qtbase-private.mk b/mk/sysdep/qt5-qtbase-private.mk new file mode 100644 index 0000000000000000000000000000000000000000..d226e55b04ba4291e6d2813b7c499cf86fc109f6 --- /dev/null +++ b/mk/sysdep/qt5-qtbase-private.mk @@ -0,0 +1,27 @@ +# robotpkg sysdep/qt5-qtbase-private +# Created: Guilhem Saurel on Thu, 28 May 2020 +# +DEPEND_DEPTH:= ${DEPEND_DEPTH}+ +QT5_QTBASE_PRIVATE_DEPEND_MK:= ${QT5_QTBASE_PRIVATE_DEPEND_MK}+ + +ifeq (+,$(DEPEND_DEPTH)) +DEPEND_PKG+= qt5-qtbase-private +endif + +ifeq (+,$(QT5_QTBASE_PRIVATE_DEPEND_MK)) # ----------------------------------------- + +PREFER.qt5-qtbase-private?= system + +DEPEND_USE+= qt5-qtbase-private +DEPEND_ABI.qt5-qtbase-private?= qt5-qtbase-private>=5<6 + +SYSTEM_SEARCH.qt5-qtbase-private=\ + 'include/{,qt{,5}/}QtAccessibilitySupport/qtaccessibilitysupportversion.h:/VERSION_STR/s/[^0-9.]//gp' \ + 'include/{,qt{,5}/}QtCore/*/QtCore/private/qmetaobject_p.h' + +SYSTEM_PKG.Arch.qt5-qtbase-private= qt5-base +SYSTEM_PKG.Debian.qt5-qtbase-private= qtbase5-private-dev + +endif # QT5_QTBASE_PRIVATE_DEPEND_MK ----------------------------------------------- + +DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/mk/sysdep/qt5-svg.mk b/mk/sysdep/qt5-svg.mk new file mode 100644 index 0000000000000000000000000000000000000000..41db98f55f10a5d7b4556501c62a0b889c1a7e3f --- /dev/null +++ b/mk/sysdep/qt5-svg.mk @@ -0,0 +1,27 @@ +# robotpkg sysdep/qt5-svg +# Created: Guilhem Saurel on Thu, 28 May 2020 +# +DEPEND_DEPTH:= ${DEPEND_DEPTH}+ +QT5_SVG_DEPEND_MK:= ${QT5_SVG_DEPEND_MK}+ + +ifeq (+,$(DEPEND_DEPTH)) +DEPEND_PKG+= qt5-svg +endif + +ifeq (+,$(QT5_SVG_DEPEND_MK)) # ----------------------------------------- + +PREFER.qt5-svg?= system + +DEPEND_USE+= qt5-svg +DEPEND_ABI.qt5-svg?= qt5-svg>=5<6 + +SYSTEM_SEARCH.qt5-svg=\ + 'include/{,qt{,5}/}QtSvg/QtSvg' \ + 'lib/cmake/Qt5Svg/Qt5SvgConfig.cmake:s/)//g;/VERSION_STRING/s/.* //gp' + +SYSTEM_PKG.Arch.qt5-svg= qt5-svg +SYSTEM_PKG.Debian.qt5-svg= libqt5svg5-dev + +endif # QT5_SVG_DEPEND_MK ----------------------------------------------- + +DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/py-qt-pythonqt/Makefile b/py-qt-pythonqt/Makefile index f897235d699637183bc142840324facb210253c6..8d7a4e996bcb0daa72bcb11a886000222a987e7a 100644 --- a/py-qt-pythonqt/Makefile +++ b/py-qt-pythonqt/Makefile @@ -32,7 +32,8 @@ PYTHON_SELF_CONFLICT= yes do-install: ${RUN}cd ${WRKSRC}; \ - ${MKDIR} ${DESTDIR}${PREFIX}/{lib,include/${NAME}/gui}; \ + ${MKDIR} ${DESTDIR}${PREFIX}/lib; \ + ${MKDIR} ${DESTDIR}${PREFIX}/include/${NAME}/gui; \ ${MKDIR} ${DESTDIR}${PREFIX}/include/${NAME}/extensions/${NAME}_QtAll; \ ${INSTALL_LIB} lib/*.so \ ${DESTDIR}${PREFIX}/lib/; \ @@ -43,10 +44,14 @@ do-install: ${INSTALL_DATA} extensions/${NAME}_QtAll/*.h \ ${DESTDIR}${PREFIX}/include/${NAME}/extensions/${NAME}_QtAll/ +include ../../wip/mk/sysdep/qt5-qtbase-private.mk +include ../../wip/mk/sysdep/qt5-svg.mk include ../../pkgtools/install-sh/depend.mk include ../../mk/sysdep/python.mk include ../../mk/sysdep/qmake.mk -include ../../mk/sysdep/qt.mk +include ../../mk/sysdep/qt5-qtbase.mk +include ../../mk/sysdep/qt5-multimedia.mk +include ../../mk/sysdep/qt5-xmlpatterns.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk include ../../mk/robotpkg.mk