* [gentoo-commits] repo/gentoo:master commit in: app-text/sword/files/, app-text/sword/
@ 2016-10-25 0:44 Chris Reffett
0 siblings, 0 replies; 5+ messages in thread
From: Chris Reffett @ 2016-10-25 0:44 UTC (permalink / raw
To: gentoo-commits
commit: ea26c138a5a7b151457852959532d6ddac9f0945
Author: Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 00:42:52 2016 +0000
Commit: Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 00:43:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea26c138
app-text/sword: Add patch for building with GCC 6
Gentoo-Bug: 593818
Package-Manager: portage-2.3.2
app-text/sword/files/sword-1.7.4-gcc6.patch | 22 ++++++++++++++++++++++
app-text/sword/sword-1.7.4.ebuild | 3 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/app-text/sword/files/sword-1.7.4-gcc6.patch b/app-text/sword/files/sword-1.7.4-gcc6.patch
new file mode 100644
index 00000000..54c7967
--- /dev/null
+++ b/app-text/sword/files/sword-1.7.4-gcc6.patch
@@ -0,0 +1,22 @@
+--- sword-1.7.4/configure.ac.old 2016-09-21 18:04:55.029088352 -0400
++++ sword-1.7.4/configure.ac 2016-09-21 18:05:37.870349308 -0400
+@@ -197,7 +197,7 @@
+ fi
+
+
+-AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
++AM_CXXFLAGS="$AM_CXXFLAGS"
+
+ if test x$enable_warnings = xyes; then
+ AM_CFLAGS="$AM_CFLAGS -Werror"
+--- sword-1.7.4/configure.old 2016-09-21 18:05:05.900008373 -0400
++++ sword-1.7.4/configure 2016-09-21 18:06:03.822112657 -0400
+@@ -16793,7 +16793,7 @@
+ fi
+
+
+-AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
++AM_CXXFLAGS="$AM_CXXFLAGS"
+
+ if test x$enable_warnings = xyes; then
+ AM_CFLAGS="$AM_CFLAGS -Werror"
diff --git a/app-text/sword/sword-1.7.4.ebuild b/app-text/sword/sword-1.7.4.ebuild
index 1567283..3943b6f 100644
--- a/app-text/sword/sword-1.7.4.ebuild
+++ b/app-text/sword/sword-1.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -39,6 +39,7 @@ src_prepare() {
[Install]
DataPath=${EPREFIX}/usr/share/${PN}/
EOF
+ epatch "${FILESDIR}/${PN}-1.7.4-gcc6.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/sword/files/, app-text/sword/
@ 2017-11-14 14:04 Chris Reffett
0 siblings, 0 replies; 5+ messages in thread
From: Chris Reffett @ 2017-11-14 14:04 UTC (permalink / raw
To: gentoo-commits
commit: 35091c0e19d6bb95e53f62349a74af9ba370839c
Author: Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 14:03:20 2017 +0000
Commit: Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 14:04:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35091c0e
app-text/sword: Fix automagic dep on clucene
Gentoo-Bug: 637398
Package-Manager: Portage-2.3.14, Repoman-2.3.5
RepoMan-Options: --force
app-text/sword/files/sword-1.7.4-configure.patch | 23 ++++++++++++++++++++++
app-text/sword/metadata.xml | 3 +++
.../{sword-1.7.4.ebuild => sword-1.7.4-r1.ebuild} | 11 +++++++----
3 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/app-text/sword/files/sword-1.7.4-configure.patch b/app-text/sword/files/sword-1.7.4-configure.patch
new file mode 100644
index 00000000000..a098addcd0d
--- /dev/null
+++ b/app-text/sword/files/sword-1.7.4-configure.patch
@@ -0,0 +1,23 @@
+--- a/configure
++++ b/configure
+@@ -16893,7 +16895,7 @@
+ # ---------------------------------------------------------------------
+
+ # NOTE the $libdir hack at the end of the c[xx]flags. Apparently F16 finds that clucene is not multilib-save and places some include files in /usr/lib[64]/
++if test "x$with_clucene" != "xno"; then
+-with_clucene=no
+ if test "x$CLUCENE2_LIBS" != x; then
+ echo "clucene 2.x found - lucene searching options available"
+ AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir"
+@@ -16914,6 +16912,11 @@
+ echo "lucene searching options not available"
+ fi
+ fi
++else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5
++$as_echo "clucene manually disabled - excluding support" >&6; }
++with_clucene="no"
++fi
+
+ for ac_func in vsnprintf
+ do :
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
index dd852d82e55..fb9230654d3 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/metadata.xml
@@ -9,4 +9,7 @@ The SWORD Project is the CrossWire Bible Society's free Bible software
project. Its purpose is to create tools that allow programmers and Bible
societies to write new Bible software more quickly and easily.
</longdescription>
+<use>
+ <flag name="clucene">Use <pkg>dev-cpp/clucene</pkg> for lucene search support</flag>
+</use>
</pkgmetadata>
diff --git a/app-text/sword/sword-1.7.4.ebuild b/app-text/sword/sword-1.7.4-r1.ebuild
similarity index 90%
rename from app-text/sword/sword-1.7.4.ebuild
rename to app-text/sword/sword-1.7.4-r1.ebuild
index 2db87d10461..be1fa4a3314 100644
--- a/app-text/sword/sword-1.7.4.ebuild
+++ b/app-text/sword/sword-1.7.4-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit eutils flag-o-matic
DESCRIPTION="Library for Bible reading software"
@@ -11,11 +11,12 @@ SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos"
-IUSE="curl debug doc icu static-libs"
+IUSE="clucene curl debug doc icu static-libs"
RDEPEND="sys-libs/zlib
curl? ( net-misc/curl )
icu? ( dev-libs/icu:= )
+ clucene? ( dev-cpp/clucene )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
@@ -39,19 +40,21 @@ src_prepare() {
DataPath=${EPREFIX}/usr/share/${PN}/
EOF
epatch "${FILESDIR}/${PN}-1.7.4-gcc6.patch"
+ epatch "${FILESDIR}/${PN}-1.7.4-configure.patch"
+ eapply_user
}
src_configure() {
# TODO: Why is this here and can we remove it?
strip-flags
-
econf \
$(use_enable static-libs static) \
$(use_enable debug) \
--with-zlib \
$(use_with icu) \
--with-conf \
- $(use_with curl)
+ $(use_with curl) \
+ $(use_with clucene)
}
src_install() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/sword/files/, app-text/sword/
@ 2018-10-11 0:05 Chris Reffett
0 siblings, 0 replies; 5+ messages in thread
From: Chris Reffett @ 2018-10-11 0:05 UTC (permalink / raw
To: gentoo-commits
commit: 0a486b6ed5e7ad6dfce634d0b2dc574bed81c825
Author: Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 00:03:45 2018 +0000
Commit: Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 00:05:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a486b6e
app-text/sword: Version bump, fix ICU
Bump to 1.8.1, add patch from Fedora to fix builds with ICU >= 62
Bug: https://bugs.gentoo.org/666518
Signed-off-by: Chris Reffett <creffett <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-text/sword/Manifest | 2 +-
app-text/sword/files/sword-1.8.1-icu61.diff | 138 +++++++++++++++++++++
.../{sword-1.8.0.ebuild => sword-1.8.1.ebuild} | 3 +-
3 files changed, 141 insertions(+), 2 deletions(-)
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 739447b1e03..ed1a2c41782 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,2 +1,2 @@
DIST sword-1.7.4.tar.gz 2157882 BLAKE2B 7ed50430500ec428a125e24550a1f7d0437a0253cf4fabad4c8af452d2aa82c71c11e4a6c334ef1a95d82f14ce1cc092f3774210113e9668ba207875b3a11b20 SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
-DIST sword-1.8.0.tar.gz 2444386 BLAKE2B dd74ca409cdc3e4563ec5f0ed225556cfc3d1c89e63b41df8335b4abdd4f36b1423a2953a86105d2efe8d57c0e57065f74e74629309bab93f2a0222b9a8fcc86 SHA512 c45f3135255322a77e955297997db2529f31b397c42cc4b9474dc6ec8d329b2233b292078979de5fbf33cad4a1a607aabb66f86501072a729d68e9fc840c8c8e
+DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d SHA512 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
diff --git a/app-text/sword/files/sword-1.8.1-icu61.diff b/app-text/sword/files/sword-1.8.1-icu61.diff
new file mode 100644
index 00000000000..2129f279ddc
--- /dev/null
+++ b/app-text/sword/files/sword-1.8.1-icu61.diff
@@ -0,0 +1,138 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5cbd06a..1d3a2d2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,4 @@
+-# TODO: write FindICU (icu-config only for 2.2 and up) -- currently taken from another CMake system
+-# limit pkg-config version to >= 0.14, demo, utilities, doc, tests
++# TODO: limit pkg-config version to >= 0.14, demo, utilities, doc, tests
+ # use BUILD_SHARED_LIBS
+ # convince perl swig bindings to build properly
+ #
+@@ -13,7 +12,7 @@
+ # all posterity and eternity, wherever such transfer is possible. Where it is
+ # not, then this file is released under the GPLv2 by myself.
+ PROJECT(libsword CXX C)
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.7.0)
+ SET(SWORD_VERSION 1.8.1)
+
+ # Make sure it's an out-of-stream build
+@@ -56,7 +55,8 @@ IF(MSVC)
+ ELSE(MSVC)
+ FIND_PACKAGE(BZIP2 QUIET)
+ FIND_PACKAGE(XZ QUIET)
+- FIND_PACKAGE(ICU QUIET)
++ FIND_PACKAGE(ICU
++ COMPONENTS data i18n io uc)
+ FIND_PACKAGE(CURL QUIET)
+ ENDIF(MSVC)
+ FIND_PACKAGE(CLucene QUIET)
+@@ -237,7 +237,11 @@ ENDIF(WITH_CLUCENE)
+ IF(WITH_ICU)
+ INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS})
+ ADD_DEFINITIONS(${ICU_DEFINITIONS})
+- SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
++ MESSAGE(STATUS "ICU Version: ${ICU_VERSION}")
++ IF("${ICU_VERSION}" VERSION_GREATER "61")
++ ADD_DEFINITIONS(-DU_USING_ICU_NAMESPACE)
++ ENDIF("${ICU_VERSION}" VERSION_GREATER "61")
++ SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES})
+ ENDIF(WITH_ICU)
+ IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
+ SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY})
+diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake
+deleted file mode 100644
+index 451c2f3..0000000
+--- a/cmake/FindICU.cmake
++++ /dev/null
+@@ -1,68 +0,0 @@
+-# Finds the International Components for Unicode (ICU) Library
+-#
+-# ICU_FOUND - True if ICU found.
+-# ICU_I18N_FOUND - True if ICU's internationalization library found.
+-# ICU_INCLUDE_DIRS - Directory to include to get ICU headers
+-# Note: always include ICU headers as, e.g.,
+-# unicode/utypes.h
+-# ICU_LIBRARIES - Libraries to link against for the common ICU
+-# ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation
+-# (note: in addition to ICU_LIBRARIES)
+-
+-# Look for the header file.
+-find_path(
+- ICU_INCLUDE_DIR
+- NAMES unicode/utypes.h
+- DOC "Include directory for the ICU library")
+-mark_as_advanced(ICU_INCLUDE_DIR)
+-
+-# Look for the library.
+-find_library(
+- ICU_LIBRARY
+- NAMES icuuc cygicuuc cygicuuc32
+- DOC "Libraries to link against for the common parts of ICU")
+-mark_as_advanced(ICU_LIBRARY)
+-
+-# Copy the results to the output variables.
+-if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+- set(ICU_FOUND 1)
+- set(ICU_LIBRARIES ${ICU_LIBRARY})
+- set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
+-
+- # Look for the ICU internationalization libraries
+- find_library(
+- ICU_I18N_LIBRARY
+- NAMES icuin icui18n cygicuin cygicuin32
+- DOC "Libraries to link against for ICU internationalization")
+- if(MSVC)
+- find_library(ICU_DATA_LIBRARY
+- NAMES icudt
+- DOC "Libraries to link against for ICU data")
+- set(ICU_LIBRARIES ${ICU_LIBRARIES} ${ICU_DATA_LIBRARY})
+- endif(MSVC)
+- mark_as_advanced(ICU_I18N_LIBRARY)
+- mark_as_advanced(ICU_DATA_LIBRARY)
+- if (ICU_I18N_LIBRARY)
+- set(ICU_I18N_FOUND 1)
+- set(ICU_I18N_LIBRARIES ${ICU_I18N_LIBRARY})
+- else (ICU_I18N_LIBRARY)
+- set(ICU_I18N_FOUND 0)
+- set(ICU_I18N_LIBRARIES)
+- endif (ICU_I18N_LIBRARY)
+-else(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+- set(ICU_FOUND 0)
+- set(ICU_I18N_FOUND 0)
+- set(ICU_LIBRARIES)
+- set(ICU_I18N_LIBRARIES)
+- set(ICU_INCLUDE_DIRS)
+-endif(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+-
+-IF(ICU_FOUND)
+- IF(NOT ICU_FIND_QUIETLY)
+- MESSAGE(STATUS "ICU: Yes ${ICU_I18N_LIBRARY}")
+- ENDIF(NOT ICU_FIND_QUIETLY)
+-ELSE(ICU_FOUND)
+- IF(ICU_FIND_REQUIRED)
+- MESSAGE(FATAL_ERROR "ICU: No")
+- ENDIF(ICU_FIND_REQUIRED)
+-ENDIF(ICU_FOUND)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 30818a8..08bc573 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -75,10 +75,12 @@ ENDFOREACH(TEST ${test_PROGRAMS})
+
+ ########################################################################################
+ # The following tests require extra libraries to run
+-#
+-FOREACH(ICUTEST icutest translittest)
+- TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
+-ENDFOREACH(ICUTEST icutest translittest)
++#
++IF(WITH_ICU)
++ FOREACH(ICUTEST icutest translittest)
++ TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
++ ENDFOREACH(ICUTEST icutest translittest)
++ENDIF(WITH_ICU)
+
+ # Excluded until I know we have the tests working
+ ADD_SUBDIRECTORY(testsuite)
diff --git a/app-text/sword/sword-1.8.0.ebuild b/app-text/sword/sword-1.8.1.ebuild
similarity index 95%
rename from app-text/sword/sword-1.8.0.ebuild
rename to app-text/sword/sword-1.8.1.ebuild
index bb6ed4a2b10..1ddc808294c 100644
--- a/app-text/sword/sword-1.8.0.ebuild
+++ b/app-text/sword/sword-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,6 +40,7 @@ src_prepare() {
DataPath=${EPREFIX}/usr/share/${PN}/
EOF
eapply "${FILESDIR}/${PN}-1.7.4-configure.patch"
+ eapply "${FILESDIR}/${PN}-1.8.1-icu61.diff"
eapply_user
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/sword/files/, app-text/sword/
@ 2021-02-15 12:26 Marek Szuba
0 siblings, 0 replies; 5+ messages in thread
From: Marek Szuba @ 2021-02-15 12:26 UTC (permalink / raw
To: gentoo-commits
commit: a9f0d29be439918dd782fe4c2da932703453dddc
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 12:21:01 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 12:21:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9f0d29b
app-text/sword: remove old
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-text/sword/Manifest | 1 -
app-text/sword/files/sword-1.7.4-configure.patch | 23 ----
app-text/sword/files/sword-1.8.1-icu61.diff | 138 -----------------------
app-text/sword/sword-1.8.1-r1.ebuild | 76 -------------
4 files changed, 238 deletions(-)
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index b34d6dd958a..663e7a3de61 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,2 +1 @@
-DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d SHA512 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
DIST sword-1.9.0.tar.gz 2606652 BLAKE2B cd0fd85267c81410dc6acdc45594688ac1855a6160f5d39d38e225982e1440433fbdc75f22eee52291fcbf1ef92b8ca5a40652a98d7cafbfc9186e6d132ef236 SHA512 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f
diff --git a/app-text/sword/files/sword-1.7.4-configure.patch b/app-text/sword/files/sword-1.7.4-configure.patch
deleted file mode 100644
index a098addcd0d..00000000000
--- a/app-text/sword/files/sword-1.7.4-configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -16893,7 +16895,7 @@
- # ---------------------------------------------------------------------
-
- # NOTE the $libdir hack at the end of the c[xx]flags. Apparently F16 finds that clucene is not multilib-save and places some include files in /usr/lib[64]/
-+if test "x$with_clucene" != "xno"; then
--with_clucene=no
- if test "x$CLUCENE2_LIBS" != x; then
- echo "clucene 2.x found - lucene searching options available"
- AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir"
-@@ -16914,6 +16912,11 @@
- echo "lucene searching options not available"
- fi
- fi
-+else
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5
-+$as_echo "clucene manually disabled - excluding support" >&6; }
-+with_clucene="no"
-+fi
-
- for ac_func in vsnprintf
- do :
diff --git a/app-text/sword/files/sword-1.8.1-icu61.diff b/app-text/sword/files/sword-1.8.1-icu61.diff
deleted file mode 100644
index 2129f279ddc..00000000000
--- a/app-text/sword/files/sword-1.8.1-icu61.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5cbd06a..1d3a2d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,4 @@
--# TODO: write FindICU (icu-config only for 2.2 and up) -- currently taken from another CMake system
--# limit pkg-config version to >= 0.14, demo, utilities, doc, tests
-+# TODO: limit pkg-config version to >= 0.14, demo, utilities, doc, tests
- # use BUILD_SHARED_LIBS
- # convince perl swig bindings to build properly
- #
-@@ -13,7 +12,7 @@
- # all posterity and eternity, wherever such transfer is possible. Where it is
- # not, then this file is released under the GPLv2 by myself.
- PROJECT(libsword CXX C)
--CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.7.0)
- SET(SWORD_VERSION 1.8.1)
-
- # Make sure it's an out-of-stream build
-@@ -56,7 +55,8 @@ IF(MSVC)
- ELSE(MSVC)
- FIND_PACKAGE(BZIP2 QUIET)
- FIND_PACKAGE(XZ QUIET)
-- FIND_PACKAGE(ICU QUIET)
-+ FIND_PACKAGE(ICU
-+ COMPONENTS data i18n io uc)
- FIND_PACKAGE(CURL QUIET)
- ENDIF(MSVC)
- FIND_PACKAGE(CLucene QUIET)
-@@ -237,7 +237,11 @@ ENDIF(WITH_CLUCENE)
- IF(WITH_ICU)
- INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS})
- ADD_DEFINITIONS(${ICU_DEFINITIONS})
-- SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
-+ MESSAGE(STATUS "ICU Version: ${ICU_VERSION}")
-+ IF("${ICU_VERSION}" VERSION_GREATER "61")
-+ ADD_DEFINITIONS(-DU_USING_ICU_NAMESPACE)
-+ ENDIF("${ICU_VERSION}" VERSION_GREATER "61")
-+ SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES})
- ENDIF(WITH_ICU)
- IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
- SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY})
-diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake
-deleted file mode 100644
-index 451c2f3..0000000
---- a/cmake/FindICU.cmake
-+++ /dev/null
-@@ -1,68 +0,0 @@
--# Finds the International Components for Unicode (ICU) Library
--#
--# ICU_FOUND - True if ICU found.
--# ICU_I18N_FOUND - True if ICU's internationalization library found.
--# ICU_INCLUDE_DIRS - Directory to include to get ICU headers
--# Note: always include ICU headers as, e.g.,
--# unicode/utypes.h
--# ICU_LIBRARIES - Libraries to link against for the common ICU
--# ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation
--# (note: in addition to ICU_LIBRARIES)
--
--# Look for the header file.
--find_path(
-- ICU_INCLUDE_DIR
-- NAMES unicode/utypes.h
-- DOC "Include directory for the ICU library")
--mark_as_advanced(ICU_INCLUDE_DIR)
--
--# Look for the library.
--find_library(
-- ICU_LIBRARY
-- NAMES icuuc cygicuuc cygicuuc32
-- DOC "Libraries to link against for the common parts of ICU")
--mark_as_advanced(ICU_LIBRARY)
--
--# Copy the results to the output variables.
--if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
-- set(ICU_FOUND 1)
-- set(ICU_LIBRARIES ${ICU_LIBRARY})
-- set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
--
-- # Look for the ICU internationalization libraries
-- find_library(
-- ICU_I18N_LIBRARY
-- NAMES icuin icui18n cygicuin cygicuin32
-- DOC "Libraries to link against for ICU internationalization")
-- if(MSVC)
-- find_library(ICU_DATA_LIBRARY
-- NAMES icudt
-- DOC "Libraries to link against for ICU data")
-- set(ICU_LIBRARIES ${ICU_LIBRARIES} ${ICU_DATA_LIBRARY})
-- endif(MSVC)
-- mark_as_advanced(ICU_I18N_LIBRARY)
-- mark_as_advanced(ICU_DATA_LIBRARY)
-- if (ICU_I18N_LIBRARY)
-- set(ICU_I18N_FOUND 1)
-- set(ICU_I18N_LIBRARIES ${ICU_I18N_LIBRARY})
-- else (ICU_I18N_LIBRARY)
-- set(ICU_I18N_FOUND 0)
-- set(ICU_I18N_LIBRARIES)
-- endif (ICU_I18N_LIBRARY)
--else(ICU_INCLUDE_DIR AND ICU_LIBRARY)
-- set(ICU_FOUND 0)
-- set(ICU_I18N_FOUND 0)
-- set(ICU_LIBRARIES)
-- set(ICU_I18N_LIBRARIES)
-- set(ICU_INCLUDE_DIRS)
--endif(ICU_INCLUDE_DIR AND ICU_LIBRARY)
--
--IF(ICU_FOUND)
-- IF(NOT ICU_FIND_QUIETLY)
-- MESSAGE(STATUS "ICU: Yes ${ICU_I18N_LIBRARY}")
-- ENDIF(NOT ICU_FIND_QUIETLY)
--ELSE(ICU_FOUND)
-- IF(ICU_FIND_REQUIRED)
-- MESSAGE(FATAL_ERROR "ICU: No")
-- ENDIF(ICU_FIND_REQUIRED)
--ENDIF(ICU_FOUND)
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 30818a8..08bc573 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -75,10 +75,12 @@ ENDFOREACH(TEST ${test_PROGRAMS})
-
- ########################################################################################
- # The following tests require extra libraries to run
--#
--FOREACH(ICUTEST icutest translittest)
-- TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
--ENDFOREACH(ICUTEST icutest translittest)
-+#
-+IF(WITH_ICU)
-+ FOREACH(ICUTEST icutest translittest)
-+ TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
-+ ENDFOREACH(ICUTEST icutest translittest)
-+ENDIF(WITH_ICU)
-
- # Excluded until I know we have the tests working
- ADD_SUBDIRECTORY(testsuite)
diff --git a/app-text/sword/sword-1.8.1-r1.ebuild b/app-text/sword/sword-1.8.1-r1.ebuild
deleted file mode 100644
index 7da3c1961d4..00000000000
--- a/app-text/sword/sword-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic cmake-utils
-
-DESCRIPTION="Library for Bible reading software"
-HOMEPAGE="https://www.crosswire.org/sword/"
-SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~ppc-macos"
-IUSE="clucene curl debug doc icu static-libs"
-
-RDEPEND="sys-libs/zlib
- curl? ( net-misc/curl )
- icu? ( dev-libs/icu:= )
- clucene? ( dev-cpp/clucene )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS="AUTHORS CODINGSTYLE ChangeLog README"
-
-RESTRICT="test" #Restricting for now, see bug 313207
-
-src_prepare() {
- sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
- eapply "${FILESDIR}/${PN}-1.7.4-configure.patch"
- eapply "${FILESDIR}/${PN}-1.8.1-icu61.diff"
- eapply_user
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- # bug 618776
- append-cxxflags -std=c++14
-
- local mycmakeargs=(
- -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- -DWITH_CLUCENE=$(usex clucene)
- -DWITH_CURL=$(usex curl)
- -DWITH_ICU=$(usex icu)
- -DWITH_ZLIB=1
- )
- use static-libs && mycmakeargs+=( -DLIBSWORD_LIBRARY_TYPE=Static )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-
- if use doc; then
- rm -rf examples/.cvsignore
- rm -rf examples/cmdline/.cvsignore
- rm -rf examples/cmdline/.deps
- cp -R samples examples "${ED}"/usr/share/doc/${PF}/
- fi
-
- insinto /etc
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- elog "Check out http://www.crosswire.org/sword/modules/"
- elog "to download modules that you would like to use with SWORD."
- elog "Follow module installation instructions found on"
- elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/sword/files/, app-text/sword/
@ 2025-02-27 6:05 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2025-02-27 6:05 UTC (permalink / raw
To: gentoo-commits
commit: b1623555fbb620459bb4f894bc2710d28ca828b3
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Mon Feb 24 23:20:32 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 06:03:34 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1623555
app-text/sword: EAPI 8, add test utils, force compliance w/ useflags
update EAPI 7 -> 8
useflags:
add test
add utils (previsously enabled by default, rdep breakout checked)
rm doc (no bdep, small size)
rm debug (no action)
cmakeargs:
force compliance with useflags (SWORD_NO_*)
rm rpath
add patch to respect user's CFLAGS
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/40748
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/sword/files/sword-1.9.0-cflags.patch | 15 +++++++
app-text/sword/metadata.xml | 1 +
app-text/sword/sword-1.9.0-r2.ebuild | 60 +++++++++++++++++++++++++++
3 files changed, 76 insertions(+)
diff --git a/app-text/sword/files/sword-1.9.0-cflags.patch b/app-text/sword/files/sword-1.9.0-cflags.patch
new file mode 100644
index 000000000000..5966fe69de4d
--- /dev/null
+++ b/app-text/sword/files/sword-1.9.0-cflags.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -174,10 +174,10 @@
+ ELSE(MSVC)
+ SET(CMAKE_C_FLAGS_DEBUG "-g3 -Wall -O0 ${CMAKE_C_FLAGS}")
+ SET(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS}")
+- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g ${CMAKE_C_FLAGS}")
++ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS}")
+ SET(CMAKE_CXX_FLAGS_DEBUG "-g3 -Wall -O0 ${CMAKE_CXX_FLAGS}")
+ SET(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS}")
+- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g ${CMAKE_CXX_FLAGS}")
++ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS}")
+ ENDIF(MSVC)
+ ##############################################################################################
+ # Setting libraries and includes
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
index cc4b6313e0c0..1e5f7dd2bb68 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/metadata.xml
@@ -9,5 +9,6 @@ societies to write new Bible software more quickly and easily.
</longdescription>
<use>
<flag name="clucene">Use <pkg>dev-cpp/clucene</pkg> for lucene search support</flag>
+ <flag name="utils">CLI (diatheke) and conversion utilities for bible documents in SWORD supported formats</flag>
</use>
</pkgmetadata>
diff --git a/app-text/sword/sword-1.9.0-r2.ebuild b/app-text/sword/sword-1.9.0-r2.ebuild
new file mode 100644
index 000000000000..e64123de6e9e
--- /dev/null
+++ b/app-text/sword/sword-1.9.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="https://www.crosswire.org/sword/"
+SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
+IUSE="clucene curl icu test utils"
+REQUIRED_USE="test? ( curl icu utils )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-arch/bzip2
+ app-arch/xz-utils
+ sys-libs/zlib
+ curl? ( net-misc/curl )
+ icu? ( dev-libs/icu:= )
+ clucene? ( dev-cpp/clucene:1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9.0-cflags.patch
+)
+
+DOCS=( AUTHORS CODINGSTYLE ChangeLog README examples/ samples/ )
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH="ON"
+ # default is shared and static
+ -DLIBSWORD_LIBRARY_TYPE="Shared"
+ -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
+ -DSWORD_BUILD_TESTS=$(usex test)
+ -DSWORD_BUILD_UTILS=$(usev !utils No)
+ -DSWORD_NO_CLUCENE=$(usev !clucene Yes)
+ -DWITH_CLUCENE=$(usex clucene)
+ -DSWORD_NO_CURL=$(usev !curl Yes)
+ -DWITH_CURL=$(usex curl)
+ -DSWORD_NO_ICU=$(usev !icu Yes)
+ -DWITH_ICU=$(usex icu)
+ -DWITH_ZLIB=1
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local -x LD_LIBRARY_PATH="${BUILD_DIR}"
+ cmake_src_test
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-02-27 6:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-27 6:05 [gentoo-commits] repo/gentoo:master commit in: app-text/sword/files/, app-text/sword/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-02-15 12:26 Marek Szuba
2018-10-11 0:05 Chris Reffett
2017-11-14 14:04 Chris Reffett
2016-10-25 0:44 Chris Reffett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox