commit 6b9299a143c8b4489209d9a8eb0d9177dcc01a9f
Author: Jakub Bogusz <[email protected]>
Date: Thu Sep 19 16:09:29 2013 +0200
- updated to 1.2.3 (note: new soname)
graphite2-fix_wrong_linker_opts.patch | 20 +++++++++++---------
graphite2.spec | 7 +++----
2 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/graphite2.spec b/graphite2.spec
index 14bbc6a..ce7e16c 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.1.3
+Version: 1.2.3
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
http://downloads.sourceforge.net/silgraphite/%{name}-%{version}.tgz
-# Source0-md5: cf74634f137ce9e651ec664870611e1a
+# Source0-md5: 7042305e4208af4c2d5249d814ccce58
Patch0: %{name}-1.0.2-no_harfbuzz_tests.patch
Patch1: %{name}-fix_wrong_linker_opts.patch
Patch2: %{name}-includes-libs-perl.patch
@@ -72,8 +72,6 @@ rm -rf $RPM_BUILD_ROOT
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
-
# cmake's fake (with no dependencies); also obsoleted by pkg-config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgraphite2.la
@@ -88,6 +86,7 @@ rm -rf $RPM_BUILD_ROOT
%doc ChangeLog doc/*.txt
%attr(755,root,root) %{_bindir}/gr2fonttest
%attr(755,root,root) %{_libdir}/libgraphite2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgraphite2.so.3
%files devel
%defattr(644,root,root,755)
diff --git a/graphite2-fix_wrong_linker_opts.patch
b/graphite2-fix_wrong_linker_opts.patch
index edacd73..d898bc2 100644
--- a/graphite2-fix_wrong_linker_opts.patch
+++ b/graphite2-fix_wrong_linker_opts.patch
@@ -1,11 +1,13 @@
-diff -urN graphite2-1.0.1.old/src/CMakeLists.txt
graphite2-1.0.1/src/CMakeLists.txt
---- graphite2-1.0.1.old/src/CMakeLists.txt 2011-08-11 10:57:24.737639566
+0200
-+++ graphite2-1.0.1/src/CMakeLists.txt 2011-08-11 10:57:47.880350242 +0200
-@@ -103,7 +103,6 @@
- -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
-fdiagnostics-show-option
- -fno-rtti -fno-exceptions -nodefaultlibs
- -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector)
-- set_target_properties(graphite2 PROPERTIES LINK_FLAGS "-nodefaultlibs"
LINKER_LANGUAGE C)
+--- graphite2-1.2.3/src/CMakeLists.txt.orig 2013-09-19 15:56:06.709464013
+0200
++++ graphite2-1.2.3/src/CMakeLists.txt 2013-09-19 15:57:50.726126320 +0200
+@@ -106,9 +106,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"
+- LINKER_LANGUAGE C)
++ 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")
if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
- target_link_libraries(graphite2 "-lkernel32 -lmsvcr90 -lmingw32 -lgcc
-luser32")
+ target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/graphite2.git/commitdiff/6b9299a143c8b4489209d9a8eb0d9177dcc01a9f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
