update depends, makedepends

other minor changes

3 files changed, 92 insertions, 89 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2bb20a1fea4f..e5fab3d16efc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,28 @@
 pkgbase = sigil-git
 	pkgdesc = multi-platform EPUB2/EPUB3 ebook editor
-	pkgver = 1.9.20.r12.gf5fe387a1
+	pkgver = 1.9.20.r27.gf8c39038c
 	pkgrel = 1
 	url = https://github.com/Sigil-Ebook/Sigil
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
+	makedepends = git
+	makedepends = python
 	makedepends = qt5-tools
-	depends = hicolor-icon-theme
 	depends = hunspell
-	depends = mathjax2
-	depends = minizip
-	depends = python-css-parser
-	depends = python-dulwich
-	depends = python-lxml
-	depends = qt5-svg
 	depends = qt5-webengine
-	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-html5lib: recommended for plugins
 	optdepends = python-pillow: recommended for plugins
-	optdepends = python-pyqt5: recommended for plugins
 	optdepends = python-pyqt5-webengine: recommended for plugins
+	optdepends = python-pyqt5: recommended for plugins
 	optdepends = python-regex: recommended for plugins
 	optdepends = tk: recommended for plugins
 	provides = sigil
 	conflicts = sigil
-	source = sigil-git::git+https://github.com/Sigil-Ebook/Sigil
+	source = sigil::git+https://github.com/Sigil-Ebook/Sigil
 	source = default_nav_css.patch
 	source = skip_ver_mod_tags.patch
 	source = skip_version_check.patch
@@ -39,3 +32,11 @@ pkgbase = sigil-git
 	sha256sums = ad10e067885809f0fab8aebcbc907f317ad7a43251d1cf9ffd0802dfb77cc540
 
 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/.gitignore b/.gitignore
index 8701e478debb..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-pkg
-src
-sigil*
-*.pkg.*
-*.log
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 48536576c76b..296d5be3b41b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,102 +5,105 @@
 # Or specify the two-letter language code of the translation you wish to keep.
 _localepurge=
 
-pkgname=sigil-git
-pkgname_="${pkgname%-git}"
-pkgver=1.9.20.r12.gf5fe387a1
+_pkgname=sigil
+pkgname="$_pkgname-git"
+pkgver=1.9.20.r27.gf8c39038c
 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
-    mathjax2
-    minizip
-    python-css-parser
-    python-dulwich
-    python-lxml
-    qt5-svg
-    qt5-webengine
-    )
+  'hunspell'
+  'qt5-webengine'
+)
 makedepends=(
-    cmake
-    qt5-tools
-    )
+  'cmake'
+  'git'
+  'python'
+  'qt5-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-html5lib: recommended for plugins'
-    'python-pillow: recommended for plugins'
-    'python-pyqt5: recommended for plugins'
-    'python-pyqt5-webengine: recommended for plugins'
-    'python-regex: recommended for plugins'
-    'tk: recommended for plugins'
-    )
-provides=("${pkgname_}")
-conflicts=("${pkgname_}")
+  '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-regex: recommended for plugins'
+  'tk: recommended for plugins'
+)
+
+provides=("$_pkgname")
+conflicts=(${provides[@]})
 source=(
-    "${pkgname}"::"git+${url}"
-    default_nav_css.patch
-    skip_ver_mod_tags.patch
-    skip_version_check.patch
-    )
+  "$_pkgname"::"git+$url"
+  default_nav_css.patch
+  skip_ver_mod_tags.patch
+  skip_version_check.patch
+)
 sha256sums=(
-    'SKIP'
-    '298928226e4e5cf9d2cf5298d2fe8c87357b92c8962c09c0683bc9af4ed9516c'
-    '9414dfd43a18d83f82c099838faca1bba8e70fe9e66e5691e652345c5d2286ab'
-    'ad10e067885809f0fab8aebcbc907f317ad7a43251d1cf9ffd0802dfb77cc540'
+  'SKIP'
+  '298928226e4e5cf9d2cf5298d2fe8c87357b92c8962c09c0683bc9af4ed9516c'
+  '9414dfd43a18d83f82c099838faca1bba8e70fe9e66e5691e652345c5d2286ab'
+  'ad10e067885809f0fab8aebcbc907f317ad7a43251d1cf9ffd0802dfb77cc540'
 )
 
 prepare() {
-    cd "${srcdir}/${pkgname}"
+  cd "$srcdir/$_pkgname"
 
-    patch -p1 < "${srcdir}/default_nav_css.patch"
-    patch -p1 < "${srcdir}/skip_ver_mod_tags.patch"
-    patch -p1 < "${srcdir}/skip_version_check.patch"
+  patch -Np1 -i "$srcdir/default_nav_css.patch"
+  patch -Np1 -i "$srcdir/skip_ver_mod_tags.patch"
+  patch -Np1 -i "$srcdir/skip_version_check.patch"
 
-    if [[ "${_localepurge}" != "" ]]; then
-        for trans in src/Resource_Files/ts/*; do
-            if [[ "$(basename $trans | sed -r 's/(_.*)_.*/\1/g')" != "sigil_${_localepurge}" ]]; then
-                rm $trans
-            fi
-        done
-    fi
+  if [[ "${_localepurge}" != "" ]]; then
+    for trans in src/Resource_Files/ts/*; do
+      if [[ "$(basename $trans | sed -r 's/(_.*)_.*/\1/g')" != "sigil_${_localepurge}" ]]; then
+        rm $trans
+      fi
+    done
+  fi
 }
 
 pkgver() {
-    cd "${srcdir}/${pkgname}"
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "$srcdir/$_pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    mkdir -p "${srcdir}/${pkgname}/build"
-    cd "${srcdir}/${pkgname}/build"
+  mkdir -p "$srcdir/$_pkgname/build"
+  cd "$srcdir/$_pkgname/build"
 
-    cmake -G "Unix Makefiles" \
-        -DUSE_SYSTEM_LIBS=1 \
-        -DSYSTEM_LIBS_REQUIRED=1 \
-        -DINSTALL_BUNDLED_DICTS=0 \
-        -DINSTALL_HICOLOR_ICONS=1 \
-        -DDISABLE_UPDATE_CHECK=1 \
-        -DMATHJAX_DIR=/usr/share/mathjax2 \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        -DCMAKE_C_FLAGS:STRING="$CFLAGS" \
-        -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS" \
-        -DCMAKE_SKIP_RPATH=ON ..
-    make
+  cmake -G "Unix Makefiles" \
+    -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
 }
 
 package() {
-    cd "${srcdir}/${pkgname}/build"
-    make install DESTDIR="${pkgdir}"
+  depends=(
+    ${depends[@]}
+    'python-cchardet'
+    'python-certifi'
+    'python-css-parser'
+    'python-dulwich'
+    'python-html5lib'
+    'python-lxml'
+  )
+
+  cd "$srcdir/$_pkgname/build"
+  make install DESTDIR="$pkgdir"
 
-    # Compile python bytecode
-    python -m compileall "$pkgdir/usr/share/sigil/"{plugin_launchers/python/,python3lib}
-    python -O -m compileall "$pkgdir/usr/share/sigil/"{plugin_launchers/python/,python3lib}
+  # Compile python bytecode
+  python -m compileall "$pkgdir/usr/share/sigil/"{plugin_launchers/python/,python3lib}
+  python -O -m compileall "$pkgdir/usr/share/sigil/"{plugin_launchers/python/,python3lib}
 }