- updated to 1.3.11

- updated fix_wrong_linker_opts patch

diff --git a/graphite2-fix_wrong_linker_opts.patch b/graphite2-fix_wrong_linker_opts.patch
index e56fb305e5fda8181d60b8113aaeb41e762e9cd6..d86e379258e47d591890b539bd9fb5485fec2dcd 100644 (file)
--- a/graphite2-fix_wrong_linker_opts.patch
+++ b/graphite2-fix_wrong_linker_opts.patch
@@ -1,10 +1,10 @@
---- graphite2-1.3.10/src/CMakeLists.txt.orig   2017-05-09 18:14:22.142733949 +0200
-+++ graphite2-1.3.10/src/CMakeLists.txt        2017-05-09 18:27:36.209391572 +0200
-@@ -109,11 +109,7 @@
+--- graphite2-1.3.11/src/CMakeLists.txt.orig   2018-03-05 05:05:42.000000000 +0100
++++ graphite2-1.3.11/src/CMakeLists.txt        2018-07-13 16:19:07.098260443 +0200
+@@ -113,11 +113,7 @@
  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}" 
+     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"
+-        LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
 -        LINKER_LANGUAGE C)
 -    if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
 -        add_definitions(-mfpmath=sse -msse2)
@@ -13,7 +13,7 @@
      if (CMAKE_COMPILER_IS_GNUCXX)
          add_definitions(-Wdouble-promotion)
      endif (CMAKE_COMPILER_IS_GNUCXX)
-@@ -124,11 +120,6 @@
+@@ -128,11 +124,6 @@
      if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
          target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
      else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
@@ -23,5 +23,5 @@
 -            target_link_libraries(graphite2 c gcc)
 -        endif (GRAPHITE2_ASAN)
          include(Graphite)
-         nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
-     endif (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+         if (BUILD_SHARED_LIBS)
+             nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)

diff --git a/graphite2.spec b/graphite2.spec
index 7c83b25a39a8c944d681a244c69d0c60fa1d225d..706b22b5d7af8f24ef2d106a9c99940881512b7a 100644 (file)
--- a/graphite2.spec
+++ b/graphite2.spec
@@ -1,12 +1,12 @@
 Summary:       Font rendering capabilities for complex non-Roman writing systems
 Summary(pl.UTF-8):     Wsparcie renderowania złożonych systemów pisma nierzymskiego
 Name:          graphite2
-Version:       1.3.10
+Version:       1.3.11
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/silgraphite/%{name}-%{version}.tgz
-# Source0-md5: b39d5ed21195f8b709bcee548c87e2b5
+# Source0-md5: 9b6166dee759e2175fe7983f65bd8be2
 Patch0:                %{name}-fix_wrong_linker_opts.patch
 Patch1:                %{name}-includes-libs-perl.patch
 URL:           http://graphite.sil.org/