tinyxml2: fix line-endings of patches

This commit fixes the line endings of the tinyxml2 patches added in
commits 22f5be171c6f9bb2611e7b87197e9faeabcaab18 and
0fa452df185545d3781b3015195bee9431496b5d. Thanks to Romain Naour for
providing the correct version of the patches.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/tinyxml2/0001-Use-BUILD_SHARED_LIBS-cmake-standard.patch b/package/tinyxml2/0001-Use-BUILD_SHARED_LIBS-cmake-standard.patch
index fec1abe7fe7f54fc66616a5fee55297893c2101e..52288c509f9cb037fd21b079754386d3f0d3937f 100644 (file)
--- a/package/tinyxml2/0001-Use-BUILD_SHARED_LIBS-cmake-standard.patch
+++ b/package/tinyxml2/0001-Use-BUILD_SHARED_LIBS-cmake-standard.patch
@@ -13,53 +13,53 @@ index 91c61a4..4375bb9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -10,8 +10,8 @@ include(GNUInstallDirs)
- ################################
- # set lib version here
- 
+ ################################\r
+ # set lib version here\r
+ \r
 -set(GENERIC_LIB_VERSION "2.2.0")
 -set(GENERIC_LIB_SOVERSION "2")
-+set(GENERIC_LIB_VERSION "2.2.0")
-+set(GENERIC_LIB_SOVERSION "2")
- 
- 
- ################################
++set(GENERIC_LIB_VERSION "2.2.0")\r
++set(GENERIC_LIB_SOVERSION "2")\r
+ \r
+ \r
+ ################################\r
 @@ -46,12 +46,8 @@ endif(MSVC)
- 
- ################################
- # Add targets
--set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libraries")
--if(BUILD_STATIC_LIBS)
--      add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h)
--      set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2)
--endif(BUILD_STATIC_LIBS)
--add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h)
-+option(BUILD_SHARED_LIBS "build shared or static libraries" ON)
-+add_library(tinyxml2 tinyxml2.cpp tinyxml2.h)
- set_target_properties(tinyxml2 PROPERTIES
-         COMPILE_DEFINITIONS "TINYXML2_EXPORT"
-       VERSION "${GENERIC_LIB_VERSION}"
+ \r
+ ################################\r
+ # Add targets\r
+-set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libraries")\r
+-if(BUILD_STATIC_LIBS)\r
+-      add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h)\r
+-      set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2)\r
+-endif(BUILD_STATIC_LIBS)\r
+-add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h)\r
++option(BUILD_SHARED_LIBS "build shared or static libraries" ON)\r
++add_library(tinyxml2 tinyxml2.cpp tinyxml2.h)\r
+ set_target_properties(tinyxml2 PROPERTIES\r
+         COMPILE_DEFINITIONS "TINYXML2_EXPORT"\r
+       VERSION "${GENERIC_LIB_VERSION}"\r
 @@ -63,16 +59,11 @@ add_dependencies(test ${TARGET_DATA_COPY})
- target_link_libraries(test tinyxml2)
- 
- 
--if(BUILD_STATIC_LIBS)
--      install(TARGETS tinyxml2 tinyxml2static
--              RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--else(BUILD_STATIC_LIBS)
--      install(TARGETS tinyxml2
--              RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
--endif(BUILD_STATIC_LIBS)
-+install(TARGETS tinyxml2
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+
- install(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- foreach(p LIB INCLUDE)
+ target_link_libraries(test tinyxml2)\r
+ \r
+ \r
+-if(BUILD_STATIC_LIBS)\r
+-      install(TARGETS tinyxml2 tinyxml2static\r
+-              RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}\r
+-              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}\r
+-              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})\r
+-else(BUILD_STATIC_LIBS)\r
+-      install(TARGETS tinyxml2\r
+-              RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}\r
+-              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})\r
+-endif(BUILD_STATIC_LIBS)\r
++install(TARGETS tinyxml2\r
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}\r
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}\r
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})\r
++\r
+ install(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})\r
+ \r
+ foreach(p LIB INCLUDE)\r
 -- 
 1.9.3
 

diff --git a/package/tinyxml2/0002-Rename-test-fixed-cmake-warning.patch b/package/tinyxml2/0002-Rename-test-fixed-cmake-warning.patch
index b712f68e78726cf6050a91d0c73b37a9c274da72..409269ac4b8fca72b72b0ae4683ccd72f376c71f 100644 (file)
--- a/package/tinyxml2/0002-Rename-test-fixed-cmake-warning.patch
+++ b/package/tinyxml2/0002-Rename-test-fixed-cmake-warning.patch
@@ -13,26 +13,26 @@ index 4375bb9..4a8f91d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -53,10 +53,10 @@ set_target_properties(tinyxml2 PROPERTIES
-       VERSION "${GENERIC_LIB_VERSION}"
-       SOVERSION "${GENERIC_LIB_SOVERSION}")
- 
--add_executable(test xmltest.cpp)
--add_dependencies(test tinyxml2)
--add_dependencies(test ${TARGET_DATA_COPY})
--target_link_libraries(test tinyxml2)
-+add_executable(xmltest xmltest.cpp)
-+add_dependencies(xmltest tinyxml2)
-+add_dependencies(xmltest ${TARGET_DATA_COPY})
-+target_link_libraries(xmltest tinyxml2)
- 
- 
- install(TARGETS tinyxml2
+       VERSION "${GENERIC_LIB_VERSION}"\r
+       SOVERSION "${GENERIC_LIB_SOVERSION}")\r
+ \r
+-add_executable(test xmltest.cpp)\r
+-add_dependencies(test tinyxml2)\r
+-add_dependencies(test ${TARGET_DATA_COPY})\r
+-target_link_libraries(test tinyxml2)\r
++add_executable(xmltest xmltest.cpp)\r
++add_dependencies(xmltest tinyxml2)\r
++add_dependencies(xmltest ${TARGET_DATA_COPY})\r
++target_link_libraries(xmltest tinyxml2)\r
+ \r
+ \r
+ install(TARGETS tinyxml2\r
 @@ -76,4 +76,4 @@ endforeach()
- configure_file(tinyxml2.pc.in tinyxml2.pc @ONLY)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- 
--#add_test(test ${SAMPLE_NAME} COMMAND $<TARGET_FILE:${SAMPLE_NAME}>)
-+#add_test(xmltest ${SAMPLE_NAME} COMMAND $<TARGET_FILE:${SAMPLE_NAME}>)
+ configure_file(tinyxml2.pc.in tinyxml2.pc @ONLY)\r
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)\r
+ \r
+-#add_test(test ${SAMPLE_NAME} COMMAND $<TARGET_FILE:${SAMPLE_NAME}>)\r
++#add_test(xmltest ${SAMPLE_NAME} COMMAND $<TARGET_FILE:${SAMPLE_NAME}>)\r
 -- 
 1.9.3