upgpkg: xiphos 4.2.0-1

upstream release

2 files changed, 45 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12d28613d40c..a3ca3a563aab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,34 @@
 pkgbase = xiphos
 	pkgdesc = A Bible study tool for GTK3
-	pkgver = 4.1.0
-	pkgrel = 7
+	pkgver = 4.2.0
+	pkgrel = 1
 	url = http://xiphos.org
 	arch = x86_64
 	arch = i686
 	license = GPL2
+	makedepends = appstream-glib
+	makedepends = cmake
 	makedepends = docbook-utils
 	makedepends = gnome-common
 	makedepends = gnome-doc-utils
+	makedepends = gtkmm
 	makedepends = intltool
-	makedepends = python2
-	depends = libbiblesync.so<2.0.0
+	makedepends = libffi
+	makedepends = libxml2
+	makedepends = python
+	makedepends = zlib
+	makedepends = zip
 	depends = dbus-glib
 	depends = gtkhtml4
-	depends = libgsf
-	depends = sword>=1.8.1
+	depends = libbiblesync.so
+	depends = minizip
+	depends = sword
 	depends = webkit2gtk
 	provides = gnomesword
 	conflicts = gnomesword
 	replaces = gnomesword
-	source = xiphos-4.1.0.tar.gz::https://github.com/crosswire/xiphos/archive/4.1.0.tar.gz
-	source = http://deb.debian.org/debian/pool/main/x/xiphos/xiphos_4.1.0.1+dfsg1-1.debian.tar.xz
-	sha256sums = 52e2f415339b6ccef7049f5812707c617b4dbdb6ba40bf0f5a5210e04f75f849
-	sha256sums = f0cd9a894dce646dcd3de81e5020cfa2c931f3341a3eaf4f5990d79b0618fa8b
+	source = xiphos-4.2.0.tar.gz::https://github.com/crosswire/xiphos/archive/4.2.0.tar.gz
+	sha256sums = 6f4734747c9dd0de27b672c4720ff1613f3937d88fbc0fe8a0b77d8ee562a8fa
 
 pkgname = xiphos
 
diff --git a/PKGBUILD b/PKGBUILD
index 0795fc263cc3..db65558cb5a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,45 +5,52 @@
 # Contributor: Albert De La Fuente Vigliotti <>
 
 pkgname=xiphos
-pkgver=4.1.0
-pkgrel=7
+pkgver=4.2.0
+pkgrel=1
 pkgdesc='A Bible study tool for GTK3'
 arch=('x86_64' 'i686')
 url='http://xiphos.org'
-depends=('libbiblesync.so<2.0.0'
-         'dbus-glib'
+license=('GPL2')
+depends=('dbus-glib'
          'gtkhtml4'
-         'libgsf'
-         'sword>=1.8.1'
+         'libbiblesync.so'
+         'minizip'
+         'sword'
          'webkit2gtk')
-makedepends=('docbook-utils'
+makedepends=('appstream-glib'
+             'cmake'
+             'docbook-utils'
              'gnome-common'
              'gnome-doc-utils'
+             'gtkmm'
              'intltool'
-             'python2')
-license=('GPL2')
+             'libffi'
+             'libxml2'
+             'python'
+             'zlib'
+             'zip')
 provides=('gnomesword')
 conflicts=("${provides[@]}")
 replaces=("${provides[@]}")
-source=("xiphos-$pkgver.tar.gz::https://github.com/crosswire/xiphos/archive/$pkgver.tar.gz"
-	    "http://deb.debian.org/debian/pool/main/x/xiphos/xiphos_$pkgver.1+dfsg1-1.debian.tar.xz")
-sha256sums=('52e2f415339b6ccef7049f5812707c617b4dbdb6ba40bf0f5a5210e04f75f849'
-            'f0cd9a894dce646dcd3de81e5020cfa2c931f3341a3eaf4f5990d79b0618fa8b')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/crosswire/$pkgname/archive/$pkgver.tar.gz")
+sha256sums=('6f4734747c9dd0de27b672c4720ff1613f3937d88fbc0fe8a0b77d8ee562a8fa')
 
-prepare () {
-  cd "$pkgname-$pkgver"
-  sed -i '0,/python/s//python2/' waf
-  patch -Np1 < ../debian/patches/0016*
-  patch -Np1 < ../debian/patches/0017*
+prepare() {
+    cd "$pkgname-$pkgver"
+    # TODO: Remove after upstream source package released (not the git archive)
+    echo $pkgver > cmake/source_version.txt
 }
 
 build() {
-  cd "$pkgname-$pkgver"
-  python2 ./waf --prefix=/usr --gtk=3 --enable-webkit2 configure
-  python2 ./waf --prefix=/usr --gtk=3 --enable-webkit2 build
+    cd "$pkgname-$pkgver"
+    cmake -S . -B build \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DGTKHTML=ON
+    make -C build
 }
 
 package() {
-  cd "$pkgname-$pkgver"
-  python2 ./waf --destdir="$pkgdir" --no-post-install install
+    cd "$pkgname-$pkgver"
+    make -C build DESTDIR="$pkgdir" install
 }