Add proper striping and patch for mingw.

3 files changed, 66 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1acbb433b093..197ef091a7f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-xalan-c-icu
 	pkgdesc = A XSLT processor for transforming XML documents (ICU) (mingw-w64)
 	pkgver = 1.12.0
-	pkgrel = 5
+	pkgrel = 6
 	url = https://xalan.apache.org/
 	arch = any
 	license = APACHE
@@ -18,8 +18,9 @@ pkgbase = mingw-w64-xalan-c-icu
 	options = staticlibs
 	source = https://github.com/apache/xalan-c/archive/Xalan-C_1_12_0.tar.gz
 	source = fix-cross-compile.patch
+	source = https://github.com/apache/xalan-c/pull/36.patch
 	sha256sums = f3d4f23af7f7914259f2f5dbd9cc1450d3ebe0b8c8163fd50fcac4a39c63fccd
-	sha256sums = 67ab886be3737b39816ab4b7cead15077fcd4808f5d991747343d8485013642a
+	sha256sums = bffe4d394b877d7a36c08efd7563ce9ccde3621ae3851dc9c00ce065cd360050
+	sha256sums = ed5a03ffecb0476aa02e90aba99f12d843bfd90748481d7b1ffc6d524bf4d952
 
 pkgname = mingw-w64-xalan-c-icu
-
diff --git a/PKGBUILD b/PKGBUILD
index b62adc8597f3..1ef48ac1b61b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,36 @@
 # Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
 
 pkgname=mingw-w64-xalan-c-icu
-provides=("mingw-w64-xalan-c")
-conflicts=("mingw-w64-xalan-c")
+provides=('mingw-w64-xalan-c')
+conflicts=('mingw-w64-xalan-c')
 pkgver=1.12.0
-pkgrel=5
-_filever="1_12_0"
-pkgdesc="A XSLT processor for transforming XML documents (ICU) (mingw-w64)"
-arch=("any")
-url="https://xalan.apache.org/"
-license=("APACHE")
+pkgrel=6
+_filever='1_12_0'
+pkgdesc='A XSLT processor for transforming XML documents (ICU) (mingw-w64)'
+arch=('any')
+url='https://xalan.apache.org/'
+license=('APACHE')
 makedepends=('mingw-w64-cmake' 'mingw-w64-wine' 'git')
 depends=('mingw-w64-crt' 'mingw-w64-xerces-c-icu' 'mingw-w64-icu')
 options=('!strip' '!buildflags' 'staticlibs')
 source=("https://github.com/apache/xalan-c/archive/Xalan-C_${_filever}.tar.gz"
-        "fix-cross-compile.patch")
+        'fix-cross-compile.patch'
+				'https://github.com/apache/xalan-c/pull/36.patch')
 sha256sums=(
-	"f3d4f23af7f7914259f2f5dbd9cc1450d3ebe0b8c8163fd50fcac4a39c63fccd"
-	"67ab886be3737b39816ab4b7cead15077fcd4808f5d991747343d8485013642a")
+	'f3d4f23af7f7914259f2f5dbd9cc1450d3ebe0b8c8163fd50fcac4a39c63fccd'
+	'bffe4d394b877d7a36c08efd7563ce9ccde3621ae3851dc9c00ce065cd360050'
+	'ed5a03ffecb0476aa02e90aba99f12d843bfd90748481d7b1ffc6d524bf4d952')
 
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 prepare() {
 	cd "xalan-c-Xalan-C_${_filever}"
-	patch -uNp1 < "../fix-cross-compile.patch"
-	sed -i -r "s/_MSC_VER/_WIN32/" "src/xalanc/XalanExe/XalanExe.cpp"
+	patch -uNp1 < '../fix-cross-compile.patch'
+	patch -uNp1 < '../36.patch'
 }
 
 build() {
-	_flags=( -Wno-dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG" -Dtranscoder=icu -Ddoxygen=OFF )
+	_flags=( -Wno-dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE='-O2 -DNDEBUG' -Dtranscoder=icu -Ddoxygen=OFF )
 	
 	for _arch in ${_architectures}; do
 		${_arch}-cmake -S "xalan-c-Xalan-C_${_filever}" -B "build-${_arch}" "${_flags[@]}"
@@ -39,6 +41,8 @@ build() {
 package() {
 	for _arch in ${_architectures}; do
 		DESTDIR="${pkgdir}" cmake --install "build-${_arch}"
+		${_arch}-strip "$pkgdir"/usr/${_arch}/bin/*.exe
 		${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+		${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
 	done
 }
diff --git a/fix-cross-compile.patch b/fix-cross-compile.patch
index 95218c07ffa7..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 d0a7d97..63911ed 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 d0a7d97..63911ed 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 dc39ad0..78b6160 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}")