Date: Saturday, July 11, 2015 @ 09:22:19 Author: arojas Revision: 242112
archrelease: copy trunk to extra-i686, extra-x86_64 Added: qca-qt5/repos/extra-i686/PKGBUILD (from rev 242111, qca-qt5/trunk/PKGBUILD) qca-qt5/repos/extra-i686/qiodevice.patch (from rev 242111, qca-qt5/trunk/qiodevice.patch) qca-qt5/repos/extra-x86_64/PKGBUILD (from rev 242111, qca-qt5/trunk/PKGBUILD) qca-qt5/repos/extra-x86_64/qiodevice.patch (from rev 242111, qca-qt5/trunk/qiodevice.patch) Deleted: qca-qt5/repos/extra-i686/PKGBUILD qca-qt5/repos/extra-x86_64/PKGBUILD ------------------------------+ /PKGBUILD | 82 +++++++++++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 41 -------------------- extra-i686/qiodevice.patch | 23 +++++++++++ extra-x86_64/PKGBUILD | 41 -------------------- extra-x86_64/qiodevice.patch | 23 +++++++++++ 5 files changed, 128 insertions(+), 82 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-07-11 07:22:09 UTC (rev 242111) +++ extra-i686/PKGBUILD 2015-07-11 07:22:19 UTC (rev 242112) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Antonio Rojas <aro...@archlinux.org> -# Contributor: Christian Bühler <christian.bueh...@ipoplan.de> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=qca-qt5 -pkgver=2.1.0.3 -pkgrel=1 -pkgdesc="Qt Cryptographic Architecture" -arch=('i686' 'x86_64') -url="http://delta.affinix.com/qca/" -license=('LGPL') -depends=('nss' 'qt5-base') -makedepends=('cmake' 'doxygen') -source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz" 'qiodevice.patch') -md5sums=('e29cc1d8f0292eb28e20b216f52d60fc' - '5ea7bcb072e72b28e37b1a1d897c9362') - -prepare() { - mkdir -p build - -# Add missing include, fixes build with Qt 5.5 - cd $pkgname-$pkgver - patch -p1 -i "$srcdir"/qiodevice.patch -} - -build() { - cd build - cmake ../$pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_TESTS=OFF \ - -DQCA_SUFFIX=qt5 \ - -DQCA_INSTALL_IN_QT_PREFIX=ON -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: qca-qt5/repos/extra-i686/PKGBUILD (from rev 242111, qca-qt5/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-07-11 07:22:19 UTC (rev 242112) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Antonio Rojas <aro...@archlinux.org> +# Contributor: Christian Bühler <christian.bueh...@ipoplan.de> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=qca-qt5 +pkgver=2.1.0.3 +pkgrel=1 +pkgdesc="Qt Cryptographic Architecture" +arch=('i686' 'x86_64') +url="http://delta.affinix.com/qca/" +license=('LGPL') +depends=('nss' 'qt5-base') +makedepends=('cmake' 'doxygen') +source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz" 'qiodevice.patch') +md5sums=('e29cc1d8f0292eb28e20b216f52d60fc' + '5ea7bcb072e72b28e37b1a1d897c9362') + +prepare() { + mkdir -p build + +# Add missing include, fixes build with Qt 5.5 + cd $pkgname-$pkgver + patch -p1 -i "$srcdir"/qiodevice.patch +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_TESTS=OFF \ + -DQCA_SUFFIX=qt5 \ + -DQCA_INSTALL_IN_QT_PREFIX=ON +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Copied: qca-qt5/repos/extra-i686/qiodevice.patch (from rev 242111, qca-qt5/trunk/qiodevice.patch) =================================================================== --- extra-i686/qiodevice.patch (rev 0) +++ extra-i686/qiodevice.patch 2015-07-11 07:22:19 UTC (rev 242112) @@ -0,0 +1,23 @@ +From: Hrvoje Senjan <hrvoje.sen...@gmail.com> +Date: Sat, 17 Jan 2015 19:12:18 +0000 +Subject: Add missing QIODevice include +X-Git-Url: http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=7207e6285e932044cd66d49d0dc484666cfb0092 +--- +Add missing QIODevice include + +Fixes build with Qt 5.5 +--- + + +--- a/include/QtCrypto/qca_basic.h ++++ b/include/QtCrypto/qca_basic.h +@@ -35,6 +35,8 @@ + + #include "qca_core.h" + ++#include <QIODevice> ++ + // Qt5 comes with QStringLiteral for wrapping string literals, which Qt4 does + // not have. It is needed if the headers are built with QT_NO_CAST_FROM_ASCII. + // Defining it here as QString::fromUtf8 for convenience. + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-07-11 07:22:09 UTC (rev 242111) +++ extra-x86_64/PKGBUILD 2015-07-11 07:22:19 UTC (rev 242112) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Antonio Rojas <aro...@archlinux.org> -# Contributor: Christian Bühler <christian.bueh...@ipoplan.de> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=qca-qt5 -pkgver=2.1.0.3 -pkgrel=1 -pkgdesc="Qt Cryptographic Architecture" -arch=('i686' 'x86_64') -url="http://delta.affinix.com/qca/" -license=('LGPL') -depends=('nss' 'qt5-base') -makedepends=('cmake' 'doxygen') -source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz" 'qiodevice.patch') -md5sums=('e29cc1d8f0292eb28e20b216f52d60fc' - '5ea7bcb072e72b28e37b1a1d897c9362') - -prepare() { - mkdir -p build - -# Add missing include, fixes build with Qt 5.5 - cd $pkgname-$pkgver - patch -p1 -i "$srcdir"/qiodevice.patch -} - -build() { - cd build - cmake ../$pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_TESTS=OFF \ - -DQCA_SUFFIX=qt5 \ - -DQCA_INSTALL_IN_QT_PREFIX=ON -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: qca-qt5/repos/extra-x86_64/PKGBUILD (from rev 242111, qca-qt5/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-07-11 07:22:19 UTC (rev 242112) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Antonio Rojas <aro...@archlinux.org> +# Contributor: Christian Bühler <christian.bueh...@ipoplan.de> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=qca-qt5 +pkgver=2.1.0.3 +pkgrel=1 +pkgdesc="Qt Cryptographic Architecture" +arch=('i686' 'x86_64') +url="http://delta.affinix.com/qca/" +license=('LGPL') +depends=('nss' 'qt5-base') +makedepends=('cmake' 'doxygen') +source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz" 'qiodevice.patch') +md5sums=('e29cc1d8f0292eb28e20b216f52d60fc' + '5ea7bcb072e72b28e37b1a1d897c9362') + +prepare() { + mkdir -p build + +# Add missing include, fixes build with Qt 5.5 + cd $pkgname-$pkgver + patch -p1 -i "$srcdir"/qiodevice.patch +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_TESTS=OFF \ + -DQCA_SUFFIX=qt5 \ + -DQCA_INSTALL_IN_QT_PREFIX=ON +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Copied: qca-qt5/repos/extra-x86_64/qiodevice.patch (from rev 242111, qca-qt5/trunk/qiodevice.patch) =================================================================== --- extra-x86_64/qiodevice.patch (rev 0) +++ extra-x86_64/qiodevice.patch 2015-07-11 07:22:19 UTC (rev 242112) @@ -0,0 +1,23 @@ +From: Hrvoje Senjan <hrvoje.sen...@gmail.com> +Date: Sat, 17 Jan 2015 19:12:18 +0000 +Subject: Add missing QIODevice include +X-Git-Url: http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=7207e6285e932044cd66d49d0dc484666cfb0092 +--- +Add missing QIODevice include + +Fixes build with Qt 5.5 +--- + + +--- a/include/QtCrypto/qca_basic.h ++++ b/include/QtCrypto/qca_basic.h +@@ -35,6 +35,8 @@ + + #include "qca_core.h" + ++#include <QIODevice> ++ + // Qt5 comes with QStringLiteral for wrapping string literals, which Qt4 does + // not have. It is needed if the headers are built with QT_NO_CAST_FROM_ASCII. + // Defining it here as QString::fromUtf8 for convenience. +