packages: graphite2/graphite2-1.0.2-no_harfbuzz_tests.patch (NEW), graphite...

arekm arekm at pld-linux.org
Thu Oct 13 22:52:39 CEST 2011


Author: arekm                        Date: Thu Oct 13 20:52:39 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- from gentoo

---- Files affected:
packages/graphite2:
   graphite2-1.0.2-no_harfbuzz_tests.patch (NONE -> 1.1)  (NEW), graphite2-fix_wrong_linker_opts.patch (NONE -> 1.1)  (NEW), graphite2-includes-libs-perl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/graphite2/graphite2-1.0.2-no_harfbuzz_tests.patch
diff -u /dev/null packages/graphite2/graphite2-1.0.2-no_harfbuzz_tests.patch:1.1
--- /dev/null	Thu Oct 13 22:52:39 2011
+++ packages/graphite2/graphite2-1.0.2-no_harfbuzz_tests.patch	Thu Oct 13 22:52:34 2011
@@ -0,0 +1,12 @@
+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)
+ 

================================================================
Index: packages/graphite2/graphite2-fix_wrong_linker_opts.patch
diff -u /dev/null packages/graphite2/graphite2-fix_wrong_linker_opts.patch:1.1
--- /dev/null	Thu Oct 13 22:52:39 2011
+++ packages/graphite2/graphite2-fix_wrong_linker_opts.patch	Thu Oct 13 22:52:34 2011
@@ -0,0 +1,18 @@
+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)
+     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 /dev/null packages/graphite2/graphite2-includes-libs-perl.patch:1.1
--- /dev/null	Thu Oct 13 22:52:39 2011
+++ packages/graphite2/graphite2-includes-libs-perl.patch	Thu Oct 13 22:52:34 2011
@@ -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 at cpan.org>',
+     dist_version_from   => 'lib/Text/Graphite2.pm',
+     extra_compiler_flags => '-Wall -Wno-unused-variable',
+-    extra_linker_flags  => '-lgraphite2',
+-    include_dirs        => ['.'],
++    extra_linker_flags  => '-L @BUILD_DIR@ -lgraphite2',
++    include_dirs        => ['.', '../../include'],
+     requires => {
+         'Test::More' => 0,
+     },
================================================================


More information about the pld-cvs-commit mailing list