[arch-commits] Commit in qbs/repos/staging-x86_64 (PKGBUILD PKGBUILD qbs-header.patch)

[Antonio Rojas]

    Date: Thursday, July 19, 2018 @ 17:06:17
  Author: arojas
Revision: 329063

archrelease: copy trunk to staging-x86_64

Added:
  qbs/repos/staging-x86_64/PKGBUILD
    (from rev 329062, qbs/trunk/PKGBUILD)
  qbs/repos/staging-x86_64/qbs-header.patch
    (from rev 329062, qbs/trunk/qbs-header.patch)
Deleted:
  qbs/repos/staging-x86_64/PKGBUILD

------------------+
 PKGBUILD         |   68 ++++++++++++++++++++++++++++-------------------------
 qbs-header.patch |   12 +++++++++
 2 files changed, 49 insertions(+), 31 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-19 17:05:57 UTC (rev 329062)
+++ PKGBUILD	2018-07-19 17:06:17 UTC (rev 329063)
@@ -1,31 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Donald Carr <sirspudd at gmail.com>
-# Contributor: Jake Petroules <jake.petroules at qt.io>
-
-pkgname=qbs
-pkgver=1.12.0
-pkgrel=1
-pkgdesc='Cross platform build tool'
-arch=(x86_64)
-url='https://wiki.qt.io/Qbs'
-license=(LGPL)
-depends=(qt5-script)
-source=(http://download.qt.io/official_releases/qbs/${pkgver}/qbs-src-${pkgver}.tar.gz)
-sha256sums=('5efeb2492f8ccf0e7a5ea106f748e1c536f964674025aecb22c1ee948e3e35d1')
-
-build() {
-  cd $pkgname-src-$pkgver
-  qmake QBS_INSTALL_PREFIX=/usr \
-    CONFIG+=qbs_enable_project_file_updates \
-    QBS_LIBEXEC_INSTALL_DIR=/usr/lib/qbs \
-    QBS_LIBEXEC_DESTDIR=../../../lib/qbs \
-    QBS_RELATIVE_LIBEXEC_PATH=../lib/qbs \
-    qbs.pro
-  make
-}
-
-package() {
-  cd $pkgname-src-$pkgver
-  INSTALL_ROOT="$pkgdir" make install
-}

Copied: qbs/repos/staging-x86_64/PKGBUILD (from rev 329062, qbs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-07-19 17:06:17 UTC (rev 329063)
@@ -0,0 +1,37 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Donald Carr <sirspudd at gmail.com>
+# Contributor: Jake Petroules <jake.petroules at qt.io>
+
+pkgname=qbs
+pkgver=1.12.0
+pkgrel=2
+pkgdesc='Cross platform build tool'
+arch=(x86_64)
+url='https://wiki.qt.io/Qbs'
+license=(LGPL)
+depends=(qt5-script)
+source=(http://download.qt.io/official_releases/qbs/${pkgver}/qbs-src-${pkgver}.tar.gz qbs-header.patch)
+sha256sums=('5efeb2492f8ccf0e7a5ea106f748e1c536f964674025aecb22c1ee948e3e35d1'
+            'f80fb8dd5401713e1d70012f2bbc26a1c544963753c0de3b25584b27d257d367')
+
+prepare() {
+  cd $pkgname-src-$pkgver
+  patch -p1 -i ../qbs-header.patch # Fix missing header
+}
+
+build() {
+  cd $pkgname-src-$pkgver
+  qmake QBS_INSTALL_PREFIX=/usr \
+    CONFIG+=qbs_enable_project_file_updates \
+    QBS_LIBEXEC_INSTALL_DIR=/usr/lib/qbs \
+    QBS_LIBEXEC_DESTDIR=../../../lib/qbs \
+    QBS_RELATIVE_LIBEXEC_PATH=../lib/qbs \
+    qbs.pro
+  make
+}
+
+package() {
+  cd $pkgname-src-$pkgver
+  INSTALL_ROOT="$pkgdir" make install
+}

Copied: qbs/repos/staging-x86_64/qbs-header.patch (from rev 329062, qbs/trunk/qbs-header.patch)
===================================================================
--- qbs-header.patch	                        (rev 0)
+++ qbs-header.patch	2018-07-19 17:06:17 UTC (rev 329063)
@@ -0,0 +1,12 @@
+diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
+index 9db30664f..bb3a55f12 100644
+--- a/src/lib/corelib/tools/tools.pri
++++ b/src/lib/corelib/tools/tools.pri
+@@ -131,6 +131,7 @@ osx {
+         $$PWD/qbs_export.h \
+         $$PWD/settings.h \
+         $$PWD/settingsmodel.h \
++        $$PWD/settingsrepresentation.h \
+         $$PWD/setupprojectparameters.h \
+         $$PWD/toolchains.h \
+         $$PWD/version.h