[arch-commits] Commit in qt5-base/repos (4 files)

Thu Feb 27 22:47:24 UTC 2020

Date: Thursday, February 27, 2020 @ 22:47:23
  Author: arojas
Revision: 376337

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  qt5-base/repos/kde-unstable-x86_64/
  qt5-base/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 376336, qt5-base/kde-unstable/PKGBUILD)
  qt5-base/repos/kde-unstable-x86_64/qt5-base-cflags.patch
    (from rev 376336, qt5-base/kde-unstable/qt5-base-cflags.patch)
  qt5-base/repos/kde-unstable-x86_64/qtbug-82547.patch
    (from rev 376336, qt5-base/kde-unstable/qtbug-82547.patch)

-----------------------+
 PKGBUILD              |  103 ++++++++++++++++++++++++++++++++++++++++++++++++
 qt5-base-cflags.patch |   26 ++++++++++++
 qtbug-82547.patch     |   22 ++++++++++
 3 files changed, 151 insertions(+)

Copied: qt5-base/repos/kde-unstable-x86_64/PKGBUILD (from rev 376336, qt5-base/kde-unstable/PKGBUILD)
===================================================================

--- kde-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ kde-unstable-x86_64/PKGBUILD	2020-02-27 22:47:23 UTC (rev 376337)
@@ -0,0 +1,103 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=qt5-base
+pkgname=(qt5-base qt5-xcb-private-headers)
+_qtver=5.15.0-beta1
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=('x86_64')
+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=('libfbclient' 'mariadb-libs' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
+             'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers')
+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'
+            'postgresql-libs: PostgreSQL driver'
+            'mariadb-libs: MariaDB driver'
+            'unixodbc: ODBC driver'
+            'libfbclient: Firebird/iBase driver'
+            'freetds: MS SQL driver'
+            'gtk3: GTK platform plugin'
+            'perl: for fixqt4headers and syncqt')
+conflicts=('qtchooser')
+groups=('qt' 'qt5')
+_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
+source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+         qt5-base-cflags.patch
+         qtbug-82547.patch)
+sha256sums=('d835c6ba15e1a443bb0114a5eeea4efd512bc74700bb1ae003514d1465cd7b94'
+            'c3ccc95178203a4ce2c84862009309ab507dc84e846f30ddd8cea95564a46c01'
+            'd41852acfb5c7eb6415a0efdb3ec9a501ca31ebdddce2311e973854753da2eeb')
+
+prepare() {
+  cd ${_pkgfqn}
+
+  patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
+  patch -p1 -i ../qtbug-82547.patch # fix build with system mimetype database
+}
+
+build() {
+  cd ${_pkgfqn}
+
+  ./configure -confirm-license -opensource -v \
+    -prefix /usr \
+    -docdir /usr/share/doc/qt \
+    -headerdir /usr/include/qt \
+    -archdatadir /usr/lib/qt \
+    -datadir /usr/share/qt \
+    -sysconfdir /etc/xdg \
+    -examplesdir /usr/share/doc/qt/examples \
+    -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
+    -system-sqlite \
+    -openssl-linked \
+    -nomake examples \
+    -no-rpath \
+    -optimized-qmake \
+    -dbus-linked \
+    -system-harfbuzz \
+    -journald \
+    -no-use-gold-linker \
+    -reduce-relocations # -no-mimetype-database https://bugreports.qt.io/browse/QTBUG-82547
+  make
+}
+
+package_qt5-base() {
+  pkgdesc='A cross-platform application and UI framework'
+
+  cd ${_pkgfqn}
+  make INSTALL_ROOT="${pkgdir}" install
+
+  install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
+
+  # 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}/${_pkgfqn}|/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() {
+  pkgdesc='Private headers for Qt5 Xcb'
+
+  depends=("qt5-base=$pkgver")
+  optdepends=()
+  groups=()
+  conflicts=()
+
+  cd ${_pkgfqn}
+  install -d -m755 "$pkgdir"/usr/include/qtxcb-private
+  cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
+}

Copied: qt5-base/repos/kde-unstable-x86_64/qt5-base-cflags.patch (from rev 376336, qt5-base/kde-unstable/qt5-base-cflags.patch)
===================================================================
--- kde-unstable-x86_64/qt5-base-cflags.patch	                        (rev 0)
+++ kde-unstable-x86_64/qt5-base-cflags.patch	2020-02-27 22:47:23 UTC (rev 376337)
@@ -0,0 +1,26 @@
+diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
+index a493cd5984..79f2d2fff9 100644
+--- a/mkspecs/common/g++-unix.conf
++++ b/mkspecs/common/g++-unix.conf
+@@ -10,5 +10,5 @@
+ 
+ include(g++-base.conf)
+ 
+-QMAKE_LFLAGS_RELEASE   += -Wl,-O1
++QMAKE_LFLAGS_RELEASE   += $$(LDFLAGS)
+ QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index 4d82321cba..4a61fc9d25 100644
+--- a/mkspecs/common/gcc-base.conf
++++ b/mkspecs/common/gcc-base.conf
+@@ -40,8 +40,8 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+ QMAKE_CFLAGS_DEPS          += -M
+ QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
+ QMAKE_CFLAGS_WARN_OFF      += -w
+-QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
+-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
++QMAKE_CFLAGS_RELEASE       += $$(CFLAGS)
++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CFLAGS) $$(DEBUG_CFLAGS)
+ QMAKE_CFLAGS_DEBUG         += -g
+ QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
+ QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC

Copied: qt5-base/repos/kde-unstable-x86_64/qtbug-82547.patch (from rev 376336, qt5-base/kde-unstable/qtbug-82547.patch)
===================================================================
--- kde-unstable-x86_64/qtbug-82547.patch	                        (rev 0)
+++ kde-unstable-x86_64/qtbug-82547.patch	2020-02-27 22:47:23 UTC (rev 376337)
@@ -0,0 +1,22 @@
+From 6a0d9896165998ef415c7169dcd8fe7eb2ec41cf Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira at intel.com>
+Date: Thu, 27 Feb 2020 08:08:25 -0800
+Subject: [PATCH] QMimeXMLProvider: add missing semi-colon in the #else case
+
+Fixes: QTBUG-82547
+Change-Id: Ia8b65350cd5d49debca9fffd15f74e22c0536805
+---
+
+diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h
+index 0629df8..c4e712b 100644
+--- a/src/corelib/mimetypes/qmimeprovider_p.h
++++ b/src/corelib/mimetypes/qmimeprovider_p.h
+@@ -140,7 +140,7 @@
+     enum : bool { InternalDatabaseAvailable = false };
+     QMimeXMLProvider(QMimeDatabasePrivate *db, InternalDatabaseEnum)
+         : QMimeProviderBase(db, QString())
+-    { Q_UNREACHABLE() };
++    { Q_UNREACHABLE(); };
+ #endif
+     QMimeXMLProvider(QMimeDatabasePrivate *db, const QString &directory);
+     ~QMimeXMLProvider();

