commit 624d82979dde571c2aa50316b461768babe81a81
Author: Jakub Bogusz <[email protected]>
Date: Sat Sep 5 15:18:59 2015 +0200
- updated to 1.3.1
- updated fix_wrong_linker_opts,includes-libs-perl patches
- removed obsolete no_harfbuzz_tests patch
graphite2-1.0.2-no_harfbuzz_tests.patch | 12 ------------
graphite2-fix_wrong_linker_opts.patch | 17 ++++++++---------
graphite2-includes-libs-perl.patch | 8 ++++----
graphite2.spec | 12 +++++-------
4 files changed, 17 insertions(+), 32 deletions(-)
---
diff --git a/graphite2.spec b/graphite2.spec
index 84efec8..dcf793b 100644
--- a/graphite2.spec
+++ b/graphite2.spec
@@ -1,15 +1,14 @@
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.2.4
-Release: 2
+Version: 1.3.1
+Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
http://downloads.sourceforge.net/silgraphite/%{name}-%{version}.tgz
-# Source0-md5: 2ef839348fe28e3b923bf8cced440227
-Patch0: %{name}-1.0.2-no_harfbuzz_tests.patch
-Patch1: %{name}-fix_wrong_linker_opts.patch
-Patch2: %{name}-includes-libs-perl.patch
+# Source0-md5: 0c4b5b0ebd59ff36837029bb60efc5b1
+Patch0: %{name}-fix_wrong_linker_opts.patch
+Patch1: %{name}-includes-libs-perl.patch
URL: http://graphite.sil.org/
BuildRequires: cmake >= 2.8.0
BuildRequires: libstdc++-devel
@@ -56,7 +55,6 @@ Pliki nagłówkowe biblioteki graphite2.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
install -d build
diff --git a/graphite2-1.0.2-no_harfbuzz_tests.patch
b/graphite2-1.0.2-no_harfbuzz_tests.patch
deleted file mode 100644
index eb41334..0000000
--- a/graphite2-1.0.2-no_harfbuzz_tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN graphite2-1.0.2.old/tests/comparerenderer/CMakeLists.txt
graphite2-1.0.2/tests/comparerenderer/CMakeLists.txt
---- graphite2-1.0.2.old/tests/comparerenderer/CMakeLists.txt 2011-09-04
13:39:16.206450690 +0200
-+++ graphite2-1.0.2/tests/comparerenderer/CMakeLists.txt 2011-09-04
13:39:44.516450716 +0200
-@@ -43,7 +43,7 @@
- find_package(PkgConfig)
-
- pkg_check_modules(GR silgraphite)
-- pkg_check_modules(HB harfbuzz)
-+ #pkg_check_modules(HB harfbuzz)
- pkg_check_modules(GLIB glib-2.0)
- # pkg_check_modules(GRNG graphite)
-
diff --git a/graphite2-fix_wrong_linker_opts.patch
b/graphite2-fix_wrong_linker_opts.patch
index a630011..f9d9eb7 100644
--- a/graphite2-fix_wrong_linker_opts.patch
+++ b/graphite2-fix_wrong_linker_opts.patch
@@ -1,13 +1,12 @@
---- graphite2-1.2.4/src/CMakeLists.txt.orig 2014-02-01 22:21:20.318017527
+0100
-+++ graphite2-1.2.4/src/CMakeLists.txt 2014-02-01 22:25:49.254672905 +0100
-@@ -112,9 +112,7 @@
-
+--- 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 @@
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"
+ 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)
-+ 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 kernel32 msvcr90 mingw32 gcc user32)
- else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
++ )
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ add_definitions(-Wdouble-promotion)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
diff --git a/graphite2-includes-libs-perl.patch
b/graphite2-includes-libs-perl.patch
index bc693a7..5948465 100644
--- a/graphite2-includes-libs-perl.patch
+++ b/graphite2-includes-libs-perl.patch
@@ -1,12 +1,12 @@
---- graphite2-1.1.1/contrib/perl/Build.PL.orig 2012-02-27 05:40:49.000000000
+0100
-+++ graphite2-1.1.1/contrib/perl/Build.PL 2012-03-28 19:13:08.209767728
+0200
+--- graphite2-1.3.1/contrib/perl/Build.PL.orig 2015-09-05 14:48:47.809953840
+0200
++++ graphite2-1.3.1/contrib/perl/Build.PL 2015-09-05 14:51:55.133279315
+0200
@@ -8,8 +8,8 @@
dist_author => 'Simon Cozens <[email protected]>',
dist_version_from => 'lib/Text/Gr2.pm',
extra_compiler_flags => $^O ne 'MSWin32' ? '-Wall -Wno-unused-variable' :
'',
- extra_linker_flags => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib'
: '-lgraphite2',
-- include_dirs => ['.'],
-+ extra_linker_flags => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib'
: '-L @BUILD_DIR@ -lgraphite2',
+- include_dirs => ['.', '../include'],
++ extra_linker_flags => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib'
: '-L@BUILD_DIR@ -lgraphite2',
+ include_dirs => ['.', '../../include'],
requires => {
'Test::More' => 0,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/graphite2.git/commitdiff/624d82979dde571c2aa50316b461768babe81a81
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
