Date: Friday, January 20, 2023 @ 01:46:13
  Author: blakkheim
Revision: 1387062

minor cmake cleanup, add maintainer line

Modified:
  sword/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-01-20 01:27:56 UTC (rev 1387061)
+++ PKGBUILD    2023-01-20 01:46:13 UTC (rev 1387062)
@@ -1,5 +1,6 @@
 # Maintainer: Felix Yan <[email protected]>
 # Maintainer: Caleb Maclennan <[email protected]>
+# Maintainer: T.J. Townsend <[email protected]>
 # Contributor: SanskritFritz (gmail)
 # Contributor: Alexander Rødseth
 # Contributor: Andrea Scarpino
@@ -20,21 +21,20 @@
 
source=("https://www.crosswire.org/ftpmirror/pub/$pkgbase/source/v$_mainver/$pkgbase-$pkgver.tar.gz";)
 
sha512sums=('9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f')
 
-prepare() {
-  cd $pkgbase-$pkgver
-  mkdir build
-}
-
 build() {
-  cd $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_PYTHON_3=TRUE 
-DCMAKE_INSTALL_PREFIX=/usr
-  make
+  cmake -B build -S $pkgbase-$pkgver \
+      -DCMAKE_BUILD_TYPE='None' \
+      -DLIBSWORD_LIBRARY_TYPE="Shared" \
+      -DSYSCONF_INSTALL_DIR='/etc' \
+      -DSWORD_BUILD_TESTS="Yes" \
+      -DSWORD_PYTHON_3=TRUE \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -Wno-dev
+  cmake --build build
 }
 
 package_sword() {
@@ -41,13 +41,12 @@
   depends=('curl' 'clucene' 'xz')
   backup=('etc/sword.conf')
 
-  cd $pkgbase-$pkgver/build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }
 
 package_python-sword() {
   depends=('sword' 'python')
 
-  cd $pkgbase-$pkgver/build/bindings/swig/python3
+  cd build/bindings/swig/python3
   python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build
 }

Reply via email to