[arch-commits] Commit in qt5-wayland/repos (4 files)
Antonio Rojas
arojas at archlinux.org
Mon Aug 8 17:55:28 UTC 2016
Date: Monday, August 8, 2016 @ 17:55:28
Author: arojas
Revision: 273508
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
qt5-wayland/repos/extra-i686/PKGBUILD
(from rev 273507, qt5-wayland/trunk/PKGBUILD)
qt5-wayland/repos/extra-x86_64/PKGBUILD
(from rev 273507, qt5-wayland/trunk/PKGBUILD)
Deleted:
qt5-wayland/repos/extra-i686/PKGBUILD
qt5-wayland/repos/extra-x86_64/PKGBUILD
-----------------------+
/PKGBUILD | 94 ++++++++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 42 ---------------------
extra-x86_64/PKGBUILD | 42 ---------------------
3 files changed, 94 insertions(+), 84 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-08-08 17:54:58 UTC (rev 273507)
+++ extra-i686/PKGBUILD 2016-08-08 17:55:28 UTC (rev 273508)
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-wayland
-_qtver=5.7.0
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL' 'FDL' 'custom')
-pkgdesc='Provides APIs for Wayland'
-depends=('qt5-declarative' 'libxcomposite')
-groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('2d2543a2564ee1b5db9f25dca9cc2e3b')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
-# cd build
- cd ${_pkgfqn} # out-of-tree build fails https://bugreports.qt.io/browse/QTBUG-54148
-# qmake ../${_pkgfqn}
- qmake .
- make
-}
-
-package() {
-# cd build
- cd ${_pkgfqn}
- make INSTALL_ROOT="$pkgdir" install
-
- # 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' {} \;
-
- install -d "$pkgdir"/usr/share/licenses
- ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-}
Copied: qt5-wayland/repos/extra-i686/PKGBUILD (from rev 273507, qt5-wayland/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-08-08 17:55:28 UTC (rev 273508)
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-wayland
+_qtver=5.7.0
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Provides APIs for Wayland'
+depends=('qt5-declarative' 'libxcomposite' 'wayland') # namcap note: wayland is needed for nvidia-libgl users
+groups=('qt' 'qt5')
+_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+ qtbug-53945.patch::"https://github.com/qtproject/qtwayland/commit/75294be3.patch")
+md5sums=('2d2543a2564ee1b5db9f25dca9cc2e3b'
+ '887f656b651e230169ce02753f14d746')
+
+prepare() {
+ mkdir -p build
+
+ cd ${_pkgfqn}
+# Fix out-of-tree build
+ patch -p1 -i ../qtbug-53945.patch
+}
+
+build() {
+ cd build
+
+ qmake ../${_pkgfqn}
+ make
+}
+
+package() {
+ cd build
+
+ make INSTALL_ROOT="$pkgdir" install
+
+ # 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' {} \;
+
+ install -d "$pkgdir"/usr/share/licenses
+ ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-08-08 17:54:58 UTC (rev 273507)
+++ extra-x86_64/PKGBUILD 2016-08-08 17:55:28 UTC (rev 273508)
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-wayland
-_qtver=5.7.0
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL' 'FDL' 'custom')
-pkgdesc='Provides APIs for Wayland'
-depends=('qt5-declarative' 'libxcomposite')
-groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('2d2543a2564ee1b5db9f25dca9cc2e3b')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
-# cd build
- cd ${_pkgfqn} # out-of-tree build fails https://bugreports.qt.io/browse/QTBUG-54148
-# qmake ../${_pkgfqn}
- qmake .
- make
-}
-
-package() {
-# cd build
- cd ${_pkgfqn}
- make INSTALL_ROOT="$pkgdir" install
-
- # 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' {} \;
-
- install -d "$pkgdir"/usr/share/licenses
- ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-}
Copied: qt5-wayland/repos/extra-x86_64/PKGBUILD (from rev 273507, qt5-wayland/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-08-08 17:55:28 UTC (rev 273508)
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-wayland
+_qtver=5.7.0
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Provides APIs for Wayland'
+depends=('qt5-declarative' 'libxcomposite' 'wayland') # namcap note: wayland is needed for nvidia-libgl users
+groups=('qt' 'qt5')
+_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+ qtbug-53945.patch::"https://github.com/qtproject/qtwayland/commit/75294be3.patch")
+md5sums=('2d2543a2564ee1b5db9f25dca9cc2e3b'
+ '887f656b651e230169ce02753f14d746')
+
+prepare() {
+ mkdir -p build
+
+ cd ${_pkgfqn}
+# Fix out-of-tree build
+ patch -p1 -i ../qtbug-53945.patch
+}
+
+build() {
+ cd build
+
+ qmake ../${_pkgfqn}
+ make
+}
+
+package() {
+ cd build
+
+ make INSTALL_ROOT="$pkgdir" install
+
+ # 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' {} \;
+
+ install -d "$pkgdir"/usr/share/licenses
+ ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+}
More information about the arch-commits
mailing list