summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-gfx/graphite2/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-gfx/graphite2/files')
-rw-r--r--media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch12
-rw-r--r--media-gfx/graphite2/files/graphite2-1.0.3-no-test-binaries.patch9
-rw-r--r--media-gfx/graphite2/files/graphite2-1.1.0-includes-libs-perl.patch13
-rw-r--r--media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch22
4 files changed, 56 insertions, 0 deletions
diff --git a/media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch b/media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch
new file mode 100644
index 000000000000..eb413345ca79
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.0.2-no_harfbuzz_tests.patch
@@ -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)
+
diff --git a/media-gfx/graphite2/files/graphite2-1.0.3-no-test-binaries.patch b/media-gfx/graphite2/files/graphite2-1.0.3-no-test-binaries.patch
new file mode 100644
index 000000000000..bbc28f5183d4
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.0.3-no-test-binaries.patch
@@ -0,0 +1,9 @@
+diff -urN graphite2-1.0.3.old/tests/comparerenderer/CMakeLists.txt graphite2-1.0.3/tests/comparerenderer/CMakeLists.txt
+--- graphite2-1.0.3.old/tests/comparerenderer/CMakeLists.txt 2011-10-28 10:28:43.688602080 +0200
++++ graphite2-1.0.3/tests/comparerenderer/CMakeLists.txt 2011-10-28 10:30:06.694603526 +0200
+@@ -132,4 +132,4 @@
+ # comparetest(scheherazade_arb Scheherazadegr.ttf udhr_arb.txt --rtl)
+
+ # comparerenderer can also be used for font testing
+-install(TARGETS comparerenderer EXPORT comparerenderer RUNTIME DESTINATION bin)
++# install(TARGETS comparerenderer EXPORT comparerenderer RUNTIME DESTINATION bin)
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..be4122937703
--- /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 => $^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-1.2.0-solaris.patch b/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch
new file mode 100644
index 000000000000..c3bbe51e8695
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch
@@ -0,0 +1,22 @@
+Bidi: undef conflicting constants
+
+On Solaris ES and CS are already defined, resulting in compilation
+errors. Since we won't need Solaris' ones here, simply undef them.
+
+--- graphite2-1.2.0/src/Bidi.cpp
++++ graphite2-1.2.0/src/Bidi.cpp
+@@ -30,6 +30,14 @@
+
+ using namespace graphite2;
+
++/* Solaris' headers define these */
++#ifdef ES
++# undef ES
++#endif
++#ifdef CS
++# undef CS
++#endif
++
+ enum DirCode { // Hungarian: dirc
+ Unk = -1,
+ N = 0, // other neutrals (default) - ON