Skip to content

Commit cbcd118

Browse files
committed
removed old patch files
1 parent 895bb73 commit cbcd118

6 files changed

+4
-174
lines changed

contrib/CMakeLists.txt

+4-23
Original file line numberDiff line numberDiff line change
@@ -52,38 +52,19 @@ IF(COMPILE_LIBXML2)
5252
ENDIF(COMPILE_LIBXML2)
5353

5454
IF(ENABLE_XMLSEC AND COMPILE_XMLSEC)
55-
IF(COMPILE_LIBXSLT)
56-
IF(DOWNLOAD)
57-
SET(URL ftp://xmlsoft.org/libxml2/)
58-
ENDIF()
59-
EXTERNALPROJECT_ADD(
60-
03_XSLT
61-
URL ${URL}/libxslt-1.1.28.tar.gz
62-
BUILD_IN_SOURCE 1
63-
PATCH_COMMAND patch -d <SOURCE_DIR> -p0 -t -N < ${PROJECT_SOURCE_DIR}/contrib/libxslt-1.1.26.patch
64-
CONFIGURE_COMMAND ${CONFIGURE} ${PREFIX_ARG} ${AUTO_CFLAGS} ${AUTO_CXXFLAGS} ${AUTO_LDFLAGS}
65-
--disable-dependency-tracking --enable-static=yes --enable-shared=no
66-
--with-libxml-prefix=${PREFIX}
67-
--with-libxml-include-prefix=${PREFIX}/include/libxml2
68-
--with-libxml-libs-prefix=${PREFIX}/lib
69-
BUILD_COMMAND ${MAKE} -f <SOURCE_DIR>/Makefile
70-
INSTALL_COMMAND ${INSTALL}
71-
)
72-
ENDIF(COMPILE_LIBXSLT)
73-
7455
IF(DOWNLOAD)
7556
SET(URL http://www.aleksey.com/xmlsec/download)
7657
ENDIF()
7758
IF(WIN32)
78-
SET(XURL ${URL}/xmlsec1-1.2.18.tar.gz)
59+
SET(URL ${URL}/xmlsec1-1.2.18.tar.gz)
7960
ELSE()
80-
SET(XURL ${URL}/xmlsec1-1.2.19.tar.gz)
61+
SET(URL ${URL}/xmlsec1-1.2.20.tar.gz)
8162
ENDIF()
8263
EXTERNALPROJECT_ADD(
8364
06_XMLSEC1
84-
URL ${XURL}
65+
URL ${URL}
8566
BUILD_IN_SOURCE 1
86-
PATCH_COMMAND patch -d <SOURCE_DIR> -p0 -t -N < ${PROJECT_SOURCE_DIR}/contrib/xmlsec1-1.1.29.patch
67+
PATCH_COMMAND patch -d <SOURCE_DIR> -p0 -t -N < ${PROJECT_SOURCE_DIR}/contrib/xmlsec1-1.2.20.patch
8768
CONFIGURE_COMMAND ${CONFIGURE} ${PREFIX_ARG} ${AUTO_CFLAGS} ${AUTO_CXXFLAGS} ${AUTO_LDFLAGS}
8869
--enable-pkgconfig=no
8970
--disable-dependency-tracking --enable-static=yes --enable-shared=no

contrib/libxslt-1.1.26.patch

-16
This file was deleted.

contrib/openjpeg_v1_4.patch

-80
This file was deleted.

contrib/openssl-0.9.8r.patch

-53
This file was deleted.
File renamed without changes.

toolchains/win32.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ ENDIF()
1919
INCLUDE_DIRECTORIES(${SYSROOT_PATH}/include/libxml2)
2020

2121
IF(ENABLE_XMLSEC)
22-
# INCLUDE_DIRECTORIES(${SYSROOT_PATH}/include/libxslt)
2322
INCLUDE_DIRECTORIES(${SYSROOT_PATH}/include/xmlsec1)
2423
SET(COMPILE_XMLSEC 1)
2524
SET(LIBS ${LIBS} ${LIB_DIR_SYS}/libxmlsec1-openssl.a ${LIB_DIR_SYS}/libxmlsec1.a)
2625
SET(LIBS ${LIBS} -L${LIB_DIR_SYS})
27-
#SET(LIBS ${LIBS} -L${LIB_DIR_SYS} -lxslt)
2826
ENDIF(ENABLE_XMLSEC)
2927

3028
SET(COMPILE_LIBXML2 0)

0 commit comments

Comments
 (0)