Force use of Qt5 in build when Qt6 is installed

2 files changed, 19 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d13221faf7b..89e016de616e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,8 @@
 pkgbase = epsonscan2
 	pkgdesc = Epson scanner management utility
 	pkgver = 6.7.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://support.epson.net/linux/en/epsonscan2.php
-	arch = i686
-	arch = pentium4
 	arch = x86_64
 	license = GPL3
 	makedepends = boost
diff --git a/PKGBUILD b/PKGBUILD
index 9dd663587be0..17bb31f32b55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 
 pkgname=epsonscan2
 pkgver=6.7.0.0
-_pkgver="${pkgver}-1"
-pkgrel=1
-arch=('i686' 'pentium4' 'x86_64')
+_pkgver="$pkgver-1"
+pkgrel=2
+arch=('x86_64')
 pkgdesc="Epson scanner management utility"
 url="http://support.epson.net/linux/en/epsonscan2.php"
 license=('GPL3')
@@ -12,35 +12,40 @@ depends=('boost-libs' 'libharu' 'qt5-singlecoreapplication' 'rapidjson' 'sane')
 makedepends=('boost' 'cmake')
 optdepends=('epsonscan2-non-free-plugin: OCR support and wireless scanning')
 options=('!buildflags')
-source=("http://support.epson.net/linux/src/scanner/${pkgname}/${pkgname}-${_pkgver}.src.tar.gz")
+source=("http://support.epson.net/linux/src/scanner/$pkgname/$pkgname-$_pkgver.src.tar.gz")
 sha512sums=('0d43d91fb679b901d73da096dba10734cd091fc84365f367c828a1106bc6d62e11fc617a27beddd5e628867e80378bfb03bc0c737249b053738da11e45faec74')
 
 prepare() {
   [[ -d build ]] && rm -r build; mkdir build
 
   sed -i 's|/lib/udev|${CMAKE_INSTALL_PREFIX}/lib/udev|' \
-         "${srcdir}/${pkgname}-${_pkgver}/CMakeLists.txt"
+         "$srcdir/$pkgname-$_pkgver/CMakeLists.txt"
 
   sed -i '1 i #include "zlib.h"' \
-         "${srcdir}/${pkgname}-${_pkgver}/src/CommonUtility/DbgLog.cpp"
+         "$srcdir/$pkgname-$_pkgver/src/CommonUtility/DbgLog.cpp"
+#
+#  sed -i 's/qt5/qt6/g; s/Qt5/Qt6/g; s/QT5/QT6/g' \
+#         "$srcdir/$pkgname-$_pkgver/src/DetectAlert/CMakeLists.txt" \
+#         "$srcdir/$pkgname-$_pkgver/src/Standalone/CMakeLists.txt"
 }
 
 build() {
   cd build
   cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
-        ../${pkgname}-${_pkgver}
+        -DQT_VERSION_MAJOR=5 \
+        ../$pkgname-$_pkgver
   cmake --build .
 }
 
 package() {
   cd build
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
-  install -Dm644 "${srcdir}/${pkgname}-${_pkgver}/desktop/rpm/i686/${pkgname}.desktop" \
-                 "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "$srcdir/$pkgname-$_pkgver/desktop/rpm/i686/$pkgname.desktop" \
+                 "$pkgdir/usr/share/applications/$pkgname.desktop"
 
-  install -d ${pkgdir}/usr/lib/sane ; cd ${pkgdir}/usr/lib/sane
-  ln -s ../${pkgname}/libsane-epsonscan2.so libsane-epsonscan2.so.1
-  ln -s ../${pkgname}/libsane-epsonscan2.so libsane-epsonscan2.so.1.0.0
+  install -d $pkgdir/usr/lib/sane ; cd $pkgdir/usr/lib/sane
+  ln -s ../$pkgname/libsane-epsonscan2.so libsane-epsonscan2.so.1
+  ln -s ../$pkgname/libsane-epsonscan2.so libsane-epsonscan2.so.1.0.0
 }