diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 33 | ||||
| -rw-r--r-- | fix-cross-compile.patch | 63 |
3 files changed, 61 insertions, 40 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-xalan-c-git pkgdesc = A XSLT processor for transforming XML documents (mingw-w64) - pkgver = r2.d8240ca + pkgver = 1.12.0.r10.g58dc1ac6c pkgrel = 1 url = https://xalan.apache.org/ arch = any @@ -18,7 +18,6 @@ pkgbase = mingw-w64-xalan-c-git source = git+https://github.com/apache/xalan-c source = fix-cross-compile.patch sha256sums = SKIP - sha256sums = 08400961f038c1aed090174425e894673ffc359b52bcbad73d2c537a89ea34b7 + sha256sums = bffe4d394b877d7a36c08efd7563ce9ccde3621ae3851dc9c00ce065cd360050 pkgname = mingw-w64-xalan-c-git - @@ -1,44 +1,43 @@ # Maintainer: Patrick Northon <northon_patrick3@yahoo.ca> pkgname=mingw-w64-xalan-c-git -conflicts=("mingw-w64-xalan-c") -provides=("mingw-w64-xalan-c") -pkgver=r2.d8240ca +conflicts=('mingw-w64-xalan-c') +provides=('mingw-w64-xalan-c') +pkgver=1.12.0.r10.g58dc1ac6c pkgrel=1 -pkgdesc="A XSLT processor for transforming XML documents (mingw-w64)" +pkgdesc='A XSLT processor for transforming XML documents (mingw-w64)' arch=(any) -url="https://xalan.apache.org/" -license=("APACHE") +url='https://xalan.apache.org/' +license=('APACHE') makedepends=('mingw-w64-cmake' 'mingw-w64-wine' 'git') depends=('mingw-w64-crt' 'mingw-w64-xerces-c') options=('!strip' '!buildflags' 'staticlibs') source=("git+https://github.com/apache/xalan-c" - "fix-cross-compile.patch") + 'fix-cross-compile.patch') sha256sums=( - "SKIP" - "08400961f038c1aed090174425e894673ffc359b52bcbad73d2c537a89ea34b7") + 'SKIP' + 'bffe4d394b877d7a36c08efd7563ce9ccde3621ae3851dc9c00ce065cd360050') -_architectures="i686-w64-mingw32 x86_64-w64-mingw32" +_architectures='i686-w64-mingw32 x86_64-w64-mingw32' pkgver() { - cd "${_repo}" + cd "xalan-c" ( set -o pipefail - git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' || + git describe --long 2>/dev/null | sed 's/^Xalan.C_//;s/_/./g;s/\([^-]*-g\)/r\1/;s/-/./g' || printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" ) } prepare() { - cd "xalan-c" - git apply "../fix-cross-compile.patch" - sed -i -r "s/_MSC_VER/_WIN32/" "src/xalanc/XalanExe/XalanExe.cpp" + cd 'xalan-c' + patch -uNp1 < '../fix-cross-compile.patch' } build() { - _flags=( -Wno-dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG" -Ddoxygen=OFF ) + _flags=( -Wno-dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE='-O2 -DNDEBUG' -Ddoxygen=OFF ) for _arch in ${_architectures}; do - ${_arch}-cmake -S "xalan-c" -B "build-${_arch}" "${_flags[@]}" + ${_arch}-cmake -S 'xalan-c' -B "build-${_arch}" "${_flags[@]}" cmake --build "build-${_arch}" done } diff --git a/fix-cross-compile.patch b/fix-cross-compile.patch index efb234e50896..f5394782505e 100644 --- a/fix-cross-compile.patch +++ b/fix-cross-compile.patch @@ -1,5 +1,5 @@ diff --git a/src/xalanc/Include/XalanVersion.hpp.in b/src/xalanc/Include/XalanVersion.hpp.in -index d0a7d971..63911ede 100644 +index d0a7d9719..63911ede3 100644 --- a/src/xalanc/Include/XalanVersion.hpp.in +++ b/src/xalanc/Include/XalanVersion.hpp.in @@ -26,11 +26,11 @@ @@ -18,33 +18,56 @@ index d0a7d971..63911ede 100644 /** * Xalan-C++ version represented as a single integer value. diff --git a/src/xalanc/Utils/CMakeLists.txt b/src/xalanc/Utils/CMakeLists.txt -index dc39ad0c..78b61601 100644 +index dc39ad0c8..e104cd310 100644 --- a/src/xalanc/Utils/CMakeLists.txt +++ b/src/xalanc/Utils/CMakeLists.txt -@@ -41,13 +41,22 @@ add_custom_target(locale ALL) +@@ -17,35 +17,37 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-set(GEN_SUPPORTDIR "${PROJECT_BINARY_DIR}/src/xalanc/PlatformSupport") ++cmake_path(APPEND PROJECT_BINARY_DIR "src" "xalanc" "PlatformSupport" OUTPUT_VARIABLE GEN_SUPPORTDIR) + file(MAKE_DIRECTORY "${GEN_SUPPORTDIR}") + +-set(XSL_NLS_SRC_DIR "${PROJECT_SOURCE_DIR}/src/xalanc/NLS") +-set(XSL_NLS_BIN_DIR "${PROJECT_BINARY_DIR}/src/xalanc/NLS") +-set(XSL_NLS_INC_DIR "${PROJECT_BINARY_DIR}/src/xalanc/NLS/include") +-set(XSL_NLS_GEN_DIR "${PROJECT_BINARY_DIR}/src/xalanc/NLS/gen") ++cmake_path(APPEND PROJECT_SOURCE_DIR "src" "xalanc" "NLS" OUTPUT_VARIABLE XSL_NLS_SRC_DIR) ++cmake_path(APPEND PROJECT_BINARY_DIR "src" "xalanc" "NLS" OUTPUT_VARIABLE XSL_NLS_BIN_DIR) ++cmake_path(APPEND XSL_NLS_BIN_DIR "include" OUTPUT_VARIABLE XSL_NLS_INC_DIR) ++cmake_path(APPEND XSL_NLS_BIN_DIR "gen" OUTPUT_VARIABLE XSL_NLS_GEN_DIR) + file(MAKE_DIRECTORY "${XSL_NLS_LIB_DIR}") + file(MAKE_DIRECTORY "${XSL_NLS_GEN_DIR}") + file(MAKE_DIRECTORY "${XSL_NLS_INC_DIR}") + + set(MSGFILENAME XalanMsg_${LOCALE}) + +-set(XLIFF_FILE_NAME ${XSL_NLS_SRC_DIR}/${LOCALE}/${MSGFILENAME}.xlf) ++cmake_path(APPEND XSL_NLS_SRC_DIR "${LOCALE}" "${MSGFILENAME}.xlf" OUTPUT_VARIABLE XLIFF_FILE_NAME) + +-set(GENMSGINDEX "${XSL_NLS_GEN_DIR}/LocalMsgIndex.hpp") +-set(GENMSGDATA "${XSL_NLS_GEN_DIR}/LocalMsgData.hpp") +-set(INCLUDEMSGDATA "${XSL_NLS_INC_DIR}/LocalMsgData.hpp") +-set(SUPPORTMSGINDEX "${GEN_SUPPORTDIR}/LocalMsgIndex.hpp") ++cmake_path(APPEND XSL_NLS_GEN_DIR "LocalMsgIndex.hpp" OUTPUT_VARIABLE GENMSGINDEX) ++cmake_path(APPEND XSL_NLS_GEN_DIR "LocalMsgData.hpp" OUTPUT_VARIABLE GENMSGDATA) ++cmake_path(APPEND XSL_NLS_INC_DIR "LocalMsgData.hpp" OUTPUT_VARIABLE INCLUDEMSGDATA) ++cmake_path(APPEND GEN_SUPPORTDIR "LocalMsgIndex.hpp" OUTPUT_VARIABLE SUPPORTMSGINDEX) + + add_custom_target(locale ALL) set_target_properties(locale PROPERTIES FOLDER "Message Library") if(msgloader STREQUAL "inmemory") -+ set(MsgCreatorCommandFilename "${XLIFF_FILE_NAME}") -+ set(MsgCreatorCommand "$<TARGET_FILE:MsgCreator>" -TYPE inmem -LOCALE ${LOCALE}) -+ -+ if(CMAKE_CROSSCOMPILING_EMULATOR) -+ set(MsgCreatorCommand "${CMAKE_CROSSCOMPILING_EMULATOR}" "${MsgCreatorCommand}") -+ if(WIN32) -+ set(MsgCreatorCommandFilename "Z:${MsgCreatorCommandFilename}") -+ endif() -+ endif() -+ -+ set(MsgCreatorCommand "${MsgCreatorCommand}" "${MsgCreatorCommandFilename}") -+ ++ cmake_path(RELATIVE_PATH XLIFF_FILE_NAME BASE_DIRECTORY "${XSL_NLS_GEN_DIR}" OUTPUT_VARIABLE XLIFF_RELPATH) ++ add_custom_command( OUTPUT "${GENMSGINDEX}" "${GENMSGDATA}" - COMMAND "$<TARGET_FILE:MsgCreator>" - "${XLIFF_FILE_NAME}" -- -TYPE inmem -- -LOCALE ${LOCALE} -+ COMMAND ${MsgCreatorCommand} ++ COMMAND MsgCreator ++ "${XLIFF_RELPATH}" + -TYPE inmem + -LOCALE ${LOCALE} WORKING_DIRECTORY "${XSL_NLS_GEN_DIR}" - COMMENT "Generating inmemory locale message data" - DEPENDS MsgCreator "${XLIFF_FILE_NAME}") |