From ad6c116184b345846b7bd42746d7b4d47871ab05 Mon Sep 17 00:00:00 2001 From: Chloe Kudryavtsev Date: Mon, 6 May 2019 21:58:46 -0400 Subject: main/graphite2: upgrade to 1.3.13, update - Updates package to latest version - Fixes bugs.a.o#10329 - Remakes patch to apply cleanly - Updates license to SPDX - Removes empty variables --- main/graphite2/cmake.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main/graphite2/cmake.patch') diff --git a/main/graphite2/cmake.patch b/main/graphite2/cmake.patch index 87f4dc9813..2b21d6b09f 100644 --- a/main/graphite2/cmake.patch +++ b/main/graphite2/cmake.patch @@ -1,5 +1,5 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 89a59af..b69e244 100644 +index b6ac26b..0371b0c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -120,11 +120,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") @@ -12,10 +12,10 @@ index 89a59af..b69e244 100644 - target_link_libraries(graphite2 c gcc) - endif () + target_link_libraries(graphite2 c gcc_s -lssp_nonshared) - endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*") + endif() include(Graphite) if (BUILD_SHARED_LIBS) -@@ -153,4 +149,4 @@ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") +@@ -156,4 +152,4 @@ endif() install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin) -- cgit v1.2.3