3 files changed, 14 insertions, 14 deletions
diff --git a/astro/astrometry/files/patch-cairoutils.c b/astro/astrometry/files/patch-cairoutils.c
deleted file mode 100644
index 65255ecab452..000000000000
--- a/astro/astrometry/files/patch-cairoutils.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/cairoutils.c.orig	2012-04-25 05:33:34.000000000 +0200
-+++ util/cairoutils.c	2012-04-25 05:35:29.000000000 +0200
-@@ -25,6 +25,7 @@
- 
- #include <cairo.h>
- #include <png.h>
-+#include <zlib.h>
- #include <jpeglib.h>
- 
- #include "an-bool.h"
diff --git a/astro/astrometry/files/patch-util_cairoutils.c b/astro/astrometry/files/patch-util_cairoutils.c
new file mode 100644
index 000000000000..16552f3a577a
--- /dev/null
+++ b/astro/astrometry/files/patch-util_cairoutils.c
@@ -0,0 +1,10 @@
+--- util/cairoutils.c.orig	2015-12-12 19:02:27 UTC
++++ util/cairoutils.c
+@@ -12,6 +12,7 @@
+ 
+ #include <cairo.h>
+ #include <png.h>
++#include <zlib.h>
+ #include <jpeglib.h>
+ #include <zlib.h>
+ 
diff --git a/astro/astrometry/files/patch-util-permutedsort.c b/astro/astrometry/files/patch-util_permutedsort.c
index 66c756326b97..82962a23a40e 100644
--- a/astro/astrometry/files/patch-util-permutedsort.c
+++ b/astro/astrometry/files/patch-util_permutedsort.c
@@ -1,6 +1,6 @@
---- util/permutedsort.c.orig	2013-10-29 22:08:09 +0800
+--- util/permutedsort.c.orig	2015-12-12 19:02:27 UTC
 +++ util/permutedsort.c
-@@ -105,6 +105,12 @@ int* permuted_sort(const void* realarray
+@@ -92,6 +92,12 @@ int* permuted_sort(const void* realarray
  	if (isnan(d2)) return -1;							\
  	assert(0); return 0;
  
@@ -13,7 +13,7 @@
  	//printf("d1=%g, d2=%g\n", d1, d2);				   
  
  int compare_doubles_asc(const void* v1, const void* v2) {
-@@ -135,13 +141,13 @@ int compare_floats_desc(const void* v1, 
+@@ -122,13 +128,13 @@ int compare_floats_desc(const void* v1, 
  int compare_int64_asc(const void* v1, const void* v2) {
  	int64_t f1 = *(int64_t*)v1;
  	int64_t f2 = *(int64_t*)v2;
@@ -28,4 +28,4 @@
 +	COMPARE_INT(f1, f2, >, <);
  }
  
- 
+ // Versions for use with QSORT_R