Thu Nov 22 05:56:56 UTC 201820181122055656

a/kernel-generic-4.19.3-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.19.3-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.19.3-x86_64-1.txz:  Upgraded.
a/openssl-solibs-1.1.1a-x86_64-1.txz:  Upgraded.
a/sysvinit-scripts-2.1-noarch-21.txz:  Rebuilt.
  rc.S: Don't run rc.fuse - udev takes care of the FUSE module and filesystem.
  rc.S: Support replacing the /etc/mtab file with a symlink to /proc/mounts.
  rc.6: Show more information when unmounting filesystems at shutdown.
ap/ghostscript-9.26-x86_64-1.txz:  Upgraded.
ap/mariadb-10.3.11-x86_64-1.txz:  Upgraded.
  This update fixes bugs and security issues.
  For more information, see:
    https://mariadb.com/kb/en/library/mariadb-10311-release-notes/
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3282
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2016-9843
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3174
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3143
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3156
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3251
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3185
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3277
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3162
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3173
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3200
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3284
  (* Security fix *)
d/cmake-3.13.0-x86_64-1.txz:  Upgraded.
d/git-2.19.2-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.14.63-x86-1.txz:  Upgraded.
d/kernel-headers-4.19.3-x86-1.txz:  Upgraded.
d/vala-0.42.3-x86_64-1.txz:  Added.
k/kernel-source-4.19.3-noarch-1.txz:  Upgraded.
l/adwaita-icon-theme-3.30.0-noarch-1.txz:  Upgraded.
l/at-spi2-atk-2.30.0-x86_64-1.txz:  Upgraded.
l/at-spi2-core-2.30.0-x86_64-1.txz:  Upgraded.
l/atk-2.30.0-x86_64-1.txz:  Upgraded.
l/atkmm-2.28.0-x86_64-1.txz:  Upgraded.
l/dconf-0.28.0-x86_64-1.txz:  Upgraded.
  dconf and dconf-editor require Vala; the alternative would be to try to
  stick with the old versions forever, and we don't want to do that.
l/dconf-editor-3.30.2-x86_64-1.txz:  Upgraded.
l/gcr-3.28.0-x86_64-3.txz:  Rebuilt.
  Recompiled to add Vala bindings.
l/gdk-pixbuf2-2.38.0-x86_64-1.txz:  Upgraded.
l/gexiv2-0.10.9-x86_64-1.txz:  Upgraded.
l/glib-networking-2.58.0-x86_64-1.txz:  Upgraded.
l/glib2-2.58.1-x86_64-1.txz:  Upgraded.
l/glibmm-2.58.0-x86_64-1.txz:  Upgraded.
l/gobject-introspection-1.58.0-x86_64-1.txz:  Upgraded.
l/gtk+3-3.24.1-x86_64-1.txz:  Upgraded.
l/gtkmm3-3.24.0-x86_64-1.txz:  Upgraded.
l/gvfs-1.38.1-x86_64-1.txz:  Upgraded.
l/libcap-2.26-x86_64-1.txz:  Upgraded.
l/libpsl-0.20.1-x86_64-1.txz:  Added.
  Required by libsoup.
l/libsoup-2.64.2-x86_64-1.txz:  Upgraded.
l/pangomm-2.42.0-x86_64-1.txz:  Upgraded.
l/pygobject3-3.30.2-x86_64-1.txz:  Upgraded.
l/vte-0.54.2-x86_64-1.txz:  Upgraded.
n/openssl-1.1.1a-x86_64-1.txz:  Upgraded.
  This update fixes timing side channel attacks on DSA and ECDSA signature
  generation that could allow an attacker to recover the private key.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-0734
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-0735
  (* Security fix *)
x/pixman-0.36.0-x86_64-1.txz:  Upgraded.
xfce/xfce4-terminal-0.8.7.4-x86_64-2.txz:  Rebuilt.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

4 files changed, 397 insertions, 85 deletions

diff --git a/source/x/x11/build/pixman b/source/x/x11/build/pixman
index 0cfbf0888..d00491fd7 100644
--- a/source/x/x11/build/pixman
+++ b/source/x/x11/build/pixman
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/patch/pixman.patch b/source/x/x11/patch/pixman.patch
index 89037dc3c..947341105 100644
--- a/source/x/x11/patch/pixman.patch
+++ b/source/x/x11/patch/pixman.patch
@@ -1 +1 @@
-zcat $CWD/patch/pixman/pixman.remove.glyph-test.that.fails.to.compile.diff.gz | patch -p1 || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff.gz | patch -p1 --backup --suffix=.orig || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/pixman/pixman.remove.glyph-test.that.fails.to.compile.diff b/source/x/x11/patch/pixman/pixman.remove.glyph-test.that.fails.to.compile.diff
deleted file mode 100644
index a4042c52e..000000000
--- a/source/x/x11/patch/pixman/pixman.remove.glyph-test.that.fails.to.compile.diff
+++ /dev/null
@@ -1,83 +0,0 @@
---- ./test/Makefile.in.orig	2016-01-31 08:31:06.000000000 -0600
-+++ ./test/Makefile.in	2018-09-18 17:37:03.435015910 -0500
-@@ -122,7 +122,7 @@
- 	rotate-test$(EXEEXT) alphamap$(EXEEXT) \
- 	gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \
- 	matrix-test$(EXEEXT) composite-traps-test$(EXEEXT) \
--	region-contains-test$(EXEEXT) glyph-test$(EXEEXT) \
-+	region-contains-test$(EXEEXT) \
- 	solid-test$(EXEEXT) stress-test$(EXEEXT) cover-test$(EXEEXT) \
- 	blitters-test$(EXEEXT) affine-test$(EXEEXT) \
- 	scaling-test$(EXEEXT) composite$(EXEEXT) \
-@@ -210,12 +210,6 @@
- fetch_test_DEPENDENCIES = libutils.la \
- 	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
--glyph_test_SOURCES = glyph-test.c
--glyph_test_OBJECTS = glyph-test.$(OBJEXT)
--glyph_test_LDADD = $(LDADD)
--glyph_test_DEPENDENCIES = libutils.la \
--	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
- gradient_crash_test_SOURCES = gradient-crash-test.c
- gradient_crash_test_OBJECTS = gradient-crash-test.$(OBJEXT)
- gradient_crash_test_LDADD = $(LDADD)
-@@ -392,7 +386,7 @@
- 	affine-test.c alpha-loop.c alphamap.c blitters-test.c \
- 	check-formats.c combiner-test.c composite.c \
- 	composite-traps-test.c cover-test.c fence-image-self-test.c \
--	fetch-test.c glyph-test.c gradient-crash-test.c \
-+	fetch-test.c gradient-crash-test.c \
- 	infinite-loop.c lowlevel-blt-bench.c matrix-test.c oob-test.c \
- 	pdf-op-test.c pixel-test.c prng-test.c radial-invalid.c \
- 	radial-perf-test.c region-contains-test.c region-test.c \
-@@ -404,7 +398,7 @@
- 	affine-test.c alpha-loop.c alphamap.c blitters-test.c \
- 	check-formats.c combiner-test.c composite.c \
- 	composite-traps-test.c cover-test.c fence-image-self-test.c \
--	fetch-test.c glyph-test.c gradient-crash-test.c \
-+	fetch-test.c gradient-crash-test.c \
- 	infinite-loop.c lowlevel-blt-bench.c matrix-test.c oob-test.c \
- 	pdf-op-test.c pixel-test.c prng-test.c radial-invalid.c \
- 	radial-perf-test.c region-contains-test.c region-test.c \
-@@ -816,7 +810,6 @@
- 	matrix-test		      \
- 	composite-traps-test	      \
- 	region-contains-test	      \
--	glyph-test		      \
- 	solid-test		      \
- 	stress-test		      \
- 	cover-test		      \
-@@ -965,10 +958,6 @@
- 	@rm -f fetch-test$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(fetch_test_OBJECTS) $(fetch_test_LDADD) $(LIBS)
- 
--glyph-test$(EXEEXT): $(glyph_test_OBJECTS) $(glyph_test_DEPENDENCIES) $(EXTRA_glyph_test_DEPENDENCIES) 
--	@rm -f glyph-test$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(glyph_test_OBJECTS) $(glyph_test_LDADD) $(LIBS)
--
- gradient-crash-test$(EXEEXT): $(gradient_crash_test_OBJECTS) $(gradient_crash_test_DEPENDENCIES) $(EXTRA_gradient_crash_test_DEPENDENCIES) 
- 	@rm -f gradient-crash-test$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(gradient_crash_test_OBJECTS) $(gradient_crash_test_LDADD) $(LIBS)
-@@ -1080,7 +1069,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cover-test.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fence-image-self-test.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fetch-test.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glyph-test.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infinite-loop.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@
-@@ -1487,13 +1475,6 @@
- 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- 	--log-file $$b.log --trs-file $$b.trs \
- 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
--	"$$tst" $(AM_TESTS_FD_REDIRECT)
--glyph-test.log: glyph-test$(EXEEXT)
--	@p='glyph-test$(EXEEXT)'; \
--	b='glyph-test'; \
--	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--	--log-file $$b.log --trs-file $$b.trs \
--	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- 	"$$tst" $(AM_TESTS_FD_REDIRECT)
- solid-test.log: solid-test$(EXEEXT)
- 	@p='solid-test$(EXEEXT)'; \
diff --git a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
new file mode 100644
index 000000000..d2a3ed1f7
--- /dev/null
+++ b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
@@ -0,0 +1,395 @@
+--- ./test/Makefile.in.orig	2018-11-21 05:41:10.000000000 -0600
++++ ./test/Makefile.in	2018-11-21 16:37:38.546566766 -0600
+@@ -111,12 +111,11 @@
+ 	scaling-helpers-test$(EXEEXT) thread-test$(EXEEXT) \
+ 	rotate-test$(EXEEXT) alphamap$(EXEEXT) \
+ 	gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \
+-	matrix-test$(EXEEXT) filter-reduction-test$(EXEEXT) \
+-	composite-traps-test$(EXEEXT) region-contains-test$(EXEEXT) \
++	filter-reduction-test$(EXEEXT) \
++	composite-traps-test$(EXEEXT) \
+ 	glyph-test$(EXEEXT) solid-test$(EXEEXT) stress-test$(EXEEXT) \
+-	cover-test$(EXEEXT) blitters-test$(EXEEXT) \
+-	affine-test$(EXEEXT) scaling-test$(EXEEXT) composite$(EXEEXT) \
+-	tolerance-test$(EXEEXT)
++	cover-test$(EXEEXT) \
++	scaling-test$(EXEEXT) composite$(EXEEXT)
+ am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT) radial-perf-test$(EXEEXT) \
+ 	check-formats$(EXEEXT) scaling-bench$(EXEEXT) \
+ 	affine-bench$(EXEEXT)
+@@ -144,12 +143,6 @@
+ affine_bench_DEPENDENCIES = libutils.la \
+ 	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+-affine_test_SOURCES = affine-test.c
+-affine_test_OBJECTS = affine-test.$(OBJEXT)
+-affine_test_LDADD = $(LDADD)
+-affine_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+ alpha_loop_SOURCES = alpha-loop.c
+ alpha_loop_OBJECTS = alpha-loop.$(OBJEXT)
+ alpha_loop_LDADD = $(LDADD)
+@@ -162,12 +155,6 @@
+ alphamap_DEPENDENCIES = libutils.la \
+ 	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+-blitters_test_SOURCES = blitters-test.c
+-blitters_test_OBJECTS = blitters-test.$(OBJEXT)
+-blitters_test_LDADD = $(LDADD)
+-blitters_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+ check_formats_SOURCES = check-formats.c
+ check_formats_OBJECTS = check-formats.$(OBJEXT)
+ check_formats_LDADD = $(LDADD)
+@@ -240,12 +227,6 @@
+ lowlevel_blt_bench_DEPENDENCIES = libutils.la \
+ 	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+-matrix_test_SOURCES = matrix-test.c
+-matrix_test_OBJECTS = matrix-test.$(OBJEXT)
+-matrix_test_LDADD = $(LDADD)
+-matrix_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+ oob_test_SOURCES = oob-test.c
+ oob_test_OBJECTS = oob-test.$(OBJEXT)
+ oob_test_LDADD = $(LDADD)
+@@ -282,12 +263,6 @@
+ radial_perf_test_DEPENDENCIES = libutils.la \
+ 	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+-region_contains_test_SOURCES = region-contains-test.c
+-region_contains_test_OBJECTS = region-contains-test.$(OBJEXT)
+-region_contains_test_LDADD = $(LDADD)
+-region_contains_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+ region_test_SOURCES = region-test.c
+ region_test_OBJECTS = region-test.$(OBJEXT)
+ region_test_LDADD = $(LDADD)
+@@ -348,12 +323,6 @@
+ thread_test_DEPENDENCIES = libutils.la \
+ 	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+-tolerance_test_SOURCES = tolerance-test.c
+-tolerance_test_OBJECTS = tolerance-test.$(OBJEXT)
+-tolerance_test_LDADD = $(LDADD)
+-tolerance_test_DEPENDENCIES = libutils.la \
+-	$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+ trap_crasher_SOURCES = trap-crasher.c
+ trap_crasher_OBJECTS = trap-crasher.$(OBJEXT)
+ trap_crasher_LDADD = $(LDADD)
+@@ -376,27 +345,27 @@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__maybe_remake_depfiles = depfiles
+ am__depfiles_remade = ./$(DEPDIR)/a1-trap-test.Po \
+-	./$(DEPDIR)/affine-bench.Po ./$(DEPDIR)/affine-test.Po \
++	./$(DEPDIR)/affine-bench.Po \
+ 	./$(DEPDIR)/alpha-loop.Po ./$(DEPDIR)/alphamap.Po \
+-	./$(DEPDIR)/blitters-test.Po ./$(DEPDIR)/check-formats.Po \
++	./$(DEPDIR)/check-formats.Po \
+ 	./$(DEPDIR)/combiner-test.Po \
+ 	./$(DEPDIR)/composite-traps-test.Po ./$(DEPDIR)/composite.Po \
+ 	./$(DEPDIR)/cover-test.Po ./$(DEPDIR)/fence-image-self-test.Po \
+ 	./$(DEPDIR)/fetch-test.Po ./$(DEPDIR)/filter-reduction-test.Po \
+ 	./$(DEPDIR)/glyph-test.Po ./$(DEPDIR)/gradient-crash-test.Po \
+ 	./$(DEPDIR)/infinite-loop.Po ./$(DEPDIR)/lowlevel-blt-bench.Po \
+-	./$(DEPDIR)/matrix-test.Po ./$(DEPDIR)/oob-test.Po \
++	./$(DEPDIR)/oob-test.Po \
+ 	./$(DEPDIR)/pdf-op-test.Po ./$(DEPDIR)/pixel-test.Po \
+ 	./$(DEPDIR)/prng-test.Po ./$(DEPDIR)/radial-invalid.Po \
+ 	./$(DEPDIR)/radial-perf-test.Po \
+-	./$(DEPDIR)/region-contains-test.Po ./$(DEPDIR)/region-test.Po \
++	./$(DEPDIR)/region-test.Po \
+ 	./$(DEPDIR)/region-translate-test.Po \
+ 	./$(DEPDIR)/rotate-test.Po ./$(DEPDIR)/scaling-bench.Po \
+ 	./$(DEPDIR)/scaling-crash-test.Po \
+ 	./$(DEPDIR)/scaling-helpers-test.Po \
+ 	./$(DEPDIR)/scaling-test.Po ./$(DEPDIR)/solid-test.Po \
+ 	./$(DEPDIR)/stress-test.Po ./$(DEPDIR)/thread-test.Po \
+-	./$(DEPDIR)/tolerance-test.Po ./$(DEPDIR)/trap-crasher.Po \
++	./$(DEPDIR)/trap-crasher.Po \
+ 	./$(DEPDIR)/utils-prng.Plo ./$(DEPDIR)/utils.Plo
+ am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -418,29 +387,29 @@
+ am__v_CCLD_0 = @echo "  CCLD    " $@;
+ am__v_CCLD_1 = 
+ SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
+-	affine-test.c alpha-loop.c alphamap.c blitters-test.c \
++	alpha-loop.c alphamap.c \
+ 	check-formats.c combiner-test.c composite.c \
+ 	composite-traps-test.c cover-test.c fence-image-self-test.c \
+ 	fetch-test.c filter-reduction-test.c glyph-test.c \
+ 	gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
+-	matrix-test.c oob-test.c pdf-op-test.c pixel-test.c \
++	oob-test.c pdf-op-test.c pixel-test.c \
+ 	prng-test.c radial-invalid.c radial-perf-test.c \
+-	region-contains-test.c region-test.c region-translate-test.c \
++	region-test.c region-translate-test.c \
+ 	rotate-test.c scaling-bench.c scaling-crash-test.c \
+ 	scaling-helpers-test.c scaling-test.c solid-test.c \
+-	stress-test.c thread-test.c tolerance-test.c trap-crasher.c
++	stress-test.c thread-test.c trap-crasher.c
+ DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
+-	affine-test.c alpha-loop.c alphamap.c blitters-test.c \
++	alpha-loop.c alphamap.c \
+ 	check-formats.c combiner-test.c composite.c \
+ 	composite-traps-test.c cover-test.c fence-image-self-test.c \
+ 	fetch-test.c filter-reduction-test.c glyph-test.c \
+ 	gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
+-	matrix-test.c oob-test.c pdf-op-test.c pixel-test.c \
++	oob-test.c pdf-op-test.c pixel-test.c \
+ 	prng-test.c radial-invalid.c radial-perf-test.c \
+-	region-contains-test.c region-test.c region-translate-test.c \
++	region-test.c region-translate-test.c \
+ 	rotate-test.c scaling-bench.c scaling-crash-test.c \
+ 	scaling-helpers-test.c scaling-test.c solid-test.c \
+-	stress-test.c thread-test.c tolerance-test.c trap-crasher.c
++	stress-test.c thread-test.c trap-crasher.c
+ am__can_run_installinfo = \
+   case $$AM_UPDATE_INFO_DIR in \
+     n|no|NO) false;; \
+@@ -844,19 +813,14 @@
+ 	alphamap		      \
+ 	gradient-crash-test	      \
+ 	pixel-test		      \
+-	matrix-test		      \
+ 	filter-reduction-test         \
+ 	composite-traps-test	      \
+-	region-contains-test	      \
+ 	glyph-test		      \
+ 	solid-test		      \
+ 	stress-test		      \
+ 	cover-test		      \
+-	blitters-test		      \
+-	affine-test		      \
+ 	scaling-test		      \
+ 	composite		      \
+-	tolerance-test		      \
+ 	$(NULL)
+ 
+ 
+@@ -953,10 +917,6 @@
+ 	@rm -f affine-bench$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(affine_bench_OBJECTS) $(affine_bench_LDADD) $(LIBS)
+ 
+-affine-test$(EXEEXT): $(affine_test_OBJECTS) $(affine_test_DEPENDENCIES) $(EXTRA_affine_test_DEPENDENCIES) 
+-	@rm -f affine-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(affine_test_OBJECTS) $(affine_test_LDADD) $(LIBS)
+-
+ alpha-loop$(EXEEXT): $(alpha_loop_OBJECTS) $(alpha_loop_DEPENDENCIES) $(EXTRA_alpha_loop_DEPENDENCIES) 
+ 	@rm -f alpha-loop$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(alpha_loop_OBJECTS) $(alpha_loop_LDADD) $(LIBS)
+@@ -965,10 +925,6 @@
+ 	@rm -f alphamap$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(alphamap_OBJECTS) $(alphamap_LDADD) $(LIBS)
+ 
+-blitters-test$(EXEEXT): $(blitters_test_OBJECTS) $(blitters_test_DEPENDENCIES) $(EXTRA_blitters_test_DEPENDENCIES) 
+-	@rm -f blitters-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(blitters_test_OBJECTS) $(blitters_test_LDADD) $(LIBS)
+-
+ check-formats$(EXEEXT): $(check_formats_OBJECTS) $(check_formats_DEPENDENCIES) $(EXTRA_check_formats_DEPENDENCIES) 
+ 	@rm -f check-formats$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(check_formats_OBJECTS) $(check_formats_LDADD) $(LIBS)
+@@ -1017,10 +973,6 @@
+ 	@rm -f lowlevel-blt-bench$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_LDADD) $(LIBS)
+ 
+-matrix-test$(EXEEXT): $(matrix_test_OBJECTS) $(matrix_test_DEPENDENCIES) $(EXTRA_matrix_test_DEPENDENCIES) 
+-	@rm -f matrix-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(matrix_test_OBJECTS) $(matrix_test_LDADD) $(LIBS)
+-
+ oob-test$(EXEEXT): $(oob_test_OBJECTS) $(oob_test_DEPENDENCIES) $(EXTRA_oob_test_DEPENDENCIES) 
+ 	@rm -f oob-test$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(oob_test_OBJECTS) $(oob_test_LDADD) $(LIBS)
+@@ -1045,10 +997,6 @@
+ 	@rm -f radial-perf-test$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(radial_perf_test_OBJECTS) $(radial_perf_test_LDADD) $(LIBS)
+ 
+-region-contains-test$(EXEEXT): $(region_contains_test_OBJECTS) $(region_contains_test_DEPENDENCIES) $(EXTRA_region_contains_test_DEPENDENCIES) 
+-	@rm -f region-contains-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(region_contains_test_OBJECTS) $(region_contains_test_LDADD) $(LIBS)
+-
+ region-test$(EXEEXT): $(region_test_OBJECTS) $(region_test_DEPENDENCIES) $(EXTRA_region_test_DEPENDENCIES) 
+ 	@rm -f region-test$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(region_test_OBJECTS) $(region_test_LDADD) $(LIBS)
+@@ -1089,10 +1037,6 @@
+ 	@rm -f thread-test$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS)
+ 
+-tolerance-test$(EXEEXT): $(tolerance_test_OBJECTS) $(tolerance_test_DEPENDENCIES) $(EXTRA_tolerance_test_DEPENDENCIES) 
+-	@rm -f tolerance-test$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(tolerance_test_OBJECTS) $(tolerance_test_LDADD) $(LIBS)
+-
+ trap-crasher$(EXEEXT): $(trap_crasher_OBJECTS) $(trap_crasher_DEPENDENCIES) $(EXTRA_trap_crasher_DEPENDENCIES) 
+ 	@rm -f trap-crasher$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(trap_crasher_OBJECTS) $(trap_crasher_LDADD) $(LIBS)
+@@ -1105,10 +1049,8 @@
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a1-trap-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-bench.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha-loop.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alphamap.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blitters-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-formats.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combiner-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-traps-test.Po@am__quote@ # am--include-marker
+@@ -1121,14 +1063,12 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infinite-loop.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matrix-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oob-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdf-op-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixel-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prng-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-invalid.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-perf-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-contains-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-translate-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rotate-test.Po@am__quote@ # am--include-marker
+@@ -1139,7 +1079,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solid-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread-test.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tolerance-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trap-crasher.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils-prng.Plo@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@ # am--include-marker
+@@ -1510,13 +1449,6 @@
+ 	--log-file $$b.log --trs-file $$b.trs \
+ 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-matrix-test.log: matrix-test$(EXEEXT)
+-	@p='matrix-test$(EXEEXT)'; \
+-	b='matrix-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ filter-reduction-test.log: filter-reduction-test$(EXEEXT)
+ 	@p='filter-reduction-test$(EXEEXT)'; \
+ 	b='filter-reduction-test'; \
+@@ -1531,13 +1463,6 @@
+ 	--log-file $$b.log --trs-file $$b.trs \
+ 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-region-contains-test.log: region-contains-test$(EXEEXT)
+-	@p='region-contains-test$(EXEEXT)'; \
+-	b='region-contains-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ glyph-test.log: glyph-test$(EXEEXT)
+ 	@p='glyph-test$(EXEEXT)'; \
+ 	b='glyph-test'; \
+@@ -1566,20 +1491,6 @@
+ 	--log-file $$b.log --trs-file $$b.trs \
+ 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-blitters-test.log: blitters-test$(EXEEXT)
+-	@p='blitters-test$(EXEEXT)'; \
+-	b='blitters-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-affine-test.log: affine-test$(EXEEXT)
+-	@p='affine-test$(EXEEXT)'; \
+-	b='affine-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ scaling-test.log: scaling-test$(EXEEXT)
+ 	@p='scaling-test$(EXEEXT)'; \
+ 	b='scaling-test'; \
+@@ -1594,13 +1505,6 @@
+ 	--log-file $$b.log --trs-file $$b.trs \
+ 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-tolerance-test.log: tolerance-test$(EXEEXT)
+-	@p='tolerance-test$(EXEEXT)'; \
+-	b='tolerance-test'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ .test.log:
+ 	@p='$<'; \
+ 	$(am__set_b); \
+@@ -1695,10 +1599,8 @@
+ distclean: distclean-am
+ 		-rm -f ./$(DEPDIR)/a1-trap-test.Po
+ 	-rm -f ./$(DEPDIR)/affine-bench.Po
+-	-rm -f ./$(DEPDIR)/affine-test.Po
+ 	-rm -f ./$(DEPDIR)/alpha-loop.Po
+ 	-rm -f ./$(DEPDIR)/alphamap.Po
+-	-rm -f ./$(DEPDIR)/blitters-test.Po
+ 	-rm -f ./$(DEPDIR)/check-formats.Po
+ 	-rm -f ./$(DEPDIR)/combiner-test.Po
+ 	-rm -f ./$(DEPDIR)/composite-traps-test.Po
+@@ -1711,14 +1613,12 @@
+ 	-rm -f ./$(DEPDIR)/gradient-crash-test.Po
+ 	-rm -f ./$(DEPDIR)/infinite-loop.Po
+ 	-rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
+-	-rm -f ./$(DEPDIR)/matrix-test.Po
+ 	-rm -f ./$(DEPDIR)/oob-test.Po
+ 	-rm -f ./$(DEPDIR)/pdf-op-test.Po
+ 	-rm -f ./$(DEPDIR)/pixel-test.Po
+ 	-rm -f ./$(DEPDIR)/prng-test.Po
+ 	-rm -f ./$(DEPDIR)/radial-invalid.Po
+ 	-rm -f ./$(DEPDIR)/radial-perf-test.Po
+-	-rm -f ./$(DEPDIR)/region-contains-test.Po
+ 	-rm -f ./$(DEPDIR)/region-test.Po
+ 	-rm -f ./$(DEPDIR)/region-translate-test.Po
+ 	-rm -f ./$(DEPDIR)/rotate-test.Po
+@@ -1729,7 +1629,6 @@
+ 	-rm -f ./$(DEPDIR)/solid-test.Po
+ 	-rm -f ./$(DEPDIR)/stress-test.Po
+ 	-rm -f ./$(DEPDIR)/thread-test.Po
+-	-rm -f ./$(DEPDIR)/tolerance-test.Po
+ 	-rm -f ./$(DEPDIR)/trap-crasher.Po
+ 	-rm -f ./$(DEPDIR)/utils-prng.Plo
+ 	-rm -f ./$(DEPDIR)/utils.Plo
+@@ -1780,10 +1679,8 @@
+ maintainer-clean: maintainer-clean-am
+ 		-rm -f ./$(DEPDIR)/a1-trap-test.Po
+ 	-rm -f ./$(DEPDIR)/affine-bench.Po
+-	-rm -f ./$(DEPDIR)/affine-test.Po
+ 	-rm -f ./$(DEPDIR)/alpha-loop.Po
+ 	-rm -f ./$(DEPDIR)/alphamap.Po
+-	-rm -f ./$(DEPDIR)/blitters-test.Po
+ 	-rm -f ./$(DEPDIR)/check-formats.Po
+ 	-rm -f ./$(DEPDIR)/combiner-test.Po
+ 	-rm -f ./$(DEPDIR)/composite-traps-test.Po
+@@ -1796,14 +1693,12 @@
+ 	-rm -f ./$(DEPDIR)/gradient-crash-test.Po
+ 	-rm -f ./$(DEPDIR)/infinite-loop.Po
+ 	-rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
+-	-rm -f ./$(DEPDIR)/matrix-test.Po
+ 	-rm -f ./$(DEPDIR)/oob-test.Po
+ 	-rm -f ./$(DEPDIR)/pdf-op-test.Po
+ 	-rm -f ./$(DEPDIR)/pixel-test.Po
+ 	-rm -f ./$(DEPDIR)/prng-test.Po
+ 	-rm -f ./$(DEPDIR)/radial-invalid.Po
+ 	-rm -f ./$(DEPDIR)/radial-perf-test.Po
+-	-rm -f ./$(DEPDIR)/region-contains-test.Po
+ 	-rm -f ./$(DEPDIR)/region-test.Po
+ 	-rm -f ./$(DEPDIR)/region-translate-test.Po
+ 	-rm -f ./$(DEPDIR)/rotate-test.Po
+@@ -1814,7 +1709,6 @@
+ 	-rm -f ./$(DEPDIR)/solid-test.Po
+ 	-rm -f ./$(DEPDIR)/stress-test.Po
+ 	-rm -f ./$(DEPDIR)/thread-test.Po
+-	-rm -f ./$(DEPDIR)/tolerance-test.Po
+ 	-rm -f ./$(DEPDIR)/trap-crasher.Po
+ 	-rm -f ./$(DEPDIR)/utils-prng.Plo
+ 	-rm -f ./$(DEPDIR)/utils.Plo