Import of pkgsrc-2016Q3

graphics/graphite2/patches/patch-src_CMakeLists.txt

@@ -1,4 +1,4 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.2 2014/05/16 12:51:24 wiz Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.4 2016/02/07 01:05:11 ryoon Exp $
 
 Don't pass -nodefaultlibs to compiler or the build fails for missing
 symbols on PowerPC and possibly other platforms. I can't see any
@@ -7,23 +7,23 @@ reason why they do this at all.
 The problem is already reported to the upstream:
 http://sourceforge.net/p/silgraphite/bugs/56/
 
---- src/CMakeLists.txt.orig	2013-11-29 06:21:26.000000000 +0000
+--- src/CMakeLists.txt.orig	2016-01-15 04:17:18.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -113,7 +113,7 @@ endif (${CMAKE_BUILD_TYPE} STREQUAL "Cla
+@@ -109,7 +109,7 @@ set_target_properties(graphite2 PROPERTI
  if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
      set_target_properties(graphite2 PROPERTIES 
          COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
 -        LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" 
 +        LINK_FLAGS      "${GRAPHITE_LINK_FLAGS}" 
          LINKER_LANGUAGE C)
-     if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
-         target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
-@@ -123,28 +123,27 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
+     if (CMAKE_COMPILER_IS_GNUCXX)
+         add_definitions(-Wdouble-promotion)
+@@ -126,23 +126,17 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
          else (GRAPHITE2_ASAN)
              target_link_libraries(graphite2 c gcc)
          endif (GRAPHITE2_ASAN)
 -        include(Graphite)
-         nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+-        nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
      endif (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
      set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
 -    CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
@@ -31,23 +31,15 @@ http://sourceforge.net/p/silgraphite/bugs/56/
  
  if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
      set_target_properties(graphite2 PROPERTIES 
-         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
+         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
 -        LINK_FLAGS      "-nodefaultlibs" 
 +        LINK_FLAGS      "${GRAPHITE_LINK_FLAGS}" 
          LINKER_LANGUAGE C)
      target_link_libraries(graphite2 c)
 -    include(Graphite)
-     nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+-    nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
      set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
 -    CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
  endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
  
  if  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-     set_target_properties(graphite2 PROPERTIES 
-         COMPILE_DEFINITIONS "_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE;GRAPHITE2_EXPORTING")
-+else  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-+include(Graphite)
-+CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
- endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- 
-