this involves is this: Cull GL from Qt by default, but still provide a
Qt+GL library that may or may not have threads. Then also provide a Qt
library that has threads but not GL. This allows us to make KDE2 depend
on a library that will *not* have threads, ever. Threads will be
revisited at a later date. Ports that require GL support need to be
updated to use the hacked library, libqtgl.so.4. The net result is that
we bloat our qt2 package by 1.5-2.5MB for compatability. Also, static
qt will not have GL support.
Introduce bsd.kde.mk, which will be tested on bento before becoming
fully activated.
Replace qt22-static with qt2-static, since it's just a proxy. Update
qt-designer to depend on qt23. Also make the old hack to package the
correct lib obsolete by using PLIST_SUB instead.
Miscellaneous changes: remove LIBQTFILE from CONFIGURE_ENV, it's not
used anymore. Solve namespace pollution problems with the devel/pth and
devel/libgnugetopt ports. Hopefully.
Suggested by: ade, asami, sobomax (bsd.kde.mk)
Repocopied by: asami (qt22-static --> qt2-static)
default -j2 (but keep MAKE_JOBS var), restore old perl REs as soon as I'd
learned how to do multiple ones, remove QPL license file from packaging,
sync with newest KOI8-U/R stuff (not tested). The biggest bonus: split
QT Designer into its own port, and make the qt22/qt-designer pair a member
of the master-slave ports legion, hopefully to reduce redundancy as much
as possible. This should also save roughly 20 minutes of compile time on
a dual PIII-600 for those that don't need or want QT Designer. UIC is,
however, still installed/compiled by the default Qt 2.2.4 (as it _is_
required for other things e.g. KDE2).
USE_MESA may break KDE2. Hopefully, now that the port does install both
the threaded and non-threaded versions of QT, it won't. But until the
next release of KDE2, I'm not gonna bother testing to see.
USE_MESA repeatedly requested by: sobomax
2.95.3. It's backwards compatible, so no need for OSVERSION or other
checks like that. Also add new var - MAKE_JOBS, which allows you to
adjust the -jN argument (I wanted this 'cause with more CPUs I can compile
with MAKE_JOBS=4 or greater). Methinks this kind of thing belongs in
bsd.port.mk, but anyway. I can now compile (with MAKE_JOBS=4) qt 1.45 in
less than 4 minutes on my dual PIII-600E. :)
Submitted by: sf (workaround)
Requested by: alex (workaround)
to garbanzo long ago), to reduce complications involved when building on
X4.0.2 with thread support. We don't need GL anyway. Bump PORTREVISION
(unconditionally this time) to 3.
Submitted by: Jeremy Shaffner <jeremy@external.org>
it doesn't really work (or so I've been told). This does not affect the
build for non-XFree86-4.0.2 users. Apologies for not getting this in
sooner.
Thanks to: Andrew <elitetek@flashcom.net> for loaning me access to a
fast machine with XFree86 4.0.2 to do my testing on, as
well as being the first one to contact me about this.
support is compiled in), untested because I don't have X4.0.2, but the
port works fine for the non-X4.0.2 case. Also substitute multiple perl
regexes on the same file for one sed regex. Add MAKE_ARGS=-j2 by default
since it makes QT compile faster even on uniprocessor systems.
I wanted to avoid putting the AA patch in CVS since it will be short-lived,
as the patch is in TrollTech's CVS and will most likely be released as part
of QT 2.2.4. Nevertheless, I thought I'd bring it in for the folks who
like bleeding edge.. since antialiasing most likely improves KDE2's look
and feel very much.
Submitted by: kevlo (AA patch)
Mikhail Teterin <mi@aldan.algebra.com> (-j2)
in the port.. although that support has been in QT 2.x for awhile. The
upgrade is also required for KDE 2.1 beta 1. Apologies to Kevin for
not getting it done sooner.
Remove a patch in configure by replacing it with "yes yes" to automate
accepting the GPL license (*sigh*) and avoiding interactive configure.
*THIS TIME* I checked to make sure *.so wasn't removed accidentally. ;-)
1.In Designer, don't rely on QTDIR environment being set when searching for
documentation and templates. Also correct search paths relatively to
QTDIR (/doc/html/... --> /share/doc/qt2/... etc.).
2.Install *all* documentation (previously index files and some pixmaps were
left behind, which was rendering help system mostly non-functional and
useless).
3.Install Designer's templates.
4.Don't use ${INSTALL_DATA} to install symbolic link to shared library - it
leads to the file this link points to being installed and as a result
two fully indentical versions of lib{qt2,util} are installed, wasting
user's HDD space (approx 8MB) and bloating package file (+3MB). Also
use ${INSTALL_PROGRAM} for shared libs to strip unneeded symbols.
I can address some of its issues (should see it marked un-broken in about
3 hours, if they're trivial enough). It took too long to get this update
out the door... :-(
This is a rather stable version of KDE2. Release is hoped for sometime
next month, so I'm going to try to reroll snapshots this weekend.
Also decide policy by removing the interactive requirement in qt22's
configure script. I don't know why they bothered adding it there..
Bugged by: *many* bug-reports, requests, etc.
After short discussion with Imura-san, back out GIF-by-default until I can
confirm whether or not there are license issues with Unisys. I will deal
with this later. I should note that I'd committed to qt2[12] previously
without conferring with him on the GIF issue first.
One big ouchie: I didn't even set MASTER_SITE/MASTER_SITE_SUBDIR on qt22
properly.. but oh well. Nobody's perfect. :-)
Things should be un-broken now.. please test these ports! I'll be trying
to update them to a new snap after a week or so.
Pointy hat: will
Patches graciously submitted by: nra
Konqueror can load HTML documents, KOffice works semi-well, and KDE2 in
general seems less buggy. Only kdeutils was left out of this mega-update.
However, it should return soon. :-)
The massive reduction in patches is mostly the result of using perl
regex replacement. This reduces the amount of time it will take in the
future to upgrade these ports, and load on the repository.
QT 2.2.0beta0 (aka qt-copy) is officially enabled for the express
purpose of allowing KDE2 to compile. It is available in the qt22 port.
Additionally, GIF support is re-enabled in both Qt2 ports, so that
people can now read GIF images. GIF support is enabled through an
internal GIF reader in Qt, and requires no patented libraries. Special
effort was made to ensure that people do not install both qt21 and qt22
ports at the same time.
I'd like to take a moment to thank the following people for their help:
Alex Zepeda <jazepeda@pacbell.net>, Stephan Kulow <coolo@kde.org>, Harri
Porten <porten@kde.org>, Waldo Bastian <waba@kde.org>, Marc G. Fournier
<scrappy@hub.org>, Arun Sharma <adsharma@sharmas.dhs.org>, Matthias
Hoelzer-Kluepfel <mhk@caldera.de>, and many others. Over 150 hours of hard
work, testing, etc. were put into this update. Another couple hundred of
hours were spent by CPUs trying to compile this behemoth. :->
Special thanks to: Physics Computer Network @ Purdue staff, especially
C. Stephen Gunn <csg@physics.purdue.edu>, for giving
me access to an extremely fast machine for doing
test builds (it performed 12 full builds of the
entire suite in the last 7 days).
PR: 18838
Submitted by: Arun Sharma <adsharma@sharmas.dhs.org>
Approved by: imura, asami
previous commit message to bsd.port.mk, which said INSTALL_SHLIBS. Boo.)
Line up the rhs of variable assignments nicely. Remove a couple of extra
whitespaces while I'm here.
Suggested by: sobomax
1) Bump lib's version, since qt-2.1.0 loses lower compatibility
with qt-2.0.2 but has only upper compatibility. (new qt binary
does not work with old qt library)
2) Install libqgl.a (it works with its examples) in addition to libqt,
so added LIB_DEPENDS to MesaGL.
3) JPEG support from extension had been included to the main library.
4) 'examples' and 'tutorials' are no longer built with port building,
since they are never installed. If you want them, set
QTDIR=/usr/ports/x11-toolkits/qt21/work and just type 'gmake' in each
directories.
Some ideas obtained from qt145. :)
