mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
sword, bump version (#3211)
This commit is contained in:
Schrijvers Luc
committed by
waddlesplash
waddlesplash
parent
b80a983d15
commit
c8b849ef33
58
app-text/sword/patches/sword-1.8.1.patchset
Normal file
58
app-text/sword/patches/sword-1.8.1.patchset
Normal file
@@ -0,0 +1,58 @@
|
||||
From 084171902d1eddf16f0941d8b07b508c2f56a35e Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sat, 29 Dec 2018 12:30:33 +0100
|
||||
Subject: fix path for the sword.conf file
|
||||
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 3083f4c..352673c 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -61,7 +61,7 @@ am__make_running_with_option = \
|
||||
test $$has_opt = yes
|
||||
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
||||
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
||||
-pkgdatadir = $(datadir)/@PACKAGE@
|
||||
+pkgdatadir = $(datadir)
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
pkglibexecdir = $(libexecdir)/@PACKAGE@
|
||||
--
|
||||
2.19.1
|
||||
|
||||
|
||||
From c849ceac02a1009dea7bb12afd80fd4634d05bf4 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Fri, 25 Jan 2019 14:00:57 +0100
|
||||
Subject: fix check for cppunit
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index b062979..8b22419 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -16723,7 +16723,7 @@ IFS=$as_save_IFS
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
-CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG
|
||||
+CPPUNIT_CONFIG=`$PKG_CONFIG cppunit --modversion`
|
||||
if test -n "$CPPUNIT_CONFIG"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5
|
||||
$as_echo "$CPPUNIT_CONFIG" >&6; }
|
||||
@@ -16741,9 +16741,9 @@ $as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; }
|
||||
if test "$CPPUNIT_CONFIG" = "no" ; then
|
||||
no_cppunit=yes
|
||||
else
|
||||
- CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
|
||||
- CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
|
||||
- cppunit_version=`$CPPUNIT_CONFIG --version`
|
||||
+ CPPUNIT_CFLAGS=`$PKG_CONFIG cppunit --cflags`
|
||||
+ CPPUNIT_LIBS=`$PKG_CONFIG cppunit --libs`
|
||||
+ cppunit_version=`$PKG_CONFIG cppunit --version`
|
||||
|
||||
cppunit_major_version=`echo $cppunit_version | \
|
||||
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@@ -1,84 +0,0 @@
|
||||
SUMMARY="The biblical text research engine"
|
||||
DESCRIPTION="The SWORD Project is the CrossWire Bible Society's free Bible \
|
||||
software project. Its purpose is to create cross-platform open-source tools-- \
|
||||
covered by the GNU General Public License-- that allow programmers and Bible \
|
||||
societies to write new Bible software more quickly and easily. We also create \
|
||||
Bible study software for all readers, students, scholars, and translators of \
|
||||
the Bible, and have a growing collection of over 200 texts in over 50 languages."
|
||||
HOMEPAGE="http://www.crosswire.org/sword"
|
||||
COPYRIGHT="1998-2014 CrossWire Bible Society"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
SOURCE_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-1.7.4.tar.gz"
|
||||
CHECKSUM_SHA256="995da8cf5a207c1f09809bf4b9db0bd7d267da5fcdb9d6666c9b313edd9d213d"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
sword$secondaryArchSuffix = $portVersion
|
||||
cmd:diatheke$secondaryArchSuffix = $portVersion
|
||||
cmd:imp2gbs$secondaryArchSuffix = $portVersion
|
||||
cmd:imp2ld$secondaryArchSuffix = $portVersion
|
||||
cmd:imp2vs$secondaryArchSuffix = $portVersion
|
||||
cmd:installmgr$secondaryArchSuffix = $portVersion
|
||||
cmd:mkfastmod$secondaryArchSuffix = $portVersion
|
||||
cmd:mod2imp$secondaryArchSuffix = $portVersion
|
||||
cmd:mod2osis$secondaryArchSuffix = $portVersion
|
||||
cmd:mod2vpl$secondaryArchSuffix = $portVersion
|
||||
cmd:mod2zmod$secondaryArchSuffix = $portVersion
|
||||
cmd:osis2mod$secondaryArchSuffix = $portVersion
|
||||
cmd:tei2mod$secondaryArchSuffix = $portVersion
|
||||
cmd:vpl2mod$secondaryArchSuffix = $portVersion
|
||||
cmd:vs2osisref$secondaryArchSuffix = $portVersion
|
||||
cmd:vs2osisreftxt$secondaryArchSuffix = $portVersion
|
||||
cmd:xml2gbs$secondaryArchSuffix = $portVersion
|
||||
lib:libsword$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
sword${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libsword$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES_devel="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
sword$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:awk
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make $jobArgs install
|
||||
|
||||
prepareInstalledDevelLibs \
|
||||
libsword
|
||||
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
@@ -6,18 +6,22 @@ societies to write new Bible software more quickly and easily. We also create \
|
||||
Bible study software for all readers, students, scholars, and translators of \
|
||||
the Bible, and have a growing collection of over 200 texts in over 50 languages."
|
||||
HOMEPAGE="http://www.crosswire.org/sword"
|
||||
COPYRIGHT="1998-2014 CrossWire Bible Society"
|
||||
COPYRIGHT="1998-2018 CrossWire Bible Society"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="3"
|
||||
SOURCE_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-1.7.3.tar.gz"
|
||||
CHECKSUM_SHA256="5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v${portVersion%.*}/sword-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="ce9aa8f721a737f406115d35ff438bd07c829fce1605f0d6dcdabc4318bc5e93"
|
||||
PATCHES="sword-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="settings/sword.conf auto-merge"
|
||||
|
||||
PROVIDES="
|
||||
sword$secondaryArchSuffix = $portVersion
|
||||
cmd:diatheke$secondaryArchSuffix = $portVersion
|
||||
cmd:emptyvss$secondaryArchSuffix = $portVersion
|
||||
cmd:imp2gbs$secondaryArchSuffix = $portVersion
|
||||
cmd:imp2ld$secondaryArchSuffix = $portVersion
|
||||
cmd:imp2vs$secondaryArchSuffix = $portVersion
|
||||
@@ -28,41 +32,51 @@ PROVIDES="
|
||||
cmd:mod2vpl$secondaryArchSuffix = $portVersion
|
||||
cmd:mod2zmod$secondaryArchSuffix = $portVersion
|
||||
cmd:osis2mod$secondaryArchSuffix = $portVersion
|
||||
cmd:stripaccents$secondaryArchSuffix = $portVersion
|
||||
cmd:tei2mod$secondaryArchSuffix = $portVersion
|
||||
cmd:vpl2mod$secondaryArchSuffix = $portVersion
|
||||
cmd:vs2osisref$secondaryArchSuffix = $portVersion
|
||||
cmd:vs2osisreftxt$secondaryArchSuffix = $portVersion
|
||||
cmd:xml2gbs$secondaryArchSuffix = $portVersion
|
||||
lib:libsword$secondaryArchSuffix = $portVersion
|
||||
lib:libsword$secondaryArchSuffix
|
||||
lib:libsword_$portVersion$secondaryArchSuffix
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
icu$secondaryArchSuffix
|
||||
# lib:libcppunit$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libclucene_core$secondaryArchSuffix
|
||||
lib:libnghttp2$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
sword${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libsword$secondaryArchSuffix = $portVersion
|
||||
devel:libsword$secondaryArchSuffix
|
||||
devel:libsword_$portVersion$secondaryArchSuffix
|
||||
"
|
||||
REQUIRES_devel="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
sword$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
icu${secondaryArchSuffix}_devel
|
||||
devel:libcppunit$secondaryArchSuffix
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libclucene_core$secondaryArchSuffix
|
||||
devel:libnghttp2$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:awk
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:cppunit_config$secondaryArchSuffix
|
||||
cmd:icu_config$secondaryArchSuffix
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
@@ -70,17 +84,25 @@ BUILD_PREREQUIRES="
|
||||
|
||||
BUILD()
|
||||
{
|
||||
runConfigure ./configure --without-conf --without-clucene
|
||||
#chmod +x ./configure
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make $jobArgs install
|
||||
make install
|
||||
|
||||
prepareInstalledDevelLibs \
|
||||
libsword
|
||||
rm -f "$libDir"/libsword.la
|
||||
|
||||
prepareInstalledDevelLibs libsword libsword-$portVersion
|
||||
fixPkgconfig
|
||||
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
"$developDir"
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
Reference in New Issue
Block a user