From 4217c7a7f209d3c1f3b415fb4b11af5f47fa844c Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 13 May 2015 15:04:18 +0000
Subject: [PATCH] main/qt5-qtquick1: fix qt4 conflict
---
main/qt5-qtquick1/APKBUILD | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/main/qt5-qtquick1/APKBUILD b/main/qt5-qtquick1/APKBUILD
index 62af2207cfbc..4584620b596f 100644
--- a/main/qt5-qtquick1/APKBUILD
+++ b/main/qt5-qtquick1/APKBUILD
@@ -5,7 +5,7 @@ _ver=${pkgver/_/-}
_ver=${_ver/beta0/beta}
_ver=${_ver/rc0/rc}
_V=${_ver/rc/RC}
-pkgrel=0
+pkgrel=1
pkgdesc="A declarative language for describing user interfaces in Qt5"
url="http://qt-project.org/"
arch="all"
@@ -21,6 +21,7 @@ case $pkgver in
esac
source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtquick1-opensource-src-$_V.tar.xz"
+_qt5_prefix=/usr/lib/qt5
_builddir="$srcdir"/qtquick1-opensource-src-$_V
prepare() {
local i
@@ -34,13 +35,17 @@ prepare() {
build() {
cd "$_builddir"
- qmake && make
+ qmake-qt5 && make
}
package() {
cd "$_builddir"
make install INSTALL_ROOT="$pkgdir" || return 1
rm "$pkgdir"/usr/lib/*.la || return 1
+ mkdir -p "$pkgdir"/usr/bin/
+ for i in "$pkgdir"/$_qt5_prefix/bin/*; do
+ ln -s ../lib/qt5/bin/${i##*/} "$pkgdir"/usr/bin/${i##*/}-qt5 || return 1
+ done
}
md5sums="16d711d20238e3220fc4030dab608f0b qtquick1-opensource-src-5.4.1.tar.xz"
--
GitLab