* [PR PATCH] sword: update to 1.9.0, orphan.
@ 2024-09-27 20:24 thedanbob
2024-09-29 8:45 ` tranzystorekk
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: thedanbob @ 2024-09-27 20:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
There is a new pull request by thedanbob against master on the void-packages repository
https://github.com/thedanbob/void-packages sword-1.9.0
https://github.com/void-linux/void-packages/pull/52381
sword: update to 1.9.0, orphan.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52381.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sword-1.9.0-52381.patch --]
[-- Type: text/x-diff, Size: 2717 bytes --]
From 9101536c82bbaa2ce4329a480dad44340485abfe Mon Sep 17 00:00:00 2001
From: Dan Arnfield <dan@arnfield.com>
Date: Fri, 27 Sep 2024 15:20:54 -0500
Subject: [PATCH] sword: update to 1.9.0, orphan.
---
srcpkgs/sword/patches/ppc64.patch | 24 +++++++++---------------
srcpkgs/sword/template | 10 +++++-----
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/sword/patches/ppc64.patch b/srcpkgs/sword/patches/ppc64.patch
index d68587464936a8..82b98b290234d8 100644
--- a/srcpkgs/sword/patches/ppc64.patch
+++ b/srcpkgs/sword/patches/ppc64.patch
@@ -1,22 +1,16 @@
-From: Daniel Glassey <wdg@debian.org>
-Date: Sat, 3 Nov 2018 13:34:07 +0700
-Subject: powerpc64 can define __s64 differently
-
-Index: sword/include/sysdata.h
-===================================================================
--- a/include/sysdata.h
+++ b/include/sysdata.h
-@@ -42,8 +42,13 @@ typedef unsigned int __u32;
-
- #ifdef OS_ANDROID
+@@ -46,8 +46,13 @@
+ //typedef __s64 SW_s64;
+ //typedef __u64 SW_u64;
#elif defined(__GNUC__)
+ #if !defined(__SANE_USERSPACE_TYPES__) && defined(__powerpc64__)
-+ typedef __signed__ long __s64;
-+ typedef unsigned long __u64;
++ typedef __signed__ long SW_s64;
++ typedef unsigned long SW_u64;
+ #else
- __extension__ typedef __signed__ long long __s64;
- __extension__ typedef unsigned long long __u64;
+ __extension__ typedef __signed__ long long SW_s64;
+ __extension__ typedef unsigned long long SW_u64;
+ #endif
#elif defined(__BORLANDC__)
- typedef signed __int64 __s64;
- typedef unsigned __int64 __u64;
+ typedef signed __int64 SW_s64;
+ typedef unsigned __int64 SW_u64;
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 61c9de83e11066..9b932ee16c0960 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,17 +1,17 @@
# Template file for 'sword'
pkgname=sword
-version=1.8.1
-revision=11
+version=1.9.0
+revision=1
build_style=gnu-configure
configure_args="--without-conf --with-icuregex"
hostmakedepends="libtool automake pkg-config"
makedepends="icu-devel clucene-devel libcurl-devel zlib-devel"
short_desc="CrossWire Bible Society's free Bible software project"
-maintainer="Dan Arnfield <dan@arnfield.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://crosswire.org/sword/index.jsp"
-distfiles="https://crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-${version}.tar.gz"
-checksum=ce9aa8f721a737f406115d35ff438bd07c829fce1605f0d6dcdabc4318bc5e93
+distfiles="https://crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-${version}.tar.gz"
+checksum=42409cf3de2faf1108523e2c5ac0745d21f9ed2a5c78ed878ee9dcc303426b8a
CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: sword: update to 1.9.0, orphan.
2024-09-27 20:24 [PR PATCH] sword: update to 1.9.0, orphan thedanbob
@ 2024-09-29 8:45 ` tranzystorekk
2024-09-29 21:56 ` [PR PATCH] [Updated] " thedanbob
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: tranzystorekk @ 2024-09-29 8:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
New comment by tranzystorekk on void-packages repository
https://github.com/void-linux/void-packages/pull/52381#issuecomment-2381266732
Comment:
- `common/shlibs` needs to be updated with new libsword version
- `bibletime` needs a rebuild commit for the new shlib
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] sword: update to 1.9.0, orphan.
2024-09-27 20:24 [PR PATCH] sword: update to 1.9.0, orphan thedanbob
2024-09-29 8:45 ` tranzystorekk
@ 2024-09-29 21:56 ` thedanbob
2024-09-29 22:02 ` thedanbob
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: thedanbob @ 2024-09-29 21:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by thedanbob against master on the void-packages repository
https://github.com/thedanbob/void-packages sword-1.9.0
https://github.com/void-linux/void-packages/pull/52381
sword: update to 1.9.0, orphan.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52381.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sword-1.9.0-52381.patch --]
[-- Type: text/x-diff, Size: 2717 bytes --]
From 23e37d0ce5284b94c9439d0beae25c35da712456 Mon Sep 17 00:00:00 2001
From: Dan Arnfield <dan@arnfield.com>
Date: Fri, 27 Sep 2024 15:20:54 -0500
Subject: [PATCH] sword: update to 1.9.0, orphan.
---
srcpkgs/sword/patches/ppc64.patch | 24 +++++++++---------------
srcpkgs/sword/template | 10 +++++-----
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/sword/patches/ppc64.patch b/srcpkgs/sword/patches/ppc64.patch
index d68587464936a8..82b98b290234d8 100644
--- a/srcpkgs/sword/patches/ppc64.patch
+++ b/srcpkgs/sword/patches/ppc64.patch
@@ -1,22 +1,16 @@
-From: Daniel Glassey <wdg@debian.org>
-Date: Sat, 3 Nov 2018 13:34:07 +0700
-Subject: powerpc64 can define __s64 differently
-
-Index: sword/include/sysdata.h
-===================================================================
--- a/include/sysdata.h
+++ b/include/sysdata.h
-@@ -42,8 +42,13 @@ typedef unsigned int __u32;
-
- #ifdef OS_ANDROID
+@@ -46,8 +46,13 @@
+ //typedef __s64 SW_s64;
+ //typedef __u64 SW_u64;
#elif defined(__GNUC__)
+ #if !defined(__SANE_USERSPACE_TYPES__) && defined(__powerpc64__)
-+ typedef __signed__ long __s64;
-+ typedef unsigned long __u64;
++ typedef __signed__ long SW_s64;
++ typedef unsigned long SW_u64;
+ #else
- __extension__ typedef __signed__ long long __s64;
- __extension__ typedef unsigned long long __u64;
+ __extension__ typedef __signed__ long long SW_s64;
+ __extension__ typedef unsigned long long SW_u64;
+ #endif
#elif defined(__BORLANDC__)
- typedef signed __int64 __s64;
- typedef unsigned __int64 __u64;
+ typedef signed __int64 SW_s64;
+ typedef unsigned __int64 SW_u64;
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 61c9de83e11066..9b932ee16c0960 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,17 +1,17 @@
# Template file for 'sword'
pkgname=sword
-version=1.8.1
-revision=11
+version=1.9.0
+revision=1
build_style=gnu-configure
configure_args="--without-conf --with-icuregex"
hostmakedepends="libtool automake pkg-config"
makedepends="icu-devel clucene-devel libcurl-devel zlib-devel"
short_desc="CrossWire Bible Society's free Bible software project"
-maintainer="Dan Arnfield <dan@arnfield.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://crosswire.org/sword/index.jsp"
-distfiles="https://crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-${version}.tar.gz"
-checksum=ce9aa8f721a737f406115d35ff438bd07c829fce1605f0d6dcdabc4318bc5e93
+distfiles="https://crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-${version}.tar.gz"
+checksum=42409cf3de2faf1108523e2c5ac0745d21f9ed2a5c78ed878ee9dcc303426b8a
CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] sword: update to 1.9.0, orphan.
2024-09-27 20:24 [PR PATCH] sword: update to 1.9.0, orphan thedanbob
2024-09-29 8:45 ` tranzystorekk
2024-09-29 21:56 ` [PR PATCH] [Updated] " thedanbob
@ 2024-09-29 22:02 ` thedanbob
2024-09-29 22:42 ` thedanbob
2024-09-29 22:42 ` [PR PATCH] [Closed]: " thedanbob
4 siblings, 0 replies; 6+ messages in thread
From: thedanbob @ 2024-09-29 22:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by thedanbob against master on the void-packages repository
https://github.com/thedanbob/void-packages sword-1.9.0
https://github.com/void-linux/void-packages/pull/52381
sword: update to 1.9.0, orphan.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52381.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sword-1.9.0-52381.patch --]
[-- Type: text/x-diff, Size: 3703 bytes --]
From c919725676e563a0e43cebdf24bd0926941cb2cb Mon Sep 17 00:00:00 2001
From: Dan Arnfield <dan@arnfield.com>
Date: Fri, 27 Sep 2024 15:20:54 -0500
Subject: [PATCH] sword: update to 1.9.0, orphan.
---
common/shlibs | 2 +-
srcpkgs/bibletime/template | 2 +-
srcpkgs/sword/patches/ppc64.patch | 24 +++++++++---------------
srcpkgs/sword/template | 10 +++++-----
4 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e03048c75bc428..efa1808818e3b2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4192,7 +4192,7 @@ libpamtest.so.0 pam_wrapper-1.1.3_1
libopenaptx.so.0 libopenaptx-0.2.0_1
libsimavr.so.1 simavr-1.6_2
libsimavrparts.so.1 simavr-1.6_2
-libsword-1.8.1.so libsword-1.8.1_6
+libsword-1.9.0.so libsword-1.9.0_1
libgivaro.so.9 givaro-4.1.1_1
liblinbox.so.0 linbox-1.6.3_1
libpari-gmp-tls.so.8 pari-2.15.0_1
diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template
index fcff5e72752bab..5ee699b4bfcc02 100644
--- a/srcpkgs/bibletime/template
+++ b/srcpkgs/bibletime/template
@@ -4,7 +4,7 @@
# to start.
pkgname=bibletime
version=3.0
-revision=3
+revision=4
build_style=cmake
configure_args="-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=/usr/share/xsl/docbook/html/chunk.xsl
-DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=/usr/share/xsl/docbook/fo/docbook.xsl"
diff --git a/srcpkgs/sword/patches/ppc64.patch b/srcpkgs/sword/patches/ppc64.patch
index d68587464936a8..82b98b290234d8 100644
--- a/srcpkgs/sword/patches/ppc64.patch
+++ b/srcpkgs/sword/patches/ppc64.patch
@@ -1,22 +1,16 @@
-From: Daniel Glassey <wdg@debian.org>
-Date: Sat, 3 Nov 2018 13:34:07 +0700
-Subject: powerpc64 can define __s64 differently
-
-Index: sword/include/sysdata.h
-===================================================================
--- a/include/sysdata.h
+++ b/include/sysdata.h
-@@ -42,8 +42,13 @@ typedef unsigned int __u32;
-
- #ifdef OS_ANDROID
+@@ -46,8 +46,13 @@
+ //typedef __s64 SW_s64;
+ //typedef __u64 SW_u64;
#elif defined(__GNUC__)
+ #if !defined(__SANE_USERSPACE_TYPES__) && defined(__powerpc64__)
-+ typedef __signed__ long __s64;
-+ typedef unsigned long __u64;
++ typedef __signed__ long SW_s64;
++ typedef unsigned long SW_u64;
+ #else
- __extension__ typedef __signed__ long long __s64;
- __extension__ typedef unsigned long long __u64;
+ __extension__ typedef __signed__ long long SW_s64;
+ __extension__ typedef unsigned long long SW_u64;
+ #endif
#elif defined(__BORLANDC__)
- typedef signed __int64 __s64;
- typedef unsigned __int64 __u64;
+ typedef signed __int64 SW_s64;
+ typedef unsigned __int64 SW_u64;
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 61c9de83e11066..9b932ee16c0960 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,17 +1,17 @@
# Template file for 'sword'
pkgname=sword
-version=1.8.1
-revision=11
+version=1.9.0
+revision=1
build_style=gnu-configure
configure_args="--without-conf --with-icuregex"
hostmakedepends="libtool automake pkg-config"
makedepends="icu-devel clucene-devel libcurl-devel zlib-devel"
short_desc="CrossWire Bible Society's free Bible software project"
-maintainer="Dan Arnfield <dan@arnfield.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://crosswire.org/sword/index.jsp"
-distfiles="https://crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-${version}.tar.gz"
-checksum=ce9aa8f721a737f406115d35ff438bd07c829fce1605f0d6dcdabc4318bc5e93
+distfiles="https://crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-${version}.tar.gz"
+checksum=42409cf3de2faf1108523e2c5ac0745d21f9ed2a5c78ed878ee9dcc303426b8a
CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: sword: update to 1.9.0, orphan.
2024-09-27 20:24 [PR PATCH] sword: update to 1.9.0, orphan thedanbob
` (2 preceding siblings ...)
2024-09-29 22:02 ` thedanbob
@ 2024-09-29 22:42 ` thedanbob
2024-09-29 22:42 ` [PR PATCH] [Closed]: " thedanbob
4 siblings, 0 replies; 6+ messages in thread
From: thedanbob @ 2024-09-29 22:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
New comment by thedanbob on void-packages repository
https://github.com/void-linux/void-packages/pull/52381#issuecomment-2381638173
Comment:
It appears bibletime won't build against the new version. I am unable to fix this so I will open another PR to just orphan.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Closed]: sword: update to 1.9.0, orphan.
2024-09-27 20:24 [PR PATCH] sword: update to 1.9.0, orphan thedanbob
` (3 preceding siblings ...)
2024-09-29 22:42 ` thedanbob
@ 2024-09-29 22:42 ` thedanbob
4 siblings, 0 replies; 6+ messages in thread
From: thedanbob @ 2024-09-29 22:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There's a closed pull request on the void-packages repository
sword: update to 1.9.0, orphan.
https://github.com/void-linux/void-packages/pull/52381
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-09-29 22:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-27 20:24 [PR PATCH] sword: update to 1.9.0, orphan thedanbob
2024-09-29 8:45 ` tranzystorekk
2024-09-29 21:56 ` [PR PATCH] [Updated] " thedanbob
2024-09-29 22:02 ` thedanbob
2024-09-29 22:42 ` thedanbob
2024-09-29 22:42 ` [PR PATCH] [Closed]: " thedanbob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).