summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-02-15 12:09:02 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-02-15 12:09:02 +0000
commit0ab1040e6058b934148885be88fed2dfb25d37c7 (patch)
tree891c8402305489a10f08f297ab4ab9a97035a010 /media-gfx/graphite2/files
parentVersion bump msnlib to 3.8. (diff)
downloadgentoo-2-0ab1040e6058b934148885be88fed2dfb25d37c7.tar.gz
gentoo-2-0ab1040e6058b934148885be88fed2dfb25d37c7.tar.bz2
gentoo-2-0ab1040e6058b934148885be88fed2dfb25d37c7.zip
Version bump to latest.
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/graphite2/files')
-rw-r--r--media-gfx/graphite2/files/graphite2-1.1.0-includes-libs-perl.patch13
-rw-r--r--media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch7
2 files changed, 13 insertions, 7 deletions
diff --git a/media-gfx/graphite2/files/graphite2-1.1.0-includes-libs-perl.patch b/media-gfx/graphite2/files/graphite2-1.1.0-includes-libs-perl.patch
new file mode 100644
index 000000000000..3c32b11481d8
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.1.0-includes-libs-perl.patch
@@ -0,0 +1,13 @@
+--- 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(
+ dist_author => 'Simon Cozens <simon@cpan.org>',
+ dist_version_from => 'lib/Text/Graphite2.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 => extra_linker_flags => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib' : '-L @BUILD_DIR@ -lgraphite2',
++ include_dirs => ['.', '../../include'],
+ requires => {
+ 'Test::More' => 0,
+ },
diff --git a/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch b/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch
index 77d1206e7bd3..edacd73629f3 100644
--- a/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch
+++ b/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch
@@ -9,10 +9,3 @@ diff -urN graphite2-1.0.1.old/src/CMakeLists.txt graphite2-1.0.1/src/CMakeLists.
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_)