package/tinyxml2: bump version to 3.0.0

Remove patches as they were applied upstream:

0001-Use-BUILD_SHARED_LIBS-cmake-standard.patch
https://github.com/leethomason/tinyxml2/commit/c8ec6fcab4eb501cc5bd328c19dcbd4b30722d52

0002-Rename-test-fixed-cmake-warning.patch
https://github.com/leethomason/tinyxml2/commit/0b2c22bd46be95b08f234b8b4cb262f72ab3f0e8

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.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
deleted file mode 100644 (file)
index 52288c5..0000000
--- a/package/tinyxml2/0001-Use-BUILD_SHARED_LIBS-cmake-standard.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 69acf13fa679628259063c4d0cd17e59b8bb0b75 Mon Sep 17 00:00:00 2001
-From: xantares <xantares09@hotmail.com>
-Date: Fri, 14 Nov 2014 19:40:58 +0100
-Subject: [PATCH] Use BUILD_SHARED_LIBS cmake standard.
-
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- CMakeLists.txt | 27 +++++++++------------------
- 1 file changed, 9 insertions(+), 18 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 91c61a4..4375bb9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,8 +10,8 @@ include(GNUInstallDirs)
- ################################\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")\r
-+set(GENERIC_LIB_SOVERSION "2")\r
- \r
- \r
- ################################\r
-@@ -46,12 +46,8 @@ endif(MSVC)
- \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)\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
deleted file mode 100644 (file)
index 409269a..0000000
--- a/package/tinyxml2/0002-Rename-test-fixed-cmake-warning.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 77631a9cf500a578338a83bc230c419bf2a05b50 Mon Sep 17 00:00:00 2001
-From: xantares <xantares09@hotmail.com>
-Date: Fri, 14 Nov 2014 19:46:18 +0100
-Subject: [PATCH] Rename test, fixed cmake warning.
-
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- CMakeLists.txt | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4375bb9..4a8f91d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,10 +53,10 @@ set_target_properties(tinyxml2 PROPERTIES
-       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)\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
-

diff --git a/package/tinyxml2/tinyxml2.hash b/package/tinyxml2/tinyxml2.hash
index f6064df9cd14e8d74903d1c1a50f43904a5b9903..acbee0931a4b91e2b0e05943b8e9dede4edd17ee 100644 (file)
--- a/package/tinyxml2/tinyxml2.hash
+++ b/package/tinyxml2/tinyxml2.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 f891224f32e7a06bf279290619cec80cc8ddc335c13696872195ffb87f5bce67  tinyxml2-2.2.0.tar.gz
+sha256 128aa1553e88403833e0cccf1b651f45ce87bc207871f53fdcc8e7f9ec795747 tinyxml2-3.0.0.tar.gz

diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk
index 370049b916d145208e6fef25baf4d1278a364230..053e46eaf8dbcd906164280dec7c4ea6cd2aa88a 100644 (file)
--- a/package/tinyxml2/tinyxml2.mk
+++ b/package/tinyxml2/tinyxml2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TINYXML2_VERSION = 2.2.0
+TINYXML2_VERSION = 3.0.0
 TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION))
 TINYXML2_LICENSE = zlib
 TINYXML2_LICENSE_FILES = readme.md