commit c2eb0666d05db26389ca4610ab380e9f60be4841
Author: Jakub Bogusz <[email protected]>
Date: Tue May 9 18:46:04 2017 +0200
- updated to 1.3.10
- updated fix_wrong_linker_opts patch; also drop forcing SSE+SSE2 on x86
- old silgraphite library seems no longer used in tests
graphite2-fix_wrong_linker_opts.patch | 21 ++++++++++++++++++---
graphite2.spec | 5 ++---
2 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/graphite2.spec b/graphite2.spec
index 738219e..7c83b25 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.9
+Version: 1.3.10
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
http://downloads.sourceforge.net/silgraphite/%{name}-%{version}.tgz
-# Source0-md5: 17e6a3b1a88c100c9e3fc0763c85d269
+# Source0-md5: b39d5ed21195f8b709bcee548c87e2b5
Patch0: %{name}-fix_wrong_linker_opts.patch
Patch1: %{name}-includes-libs-perl.patch
URL: http://graphite.sil.org/
@@ -17,7 +17,6 @@ BuildRequires: pkgconfig
BuildRequires: freetype-devel >= 2
BuildRequires: glib2-devel >= 2.0
BuildRequires: libicu-devel
-BuildRequires: silgraphite-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
diff --git a/graphite2-fix_wrong_linker_opts.patch
b/graphite2-fix_wrong_linker_opts.patch
index f9d9eb7..e56fb30 100644
--- a/graphite2-fix_wrong_linker_opts.patch
+++ b/graphite2-fix_wrong_linker_opts.patch
@@ -1,12 +1,27 @@
---- graphite2-1.3.1/src/CMakeLists.txt.orig 2015-09-05 14:35:43.749986744
+0200
-+++ graphite2-1.3.1/src/CMakeLists.txt 2015-09-05 14:48:30.546621231 +0200
-@@ -110,8 +110,7 @@
+--- 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 @@
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}"
- LINKER_LANGUAGE C)
+- if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
+- add_definitions(-mfpmath=sse -msse2)
+- endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
+ )
if (CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-Wdouble-promotion)
endif (CMAKE_COMPILER_IS_GNUCXX)
+@@ -124,11 +120,6 @@
+ if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+ target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
+ else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+- if (GRAPHITE2_ASAN)
+- target_link_libraries(graphite2 c gcc_s)
+- else (GRAPHITE2_ASAN)
+- target_link_libraries(graphite2 c gcc)
+- endif (GRAPHITE2_ASAN)
+ include(Graphite)
+ nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+ endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/graphite2.git/commitdiff/c2eb0666d05db26389ca4610ab380e9f60be4841
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
