Distrotech · aguai · Dec 29, 2015 · Dec 29, 2015 · Dec 29, 2015 · Dec 29, 2015
diff --git a/NEWS b/NEWS
@@ -1,3 +1,129 @@
+Release 1.15.4     (2016-12-9 Bryce Harrington <bryce@osg.samsung.com>)
+=======================================================================
+This new snapshot incorporates changes over the past year since the
+1.15.2 snapshot, including all the fixes from the 1.14 release series.
+
+Of particular note in this snapshot is a wealth of work by Adrian
+Johnson to enhance PDF support, as well as numerous bug fixes provided
+by him and other contributors.
+
+For a complete log of changes since the last release, please see:
+
+    http://cairographics.org/releases/ChangeLog.1.15.4
+
+Features
+--------
+* The PDF backend has gained support for a range of widely used
+  features, including thumbnails, page labels, metadata, document
+  outlines, structured text, hyperlinks, and tags.  Tags permit adding
+  logical info such as headings, tables, figures, etc. that facilitates
+  indexing, accessibility, text reflow, searching, and extraction of the
+  tagged items to other software.  For details on this new PDF
+  functionality, see:
+
+    https://lists.cairographics.org/archives/cairo/2016-June/027427.html
+
+
+API Changes
+-----------
+
+  cairo_win32_surface_create_with_format
+
+    Added a cairo API to set up Win32 surfaces for HDC with alpha channels.
+
+  cairo_pdf_surface_add_outline
+  cairo_pdf_surface_set_metadata
+  cairo_pdf_surface_set_page_label
+  cairo_pdf_surface_set_thumbnail_size
+  cairo_tag_begin
+  cairo_tag_end
+  CAIRO_STATUS_TAG_ERROR
+
+    New API for added PDF functionality (see above), and new error
+    status item for problems relating to PDF tagging.
+
+  CAIRO_STATUS_WIN32_GDI_ERROR
+  CAIRO_STATUS_FREETYPE_ERROR
+  CAIRO_STATUS_PNG_ERROR
+
+    New error status items for handling of GDI, libfreetype, and libpng
+    errors, respectively.
+
+Dependency Changes
+------------------
+None
+
+Performance Optimizations
+-------------------------
+None
+
+Bug Fixes
+---------
+* Bug fixes from 1.15.2 (see the 1.15.2 NEWS for details)
+
+* Fix playback of recording surfaces into PDF surfaces, where objects
+  with negative coordinates were not getting drawn.  To address this,
+  the coordinate systems for PDF and PS have been changed to match
+  cairo's coordinate system.  This allows recording surfaces to be
+  emitted in cairo coordinates, and results in the same origin being
+  used for all operations when using the recording surface XObject.
+  Test cases for PDF and PS have also been updated accordingly.
+  (Bug #89232)
+
+* Fix "invalidfont" error on some printers when printing PDFs with
+  embedded fonts that have glyphs (such as spaces) with
+  num_contours == 0.  (Bug #79897)
+
+* Fix missing glyphs such as thin dashes, which get scaled to 0 in
+  userspace and thus have their drawing operations culled.  (Bug #94615)
+
+* Fix other oddities caused by variously idiosyncratic fonts.
+
+* Fix deadlock when destruction of a scaled font indirectly triggers
+  destruction of a second scaled font, causing the global cache to be
+  locked twice.  (Bug #93891)
+
+* Fix X errors reported to applications when shmdt() is called before
+  the Attach request is processed, due to missing xcb and xlib calls.
+
+* Fix random failure in record-paint-alpha-clip-mast test case, caused
+  by an incorrect assumption that a deferred clear can be skipped.
+  (Bug #84330)
+
+* Fix crash when dealing with an XShmGetImage() failure, caused by a
+  double free in _get_image_surface().  (Bug #91967)
+
+* Fix invalid execution of ASCII85 data by the PS interpreter that the
+  image operator didn't use, by flushing the extraneous data after
+  drawing the image.  (Bug #84811)
+
+* Fix decoding of Adobe Photoshop's inverted CMYK JPEG files in PDF
+  export.
+
+* Fix unbounded surface assertion in win32-print code.
+
+* Fix a data race in freed_pool discovered by Firefox's cairo usage.
+  The patch adads atomic int load and store functions, with relaxed
+  memory ordering.  (Bug #90318)
+
+* Cleanup debugging text sent to stdout instead of log.  (Bug #95227)
+
+* Fix build issue when using non-GNU strings utility.  (Bug #88639)
+
+* Fix build of cairo modules as regular modules, not as versioned shared
+  libaries.  (Bug #29319)
+
+* Fix build on win32 using gcc 5.4.
+
+* Fix build of script backend to require zlib.
+
+* Update test suite reference images using Debian Jessie 64-bit and
+  poppler current as of June, 2016.
+
+* Various improvements to documentation and tests, compiler warning
+  fixes, and an assortment of code refactoring and cleanup.
+
+
 Release 1.15.2     (2015-12-10 Bryce Harrington <bryce@osg.samsung.com>)
 ========================================================================
 This release is largely a rollup to include a variety of fixes that
@@ -30,7 +156,7 @@ None
 
 Bug Fixes
 ---------
-* All the bug fixes from 1.14.2, 1.14.4, and 14.6
+* All the bug fixes from 1.14.2, 1.14.4, and 1.14.6
 
 * Fix xcb/xlib compilation and calls.  Make image boxes behave when SHM
   is not available.
@@ -55,7 +181,7 @@ Bug Fixes
   doing anything.
   (Bug #90984)
 
-* Improve rendering with Quarts to better match pixman's blending and
+* Improve rendering with Quartz to better match pixman's blending and
   filtering behavior.
 
 

diff --git a/README b/README
@@ -121,7 +121,7 @@ Supported, "platform" surface backends
 
 	quartz backend
 	--------------
-	MacOS X >= 10.5 with Xcode >= 3.0
+	MacOS X >= 10.4 with Xcode >= 2.5
 
 	win32 backend
 	-------------

diff --git a/RELEASING b/RELEASING
@@ -2,10 +2,10 @@ Here are the steps to follow to create a new cairo release:
 
 1) Ensure that there are no local, uncommitted/unpushed mods.
 
-        You're probably in a good state if both "git diff
-        HEAD" and "git log master..origin/master" give no output.  Also make
-        sure you have libglib2.0-doc installed (else you'll get
-        excessive gtk-doc cross reference warnings in the next step).
+	You're probably in a good state if both "git diff
+	HEAD" and "git log master..origin/master" give no output.  Also make
+	sure you have libglib2.0-doc installed (else you'll get
+	excessive gtk-doc cross reference warnings in the next step).
 
 2) Verify that the code passes "make distcheck"
 
@@ -38,7 +38,7 @@ Here are the steps to follow to create a new cairo release:
 	suite passing, here's the magic env vars to set when doing
 	'make distcheck' and 'make release-publish' that will let you
 	get away with it.  At any cost, never ever release without
-	(implied) distchecking.  Every time we got around it, it turned
+	(implied) distchecking.	 Every time we got around it, it turned
 	out to be a disaster.  Anyway, here's the pass code:
 
 		DISPLAY= CAIRO_TEST_TARGET=" "

diff --git a/boilerplate/cairo-boilerplate-win32.c b/boilerplate/cairo-boilerplate-win32.c
@@ -28,6 +28,9 @@
 
 #include <cairo-win32.h>
 
+#include <errno.h>
+#include <limits.h>
+
 static const cairo_user_data_key_t win32_closure_key;
 
 typedef struct _win32_target_closure {

diff --git a/build/aclocal.float.m4 b/build/aclocal.float.m4
@@ -31,10 +31,10 @@ int main() { return 0; }
 
 ]])], [
 
-if strings - conftest$ac_exeext | grep noonsees >/dev/null ; then
+if strings -a conftest$ac_exeext | grep noonsees >/dev/null ; then
   ax_cv_c_float_words_bigendian=yes
 fi
-if strings - conftest$ac_exeext | grep seesnoon >/dev/null ; then
+if strings -a conftest$ac_exeext | grep seesnoon >/dev/null ; then
   if test "$ax_cv_c_float_words_bigendian" = unknown; then
     ax_cv_c_float_words_bigendian=no
   else

diff --git a/cairo-version.h b/cairo-version.h
@@ -3,6 +3,6 @@
 
 #define CAIRO_VERSION_MAJOR 1
 #define CAIRO_VERSION_MINOR 15
-#define CAIRO_VERSION_MICRO 2
+#define CAIRO_VERSION_MICRO 5
 
 #endif
diff --git a/configure.ac b/configure.ac
@@ -296,7 +296,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(beos, BeOS/Zeta, no, [
 dnl ===========================================================================
 
 CAIRO_ENABLE_SURFACE_BACKEND(drm, DRM, no, [
-  drm_REQUIRES="libudev >= 136"
+  drm_REQUIRES="libudev >= 136, libdrm >= 2.4"
   PKG_CHECK_MODULES(drm, $drm_REQUIRES, ,
    [use_drm="no (requires $drm_REQUIRES, udev is available from git://git.kernel.org/pub/scm/linux/hotplug/udev.git)"])
 ])
@@ -470,6 +470,9 @@ dnl ===========================================================================
 any2ppm_cs=no
 CAIRO_ENABLE_SURFACE_BACKEND(script, script, yes, [
   any2ppm_cs=yes
+  # The script backend requires zlib.
+  use_script=$have_libz
+  script_NONPKGCONFIG_LIBS=-lz
 ])
 
 dnl ===========================================================================

diff --git a/doc/public/cairo-docs.xml b/doc/public/cairo-docs.xml
@@ -18,6 +18,7 @@
     <xi:include href="xml/cairo-transforms.xml"/>
     <xi:include href="xml/cairo-text.xml"/>
     <xi:include href="xml/cairo-raster-source.xml"/>
+    <xi:include href="xml/cairo-tag.xml"/>
   </chapter>
   <chapter id="cairo-fonts">
     <title>Fonts</title>

diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
@@ -68,13 +68,20 @@ cairo_image_surface_get_stride
 <SECTION>
 <FILE>cairo-pdf</FILE>
 CAIRO_HAS_PDF_SURFACE
+CAIRO_PDF_OUTLINE_ROOT
+cairo_pdf_outline_flags_t
+cairo_pdf_metadata_t
 cairo_pdf_surface_create
 cairo_pdf_surface_create_for_stream
 cairo_pdf_surface_restrict_to_version
 cairo_pdf_version_t
 cairo_pdf_get_versions
 cairo_pdf_version_to_string
 cairo_pdf_surface_set_size
+cairo_pdf_surface_add_outline
+cairo_pdf_surface_set_metadata
+cairo_pdf_surface_set_page_label
+cairo_pdf_surface_set_thumbnail_size
 </SECTION>
 
 <SECTION>
@@ -407,6 +414,14 @@ cairo_raster_source_copy_func_t
 cairo_raster_source_finish_func_t
 </SECTION>
 
+<SECTION>
+<FILE>cairo-tag</FILE>
+CAIRO_TAG_DEST
+CAIRO_TAG_LINK
+cairo_tag_begin
+cairo_tag_end
+</SECTION>
+
 <SECTION>
 <FILE>cairo-matrix</FILE>
 cairo_matrix_t

diff --git a/src/.gitignore b/src/.gitignore
@@ -36,3 +36,7 @@ headers-standalone
 !cairo-uninstalled.pc.in
 !cairo-features.pc.in
 !cairo-features-uninstalled.pc.in
+.history
+.history/*
+.gitignore
+
diff --git a/src/Makefile.sources b/src/Makefile.sources
@@ -279,8 +279,8 @@ _cairo_deflate_stream_sources = cairo-deflate-stream.c
 cairo_sources += $(_cairo_deflate_stream_sources)
 
 cairo_pdf_headers = cairo-pdf.h
-cairo_pdf_private = cairo-pdf-surface-private.h
-cairo_pdf_sources = cairo-pdf-surface.c
+cairo_pdf_private = cairo-pdf-surface-private.h cairo-tag-stack-private.h cairo-tag-attributes-private.h
+cairo_pdf_sources = cairo-pdf-surface.c cairo-pdf-interchange.c cairo-tag-stack.c cairo-tag-attributes.c
 
 cairo_svg_headers = cairo-svg.h
 cairo_svg_private = cairo-svg-surface-private.h