back out quartz patches - and try again for a 2.26.2 stable release

diff --git a/ChangeLog b/ChangeLog
index 629f7e730be9b1cdc6e2bf78fc471f1523f26817..db74f532c12e45f793209186429307c2dbea64a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
-January 19, 2010
-       - Release 2.26.1
+January 21, 2010
+       - Release 2.26.2
        - libcgraph.so   version bumped from 4 to 5 due to API changes
        - Allow ranksep to specify multiple radial differences in twopi
        - Allow the user to specify all pairwise distances in neato with

diff --git a/configure.ac b/configure.ac
index 711056cd1974774dbe38458972121c495734d575..f21305731236eee945ac54ee751e91f73b680e2e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,9 @@ dnl                       even => stable series
 dnl For the micro number: 0 => in-progress development (from cvs)
 dnl                       timestamp => tar-file snapshot or release
 m4_define(graphviz_version_major, 2)
-m4_define(graphviz_version_minor, 27)
+m4_define(graphviz_version_minor, 26)
 #NB: the next line gets changed to a date/time string for development releases
-m4_define(graphviz_version_micro, 0)
+m4_define(graphviz_version_micro, 2)
 
 AC_INIT([graphviz],[graphviz_version_major.graphviz_version_minor.graphviz_version_micro],[http://www.graphviz.org/])
 

diff --git a/plugin/quartz/gvloadimage_quartz.c b/plugin/quartz/gvloadimage_quartz.c
index 638291ac5d2e7f848dd75644a60fddca3201ec7f..ca3a52320fb990a447267bcc113ede951393c732 100644 (file)
--- a/plugin/quartz/gvloadimage_quartz.c
+++ b/plugin/quartz/gvloadimage_quartz.c
@@ -22,10 +22,6 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <CGDataProvider.h>
-#include <CGImage.h>
-#include <CGGLContext.h>
-
 #include "gvplugin_loadimage.h"
 
 #include "gvplugin_quartz.h"
@@ -188,4 +184,4 @@ gvplugin_installed_t gvloadimage_quartz_types[] = {
        {FORMAT_JPEG, "jpg:quartz", 8, &engine, NULL},
        {FORMAT_PNG, "png:quartz", 8, &engine, NULL},
        {0, NULL, 0, NULL, NULL}
-};
+};
\ No newline at end of file

diff --git a/plugin/quartz/gvplugin_quartz.h b/plugin/quartz/gvplugin_quartz.h
index 914e1f4fb1311c06664ab682888c14731a228b49..0b5ddbac47feb819308f50b14861e1522a20327c 100644 (file)
--- a/plugin/quartz/gvplugin_quartz.h
+++ b/plugin/quartz/gvplugin_quartz.h
@@ -17,10 +17,7 @@
 #ifndef GVPLUGIN_QUARTZ_H
 #define GVPLUGIN_QUARTZ_H
 
-#include <CoreGraphics.h>
-#include <CGDataConsumer.h>
-#include <CGFont.h>
-#include <AvailabilityMacros.h>
+#include <Availability.h>
 
 #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
 #include <ApplicationServices/ApplicationServices.h>

diff --git a/plugin/quartz/gvrender_quartz.c b/plugin/quartz/gvrender_quartz.c
index 7e8798199b13af4f4dad423904bc4882fa391c77..33246e55e377a042ba42d6a586cac98588ae01c5 100644 (file)
--- a/plugin/quartz/gvrender_quartz.c
+++ b/plugin/quartz/gvrender_quartz.c
@@ -21,20 +21,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <CGContext.h>
-#include <CGPDFContext.h>
-
 #include "gvplugin_device.h"
 #include "gvplugin_render.h"
 #include "graph.h"
 
 #include "gvplugin_quartz.h"
 
-#ifndef CGFLOAT_DEFINED
-/* nowhere defined, for Carbon Emacs the same work-around */
-typedef float CGFloat;
-#endif
-
 static CGFloat dashed[] = {6.0};
 static CGFloat dotted[] = {2.0, 6.0};