Subject: incorrect patch for graphics/freetype2
To: None <tech-pkg@NetBSD.org>
From: Klaus Heinz <k.heinz.jul.sieben@kh-22.de>
List: tech-pkg
Date: 07/14/2007 20:25:02
--vtzGhvizbBRQ85DL
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi,
according to the CVS log message graphics/wxsvg/patches/patch-aa tries to
patch the file for machines where freetype 2.2* or _later_ is installed
but in fact the patch recognizes even freetype 2.1.10 and thus breaks
graphics/wxsvg.
I think the appended patch shows what was originally intended.
ciao
Klaus
--vtzGhvizbBRQ85DL
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-aa.diff"
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/wxsvg/patches/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- patches/patch-aa 20 Jun 2006 12:54:48 -0000 1.1
+++ patches/patch-aa 14 Jul 2007 18:22:41 -0000
@@ -6,7 +6,7 @@
}
}
-+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
++#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR > 2
+gint moveto(const FT_Vector* to, gpointer data)
+#else
gint moveto(FT_Vector* to, gpointer data)
@@ -18,7 +18,7 @@
return 0;
}
-+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
++#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR > 2
+static gint lineto (const FT_Vector* to, gpointer data)
+#else
static gint lineto (FT_Vector* to, gpointer data)
@@ -30,7 +30,7 @@
return 0;
}
-+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
++#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR > 2
+static gint conicto(const FT_Vector* ftcontrol, const FT_Vector* to, gpointer data)
+#else
static gint conicto(FT_Vector* ftcontrol, FT_Vector* to, gpointer data)
@@ -42,7 +42,7 @@
return 0;
}
-+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
++#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR > 2
+static gint cubicto(const FT_Vector* ftcontrol1, const FT_Vector* ftcontrol2,
+ const FT_Vector* to, gpointer data)
+#else
--vtzGhvizbBRQ85DL--