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

[Antonio Rojas]

    Date: Tuesday, July 11, 2017 @ 16:45:25
  Author: arojas
Revision: 300113

archrelease: copy trunk to extra-x86_64, extra-i686

Added:
  qbs/repos/extra-i686/PKGBUILD
    (from rev 300112, qbs/trunk/PKGBUILD)
  qbs/repos/extra-x86_64/PKGBUILD
    (from rev 300112, qbs/trunk/PKGBUILD)
Deleted:
  qbs/repos/extra-i686/PKGBUILD
  qbs/repos/extra-x86_64/PKGBUILD

-----------------------+
 /PKGBUILD             |   66 ++++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD   |   25 ------------------
 extra-x86_64/PKGBUILD |   25 ------------------
 3 files changed, 66 insertions(+), 50 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-07-11 16:44:54 UTC (rev 300112)
+++ extra-i686/PKGBUILD	2017-07-11 16:45:25 UTC (rev 300113)
@@ -1,25 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Donald Carr <sirspudd at gmail.com>
-# Contributor: Jake Petroules <jake.petroules at qt.io>
-pkgname=qbs
-pkgver=1.8.1
-pkgrel=1
-pkgdesc='Cross platform build tool'
-arch=('x86_64' 'i686')
-url='https://code.qt.io/qt-labs/qbs.git'
-license=('LGPL')
-depends=('qt5-base' 'qt5-script')
-makedepends=('gcc')
-source=($pkgname-$pkgver.tar.gz::"https://github.com/qt-labs/qbs/archive/v$pkgver.tar.gz")
-sha512sums=('6e8bff90cb8c412fd8645bf174e0e32ba8bab1bb0007b18bc4e543f9e80003745c1973b2fb753ed320b956d061685bd1c6d3ea618431e8d4ccbee21599a16a29')
-
-build() {
-  cd qbs-$pkgver
-  qmake QBS_INSTALL_PREFIX=/usr QBS_LIBEXEC_INSTALL_DIR=/usr/lib/qbs QBS_RELATIVE_LIBEXEC_PATH=../lib/qbs CONFIG+=qbs_enable_project_file_updates qbs.pro
-  make
-}
-
-package() {
-  cd qbs-$pkgver
-  INSTALL_ROOT="$pkgdir" make install
-}

Copied: qbs/repos/extra-i686/PKGBUILD (from rev 300112, qbs/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-07-11 16:45:25 UTC (rev 300113)
@@ -0,0 +1,33 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Donald Carr <sirspudd at gmail.com>
+# Contributor: Jake Petroules <jake.petroules at qt.io>
+pkgname=qbs
+pkgver=1.8.1
+pkgrel=2
+pkgdesc='Cross platform build tool'
+arch=('x86_64' 'i686')
+url='https://code.qt.io/qt-labs/qbs.git'
+license=('LGPL')
+depends=('qt5-base' 'qt5-script')
+makedepends=('gcc')
+source=($pkgname-$pkgver.tar.gz::"https://github.com/qt-labs/qbs/archive/v$pkgver.tar.gz"
+        qbs-missing-header.patch::"https://github.com/qt-labs/qbs/commit/4143de9a.patch")
+sha512sums=('6e8bff90cb8c412fd8645bf174e0e32ba8bab1bb0007b18bc4e543f9e80003745c1973b2fb753ed320b956d061685bd1c6d3ea618431e8d4ccbee21599a16a29'
+            '218292bdcd05141c6546e6b3cf757288ca05624cd4605629389aea928bc7525874dd3fd8a64fa7aaf2eefd6916f48f238b23dd167b7a6e47c1d0af1f37824917')
+
+prepare() {
+  cd $pkgname-$pkgver
+# Fix missing header
+  patch -p1 -i ../qbs-missing-header.patch
+}
+
+build() {
+  cd qbs-$pkgver
+  qmake QBS_INSTALL_PREFIX=/usr QBS_LIBEXEC_INSTALL_DIR=/usr/lib/qbs QBS_RELATIVE_LIBEXEC_PATH=../lib/qbs CONFIG+=qbs_enable_project_file_updates qbs.pro
+  make
+}
+
+package() {
+  cd qbs-$pkgver
+  INSTALL_ROOT="$pkgdir" make install
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-07-11 16:44:54 UTC (rev 300112)
+++ extra-x86_64/PKGBUILD	2017-07-11 16:45:25 UTC (rev 300113)
@@ -1,25 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Donald Carr <sirspudd at gmail.com>
-# Contributor: Jake Petroules <jake.petroules at qt.io>
-pkgname=qbs
-pkgver=1.8.1
-pkgrel=1
-pkgdesc='Cross platform build tool'
-arch=('x86_64' 'i686')
-url='https://code.qt.io/qt-labs/qbs.git'
-license=('LGPL')
-depends=('qt5-base' 'qt5-script')
-makedepends=('gcc')
-source=($pkgname-$pkgver.tar.gz::"https://github.com/qt-labs/qbs/archive/v$pkgver.tar.gz")
-sha512sums=('6e8bff90cb8c412fd8645bf174e0e32ba8bab1bb0007b18bc4e543f9e80003745c1973b2fb753ed320b956d061685bd1c6d3ea618431e8d4ccbee21599a16a29')
-
-build() {
-  cd qbs-$pkgver
-  qmake QBS_INSTALL_PREFIX=/usr QBS_LIBEXEC_INSTALL_DIR=/usr/lib/qbs QBS_RELATIVE_LIBEXEC_PATH=../lib/qbs CONFIG+=qbs_enable_project_file_updates qbs.pro
-  make
-}
-
-package() {
-  cd qbs-$pkgver
-  INSTALL_ROOT="$pkgdir" make install
-}

Copied: qbs/repos/extra-x86_64/PKGBUILD (from rev 300112, qbs/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-07-11 16:45:25 UTC (rev 300113)
@@ -0,0 +1,33 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Donald Carr <sirspudd at gmail.com>
+# Contributor: Jake Petroules <jake.petroules at qt.io>
+pkgname=qbs
+pkgver=1.8.1
+pkgrel=2
+pkgdesc='Cross platform build tool'
+arch=('x86_64' 'i686')
+url='https://code.qt.io/qt-labs/qbs.git'
+license=('LGPL')
+depends=('qt5-base' 'qt5-script')
+makedepends=('gcc')
+source=($pkgname-$pkgver.tar.gz::"https://github.com/qt-labs/qbs/archive/v$pkgver.tar.gz"
+        qbs-missing-header.patch::"https://github.com/qt-labs/qbs/commit/4143de9a.patch")
+sha512sums=('6e8bff90cb8c412fd8645bf174e0e32ba8bab1bb0007b18bc4e543f9e80003745c1973b2fb753ed320b956d061685bd1c6d3ea618431e8d4ccbee21599a16a29'
+            '218292bdcd05141c6546e6b3cf757288ca05624cd4605629389aea928bc7525874dd3fd8a64fa7aaf2eefd6916f48f238b23dd167b7a6e47c1d0af1f37824917')
+
+prepare() {
+  cd $pkgname-$pkgver
+# Fix missing header
+  patch -p1 -i ../qbs-missing-header.patch
+}
+
+build() {
+  cd qbs-$pkgver
+  qmake QBS_INSTALL_PREFIX=/usr QBS_LIBEXEC_INSTALL_DIR=/usr/lib/qbs QBS_RELATIVE_LIBEXEC_PATH=../lib/qbs CONFIG+=qbs_enable_project_file_updates qbs.pro
+  make
+}
+
+package() {
+  cd qbs-$pkgver
+  INSTALL_ROOT="$pkgdir" make install
+}