From 8ffd78026c9bcee056738d417c176df6e36b32e8 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Wed, 8 Aug 2018 12:35:44 -0400 Subject: user/clucene: modernize, fix license --- user/clucene/APKBUILD | 25 ++++++------- ...clucene-core-2.3.3.4-install_contribs_lib.patch | 42 ---------------------- user/clucene/clucene-core-2.3.3.4-pkgconfig.patch | 12 ------- user/clucene/clucene-core-2.3.3.4-usleep.patch | 12 ------- user/clucene/install_contribs_lib.patch | 42 ++++++++++++++++++++++ user/clucene/pkgconfig.patch | 12 +++++++ user/clucene/usleep.patch | 12 +++++++ 7 files changed, 79 insertions(+), 78 deletions(-) delete mode 100644 user/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch delete mode 100644 user/clucene/clucene-core-2.3.3.4-pkgconfig.patch delete mode 100644 user/clucene/clucene-core-2.3.3.4-usleep.patch create mode 100644 user/clucene/install_contribs_lib.patch create mode 100644 user/clucene/pkgconfig.patch create mode 100644 user/clucene/usleep.patch (limited to 'user/clucene') diff --git a/user/clucene/APKBUILD b/user/clucene/APKBUILD index 784f52586..90f7a8eb7 100644 --- a/user/clucene/APKBUILD +++ b/user/clucene/APKBUILD @@ -1,3 +1,4 @@ +# Contributor: Natanael Copa # Maintainer: Max Rees pkgname=clucene pkgver=2.3.3.4 @@ -5,24 +6,24 @@ pkgrel=5 pkgdesc="A C++ port of Lucene" url="http://www.sourceforge.net/projects/clucene" arch="all" -license="LGPLv2+ or ASL 2.0" +license="(LGPL-2.1+ OR Apache-2.0) AND RSA-MD AND (LGPL-2.0+ OR Apache-2.0) AND Zlib AND Apache-2.0" depends="" depends_dev="zlib-dev boost-dev" makedepends="cmake $depends_dev" subpackages="$pkgname-dev $pkgname-contribs" source="http://downloads.sourceforge.net/clucene/clucene-core-$pkgver.tar.gz - clucene-core-2.3.3.4-pkgconfig.patch - clucene-core-2.3.3.4-install_contribs_lib.patch - clucene-core-2.3.3.4-usleep.patch - disable-threading.patch" -builddir="$srcdir/clucene-core-$pkgver" -options="" + pkgconfig.patch + install_contribs_lib.patch + usleep.patch + disable-threading.patch +" +builddir="$srcdir/$pkgname-core-$pkgver" prepare() { default_prepare cd "$builddir" - sed -ie '/ADD_SUBDIRECTORY (src\/ext)/d' \ - CMakeLists.txt + # Do not use bundled zlib or boost + sed -ie '/ADD_SUBDIRECTORY (src\/ext)/d' CMakeLists.txt rm -rf src/ext } @@ -64,7 +65,7 @@ dev() { } sha512sums="1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4 clucene-core-2.3.3.4.tar.gz -b357cb5a1c5d66219f3168724a71af3ebf5c45c752a612d3a69c170b739acc065dc17c261c3a730298ea6c637fe820637a100f73ab03d931734f80bb598fbf55 clucene-core-2.3.3.4-pkgconfig.patch -0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3 clucene-core-2.3.3.4-install_contribs_lib.patch -5de49cb5eba1f9033f28281e0e5ff0e29fe6842ea3e1cb246c12649dc12dedad15e1811b45ccc989a1b743657eb0eeb4937616aa19ec5ee482cd323f54431b99 clucene-core-2.3.3.4-usleep.patch +b357cb5a1c5d66219f3168724a71af3ebf5c45c752a612d3a69c170b739acc065dc17c261c3a730298ea6c637fe820637a100f73ab03d931734f80bb598fbf55 pkgconfig.patch +0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3 install_contribs_lib.patch +5de49cb5eba1f9033f28281e0e5ff0e29fe6842ea3e1cb246c12649dc12dedad15e1811b45ccc989a1b743657eb0eeb4937616aa19ec5ee482cd323f54431b99 usleep.patch 3ded79aed693f6de35389377eddea0b4b0bb0cafd016f6f766986297c35912b18c1e90cedb1fb1d256765abdaab05ca2999aec2fe7ae309fa75231ac94c519a9 disable-threading.patch" diff --git a/user/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch b/user/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch deleted file mode 100644 index 8fbb3c716..000000000 --- a/user/clucene/clucene-core-2.3.3.4-install_contribs_lib.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -NaurpBb clucene-core-2.3.3.4/CMakeLists.txt clucene-core-2.3.3.4-mod/CMakeLists.txt ---- clucene-core-2.3.3.4/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 -+++ clucene-core-2.3.3.4-mod/CMakeLists.txt 2011-08-16 16:56:55.968268152 +0400 -@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS ) - SET(BUILD_CONTRIBS_LIB 1) - ENDIF ( BUILD_CONTRIBS ) - IF ( BUILD_CONTRIBS_LIB ) -- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL) -+ ADD_SUBDIRECTORY (src/contribs-lib) - ENDIF ( BUILD_CONTRIBS_LIB ) - - -diff -NaurpBb clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt ---- clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 -+++ clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt 2011-08-16 17:14:13.499275499 +0400 -@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED - ) - TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs}) - -+#install public headers. -+FOREACH(file ${HEADERS}) -+ get_filename_component(apath ${file} PATH) -+ get_filename_component(aname ${file} NAME) -+ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath}) -+ IF ( NOT aname MATCHES "^_.*" ) -+ install(FILES ${file} -+ DESTINATION include/${relpath} -+ COMPONENT development) -+ ENDIF ( NOT aname MATCHES "^_.*" ) -+ENDFOREACH(file) -+ - #set properties on the libraries - SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES - VERSION ${CLUCENE_VERSION} - SOVERSION ${CLUCENE_SOVERSION} - COMPILE_DEFINITIONS_DEBUG _DEBUG - ) -+ -+#and install library -+install(TARGETS clucene-contribs-lib -+ DESTINATION ${LIB_DESTINATION} -+ COMPONENT runtime ) diff --git a/user/clucene/clucene-core-2.3.3.4-pkgconfig.patch b/user/clucene/clucene-core-2.3.3.4-pkgconfig.patch deleted file mode 100644 index aff20d7b4..000000000 --- a/user/clucene/clucene-core-2.3.3.4-pkgconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake ---- clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes 2011-03-16 19:21:07.000000000 -0500 -+++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake 2012-03-19 09:01:00.689263954 -0500 -@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i - Name: libclucene - Description: CLucene - a C++ search engine, ported from the popular Apache Lucene - Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@ --Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core --Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -+Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared -+Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@ - ~ diff --git a/user/clucene/clucene-core-2.3.3.4-usleep.patch b/user/clucene/clucene-core-2.3.3.4-usleep.patch deleted file mode 100644 index d6cbac360..000000000 --- a/user/clucene/clucene-core-2.3.3.4-usleep.patch +++ /dev/null @@ -1,12 +0,0 @@ -Add missing include needed to run tests which use usleep - ---- clucene-core-2.3.3.4/src/test/test.h 2011-03-17 00:21:07.000000000 +0000 -+++ clucene-core-2.3.3.4/src/test/test.h 2017-12-27 09:43:25.320000000 +0000 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - using namespace std; - diff --git a/user/clucene/install_contribs_lib.patch b/user/clucene/install_contribs_lib.patch new file mode 100644 index 000000000..8fbb3c716 --- /dev/null +++ b/user/clucene/install_contribs_lib.patch @@ -0,0 +1,42 @@ +diff -NaurpBb clucene-core-2.3.3.4/CMakeLists.txt clucene-core-2.3.3.4-mod/CMakeLists.txt +--- clucene-core-2.3.3.4/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 ++++ clucene-core-2.3.3.4-mod/CMakeLists.txt 2011-08-16 16:56:55.968268152 +0400 +@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS ) + SET(BUILD_CONTRIBS_LIB 1) + ENDIF ( BUILD_CONTRIBS ) + IF ( BUILD_CONTRIBS_LIB ) +- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL) ++ ADD_SUBDIRECTORY (src/contribs-lib) + ENDIF ( BUILD_CONTRIBS_LIB ) + + +diff -NaurpBb clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt +--- clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 ++++ clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt 2011-08-16 17:14:13.499275499 +0400 +@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED + ) + TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs}) + ++#install public headers. ++FOREACH(file ${HEADERS}) ++ get_filename_component(apath ${file} PATH) ++ get_filename_component(aname ${file} NAME) ++ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath}) ++ IF ( NOT aname MATCHES "^_.*" ) ++ install(FILES ${file} ++ DESTINATION include/${relpath} ++ COMPONENT development) ++ ENDIF ( NOT aname MATCHES "^_.*" ) ++ENDFOREACH(file) ++ + #set properties on the libraries + SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES + VERSION ${CLUCENE_VERSION} + SOVERSION ${CLUCENE_SOVERSION} + COMPILE_DEFINITIONS_DEBUG _DEBUG + ) ++ ++#and install library ++install(TARGETS clucene-contribs-lib ++ DESTINATION ${LIB_DESTINATION} ++ COMPONENT runtime ) diff --git a/user/clucene/pkgconfig.patch b/user/clucene/pkgconfig.patch new file mode 100644 index 000000000..aff20d7b4 --- /dev/null +++ b/user/clucene/pkgconfig.patch @@ -0,0 +1,12 @@ +diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake +--- clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes 2011-03-16 19:21:07.000000000 -0500 ++++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake 2012-03-19 09:01:00.689263954 -0500 +@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i + Name: libclucene + Description: CLucene - a C++ search engine, ported from the popular Apache Lucene + Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@ +-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core +-Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext ++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared ++Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@ + ~ diff --git a/user/clucene/usleep.patch b/user/clucene/usleep.patch new file mode 100644 index 000000000..d6cbac360 --- /dev/null +++ b/user/clucene/usleep.patch @@ -0,0 +1,12 @@ +Add missing include needed to run tests which use usleep + +--- clucene-core-2.3.3.4/src/test/test.h 2011-03-17 00:21:07.000000000 +0000 ++++ clucene-core-2.3.3.4/src/test/test.h 2017-12-27 09:43:25.320000000 +0000 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + using namespace std; + -- cgit v1.2.3-70-g09d2