summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaawda2017-05-22 18:34:23 +0200
committerhaawda2017-05-22 18:34:23 +0200
commit0106563aaa66a91e4c0a8f1d84590b8d4f718890 (patch)
treed1f9f430792b98849a08e30530febc42f0d739a7
parentff9d14035ba9310273ba171be5a318def87a1209 (diff)
downloadaur-0106563aaa66a91e4c0a8f1d84590b8d4f718890.tar.gz
update with upstream applied patch removed
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
-rw-r--r--includes.patch26
3 files changed, 5 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b99fe641d24c..185dab6e6cc3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun May 21 22:43:25 UTC 2017
+# Mon May 22 16:34:12 UTC 2017
pkgbase = sword-svn
pkgdesc = Libraries for Bible programs - svn-version
- pkgver = 3467
+ pkgver = 3476
pkgrel = 1
url = http://www.crosswire.org/sword/
arch = i686
@@ -16,9 +16,7 @@ pkgbase = sword-svn
conflicts = sword
options = !makeflags
source = sword::svn+https://www.crosswire.org/svn/sword/trunk/
- source = includes.patch
sha256sums = SKIP
- sha256sums = 9058e7cb9383e5107efd6a52d617618d34635dbf685199f11ec5482157241b74
pkgname = sword-svn
diff --git a/PKGBUILD b/PKGBUILD
index 599be29a1358..3e2598d14c6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=sword-svn
-pkgver=3467
+pkgver=3476
pkgrel=1
pkgdesc="Libraries for Bible programs - svn-version"
arch=('i686' 'x86_64')
@@ -10,9 +10,8 @@ depends=('curl' 'clucene' 'xapian-core')
makedepends=('subversion')
provides=('sword')
conflicts=('sword')
-source=('sword::svn+https://www.crosswire.org/svn/sword/trunk/' includes.patch)
-sha256sums=('SKIP'
- '9058e7cb9383e5107efd6a52d617618d34635dbf685199f11ec5482157241b74')
+source=('sword::svn+https://www.crosswire.org/svn/sword/trunk/')
+sha256sums=('SKIP')
options=('!makeflags')
_svnmod=sword
@@ -22,11 +21,6 @@ pkgver() {
printf "%s" "${ver//[[:alpha:]]}"
}
-prepare() {
- cd "${_svnmod}"
- patch -Np0 < $srcdir/includes.patch || true
-}
-
build() {
cd "$_svnmod"
./autogen.sh
diff --git a/includes.patch b/includes.patch
deleted file mode 100644
index 3c09610e1605..000000000000
--- a/includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: include/utf8scsu.h
-===================================================================
---- include/utf8scsu.h (Revision 3463)
-+++ include/utf8scsu.h (Arbeitskopie)
-@@ -28,6 +28,7 @@
- #include <unicode/utypes.h>
- #include <unicode/ucnv.h>
- #include <unicode/uchar.h>
-+#include <unicode/unistr.h>
-
- SWORD_NAMESPACE_START
-
-Index: src/modules/filters/scsuutf8.cpp
-===================================================================
---- src/modules/filters/scsuutf8.cpp (Revision 3463)
-+++ src/modules/filters/scsuutf8.cpp (Arbeitskopie)
-@@ -31,8 +31,8 @@
-
- #include <scsuutf8.h>
- #include <swbuf.h>
-+#include <unicode/unistr.h>
-
--
- SWORD_NAMESPACE_START
-
-