diff options
| author | root <root@rshg054.dnsready.net> | 2012-02-21 23:15:10 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-02-21 23:15:10 +0000 |
| commit | 1f55cedf5ea357497d2a98eb2be78d8dab4a9665 (patch) | |
| tree | 5e44ad19f2672ee92283377c9fe6eab3c8a815d7 /community/xiphos | |
| parent | 11484c032f8c236b2044e715a9a3b28e33f65598 (diff) | |
Tue Feb 21 23:15:10 UTC 2012
Diffstat (limited to 'community/xiphos')
| -rwxr-xr-x | community/xiphos/PKGBUILD | 18 | ||||
| -rw-r--r-- | community/xiphos/xiphos.patch | 29 |
2 files changed, 40 insertions, 7 deletions
diff --git a/community/xiphos/PKGBUILD b/community/xiphos/PKGBUILD index 1e6e80c69..dc5c97637 100755 --- a/community/xiphos/PKGBUILD +++ b/community/xiphos/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 60197 2011-12-07 12:42:03Z arodseth $ +# $Id: PKGBUILD 65313 2012-02-20 22:49:22Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Andrea Scarpino # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: TripleE <eric1548@yahoo.com> + pkgname=xiphos -pkgver=3.1.4 -pkgrel=9 +pkgver=3.1.5 +pkgrel=1 pkgdesc="Bible study tool for GTK+" arch=('x86_64' 'i686') url="http://xiphos.org/" @@ -16,15 +17,18 @@ conflicts=('gnomesword') provides=('gnomesword') replaces=('gnomesword') install=xiphos.install -source=("http://downloads.sourceforge.net/gnomesword/$pkgname-$pkgver.tar.gz") -md5sums=('4d6f7805c4c8185f5c4ac3bd95fc705a') +source=("http://downloads.sourceforge.net/gnomesword/$pkgname-$pkgver.tar.gz" + "$pkgname.patch") +sha256sums=('568474d9060979ad1140dbf0eae13e46890a268bfa06d600ded5917ba6674bc2' + 'd9cdbb2de7108e2d4e49960c0c54470bc34176cb5035e14af53400c6a823ef60') build() { cd "$srcdir/$pkgname-$pkgver" sed -i '0,/on/s//on2/' waf - ./waf configure --prefix=/usr --enable-gtkhtml - ./waf build --prefix=/usr + patch -p0 -i "$srcdir/$pkgname.patch" + CXXFLAGS+=" -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1" ./waf configure --prefix=/usr --enable-gtkhtml + ./waf build --prefix=/usr } package() { diff --git a/community/xiphos/xiphos.patch b/community/xiphos/xiphos.patch new file mode 100644 index 000000000..f1940375e --- /dev/null +++ b/community/xiphos/xiphos.patch @@ -0,0 +1,29 @@ +--- src/main/display.cc 2012/02/19 14:16:05 4372 ++++ src/main/display.cc 2012/02/20 10:56:39 4374 +@@ -29,9 +29,12 @@ + #include <thmlhtmlhref.h> + #include <gbfhtmlhref.h> + #include <teihtmlhref.h> ++#ifndef NO_SWORD_SET_RENDER_NOTE_NUMBERS ++/* these files are erroneously uninstalled as of previous release */ + #include <osisxhtml.h> + #include <thmlxhtml.h> + #include <gbfxhtml.h> ++#endif + + #include <osisvariants.h> + #include <thmlvariants.h> +--- src/main/display.cc (revision 4374) ++++ src/main/display.cc (revision 4375) +@@ -762,7 +762,10 @@ + } + } + +-#ifndef NO_SWORD_SET_RENDER_NOTE_NUMBERS ++#ifdef NO_SWORD_SET_RENDER_NOTE_NUMBERS ++// placeholder for older Sword. ++#define set_render_numbers(x,y) /* nothing */ ++#else + void + set_render_numbers(SWModule& imodule, GLOBAL_OPS *ops) + { |