From d096de6c5ac988c5287d76600dbbb751a60b02c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 23 Jul 2015 22:42:20 -0300 Subject: octopi-0.7.0-4.parabola1: add patch for Qt5.5 --- libre/octopi/PKGBUILD | 6 +++++- libre/octopi/qt55.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 libre/octopi/qt55.patch diff --git a/libre/octopi/PKGBUILD b/libre/octopi/PKGBUILD index 14b2a4f86..e6fec0c79 100644 --- a/libre/octopi/PKGBUILD +++ b/libre/octopi/PKGBUILD @@ -4,21 +4,25 @@ pkgbase=octopi pkgname=('octopi' 'octopi-notifier' 'octopi-repoeditor' 'octopi-cachecleaner') pkgver=0.7.0 -pkgrel=3.parabola1 +pkgrel=4.parabola1 arch=('i686' 'x86_64') url="https://github.com/aarnt/octopi" license=('GPL2') makedepends=('qt5-declarative' 'qt4' 'knotifications' 'libnotify') source=("https://github.com/aarnt/${pkgname}/archive/v${pkgver}.tar.gz" 'octopi-repoeditor.desktop' + 'qt55.patch' 'parabola-support.patch') sha256sums=('03d15458ebe482e5a9a00e7a3db5676a53886c754b13a7c56e36d75b73f2d496' '131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef' + '459f924eba5bc780cb3a0cb955e9d7c634fe77d7e9f7b1a44d86c827535acbe3' '48bd938f2286e9eca5ae8b204fea5c628a53906c4b8aa9ca304a3e25dcc99822') prepare() { cd "${srcdir}/${pkgbase}-${pkgver}" patch -Np1 -i ../parabola-support.patch + + patch -p1 < ../qt55.patch } build() { diff --git a/libre/octopi/qt55.patch b/libre/octopi/qt55.patch new file mode 100644 index 000000000..744202a6d --- /dev/null +++ b/libre/octopi/qt55.patch @@ -0,0 +1,12 @@ +diff -Naur octopi-0.7.0-orig octopi-0.7.0 +diff -Naur octopi-0.7.0-orig/src/QtSolutions/qtlocalpeer.cpp octopi-0.7.0/src/QtSolutions/qtlocalpeer.cpp +--- octopi-0.7.0-orig/src/QtSolutions/qtlocalpeer.cpp 2015-07-23 09:02:22.817230596 -0400 ++++ octopi-0.7.0/src/QtSolutions/qtlocalpeer.cpp 2015-07-23 09:03:11.350983792 -0400 +@@ -41,6 +41,7 @@ + #include "qtlocalpeer.h" + #include + #include ++#include + + #if defined(Q_OS_WIN) + #include -- cgit v1.2.3-2-g168b