Author: qboosh Date: Wed Mar 28 17:31:14 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.1.1
- pl
- updated fix_wrong_linker_opts,includes-libs-perl patches
---- Files affected:
packages/graphite2:
graphite2-fix_wrong_linker_opts.patch (1.1 -> 1.2) ,
graphite2-includes-libs-perl.patch (1.1 -> 1.2) , graphite2.spec (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/graphite2/graphite2-fix_wrong_linker_opts.patch
diff -u packages/graphite2/graphite2-fix_wrong_linker_opts.patch:1.1
packages/graphite2/graphite2-fix_wrong_linker_opts.patch:1.2
--- packages/graphite2/graphite2-fix_wrong_linker_opts.patch:1.1 Thu Oct
13 22:52:34 2011
+++ packages/graphite2/graphite2-fix_wrong_linker_opts.patch Wed Mar 28
19:31:09 2012
@@ -9,10 +9,3 @@
if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
target_link_libraries(graphite2 "-lkernel32 -lmsvcr90 -lmingw32 -lgcc
-luser32")
else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
-@@ -121,4 +120,4 @@
-
-
- install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION
lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION
include/graphite2 RUNTIME DESTINATION bin)
--install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
-\ Chybí znak konce řádku na konci souboru
-+install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
================================================================
Index: packages/graphite2/graphite2-includes-libs-perl.patch
diff -u packages/graphite2/graphite2-includes-libs-perl.patch:1.1
packages/graphite2/graphite2-includes-libs-perl.patch:1.2
--- packages/graphite2/graphite2-includes-libs-perl.patch:1.1 Thu Oct 13
22:52:34 2011
+++ packages/graphite2/graphite2-includes-libs-perl.patch Wed Mar 28
19:31:09 2012
@@ -1,12 +1,12 @@
---- graphite2-0.9.3.orig/contrib/perl/Build.PL
-+++ graphite2-0.9.3/contrib/perl/Build.PL
-@@ -8,8 +8,8 @@ my $builder = Module::Build->new(
+--- 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
+@@ -8,8 +8,8 @@
dist_author => 'Simon Cozens <[email protected]>',
- dist_version_from => 'lib/Text/Graphite2.pm',
- extra_compiler_flags => '-Wall -Wno-unused-variable',
-- extra_linker_flags => '-lgraphite2',
+ 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 => '-L @BUILD_DIR@ -lgraphite2',
++ extra_linker_flags => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib'
: '-L @BUILD_DIR@ -lgraphite2',
+ include_dirs => ['.', '../../include'],
requires => {
'Test::More' => 0,
================================================================
Index: packages/graphite2/graphite2.spec
diff -u packages/graphite2/graphite2.spec:1.3
packages/graphite2/graphite2.spec:1.4
--- packages/graphite2/graphite2.spec:1.3 Fri Oct 14 07:36:53 2011
+++ packages/graphite2/graphite2.spec Wed Mar 28 19:31:09 2012
@@ -1,35 +1,51 @@
# $Revision$, $Date$
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.0.3
+Version: 1.1.1
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
http://downloads.sourceforge.net/silgraphite/graphite2/%{name}-%{version}.tgz
-# Source0-md5: 3bf481ca95109b14435125c0dd1f2217
+# Source0-md5: d2470967db5cdc6c04468950e423e9df
Patch0: %{name}-1.0.2-no_harfbuzz_tests.patch
Patch1: %{name}-fix_wrong_linker_opts.patch
Patch2: %{name}-includes-libs-perl.patch
URL: http://graphite.sil.org/
-BuildRequires: cmake
-BuildRequires: glib2-devel
+BuildRequires: cmake >= 2.8.0
+BuildRequires: libstdc++-devel
BuildRequires: pkgconfig
+# the rest for tests only
+BuildRequires: freetype-devel >= 2
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: libicu-devel
BuildRequires: silgraphite-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-Graphite is a project within SIL’s Non-Roman Script Initiative and
+Graphite is a project within SIL's Non-Roman Script Initiative and
Language Software Development groups to provide rendering capabilities
for complex non-Roman writing systems. Graphite can be used to create
"smart fonts" capable of displaying writing systems with various
complex behaviors. With respect to the Text Encoding Model, Graphite
handles the "Rendering" aspect of writing system implementation.
+%description -l pl.UTF-8
+Graphite to projekt w ramach grup SIL Non-Roman Script Initiative
+(inicjatywy pism nierzymskich SIL) oraz Language Software Development
+(tworzenia oprogramowania językowego) mający na celu zapewnienie
+wsparcia dla złożonych systemów pisma nierzymskiego. Graphite może być
+używany do tworzenia "inteligentnych fontów", będących w stanie
+wyświelać systemy pisma o różnych złożonych zachowaniach.
+Uwzględniając model kodowania tekstu (Text Encoding Model) Graphite
+obsługuje aspekt renderowania całości implementacji systemów pisma.
+
%package devel
Summary: Header files for graphite2 library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki graphite2
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: libstdc++-devel
%description devel
Header files for graphite2 library.
@@ -37,18 +53,6 @@
%description devel -l pl.UTF-8
Pliki nagłówkowe biblioteki graphite2.
-%package static
-Summary: Static graphite2 library
-Summary(pl.UTF-8): Statyczna biblioteka graphite2
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Static graphite2 library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka graphite2.
-
%prep
%setup -q
%patch0 -p1
@@ -58,9 +62,8 @@
%build
install -d build
cd build
-%cmake \
- -DVM_MACHINE_TYPE=direct \
- ..
+%cmake .. \
+ -DGRAPHITE2_VM_TYPE=direct
%{__make}
@@ -72,6 +75,9 @@
/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
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -84,7 +90,6 @@
%attr(755,root,root) %{_bindir}/comparerenderer
%attr(755,root,root) %{_bindir}/gr2fonttest
%attr(755,root,root) %{_libdir}/libgraphite2.so.*.*.*
-#%attr(755,root,root) %ghost %{_libdir}/libgraphite2.so.2
%files devel
%defattr(644,root,root,755)
@@ -99,9 +104,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2012/03/28 17:31:09 qboosh
+- updated to 1.1.1
+- pl
+- updated fix_wrong_linker_opts,includes-libs-perl patches
+
Revision 1.3 2011/10/14 05:36:53 arekm
- rel 1; fix files
Revision 1.2 2011/10/13 20:52:14 arekm
- almost raw
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/graphite2/graphite2-fix_wrong_linker_opts.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/graphite2/graphite2-includes-libs-perl.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/graphite2/graphite2.spec?r1=1.3&r2=1.4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
