diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-13 13:37:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-15 10:06:34 +0000 |
| commit | 2bdad6792d85f706a484581b1ba9f75aaa6c99a9 (patch) | |
| tree | 44bd5d72881ce13cd3bb3414f499cdbe70855df8 /main/qt5-qtbase | |
| parent | 38a10c5fa0ef86f5a2f5f2a6b835fd6af5488060 (diff) | |
| download | aports-2bdad6792d85f706a484581b1ba9f75aaa6c99a9.tar.bz2 aports-2bdad6792d85f706a484581b1ba9f75aaa6c99a9.tar.xz | |
main/qt5-qtbase: move bindir to /usr/lib/qt5/bin
to avoid conflict with qt4
Diffstat (limited to 'main/qt5-qtbase')
| -rw-r--r-- | main/qt5-qtbase/APKBUILD | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/main/qt5-qtbase/APKBUILD b/main/qt5-qtbase/APKBUILD index fd7b2c26ac..ea2e8eaca7 100644 --- a/main/qt5-qtbase/APKBUILD +++ b/main/qt5-qtbase/APKBUILD @@ -5,7 +5,7 @@ _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} _V=${_ver/rc/RC} -pkgrel=0 +pkgrel=1 pkgdesc="Qt5 - QtBase components" url="http://qt-project.org/" arch="all" @@ -54,6 +54,9 @@ source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qt qt-musl-socklen.patch " +_qt5_prefix=/usr/lib/qt5 +_qt5_datadir=/usr/share/qt5 + _builddir="$srcdir"/qtbase-opensource-src-$_V prepare() { cd "$_builddir" @@ -82,16 +85,18 @@ build() { esac ./configure -confirm-license -opensource \ - -archdatadir /usr/lib/qt5 \ - -datadir /usr/share/qt5 \ + -archdatadir "$_qt5_prefix" \ + -bindir "$_qt5_prefix"/bin \ + -datadir "$_qt5_datadir" \ -dbus-linked \ -docdir /usr/share/doc/qt5 \ -examplesdir /usr/share/doc/qt5/examples \ -glib \ -gtkstyle \ -icu \ - -importdir /usr/lib/qt5/imports \ + -importdir "$_qt5_prefix"/imports \ -largefile \ + -libexecdir "$_qt5_prefix"/libexec \ -no-openvg \ -no-rpath \ -no-separate-debug-info \ @@ -104,17 +109,17 @@ build() { -plugin-sql-psql \ -plugin-sql-sqlite \ -plugin-sql-tds \ - -plugindir /usr/lib/qt5/plugins \ + -plugindir "$_qt5_prefix"/plugins \ -prefix /usr \ -silent \ - -sysconfdir /etc \ + -sysconfdir /etc/xdg \ -system-libjpeg \ -system-libpng \ -system-pcre \ -system-sqlite \ -system-xcb \ -system-zlib \ - -translationdir /usr/share/qt5/translations \ + -translationdir "$_qt5_datadir"/translations \ $_arch \ || return 1 make || return 1 @@ -124,6 +129,10 @@ package() { cd "$_builddir" make INSTALL_ROOT="$pkgdir" install || return 1 rm -f "$pkgdir"/usr/lib/*.la + 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 } _mv_files() { @@ -138,7 +147,7 @@ dev() { cd "$pkgdir" _mv_files usr/lib/qt5/mkspecs \ usr/lib/cmake \ - usr/bin \ + usr/lib/qt5/bin \ $(find usr/ -name '*.prl') \ || return 1 default_dev |