[magics] 04/04: Add compile fixes

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository magics.

commit 5320a0b0b461ffa8adddc1addf75642935368d8e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Mar 22 16:16:57 2016 +0000

    Add compile fixes
---
 debian/changelog                   |  4 ++--
 debian/patches/compile-fixes.patch | 20 ++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0450e83..4ac1579 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-magics++ (2.28.0-1) UNRELEASED; urgency=medium
+magics++ (2.28.0-1) unstable; urgency=medium
 
   * New upstream release.
   * Refresh patches:
     - compile-fixes.patch: fixed upstream
   * Move auto_ptr -> unique_ptr for c++11 (G++ 6) move
 
- -- Alastair McKinstry <mckinstry at debian.org>  Fri, 18 Mar 2016 10:44:16 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 22 Mar 2016 18:44:16 +0000
 
 magics++ (2.26.2-3) unstable; urgency=medium
 
diff --git a/debian/patches/compile-fixes.patch b/debian/patches/compile-fixes.patch
new file mode 100644
index 0000000..68fb39f
--- /dev/null
+++ b/debian/patches/compile-fixes.patch
@@ -0,0 +1,20 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: compile fix.
+Forwarded: no
+Last-Updated: 2016-03-22
+
+Index: magics++-2.28.0/src/drivers/CairoDriver.cc
+===================================================================
+--- magics++-2.28.0.orig/src/drivers/CairoDriver.cc
++++ magics++-2.28.0/src/drivers/CairoDriver.cc
+@@ -539,8 +539,8 @@ MAGICS_NO_EXPORT void CairoDriver::write
+ 
+     // DPI
+     TIFFSetField(tif, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH);
+-    TIFFSetField(tif, TIFFTAG_XRESOLUTION, (float) 90.;// resolution_);
+-    TIFFSetField(tif, TIFFTAG_YRESOLUTION, (float) 90.;// resolution_);
++    TIFFSetField(tif, TIFFTAG_XRESOLUTION, (float) 90.);// resolution_);
++    TIFFSetField(tif, TIFFTAG_YRESOLUTION, (float) 90.);// resolution_);
+ 
+     unsigned char *buf;
+     if (TIFFScanlineSize(tif))
diff --git a/debian/patches/series b/debian/patches/series
index 0622f20..2d4a019 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ reproducibility.patch
 pkgconfig-fix.patch
 cmake-config.patch
 unique-ptr.patch
+compile-fixes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git