[arch-commits] Commit in qt5-base/repos/extra-x86_64 (6 files)
Antonio Rojas
arojas at archlinux.org
Tue Jan 2 19:41:02 UTC 2018
Date: Tuesday, January 2, 2018 @ 19:41:01
Author: arojas
Revision: 313879
archrelease: copy trunk to extra-x86_64
Added:
qt5-base/repos/extra-x86_64/PKGBUILD
(from rev 313878, qt5-base/trunk/PKGBUILD)
qt5-base/repos/extra-x86_64/qt-no-statx.patch
(from rev 313878, qt5-base/trunk/qt-no-statx.patch)
qt5-base/repos/extra-x86_64/rebuild.list
(from rev 313878, qt5-base/trunk/rebuild.list)
Deleted:
qt5-base/repos/extra-x86_64/PKGBUILD
qt5-base/repos/extra-x86_64/qt-no-statx.patch
qt5-base/repos/extra-x86_64/rebuild.list
-------------------+
PKGBUILD | 232 ++++++++++++++++++++++++++--------------------------
qt-no-statx.patch | 22 ++--
rebuild.list | 45 +++++-----
3 files changed, 152 insertions(+), 147 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-02 19:40:27 UTC (rev 313878)
+++ PKGBUILD 2018-01-02 19:41:01 UTC (rev 313879)
@@ -1,114 +0,0 @@
-# $Id$
-# 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.10.0
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('x86_64')
-url='http://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'
- 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2'
- 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'double-conversion')
-makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
- 'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers')
-optdepends=('qt5-svg: to use SVG icon themes'
- 'postgresql-libs: PostgreSQL driver'
- 'libmariadbclient: MariaDB driver'
- 'unixodbc: ODBC driver'
- 'libfbclient: Firebird/iBase driver'
- 'freetds: MS SQL driver'
- 'gtk3: GTK platform plugin')
-conflicts=('qtchooser')
-groups=('qt' 'qt5')
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
- qt-no-statx.patch)
-sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
- '5cd1d90622cc53609806a3ce0b2811b28f0e6e20eb835861de4492dddeef6e52')
-
-prepare() {
- cd ${_pkgfqn}
-
- # 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
-
- # Use python2 for Python 2.x
- find . -name '*.py' -exec sed -i \
- 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
-
- # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
- sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf
-
- # Don't use the statx syscall https://bugs.archlinux.org/task/56289 https://bugreports.qt.io/browse/QTBUG-64490
- patch -p1 -i ../qt-no-statx.patch
-}
-
-build() {
- cd ${_pkgfqn}
-
- PYTHON=/usr/bin/python2 ./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
- make
-}
-
-package_qt5-base() {
- pkgdesc='A cross-platform application and UI framework'
-
- cd ${_pkgfqn}
- make INSTALL_ROOT="${pkgdir}" install
-
- install -D -m644 LGPL_EXCEPTION.txt \
- "${pkgdir}"/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
-
- # 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 /usr/bin/$(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/extra-x86_64/PKGBUILD (from rev 313878, qt5-base/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-02 19:41:01 UTC (rev 313879)
@@ -0,0 +1,118 @@
+# $Id$
+# 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.10.0
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('x86_64')
+url='http://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'
+ 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2'
+ 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'double-conversion')
+makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
+ 'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers')
+optdepends=('qt5-svg: to use SVG icon themes'
+ 'postgresql-libs: PostgreSQL driver'
+ 'libmariadbclient: MariaDB driver'
+ 'unixodbc: ODBC driver'
+ 'libfbclient: Firebird/iBase driver'
+ 'freetds: MS SQL driver'
+ 'gtk3: GTK platform plugin')
+conflicts=('qtchooser')
+groups=('qt' 'qt5')
+_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+ qt-no-statx.patch
+ qtbug-65235.patch::"https://github.com/qt/qtbase/commit/79d78d81.patch")
+sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
+ '5cd1d90622cc53609806a3ce0b2811b28f0e6e20eb835861de4492dddeef6e52'
+ '32d71a129adad13fc90e2ec9b15d0a21d9dd3f02bd8094882b18e4451d39ffe7')
+
+prepare() {
+ cd ${_pkgfqn}
+
+ # 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
+
+ # Use python2 for Python 2.x
+ find . -name '*.py' -exec sed -i \
+ 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
+
+ # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417
+ sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf
+
+ # Don't use the statx syscall https://bugs.archlinux.org/task/56289 https://bugreports.qt.io/browse/QTBUG-64490
+ patch -p1 -i ../qt-no-statx.patch
+
+ patch -p1 -i ../qtbug-65235.patch # https://bugreports.qt.io/browse/QTBUG-65235
+}
+
+build() {
+ cd ${_pkgfqn}
+
+ PYTHON=/usr/bin/python2 ./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
+ make
+}
+
+package_qt5-base() {
+ pkgdesc='A cross-platform application and UI framework'
+
+ cd ${_pkgfqn}
+ make INSTALL_ROOT="${pkgdir}" install
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
+
+ # 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 /usr/bin/$(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/
+}
Deleted: qt-no-statx.patch
===================================================================
--- qt-no-statx.patch 2018-01-02 19:40:27 UTC (rev 313878)
+++ qt-no-statx.patch 2018-01-02 19:41:01 UTC (rev 313879)
@@ -1,11 +0,0 @@
---- qtbase-everywhere-src-5.10.0-beta4/src/corelib/io/qfilesystemengine_unix.cpp.orig 2017-11-14 12:10:28.156094557 +0000
-+++ qtbase-everywhere-src-5.10.0-beta4/src/corelib/io/qfilesystemengine_unix.cpp 2017-11-14 12:10:46.156136206 +0000
-@@ -95,7 +95,7 @@
- { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
- # endif
-
--# if !QT_CONFIG(statx) && defined(SYS_statx) && QT_HAS_INCLUDE(<linux/stat.h>)
-+# if 0
- # include <linux/stat.h>
- static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
- { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
Copied: qt5-base/repos/extra-x86_64/qt-no-statx.patch (from rev 313878, qt5-base/trunk/qt-no-statx.patch)
===================================================================
--- qt-no-statx.patch (rev 0)
+++ qt-no-statx.patch 2018-01-02 19:41:01 UTC (rev 313879)
@@ -0,0 +1,11 @@
+--- qtbase-everywhere-src-5.10.0-beta4/src/corelib/io/qfilesystemengine_unix.cpp.orig 2017-11-14 12:10:28.156094557 +0000
++++ qtbase-everywhere-src-5.10.0-beta4/src/corelib/io/qfilesystemengine_unix.cpp 2017-11-14 12:10:46.156136206 +0000
+@@ -95,7 +95,7 @@
+ { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
+ # endif
+
+-# if !QT_CONFIG(statx) && defined(SYS_statx) && QT_HAS_INCLUDE(<linux/stat.h>)
++# if 0
+ # include <linux/stat.h>
+ static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf)
+ { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
Deleted: rebuild.list
===================================================================
--- rebuild.list 2018-01-02 19:40:27 UTC (rev 313878)
+++ rebuild.list 2018-01-02 19:41:01 UTC (rev 313879)
@@ -1,22 +0,0 @@
-### Rebuild only for minor version updates
-calibre
-gcin
-kwin
-lxqt-qtplugin
-plasma-integration
-qqc2-desktop-style
-qt5ct
-### Rebuild for minor and patch version updates
-akonadi
-deepin-dock
-deepin-file-manager
-deepin-qt5integration
-deepin-qt5dxcb-plugin
-dtkwidget
-dtkwm
-fcitx-qt5
-libqtxdg
-pyqt5
-qt5-styleplugins
-qt5-webkit
-skrooge
Copied: qt5-base/repos/extra-x86_64/rebuild.list (from rev 313878, qt5-base/trunk/rebuild.list)
===================================================================
--- rebuild.list (rev 0)
+++ rebuild.list 2018-01-02 19:41:01 UTC (rev 313879)
@@ -0,0 +1,23 @@
+### Rebuild only for minor version updates
+calibre
+gcin
+googlemaps
+kwin
+lxqt-qtplugin
+plasma-integration
+qqc2-desktop-style
+qt5ct
+### Rebuild for minor and patch version updates
+akonadi
+deepin-dock
+deepin-file-manager
+deepin-qt5integration
+deepin-qt5dxcb-plugin
+dtkwidget
+dtkwm
+fcitx-qt5
+libqtxdg
+pyqt5
+qt5-styleplugins
+qt5-webkit
+skrooge
More information about the arch-commits
mailing list