diff options
| author | Llewelyn Trahaearn | 2017-04-25 00:19:18 -0700 |
|---|---|---|
| committer | Llewelyn Trahaearn | 2017-04-25 00:19:18 -0700 |
| commit | 1684250164989e37984c68c61f6d11ff3d56cb08 (patch) | |
| tree | 9003cfe95d1247626c432a289c5ac9aa7482df1e | |
| parent | 43610d165cde88ddd85e3419a9202017fa29dff6 (diff) | |
| download | aur-1684250164989e37984c68c61f6d11ff3d56cb08.tar.gz | |
Update to deal with new OpenSSL 1.1.0 & 1.0 deployment.
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
2 files changed, 8 insertions, 6 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Apr 6 18:36:59 UTC 2017 +# Tue Apr 25 07:18:02 UTC 2017 pkgbase = lib32-qt4 pkgdesc = A cross-platform application and UI framework (32-bit) pkgver = 4.8.7 - pkgrel = 10 + pkgrel = 11 url = http://www.qt.io arch = x86_64 license = GPL3 @@ -29,7 +29,7 @@ pkgbase = lib32-qt4 depends = lib32-libxi depends = lib32-libxrandr depends = lib32-libxv - depends = lib32-openssl + depends = lib32-openssl-1.0 depends = lib32-sqlite optdepends = lib32-libxcursor: Xcursor support optdepends = lib32-libxfixes: Xfixes support @@ -7,14 +7,14 @@ pkgname=lib32-qt4 pkgver=4.8.7 -pkgrel=10 +pkgrel=11 pkgdesc='A cross-platform application and UI framework (32-bit)' arch=('x86_64') url='http://www.qt.io' license=('GPL3' 'LGPL' 'FDL' 'custom') depends=("${pkgname#lib32-}" 'lib32-alsa-lib' 'lib32-dbus' 'lib32-fontconfig' 'lib32-glib2' 'lib32-libgl' 'lib32-libmng' 'lib32-libpng' 'lib32-libsm' 'lib32-libtiff' - 'lib32-libxi' 'lib32-libxrandr' 'lib32-libxv' 'lib32-openssl' 'lib32-sqlite') + 'lib32-libxi' 'lib32-libxrandr' 'lib32-libxv' 'lib32-openssl-1.0' 'lib32-sqlite') makedepends=('cups' 'gcc-multilib' 'lib32-gtk2' 'lib32-libcups' 'lib32-libxfixes' 'lib32-mesa') optdepends=('lib32-libxcursor: Xcursor support' 'lib32-libxfixes: Xfixes support' @@ -102,9 +102,11 @@ build() { export CXXFLAGS+=" -std=gnu++98" # Fix build with GCC 6 export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" # export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig' + export OPENSSL_LIBS='-L/usr/lib32/openssl-1.0 -lssl -lcrypto' + export CXXFLAGS+=" -I/usr/include/openssl-1.0" cd ${_pkgfqn} - ./configure -confirm-license -opensource -platform linux-g++-32 \ + ./configure -confirm-license -opensource \ -prefix /usr \ -bindir /usr/lib/qt4/bin \ -headerdir /usr/include/qt4 \ |