Merge remote-tracking branch 'upstream/master'

2016-07-18 22:21:51 +09:00
parent 8cda0ac541 30851cd302
commit 2fa9166f8f
5 changed files with 217 additions and 6 deletions
--- a/mingw-w64-clucene/PKGBUILD
+++ b/mingw-w64-clucene/PKGBUILD
@@ -0,0 +1,43 @@
+# Maintainer: Diego Sogari <diego.sogari@gmail.com>
+
+_realname=clucene
+pkgbase=mingw-w64-${_realname}
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
+pkgver=2.3.3.4
+pkgrel=1
+pkgdesc="CLucene - a C++ search engine (mingw-w64)"
+arch=('any')
+url="http://clucene.sourceforge.net/"
+license=('LGPL')
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake")
+depends=("${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-zlib")
+source=("http://liquidtelecom.dl.sourceforge.net/project/${_realname}/${_realname}-core-unstable/${pkgver:0:3}/${_realname}-core-${pkgver}.tar.gz"
+        "${_realname}-core-${pkgver}.patch")
+sha256sums=('ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab'
+            'a3b0bb664231ed5e66384dd606422d7f6d9f0e6181f295056acfbe0b0d4d7c9c')
+
+prepare() {
+  cd "${srcdir}/${_realname}-core-${pkgver}"
+  patch -Np1 -i "../${_realname}-core-${pkgver}.patch"
+}
+
+build() {
+  rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  mkdir "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MINGW_CHOST}"
+
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+  ${MINGW_PREFIX}/bin/cmake.exe \
+    -G"MSYS Makefiles" \
+    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    -DBUILD_STATIC_LIBRARIES=ON \
+    -DCMAKE_BUILD_TYPE=Release \
+    "../${_realname}-core-${pkgver}"
+
+  make
+}
+
+package() {
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  make DESTDIR="${pkgdir}" install
+}
--- a/mingw-w64-clucene/clucene-core-2.3.3.4.patch
+++ b/mingw-w64-clucene/clucene-core-2.3.3.4.patch
@@ -0,0 +1,168 @@
+diff -c -r clucene-core-2.3.3.4.orig/src/core/CMakeLists.txt clucene-core-2.3.3.4/src/core/CMakeLists.txt
+*** clucene-core-2.3.3.4.orig/src/core/CMakeLists.txt	2011-03-16 21:21:07.000000000 -0300
+--- clucene-core-2.3.3.4/src/core/CMakeLists.txt	2016-07-18 07:03:30.941376500 -0300
+***************
+*** 209,214 ****
+--- 209,215 ----
+  	)
+  	
+  	SET_TARGET_PROPERTIES(clucene-core-static PROPERTIES
+         OUTPUT_NAME clucene-core
+  	    VERSION ${CLUCENE_VERSION}
+  	    SOVERSION ${CLUCENE_SOVERSION}
+  	    COMPILE_DEFINITIONS_DEBUG _DEBUG
+***************
+*** 252,265 ****
+      set(CLUCENE_SOVERSION ${CLUCENE_SOVERSION})
+  ")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake"
+!         DESTINATION ${LIB_DESTINATION}/CLuceneConfig.cmake)
+  
+  # install pkg-config file
+! IF(NOT WIN32)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libclucene-core.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libclucene-core.pc @ONLY)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libclucene-core.pc
+            DESTINATION ${LIB_DESTINATION}/pkgconfig )
+! ENDIF(NOT WIN32)
+  
+  
+  #install non system-independent
+--- 253,266 ----
+      set(CLUCENE_SOVERSION ${CLUCENE_SOVERSION})
+  ")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake"
+!         DESTINATION ${LIB_DESTINATION}/cmake/CLucene)
+  
+  # install pkg-config file
+! IF(NOT WIN32 OR MINGW)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libclucene-core.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libclucene-core.pc @ONLY)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libclucene-core.pc
+            DESTINATION ${LIB_DESTINATION}/pkgconfig )
+! ENDIF(NOT WIN32 OR MINGW)
+  
+  
+  #install non system-independent
+***************
+*** 267,286 ****
+      install(FILES ${clucene-shared_BINARY_DIR}/CLucene/clucene-config.h 
+              DESTINATION ${LUCENE_SYS_INCLUDES}/CLucene  
+              COMPONENT development)
+-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake 
+-             DESTINATION ${LUCENE_SYS_INCLUDES}/CLucene  
+-             COMPONENT development)
+  ELSE ( LUCENE_SYS_INCLUDES )
+      install(FILES ${clucene-shared_BINARY_DIR}/CLucene/clucene-config.h 
+              DESTINATION include/CLucene
+              COMPONENT development)
+-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CLuceneConfig.cmake 
+-             DESTINATION include/CLucene
+-             COMPONENT development)
+  ENDIF ( LUCENE_SYS_INCLUDES )
+  
+  
+  #and install library
+! install(TARGETS clucene-core 
+!         DESTINATION ${LIB_DESTINATION}  
+          COMPONENT runtime )
+--- 268,283 ----
+      install(FILES ${clucene-shared_BINARY_DIR}/CLucene/clucene-config.h 
+              DESTINATION ${LUCENE_SYS_INCLUDES}/CLucene  
+              COMPONENT development)
+  ELSE ( LUCENE_SYS_INCLUDES )
+      install(FILES ${clucene-shared_BINARY_DIR}/CLucene/clucene-config.h 
+              DESTINATION include/CLucene
+              COMPONENT development)
+  ENDIF ( LUCENE_SYS_INCLUDES )
+  
+  
+  #and install library
+! install(TARGETS clucene-core
+!         LIBRARY DESTINATION ${LIB_DESTINATION}
+!         ARCHIVE DESTINATION ${LIB_DESTINATION}
+!         RUNTIME DESTINATION bin
+          COMPONENT runtime )
+diff -c -r clucene-core-2.3.3.4.orig/src/shared/CMakeLists.txt clucene-core-2.3.3.4/src/shared/CMakeLists.txt
+*** clucene-core-2.3.3.4.orig/src/shared/CMakeLists.txt	2011-03-16 21:21:07.000000000 -0300
+--- clucene-core-2.3.3.4/src/shared/CMakeLists.txt	2016-07-18 07:03:30.957003100 -0300
+***************
+*** 147,153 ****
+  CHOOSE_FUNCTION(_mkdir "_mkdir((const char*)0)" "#define _mkdir(x) mkdir(x,0777)")
+  CHOOSE_FUNCTION(SLEEPFUNCTION "usleep;Sleep(0);_sleep")
+  
+! CHOOSE_FUNCTION(_snprintf "snprintf;_snprintf")
+  CHOOSE_FUNCTION(_snwprintf "snwprintf;_snwprintf")
+  
+  ########################################################################
+--- 147,153 ----
+  CHOOSE_FUNCTION(_mkdir "_mkdir((const char*)0)" "#define _mkdir(x) mkdir(x,0777)")
+  CHOOSE_FUNCTION(SLEEPFUNCTION "usleep;Sleep(0);_sleep")
+  
+! #CHOOSE_FUNCTION(_snprintf "snprintf;_snprintf")
+  CHOOSE_FUNCTION(_snwprintf "snwprintf;_snwprintf")
+  
+  ########################################################################
+***************
+*** 211,219 ****
+  ########################################################################
+  
+  #check for pthreads
+! IF ( CMAKE_USE_WIN32_THREADS_INIT )
+      SET ( _CL_HAVE_WIN32_THREADS 1 )
+! ENDIF ( CMAKE_USE_WIN32_THREADS_INIT )
+  IF ( CMAKE_USE_PTHREADS_INIT )
+      SET ( _CL_HAVE_PTHREAD 1 )
+  ENDIF (CMAKE_USE_PTHREADS_INIT)
+--- 211,219 ----
+  ########################################################################
+  
+  #check for pthreads
+! IF ( CMAKE_USE_WIN32_THREADS_INIT AND NOT MINGW )
+      SET ( _CL_HAVE_WIN32_THREADS 1 )
+! ENDIF ( CMAKE_USE_WIN32_THREADS_INIT AND NOT MINGW )
+  IF ( CMAKE_USE_PTHREADS_INIT )
+      SET ( _CL_HAVE_PTHREAD 1 )
+  ENDIF (CMAKE_USE_PTHREADS_INIT)
+***************
+*** 339,346 ****
+    TARGET_LINK_LIBRARIES(clucene-shared ${EXTRA_LIBS})
+  ENDIF ( EXTRA_LIBS )
+  
+! install(TARGETS clucene-shared 
+!         DESTINATION ${LIB_DESTINATION} 
+          COMPONENT development )
+  
+  IF ( BUILD_STATIC_LIBRARIES )
+--- 339,348 ----
+    TARGET_LINK_LIBRARIES(clucene-shared ${EXTRA_LIBS})
+  ENDIF ( EXTRA_LIBS )
+  
+! install(TARGETS clucene-shared
+!         LIBRARY DESTINATION ${LIB_DESTINATION}
+!         ARCHIVE DESTINATION ${LIB_DESTINATION}
+!         RUNTIME DESTINATION bin
+          COMPONENT development )
+  
+  IF ( BUILD_STATIC_LIBRARIES )
+***************
+*** 349,354 ****
+--- 351,357 ----
+  	)
+  	
+  	SET_TARGET_PROPERTIES(clucene-shared-static PROPERTIES
+         OUTPUT_NAME clucene-shared
+  	    VERSION ${CLUCENE_VERSION}
+  	    SOVERSION ${CLUCENE_SOVERSION}
+  	    COMPILE_DEFINITIONS_DEBUG _DEBUG
+diff -c -r clucene-core-2.3.3.4.orig/src/test/search/TestIndexSearcher.cpp clucene-core-2.3.3.4/src/test/search/TestIndexSearcher.cpp
+*** clucene-core-2.3.3.4.orig/src/test/search/TestIndexSearcher.cpp	2011-03-16 21:21:07.000000000 -0300
+--- clucene-core-2.3.3.4/src/test/search/TestIndexSearcher.cpp	2016-07-18 07:03:30.957003100 -0300
+***************
+*** 5,10 ****
+--- 5,11 ----
+  * the GNU Lesser General Public License, as specified in the COPYING file.
+  ------------------------------------------------------------------------------*/
+  #include "test.h"
+ #include <unistd.h>
+  
+  DEFINE_MUTEX(searchMutex);
+  DEFINE_CONDITION(searchCondition);
--- a/mingw-w64-python-et-xmlfile/PKGBUILD
+++ b/mingw-w64-python-et-xmlfile/PKGBUILD
@@ -43,7 +43,7 @@ package_python3-et-xmlfile() {
  cd ${srcdir}/et_xmlfile-${pkgver}
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 ${srcdir}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
+  install -Dm644 ${srcdir}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }

 package_python2-et-xmlfile() {
@@ -54,7 +54,7 @@ package_python2-et-xmlfile() {
  cd ${srcdir}/et_xmlfile-${pkgver}-py2
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 ${srcdir}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
+  install -Dm644 ${srcdir}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }

 package_mingw-w64-i686-python2-et-xmlfile() {
--- a/mingw-w64-python-jdcal/PKGBUILD
+++ b/mingw-w64-python-jdcal/PKGBUILD
@@ -40,7 +40,7 @@ package_python3-jdcal() {
  cd ${srcdir}/${_realname}-${pkgver}
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
+  install -Dm644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }

 package_python2-jdcal() {
@@ -51,7 +51,7 @@ package_python2-jdcal() {
  cd ${srcdir}/${_realname}-${pkgver}-py2
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
+  install -Dm644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }

 package_mingw-w64-i686-python2-jdcal() {
--- a/mingw-w64-python-openpyxl/PKGBUILD
+++ b/mingw-w64-python-openpyxl/PKGBUILD
@@ -54,7 +54,7 @@ package_python3-openpyxl() {
  cd ${srcdir}/${_realname}-${pkgver}
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 ${srcdir}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
+  install -Dm644 ${srcdir}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python-3${_realname}/LICENSE
 }

 package_python2-openpyxl() {
@@ -66,7 +66,7 @@ package_python2-openpyxl() {
  cd ${srcdir}/${_realname}-${pkgver}
  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
  ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 ${srcdir}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE
+  install -Dm644 ${srcdir}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }

 package_mingw-w64-i686-python2-openpyxl() {