diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 111 |
1 files changed, 70 insertions, 41 deletions
@@ -1,22 +1,25 @@ -# Maintainer: Valentin Hăloiu <vially.ichb+aur@gmail.com> +# Merged with official ABS qt5-base PKGBUILD by João, 2021/08/30 (all respective contributors apply herein) +# Maintainer: João Figueiredo & chaotic-aur <islandc0der@chaotic.cx> +# Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com> # Contributor: Riley Trautman <asonix.dev@gmail.com> # Contributor: Jerome Leclanche <jerome@leclan.ch> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> -_pkgname=qt5-base -pkgname=$_pkgname-git -pkgver=5.15.0.beta1.r69.gfbebc93617 +pkgbase=qt5-base-git +pkgname=(qt5-base-git qt5-xcb-private-headers-git) +pkgver=5.15.2_r43754.g40143c189b pkgrel=1 -arch=("i686" "x86_64") -url='https://qt-project.org/' -license=('GPL3' 'LGPL3' 'FDL' 'custom') -pkgdesc="A cross-platform application and UI framework" -depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig' 'xdg-utils' - 'shared-mime-info' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'mesa' - 'tslib' 'libinput' 'libxkbcommon-x11' 'libproxy' 'libcups' 'double-conversion' 'md4c') -makedepends=('libfbclient' 'mariadb-libs' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs' - 'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers' 'git') +arch=($CARCH) +url='https://www.qt.io' +license=(GPL3 LGPL3 FDL custom) +pkgdesc='A cross-platform application and UI framework' +depends=(libjpeg-turbo xcb-util-keysyms xcb-util-renderutil libgl fontconfig xdg-utils + shared-mime-info xcb-util-wm libxrender libxi sqlite xcb-util-image mesa + tslib libinput libxkbcommon-x11 libproxy libcups double-conversion md4c) +makedepends=(git libfbclient mariadb-libs unixodbc postgresql-libs alsa-lib gst-plugins-base-libs + gtk3 libpulse cups freetds vulkan-headers) +conflicts=(qtchooser{,-git}) optdepends=('qt5-svg: to use SVG icon themes' 'qt5-wayland: to run Qt applications in a Wayland session' 'qt5-translations: for some native UI translations' @@ -27,37 +30,37 @@ optdepends=('qt5-svg: to use SVG icon themes' 'freetds: MS SQL driver' 'gtk3: GTK platform plugin' 'perl: for fixqt4headers and syncqt') -provides=("$_pkgname") -conflicts=("$_pkgname" "qtchooser") -source=("$_pkgname::git://code.qt.io/qt/qtbase.git#branch=5.15") - -sha256sums=('SKIP') +groups=(qt-git qt5-git) +source=("git+https://github.com/qt/qtbase.git" qt5-base-cflags.patch qt5-base-nostrip.patch qt5-qtbase-gcc11.patch qtbase-QTBUG-89977.patch qtbase-QTBUG-90395.patch qtbase-QTBUG-91909.patch) +sha256sums=('SKIP' + 'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c' + '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094' + 'b848bafd4eb3585cab5480196afdfdcaa251f4c56f6a93c765f7668cf48471d1' + '435e44c35273e1f7f72e525996b0b93b08602fe9f83c751cb4270d8b67fbfec4' + '1651229105d419937784d1b3b04955a5504142f48de3b4f96da051a76b6833f8' + '726eccdddf6fbac3822fc6530a14d3fe3b83e671ca35563b4c2fa4f6644214a3') pkgver() { - cd "$srcdir/$_pkgname" - git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' + cd qtbase + echo "5.15.2_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)" } prepare() { - cd "$srcdir/$_pkgname" - - sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/gcc-base.conf - - # Build qmake using Arch {C,LD}FLAGS - # This also sets default {C,CXX,LD}FLAGS for projects built using qmake - sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \ - mkspecs/common/gcc-base.conf - sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \ - mkspecs/common/g++-unix.conf + cd qtbase + git checkout ${pkgver%%_*} - # Use python2 for Python 2.x - find . -name '*.py' -exec sed -i \ - 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} + + patch -p1 < ../qt5-base-cflags.patch # Use system CFLAGS in qmake + patch -p1 < ../qt5-base-nostrip.patch # Don't strip binaries with qmake + + ## Fedora patches for gcc11 support + patch -p1 < ../qt5-qtbase-gcc11.patch + patch -p1 < ../qtbase-QTBUG-89977.patch + patch -p1 < ../qtbase-QTBUG-90395.patch + patch -p1 < ../qtbase-QTBUG-91909.patch } build() { - cd "$srcdir/$_pkgname" - + cd qtbase ./configure -confirm-license -opensource -v \ -prefix /usr \ -docdir /usr/share/doc/qt \ @@ -71,22 +74,48 @@ build() { -openssl-linked \ -nomake examples \ -no-rpath \ - -optimized-qmake \ -dbus-linked \ -system-harfbuzz \ -journald \ + -no-mimetype-database \ -no-use-gold-linker \ - -reduce-relocations # -no-mimetype-database + -reduce-relocations \ + -no-strip make } -package() { - cd "$srcdir/$_pkgname" - make INSTALL_ROOT="$pkgdir" install +package_qt5-base-git() { + pkgdesc='A cross-platform application and UI framework' + conflicts=(qt5-base) + provides=(qt5-base) + + cd qtbase + make INSTALL_ROOT="${pkgdir}" install - install -Dm644 LICENSE* -t "${pkgdir}"/usr/share/licenses/${pkgname} + install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/${pkgbase%-git} # Drop QMAKE_PRL_BUILD_DIR because reference the build dir find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + # Fix wrong qmake path in pri file + sed -i "s|${srcdir}/qtbase|/usr|" \ + "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri + + # Symlinks for backwards compatibility + for b in "${pkgdir}"/usr/bin/*; do + ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done +} + +package_qt5-xcb-private-headers-git() { + pkgdesc='Private headers for Qt5 Xcb' + + depends=("qt5-base-git=$pkgver") + conflicts=(qt5-xcb-private-headers) + provides=(qt5-xcb-private-headers) + + cd qtbase + install -d -m755 "$pkgdir"/usr/include/qtxcb-private + cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/ } |