summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2016-05-13 15:14:39 +0200
committerMartchus2016-05-13 15:14:39 +0200
commitd1ddc625518996e24d767d093443a4b70cff7361 (patch)
tree3cd31fb6f0760b66a18211e78c032d460beace9d
parentf1e7edb5061451f002dc8f5c7477770c3c2ff40f (diff)
downloadaur-d1ddc625518996e24d767d093443a4b70cff7361.tar.gz
Update for GCC 6.1 rebuild
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD68
2 files changed, 36 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4163ca7ddcf..779d3519c21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Mar 29 16:50:58 UTC 2016
+# Fri May 13 13:09:20 UTC 2016
pkgbase = mingw-w64-qt5-base
pkgdesc = A cross-platform application and UI framework (mingw-w64)
pkgver = 5.6.0
- pkgrel = 2
+ pkgrel = 3
url = https://www.qt.io/
arch = i686
arch = x86_64
@@ -24,7 +24,6 @@ pkgbase = mingw-w64-qt5-base
depends = mingw-w64-libdbus
depends = mingw-w64-pcre
depends = mingw-w64-harfbuzz
- depends = mingw-w64-glib2
depends = mingw-w64-angleproject
optdepends = mingw-w64-postgresql-libs: PostgreSQL support
optdepends = mingw-w64-mariadb-connector-c: MySQL support
diff --git a/PKGBUILD b/PKGBUILD
index e9acc4fa98d..e208e71cc69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,36 +6,45 @@
# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
# you also find the URL of a binary repository.
+# Helper functions for the split builds
+isStatic() {
+ [ $pkgname = "mingw-w64-qt5-base-static" ]
+}
+
+isOpenGL() {
+ [ $pkgname = "mingw-w64-qt5-base-opengl" ]
+}
+
pkgname=mingw-w64-qt5-base
pkgver=5.6.0
-pkgrel=2
+pkgrel=3
pkgdesc="A cross-platform application and UI framework (mingw-w64)"
-arch=(i686 x86_64)
+! isStatic && arch=('i686' 'x86_64')
+isStatic && arch=('any') # the static variant doesn't contain any executables which need to be executed on the host
url="https://www.qt.io/"
license=("custom, FDL, GPL3, LGPL")
depends=(
- mingw-w64-crt
- mingw-w64-zlib
- mingw-w64-libjpeg-turbo
- mingw-w64-libiconv
- mingw-w64-sqlite
- mingw-w64-libpng
- mingw-w64-openssl
- mingw-w64-libdbus
- mingw-w64-pcre
- mingw-w64-harfbuzz
- mingw-w64-glib2
+ 'mingw-w64-crt'
+ 'mingw-w64-zlib'
+ 'mingw-w64-libjpeg-turbo'
+ 'mingw-w64-libiconv'
+ 'mingw-w64-sqlite'
+ 'mingw-w64-libpng'
+ 'mingw-w64-openssl'
+ 'mingw-w64-libdbus'
+ 'mingw-w64-pcre'
+ 'mingw-w64-harfbuzz'
)
-groups=(mingw-w64-qt mingw-w64-qt5)
+groups=('mingw-w64-qt' 'mingw-w64-qt5')
optdepends=(
- "mingw-w64-postgresql-libs: PostgreSQL support"
- "mingw-w64-mariadb-connector-c: MySQL support"
- "qtchooser"
+ 'mingw-w64-postgresql-libs: PostgreSQL support'
+ 'mingw-w64-mariadb-connector-c: MySQL support'
+ 'qtchooser'
)
-makedepends=(mingw-w64-gcc
- mingw-w64-postgresql-libs
- mingw-w64-mariadb-connector-c
- mingw-w64-pkg-config)
+makedepends=('mingw-w64-gcc'
+ 'mingw-w64-postgresql-libs'
+ 'mingw-w64-mariadb-connector-c'
+ 'mingw-w64-pkg-config')
options=(!strip !buildflags staticlibs)
_pkgfqn="qtbase-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
@@ -76,15 +85,6 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
'83139869355c2d46921adb25e47cf0fa')
_architectures="x86_64-w64-mingw32 i686-w64-mingw32"
-# Helper functions for the split builds
-isStatic() {
- [ $pkgname = "mingw-w64-qt5-base-static" ]
-}
-
-isOpenGL() {
- [ $pkgname = "mingw-w64-qt5-base-opengl" ]
-}
-
isStatic && depends+=("mingw-w64-qt5-base")
! isOpenGL && depends+=("mingw-w64-angleproject")
isOpenGL && provides+=("mingw-w64-qt5-base")
@@ -267,7 +267,7 @@ build() {
# libraries which various compiled tools (like moc) use. As the libQt5Bootstrap*
# libraries aren't installed at this point yet, we have to workaround this
../${_pkgfqn}/configure -shared $qt_configure_args $qt_configure_args_mysql
- LD_LIBRARY_PATH=`pwd`/lib make
+ LD_LIBRARY_PATH="$PWD/lib" make
fi
popd
@@ -337,9 +337,9 @@ package() {
fi
# keeping prl files for base build since qbs seems to need them.
- if isStatic; then
- rm -f "${pkgdir}/usr/${_arch}/lib"{,/qt/plugins/*}/*.prl
- fi
+ isStatic && rm -f "${pkgdir}/usr/${_arch}/lib"{,/qt/plugins/*}/*.prl
+
+ # remove binaries, strip libs
find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" | xargs -rtl1 rm
find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g