Attachment 170994 Details for Bug 210006 – the patch

[patch] the patch

pugixml-1.7.diff (text/plain), 3.36 KB, created by Yakov Galka on 2016-06-03 23:19:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yakov Galka

Created: 2016-06-03 23:19:41 UTC

Size: 3.36 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 416336)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	pugixml
>-PORTVERSION=	1.6
>+PORTVERSION=	1.7
> PORTREVISION=	1
> CATEGORIES=	textproc
> MASTER_SITES=	http://github.com/zeux/pugixml/releases/download/v${PORTVERSION}/
>Index: distinfo
>===================================================================
>--- distinfo	(revision 416336)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (pugixml-1.6.tar.gz) = 473705c496d45ee6a74f73622b175dfb5dde0de372c4dc61a5acb964516cd9de
>-SIZE (pugixml-1.6.tar.gz) = 346616
>+SHA256 (pugixml-1.7.tar.gz) = fbe10d46f61d769f7d92a296102e4e2bd3ee16130f11c5b10a1aae590ea1f5ca
>+SIZE (pugixml-1.7.tar.gz) = 354472
>Index: files/patch-scripts_CMakeLists.txt
>===================================================================
>--- files/patch-scripts_CMakeLists.txt	(revision 416336)
>+++ files/patch-scripts_CMakeLists.txt	(working copy)
>@@ -1,18 +1,23 @@
>---- scripts/CMakeLists.txt.orig	2015-03-25 03:19:09 UTC
>-+++ scripts/CMakeLists.txt
>-@@ -16,19 +16,16 @@ if(DEFINED BUILD_DEFINES)
>- 	add_definitions(${BUILD_DEFINES})
>+--- scripts/CMakeLists.txt.orig	2015-10-19 06:15:50.000000000 +0300
>++++ scripts/CMakeLists.txt	2016-06-04 00:25:19.436479000 +0300
>+@@ -19,11 +19,8 @@
>+ 	endforeach()
>  endif()
>  
> -if(BUILD_SHARED_LIBS)
>--    add_library(pugixml SHARED ${SOURCES})
>+-	add_library(pugixml SHARED ${SOURCES})
> -else()
>--    add_library(pugixml STATIC ${SOURCES})
>+-	add_library(pugixml STATIC ${SOURCES})
> -endif()
> +add_library(pugixml SHARED ${SOURCES})
> +add_library(pugixml_static STATIC ${SOURCES})
>  
>- set_target_properties(pugixml PROPERTIES VERSION 1.6 SOVERSION 1)
>+ # Enable C++11 long long for compilers that are capable of it
>+ if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1)
>+@@ -31,15 +28,15 @@
>+ endif()
>+ 
>+ set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1)
> +set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml)
>  
> -install(TARGETS pugixml EXPORT pugixml-config 
>@@ -24,3 +29,6 @@
>  
>  install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
> -install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
>+ 
>+ if(BUILD_TESTS)
>+ 	file(GLOB TEST_SOURCES ../tests/*.cpp)
>Index: files/patch-src_pugiconfig.hpp
>===================================================================
>--- files/patch-src_pugiconfig.hpp	(revision 416336)
>+++ files/patch-src_pugiconfig.hpp	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/pugiconfig.hpp.orig	2015-08-18 17:07:06 UTC
>-+++ src/pugiconfig.hpp
>-@@ -41,7 +41,7 @@
>- // #define PUGIXML_HEADER_ONLY
>- 
>- // Uncomment this to enable long long support
>--// #define PUGIXML_HAS_LONG_LONG
>-+#define PUGIXML_HAS_LONG_LONG
>- 
>- #endif
>- 
>
>Property changes on: files/patch-src_pugiconfig.hpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 416336)
>+++ pkg-plist	(working copy)
>@@ -3,4 +3,4 @@
> lib/libpugixml.a
> lib/libpugixml.so
> lib/libpugixml.so.1
>-lib/libpugixml.so.1.6
>+lib/libpugixml.so.1.7

Actions: View | Diff

Attachments on bug 210006: 170994 | 171622