92 Commits

Author SHA1 Message Date
sthen
7e44b3e4be Add ${CLANG_ARCHS} to "ONLY_FOR_ARCHS = ${GCC4_ARCHS}" lines to give them
a chance on aarch64.
2017-04-19 11:16:03 +00:00
zhuk
223f6a5dfb Fix conflict marker that prevented installation of qt5-html meta-package. 2017-02-15 09:55:20 +00:00
sthen
a0712c976b Record the dependency on libssl/libcrypto in WANTLIB-main. This would
have been missed previously listed because Qt likes to dlopen() things
so check-lib-depends can't find it, which would stop qt5base getting
updated correctly by pkg_add -u when ssl/crypto libs are updated.
2017-02-01 14:07:30 +00:00
zhuk
2e7bf04982 Fix after recent LibreSSL changes.
Nowadays we have fake SSL_CTRL_SET_CURVES macro, and SSL_CTX_set1_curves
defined as synonym to SSL_CTX_set1_groups. So use the latter instead
of the former.

The patch should be tweaked furthermore before proposing it upstream,
but for now we can at least build things again.
2017-01-27 16:13:08 +00:00
zhuk
55cb3c3d94 Having comms/qtserialport and x11/qt5/qtserialport not conflicting
is not enough for stable builds: all their dependees should depend
on either <5.6 or >=5.6 version as well.

Issue reported by naddy@
2017-01-21 18:25:02 +00:00
sthen
d549cdac3d Backport Qt5 commit https://codereview.qt-project.org/#/c/140750/4//ALL,unified
to prevent unloading Qt plugins in various destructors. Fixes a segfault seen
closing otter-browser using WM kill; otter bug report pointing at the Qt bug
was tracked down by awolk@.  OK zhuk@
2017-01-08 11:51:14 +00:00
zhuk
13ecff52bd Comment out the file qdoc sometimes fails to generate.
The root problem is not known yet, but this way we can get more reliable
builds, at least.

Initial report from naddy@
2017-01-05 09:52:36 +00:00
zhuk
4f28f674cc Add to BDEPs necessary for qtquickcontrols,-html.
Found by naddy@.
2016-12-30 20:33:27 +00:00
zhuk
9328f0bd59 Missing bumps after tweaking PKGNAME of qtbase-docs,-docindex,
the -html and -qch were depending on it already..

Found by naddy@
2016-12-30 12:52:45 +00:00
zhuk
3c79988794 LIB_DEPENDS doesn't contain x11/qt5/qtbase at the time Makefile.inc
gets processed. As a result, qtbase-docs,-docindex didn't get into
BUILD_DEPENDS, thus qtenginio-html build may still break.

Spotted by naddy@
2016-12-29 20:59:05 +00:00
zhuk
9f29712c9c Rework Qt5 documentation handling:
* Move share/qt5/doc/* in qtbase from -main to a separate subpackage,
    -global, which (as a bonus) "owns" share/doc/qt5/ directory;

  * Move FOO.index files from -html to a separate subpackage, -docindex,
    and make 'em depend on qtbase,-global;

  * Make DEP,-docindex automatically added as BDEP for each DEP in
    LDEP and BDEP mentioned for -main;

  * Make it clear that building -qch without -html is impossible;

While there, fixed a few minor issues.

This make at least qtenginio,-html build correctly, which failed before
due to missing .index files during qdoc run. Initial report from kili@.
2016-12-28 01:41:23 +00:00
zhuk
9f80405df3 Oops, fix DESCRs. 2016-12-28 01:31:10 +00:00
zhuk
58c33e24da Import qtbase-docs, the qtbase documentation.
It's based on the same distfile as qtbase package, but uses totally
different build mechanizm. And it's unreal to build -qch part without
circular dependency with qttools anyway.

Do not try to build this one until it's hooked to the build: this port
relies on functionality to be committed (really soon).
2016-12-28 01:28:41 +00:00
zhuk
d8aca61473 Fix version handling in x11/qt5, issue found hard way by landry@. 2016-12-26 19:37:04 +00:00
landry
44fbcc0039 Fixup previous, tarball doesnt fetch.. 2016-12-26 18:59:22 +00:00
zhuk
5c0e91eec4 Oops, remove WIP files that should be left in openbsd-wip. 2016-12-25 14:37:19 +00:00
zhuk
60891ee7a8 Remove leftover files from Qt 5.5 times. 2016-12-25 14:28:41 +00:00
zhuk
99b8e07710 Resolve conflicts after Qt 5.6.2 import. 2016-12-25 14:18:55 +00:00
zhuk
e855be1d25 Import Qt 5.6.2.
The port is now being split into pieces. Cleanup and conflict resolving
to follow.
2016-12-25 14:13:11 +00:00
sthen
c690cc62ce WANTLIB += lzma 2016-11-08 14:47:22 +00:00
jeremy
f0198480e2 Fix SIGFPE when using Xvfb, backported from Qt 5.6
OK dcoppa@
2016-09-23 15:22:49 +00:00
sthen
564c6c344a Cope with moving sqlite3 back to ports. 2016-09-23 09:16:52 +00:00
dcoppa
16547e01f0 USE_WXNEEDED, add "-Wl,-z,wxneeded" to Qt5WebKit and QtWebKit
pkg-config files.

Similar commit to what was done to www/webkit, and www/webkitgtk4.

OK ajacoutot@, landry@
2016-09-06 09:00:19 +00:00
jca
12d284b187 Add an abstraction for the lrelease Qt tool
ok sthen@ zhuk@
2016-05-18 19:12:22 +00:00
zhuk
ed298848a3 Zap more lines from qmake-based ports by moving them from
the "MODULES=x11/qtX + CONFIGURE_STYLE=qmake" logic to
the "MODULES=devel/qmake x11/qtX" logic.

Discussed with espie@ a few weeks ago.
2016-03-26 20:37:34 +00:00
naddy
a90d3a4179 remove SHARED_ONLY 2016-03-20 15:58:26 +00:00
landry
e15ac49941 Mark qt5 BROKEN-powerpc, it never built there (gcc does ICE's) and it
takes hours/days to fail in bulk builds.
2016-03-19 12:04:05 +00:00
sthen
00e6ecc723 Adjust qt5 configuration: disable build-time detection of sse3, ssse3,
sse4.1, sse4.2, avx, avx2 on amd64/i386, and additionally sse2 on i386.
Problem report from Peter Kay, input from zhuk@ naddy@
2016-03-17 11:49:08 +00:00
zhuk
3b286ff983 Switch to a separate qmake.port.mk. Simplifies logic a lot.
This removes support of separate qmake versions in one port: as we
discovered, there are no ports actually needing this; strangers like
print/poppler don't use qmake in build.

This should be transparent to current ports. But expect more tweaks there:
for now, qt?.port.mk forces qmake.port.mk inclusion, but that will be
reworked to a more common scheme.

Same idea from (at least) espie@ and me; also, espie@ agrees on the plan.
2016-03-10 17:45:11 +00:00
zhuk
7a14b38014 Don't use MAKE_FILE, but hardcode Makefile instead: that's what qmake
actually generates, and some tricky ports like games/gambatte fail when
qmake-specific part tries to use MAKE_FILE variable.
2016-03-09 16:54:28 +00:00
zhuk
ca0f46bce1 Unbreak the case of USE_SYSTRACE=Yes: we tried to run under systrace
always, and bsd.port.mk invokes systrace for us already when in do-build
or do-install target.
2016-03-07 10:13:32 +00:00
zhuk
bac221c6eb Add support for CONFIGURE_STYLE=qmake. No ports affected, since this is
an opt-in. Actual qmake-based ports will be switched on case-by-case
basis in the near future.

Unslacking after discussion with at least naddy@ & espie@ from... 2014?!

Oh my.
2016-03-06 23:59:51 +00:00
zhuk
64c8dd9bd6 Update to Qt 5.5.1.
Some updates, unbreaking stuff, to follow.
2016-03-06 11:56:41 +00:00
zhuk
c104dcee3e Fix fd_set handling bug in Qt5 as well.
okay naddy@
2016-02-22 20:38:08 +00:00
sthen
a0d09ffbad remove devel/flex dep, these are ok with base flex 2015-11-20 11:24:04 +00:00
zhuk
b055d5767f Better later than never: actually update right REVISION-main, and not
the one that went to libastral yesterday.

From Caspar Schutijser, thanks!
2015-10-22 17:26:18 +00:00
zhuk
20cef22fc3 Remove extra REVISION-main.
Pointed out by Caspar Schutijser, thanks!
2015-10-20 21:58:27 +00:00
zhuk
420b39ef2d Allow COPTS/CXXOPTS ha^Wfeature to work in qmake-generated makefiles.
Similar feature existed in qt4 port, but was lost during Qt5 porting.

Inspired by conversation with Caspar Schutijser, should help him on
updating Qt Creator port.
2015-10-20 21:37:26 +00:00
sthen
06e407b972 Qt dlopen()s various libraries including libssl and does runtime
resolution of symbols. It does guard with #ifdefs but since it doesn't
record a hard dependency on the libssl version, an installed package
doesn't automatically get updated to a newer version that notices the
change, so bump qt5's REVISION-main to force an update.

It does fallback sensibly (no crash, just a Warning printf), but since
the change to headers results in a code change to Qt, we need to bump.

Noticed while testing the otter-browser udpate.
2015-09-04 22:08:25 +00:00
ajacoutot
8e5bc8506f Unbreak: libexecinfo header seems to be picked up after the switch to gcc4.9, so
add the corresponding QMAKE_LIBS_EXECINFO to qmake.conf for the time being.
2015-05-29 07:14:44 +00:00
pascal
f0585aa4cf gcc4 bumps, reminded by aja@ 2015-05-28 10:17:22 +00:00
zhuk
66baad7412 Oops, put back backslash that somehow disappeared in r1.37.
Noticed by aja@
2015-05-05 17:43:42 +00:00
ajacoutot
2a0011b8f9 Unbreak: pkg_subst(1) is not in the default path and may not be executable
either.
2015-05-04 21:31:27 +00:00
zhuk
e191b5b217 Improve hack that avoids picking up compiler intrinsics from
/usr/include in favor of /usr/local/lib/gcc ones by Qt5: now it
helps all qmake-qt5-based software as well.

Fixes problems aja@ was seeing with games/gottcode/tanglet at least.
2015-05-04 10:37:01 +00:00
zhuk
48c3d11fc9 Oops, -examples should be bumped, too. 2015-05-03 13:10:59 +00:00
zhuk
4814e31795 Fix a few more glitches in Qt5:
* Add missing Qt5Designer in WANTLIB-examples;
  * Add a gross hack for pkgconfig files being generated to avoid
    value of WRKBUILD mentioned in them;
  * Unhide dependency on geo/geoclue (used by Qt5Location).
2015-05-03 13:00:53 +00:00
zhuk
45ca0232fc It looks like packaging problems naddy@ and aja@ see happen with two files
only. So let's @comment those until the issue is found and fixed.
2015-04-30 21:39:35 +00:00
zhuk
0f44a60a31 It's always better to run update-patches BEFORE commit... 2015-04-25 18:41:30 +00:00
zhuk
c1305c51e5 Remove patch not needed anymore since we have .cpp.o rule in sys.mk now. 2015-04-24 16:31:57 +00:00
zhuk
e7223cf23d Add a deubg printout for qhelpgenerator, which should help to find the root
cause of packaging bug naddy@ observes.

Enable documentation generation again.
2015-04-24 16:16:39 +00:00