Date: Thu, 20 Nov 2014 20:25:02 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372956 - in head/www/webkit-qt5: . files Message-ID: <201411202025.sAKKP2SZ095744@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Thu Nov 20 20:25:02 2014 New Revision: 372956 URL: https://svnweb.freebsd.org/changeset/ports/372956 QAT: https://qat.redports.org/buildarchive/r372956/ Log: Stop installing libplatformplugin.so. That is an example plugin that is not supposed to be built and installed by default. Its sole purpose is to be an example of how to write a plugin, and it does so by making <select> elements show up in a separate dialog. We definitely do not want that. As a bonus, it allows us to remove some of the hacks we do in the pre-configure target. While here: - Improve the comment about why we change ALL_TARGET. - Remove the weird CONFIGURE_ENV change we did that does not seem to be necessary anymore. I could not find any explanation for why it was added in the first place. Added: head/www/webkit-qt5/files/patch-Source__QtWebKit.pro (contents, props changed) Modified: head/www/webkit-qt5/Makefile head/www/webkit-qt5/pkg-plist Modified: head/www/webkit-qt5/Makefile ============================================================================== --- head/www/webkit-qt5/Makefile Thu Nov 20 20:18:07 2014 (r372955) +++ head/www/webkit-qt5/Makefile Thu Nov 20 20:25:02 2014 (r372956) @@ -2,6 +2,7 @@ PORTNAME= webkit DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -26,11 +27,10 @@ RUBY_NO_RUN_DEPENDS= yes USE_SQLITE= 3 USE_XORG= x11 xcomposite xrender USES= bison gmake gperf perl5 pkgconfig python:build qmake:outsource -# Keep make(1) from descending into obj/ subdirectories during tests. -CONFIGURE_ENV= MAKEOBJDIR=. # Use flex(1) from ports. MAKE_ENV= PATH="${LOCALBASE}/bin:${PATH}" -# Probably required. +# "all" builds many more targets. The default one is called "first" in +# QtWebKit, and is invoked by default when make is called without arguments. ALL_TARGET= first USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} @@ -62,14 +62,6 @@ post-patch: ${WRKSRC}/Tools/qmake/mkspecs/features/configure.prf pre-configure: -# Write a clean installation procedure to avoid the installation of -# the file during the build stage. - @${REINPLACE_CMD} -e 's|\[QT_INSTALL_PLUGINS]|{ROOT_BUILD_DIR}/plugins|' \ - ${WRKSRC}/Source/WebKit/qt/examples/platformplugin/platformplugin.pro - @${ECHO_CMD} "target.path = ${PREFIX}/${QT_PLUGINDIR_REL}/webkit" \ - >> ${WRKSRC}/Source/WebKit/qt/examples/platformplugin/platformplugin.pro - @${ECHO_CMD} "INSTALLS += target" \ - >> ${WRKSRC}/Source/WebKit/qt/examples/platformplugin/platformplugin.pro @${REINPLACE_CMD} -Ee 's|linux-?\*|unix|g' \ ${WRKSRC}/Source/JavaScriptCore/DerivedSources.pri \ ${WRKSRC}/Source/JavaScriptCore/JavaScriptCore.pri \ Added: head/www/webkit-qt5/files/patch-Source__QtWebKit.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/webkit-qt5/files/patch-Source__QtWebKit.pro Thu Nov 20 20:25:02 2014 (r372956) @@ -0,0 +1,17 @@ +Do not go into the examples/ directory, which contains only platformplugin/. + +Even though it is not part of the default target, it is included in `make +install', and platformplugin's .pro file has a DESTDIR setting that causes the +file system to be touched even though there is nothing to build or install. +--- a/Source/QtWebKit.pro ++++ b/Source/QtWebKit.pro +@@ -38,9 +38,4 @@ build?(webkit1) { + tests.file = tests.pri + SUBDIRS += tests + } +- +- examples.file = WebKit/qt/examples/examples.pro +- examples.CONFIG += no_default_target +- examples.makefile = Makefile +- SUBDIRS += examples + } Modified: head/www/webkit-qt5/pkg-plist ============================================================================== --- head/www/webkit-qt5/pkg-plist Thu Nov 20 20:18:07 2014 (r372955) +++ head/www/webkit-qt5/pkg-plist Thu Nov 20 20:25:02 2014 (r372956) @@ -100,7 +100,6 @@ %%QT_MKSPECDIR%%/modules/qt_lib_webkit_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_webkitwidgets.pri %%QT_MKSPECDIR%%/modules/qt_lib_webkitwidgets_private.pri -%%QT_PLUGINDIR%%/webkit/libplatformplugin.so %%QT_QMLDIR%%/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so %%QT_QMLDIR%%/QtWebKit/experimental/qmldir %%QT_QMLDIR%%/QtWebKit/libqmlwebkitplugin.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411202025.sAKKP2SZ095744>