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
This commit is contained in:
Adriaan de Groot 2020-07-19 11:35:49 +00:00
parent fcea7b5cc2
commit f4a64c52c6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=542563
2 changed files with 6 additions and 3 deletions

View File

@ -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-libjpeg \
-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

View File

@ -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 \