For discussion of Alpine Linux development and developer support

3 2

[alpine-devel] [PATCH] testing/sword: update to 1.7.4

Isaac Dunham
Details
Message ID
<1420138255-1952-1-git-send-email-ibid.ag@gmail.com>
Sender timestamp
1420138255
DKIM signature
missing
Download raw message
Patch: +9 -30
---
 testing/sword/01-corediatheke.patch | 18 ------------------
 testing/sword/APKBUILD              | 21 +++++++++------------
 2 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 testing/sword/01-corediatheke.patch

diff --git a/testing/sword/01-corediatheke.patch b/testing/sword/01-corediatheke.patch
deleted file mode 100644
index 1db160b..0000000
--- a/testing/sword/01-corediatheke.patch
@@ -1,18 +0,0 @@
-diff --git a/utilities/diatheke/corediatheke.cpp b/utilities/diatheke/corediatheke.cpp
-index 6e05e7c..c2b6efb 100644
---- a/utilities/diatheke/corediatheke.cpp
-+++ b/utilities/diatheke/corediatheke.cpp
-@@ -454,7 +454,6 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
- 						if (font) { *output << "style=\"font:\""  << font << ";\" " ;}
- 						if (strcmp(modlocale,locale) !=0 ) { *output << "lang=\"" << modlocale << "\"";}
- 						*output << ">";
--					}
- 				}	
- 
- 				if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
-@@ -498,4 +497,4 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
- 		}
- 
- 	}
--
-+}
diff --git a/testing/sword/APKBUILD b/testing/sword/APKBUILD
index dd7d21c..8076876 100644
--- a/testing/sword/APKBUILD
+++ b/testing/sword/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Isaac Dunham <ibid.ag@gmail.com>
 # Maintainer: Isaac Dunham <ibid.ag@gmail.com>
 pkgname=sword
-pkgver=1.7.3
-pkgrel=2
+pkgver=1.7.4
+pkgrel=0
 pkgdesc="Library for free Bible software"
 url="http://www.crosswire.org/sword/"
 arch="all"
@@ -23,7 +23,7 @@ install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-utils"
 source="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-$pkgver.tar.gz
 	00-fflush.patch
-	01-corediatheke.patch"
+	"
 
 _builddir="$srcdir"/sword-$pkgver
 prepare() {
@@ -80,12 +80,9 @@ utils() {
 	mv usr/bin/* "$subpkgdir"/usr/bin
 }
 
-md5sums="bd2ffadaa9f92f7b6e657e323e27a028  sword-1.7.3.tar.gz
-cce51448f99b7253a502266e268386b6  00-fflush.patch
-25a3a3118835150c84471dea439e8c33  01-corediatheke.patch"
-sha256sums="5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea  sword-1.7.3.tar.gz
-4c6000d94428cb5150b7debc5a180c17e455ba718b6ef54fa937e9bb4f8c1b80  00-fflush.patch
-7ea0e188ae0d8dcfbd2833bf14d98edcfbea99eacf432c7bc5a3df59c9f72e60  01-corediatheke.patch"
-sha512sums="4805215954211584ed6b00869a31e1d317d9fa460db2d2e8c5c396f0154979949ec8b770ac8c6ff20106d8beea75d2a824c7e6b6ce5138fc3e558ab4b5614f2a  sword-1.7.3.tar.gz
-6f6c13e7d04458e73d36c114017ad9e76e04c991adb8e457a0b55ce09fcaa95f33b2c26b73c2fd28591f07b69d3d03c1db6d08676001b3a45e0b66b22cb47dc0  00-fflush.patch
-177081a73de62f798f1cd2654a7f74d5626aac11a67b110e262e74b1c0d04b1e313ddb2dfbcaf6907c405b65ef82a94fd45c64d1dda66be51138a6ed78b79df6  01-corediatheke.patch"
+md5sums="1677f02a86cbf07713d4e1d4c39791e6  sword-1.7.4.tar.gz
+cce51448f99b7253a502266e268386b6  00-fflush.patch"
+sha256sums="995da8cf5a207c1f09809bf4b9db0bd7d267da5fcdb9d6666c9b313edd9d213d  sword-1.7.4.tar.gz
+4c6000d94428cb5150b7debc5a180c17e455ba718b6ef54fa937e9bb4f8c1b80  00-fflush.patch"
+sha512sums="4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75  sword-1.7.4.tar.gz
+6f6c13e7d04458e73d36c114017ad9e76e04c991adb8e457a0b55ce09fcaa95f33b2c26b73c2fd28591f07b69d3d03c1db6d08676001b3a45e0b66b22cb47dc0  00-fflush.patch"
-- 
2.2.1



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---

[alpine-devel] Working on Xiphos package

Isaac Dunham
Details
Message ID
<20150102023138.GB3841@newbook>
In-Reply-To
<1420138255-1952-1-git-send-email-ibid.ag@gmail.com> (view parent)
Sender timestamp
1420165899
DKIM signature
missing
Download raw message
I've got another package I'd like to submit (Xiphos 4.0.0) that needs
sword 1.7.4.
So does abuild support versioned makedepends? 

Also, should I split everyhing under /usr/share off into a -common
package?

Thanks,
Isaac Dunham



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---

Re: [alpine-devel] Working on Xiphos package

Natanael Copa
Details
Message ID
<20150102163746.58e5ca51@ncopa-desktop.alpinelinux.org>
In-Reply-To
<20150102023138.GB3841@newbook> (view parent)
Sender timestamp
1420213066
DKIM signature
missing
Download raw message
On Thu, 1 Jan 2015 18:31:39 -0800
Isaac Dunham <ibid.ag@gmail.com> wrote:

> I've got another package I'd like to submit (Xiphos 4.0.0) that needs
> sword 1.7.4.
> So does abuild support versioned makedepends? 

i think not. but apk supports versioned depends though.

> 
> Also, should I split everyhing under /usr/share off into a -common
> package?

that i dont know.

-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20150106164206.22235c41@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1420138255-1952-1-git-send-email-ibid.ag@gmail.com> (view parent)
Sender timestamp
1420558926
DKIM signature
missing
Download raw message
On Thu,  1 Jan 2015 10:50:55 -0800
Isaac Dunham <ibid.ag@gmail.com> wrote:

> ---
>  testing/sword/01-corediatheke.patch | 18 ------------------
>  testing/sword/APKBUILD              | 21 +++++++++------------
>  2 files changed, 9 insertions(+), 30 deletions(-)
>  delete mode 100644 testing/sword/01-corediatheke.patch

applied. thanks!


-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---