build with qt6

2 files changed, 49 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b50fee794bb..dc028f2c9ae4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sigil-git
 	pkgdesc = multi-platform EPUB2/EPUB3 ebook editor
-	pkgver = 1.9.20.r46.ga2898308c
+	pkgver = 1.9.30.r34.g61f091c9e
 	pkgrel = 1
 	url = https://github.com/Sigil-Ebook/Sigil
 	arch = x86_64
@@ -8,20 +8,32 @@ pkgbase = sigil-git
 	makedepends = cmake
 	makedepends = git
 	makedepends = python
-	makedepends = qt5-tools
+	makedepends = qt6-tools
+	depends = hicolor-icon-theme
 	depends = hunspell
-	depends = qt5-webengine
+	depends = pcre2
+	depends = minizip
+	depends = python-chardet
+	depends = python-certifi
+	depends = python-css-parser
+	depends = python-dulwich
+	depends = python-html5lib
+	depends = python-lxml
+	depends = qt6-webengine
+	depends = qt6-5compat
+	optdepends = hunspell-en_US: for English dictionary support
 	optdepends = hyphen-en: for English hyphenation support in plugins
 	optdepends = pageedit: external editor to replace BookView
 	optdepends = python-chardet: recommended for plugins
 	optdepends = python-cssselect: recommended for plugins
 	optdepends = python-pillow: recommended for plugins
-	optdepends = python-pyqt5-webengine: recommended for plugins
-	optdepends = python-pyqt5: recommended for plugins
+	optdepends = python-pyqt6-webengine: recommended for plugins
+	optdepends = python-pyqt6: recommended for plugins
 	optdepends = python-regex: recommended for plugins
 	optdepends = tk: recommended for plugins
 	provides = sigil
 	conflicts = sigil
+	options = !debug
 	source = sigil::git+https://github.com/Sigil-Ebook/Sigil
 	source = default_nav_css.patch
 	source = skip_epub_version_check.patch
@@ -32,11 +44,3 @@ pkgbase = sigil-git
 	sha256sums = c74be3af315c9ffe181df6b465d0037f152f6078b953e6eeaab7b2932ae4c729
 
 pkgname = sigil-git
-	depends = hunspell
-	depends = qt5-webengine
-	depends = python-cchardet
-	depends = python-certifi
-	depends = python-css-parser
-	depends = python-dulwich
-	depends = python-html5lib
-	depends = python-lxml
diff --git a/PKGBUILD b/PKGBUILD
index 49e2f312140c..49ed507b1729 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer:
 # Contributor: Eli Schwartz <eschwartz@archlinux.org>
 # Contributor: David Mougey <imapiekindaguy at gmail dot com>
 
@@ -7,36 +8,50 @@ _localepurge=
 
 _pkgname=sigil
 pkgname="$_pkgname-git"
-pkgver=1.9.20.r46.ga2898308c
+pkgver=1.9.30.r34.g61f091c9e
 pkgrel=1
 pkgdesc='multi-platform EPUB2/EPUB3 ebook editor'
 arch=('x86_64')
 url="https://github.com/Sigil-Ebook/Sigil"
 license=('GPL3')
 depends=(
+  'hicolor-icon-theme'
   'hunspell'
-  'qt5-webengine'
+  'pcre2'
+  'minizip'
+  'python-chardet'
+  'python-certifi'
+  'python-css-parser'
+  'python-dulwich'
+  'python-html5lib'
+  'python-lxml'
+  'qt6-webengine'
+  'qt6-5compat'
 )
 makedepends=(
   'cmake'
   'git'
   'python'
-  'qt5-tools'
+  'qt6-tools'
 )
 optdepends=(
+  'hunspell-en_US: for English dictionary support'
   'hyphen-en: for English hyphenation support in plugins'
   'pageedit: external editor to replace BookView'
   'python-chardet: recommended for plugins'
   'python-cssselect: recommended for plugins'
   'python-pillow: recommended for plugins'
-  'python-pyqt5-webengine: recommended for plugins'
-  'python-pyqt5: recommended for plugins'
+  'python-pyqt6-webengine: recommended for plugins'
+  'python-pyqt6: recommended for plugins'
   'python-regex: recommended for plugins'
   'tk: recommended for plugins'
 )
 
 provides=("$_pkgname")
 conflicts=(${provides[@]})
+
+options=(!debug)
+
 source=(
   "$_pkgname"::"git+$url"
   'default_nav_css.patch'
@@ -55,6 +70,7 @@ prepare() {
   cd "$srcdir/$_pkgname"
 
   for p in "$srcdir"/*.patch ; do
+    echo "Applying patch: $p"
     patch -Np1 -i "$p"
   done
 
@@ -73,35 +89,28 @@ pkgver() {
 }
 
 build() {
-  mkdir -p "$srcdir/$_pkgname/build"
-  cd "$srcdir/$_pkgname/build"
-
   cmake -G "Unix Makefiles" \
+    -B build \
+    -S "$_pkgname" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX='/usr' \
+    -DCMAKE_INSTALL_LIBDIR='lib' \
+    -DMATHJAX3_DIR='/usr/share/mathjax' \
+    -DUSE_QT6=1 \
     -DUSE_SYSTEM_LIBS=1 \
     -DSYSTEM_LIBS_REQUIRED=1 \
     -DINSTALL_BUNDLED_DICTS=0 \
     -DINSTALL_HICOLOR_ICONS=1 \
     -DDISABLE_UPDATE_CHECK=1 \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_C_FLAGS:STRING="$CFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS" \
-    -DCMAKE_SKIP_RPATH=ON ..
-  make
+    -DCMAKE_SKIP_RPATH=ON
+
+  cmake --build build
 }
 
 package() {
-  depends+=(
-    'python-cchardet'
-    'python-certifi'
-    'python-css-parser'
-    'python-dulwich'
-    'python-html5lib'
-    'python-lxml'
-  )
-
-  cd "$srcdir/$_pkgname/build"
-  make install DESTDIR="$pkgdir"
+  DESTDIR="$pkgdir" cmake --install build
 
   # Compile python bytecode
   python -m compileall "$pkgdir/usr/share/sigil/"{plugin_launchers/python/,python3lib}