Update to qt6

2 files changed, 28 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 766643e6d784..fe92b2ab4ab4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = hunspell-ar
 	pkgdesc = Arabic dictionary for hunspell
 	pkgver = 3.5
-	pkgrel = 2
+	pkgrel = 3
 	url = http://ayaspell.sourceforge.net
 	arch = any
 	license = GPL
 	license = LGPL
 	license = MPL
-	makedepends = qt5-webengine
+	makedepends = qt6-webengine
 	optdepends = hunspell: the spell checking libraries and apps
 	source = http://downloads.sourceforge.net/project/ayaspell/hunspell-ar_3.5.2014-11-08.zip
 	sha256sums = 966faf94e7d05d52e9afdd20b266e28932edf5b32fe26aa83d554d6a2c6021ea
 
 pkgname = hunspell-ar
-
diff --git a/PKGBUILD b/PKGBUILD
index 921f6d1c0683..dc4afd10cf1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,48 @@
 # Maintainer: Munzir Taha <munzirtaha at gmail dot com>
+
 pkgname=hunspell-ar
 pkgver=3.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Arabic dictionary for hunspell"
 arch=(any)
 url="http://ayaspell.sourceforge.net"
 license=('GPL' 'LGPL' 'MPL')
-makedepends=('qt5-webengine')
+makedepends=('qt6-webengine')
 optdepends=('hunspell: the spell checking libraries and apps')
 source=(http://downloads.sourceforge.net/project/ayaspell/${pkgname}_${pkgver}.2014-11-08.zip)
 sha256sums=('966faf94e7d05d52e9afdd20b266e28932edf5b32fe26aa83d554d6a2c6021ea')
 
-build() {
- /bin/true
-}
-
 package() {
   cd "$srcdir"
-  install -d "$pkgdir"/usr/share/{hunspell,qt/qtwebengine_dictionaries}
-  install -D -m644 ar.dic ar.aff $pkgdir/usr/share/hunspell/
+  # bdic dosn't support the IGNORE command yet
+  sed -i '/^IGNORE/d' ar.aff
+  install -vDm 644 ar.dic ar.aff -t "$pkgdir/usr/share/hunspell"
 
-  pushd $pkgdir/usr/share/hunspell/
-  ar_aliases="ar_AE ar_BH ar_DZ ar_EG ar_IN ar_IQ ar_JO ar_KW ar_LB ar_LY ar_MA ar_OM ar_QA ar_SA ar_SD ar_SY ar_TN ar_YE"
-  for lang in $ar_aliases; do
-    ln -s ar.aff $lang.aff
-    ln -s ar.dic $lang.dic
-  done
+  pushd "$pkgdir/usr/share/hunspell/"
+    ar_aliases="ar_AE ar_BH ar_DZ ar_EG ar_IN ar_IQ ar_JO ar_KW ar_LB ar_LY ar_MA ar_OM ar_QA ar_SA ar_SD ar_SY ar_TN ar_YE"
+    for lang in $ar_aliases; do
+      ln -s ar.aff $lang.aff
+      ln -s ar.dic $lang.dic
+    done
   popd
 
-  # FIXME: tested with Falkon but Arabic spell is not working
-  # Install webengine dictionary; the IGNORE command is not supported by bdic
-  sed -i '/^IGNORE/d' ar.aff
-  qwebengine_convert_dict ar.dic "$pkgdir/usr/share/qt/qtwebengine_dictionaries/ar.bdic"
-
-  # the symlinks
-  install -d $pkgdir/usr/share/myspell/dicts
-  pushd $pkgdir/usr/share/myspell/dicts
-  for file in $pkgdir/usr/share/hunspell/ar.*; do
-    ln -sv /usr/share/hunspell/$(basename $file) .
+  # Install webengine dictionary
+  install -d "$pkgdir"/usr/share/qt{,6}/qtwebengine_dictionaries/
+  for _file in "$pkgdir"/usr/share/hunspell/*.dic; do
+  _filename=$(basename $_file)
+    /usr/lib/qt6/qwebengine_convert_dict $_file "$pkgdir"/usr/share/qt6/qtwebengine_dictionaries/${_filename/\.dic/\.bdic}
+  ln -rs "$pkgdir"/usr/share/qt6/qtwebengine_dictionaries/${_filename/\.dic/\.bdic} "$pkgdir"/usr/share/qt/qtwebengine_dictionaries/
   done
+
+  # myspell symlinks
+  install -dm755 "${pkgdir}/usr/share/myspell/dicts"
+  pushd "$pkgdir/usr/share/myspell/dicts"
+    for file in "$pkgdir/usr/share/hunspell/"*; do
+      ln -sv "/usr/share/hunspell/$(basename "$file")" .
+    done
   popd
 
   # docs
   install -d $pkgdir/usr/share/doc/$pkgname
-  install -m644 ChangeLog-?? README-?? AUTHORS TODO-?? "$pkgdir/usr/share/doc/$pkgname/"
+  install -m644 AUTHORS ChangeLog* README* TODO* "$pkgdir/usr/share/doc/$pkgname/"
 }