diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-08-12 19:13:04 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-11-19 22:49:41 -0500 |
| commit | 1aead42d41178d0eeeae2c1b7d0131af9d6fffd2 (patch) | |
| tree | 19c8eaa38f45c3c35a03c3704b5e9de9fe87d9cb /depends | |
| parent | 5f93ec202810c1bc082f181fbfe6af4438b395fe (diff) | |
gitian: descriptors overhaul
Descriptors now make use of the dependencies builder, so results are cached.
A very new version (>= e9741525c) of Gitian should be used in order to take
advantage of caching.
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/qt46.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/depends/packages/qt46.mk b/depends/packages/qt46.mk index 6af8052931..8fb30a5c44 100644 --- a/depends/packages/qt46.mk +++ b/depends/packages/qt46.mk @@ -1,10 +1,9 @@ PACKAGE=qt46 -$(package)_version=4.6.2 +$(package)_version=4.6.4 $(package)_download_path=http://download.qt-project.org/archive/qt/4.6/ $(package)_file_name=qt-everywhere-opensource-src-$($(package)_version).tar.gz -$(package)_sha256_hash=176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae -$(package)_dependencies=openssl -$(package)_linux_dependencies=freetype dbus libX11 xproto libXext libICE libSM +$(package)_sha256_hash=9ad4d46c721b53a429ed5a2eecfd3c239a9ab566562f183f99d3125f1a234250 +$(package)_dependencies=openssl freetype dbus libX11 xproto libXext libICE libSM $(package)_patches=stlfix.patch define $(package)_set_vars @@ -35,7 +34,7 @@ define $(package)_preprocess_cmds sed -i.old "s|/usr/X11R6/lib64|$(host_prefix)/lib|" mkspecs/*/*.conf && \ sed -i.old "s|/usr/X11R6/lib|$(host_prefix)/lib|" mkspecs/*/*.conf && \ sed -i.old "s|/usr/X11R6/include|$(host_prefix)/include|" mkspecs/*/*.conf && \ - sed -i.old "s|QMAKE_LFLAGS_SHLIB += -shared|QMAKE_LFLAGS_SHLIB += -shared -Wl,--exclude-libs,ALL|" mkspecs/common/g++.conf && \ + sed -i.old "s|QMAKE_LFLAGS_SHLIB\t+= -shared|QMAKE_LFLAGS_SHLIB\t+= -shared -Wl,--exclude-libs,ALL|" mkspecs/common/g++.conf && \ sed -i.old "/SSLv2_client_method/d" src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp && \ sed -i.old "/SSLv2_server_method/d" src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp && \ patch -p1 < $($(package)_patch_dir)/stlfix.patch @@ -62,6 +61,6 @@ define $(package)_stage_cmds endef define $(package)_postprocess_cmds - rm -rf mkspecs/ lib/cmake/ && \ + rm -rf mkspecs/ lib/cmake/ lib/*.prl lib/*.la && \ find native/bin -type f -exec mv {} {}-qt4 \; endef |