FreeBSD Bugzilla – Attachment 210369 Details for
Bug 242905
misc/qtchooser symlinks break users tools and qt5 deps
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v1 (from the qt-5.14 branch of the kde@ repo)
0001-qt5-5.14-misc-qtchooser-don-t-install-any-links-to-b.patch (text/plain), 18.00 KB, created by
Tobias C. Berner
on 2020-01-01 17:11:09 UTC
(
hide
)
Description:
v1 (from the qt-5.14 branch of the kde@ repo)
Filename:
MIME Type:
Creator:
Tobias C. Berner
Created:
2020-01-01 17:11:09 UTC
Size:
18.00 KB
patch
obsolete
>From ed67dce76995a48a6702f75fbbe9dff75a3bc964 Mon Sep 17 00:00:00 2001 >From: "Tobias C. Berner" <tcberner@FreeBSD.org> >Date: Tue, 31 Dec 2019 22:35:48 +0100 >Subject: [PATCH] qt5-5.14: misc/qtchooser: don't install any links to > bin/qtchooser > >* don't install any symlinks to bin/qtchooser from misc/qtchooser >* add bin/update-qtchooser-wrapper to misc/qtchooser >* declare QT_BINARIES in qt-dist ports installing binaries >* if a port defines QT_BINARIES, qt-dist.mk will add > @postexec update-qtchooser-wrapper > and > @postunexex update-qtchooser-wrapper >--- > Mk/Uses/qt-dist.mk | 6 +- > comms/qt5-serialbus/Makefile | 1 + > devel/qt5-assistant/Makefile | 1 + > devel/qt5-buildtools/Makefile | 1 + > devel/qt5-core/Makefile | 1 + > devel/qt5-dbus/Makefile | 1 + > devel/qt5-designer/Makefile | 2 + > devel/qt5-help/Makefile | 2 + > devel/qt5-linguist/Makefile | 2 + > devel/qt5-linguisttools/Makefile | 2 + > devel/qt5-qdbus/Makefile | 2 + > devel/qt5-qdbusviewer/Makefile | 2 + > devel/qt5-qdoc/Makefile | 2 + > devel/qt5-qmake/Makefile | 2 + > devel/qt5-remoteobjects/Makefile | 2 + > devel/qt5-scxml/Makefile | 2 + > graphics/qt5-3d/Makefile | 2 + > graphics/qt5-pixeltool/Makefile | 2 + > graphics/qt5-wayland/Makefile | 2 + > misc/qtchooser/Makefile | 8 +++ > misc/qtchooser/files/patch-Makefile | 8 ++- > .../files/update-qtchooser-wrapper.in | 61 +++++++++++++++++++ > misc/qtchooser/pkg-plist | 47 +------------- > sysutils/qt5-qtdiag/Makefile | 2 + > sysutils/qt5-qtpaths/Makefile | 2 + > sysutils/qt5-qtplugininfo/Makefile | 2 + > textproc/qt5-xmlpatterns/Makefile | 2 + > www/qt5-webengine/Makefile | 2 + > x11-toolkits/qt5-declarative/Makefile | 1 + > x11-toolkits/qt5-gui/Makefile | 1 + > x11-toolkits/qt5-widgets/Makefile | 1 + > x11/qt5-qev/Makefile | 2 + > 32 files changed, 127 insertions(+), 49 deletions(-) > create mode 100755 misc/qtchooser/files/update-qtchooser-wrapper.in > >diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk >index 547fa0868c43..e56984ee38a6 100644 >--- a/Mk/Uses/qt-dist.mk >+++ b/Mk/Uses/qt-dist.mk >@@ -380,5 +380,9 @@ qt-post-install: > >> ${TMPPLIST} > . endif # ${QT_CONFIG:N-*} > . endif # M5 >- >+# Handle misc/qtchooser wrapper installation and deinstallation >+. if defined(QT_BINARIES) >+ ${ECHO_CMD} '@postexec if type update-qtchooser-wrapper >/dev/null 2>&1; then update-qtchooser-wrapper; fi' >> ${TMPPLIST} >+ ${ECHO_CMD} '@postunexec if type update-qtchooser-wrapper >/dev/null 2>&1; then update-qtchooser-wrapper; fi' >> ${TMPPLIST} >+. endif > .endif # defined(_QT_DIST_MK_INCLUDED) >diff --git a/comms/qt5-serialbus/Makefile b/comms/qt5-serialbus/Makefile >index aeccbf4933ae..0b7962796a7a 100644 >--- a/comms/qt5-serialbus/Makefile >+++ b/comms/qt5-serialbus/Makefile >@@ -11,5 +11,6 @@ COMMENT= Qt functions to access industrial bus systems > USES= compiler:c++11-lib qmake qt-dist:5,serialbus > USE_QT= core network serialport buildtools_build > USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} >+QT_BINARIES= yes > > .include <bsd.port.mk> >diff --git a/devel/qt5-assistant/Makefile b/devel/qt5-assistant/Makefile >index f4c9bd227208..9ac7eef54846 100644 >--- a/devel/qt5-assistant/Makefile >+++ b/devel/qt5-assistant/Makefile >@@ -11,6 +11,7 @@ COMMENT= Qt 5 documentation browser > USES= compiler:c++11-lang qmake qt-dist:5,tools > USE_QT= core gui help network printsupport sql widgets \ > buildtools_build sql-sqlite3_run >+QT_BINARIES= yes > > DESKTOP_ENTRIES="Qt 5 Assistant" "" \ > "${PREFIX}/share/pixmaps/assistant-qt5.png" \ >diff --git a/devel/qt5-buildtools/Makefile b/devel/qt5-buildtools/Makefile >index ab86eed4f1f4..1a52fc412c0b 100644 >--- a/devel/qt5-buildtools/Makefile >+++ b/devel/qt5-buildtools/Makefile >@@ -12,6 +12,7 @@ USES= compiler:c++11-lang libtool perl5 qmake:no_env qt-dist:5,base > HAS_CONFIGURE= yes > CONFIGURE_ARGS= -no-gui -no-xcb > USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} >+QT_BINARIES= yes > > BUILD_WRKSRC= ${WRKSRC}/src/tools/bootstrap > INSTALL_WRKSRC= ${BUILD_WRKSRC} >diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile >index 07fafdc1e8d2..d0c018753c19 100644 >--- a/devel/qt5-core/Makefile >+++ b/devel/qt5-core/Makefile >@@ -30,6 +30,7 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} > BUILD_WRKSRC= ${WRKSRC}/src/corelib > INSTALL_WRKSRC= ${BUILD_WRKSRC} > >+QT_BINARIES= yes > QT_DEFINES= GLIB > QT_CONFIG= glib icu > >diff --git a/devel/qt5-dbus/Makefile b/devel/qt5-dbus/Makefile >index bb1b65531d34..a3dead557d91 100644 >--- a/devel/qt5-dbus/Makefile >+++ b/devel/qt5-dbus/Makefile >@@ -21,6 +21,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} > > TOOLS= qdbuscpp2xml qdbusxml2cpp > >+QT_BINARIES= yes > QT_DEFINES= DBUS > QT_CONFIG= dbus > >diff --git a/devel/qt5-designer/Makefile b/devel/qt5-designer/Makefile >index 098bf1efac76..9cb92a8c9835 100644 >--- a/devel/qt5-designer/Makefile >+++ b/devel/qt5-designer/Makefile >@@ -21,6 +21,8 @@ DESKTOP_ENTRIES="Qt 5 Designer" "" \ > BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} > INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME} > >+QT_BINARIES= yes >+ > OPTIONS_DEFINE= WEBKIT > OPTIONS_SUB= yes > WEBKIT_DESC= Build WebKit-based WebView widget >diff --git a/devel/qt5-help/Makefile b/devel/qt5-help/Makefile >index 6b05aab6cc33..c787fcd4c031 100644 >--- a/devel/qt5-help/Makefile >+++ b/devel/qt5-help/Makefile >@@ -16,4 +16,6 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} > BUILD_WRKSRC= ${WRKSRC}/src/assistant > INSTALL_WRKSRC= ${WRKSRC}/src/assistant > >+QT_BINARIES= yes >+ > .include <bsd.port.mk> >diff --git a/devel/qt5-linguist/Makefile b/devel/qt5-linguist/Makefile >index b774755429ef..010e1a6c8144 100644 >--- a/devel/qt5-linguist/Makefile >+++ b/devel/qt5-linguist/Makefile >@@ -21,6 +21,8 @@ DESKTOP_ENTRIES="Qt 5 Linguist" "" \ > BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} > INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} > >+QT_BINARIES= yes >+ > post-install: > ${INSTALL_DATA} ${BUILD_WRKSRC}/images/icons/linguist-128-32.png \ > ${STAGEDIR}${PREFIX}/share/pixmaps/linguist-qt5.png >diff --git a/devel/qt5-linguisttools/Makefile b/devel/qt5-linguisttools/Makefile >index dd095a8ee2f6..42d5d328d9e9 100644 >--- a/devel/qt5-linguisttools/Makefile >+++ b/devel/qt5-linguisttools/Makefile >@@ -14,6 +14,8 @@ USE_QT= core xml buildtools_build declarative_build > BUILD_WRKSRC= ${WRKSRC}/src/linguist > INSTALL_WRKSRC= ${WRKSRC}/src/linguist > >+QT_BINARIES= yes >+ > post-patch: > @${REINPLACE_CMD} -e '/SUBDIRS.*linguist/ d' \ > ${WRKSRC}/src/linguist/linguist.pro >diff --git a/devel/qt5-qdbus/Makefile b/devel/qt5-qdbus/Makefile >index 1f43f0470b62..008433e85302 100644 >--- a/devel/qt5-qdbus/Makefile >+++ b/devel/qt5-qdbus/Makefile >@@ -14,4 +14,6 @@ USE_QT= core dbus xml buildtools_build > BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} > INSTALL_WRKSRC= ${BUILD_WRKSRC} > >+QT_BINARIES= yes >+ > .include <bsd.port.mk> >diff --git a/devel/qt5-qdbusviewer/Makefile b/devel/qt5-qdbusviewer/Makefile >index 4e85a308e30b..da7117277d30 100644 >--- a/devel/qt5-qdbusviewer/Makefile >+++ b/devel/qt5-qdbusviewer/Makefile >@@ -19,6 +19,8 @@ DESKTOP_ENTRIES="Qt 5 D-Bus Viewer" "" \ > BUILD_WRKSRC= ${WRKSRC}/src/qdbus/${PORTNAME} > INSTALL_WRKSRC= ${BUILD_WRKSRC} > >+QT_BINARIES= yes >+ > post-install: > ${INSTALL_DATA} ${BUILD_WRKSRC}/images/qdbusviewer-128.png \ > ${STAGEDIR}${PREFIX}/share/pixmaps/qdbusviewer-qt5.png >diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile >index b17162bf5373..87d858a047d2 100644 >--- a/devel/qt5-qdoc/Makefile >+++ b/devel/qt5-qdoc/Makefile >@@ -23,4 +23,6 @@ PLIST_FILES= ${QT_BINDIR}/qdoc \ > > CONFIGURE_ENV= LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT} > >+QT_BINARIES= yes >+ > .include <bsd.port.mk> >diff --git a/devel/qt5-qmake/Makefile b/devel/qt5-qmake/Makefile >index 44e4319947ef..6defdd457bb1 100644 >--- a/devel/qt5-qmake/Makefile >+++ b/devel/qt5-qmake/Makefile >@@ -32,6 +32,8 @@ INSTALL_TARGET= sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs > > BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} > >+QT_BINARIES= yes >+ > post-patch: > # Clean up files created by patching > @${RM} ${WRKSRC}/mkspecs/*/*.orig >diff --git a/devel/qt5-remoteobjects/Makefile b/devel/qt5-remoteobjects/Makefile >index 474cf7d97554..efbca1f1682a 100644 >--- a/devel/qt5-remoteobjects/Makefile >+++ b/devel/qt5-remoteobjects/Makefile >@@ -14,4 +14,6 @@ USE_QT= core declarative network \ > buildtools_build > USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} > >+QT_BINARIES= yes >+ > .include <bsd.port.mk> >diff --git a/devel/qt5-scxml/Makefile b/devel/qt5-scxml/Makefile >index d994bca6eaaf..1551affa80cb 100644 >--- a/devel/qt5-scxml/Makefile >+++ b/devel/qt5-scxml/Makefile >@@ -12,4 +12,6 @@ USES= compiler:c++11-lang qmake qt-dist:5,scxml > USE_QT= core declarative network buildtools_build > USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} > >+QT_BINARIES= yes >+ > .include <bsd.port.mk> >diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile >index 641f22665d44..f9989f94f98c 100644 >--- a/graphics/qt5-3d/Makefile >+++ b/graphics/qt5-3d/Makefile >@@ -15,4 +15,6 @@ USE_QT= concurrent core declarative gui network buildtools_build > > USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} > >+QT_BINARIES= yes >+ > .include <bsd.port.mk> >diff --git a/graphics/qt5-pixeltool/Makefile b/graphics/qt5-pixeltool/Makefile >index a2fccc06154f..13a47d2c7b5e 100644 >--- a/graphics/qt5-pixeltool/Makefile >+++ b/graphics/qt5-pixeltool/Makefile >@@ -20,4 +20,6 @@ DESKTOP_ENTRIES="Qt 5 PixelTool" "" \ > BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} > INSTALL_WRKSRC= ${BUILD_WRKSRC} > >+QT_BINARIES= yes >+ > .include <bsd.port.mk> >diff --git a/graphics/qt5-wayland/Makefile b/graphics/qt5-wayland/Makefile >index 68265edbb5af..04bedef67390 100644 >--- a/graphics/qt5-wayland/Makefile >+++ b/graphics/qt5-wayland/Makefile >@@ -23,4 +23,6 @@ USE_XORG= x11 xcomposite > > USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} > >+QT_BINARIES= yes >+ > .include <bsd.port.mk> >diff --git a/misc/qtchooser/Makefile b/misc/qtchooser/Makefile >index 042f6bbc8432..346d11936211 100644 >--- a/misc/qtchooser/Makefile >+++ b/misc/qtchooser/Makefile >@@ -2,6 +2,7 @@ > > PORTNAME= qtchooser > PORTVERSION= 66 >+PORTREVISION= 2 > CATEGORIES= misc > MASTER_SITES= QT/official_releases/${PORTNAME} > DIST_SUBDIR= KDE/Qt/qtchooser >@@ -16,6 +17,10 @@ USES= gmake tar:xz > DESTDIRNAME= INSTALL_ROOT > MAKE_ARGS= prefix=${PREFIX} > >+SUB_FILES= update-qtchooser-wrapper >+# Keep this synchronized with qt.mk >+SUB_LIST= QT_SUPPORTED="5" >+ > # bin/linguist > CONFLICTS_INSTALL= rubygem-github-linguist rubygem-github-linguist47 rubygem-gitlab-linguist > >@@ -44,5 +49,8 @@ post-install: > ${INSTALL_DATA} ${WRKSRC}/doc/qtchooser.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 > # Create the default profile. > cd ${STAGEDIR}/${QT_QTCHOOSERDIR} && ${LN} -s qt5.conf default.conf >+ ${INSTALL_SCRIPT} ${WRKDIR}/update-qtchooser-wrapper \ >+ ${STAGEDIR}${PREFIX}/bin/update-qtchooser-wrapper >+ > > .include <bsd.port.mk> >diff --git a/misc/qtchooser/files/patch-Makefile b/misc/qtchooser/files/patch-Makefile >index ff4b4122590c..d7e61cc17d58 100644 >--- a/misc/qtchooser/files/patch-Makefile >+++ b/misc/qtchooser/files/patch-Makefile >@@ -1,6 +1,10 @@ >---- Makefile.orig 2018-10-08 18:18:42 UTC >+--- Makefile.orig 2018-05-04 07:41:32 UTC > +++ Makefile >-@@ -70,8 +70,8 @@ install: >+@@ -66,12 +66,11 @@ distclean: >+ >+ install: >+ cd src/qtchooser && $(MAKE) install >+- for tool in $(TOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done > case `uname -s` in Darwin) \ > for tool in $(MACTOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done \ > ;; esac >diff --git a/misc/qtchooser/files/update-qtchooser-wrapper.in b/misc/qtchooser/files/update-qtchooser-wrapper.in >new file mode 100755 >index 000000000000..6dfc1f5c79fb >--- /dev/null >+++ b/misc/qtchooser/files/update-qtchooser-wrapper.in >@@ -0,0 +1,61 @@ >+#!/bin/sh >+ >+# $FreeBSD$ >+ >+PREFIX=%%PREFIX%% >+BINDIR=${PREFIX}/bin >+QTCHOOSER=${BINDIR}/qtchooser >+VERSIONS=%%QT_SUPPORTED%% >+ >+if [ ! -d ${BINDIR} ] ; then >+ echo "Binary directory '${BINDIR}' missing." >&2 >+ return 1 >+fi >+ >+if [ ! -x ${QTCHOOSER} ] ; then >+ echo "Qtchooser binary '${QTCHOOSER}' missing." >&2 >+ return 2 >+fi >+ >+remove_links() { >+ echo "Removing qtchooser links" >+ for file in $(find -L ${BINDIR} -maxdepth 1 -samefile ${QTCHOOSER}) ; do >+ if [ ! -L ${file} ] ; then >+ continue >+ fi >+ local found=0 >+ for version in ${VERSIONS} ; do >+ version_bin_dir=${PREFIX}/lib/qt${version}/bin >+ target=${version_bin_dir}/$(basename ${file}) >+ if [ -x ${target} ] ; then >+ found=1 >+ continue >+ fi >+ done >+ if [ ${found} -eq 0 ] ; then >+ echo " ${file}" >+ rm ${file} >+ fi >+ done >+ echo "done" >+} >+ >+create_links() { >+ echo "Creating qtchooser links" >+ for version in ${VERSIONS} ; do >+ version_bin_dir=${PREFIX}/lib/qt${version}/bin >+ if [ -d ${version_bin_dir} ] ; then >+ for file in $(find ${version_bin_dir} -type f -maxdepth 1) ; do >+ target=${BINDIR}/$(basename ${file}) >+ if [ ! -L ${target} -a ! -f ${target} ] ; then >+ echo " ${target}" >+ ln -s ${QTCHOOSER} ${target} >+ fi >+ done >+ fi >+ done >+ echo "done" >+} >+ >+remove_links >+create_links >diff --git a/misc/qtchooser/pkg-plist b/misc/qtchooser/pkg-plist >index b74fba3f085f..0a9890519998 100644 >--- a/misc/qtchooser/pkg-plist >+++ b/misc/qtchooser/pkg-plist >@@ -1,50 +1,5 @@ >-bin/assistant >-bin/designer >-bin/lconvert >-bin/linguist >-bin/lrelease >-bin/lupdate >-bin/moc >-bin/pixeltool >-bin/qcollectiongenerator >-bin/qdbus >-bin/qdbuscpp2xml >-bin/qdbusviewer >-bin/qdbusxml2cpp >-bin/qdoc >-bin/qdoc3 >-bin/qgltf >-bin/qhelpconverter >-bin/qhelpgenerator >-bin/qlalr >-bin/qmake >-bin/qml >-bin/qml1plugindump >-bin/qmlbundle >-bin/qmlcachegen >-bin/qmleasing >-bin/qmlimportscanner >-bin/qmljs >-bin/qmllint >-bin/qmlmin >-bin/qmlplugindump >-bin/qmlprofiler >-bin/qmlscene >-bin/qmltestrunner >-bin/qmlviewer >-bin/qtattributionsscanner > bin/qtchooser >-bin/qtconfig >-bin/qtdiag >-bin/qtpaths >-bin/qtplugininfo >-bin/qvkgen >-bin/rcc >-bin/repc >-bin/uic >-bin/uic3 >-bin/xmlpatterns >-bin/xmlpatternsvalidator >+bin/update-qtchooser-wrapper > etc/xdg/qtchooser/default.conf > etc/xdg/qtchooser/qt4.conf > etc/xdg/qtchooser/qt5.conf >diff --git a/sysutils/qt5-qtdiag/Makefile b/sysutils/qt5-qtdiag/Makefile >index 34e18b168457..f920486fc864 100644 >--- a/sysutils/qt5-qtdiag/Makefile >+++ b/sysutils/qt5-qtdiag/Makefile >@@ -19,6 +19,8 @@ PLIST_FILES= ${QT_BINDIR}/qtdiag > # we do not really have to depend on. > WRKSRC_SUBDIR= src/${PORTNAME} > >+QT_BINARIES= yes >+ > post-patch: > ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC} > >diff --git a/sysutils/qt5-qtpaths/Makefile b/sysutils/qt5-qtpaths/Makefile >index 00c2a7e2bd5b..2ae61bbe340c 100644 >--- a/sysutils/qt5-qtpaths/Makefile >+++ b/sysutils/qt5-qtpaths/Makefile >@@ -19,6 +19,8 @@ PLIST_FILES= ${QT_BINDIR}/qtpaths > # we do not really have to depend on. > WRKSRC_SUBDIR= src/${PORTNAME} > >+QT_BINARIES= yes >+ > post-patch: > ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC} > >diff --git a/sysutils/qt5-qtplugininfo/Makefile b/sysutils/qt5-qtplugininfo/Makefile >index eb61e1db0d89..f673af1fb15c 100644 >--- a/sysutils/qt5-qtplugininfo/Makefile >+++ b/sysutils/qt5-qtplugininfo/Makefile >@@ -19,6 +19,8 @@ PLIST_FILES= ${QT_BINDIR}/qtplugininfo > # we do not really have to depend on. > WRKSRC_SUBDIR= src/${PORTNAME} > >+QT_BINARIES= yes >+ > post-patch: > ${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC} > >diff --git a/textproc/qt5-xmlpatterns/Makefile b/textproc/qt5-xmlpatterns/Makefile >index 8370b7d852f9..86223d6862fa 100644 >--- a/textproc/qt5-xmlpatterns/Makefile >+++ b/textproc/qt5-xmlpatterns/Makefile >@@ -12,4 +12,6 @@ USES= compiler:c++11-lang qmake:norecursive qt-dist:5,xmlpatterns > USE_QT= core network buildtools_build > USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} > >+QT_BINARIES= yes >+ > .include <bsd.port.mk> >diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile >index c301dc37f755..cea7b553283b 100644 >--- a/www/qt5-webengine/Makefile >+++ b/www/qt5-webengine/Makefile >@@ -110,6 +110,8 @@ MAKE_ENV+= CC="${CC}" CXX="${CXX}" \ > CPLUS_INCLUDE_PATH=${LOCALBASE}/include \ > ${CONFIGURE_ENV} > >+QT_BINARIES= yes >+ > .include <bsd.port.pre.mk> > > .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 >diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile >index eb84c7be52a4..360371ba85ba 100644 >--- a/x11-toolkits/qt5-declarative/Makefile >+++ b/x11-toolkits/qt5-declarative/Makefile >@@ -17,6 +17,7 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} > > CONFLICTS= qt5-declarative-render2d-* qt5-qml qt5-quick > >+QT_BINARIES= yes > QT_DEFINES= ACCESSIBILITY > QT_CONFIG= accessibility accessibility-atspi-bridge > >diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile >index d020fe1aaaac..6851a4c79280 100644 >--- a/x11-toolkits/qt5-gui/Makefile >+++ b/x11-toolkits/qt5-gui/Makefile >@@ -64,6 +64,7 @@ MORE_WRKSRCS+= src/plugins/imageformats \ > # openglextensions is the static library to use for further things like qtcanvas3d > MORE_WRKSRCS+= src/openglextensions > >+QT_BINARIES= yes > QT_DEFINES= ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \ > IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER > QT_CONFIG= accessibility accessibility-atspi-bridge dbus \ >diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile >index 6b89b9d32258..68072dc3f794 100644 >--- a/x11-toolkits/qt5-widgets/Makefile >+++ b/x11-toolkits/qt5-widgets/Makefile >@@ -19,6 +19,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} > > MORE_WRKSRCS= src/tools/uic > >+QT_BINARIES= yes > QT_DEFINES= ACCESSIBILITY WIDGETS XSYNC > QT_CONFIG= accessibility accessibility-atspi-bridge xlib > >diff --git a/x11/qt5-qev/Makefile b/x11/qt5-qev/Makefile >index 4ef012577306..973be4d3cfde 100644 >--- a/x11/qt5-qev/Makefile >+++ b/x11/qt5-qev/Makefile >@@ -13,6 +13,8 @@ USE_QT= core widgets > > WRKSRC_SUBDIR= src/${PORTNAME} > >+QT_BINARIES= yes >+ > # qev is not connected to qttool's build system, so we cannot just run qmake qt-dist:5,tools > # and set {BUILD,INSTALL}_WRKSRC. > # Instead, we run qmake qt-dist:5,tools from src/${PORTNAME} but need to copy .qmake qt-dist:5,tools.conf to >-- >2.24.1 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=210369">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 242905
: 210369
Working