[arch-commits] Commit in q4wine/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

    Date: Wednesday, August 2, 2017 @ 07:42:33
  Author: bpiotrowski
Revision: 247400

use architecture-specific options instead of bash hackery

Modified:
  q4wine/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-02 07:42:30 UTC (rev 247399)
+++ PKGBUILD	2017-08-02 07:42:33 UTC (rev 247400)
@@ -9,14 +9,8 @@
 arch=("i686" "x86_64")
 url="http://sourceforge.net/projects/${pkgname}/"
 license=("GPL3")
-if [[ $CARCH == x86_64 ]]; then
-  # in multilib repo catalyst is 1st and default, so hardcode lib32-mesa-libgl
-  depends=("lib32-mesa-libgl" "qt5-base" "wine" "sqlite3" "which" "icoutils")
-  makedepends=("cmake" "qt5-tools")
-else
-  depends=("qt5-base" "wine" "sqlite3" "which" "icoutils")
-  makedepends=("cmake" "qt5-tools")
-fi
+depends=("qt5-base" "wine" "sqlite3" "which" "icoutils")
+makedepends=("cmake" "qt5-tools")
 optdepends=("winetricks" "fuseiso")
 options=('!emptydirs')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/_/-}.tar.bz2)
@@ -34,11 +28,6 @@
 }
 
 package() {
-if [[ $CARCH == x86_64 ]]; then
-  # remove hardcoded lib32-mesa-libgl
-  depends=(${depends[@]:1})
-fi
-
   cd "$srcdir"/${pkgname}-${pkgver/_/-}
   make DESTDIR="$pkgdir" install
 }