[graphite2] 48/69: Imported Debian patch 1.3.2-1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository graphite2.
commit 4efd2e655f0343887c69abd4b850c6139d252377
Merge: e043c0d be02c66
Author: Rene Engelhard <rene@debian.org>
Date: Mon Sep 14 21:20:32 2015 +0200
Imported Debian patch 1.3.2-1
.hg_archival.txt | 6 +-
.hgtags | 5 +
CMakeLists.txt | 7 +-
ChangeLog | 23 +-
Graphite.cmake | 15 +-
Todo.txt | 13 +-
debian-src/changelog | 12 +
debian/changelog | 10 +
debian/control | 2 +-
debian/patches/cfab7499b46b | 29 ---
debian/patches/no-icons.diff | 4 +-
debian/patches/non-linux.diff | 80 ++----
debian/patches/test-timeout.diff | 29 ++-
debian/rules | 2 +-
doc/GTF.txt | 12 +-
doc/building.txt | 27 +-
gr2fonttest/CMakeLists.txt | 13 +-
gr2fonttest/gr2FontTest.cpp | 2 +-
include/graphite2/Font.h | 2 +-
include/graphite2/Segment.h | 3 +-
src/Bidi.cpp | 2 +-
src/CMakeLists.txt | 12 +-
src/CmapCache.cpp | 14 +-
src/Code.cpp | 85 +++++--
src/Collider.cpp | 7 +-
src/Decompressor.cpp | 121 ++++-----
src/Face.cpp | 36 ++-
src/FeatureMap.cpp | 7 +-
src/FileFace.cpp | 2 +-
src/GlyphCache.cpp | 21 +-
src/Justifier.cpp | 18 +-
src/Pass.cpp | 99 +++++---
src/SegCache.cpp | 4 +-
src/Segment.cpp | 107 ++++++--
src/Silf.cpp | 60 +++--
src/Slot.cpp | 36 +--
src/Sparse.cpp | 2 +-
src/TtfUtil.cpp | 33 ++-
src/call_machine.cpp | 5 +-
src/direct_machine.cpp | 4 +-
src/files.mk | 5 +-
src/gr_segment.cpp | 2 +-
src/inc/Code.h | 64 ++---
src/inc/Collider.h | 49 +++-
src/inc/Compression.h | 120 +++++++++
src/inc/Decompressor.h | 66 ++---
src/inc/Face.h | 8 +-
src/inc/FeatureMap.h | 12 +-
src/inc/GlyphCache.h | 23 +-
src/inc/Intervals.h | 3 +
src/inc/List.h | 1 +
src/inc/Main.h | 6 +-
src/inc/Pass.h | 11 +-
src/inc/Rule.h | 25 +-
src/inc/SegCache.h | 2 +-
src/inc/Segment.h | 38 ++-
src/inc/Shrinker.h | 119 ---------
src/inc/Silf.h | 3 +-
src/inc/Slot.h | 11 +-
src/inc/Sparse.h | 6 +-
src/inc/TtfUtil.h | 4 +-
src/inc/opcodes.h | 19 +-
tests/CMakeLists.txt | 11 +-
tests/bittwiddling/CMakeLists.txt | 5 +-
tests/comparerenderer/CMakeLists.txt | 12 +-
tests/comparerenderer/CompareRenderer.cpp | 1 -
tests/endian/CMakeLists.txt | 3 +
tests/examples/CMakeLists.txt | 8 +-
tests/examples/linebreak.c | 1 +
tests/featuremap/CMakeLists.txt | 3 +
tests/featuremap/featuremaptest.cpp | 10 +-
tests/fnttxtrender | 34 +--
tests/fonts/Awami_compressed_test.ttf | Bin 355072 -> 350320 bytes
tests/fonts/Awami_test.ttf | Bin 918668 -> 932088 bytes
tests/full-fuzz-test.sh | 8 +-
tests/fuzz-tests/CMakeLists.txt | 4 +-
tests/fuzzcomparerender | 2 +-
tests/graphite.py | 45 +---
tests/grlist/CMakeLists.txt | 5 +-
tests/hbspeeds | 12 +-
tests/json/CMakeLists.txt | 7 +-
tests/nametabletest/CMakeLists.txt | 7 +-
tests/nametabletest/nametabletest.cpp | 4 +
tests/segcache/CMakeLists.txt | 7 +-
tests/segcache/segcachetest.cpp | 16 +-
tests/sparsetest/CMakeLists.txt | 5 +-
tests/standards/scher1.json | 397 ++++++++++++++----------------
tests/standards/scher2.json | 333 ++++++++++++-------------
tests/standards/scher3.json | 253 +++++++++----------
tests/standards/scher3.log | 16 +-
tests/standards/scher4.json | 121 +++++----
tests/standards/scher5.json | 121 +++++----
tests/standards/schercmp1.json | 48 ++--
tests/utftest/CMakeLists.txt | 5 +-
tests/vm/CMakeLists.txt | 13 +-
tests/vm/basic_test.cpp | 10 +-
96 files changed, 1609 insertions(+), 1486 deletions(-)
diff --cc debian/changelog
index 02868d1,0000000..61c04ad
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,217 -1,0 +1,227 @@@
++graphite2 (1.3.2-1) experimental; urgency=medium
++
++ * New upstream release
++
++ * use --parallel in dh_auto_build (not in docs build and tests; the former
++ doesn't build with parallelism)
++ * Standards-Versions: 3.9.1 -> 3.9.6, no changes needed
++
++ -- Rene Engelhard <rene@debian.org> Mon, 14 Sep 2015 21:20:32 +0200
++
+graphite2 (1.3.0-2) experimental; urgency=medium
+
+ * backport fixes from http://hg.palaso.org/graphitedev/raw-rev/cfab7499b46b:
+ - fix tests on !linux (closes: #79499)
+ - increase test timeout from 10s to 120s to make them succeed on mips(el)
+
+ -- Rene Engelhard <rene@rene-engelhard.de> Wed, 12 Aug 2015 17:12:57 +0200
+
+graphite2 (1.3.0-1) experimental; urgency=medium
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Sat, 08 Aug 2015 10:38:42 +0000
+
+graphite2 (1.2.4-3) unstable; urgency=medium
+
+ * run a2x without --icons to avoid FTBFS (closes: #741845)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 01 Jun 2014 11:12:56 +0200
+
+graphite2 (1.2.4-2) unstable; urgency=low
+
+ * add patch from Pino Toscano to also avoid linking to libstdc++ on
+ kFreeBSD and Hurd (closes: #738353)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 10 Feb 2014 09:47:01 +0100
+
+graphite2 (1.2.4-1) unstable; urgency=low
+
+ * New upstream release
+ * some tests need apparently need python, build-dep on python (>= 2.6)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 29 Nov 2013 20:12:13 +0100
+
+graphite2 (1.2.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Tue, 11 Jun 2013 19:25:25 +0200
+
+graphite2 (1.2.2-2) unstable; urgency=low
+
+ * add patch from Michael Cree <mcree@orcon.net.nz> to fix
+ misaligned memory access - thanks (closes: #710336)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 02 Jun 2013 12:05:28 +0000
+
+graphite2 (1.2.2-1) unstable; urgency=low
+
+ * New upstream release
+ * stop building with -O3 gotten from somewhere and overriding
+ dpkg-buildflags' value, just remove via sed
+ * converto multiarch again... (closes: #689813)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 31 May 2013 18:10:55 +0200
+
+graphite2 (1.2.1-2) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Thu, 18 Apr 2013 23:49:24 +0200
+
+graphite2 (1.2.1-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Mon, 04 Mar 2013 19:44:28 +0100
+
+graphite2 (1.2.0-4) experimental; urgency=low
+
+ * revert multiarch stuff as harfbuzz now doesn't need us
+ anymore... (reopens: #699714)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 02 Mar 2013 14:29:58 +0100
+
+graphite2 (1.2.0-3) experimental; urgency=low
+
+ * apply patch from Daniel Schaal to convert to multiarch
+ as already multiarchified pango now needs us via harfbuzz...
+ (closes: #699714)
+ * clean up (not packaged) perl module packaging
+ * add (not used yet) stuff to build mono binding
+ * split arch-dep and arch-indep (docs...) build
+ * disable the compare renderer stuff - enough compared ;-)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 27 Feb 2013 20:24:34 +0100
+
+graphite2 (1.2.0-2) experimental; urgency=low
+
+ * break libgraphite2-2.0.0 (<< 1.2.0) (closes: #689813)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 06 Oct 2012 18:24:32 +0200
+
+graphite2 (1.2.0-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Fri, 21 Sep 2012 16:41:23 +0200
+
+graphite2 (1.1.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Sat, 02 Jun 2012 01:10:10 +0200
+
+graphite2 (1.1.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Fri, 20 Apr 2012 01:45:47 +0200
+
+graphite2 (1.1.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Mon, 27 Feb 2012 22:32:26 +0100
+
+graphite2 (1.1.0-2) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Tue, 21 Feb 2012 20:41:47 +0100
+
+graphite2 (1.1.0-1) experimental; urgency=low
+
+ * New upstream release
+ * fix copyright syntax
+
+ -- Rene Engelhard <rene@debian.org> Tue, 07 Feb 2012 22:55:08 +0000
+
+graphite2 (1.0.3.real-1) unstable; urgency=low
+
+ * fixup upstream release for 1.0.3
+
+ -- Rene Engelhard <rene@debian.org> Thu, 22 Sep 2011 20:59:53 +0200
+
+graphite2 (1.0.3-1) unstable; urgency=low
+
+ * New upstream release
+ * add libxml2-utils to B-D-I
+
+ -- Rene Engelhard <rene@debian.org> Tue, 20 Sep 2011 00:28:27 +0200
+
+graphite2 (1.0.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Mon, 15 Aug 2011 13:29:41 +0000
+
+graphite2 (1.0.1-3) unstable; urgency=low
+
+ * debian/patches/fix-typedefs.diff: move ...
+ * debian/patches/words-bigendian-fixes.diff: ... here and add additional
+ upstream fix for setting -DWORDS_BIGENDIAN also for the tests...
+ * clean up Build-Depends:
+ + move asciidoc, dblatex, doxygen, docbook-xsl, latex-xcolor to B-D-I
+ + remove libxml2-utils
+
+ -- Rene Engelhard <rene@debian.org> Wed, 10 Aug 2011 15:42:59 +0200
+
+graphite2 (1.0.1-2) unstable; urgency=low
+
+ * debian/patches/fix-typedefs.diff: fix Main.h typedefs for
+ WORDS_BIGENDIAN
+
+ -- Rene Engelhard <rene@debian.org> Tue, 09 Aug 2011 17:47:10 +0000
+
+graphite2 (1.0.1-1) unstable; urgency=low
+
+ * New upstream release
+ - removes -nostdlibs (closes: #634810)
+
+ * build with -DDISABLE_TRACING:bool=1
+ * stop symlinking to Debian's fonts as they are not sufficient for the
+ tests
+ * update debian/copyright; mention ppport.h according to
+ http://pkg-perl.alioth.debian.org/copyright.html#devel__ppport
+ * fix libgraphite2-2.0.0's short description
+
+ -- Rene Engelhard <rene@debian.org> Thu, 28 Jul 2011 12:54:36 +0000
+
+graphite2 (0.9.4.dfsg-4) unstable; urgency=low
+
+ * grr, remove dpkg-source generated patch which readds ppport.h...
+
+ -- Rene Engelhard <rene@debian.org> Thu, 14 Jul 2011 14:50:55 +0200
+
+graphite2 (0.9.4.dfsg-3) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Tue, 12 Jul 2011 16:58:19 +0000
+
+graphite2 (0.9.4.dfsg-2) experimental; urgency=low
+
+ * add missing build-dep on latex-xcolor
+
+ -- Rene Engelhard <rene@debian.org> Sun, 10 Jul 2011 00:05:23 +0200
+
+graphite2 (0.9.4.dfsg-1) experimental; urgency=low
+
+ * remove perl/pport.h and tests/fonts/* from .orig
+
+ * debian/changelog: update
+ * debian/control: build-depend on ttf-sil-padauk, ttf-sil-scheherazade
+ * debian/rules: symlink to Debian's versions pf Padauk and Scheherazade,
+ though....
+ * debian/patches/disable_font_tests.diff: disable them (fail)
+ * debian/rules, debian/control: disable perl build
+
+ -- Rene Engelhard <rene@debian.org> Sat, 09 Jul 2011 16:50:25 +0000
+
+graphite2 (0.9.4-1) experimental; urgency=low
+
+ * Initial release (closes: #617718)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 03 Jun 2011 11:08:48 +0000
diff --cc debian/control
index 12e8aa3,0000000..5e21d9a
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,136 -1,0 +1,136 @@@
+Source: graphite2
+Priority: optional
+Section: libs
+Maintainer: Debian LibreOffice Team <debian-openoffice@lists.debian.org>
+Uploaders: Rene Engelhard <rene@debian.org>, Daniel Glassey <wdg@debian.org>
+Build-Depends: debhelper (>= 9), dh-exec (>= 0.3), dpkg-dev (>= 1.16.1), cmake, python, fonttools
+# perl: libmodule-build-perl
+# mono: mono-xbuild, mono-gmcs, mono-dmcs, libnunit-cil-dev
+Build-Depends-Indep: asciidoc, dblatex, doxygen, docbook-xsl, latex-xcolor, libxml2-utils
- Standards-Version: 3.9.1
++Standards-Version: 3.9.6
+
+Package: libgraphite2-3
+Section: libs
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: libgraphite2-2.0.0
+Replaces: libgraphite2-2.0.0
+Breaks: libgraphite2-2.0.0 (<< 1.2.0)
+Multi-Arch: same
+Description: Font rendering engine for Complex Scripts -- library
+ Graphite is a system that can be used to create and use "smart fonts" capable
+ of displaying writing systems with various complex behaviors, such as:
+ contextual shaping, ligatures, reordering, split glyphs, bidirectionality,
+ stacking diacritics and complex positioning.
+ .
+ This library was designed and developed by the NRSI (Non-Roman Script
+ Initiative) within SIL International (www.sil.org) to act as a complement to
+ other smart font rendering technologies with limited practical local
+ extensibility. Its purpose is to help meet the needs of a very large number
+ of "minority language" communities for local extensibility of complex script
+ behaviors.
+ .
+ The behavior of the rendering engine for a given writing system is specified
+ through extra tables added to a TrueType font. These tables are generated by
+ compiling a GDL (Graphite Description Language) source file into a font using
+ grcompiler.
+ .
+ This package contains the shared library.
+
+Package: libgraphite2-dev
+Section: libdevel
+Architecture: any
+Depends: libgraphite2-3 (= ${binary:Version}), ${misc:Depends}
+Description: Development files for libgraphite2
+ Graphite is a system that can be used to create and use "smart fonts" capable
+ of displaying writing systems with various complex behaviors, such as:
+ contextual shaping, ligatures, reordering, split glyphs, bidirectionality,
+ stacking diacritics and complex positioning.
+ .
+ This library was designed and developed by the NRSI (Non-Roman Script
+ Initiative) within SIL International (www.sil.org) to act as a complement to
+ other smart font rendering technologies with limited practical local
+ extensibility. Its purpose is to help meet the needs of a very large number
+ of "minority language" communities for local extensibility of complex script
+ behaviors.
+ .
+ The behavior of the rendering engine for a given writing system is specified
+ through extra tables added to a TrueType font. These tables are generated by
+ compiling a GDL (Graphite Description Language) source file into a font using
+ grcompiler.
+ .
+ This package contains the development libraries for libgraphite2
+
+Package: libgraphite2-3-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: libgraphite2-3 (= ${binary:Version}), ${misc:Depends}
+Description: Debug symbols for libgraphite2
+ Graphite is a system that can be used to create and use "smart fonts" capable
+ of displaying writing systems with various complex behaviors, such as:
+ contextual shaping, ligatures, reordering, split glyphs, bidirectionality,
+ stacking diacritics and complex positioning.
+ .
+ This library was designed and developed by the NRSI (Non-Roman Script
+ Initiative) within SIL International (www.sil.org) to act as a complement to
+ other smart font rendering technologies with limited practical local
+ extensibility. Its purpose is to help meet the needs of a very large number
+ of "minority language" communities for local extensibility of complex script
+ behaviors.
+ .
+ The behavior of the rendering engine for a given writing system is specified
+ through extra tables added to a TrueType font. These tables are generated by
+ compiling a GDL (Graphite Description Language) source file into a font using
+ grcompiler.
+ .
+ Debug symbols for libgraphite2
+
+Package: libgraphite2-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Documentation for libgraphite2
+ Graphite is a system that can be used to create and use "smart fonts" capable
+ of displaying writing systems with various complex behaviors, such as:
+ contextual shaping, ligatures, reordering, split glyphs, bidirectionality,
+ stacking diacritics and complex positioning.
+ .
+ This library was designed and developed by the NRSI (Non-Roman Script
+ Initiative) within SIL International (www.sil.org) to act as a complement to
+ other smart font rendering technologies with limited practical local
+ extensibility. Its purpose is to help meet the needs of a very large number
+ of "minority language" communities for local extensibility of complex script
+ behaviors.
+ .
+ The behavior of the rendering engine for a given writing system is specified
+ through extra tables added to a TrueType font. These tables are generated by
+ compiling a GDL (Graphite Description Language) source file into a font using
+ grcompiler.
+ .
+ PDF and HTML documentation for libgraphite2
+
+#Package: libtext-gr2-perl
+#Section: perl
+#Architecture: any
+#Depends: ${shlibs:Depends}, perl, ${perl:Depends}, ${misc:Depends}
+#Description: Perl Interface to SIL's Graphite2 rendering engine
+# Graphite is a system that can be used to create and use "smart fonts" capable
+# of displaying writing systems with various complex behaviors, such as:
+# contextual shaping, ligatures, reordering, split glyphs, bidirectionality,
+# stacking diacritics and complex positioning.
+# .
+# This library was designed and developed by the NRSI (Non-Roman Script
+# Initiative) within SIL International (www.sil.org) to act as a complement to
+# other smart font rendering technologies with limited practical local
+# extensibility. Its purpose is to help meet the needs of a very large number
+# of "minority language" communities for local extensibility of complex script
+# behaviors.
+# .
+# The behavior of the rendering engine for a given writing system is specified
+# through extra tables added to a TrueType font. These tables are generated by
+# compiling a GDL (Graphite Description Language) source file into a font using
+# grcompiler.
+# .
+# This package contains the Text::Graphite2 module.
diff --cc debian/patches/no-icons.diff
index 1bc986b,0000000..618cdb1
mode 100644,000000..100644
--- a/debian/patches/no-icons.diff
+++ b/debian/patches/no-icons.diff
@@@ -1,15 -1,0 +1,15 @@@
- --- graphite2-1.3.0.orig/doc/CMakeLists.txt
- +++ graphite2-1.3.0/doc/CMakeLists.txt
++--- graphite2-1.3.2.orig/doc/CMakeLists.txt
+++++ graphite2-1.3.2/doc/CMakeLists.txt
+@@ -12,10 +12,10 @@ if(A2X)
+ if(DBLATEX)
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/manual.pdf
+ DEPENDS ${PROJECT_SOURCE_DIR}/[a-z]*.txt
+- COMMAND ${A2X} --icons -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
++ COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/GTF.pdf
+ DEPENDS ${PROJECT_SOURCE_DIR}/GTF.txt
+- COMMAND ${A2X} --icons -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/GTF.txt)
++ COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/GTF.txt)
+ set(DOC_DEPENDS ${PROJECT_BINARY_DIR}/manual.pdf ${PROJECT_BINARY_DIR}/GTF.pdf)
+ endif(DBLATEX)
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/manual.html
diff --cc debian/patches/non-linux.diff
index 5f80018,0000000..e10fdc5
mode 100644,000000..100644
--- a/debian/patches/non-linux.diff
+++ b/debian/patches/non-linux.diff
@@@ -1,102 -1,0 +1,54 @@@
- --- graphite2-1.3.0.orig/gr2fonttest/CMakeLists.txt
- +++ graphite2-1.3.0/gr2fonttest/CMakeLists.txt
- @@ -17,14 +17,14 @@ if (GRAPHITE2_ASAN)
- set(GRAPHITE_LINK_FLAGS "-fsanitize=address")
- endif (GRAPHITE2_ASAN)
-
- -if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- +if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
- # -lgcc LINKER_LANGUAGE C
- add_definitions(-fno-rtti -fno-exceptions)
- set_target_properties(gr2fonttest PROPERTIES LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" LINKER_LANGUAGE C)
- set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
- # This script just fails
- nolib_test(stdc++ $<TARGET_FILE:gr2fonttest>)
- -endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- +endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
-
- # copy the DLL so that gr2fonttest can find it
- add_custom_target(${PROJECT_NAME}_copy_dll ALL
- --- graphite2-1.3.0.orig/src/CMakeLists.txt
- +++ graphite2-1.3.0/src/CMakeLists.txt
- @@ -113,7 +113,7 @@ else (${CMAKE_BUILD_TYPE} STREQUAL "Clan
- set(GRAPHITE_LINK_FLAGS "")
- endif (${CMAKE_BUILD_TYPE} STREQUAL "ClangASN")
++--- graphite2-1.3.2.orig/src/CMakeLists.txt
+++++ graphite2-1.3.2/src/CMakeLists.txt
++@@ -106,7 +106,7 @@ set_target_properties(graphite2 PROPERTI
++ LT_VERSION_REVISION ${GRAPHITE_API_REVISION}
++ LT_VERSION_AGE ${GRAPHITE_API_AGE})
+
+-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+ set_target_properties(graphite2 PROPERTIES
- COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector -Wdouble-promotion"
++ COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
+ LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
- @@ -131,7 +131,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
++@@ -127,7 +127,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
+ endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
+ set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+-endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+
+ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+ set_target_properties(graphite2 PROPERTIES
- --- graphite2-1.3.0.orig/tests/examples/CMakeLists.txt
- +++ graphite2-1.3.0/tests/examples/CMakeLists.txt
- @@ -26,12 +26,12 @@ macro(test_example TESTNAME SRCFILE)
- set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT 3)
++--- graphite2-1.3.2.orig/tests/examples/CMakeLists.txt
+++++ graphite2-1.3.2/tests/examples/CMakeLists.txt
++@@ -29,12 +29,12 @@ macro(test_example TESTNAME SRCFILE)
++ endif (GRAPHITE2_ASAN)
+ endmacro(test_example)
+
+-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+ find_package(Freetype)
+ if (${FREETYPE_FOUND})
+ include_directories(${FREETYPE_INCLUDE_DIRS})
+ endif (${FREETYPE_FOUND})
+-endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+
+ macro(test_freetype TESTNAME SRCFILE)
+ if (${FREETYPE_FOUND})
- --- graphite2-1.3.0.orig/tests/vm/CMakeLists.txt
- +++ graphite2-1.3.0/tests/vm/CMakeLists.txt
- @@ -38,12 +38,12 @@ if (GRAPHITE2_ASAN)
- set_target_properties(vm-test-call PROPERTIES LINK_FLAGS "-fsanitize=address")
- endif (GRAPHITE2_ASAN)
++--- graphite2-1.3.2.orig/tests/vm/CMakeLists.txt
+++++ graphite2-1.3.2/tests/vm/CMakeLists.txt
++@@ -34,12 +34,12 @@ if (${CMAKE_COMPILER_IS_GNUCXX})
++ target_link_libraries(vm-test-direct vm-test-common)
++ endif (${CMAKE_COMPILER_IS_GNUCXX})
+
+-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+ add_definitions(-fno-rtti -fno-exceptions)
+ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+ add_definitions(-DNDEBUG -fomit-frame-pointer)
+ endif ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+-endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "k.*BSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
+
+ add_test(vm-test-call-threading vm-test-call ${testing_SOURCE_DIR}/fonts/tiny.ttf 1)
+ set_tests_properties(vm-test-call-threading PROPERTIES
-
- # HG changeset patch
- # User Martin Hosken <martin_hosken@sil.org>
- # Date 1439048141 -25200
- # Node ID cfab7499b46b2b47e37e1fd0c9ab36e3426fdea4
- # Parent e6539b6769cf98b2e36769999c2388d8427201d3
- Enable testing in more environments
-
- diff -r e6539b6769cf -r cfab7499b46b tests/graphite.py
- --- a/tests/graphite.py Wed Aug 05 09:00:12 2015 +0700
- +++ b/tests/graphite.py Sat Aug 08 22:35:41 2015 +0700
- @@ -34,13 +34,14 @@
- 'darwin' : 'libgraphite2.dylib',
- 'linux2' : 'libgraphite2.so',
- 'win32' : 'graphite2.dll',
- - 'win64' : 'graphite2-x64.dll'
- + 'win64' : 'graphite2-x64.dll',
- + 'gnukfreebsd9' : 'libgraphite2.so'
- }
- gr2 = None
- if sys.platform == 'win32' and sys.maxsize > (1 << 32) :
- grfile = grfiles['win64']
- else :
- - grfile = grfiles[sys.platform]
- + grfile = grfiles.get(sys.platform, grfiles['linux2'])
- for b in (os.path.join(b,'src',c) for b in basedirs for c in ('', 'Debug', 'Release', 'DebWithRelInfo', 'MinSizeRel')):
- testfile = os.path.join(b, grfile)
- print "Trying " + testfile
-
diff --cc debian/patches/test-timeout.diff
index 90fcc38,0000000..20c71ba
mode 100644,000000..100644
--- a/debian/patches/test-timeout.diff
+++ b/debian/patches/test-timeout.diff
@@@ -1,11 -1,0 +1,20 @@@
- --- graphite2-1.3.0.orig/Graphite.cmake
- +++ graphite2-1.3.0/Graphite.cmake
- @@ -111,7 +111,7 @@ function(cmptest TESTNAME FONTFILE TEXTF
- endif (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.json)
- if (NOT (GRAPHITE2_NFILEFACE))
- add_test(NAME ${TESTNAME} COMMAND python ${PROJECT_SOURCE_DIR}/fnttxtrender -t ${PROJECT_SOURCE_DIR}/texts/${TEXTFILE} -o ${PROJECT_BINARY_DIR}/${TESTNAME}.json -c ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${PLATFORM_TEST_SUFFIX}.json ${ARGN} ${PROJECT_SOURCE_DIR}/fonts/${FONTFILE})
- - set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT 10)
++--- graphite2-1.3.2.orig/Graphite.cmake
+++++ graphite2-1.3.2/Graphite.cmake
++@@ -79,7 +79,7 @@ function(fonttest TESTNAME FONTFILE)
++ endif (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.log)
++ if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
++ add_test(NAME ${TESTNAME} COMMAND $<TARGET_FILE:gr2fonttest> -trace ${PROJECT_BINARY_DIR}/${TESTNAME}.json -log ${PROJECT_BINARY_DIR}/${TESTNAME}.log ${PROJECT_SOURCE_DIR}/fonts/${FONTFILE} -codes ${ARGN})
++- set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT 3)
++ set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT 120)
- endif (NOT (GRAPHITE2_NFILEFACE))
- endfunction(cmptest)
-
++ if (GRAPHITE2_ASAN)
++ set_property(TEST ${TESTNAME} APPEND PROPERTY ENVIRONMENT "ASAN_SYMBOLIZER_PATH=${ASAN_SYMBOLIZER}")
++ endif (GRAPHITE2_ASAN)
++@@ -99,7 +99,7 @@ function(feattest TESTNAME FONTFILE)
++ endif (EXISTS ${PROJECT_SOURCE_DIR}/standards/${TESTNAME}${CMAKE_SYSTEM_NAME}.log)
++ if (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE))
++ add_test(NAME ${TESTNAME} COMMAND $<TARGET_FILE:gr2fonttest> -log ${PROJECT_BINARY_DIR}/${TESTNAME}.log ${PROJECT_SOURCE_DIR}/fonts/${FONTFILE})
++- set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT 3)
+++ set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT 120)
++ if (GRAPHITE2_ASAN)
++ set_property(TEST ${TESTNAME} APPEND PROPERTY ENVIRONMENT "ASAN_SYMBOLIZER_PATH=${ASAN_SYMBOLIZER}")
++ endif (GRAPHITE2_ASAN)
diff --cc debian/rules
index 34da2be,0000000..853e96c
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,63 -1,0 +1,63 @@@
+#!/usr/bin/make -f
+
+include /usr/share/dpkg/architecture.mk
+
+%:
+ dh $@ --builddirectory=build
+
+override_dh_strip:
+ dh_strip --dbg-package=libgraphite2-3-dbg
+
+override_dh_auto_build-arch:
- dh_auto_build
++ dh_auto_build --parallel
+# echo "Building perl module"
+# cd contrib/perl && \
+# perl Build.PL prefix=/usr && \
+# ./Build
+
+override_dh_auto_build-indep:
+ echo "Building docs"
+ dh_auto_build -- docs
+# echo "Building C# binding"
+# cd contrib/C\# && \
+# mono-xbuild NGraphite.sln
+
+override_dh_auto_install:
+ dh_auto_install
+# cd perl && \
+# ./Build install destdir=$(CURDIR)/debian/libtext-gr2-perl
+# # hack
+# cd $(CURDIR)/debian/libtext-gr2-perl/usr && \
+# mkdir share && mv man share
+# cd $(CURDIR)/debian/libtext-gr2-perl/usr/lib && \
+# mv perl perl5 && cd perl5 && mv 5.*/* . && rm -rf 5.*
+# find debian/libtext-gr2-perl -type f -name .packlist | xargs rm -f
+
+override_dh_auto_test:
+ dh_auto_test
+#ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+# cd contrib/perl && \
+# LD_LIBRARY_PATH=$(CURDIR)/build/src ./Build test
+#endif
+
+override_dh_auto_clean:
+# if [ -e contrib/perl/Build ]; then cd contrib/perl && \
+# ./Build clean; fi
+# rm -rf contrib/perl/Build contrib/perl/_build
+# rm -f /contrib/perl/MYMETA*
+# rm -f contrib/C\#/NGraphite/obj/Debug/NGraphite.csproj.FilesWrittenAbsolute.txt
+# -find contrib/C\# -name "*.dll" | xargs rm
+# -find contrib/C\# -name "*.dll.mdb" | xargs rm
+ -find . -name "CTestCostData.txt" | xargs rm
+ -find . -name "LastTest.log" | xargs rm
+ rm -f tests/graphite.pyc
+ dh_auto_clean
+
+override_dh_auto_configure:
+ dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DGRAPHITE2_NTRACING:bool=1 -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)
+ find . -type f ! -name "rules" ! -name "changelog" \
+ -exec sed -i -e 's/\-O3//g' {} \;
+
+override_dh_gencontrol:
+ dh_gencontrol -Nlibtext-gr2-perl -O--builddirectory=build
+# dh_gencontrol -plibtext-gr2-perl -- -v`cat perl/META.yml | grep version: | tail -n 1 | awk '{ print $$2 }'`-`dpkg-parsechangelog | grep urgency | awk '{ print $$2 }' | sed -e 's/(//' | sed -e 's/)//' | cut -d- -f2`
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
Reply to: