[graphite2] 01/03: add -ffloat-store to COMPILE_FLAGS; enable awami tests again

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository graphite2.

commit c43e02da079f98f5b69176b1fd39f29bcf50987b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Feb 21 12:01:24 2017 +0100

    add -ffloat-store to COMPILE_FLAGS; enable awami tests again
---
 debian/patches/disable-awami-tests.diff | 36 ---------------------------------
 debian/patches/ffloat-store.diff        | 13 ++++++++++++
 debian/patches/non-linux.diff           |  2 +-
 debian/patches/series                   |  2 +-
 4 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/debian/patches/disable-awami-tests.diff b/debian/patches/disable-awami-tests.diff
deleted file mode 100644
index adb505f..0000000
--- a/debian/patches/disable-awami-tests.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Disable awami tests
- 12:06 < uniscript> @_rene_ I'm not surprised about that particular error, and I 
- would be tempted to say: ignore it. But we should make the package pass that tes
- t. Any chance you can get hold of the test result? build/tests/awamicmp1.json fr
- om that build?
- 12:07 -!- erAck [~er at x4e3637b2.dyn.telefonica.de] has joined #libreoffice-dev
- 12:07 -!- mode/#libreoffice-dev [+o erAck] by ChanServ
- 12:07 < uniscript> grr. I must learn to drop @. sorry
- 12:07 < uniscript> _rene_
- 12:09 < _rene_> can try in a i386 chroot when back home, yes..
- 12:09 < uniscript> tia
- 12:10 < uniscript> basically there are rounding errors, I assume, and they can be ignored. It's a matter of quietly dropping the failing strings.
- 12:10 < _rene_> and well, ignoring would mean ignoring the testsuite results, so... (or just ignore those two tests...)
- 12:10 < uniscript> just ignore those two tests
-Author: Rene Engelhard <rene at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: vendor
-Forwarded: not-needed
-Reviewed-By: Martin Hosken <martin_hosken at sil.org>
-Last-Update: 2016-11-17
-
---- graphite2-1.3.9.orig/tests/CMakeLists.txt
-+++ graphite2-1.3.9/tests/CMakeLists.txt
-@@ -122,5 +122,5 @@ cmptest(chariscmp1 charis_r_gr.ttf udhr_
- cmptest(chariscmp2 charis_r_gr.ttf udhr_yor.txt)
- cmptest(annacmp1 Annapurnarc2.ttf udhr_nep.txt)
- cmptest(schercmp1 Scheherazadegr.ttf udhr_arb.txt -r)
--cmptest(awamicmp1 Awami_test.ttf awami_tests.txt -r -e 1)
--cmptest(awamicmp2 Awami_compressed_test.ttf awami_tests.txt -r -e 1)
-+#cmptest(awamicmp1 Awami_test.ttf awami_tests.txt -r -e 1)
-+#cmptest(awamicmp2 Awami_compressed_test.ttf awami_tests.txt -r -e 1)
diff --git a/debian/patches/ffloat-store.diff b/debian/patches/ffloat-store.diff
new file mode 100644
index 0000000..e98ce33
--- /dev/null
+++ b/debian/patches/ffloat-store.diff
@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4f1e7e5..5b61b5c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -108,7 +108,7 @@ set_target_properties(graphite2 PROPERTIES  PUBLIC_HEADER "${GRAPHITE_HEADERS}"
+ 
+ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+     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"
++        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 -ffloat-store"
+         LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" 
+         LINKER_LANGUAGE C)
+     if (CMAKE_COMPILER_IS_GNUCXX)
diff --git a/debian/patches/non-linux.diff b/debian/patches/non-linux.diff
index e10fdc5..6adaad5 100644
--- a/debian/patches/non-linux.diff
+++ b/debian/patches/non-linux.diff
@@ -7,7 +7,7 @@
 -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"
+         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 -ffloat-store"
          LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" 
 @@ -127,7 +127,7 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
      endif (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
diff --git a/debian/patches/series b/debian/patches/series
index a65dd4c..5bf0f98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
+ffloat-store.diff
 non-linux.diff
 no-icons.diff
 test-timeout.diff
 reproducible-build.diff
-disable-awami-tests.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git