Commit Graph

880 Commits

Author SHA1 Message Date
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 7a4ffb7acc run the ./configure script with bash in package xerces
The reason is a bug in /bin/sh of OpenSolaris:
http://lists.gnu.org/archive/html/mingw-cross-env-list/2010-02/msg00100.html
2010-02-19 20:11:27 +01:00
Volker Grabsch 6bd7bda9b8 improved .hgignore to support symlinked directories 2010-02-19 16:41:15 +01:00
Volker Grabsch 9e4b402825 use $(INSTALL) instead of install in package freeimage 2010-02-19 04:37:27 +01:00
Mark Brand 2d548d4bfb upgrade package vmime to 0.9.1-svn-r534
Fix for invoking bash from bootstrap script.
2010-02-18 02:31:18 +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 644262b033 merge 2010-02-20 04:45:09 +01:00
Volker Grabsch 6750ff91bf merge 2010-02-19 04:39:45 +01:00
Volker Grabsch c29ce62e5c install "usr/bin/i686-pc-mingw32-pg_config" instead of "usr/i686-pc-mingw32/bin/pg_config" 2010-02-18 03:03:04 +01:00
Volker Grabsch b5e9d038cc update release notes 2010-02-16 21:54:11 +01:00
Volker Grabsch 48ea4b533e update version of package libgsasl 2010-02-16 21:52:51 +01:00
Volker Grabsch a7cae3a1f7 implemented version recognition for package freeimage 2010-02-16 21:47:03 +01:00
Volker Grabsch 5faa838de4 corrected download URL and version number style of package freeimage 2010-02-16 21:28:49 +01:00
Volker Grabsch 91464c9a5b add missing CR characters to the patch of package freeimage 2010-02-16 21:23:19 +01:00
Mark Brand 456d5a9d68 new package: freeimage 2010-02-16 12:22:34 +01:00
Volker Grabsch 6129e49143 add missing dependency to package librsvg 2010-02-16 11:19:16 +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
Volker Grabsch 18316ec7d0 restore all patch headers 2010-02-16 04:07:12 +01:00
Mark Brand 1ec507a833 update package qt 2010-02-15 21:37:49 +01:00
Volker Grabsch 112ec2c8fc bugfix for package gdal (by Mark Brand) 2010-02-16 03:51:46 +01:00
Volker Grabsch fcc25621b3 improved coding style 2010-02-16 03:49:06 +01:00
Volker Grabsch 0b1e593a49 test program for package librsvg 2010-02-16 03:18:23 +01:00
Volker Grabsch 7af76e7a89 fixed several dependencies and *.pc scripts 2010-02-16 03:14:49 +01:00
Volker Grabsch 31cc6ec584 new package: sdl_pango 2010-02-16 01:35:40 +01:00
Volker Grabsch c6608266b9 update release notes 2010-02-16 01:35:00 +01:00
Volker Grabsch 2caf98d262 update version of package libidn 2010-02-16 01:22:28 +01:00
Volker Grabsch b3d50601e2 ignore the alpha version 0.17 of package libidn 2010-02-16 01:13:08 +01:00
Volker Grabsch 9962cf96c1 test program for package gtk 2010-02-16 00:48:52 +01:00
Volker Grabsch a963fe3cdb new package: librsvg 2010-02-16 00:41:24 +01:00
Volker Grabsch 761b2a794d create missing *.pc file for package libgsf 2010-02-15 18:51:52 +01:00
Mark Brand 71639e81fa upgrade package vmime to 0.9.1-svn-r533 2010-02-15 11:05:16 +01:00
Volker Grabsch d9fefb83b7 make all dependencies explicit in package gdal 2010-02-15 15:52:04 +01:00
Volker Grabsch 48d206d2c6 remove an option that is no longer needed since "pkg-config" gets always "--static" 2010-02-15 15:49:32 +01:00
Volker Grabsch 7a4d773dcd improved native build of pg_config in package postgresql 2010-02-15 02:40:09 +01:00
Volker Grabsch c2a7118350 update version of packages curl, freetype, gdal, glib, gtk and pixman 2010-02-14 22:06:05 +01:00
Volker Grabsch fce859d9a1 improved version recognition of package muparser 2010-02-14 21:28:19 +01:00
Volker Grabsch 875ff2ce66 new package: muparser (by Martin Lambers) 2010-02-14 21:15:10 +01:00
Volker Grabsch 4d7d8ee31f don't generate the README and ChangeLog files anymore 2010-02-14 21:04:32 +01:00
Volker Grabsch 5bbe12e588 remove "--static" from docs because it is not needed anymore 2010-02-14 20:15:32 +01:00
Volker Grabsch 862598bd53 bugfix and test program for package sdl_mixer 2010-02-14 19:59:37 +01:00
Volker Grabsch fbd9ed2ae2 bugfix in *-config result of package smpeg 2010-02-14 19:59:01 +01:00
Volker Grabsch 2fc34f1cc8 bugfix in *-config result of package libmikmod 2010-02-14 19:45:35 +01:00
Volker Grabsch e83815cdb4 bugfix and test program for package sdl_image 2010-02-14 19:33:14 +01:00
Volker Grabsch 2c08f6cec5 merge 2010-02-14 19:02:10 +01:00
Volker Grabsch 80f761359e improved coding style 2010-02-14 18:53:54 +01:00
Volker Grabsch 834421011b hardcode the --static argument into i686-pc-mingw32-pkg-config 2010-02-14 18:49:22 +01:00