summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD35
2 files changed, 24 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9901df172bca..b7df8cd36ccf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,23 @@
pkgbase = xiphos-git
pkgdesc = A Bible study tool -- git version
- pkgver = r4065
- pkgrel = 4
+ pkgver = 4.1.0.r63.gd1dd1598
+ pkgrel = 1
+ epoch = 1
url = http://xiphos.org
arch = i686
arch = x86_64
license = GPL
+ makedepends = cmake
+ makedepends = gtkmm
+ makedepends = libgsf
+ makedepends = libxml2
makedepends = gnome-common
makedepends = gnome-doc-utils
makedepends = intltool
makedepends = git
makedepends = python2
makedepends = docbook-utils
- depends = dbus-glib
+ depends = gconf
depends = webkit2gtk
depends = libgsf
depends = sword>=1.8.1
@@ -23,9 +28,7 @@ pkgbase = xiphos-git
conflicts = gnomesword
conflicts = xiphos
source = git+https://github.com/crosswire/xiphos.git
- source = http://deb.debian.org/debian/pool/main/x/xiphos/xiphos_4.1.0.1+dfsg1-1.debian.tar.xz
sha512sums = SKIP
- sha512sums = 7438bc523b8a6d50a2474e43d9057081667436b8292eef9164a5478471e8dc3380f75a84c736ff95ce4ba29bc99588f1a48cf9dfbf5c7c431dd0d53374bfeeb6
pkgname = xiphos-git
diff --git a/PKGBUILD b/PKGBUILD
index 76a7246d779a..be9903c0484e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,35 @@
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=xiphos-git
-pkgver=r4065
-pkgrel=4
+pkgver=4.1.0.r63.gd1dd1598
+pkgrel=1
+epoch=1
pkgdesc="A Bible study tool -- git version"
arch=('i686' 'x86_64')
url="http://xiphos.org"
license=('GPL')
-depends=('dbus-glib' 'webkit2gtk' 'libgsf' 'sword>=1.8.1' 'gtkhtml4' 'biblesync-git')
-makedepends=('gnome-common' 'gnome-doc-utils' 'intltool' 'git' 'python2' 'docbook-utils')
+depends=('gconf' 'webkit2gtk' 'libgsf' 'sword>=1.8.1' 'gtkhtml4' 'biblesync-git')
+makedepends=('cmake' 'gtkmm' 'libgsf' 'libxml2' 'gnome-common' 'gnome-doc-utils'
+ 'intltool' 'git' 'python2' 'docbook-utils')
provides=('gnomesword' 'xiphos')
conflicts=('gnomesword' 'xiphos')
-source=(git+https://github.com/crosswire/xiphos.git "http://deb.debian.org/debian/pool/main/x/xiphos/xiphos_4.1.0.1+dfsg1-1.debian.tar.xz")
-sha512sums=('SKIP' '7438bc523b8a6d50a2474e43d9057081667436b8292eef9164a5478471e8dc3380f75a84c736ff95ce4ba29bc99588f1a48cf9dfbf5c7c431dd0d53374bfeeb6')
+source=(git+https://github.com/crosswire/xiphos.git)
+sha512sums=('SKIP')
pkgver() {
cd ${pkgname%-git}
- printf "r%s" $(git rev-list --count HEAD)
-}
-
-prepare () {
- cd ${pkgname%-git}
- sed -i 's+src/gnome2/+src/gtk/+g' "$srcdir"/debian/patches/0017*
- patch -Np1 < "$srcdir"/debian/patches/0016*
- patch -Np1 < "$srcdir"/debian/patches/0017*
+ git describe --tags | sed 's+-+.r+'|tr - .
}
build() {
- cd ${pkgname%-git}
- python2 ./waf --prefix=/usr --enable-webkit2 configure
- python2 ./waf --prefix=/usr --enable-webkit2 build
+ [[ -d build ]] || mkdir build
+ cd build
+ cmake ../${pkgname%-git} -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release -DGTKHTML=ON
+ make
}
package() {
- cd ${pkgname%-git}
- python2 ./waf --destdir="$pkgdir" --no-post-install install
+ cd build
+ make DESTDIR="$pkgdir" install
}