From 2d57fea5940bc1ed18b8a424bb3efda6fec51b0f Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Thu, 11 Aug 2011 09:30:31 +0000 Subject: Version bump to 1.0.1, add few missing dependencies. (Portage version: 2.2.0_alpha50/cvs/Linux x86_64) --- media-gfx/graphite2/ChangeLog | 11 ++- .../files/graphite2-disablefonttest.patch | 59 --------------- .../graphite2/files/graphite2-fix-nostdlib.patch | 29 -------- .../files/graphite2-fix_wrong_linker_opts.patch | 19 +++-- .../files/graphite2-includes-libs-perl.patch | 4 +- .../files/graphite2-multilib-strict.patch | 21 ------ media-gfx/graphite2/graphite2-0.9.4-r1.ebuild | 86 ---------------------- media-gfx/graphite2/graphite2-1.0.1.ebuild | 85 +++++++++++++++++++++ 8 files changed, 110 insertions(+), 204 deletions(-) delete mode 100644 media-gfx/graphite2/files/graphite2-disablefonttest.patch delete mode 100644 media-gfx/graphite2/files/graphite2-fix-nostdlib.patch delete mode 100644 media-gfx/graphite2/files/graphite2-multilib-strict.patch delete mode 100644 media-gfx/graphite2/graphite2-0.9.4-r1.ebuild create mode 100644 media-gfx/graphite2/graphite2-1.0.1.ebuild (limited to 'media-gfx') diff --git a/media-gfx/graphite2/ChangeLog b/media-gfx/graphite2/ChangeLog index a2306514801a..2c723b7f791a 100644 --- a/media-gfx/graphite2/ChangeLog +++ b/media-gfx/graphite2/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-gfx/graphite2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.8 2011/07/29 11:11:10 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/ChangeLog,v 1.9 2011/08/11 09:30:31 scarabeus Exp $ + +*graphite2-1.0.1 (11 Aug 2011) + + 11 Aug 2011; Tomáš Chvátal + -files/graphite2-disablefonttest.patch, -files/graphite2-fix-nostdlib.patch, + -files/graphite2-multilib-strict.patch, + files/graphite2-fix_wrong_linker_opts.patch, -graphite2-0.9.4-r1.ebuild, + files/graphite2-includes-libs-perl.patch, +graphite2-1.0.1.ebuild: + Version bump to 1.0.1, add few missing dependencies. 29 Jul 2011; Tomáš Chvátal +files/graphite2-fix_wrong_linker_opts.patch, graphite2-0.9.4-r1.ebuild: diff --git a/media-gfx/graphite2/files/graphite2-disablefonttest.patch b/media-gfx/graphite2/files/graphite2-disablefonttest.patch deleted file mode 100644 index 7fafea16fc5c..000000000000 --- a/media-gfx/graphite2/files/graphite2-disablefonttest.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- graphite2-0.9.4.orig/tests/CMakeLists.txt -+++ graphite2-0.9.4/tests/CMakeLists.txt -@@ -31,28 +31,6 @@ macro(fonttest TESTNAME FONTFILE) - # add_custom_target(${TESTNAME} DEPENDS ${TESTNAME}.xml) - endmacro(fonttest) - --fonttest(padauk1 Padauk.ttf 1015 102F 100F 1039 100F 1031 1038) --fonttest(padauk2 Padauk.ttf 1000 103C 102D 102F) --fonttest(padauk3 Padauk.ttf 101e 1004 103a 1039 1001 103b 102d 102f 1004 103a 1038) --fonttest(padauk4 Padauk.ttf 1005 1000 1039 1000 1030) --fonttest(padauk5 Padauk.ttf 1000 103c 1031 102c 1004 1037 103a) --fonttest(padauk6 Padauk.ttf 1000 102D 1005 1039 1006 102C) --# padauk7 can cause an infinite loop, though the text is miss-spelt --fonttest(padauk7 Padauk.ttf 1017 1014 103c 103d 102f) --fonttest(padauk8 Padauk.ttf 1004 103A 1039 1005) --fonttest(padauk9 Padauk.ttf 1004 103A 1039) --fonttest(padauk10 Padauk.ttf 1004 103D 1000 103A -feat kdot=1,wtri=1) --fonttest(padauk11 Padauk.ttf 100B 1039 100C 1031 102C) --fonttest(charis1 charis_r_gr.ttf 0069 02E6 02E8 02E5) --fonttest(scher1 Scheherazadegr.ttf 0628 0628 064E 0644 064E 0654 0627 064E -rtl) --fonttest(scher2 Scheherazadegr.ttf 0627 0644 0625 0639 0644 0627 0646 -rtl) --fonttest(charis2 charis_r_gr.ttf 1D510 0041 1D513) --fonttest(charis3 charis_r_gr.ttf 0054 0069 1ec3 0075 -feat 'lang=vie') --fonttest(charis4 charis_r_gr.ttf 006b 0361 070) --fonttest(magyar1 MagyarLinLibertineG.ttf 0031 0035 -feat 210=36) --fonttest(magyar2 MagyarLinLibertineG.ttf 0031 0030 -feat 210=200) --fonttest(magyar3 MagyarLinLibertineG.ttf 0066 0069 0066 0074 0079 002d 0066 0069 0076 0065 -feat 209=3) -- - macro(feattest TESTNAME FONTFILE) - if (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.log) - set(PLATFORM_TEST_SUFFIX ${CMAKE_SYSTEM_NAME}) -@@ -65,6 +43,3 @@ macro(feattest TESTNAME FONTFILE) - # add_custom_target(${TESTNAME} DEPENDS ${TESTNAME}.xml) - endmacro(feattest) - --feattest(padauk_feat Padauk.ttf) --feattest(charis_feat charis_r_gr.ttf) --feattest(scher_feat Scheherazadegr.ttf) ---- graphite2-0.9.4.orig/tests/comparerenderer/CMakeLists.txt -+++ graphite2-0.9.4/tests/comparerenderer/CMakeLists.txt -@@ -123,11 +123,8 @@ macro(comparetest TESTNAME FONTFILE TEXT - endif (${GR_FOUND}) - endmacro(comparetest) - --comparetest(charis charis_r_gr.ttf udhr_eng.txt) - comparetest(padauk Padauk.ttf my_HeadwordSyllables.txt) - comparetest(padauk_ulon Padauk.ttf my_HeadwordSyllables.txt --features ulon=1) --comparetest(charis_yor charis_r_gr.ttf udhr_yor.txt) --comparetest(piglatin PigLatinBenchmark_v3.ttf udhr_eng.txt) - # comparerenderer needs a bidi algorithm before it can run this test - # comparetest(scheherazade_arb Scheherazadegr.ttf udhr_arb.txt --rtl) - ---- graphite2-0.9.4.orig/tests/examples/CMakeLists.txt -+++ graphite2-0.9.4/tests/examples/CMakeLists.txt -@@ -29,4 +29,3 @@ endmacro(test_example) - test_example(simple simple.c ${PROJECT_SOURCE_DIR}/../fonts/Padauk.ttf "Hello World!") - test_example(features features.c ${PROJECT_SOURCE_DIR}/../fonts/Padauk.ttf) - test_example(clusters cluster.c ${PROJECT_SOURCE_DIR}/../fonts/Padauk.ttf "စက္ခုန္ဒြေ") --test_example(linebreak linebreak.c ${PROJECT_SOURCE_DIR}/../fonts/charis_r_gr.ttf 120 "This is a long test line that goes on and on and on") diff --git a/media-gfx/graphite2/files/graphite2-fix-nostdlib.patch b/media-gfx/graphite2/files/graphite2-fix-nostdlib.patch deleted file mode 100644 index 7b7c80b47b64..000000000000 --- a/media-gfx/graphite2/files/graphite2-fix-nostdlib.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/gr2fonttest/CMakeLists.txt b/gr2fonttest/CMakeLists.txt -index 4e11217..89f97e4 100644 ---- a/gr2fonttest/CMakeLists.txt -+++ b/gr2fonttest/CMakeLists.txt -@@ -45,7 +45,7 @@ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - # -lgcc LINKER_LANGUAGE C - add_definitions(-fno-rtti -fno-exceptions) -- set_target_properties(gr2fonttest PROPERTIES LINK_FLAGS "-nostdlibs -nodefaultlibs" ) -+ set_target_properties(gr2fonttest PROPERTIES LINK_FLAGS "-nostdlib -nodefaultlibs" ) - set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") - # This script just fails - nolib_test(stdc++ $) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9c31e35..775a83b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -164,9 +164,9 @@ set_target_properties(graphite2 PROPERTIES LT_VERSION_AGE ${GRAPHITE_API_AGE}) - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - add_definitions(-Wall -Wno-unknown-pragmas -Wparentheses -Wextra -Wendif-labels - -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fdiagnostics-show-option -- -fno-rtti -fno-exceptions -nodefaultlibs -nostdlibs -+ -fno-rtti -fno-exceptions -nodefaultlibs -nostdlib - -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector) -- set_target_properties(graphite2 PROPERTIES LINK_FLAGS "-nostdlibs -nodefaultlibs" LINKER_LANGUAGE C) -+ set_target_properties(graphite2 PROPERTIES LINK_FLAGS "-nostdlib -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.*") 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 233995647ce3..77d1206e7bd3 100644 --- a/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch +++ b/media-gfx/graphite2/files/graphite2-fix_wrong_linker_opts.patch @@ -1,11 +1,18 @@ -diff -urN graphite2-0.9.4.old/src/CMakeLists.txt graphite2-0.9.4/src/CMakeLists.txt ---- graphite2-0.9.4.old/src/CMakeLists.txt 2011-07-29 12:53:36.000000000 +0200 -+++ graphite2-0.9.4/src/CMakeLists.txt 2011-07-29 13:06:18.000000000 +0200 -@@ -166,7 +166,6 @@ +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 -nostdlib + -fno-rtti -fno-exceptions -nodefaultlibs -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector) -- set_target_properties(graphite2 PROPERTIES LINK_FLAGS "-nostdlib -nodefaultlibs" LINKER_LANGUAGE C) +- 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_) diff --git a/media-gfx/graphite2/files/graphite2-includes-libs-perl.patch b/media-gfx/graphite2/files/graphite2-includes-libs-perl.patch index f549f5bd424e..b0fef4d1e62e 100644 --- a/media-gfx/graphite2/files/graphite2-includes-libs-perl.patch +++ b/media-gfx/graphite2/files/graphite2-includes-libs-perl.patch @@ -1,5 +1,5 @@ ---- graphite2-0.9.3.orig/perl/Build.PL -+++ graphite2-0.9.3/perl/Build.PL +--- 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 ', dist_version_from => 'lib/Text/Graphite2.pm', diff --git a/media-gfx/graphite2/files/graphite2-multilib-strict.patch b/media-gfx/graphite2/files/graphite2-multilib-strict.patch deleted file mode 100644 index 66d849a63369..000000000000 --- a/media-gfx/graphite2/files/graphite2-multilib-strict.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN graphite2-0.9.4.old/CMakeLists.txt graphite2-0.9.4/CMakeLists.txt ---- graphite2-0.9.4.old/CMakeLists.txt 2011-07-27 17:45:26.000000000 +0200 -+++ graphite2-0.9.4/CMakeLists.txt 2011-07-27 17:48:30.000000000 +0200 -@@ -68,5 +68,5 @@ - - configure_file(graphite2.pc.in graphite2.pc) - --install(FILES ${PROJECT_BINARY_DIR}/graphite2.pc DESTINATION lib/pkgconfig) -+install(FILES ${PROJECT_BINARY_DIR}/graphite2.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) - -diff -urN graphite2-0.9.4.old/src/CMakeLists.txt graphite2-0.9.4/src/CMakeLists.txt ---- graphite2-0.9.4.old/src/CMakeLists.txt 2011-07-27 17:45:26.000000000 +0200 -+++ graphite2-0.9.4/src/CMakeLists.txt 2011-07-27 17:48:04.000000000 +0200 -@@ -182,6 +182,6 @@ - endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - - --install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin) -+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_) - diff --git a/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild b/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild deleted file mode 100644 index 98dd8108efbf..000000000000 --- a/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-0.9.4-r1.ebuild,v 1.5 2011/07/29 11:11:10 scarabeus Exp $ - -EAPI=4 - -inherit base cmake-utils perl-module - -DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" -HOMEPAGE="http://graphite.sil.org/" -SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="perl" - -RDEPEND=" - dev-libs/glib:2 - media-libs/fontconfig - perl? ( dev-lang/perl ) -" -DEPEND="${RDEPEND} - perl? ( virtual/perl-Module-Build ) -" - -PATCHES=( - "${FILESDIR}/${PN}-includes-libs-perl.patch" - "${FILESDIR}/${PN}-disablefonttest.patch" - "${FILESDIR}/${PN}-multilib-strict.patch" - "${FILESDIR}/${PN}-fix-nostdlib.patch" - "${FILESDIR}/${PN}-fix_wrong_linker_opts.patch" -) - -pkg_setup() { - use perl && perl-module_pkg_setup -} - -src_prepare() { - base_src_prepare - - # fix perl linking - if use perl; then - _check_build_dir init - sed -i \ - -e "s:@BUILD_DIR@:\"${CMAKE_BUILD_DIR}/src\":" \ - perl/Build.PL || die - fi -} - -src_configure() { - local mycmakeargs=( - "-DVM_MACHINE_TYPE=direct" - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - if use perl; then - cd perl - perl-module_src_prep - perl-module_src_compile - fi -} - -src_test() { - cmake-utils_src_test - if use perl; then - cd perl - perl-module_src_test - fi -} - -src_install() { - cmake-utils_src_install - if use perl; then - cd perl - perl-module_src_install - fixlocalpod - fi - - find "${ED}" -name '*.la' -exec rm -f {} + - -} diff --git a/media-gfx/graphite2/graphite2-1.0.1.ebuild b/media-gfx/graphite2/graphite2-1.0.1.ebuild new file mode 100644 index 000000000000..1f6074dac070 --- /dev/null +++ b/media-gfx/graphite2/graphite2-1.0.1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.0.1.ebuild,v 1.1 2011/08/11 09:30:31 scarabeus Exp $ + +EAPI=4 + +inherit base cmake-utils perl-module + +DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" +HOMEPAGE="http://graphite.sil.org/" +SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="perl" + +RDEPEND=" + dev-libs/glib:2 + media-libs/fontconfig + media-libs/harfbuzz + media-libs/silgraphite + perl? ( dev-lang/perl ) +" +DEPEND="${RDEPEND} + perl? ( virtual/perl-Module-Build ) +" + +PATCHES=( + "${FILESDIR}/${PN}-includes-libs-perl.patch" + "${FILESDIR}/${PN}-fix_wrong_linker_opts.patch" +) + +pkg_setup() { + use perl && perl-module_pkg_setup +} + +src_prepare() { + base_src_prepare + + # fix perl linking + if use perl; then + _check_build_dir init + sed -i \ + -e "s:@BUILD_DIR@:\"${CMAKE_BUILD_DIR}/src\":" \ + contrib/perl/Build.PL || die + fi +} + +src_configure() { + local mycmakeargs=( + "-DVM_MACHINE_TYPE=direct" + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + if use perl; then + cd contrib/perl + perl-module_src_prep + perl-module_src_compile + fi +} + +src_test() { + cmake-utils_src_test + if use perl; then + cd contrib/perl + perl-module_src_test + fi +} + +src_install() { + cmake-utils_src_install + if use perl; then + cd contrib/perl + perl-module_src_install + fixlocalpod + fi + + find "${ED}" -name '*.la' -exec rm -f {} + + +} -- cgit v1.2.3-65-gdbad