[arch-commits] Commit in sword/trunk (PKGBUILD)

2020-12-19 Thread Felix Yan via arch-commits
Date: Saturday, December 19, 2020 @ 09:46:32
  Author: felixonmars
Revision: 779864

upgpkg: sword 1.8.1-11: icu 68.2 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-19 09:46:23 UTC (rev 779863)
+++ PKGBUILD2020-12-19 09:46:32 UTC (rev 779864)
@@ -10,7 +10,7 @@
 pkgname=(sword python-sword)
 _mainver=1.8
 pkgver=1.8.1
-pkgrel=10
+pkgrel=11
 pkgdesc="Library for Bible study programs"
 arch=('x86_64')
 url="https://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2020-04-27 Thread Evangelos Foutras via arch-commits
Date: Tuesday, April 28, 2020 @ 01:32:20
  Author: foutrelis
Revision: 621950

icu 67.1 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-27 22:41:05 UTC (rev 621949)
+++ PKGBUILD2020-04-28 01:32:20 UTC (rev 621950)
@@ -10,7 +10,7 @@
 pkgname=(sword python-sword)
 _mainver=1.8
 pkgver=1.8.1
-pkgrel=8
+pkgrel=9
 pkgdesc="Library for Bible study programs"
 arch=('x86_64')
 url="https://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2019-11-11 Thread Felix Yan via arch-commits
Date: Tuesday, November 12, 2019 @ 01:32:16
  Author: felixonmars
Revision: 526896

icu 65.1 / poppler 0.82.0 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-12 01:29:33 UTC (rev 526895)
+++ PKGBUILD2019-11-12 01:32:16 UTC (rev 526896)
@@ -10,7 +10,7 @@
 pkgname=(sword python-sword)
 _mainver=1.8
 pkgver=1.8.1
-pkgrel=7
+pkgrel=8
 pkgdesc="Library for Bible study programs"
 arch=('x86_64')
 url="https://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2019-11-04 Thread Felix Yan via arch-commits
Date: Monday, November 4, 2019 @ 09:24:24
  Author: felixonmars
Revision: 523877

Python 3.8 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 09:23:53 UTC (rev 523876)
+++ PKGBUILD2019-11-04 09:24:24 UTC (rev 523877)
@@ -10,7 +10,7 @@
 pkgname=(sword python-sword)
 _mainver=1.8
 pkgver=1.8.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Library for Bible study programs"
 arch=('x86_64')
 url="https://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2019-04-26 Thread Antonio Rojas via arch-commits
Date: Friday, April 26, 2019 @ 22:29:49
  Author: arojas
Revision: 454389

https

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-26 22:29:03 UTC (rev 454388)
+++ PKGBUILD2019-04-26 22:29:49 UTC (rev 454389)
@@ -13,10 +13,10 @@
 pkgrel=6
 pkgdesc="Library for Bible study programs"
 arch=('x86_64')
-url="http://www.crosswire.org/sword/;
+url="https://www.crosswire.org/sword/;
 license=('GPL')
 makedepends=('curl' 'clucene' 'swig' 'cmake' 'python')
-source=("http://www.crosswire.org/ftpmirror/pub/$pkgbase/source/v$_mainver/$pkgbase-$pkgver.tar.gz;)
+source=("https://www.crosswire.org/ftpmirror/pub/$pkgbase/source/v$_mainver/$pkgbase-$pkgver.tar.gz;)
 
sha512sums=('5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36')
 
 prepare() {


[arch-commits] Commit in sword/trunk (PKGBUILD)

2019-04-05 Thread Felix Yan via arch-commits
Date: Friday, April 5, 2019 @ 14:47:25
  Author: felixonmars
Revision: 449829

icu 64.1 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-05 14:38:53 UTC (rev 449828)
+++ PKGBUILD2019-04-05 14:47:25 UTC (rev 449829)
@@ -10,7 +10,7 @@
 pkgname=(sword python-sword)
 _mainver=1.8
 pkgver=1.8.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Library for Bible study programs"
 arch=('x86_64')
 url="http://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2019-04-02 Thread Felix Yan via arch-commits
Date: Tuesday, April 2, 2019 @ 13:29:45
  Author: felixonmars
Revision: 447735

upgpkg: sword 1.8.1-5

remove python2 sibling

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |   17 +++--
 1 file changed, 3 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-02 13:28:12 UTC (rev 447734)
+++ PKGBUILD2019-04-02 13:29:45 UTC (rev 447735)
@@ -7,15 +7,15 @@
 # Contributor: Dominic Tubach
 
 pkgbase=sword
-pkgname=(sword python-sword python2-sword)
+pkgname=(sword python-sword)
 _mainver=1.8
 pkgver=1.8.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Library for Bible study programs"
 arch=('x86_64')
 url="http://www.crosswire.org/sword/;
 license=('GPL')
-makedepends=('curl' 'clucene' 'swig' 'cmake' 'python' 'python2')
+makedepends=('curl' 'clucene' 'swig' 'cmake' 'python')
 
source=("http://www.crosswire.org/ftpmirror/pub/$pkgbase/source/v$_mainver/$pkgbase-$pkgver.tar.gz;)
 
sha512sums=('5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36')
 
@@ -34,10 +34,6 @@
   cmake .. -DLIBSWORD_LIBRARY_TYPE="Shared" -DSYSCONF_INSTALL_DIR='/etc' \
-DSWORD_BUILD_TESTS="Yes" -DSWORD_BINDINGS="Python" 
-DCMAKE_INSTALL_PREFIX=/usr
   make
-
-  cp -a bindings/swig/python bindings/swig/python2
-  cd bindings/swig/python2
-  python2 setup.py build
 }
 
 package_sword() {
@@ -54,10 +50,3 @@
   cd "$srcdir/$pkgbase-$pkgver/build/bindings/swig/python"
   python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build
 }
-
-package_python2-sword() {
-  depends=('sword' 'python2')
-
-  cd "$srcdir/$pkgbase-$pkgver/build/bindings/swig/python2"
-  python2 setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build
-}


[arch-commits] Commit in sword/trunk (PKGBUILD)

2018-10-22 Thread Evangelos Foutras via arch-commits
Date: Monday, October 22, 2018 @ 22:24:35
  Author: foutrelis
Revision: 398539

icu 63.1 / poppler 0.70.0 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-22 22:22:44 UTC (rev 398538)
+++ PKGBUILD2018-10-22 22:24:35 UTC (rev 398539)
@@ -10,7 +10,7 @@
 pkgname=(sword python-sword python2-sword)
 _mainver=1.8
 pkgver=1.8.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Library for Bible study programs"
 arch=('x86_64')
 url="http://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2018-08-06 Thread Evangelos Foutras via arch-commits
Date: Monday, August 6, 2018 @ 22:37:19
  Author: foutrelis
Revision: 369967

icu 62.1 / poppler 0.67.0 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-06 22:36:48 UTC (rev 369966)
+++ PKGBUILD2018-08-06 22:37:19 UTC (rev 369967)
@@ -11,7 +11,7 @@
 pkgname=(sword python-sword python2-sword)
 _mainver=1.8
 pkgver=1.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for Bible study programs"
 arch=('x86_64')
 url="http://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2018-07-08 Thread Evangelos Foutras via arch-commits
Date: Sunday, July 8, 2018 @ 14:20:10
  Author: foutrelis
Revision: 354956

Python 3.7 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-08 14:17:58 UTC (rev 354955)
+++ PKGBUILD2018-07-08 14:20:10 UTC (rev 354956)
@@ -11,7 +11,7 @@
 pkgname=(sword python-sword python2-sword)
 _mainver=1.8
 pkgver=1.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for Bible study programs"
 arch=('x86_64')
 url="http://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2018-06-06 Thread Felix Yan via arch-commits
Date: Wednesday, June 6, 2018 @ 09:50:55
  Author: felixonmars
Revision: 341127

upgpkg: sword 1.8.1-1

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |   13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-06 09:50:26 UTC (rev 341126)
+++ PKGBUILD2018-06-06 09:50:55 UTC (rev 341127)
@@ -9,9 +9,9 @@
 
 pkgbase=sword
 pkgname=(sword python-sword python2-sword)
-_mainver=1.7
-pkgver=1.7.4
-pkgrel=12
+_mainver=1.8
+pkgver=1.8.1
+pkgrel=1
 pkgdesc="Library for Bible study programs"
 arch=('x86_64')
 url="http://www.crosswire.org/sword/;
@@ -18,7 +18,7 @@
 license=('GPL')
 makedepends=('curl' 'clucene' 'swig' 'cmake' 'python' 'python2')
 
source=("http://www.crosswire.org/ftpmirror/pub/$pkgbase/source/v$_mainver/$pkgbase-$pkgver.tar.gz;)
-md5sums=('1677f02a86cbf07713d4e1d4c39791e6')
+sha512sums=('5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36')
 
 prepare() {
   cd "$srcdir/$pkgbase-$pkgver"
@@ -42,14 +42,11 @@
 }
 
 package_sword() {
-  depends=('curl' 'clucene' 'swig')
+  depends=('curl' 'clucene' 'swig' 'xz')
   backup=('etc/sword.conf')
 
   cd "$srcdir/$pkgbase-$pkgver/build"
   make DESTDIR="$pkgdir" install
-
-  # Move it into a separated package
-  rm -r "$pkgdir/usr/lib/python3.6"
 }
 
 package_python-sword() {


[arch-commits] Commit in sword/trunk (PKGBUILD)

2018-03-27 Thread Evangelos Foutras via arch-commits
Date: Tuesday, March 27, 2018 @ 22:04:54
  Author: foutrelis
Revision: 312969

icu 61.1 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-27 22:02:58 UTC (rev 312968)
+++ PKGBUILD2018-03-27 22:04:54 UTC (rev 312969)
@@ -11,7 +11,7 @@
 pkgname=(sword python-sword python2-sword)
 _mainver=1.7
 pkgver=1.7.4
-pkgrel=11
+pkgrel=12
 pkgdesc="Library for Bible study programs"
 arch=('x86_64')
 url="http://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2018-03-27 Thread Evangelos Foutras via arch-commits
Date: Tuesday, March 27, 2018 @ 21:56:52
  Author: foutrelis
Revision: 312958

Fix build with ICU 61

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-27 21:54:15 UTC (rev 312957)
+++ PKGBUILD2018-03-27 21:56:52 UTC (rev 312958)
@@ -27,7 +27,10 @@
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver/build"
-  
+
+  # http://site.icu-project.org/download/61#TOC-Migration-Issues
+  CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+
   #./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc
   cmake .. -DLIBSWORD_LIBRARY_TYPE="Shared" -DSYSCONF_INSTALL_DIR='/etc' \
-DSWORD_BUILD_TESTS="Yes" -DSWORD_BINDINGS="Python" 
-DCMAKE_INSTALL_PREFIX=/usr


[arch-commits] Commit in sword/trunk (PKGBUILD)

2017-11-12 Thread Evangelos Foutras
Date: Sunday, November 12, 2017 @ 13:10:07
  Author: foutrelis
Revision: 266330

icu 60.1 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-12 13:09:32 UTC (rev 266329)
+++ PKGBUILD2017-11-12 13:10:07 UTC (rev 266330)
@@ -11,7 +11,7 @@
 pkgname=(sword python-sword python2-sword)
 _mainver=1.7
 pkgver=1.7.4
-pkgrel=10
+pkgrel=11
 pkgdesc="Library for Bible study programs"
 arch=('x86_64' 'i686')
 url="http://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2017-04-24 Thread Evangelos Foutras
Date: Tuesday, April 25, 2017 @ 04:51:06
  Author: foutrelis
Revision: 225245

icu 59.1 / hunspell 1.6.0 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-25 04:47:30 UTC (rev 225244)
+++ PKGBUILD2017-04-25 04:51:06 UTC (rev 225245)
@@ -11,7 +11,7 @@
 pkgname=(sword python-sword python2-sword)
 _mainver=1.7
 pkgver=1.7.4
-pkgrel=9
+pkgrel=10
 pkgdesc="Library for Bible study programs"
 arch=('x86_64' 'i686')
 url="http://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2016-12-24 Thread Felix Yan
Date: Saturday, December 24, 2016 @ 15:24:00
  Author: felixonmars
Revision: 201526

Python 3.6 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-24 15:21:29 UTC (rev 201525)
+++ PKGBUILD2016-12-24 15:24:00 UTC (rev 201526)
@@ -11,7 +11,7 @@
 pkgname=(sword python-sword python2-sword)
 _mainver=1.7
 pkgver=1.7.4
-pkgrel=8
+pkgrel=9
 pkgdesc="Library for Bible study programs"
 arch=('x86_64' 'i686')
 url="http://www.crosswire.org/sword/;
@@ -46,7 +46,7 @@
   make DESTDIR="$pkgdir" install
 
   # Move it into a separated package
-  rm -r "$pkgdir/usr/lib/python3.5"
+  rm -r "$pkgdir/usr/lib/python3.6"
 }
 
 package_python-sword() {


[arch-commits] Commit in sword/trunk (PKGBUILD)

2016-11-26 Thread Evangelos Foutras
Date: Saturday, November 26, 2016 @ 14:45:05
  Author: foutrelis
Revision: 196914

icu 58.1 / poppler 0.49.0 / hunspell 1.5.0 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-26 14:36:12 UTC (rev 196913)
+++ PKGBUILD2016-11-26 14:45:05 UTC (rev 196914)
@@ -11,7 +11,7 @@
 pkgname=(sword python-sword python2-sword)
 _mainver=1.7
 pkgver=1.7.4
-pkgrel=7
+pkgrel=8
 pkgdesc="Library for Bible study programs"
 arch=('x86_64' 'i686')
 url="http://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2016-04-02 Thread Felix Yan
Date: Sunday, April 3, 2016 @ 00:39:00
  Author: fyan
Revision: 169289

icu 57.1 / poppler 0.42.0 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-02 21:36:31 UTC (rev 169288)
+++ PKGBUILD2016-04-02 22:39:00 UTC (rev 169289)
@@ -11,7 +11,7 @@
 pkgname=(sword python-sword python2-sword)
 _mainver=1.7
 pkgver=1.7.4
-pkgrel=6
+pkgrel=7
 pkgdesc="Library for Bible study programs"
 arch=('x86_64' 'i686')
 url="http://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2015-12-06 Thread Evangelos Foutras
Date: Monday, December 7, 2015 @ 06:37:51
  Author: foutrelis
Revision: 149606

C++11 ABI rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 05:37:16 UTC (rev 149605)
+++ PKGBUILD2015-12-07 05:37:51 UTC (rev 149606)
@@ -11,7 +11,7 @@
 pkgname=(sword python-sword python2-sword)
 _mainver=1.7
 pkgver=1.7.4
-pkgrel=5
+pkgrel=6
 pkgdesc="Library for Bible study programs"
 arch=('x86_64' 'i686')
 url="http://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2015-11-01 Thread Bartłomiej Piotrowski
Date: Sunday, November 1, 2015 @ 22:29:00
  Author: bpiotrowski
Revision: 145483

icu 56.1 / poppler 0.37.0 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-01 20:51:11 UTC (rev 145482)
+++ PKGBUILD2015-11-01 21:29:00 UTC (rev 145483)
@@ -11,7 +11,7 @@
 pkgname=(sword python-sword python2-sword)
 _mainver=1.7
 pkgver=1.7.4
-pkgrel=4
+pkgrel=5
 pkgdesc="Library for Bible study programs"
 arch=('x86_64' 'i686')
 url="http://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2015-09-19 Thread Felix Yan
Date: Saturday, September 19, 2015 @ 16:14:34
  Author: fyan
Revision: 140861

upgpkg: sword 1.7.4-4

rebuild for python 3.5

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-19 14:14:27 UTC (rev 140860)
+++ PKGBUILD2015-09-19 14:14:34 UTC (rev 140861)
@@ -11,7 +11,7 @@
 pkgname=(sword python-sword python2-sword)
 _mainver=1.7
 pkgver=1.7.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Library for Bible study programs"
 arch=('x86_64' 'i686')
 url="http://www.crosswire.org/sword/;
@@ -46,7 +46,7 @@
   make DESTDIR="$pkgdir" install
 
   # Move it into a separated package
-  rm -r "$pkgdir/usr/lib/python3.4"
+  rm -r "$pkgdir/usr/lib/python3.5"
 }
 
 package_python-sword() {


[arch-commits] Commit in sword/trunk (PKGBUILD)

2015-04-03 Thread Felix Yan
Date: Saturday, April 4, 2015 @ 06:14:13
  Author: fyan
Revision: 130654

upgpkg: sword 1.7.4-3

icu 55.1 rebuild

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-04 04:07:12 UTC (rev 130653)
+++ PKGBUILD2015-04-04 04:14:13 UTC (rev 130654)
@@ -10,8 +10,8 @@
 pkgbase=sword
 pkgname=(sword python-sword python2-sword)
 _mainver=1.7
-pkgver=$_mainver.4
-pkgrel=2
+pkgver=1.7.4
+pkgrel=3
 pkgdesc=Library for Bible study programs
 arch=('x86_64' 'i686')
 url=http://www.crosswire.org/sword/;


[arch-commits] Commit in sword/trunk (PKGBUILD)

2014-12-27 Thread Felix Yan
Date: Saturday, December 27, 2014 @ 12:31:55
  Author: fyan
Revision: 124670

upgpkg: sword 1.7.4-2

- switch to cmake
- enable python bindings

Modified:
  sword/trunk/PKGBUILD

--+
 PKGBUILD |   53 +
 1 file changed, 37 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-27 11:17:20 UTC (rev 124669)
+++ PKGBUILD2014-12-27 11:31:55 UTC (rev 124670)
@@ -7,37 +7,58 @@
 # Contributor: TripleE eric1...@yahoo.com
 # Contributor: Dominic Tubach
 
-pkgname=sword
+pkgbase=sword
+pkgname=(sword python-sword python2-sword)
 _mainver=1.7
 pkgver=$_mainver.4
-pkgrel=1
+pkgrel=2
 pkgdesc=Library for Bible study programs
 arch=('x86_64' 'i686')
 url=http://www.crosswire.org/sword/;
 license=('GPL')
-depends=('curl' 'clucene' 'swig')
-makedepends=('cmake')
-backup=('etc/sword.conf')
-source=(http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v$_mainver/$pkgname-$pkgver.tar.gz;)
+makedepends=('curl' 'clucene' 'swig' 'cmake' 'python' 'python2')
+source=(http://www.crosswire.org/ftpmirror/pub/$pkgbase/source/v$_mainver/$pkgbase-$pkgver.tar.gz;)
 md5sums=('1677f02a86cbf07713d4e1d4c39791e6')
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i 's/OPTIONS=--without-conf/#OPTIONS=--without-conf/' usrinst.sh
-  sed -i 's/OPTIONS=--disable-shared/#OPTIONS=--disable-shared/' usrinst.sh
+  cd $srcdir/$pkgbase-$pkgver
+  mkdir build
 }
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgbase-$pkgver/build
+  
+  #./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc
+  cmake .. -DLIBSWORD_LIBRARY_TYPE=Shared -DSYSCONF_INSTALL_DIR='/etc' \
+   -DSWORD_BUILD_TESTS=Yes -DSWORD_BINDINGS=Python 
-DCMAKE_INSTALL_PREFIX=/usr
+  make
 
-  ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc
-  make
+  cp -a bindings/swig/python bindings/swig/python2
+  cd bindings/swig/python2
+  python2 setup.py build
 }
 
-package() {
-  cd $srcdir/$pkgname-$pkgver
+package_sword() {
+  depends=('curl' 'clucene' 'swig')
+  backup=('etc/sword.conf')
 
+  cd $srcdir/$pkgbase-$pkgver/build
   make DESTDIR=$pkgdir install
-  mkdir --parents $pkgdir/etc
-  make DESTDIR=$pkgdir install_config
+
+  # Move it into a separated package
+  rm -r $pkgdir/usr/lib/python3.4
 }
+
+package_python-sword() {
+  depends=('sword' 'python')
+
+  cd $srcdir/$pkgbase-$pkgver/build/bindings/swig/python
+  python setup.py install --root=$pkgdir --prefix=/usr -O1 --skip-build
+}
+
+package_python2-sword() {
+  depends=('sword' 'python2')
+
+  cd $srcdir/$pkgbase-$pkgver/build/bindings/swig/python2
+  python2 setup.py install --root=$pkgdir --prefix=/usr -O1 --skip-build
+}