Commit Graph

77 Commits

Author SHA1 Message Date
Mark Brand baa08f59e2 update packages: lcms libpng qt suitesparse 2011-12-16 13:15:16 +01:00
Mark Brand 379fe546f2 package qt: improve order of SYBASE_LIBS 2011-12-11 15:25:35 +01:00
Mark Brand da0ac81457 package qt: use new mkspec for gcc 4.6 2011-11-17 07:40:02 +01:00
Mark Brand 4d17c8df49 package qt: removed stale comments 2011-11-03 17:08:47 +01:00
Mark Brand c8c1013de5 package qt: improve style 2011-11-02 23:49:19 +01:00
Mark Brand f5c5166428 update package qt 2011-10-15 01:58:08 +02:00
Brad Pitcher 02c11bb052 fixed qt hash 2011-09-17 16:18:38 -07:00
Mark Brand 3b7ac5bfc3 update package qt 2011-09-01 14:36:58 +02:00
Mark Brand ad1aed8315 package qt: handle gnutls dependency introduced by freetds 2011-08-17 10:14:00 +02:00
Mark Brand 72e0ffab56 package qt: freetds driver still needs iconv 2011-06-28 21:20:27 +02:00
Nikos Chantziaras 788de552d0 package qt: build with -no-iconv
mingw-cross-env should build Qt with "-no-iconv".  That way, the
programmer will get linker errors when trying to build his application.
That way, he will know that he *must* include the text codec plugins.
2011-06-28 21:16:19 +02:00
Mark Brand b78b6fa530 Backed out changeset 6aba5d36fb84
should have used newer version of patch
2011-06-28 21:12:44 +02:00
Nikos Chantziaras 5ca5beebb2 package qt: build with -no-iconv
mingw-cross-env should build Qt with "-no-iconv".  That way, the
programmer will get linker errors when trying to build his application.
That way, he will know that he *must* include the text codec plugins.
2011-06-28 20:59:03 +02:00
Mark Brand a01c683a4b update package qt 2011-05-10 11:15:28 +02:00
Mark Brand 748a4a4bc9 package qt: dependency cleanup 2011-03-16 18:37:17 +01:00
Mark Brand c62c5b35d1 update package qt 2011-03-01 15:50:10 +01:00
Mark Brand 8d03734ece package qt: build and install qdbus tools 2011-01-06 10:49:44 +01:00
Mark Brand 2943362724 package qt: added missing dependency 2011-01-04 01:22:05 +01:00
Mark Brand 2ff331d6d4 package qt: added dbus support 2011-01-04 01:17:16 +01:00
Mark Brand f8015dcfa1 package qt: improved handling of liblcms dependency 2010-11-16 20:10:46 +01:00
Mark Brand 8893597644 fixed whitespace 2010-11-10 13:22:01 +01:00
Mark Brand e64276e063 enabled lcms for package libmng
Introduced lcms1 because libmng does not work with lcms2.
Added -lcms to package qt.
2010-11-10 13:17:42 +01:00
Mark Brand dd9a85c431 upgrade package qt 2010-11-09 20:41:56 +01:00
Mark Brand a3bfdf54ba package qt does not depend on giflib 2010-11-07 21:18:57 +01:00
Mark Brand c14b6b2b5f upgrade package qt 2010-09-21 15:31:48 +02:00
Mark Brand 1a0bbdbffe package qt: don't attempt parallel make during configure (by Tony Theodore)
FreeBSD and OSX seem to have a problem with MAKEFLAGS being set. Tens
or hundreds of g++ processes are created and they eventually end up
with strange errors.
2010-09-11 21:03:14 +02:00
Mark Brand bbee76e2c1 upgrade package qt 2010-08-26 22:45:04 +02:00
Mark Brand b3b736c9b5 update checksum for package qt 2010-06-16 12:05:34 +02:00
Mark Brand 4730d5261b enable webkit in package qt 2010-06-06 00:56:26 +02:00
Mark Brand 4b6a9eb0e2 improvements for package qt
Several improvments made to building Qt. One is the removal of the
"-isystem" hack for putting the mingwrt at the top of the include
path search list to solve the float.h problem.
2010-06-05 13:22:58 +02:00
Volker Grabsch 6d0a6a6829 upgrade package qt to 4.7.0-beta1 (by Mark Brand) 2010-05-31 11:04:18 +00:00
Mark Brand 0d332f41f0 use correct options for arch and largefile for windows target of package qt
Previously we did not specify -arch, so the configure script used
the host architecture as the default. This worked as long as the
host and target architectures matched. That's why we had to force
it with -host-arch i386 to make it work on 64 bit hosts.

The correct value "windows" may have different properties than
i386, but this has not be researched. In any case "windows" is
the value use by the binary executable configure tool for windows.

Additionally, the configure script did not respect -arch when
cross-building on MAC. Now CFG_ARCH is set automatically to
windows to cover this case.

Also, "-largefile" is not appropriate for Windows. Now specify
"-no-largefile" to avoid defintions meant for Unix. Windows
apparently still has its largefile support.
2010-05-20 01:50:31 +02:00
Volker Grabsch 2efe10088d corrected version recognition regexes of many packages 2010-04-10 05:18:34 +02:00
Mark Brand 7faf8a1c89 bugfix: phonon backend does not depend on glib and gstreamer in package qt
The configure script assumes that gstreamer is the phonon backend
but ds9 is used for mingw32. This patch fixes this in the configure
script. We now invoke configure with -no-glib and -no-gstreamer.

Also fixed case of GL include directory reference.

Some syntactic improvements suggested upstream.
2010-03-01 00:45:03 +01:00
Mark Brand adbf2733ce do not add QtCore4 to OPENSSL_LIBS for static builds of package qt
I assumed that having -lQtCore4 in OPENSSL_LIBS was harmless for
static Qt. That is false. Although building Qt succeeds, this
also causes an application's makefile generated by qmake to mention
-lQtCore4. For static Qt, the actual library is called "libQtCore.a"
(without the "4"), which caueses linking to fail.

Therefore, I removed this library from OPENSSL_LIBS and included
a reminder for people who want to build shared Qt with qt-zlib.

Also, OPENSSL_LIBS and PSQL_LIBS are probably more than "harmless"
for static Qt. They help qmake generate appropriate makefiles
for applications.
2010-02-26 16:56:01 +01:00
Mark Brand 7f68c53a0b do not introduce QtCore4 in ssl.pri
It is not correct to add QtCore4 in ssl.pri when -lz is removed
for qt-zlib.

In mingw-cross-env we add QtCore4 to OPENSSL_LIBS so the zlib
dependency of openssl is satisfied in case of qt-zlib. This
is necessary for the time being because the QtCore4 in the link
command that qmake generates appears before the contents of
OPENSSL_LIBS.
2010-02-21 11:14:53 +01:00
Mark Brand 8373ee4e4e add missing dependencies for package qt
Now the compile test works, qt detects and uses libiconv and glib.
Added these to the dependency list for consistent builds.
2010-02-20 00:41:12 +01:00
Mark Brand 6ab12f652e fixed compile tests in ./configure of package qt
-fixed compile test for win32-g++
 -removed compile test hacks since compile test works now
 -fixed odbc test for mingw32
 -fixed iconv compile test for win32-g++
 -fix ipv6 detection on win32-g++
 -fix largefile detection on win32-g++
 -fix getaddrinfo detection on win32-g++. Result is still
  negative, apparently correctly.
 -fix opengl  detection on win32-g++
 -removed obsolee opengl error hack
 -improved exempting win32-g++ from XLib test
 -improved zlib treatment when compiling on MAC for win32-g++
 -finished rtti support
 -restored replacement of -lz with -lQtCore4 on ssl.pri
 -specifed "-no-fontcnfig" because this gets enabled now
  by default thanks to working freetype detection.
 -restored -openssl-linked, setting OPENSSL_LIBS and
  zlib fix in ssl.pri. Previous conclusion that these
  were unnecessary was apparently an experimental error.

glib is now detected which I hope is a good thing.
2010-02-19 23:24:55 +01:00
Volker Grabsch 46d40c81c2 use the correct pg_config tool in package qt 2010-02-20 05:23:09 +01:00
Mark Brand 03dbabd8f4 bugfix: use backquotes instead of $(shell ...) in the build rules of package qt 2010-02-18 09:16:33 +01:00
Mark Brand 902b61d8bc fixed dependencies for the shared psql plugin in package qt
The postgresql library -lpq depends on -lsecure32, -lssl, and so
on. These are static libraries. When we build the psql plugin as
a shared library, linking fails unless we provide the list of
required libraries.

Previously, this was taken care of with a hack in the configure
script. Since that hack is not suitable for an upstream merge
request, I have moved it here.
2010-02-18 01:56:41 +01:00
Mark Brand 4325746a51 revert openssl hacks in configure and use pg_config in package qt 2010-02-17 21:57:56 +01:00
Mark Brand 754f8ef7c3 simplified linking to openssl in package qt
We have been building Qt with "-openssl-linked". A patch was needed to adjust
OPENSSL_LIBS to keep a shared Qt build from failing at the point where
QtNetwork4.dll is linked. The patch is not needed if we use "-openssl" instead.

Because libssl and its dependencies are static libraries in mingw-cross-env,
a simple "-openssl" also causes libssl and dependencies to be embedded
(imported) into QNetwork4.dll, but it does so without requiring the patch.

Details:

The patch solved a problem that is a feature of a specific recipe of
Qt build ingredients:

(1) -shared
(2) -openssl-linked
(3) -qt-zlib

in an environment were:

(4) openssl is static
(5) “system” zlib is static

At least 1-3 are needed to see the problem. I suspect that 4 and 5 are needed as
well.

What I think I understand:

“-shared” means that QtNetwork4.dll will be built, which is the locus of the
problem.

“-openssl-linked” means that libssl and its dependencies are to be embedded in
QtNetwork4.dll. OPENSSL_LIBS supplies the list of dependencies.

“-qt-zlib” means that QtCore4 contains a zlib implementation.

Given this recipe for QtNetwork4.dll, the zlib implementation of “-lz” conflicts
with the zlib implementation of “-lQtCore4”.

The patch removed "-lz" from OPENSSL_LIBS and replaced it with "-lQtCore" in the
same position. Adding "-lQtCore" in this way is not a robust solution. For example,
it will break a debug build.
2010-02-17 16:56:48 +01:00
Volker Grabsch e1ab4466ff changed coding style: make "-i" always the first argument of $(SED) (by Mark Brand) 2010-02-16 04:12:53 +01:00
Mark Brand 1ec507a833 update package qt 2010-02-15 21:37:49 +01:00
Volker Grabsch 71f83a7e0d point consequently to "doc/index.html" instead of "doc/index.html or doc/README" 2010-02-08 00:58:06 +01:00
Volker Grabsch 4a1e1b1fcb test program for package qt 2010-01-23 00:07:21 +01:00
Volker Grabsch feccf81bb9 improved escaping in the build rules of package qt 2010-01-23 00:05:23 +01:00
Mark Brand b9a06d261a update version of package qt 2010-01-21 02:02:05 +01:00
Volker Grabsch 8a3233b044 simplified file markers 2010-01-16 23:02:02 +01:00