Framework: sync with upstream
Taken from: HardenedBSD
This commit is contained in:
parent
31fdd332e2
commit
b6b74a2453
6 changed files with 11 additions and 8 deletions
1
MOVED
1
MOVED
|
|
@ -10785,3 +10785,4 @@ biology/njplot|biology/seaview|2018-12-11|Has expired: Deprecated by upstream; u
|
|||
devel/dcmtk|graphics/dcmtk|2018-12-12|Move to a proper category
|
||||
graphics/cuneiform||2018-12-16|Has expired: Unmaintained upstream
|
||||
dns/knot1|dns/knot2|2018-12-16|Has expired: EOL upstream; successor dns/knot2 is in place
|
||||
print/frescobaldi||2018-12-16|Depends on non-existent poppler-qt4
|
||||
|
|
|
|||
|
|
@ -251,6 +251,7 @@ do-build:
|
|||
.if !target(do-install) && ${CARGO_INSTALL:tl} == "yes"
|
||||
do-install:
|
||||
@${CARGO_CARGO_RUN} install \
|
||||
--path . \
|
||||
--root "${STAGEDIR}${PREFIX}" \
|
||||
--verbose \
|
||||
${CARGO_INSTALL_ARGS}
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ KDE_PLASMA_VERSION?= 5.12.7
|
|||
KDE_PLASMA_BRANCH?= stable
|
||||
|
||||
# Current KDE frameworks.
|
||||
KDE_FRAMEWORKS_VERSION?= 5.52.0
|
||||
KDE_FRAMEWORKS_VERSION?= 5.53.0
|
||||
KDE_FRAMEWORKS_BRANCH?= stable
|
||||
|
||||
# Current KDE applications.
|
||||
|
|
|
|||
|
|
@ -60,10 +60,10 @@ MASTER_SITES_PYQT5= SF/pyqt/PyQt5/PyQt-${PORTVERSION} \
|
|||
MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
|
||||
GENTOO
|
||||
|
||||
SIP_VERSION= 4.19.8
|
||||
QSCI2_VERSION= 2.10.4
|
||||
SIP_VERSION= 4.19.13
|
||||
QSCI2_VERSION= 2.10.8
|
||||
PYQT4_VERSION= 4.12.1
|
||||
PYQT5_VERSION= 5.10.1
|
||||
PYQT5_VERSION= 5.11.3
|
||||
|
||||
SIP_DISTNAME= sip-${SIP_VERSION}
|
||||
PYQT4_DISTNAME= PyQt4_gpl_x11-${PYQT4_VERSION}
|
||||
|
|
@ -255,10 +255,12 @@ CONFIGURE_ARGS+=-b ${PREFIX}/bin \
|
|||
--confirm-license \
|
||||
--sip ${SIP} \
|
||||
--sipdir ${PYQT_SIPDIR}
|
||||
# Move the designer plugin and qml libraries to versioned folders.
|
||||
.if ${_PYQT_VERSION:M5}
|
||||
# Move the designer plugin and qml libraries to versioned folders.
|
||||
CONFIGURE_ARGS+=--qml-plugindir ${PYQT_QMLDIR} \
|
||||
--designer-plugindir ${PYQT_DESIGNERDIR}
|
||||
# Further do not gernate the dinstinfo files.
|
||||
CONFIGURE_ARGS+=--no-dist-info
|
||||
.endif
|
||||
# One of the things PyQt looks for to determine whether to build the Qt DBus
|
||||
# main loop module (${PYQT_RELNAME}-dbussupport) is whether the dbus/ directory is
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ _QT_MK_INCLUDED= qt.mk
|
|||
# Qt versions currently supported by the framework.
|
||||
_QT_SUPPORTED?= 4 5
|
||||
QT4_VERSION?= 4.8.7
|
||||
QT5_VERSION?= 5.11.2
|
||||
QT5_VERSION?= 5.12.0
|
||||
|
||||
# We accept the Qt version to be passed by either or all of the three mk files.
|
||||
. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
|
||||
|
|
|
|||
|
|
@ -1551,8 +1551,7 @@ FLAVORS:= ${FLAVOR} ${FLAVORS:N${FLAVOR}}
|
|||
|
||||
.if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS)
|
||||
_DID_FLAVORS_HELPERS= yes
|
||||
_FLAVOR_HELPERS_OVERRIDE= DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX \
|
||||
DEPRECATED EXPIRATION_DATE
|
||||
_FLAVOR_HELPERS_OVERRIDE= DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX
|
||||
_FLAVOR_HELPERS_APPEND= CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL \
|
||||
PKG_DEPENDS EXTRACT_DEPENDS PATCH_DEPENDS \
|
||||
FETCH_DEPENDS BUILD_DEPENDS LIB_DEPENDS \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue