From owner-svn-ports-all@freebsd.org Sun Jul 19 11:35:50 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8F73D35BDDC; Sun, 19 Jul 2020 11:35:50 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B8jTy3HPTz4S7M; Sun, 19 Jul 2020 11:35:50 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 35D1B1B183; Sun, 19 Jul 2020 11:35:50 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06JBZo6C018931; Sun, 19 Jul 2020 11:35:50 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06JBZnPt018929; Sun, 19 Jul 2020 11:35:49 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202007191135.06JBZnPt018929@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sun, 19 Jul 2020 11:35:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542563 - in head: devel/qt5-core www/qt5-webengine X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head: devel/qt5-core www/qt5-webengine X-SVN-Commit-Revision: 542563 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jul 2020 11:35:50 -0000 Author: adridg Date: Sun Jul 19 11:35:49 2020 New Revision: 542563 URL: https://svnweb.freebsd.org/changeset/ports/542563 Log: Make qt5-core and qt5-webengine depend explicitly on double-conversion. In a dirty build-environment, double-conversion was being picked up automatically (as "system double-conversion"). We could bung in a configure flag to ignore it, so that Qt would always build its own copy. Or we could depend explicitly on it, dropping the build of the bundled copy. Do the latter, because: - it's the same code, but now extracted from V8 JS into a separate library by upstream (that is, by Chromium / Google), - the dependency package is only 168kB. - this reduces code-bundling and improves reuse when other things also use double-conversion. (This is the opposite of what I originally intended; using the flag is harder to implement, and since the dependency is small ..) I've taken the patch from Andy Mender and applied it in two cases. Perhaps adding it to qt5-core would have been enough, duplication here can't hurt. PR: 245946 248020 Submitted by: Andy Mender Reported by: Andy Mender, yuri Modified: head/devel/qt5-core/Makefile head/www/qt5-webengine/Makefile Modified: head/devel/qt5-core/Makefile ============================================================================== --- head/devel/qt5-core/Makefile Sun Jul 19 11:32:28 2020 (r542562) +++ head/devel/qt5-core/Makefile Sun Jul 19 11:35:49 2020 (r542563) @@ -2,14 +2,15 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt core non-graphical module -LIB_DEPENDS= libicui18n.so:devel/icu \ +LIB_DEPENDS= libdouble-conversion.so:devel/double-conversion \ + libicui18n.so:devel/icu \ libpcre2-posix.so:devel/pcre2 \ libzstd.so:archivers/zstd @@ -27,6 +28,7 @@ CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng - -no-fontconfig -no-freetype -no-gtk -no-harfbuzz \ -no-libudev -no-xcb -no-xcb-xlib \ -no-xkbcommon -no-libinput + USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/corelib Modified: head/www/qt5-webengine/Makefile ============================================================================== --- head/www/qt5-webengine/Makefile Sun Jul 19 11:32:28 2020 (r542562) +++ head/www/qt5-webengine/Makefile Sun Jul 19 11:35:49 2020 (r542563) @@ -18,7 +18,7 @@ PORTNAME= webengine DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -32,6 +32,7 @@ BUILD_DEPENDS= bison:devel/bison \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ + libdouble-conversion.so:devel/double-conversion \ libevent.so:devel/libevent \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \