Commit Graph

64 Commits

Author SHA1 Message Date
Mark Brand a868bf635e qtbase: improve update macro 2015-10-16 10:44:41 +02:00
Boris Nagaev 23e6a9a2cd Merge pull request #937 from saiarcot895/upstream-fix-qt-mysql-detection
Ensure that our mysql-config is used and not the system mysql-config …
2015-10-16 03:29:05 +03:00
Saikrishna Arcot 787e877d36
Ensure that our mysql-config is used and not the system mysql-config when building Qt 5. 2015-10-15 14:35:07 -04:00
Mark Brand b93b12d762 update qt5 modules 2015-10-15 10:33:18 +02:00
Tony Theodore 46fe764cf3 qtbase: enable shared mysql plugin 2015-10-08 16:28:13 +11:00
Mark Brand 16e417f9d9 qtbase: enable building mysql driver 2015-10-06 13:18:18 +02:00
Boris Nagaev d38cb7ee2e qt and qtbase: fix the test built the manual way
Add MOC and RCC commands and files produced to the test.

close #883
2015-09-23 23:07:15 +03:00
Tony Theodore fc0ed34fb9 all packages: really use sha256 checksums 2015-09-23 18:32:58 +10:00
Tony Theodore ac7344aaef many packages: cleanup deps ordering 2015-09-23 17:41:16 +10:00
Tony Theodore a228c0488f all packages: switch to sha256 checksums
closes #871
2015-09-23 17:27:16 +10:00
Tony Theodore 44438d6e6a boost hdf5 qt qtbase: write to $(CMAKE_TOOLCHAIN_DIR) instead of $(CMAKE_TOOLCHAIN_FILE)
Fixes #823
2015-09-12 13:43:05 +10:00
Mark Brand 08e8e8d697 Revert "qtbase: dont use fontconfig and freetype"
This reverts commit 48c51901a74ef51bc7abb92e8c0ce0cbe1a7c5e0.
2015-08-07 01:26:02 +02:00
Mark Brand b4885ae64f qtbase: dont use fontconfig and freetype 2015-08-07 01:26:02 +02:00
Mark Brand 1d6ea923de update qt5 modules 2015-08-07 01:26:02 +02:00
Mark Brand ccbf96fbcb qtbase: remove obsolete icu dependency
Follow-up to 7eef8b4e29
2015-07-30 11:51:37 +02:00
Timothy Gu b502b6cc77 Remove Qt5_DIR definition
It's extraneous, and let's let CMake find that out.
2015-07-20 08:46:15 +08:00
Timothy Gu 9407cab3f3 Set CMAKE_SYSTEM_PREFIX_PATH and Qt5_DIR in CMake toolchain 2015-07-20 08:32:11 +08:00
Timothy Gu c4c8dc3c40 Merge pull request #584 from uwehermann/qt5_cmake
qtbase: Append Qt5 cmake dir to CMAKE_PREFIX_PATH.
2015-07-20 08:30:16 +08:00
Timothy Gu 7eef8b4e29 qtbase: Disable icu
Fixes #653.
2015-06-23 16:09:32 +08:00
Timothy Gu 8f7834b362 qtbase: Fix update routine 2015-06-18 19:34:32 -07:00
Mark Brand a46bb6eafa qt5 modules: update 2015-06-03 09:31:54 +02:00
Mark Brand e91ec3826c qt5 modules: update 2015-02-27 21:35:46 +01:00
Tobias Gruetzmacher 8e2b5f0264 qtbase: Don't try to use gold. 2015-02-05 19:56:33 +01:00
Uwe Hermann b9100cfce1 qtbase: Append Qt5 cmake dir to CMAKE_PREFIX_PATH.
This allows cmake-using programs to find Qt5 components.
2014-12-11 12:06:05 +01:00
Mark Brand 61cebef645 qtbase: fix shared build
Typo in 839eaf513b broke it.
2014-12-10 17:55:17 +01:00
Mark Brand 34b205aa5a qt5 modules: update 2014-12-10 14:10:59 +01:00
Mark Brand 839eaf513b qtbase: build sql drivers as plugins
Since Qt 5.3.0, static plugin linking is taken care of automaticallly
by qmake, which removes the reason for building the sql drivers
into QtSql instead of as plugins. For shared builds, plugins is the
sensible choice too.
2014-12-09 10:50:07 +01:00
Mark Brand b5249edbb7 qt5: update modules 2014-12-06 03:13:02 +01:00
Timothy Gu 7d265e6f70 Remove i686-pc-mingw32 package recipes
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-10-14 01:42:11 +00:00
Timothy Gu a108a13fcf Revert "qt5: try to fix CMake files"
This reverts commit 8a6cf7cab7.
2014-09-23 09:43:28 -07:00
Timothy Gu 8a6cf7cab7 qt5: try to fix CMake files
See #466.

This is one of the worst hacks I've ever seen. If there is a way to fix
this better, please mention on #466.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-09-22 21:53:47 -07:00
Mark Brand c8a496519f update qt5 modules 2014-09-16 22:00:52 +02:00
Mark Brand 4c530e26ba qtbase: disable i686-pc-mingw32 targets
As of version 5.3.1 qtbase requires comdef.h, which MinGW lacks.
2014-08-28 10:20:27 +02:00
Mark Brand 736bbb481c update qt5 modules 2014-06-25 22:40:09 +02:00
Mark Brand 016a8f4490 package qtbase: use system harfbuzz and resolve link circularity 2014-06-19 02:03:04 +02:00
Mark Brand ebc859ef6c update qt5 modules 2014-05-21 11:59:00 +02:00
Tony Theodore 515c1c3050 package qtbase: disable mysql detection
fixes #325
2014-02-19 13:56:07 +11:00
Tony Theodore 74ec5c0770 package qtbase: enable shared build 2014-02-16 13:10:47 +11:00
Mark Brand ef2799c07b update qt5 modules 2014-02-06 16:34:20 +01:00
Tony Theodore c8326412d3 package qtbase: don't copy pkg-config files to standard search path
subsequent qt5 packages would also require this so add
qt5 to PKG_CONFIG_PATH instead:

14b5bef5e2
2014-01-31 14:58:24 +11:00
Moritz Bunkus 821a0dcfad Qt4, Qt5: create symlinks $(TARGET)-qmake-qtX in $(PREFIX)/bin
That way a configure script looking for "qmake-qt4" or "qmake-qt5"
with AC_PATH_PROG will find e.g. x86_64-w64-mingw32-qmake-qt5
properly. See
http://thread.gmane.org/gmane.comp.gnu.mingw.cross-env/3424/focus=3426
2014-01-30 17:00:54 +01:00
Mark Brand e8765d97d5 update qt5 packages (5.2.0 final) 2013-12-12 16:48:46 +01:00
Mark Brand adb9178258 upgrade qt5 packages 2013-11-30 11:08:22 +01:00
Mark Brand af4b34bf16 package qtbase: rebased patches on upstream fixes 2013-10-24 23:45:34 +02:00
Mark Brand 8dd229eac0 package qtbase: update patches
-cherry-picked NTLM bugfix
-move _WIN32_WINNT define from patch to qmake -D option to ensure
consistency
2013-10-19 18:08:07 +02:00
Mark Brand 4842b97401 package qtbase: remove wrong dependency
libodbc++ has nothing to do with Qt's ODBC driver.
2013-09-18 14:41:09 +02:00
Mark Brand e074d9fff7 update qt5 packages 2013-08-28 14:42:56 +02:00
Tony Theodore b30e9d419a packages qt qtbase: install pkgconfig files in standard location 2013-07-31 18:39:47 +10:00
Volker Grabsch e412eb642d Move package versions from index.html back into the src/*.mk files
Most of the automatic conversion was done using the following Python script:

import os
import re
pkgs = sorted(mkfile[:-len('.mk')] for mkfile in os.listdir('src') if mkfile.endswith('.mk'))
with open('index.html', 'rb') as f:
    index = f.read()
pkgs_index = re.findall('<td class="package">([^<]*)</td>', index)
assert pkgs_index == pkgs
versions = dict(re.findall('<td id="([^"]*)-version">([^<]*)</td>', index))
assert sorted(versions.keys()) == pkgs
for pkg in pkgs:
    version = versions[pkg]
    with open('src/' + pkg + '.mk', 'rb') as f:
        mk = f.read()
    checksumpos = mk.index('\n$(PKG)_CHECKSUM ')
    versionline = '\n$(PKG)_VERSION  := %(version)s' % {'version': version}
    newmk = mk[:checksumpos] + versionline + mk[checksumpos:]
    with open('src/' + pkg + '.mk', 'wb') as f:
        f.write(newmk)
2013-07-22 01:41:31 +02:00
Niels Kristian Bech Jensen 06808ea943 update package qt5 2013-07-06 14:59:27 +10:00