Commit Graph

139 Commits

Author SHA1 Message Date
Mark Brand 0c1b092fc4 qt: Qt 4 compatibility with gcc 9 and later 2020-05-28 23:52:36 +02:00
Tony Theodore fba69d2005 qt qtbase: set MAKE variable to bypass detection 2019-10-15 18:21:47 +11:00
Tony Theodore 86079641c8 qt: fix libmng/tiff cmake deps 2019-04-03 22:16:21 +11:00
Tony Theodore 9426f0df0b qt: fx darwin build with latest xcode 2019-04-03 22:15:56 +11:00
Mark Brand c761dd5223 qt, qtbase: update SYBASE_LIBS for freetds using openssl
Follow-up to e28ae58625.
2018-12-06 11:09:16 +01:00
Ivan Romanov e89d5d7ee2 Install Qt4 translations 2018-08-03 01:27:02 +10:00
Tony Theodore 01e2a64d00 cross packages: replace dependency gcc with cc 2017-12-23 08:19:00 +11:00
Yunhui Fu ea3da3dc54 compile qt4 with xmlpatterns module 2017-09-13 17:56:06 -04:00
Martin Müllenhaupt 941541e551 qt: set CMake QT_QMAKE_EXECUTABLE variable to cache 2017-07-21 08:23:01 +02:00
Viktor Szakats 45d34aaac7 more URL updates 2017-03-10 13:59:00 +00:00
Viktor Szakats e961e447fb URL updates 2017-03-04 10:33:47 +00:00
Boris Nagaev 74163f1794 add _WEBSITE and _DESCR fields to core packages
See https://github.com/mxe/mxe/issues/1422

Automation (Python 2 code): https://gist.github.com/9f5c315e5d0cf113d41dc454b7a0eb41
2016-12-22 22:25:48 +01:00
Boris Nagaev 913b396a09 qt, qtbase: -no-pch (pre-compiled header support)
Qt and qtbase fail to build if host compiler is GCC 6
with the following error message:

cc1: error: one or more PCH files were found, but they were invalid
cc1: error: use -Winvalid-pch for more information
cc1: fatal error: .obj/release-shared/qt_pch.h: No such file or directory

See https://github.com/mxe/mxe/issues/1554
See https://github.com/mxe/mxe/issues/1103
See https://github.com/mxe/mxe/pull/1527#issuecomment-254001204
2016-10-29 01:57:46 +03:00
Boris Nagaev 6adb5ade12 Copyright headers: point to LICENSE.md and shorten
The following script was applied:

    sed ':a;/part of MXE.$/{N;s/\n//;ba}' -i $(git grep -l 'part of MXE')

    sed 's/\(part of MXE\).*\(See index.html\)/\1. \2/' -i \
        $(git grep -l 'part of MXE.*See index.html')

    before='This file is part of MXE. See index.html for further information.'
    after='This file is part of MXE. See LICENSE.md for licensing information.'
    sed "s/$before/$after/" -i $(git grep -l 'part of MXE')

Then git grep 'index.html for further information' revealed two other files.
One of them was patched manually (patch.mk). Makefile has text
"See index.html for further information" unrelated to licensing.

See https://github.com/mxe/mxe/issues/1500#issuecomment-241340792
2016-08-27 12:31:29 +03:00
Tony Theodore ec2ed12b6f qt qtbase: add pthreads to postgresql libs 2016-08-17 04:48:11 +10:00
Tony Theodore 3d436d2f60 qt: allow user overrides of build options 2016-08-12 01:49:31 +10:00
Boris Nagaev 17e40d3884 use $(TEST_FILE) instead of $(2).c and other
The following script was applied:

    set -xue

    find src/ plugins/ -name '*.mk' -type f > mks

    # special cases for test file:
    # ls -d src/*-test* | sed 's@-test.*@@' | sort | uniq --repeated
    sed 's@$(2).c@$(PWD)/src/$(PKG)-test.c@g' -i \
        src/{boost,freeimage,hdf5,lapack,sdl,sdl_image,sdl_sound}.mk
    sed 's@$(2).f@$(PWD)/src/$(PKG)-test.f@g' -i src/lapack.mk
    sed 's@$(PWD)/$(2).pro@$(PWD)/src/$(PKG)-test.pro@g' -i \
        src/qt.mk plugins/examples/custom-qt-min/overrides.mk
    sed 's@$(2)-CMakeLists.txt@$(PWD)/src/$(PKG)-test-CMakeLists.txt@g' \
        -i src/{sdl_image,sdl_sound}.mk

    # check
    for base in $(ls -d src/*-test* | sed 's@-test.*@@' | sort | uniq --repeated); do
        ! grep -q '$(2)' "${base}.mk"
    done

    # other $(2)
    sed 's@$(2).cpp@$(TEST_FILE)@g' -i $(cat mks)
    sed 's@$(2).cxx@$(TEST_FILE)@g' -i $(cat mks)
    sed 's@$(2).c@$(TEST_FILE)@g' -i $(cat mks)
    sed 's@$(2).ml@$(TEST_FILE)@g' -i $(cat mks)
    sed 's@$(2).f@$(TEST_FILE)@g' -i $(cat mks)

    # check
    ! grep '$(2)' $(cat mks)

See https://github.com/mxe/mxe/issues/1452
2016-07-30 22:38:45 +03:00
Tony Theodore 7d04e40e29 qt: symlink mkspecs/default
On OSX, the default mkspec doesn't set `win32-g++` correctly.
The following workarounds are possible:
 - set `QMAKESPEC` env var
 - use `-spec` command line option
 - set `CONFIG+=`
 - symlink mkspecs/default

The internal build of qt always seems to use the `-spec` option,
but that doesn't solve the default case - the symlink approach used
on linux appears to always work.

closes #1379
2016-07-17 13:42:40 +10:00
Boris Pek 5aac1c3335 qt: add workaround for builds with GCC >= 6.x 2016-04-30 22:09:16 +03:00
Tony Theodore 3dae2fee64 qt: remove broken `lrelease` symlink
no need for a prefixed version, it seems nobody has ever tried using it.
2015-12-14 18:57:22 +11:00
Tony Theodore d08148a0da Revert "boost pthreads qt sdl: disable cmake tests"
This reverts commit f1dd70802a.
2015-10-17 11:53:28 +11:00
Tony Theodore f1dd70802a boost pthreads qt sdl: disable cmake tests
see #909
2015-10-08 09:20:17 +11:00
Tony Theodore dd34bab1b4 qt: add cmake test
workaround in #857 allows this to build.
see also #852, a complete solution that covers Qt5 is required
2015-10-04 18:39:06 +11:00
Tony Theodore 8233e2b38c Merge branch 'master' of https://github.com/muellni/mxe into muellni-master 2015-10-04 18:05:16 +11: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
Martin Müllenhaupt dc2526a2d8 qt: fix QtGui CMake static linking errors 2015-09-15 14:09:42 +02: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
Timothy Gu 4a4b5dc1f5 qt: Fix update routine 2015-06-18 19:37:20 -07:00
Mark Brand 733472c2aa qt: update 2015-05-27 15:47:43 +02:00
Tony Theodore 3c67cefde7 boost hdf5 pkgconf qt: move cmake variables to respective packages 2014-12-08 20:22:39 +11:00
Timothy Gu 262aa647f0 Merge branch 'stable'
Conflicts:
	Makefile
	src/gd.mk
	src/gdal.mk
	src/imagemagick.mk
	src/pcl.mk
	src/qt.mk
2014-08-29 17:58:30 -07:00
Timothy Gu 810170eeb6 qt: Fix downloading
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2014-08-29 17:17:41 -07:00
Henning Heinold a323414bc6 qt: build lrelease for host usage
The original patch comes from gnu-octave:
http://savannah.gnu.org/bugs/download.php?file_id=28078
2014-07-15 10:25:43 +02:00
Mark Brand c428d4976a update package qt 2014-04-30 23:49:45 +02:00
Tony Theodore 57fa8e075e package qt4 and dependencies: enable shared builds 2014-02-09 23:29:51 +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 01d458332a package qt: remove wrong dependency
libodbc++ has nothing to do with Qt's ODBC driver.
2013-09-18 14:38:49 +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
Florian Staudacher 9015f8ce3d explicitly disable mysql driver 2013-07-11 14:07:38 +02:00
Mark Brand d504762274 update package qt (Qt 4) 2013-07-02 12:20:05 +02:00
Mark Brand e8a731d2d1 update package qt 2013-06-08 20:49:13 +02:00
Mark Brand c7d3a58aa1 update package qt 2013-06-01 00:38:53 +02:00
Mark Brand b5c4371c80 package qt: remove obsolete prefixed links to qmake and friends
index.html already explains how to invoke the qmake of choice
(Qt 4 or Qt 5).
2013-04-02 21:30:18 +02:00
Mark Brand 06c7c91ac7 update package qt 2012-11-29 21:10:21 +01:00
Mark Brand fe252299ec package qt: install under qt prefix
This makes room for Qt 5.0 when it is released and added to MXE.
Expect to install Qt 5.0 under qt5 prefix.
2012-09-18 12:00:08 +02:00
Mark Brand 002564211a package qt: improve pkg-config setting
It is not necessary to modify the shipped mkspec. Just set PKG_CONFIG
as a device option with configure.
2012-09-17 18:03:29 +02:00