commit 7a4dc8dff1991844fa84c59c3f2cfd4f7466b3a1
Author: Jakub Bogusz <[email protected]>
Date: Sun Nov 18 08:18:10 2018 +0100
- updated to 1.3.12
- updated fix_wrong_linker_opts patch
graphite2-fix_wrong_linker_opts.patch | 23 ++++++++++++-----------
graphite2.spec | 4 ++--
2 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/graphite2.spec b/graphite2.spec
index 706b22b..719ff18 100644
--- 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.11
+Version: 1.3.12
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
http://downloads.sourceforge.net/silgraphite/%{name}-%{version}.tgz
-# Source0-md5: 9b6166dee759e2175fe7983f65bd8be2
+# Source0-md5: 75eafa40b5d2cfee852f40b42ef553f5
Patch0: %{name}-fix_wrong_linker_opts.patch
Patch1: %{name}-includes-libs-perl.patch
URL: http://graphite.sil.org/
diff --git a/graphite2-fix_wrong_linker_opts.patch
b/graphite2-fix_wrong_linker_opts.patch
index d86e379..aa48e60 100644
--- a/graphite2-fix_wrong_linker_opts.patch
+++ b/graphite2-fix_wrong_linker_opts.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- graphite2-1.3.12/src/CMakeLists.txt.orig 2018-08-15 07:38:09.000000000
+0200
++++ graphite2-1.3.12/src/CMakeLists.txt 2018-11-18 08:15:12.590957323
+0100
+@@ -105,11 +105,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"
@@ -13,15 +13,16 @@
if (CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-Wdouble-promotion)
endif (CMAKE_COMPILER_IS_GNUCXX)
-@@ -128,11 +124,6 @@
+@@ -119,12 +115,6 @@
+ endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
- else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
-- if (GRAPHITE2_ASAN)
+- else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+- if (GRAPHITE2_SANITIZERS)
- target_link_libraries(graphite2 c gcc_s)
-- else (GRAPHITE2_ASAN)
+- else ()
- target_link_libraries(graphite2 c gcc)
-- endif (GRAPHITE2_ASAN)
- include(Graphite)
- if (BUILD_SHARED_LIBS)
- nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+- endif ()
+ endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+ include(Graphite)
+ if (BUILD_SHARED_LIBS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/graphite2.git/commitdiff/7a4dc8dff1991844fa84c59c3f2cfd4f7466b3a1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
