--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package graphite2
1.3.9-1 FTBFSed on *i386 with the tests failing[1]. Discussion with upstream at
that time resulted in disabling the tests (see the log in the patch file
removed below). That happened in 1.3.9-2.
Yesterday I got approached by upstream pointing me to https://github.com/silnrsi/graphite/commit/f7bbdd87d510d587c872e314d6458160c0069c65
(the first part) which was supposed to fix this.
It did.[2]
Your mileage may vary, but I think it's worthwile and better to have the tests
ran and do the necessary adaptions than keep them disabled. Though I of course
don't believe they'll break during stretchs cycle...
Debdiff:
diff -Nru graphite2-1.3.9/debian/changelog graphite2-1.3.9/debian/changelog
--- graphite2-1.3.9/debian/changelog 2017-01-11 21:33:49.000000000 +0100
+++ graphite2-1.3.9/debian/changelog 2017-02-21 12:02:23.000000000 +0100
@@ -1,3 +1,9 @@
+graphite2 (1.3.9-4) unstable; urgency=medium
+
+ * add -ffloat-store to COMPILE_FLAGS; enable awami tests again
+
+ -- Rene Engelhard <rene@debian.org> Tue, 21 Feb 2017 12:02:23 +0100
+
graphite2 (1.3.9-3) unstable; urgency=medium
* s/asciidoc, dblatex/asciidoc-dblatex/ in Build-Depends-Indep
diff -Nru graphite2-1.3.9/debian/libgraphite2-3-dbg.substvars graphite2-1.3.9/debian/libgraphite2-3-dbg.substvars
--- graphite2-1.3.9/debian/libgraphite2-3-dbg.substvars 2016-11-17 13:54:13.000000000 +0100
+++ graphite2-1.3.9/debian/libgraphite2-3-dbg.substvars 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-misc:Depends=
-misc:Pre-Depends=
diff -Nru graphite2-1.3.9/debian/patches/disable-awami-tests.diff graphite2-1.3.9/debian/patches/disable-awami-tests.diff
--- graphite2-1.3.9/debian/patches/disable-awami-tests.diff 2016-11-17 13:54:13.000000000 +0100
+++ graphite2-1.3.9/debian/patches/disable-awami-tests.diff 1970-01-01 01:00:00.000000000 +0100
@@ -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@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@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@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 -Nru graphite2-1.3.9/debian/patches/ffloat-store.diff graphite2-1.3.9/debian/patches/ffloat-store.diff
--- graphite2-1.3.9/debian/patches/ffloat-store.diff 1970-01-01 01:00:00.000000000 +0100
+++ graphite2-1.3.9/debian/patches/ffloat-store.diff 2017-02-21 12:02:23.000000000 +0100
@@ -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 -Nru graphite2-1.3.9/debian/patches/non-linux.diff graphite2-1.3.9/debian/patches/non-linux.diff
--- graphite2-1.3.9/debian/patches/non-linux.diff 2016-11-17 13:54:13.000000000 +0100
+++ graphite2-1.3.9/debian/patches/non-linux.diff 2017-02-21 12:02:23.000000000 +0100
@@ -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 -Nru graphite2-1.3.9/debian/patches/series graphite2-1.3.9/debian/patches/series
--- graphite2-1.3.9/debian/patches/series 2016-11-17 13:54:13.000000000 +0100
+++ graphite2-1.3.9/debian/patches/series 2017-02-21 12:02:23.000000000 +0100
@@ -1,5 +1,5 @@
+ffloat-store.diff
non-linux.diff
no-icons.diff
test-timeout.diff
reproducible-build.diff
-disable-awami-tests.diff
(Ordered the new patch first to do a more easy update when this is in a
upstream release. This also meant a - trivial - change in non-linux.diff
to apply)
unblock graphite2/1.3.9-4
Regards,
Rene
[1] https://buildd.debian.org/status/logs.php?pkg=graphite2&ver=1.3.9-1&suite=sid
[2] https://buildd.debian.org/status/logs.php?pkg=graphite2&ver=1.3.9-4&suite=sid
--- End Message ---