diff options
Diffstat (limited to 'user/qt5-qtbase')
| -rw-r--r-- | user/qt5-qtbase/APKBUILD | 56 | ||||
| -rw-r--r-- | user/qt5-qtbase/link-to-execinfo.patch | 10 |
2 files changed, 27 insertions, 39 deletions
diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD index bc81a6442..08e623af5 100644 --- a/user/qt5-qtbase/APKBUILD +++ b/user/qt5-qtbase/APKBUILD @@ -1,51 +1,28 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtbase _pkgname=qtbase-opensource-src -pkgver=5.9.6 -pkgrel=1 +pkgver=5.9.7 +pkgrel=0 pkgdesc="Qt 5.9 base components" url="https://www.qt.io/" arch="all" license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions" _sub="$pkgname-sqlite $pkgname-odbc $pkgname-postgresql $pkgname-tds $pkgname-x11" -depends_dev="mesa-dev libice-dev libsm-dev libx11-dev libxext-dev - openssl-dev fontconfig-dev freetype-dev glib-dev libpng-dev zlib-dev - sqlite-dev dbus-dev perl $_sub" +depends_dev="dbus-dev fontconfig-dev freetype-dev glib-dev libice-dev + libpng-dev libsm-dev libx11-dev libxext-dev mesa-dev openssl-dev perl + sqlite-dev zlib-dev $_sub" makedepends="$depends_dev - at-spi2-core-dev - bison - cups-dev - eudev-dev - flex - freetds-dev - freetype-dev - gperf - gtk+2.0-dev - harfbuzz-dev - hicolor-icon-theme - icu-dev - libinput-dev - libjpeg-turbo-dev - libxkbcommon-dev - libxi-dev - libxrandr-dev - libxrender-dev - libxslt-dev - libxv-dev - mtdev-dev - pcre2-dev - postgresql-dev - unixodbc-dev - xcb-util-dev - xcb-util-image-dev - xcb-util-keysyms-dev - xcb-util-wm-dev - xcb-util-renderutil-dev - cmd:which + at-spi2-core-dev bison cups-dev eudev-dev flex freetds-dev freetype-dev + gperf gtk+2.0-dev harfbuzz-dev hicolor-icon-theme icu-dev + libexecinfo-dev libinput-dev libjpeg-turbo-dev libxkbcommon-dev + libxi-dev libxrandr-dev libxrender-dev libxslt-dev libxv-dev mtdev-dev + pcre2-dev postgresql-dev unixodbc-dev xcb-util-dev xcb-util-image-dev + xcb-util-keysyms-dev xcb-util-wm-dev xcb-util-renderutil-dev cmd:which " subpackages="$pkgname-dev $pkgname-doc $_sub" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz + link-to-execinfo.patch qt-musl-iconv-no-bom.patch " @@ -59,7 +36,7 @@ prepare() { sed -i -e "s|-O2|$CXXFLAGS|" \ -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \ -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \ - mkspecs/common/*.conf + mkspecs/common/linux.conf } build() { @@ -70,7 +47,7 @@ build() { ./configure -confirm-license -opensource \ -archdatadir "$_qt5_prefix" \ - -bindir "$_qt5_prefix"/bin \ + -bindir "$_qt5_prefix"/bin \ -datadir "$_qt5_datadir" \ -dbus-linked \ -docdir /usr/share/doc/qt5 \ @@ -79,8 +56,8 @@ build() { -icu \ -importdir "$_qt5_prefix"/imports \ -libexecdir "$_qt5_prefix"/libexec \ - -no-rpath \ -no-pch \ + -no-rpath \ -nomake examples \ -opengl \ -openssl-linked \ @@ -195,5 +172,6 @@ x11() { return 0 } -sha512sums="e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb qtbase-opensource-src-5.9.6.tar.xz +sha512sums="7121837501b810f31863fbb3a6ea7189d3e38789ff25eb49b639a69b73913761c8cba18b65046519693d2f5c8755c2197feff1df1ec3d88676d00c649a326e1e qtbase-opensource-src-5.9.7.tar.xz +ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd436df4f548c1ab0b4fe801f01b162ddd5c0f892893e227acfd link-to-execinfo.patch 7d68421a14f0259535c977d8a521c98918193c107b76ac664571b12f5b0d7588a0d0e1297af412a26753a393b21f3f44c3274fa8ab5bc87f03705a3a03acb444 qt-musl-iconv-no-bom.patch" diff --git a/user/qt5-qtbase/link-to-execinfo.patch b/user/qt5-qtbase/link-to-execinfo.patch new file mode 100644 index 000000000..e7cb6ea18 --- /dev/null +++ b/user/qt5-qtbase/link-to-execinfo.patch @@ -0,0 +1,10 @@ +--- qtbase-opensource-src-5.9.7/mkspecs/common/linux.conf.old 2018-12-06 18:58:21.200000000 +0000 ++++ qtbase-opensource-src-5.9.7/mkspecs/common/linux.conf 2018-12-06 19:08:00.980000000 +0000 +@@ -28,6 +28,7 @@ + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl ++QMAKE_LIBS_EXECINFO = -lexecinfo + QMAKE_LIBS_X11 = -lXext -lX11 -lm + QMAKE_LIBS_EGL = -lEGL + QMAKE_LIBS_OPENGL = -lGL |