Add patch to allow building with later freetype versions. Bug #175640.

Package-Manager: portage-2.1.2.4

4 files changed, 66 insertions, 10 deletions

diff --git a/media-libs/wxsvg/ChangeLog b/media-libs/wxsvg/ChangeLog
index b9a98cf2d150..50c9c38a24b3 100644
--- a/media-libs/wxsvg/ChangeLog
+++ b/media-libs/wxsvg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/wxsvg
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/ChangeLog,v 1.1 2007/01/28 20:02:38 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/ChangeLog,v 1.2 2007/04/23 03:27:28 dirtyepic Exp $
+
+  23 Apr 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/wxsvg-1.0_beta7-freetype.patch, wxsvg-1.0_beta7.ebuild:
+  Add patch to allow building with later freetype versions.  Bug #175640.
 
 *wxsvg-1.0_beta7 (28 Jan 2007)
 
diff --git a/media-libs/wxsvg/Manifest b/media-libs/wxsvg/Manifest
index 45bd8df2e32a..aa222150ba26 100644
--- a/media-libs/wxsvg/Manifest
+++ b/media-libs/wxsvg/Manifest
@@ -1,12 +1,16 @@
+AUX wxsvg-1.0_beta7-freetype.patch 1442 RMD160 f16802e0cfeea0165dcc102761cda52d2a093d12 SHA1 e01b7100d876ee09ae29b2cee0cd989a2acc4988 SHA256 49aa6cc9a2e584a08d7604e1c588a37366c14b5d3bb649014938d85300eeb253
+MD5 1da7d651c66fc1d83eed494fab094abd files/wxsvg-1.0_beta7-freetype.patch 1442
+RMD160 f16802e0cfeea0165dcc102761cda52d2a093d12 files/wxsvg-1.0_beta7-freetype.patch 1442
+SHA256 49aa6cc9a2e584a08d7604e1c588a37366c14b5d3bb649014938d85300eeb253 files/wxsvg-1.0_beta7-freetype.patch 1442
 DIST wxsvg-1.0b7_1.tar.gz 681769 RMD160 ecbcfae2f486ec9f2b2b8e6c6cfebf32c9e4a999 SHA1 ad180cae3554130633e7ccda09822495b2486b19 SHA256 0d92c7a2716939d98b21b52abe9edf8b0b81382cdcac05296569885f6280c25a
-EBUILD wxsvg-1.0_beta7.ebuild 1037 RMD160 b089ddb4b9f01b51de899acafc921854fd936550 SHA1 a49f3c589bfba788e4a2f2e0f63ae0b974420ffe SHA256 b3d160b6150c3913ab473dc671723415854916231c53345a47bc617be0c1442f
-MD5 6daa93cd9709875d87822556767a12e7 wxsvg-1.0_beta7.ebuild 1037
-RMD160 b089ddb4b9f01b51de899acafc921854fd936550 wxsvg-1.0_beta7.ebuild 1037
-SHA256 b3d160b6150c3913ab473dc671723415854916231c53345a47bc617be0c1442f wxsvg-1.0_beta7.ebuild 1037
-MISC ChangeLog 385 RMD160 0cdce8823c8c87c321073921df7bd25ed7cf88af SHA1 9ba5bbe211de99fddee24ce120874140d3eb9d0b SHA256 c032ab3886ad48665fad31cdd2123a3626c9c6049d340dce85935e568f1e59e5
-MD5 baa2fe8d5bd5926e40b39a989d489801 ChangeLog 385
-RMD160 0cdce8823c8c87c321073921df7bd25ed7cf88af ChangeLog 385
-SHA256 c032ab3886ad48665fad31cdd2123a3626c9c6049d340dce85935e568f1e59e5 ChangeLog 385
+EBUILD wxsvg-1.0_beta7.ebuild 1122 RMD160 9f7222ea01a31e4c40b6457f38385949c3bfefc4 SHA1 71856e9fa5ea7989843dde9cdf67dbe19ee0adc6 SHA256 ef91300b8c26a6b79065e6d359079c19b56385eb4b47716ffcbfc040767f3be4
+MD5 2abf3c9f88aff95cba54c639efd01cc8 wxsvg-1.0_beta7.ebuild 1122
+RMD160 9f7222ea01a31e4c40b6457f38385949c3bfefc4 wxsvg-1.0_beta7.ebuild 1122
+SHA256 ef91300b8c26a6b79065e6d359079c19b56385eb4b47716ffcbfc040767f3be4 wxsvg-1.0_beta7.ebuild 1122
+MISC ChangeLog 573 RMD160 07f87726b01f52c4336a8aa5eafaee3b1da96173 SHA1 905d997ff92d0e43664fbea64acd47cacdf94440 SHA256 9f2785c1208e9c3b1fae33b7b503ce05aad78739ceed890ffacadd96b00f3709
+MD5 a9d84e4ef38d6d8f51ae406cabbf2e22 ChangeLog 573
+RMD160 07f87726b01f52c4336a8aa5eafaee3b1da96173 ChangeLog 573
+SHA256 9f2785c1208e9c3b1fae33b7b503ce05aad78739ceed890ffacadd96b00f3709 ChangeLog 573
 MISC metadata.xml 230 RMD160 8900642143e34e5c6dd1df987c924ede96ae6bb0 SHA1 6c8fe85479c2fb5db137f9b9f85b56449bf21d79 SHA256 4bb9573931fffa78f631176d18a7aa5341ac7d832169f2ebc6df3d65f16b8e8b
 MD5 2f58f2c24eeea3b0135c9dfffba7fe67 metadata.xml 230
 RMD160 8900642143e34e5c6dd1df987c924ede96ae6bb0 metadata.xml 230
diff --git a/media-libs/wxsvg/files/wxsvg-1.0_beta7-freetype.patch b/media-libs/wxsvg/files/wxsvg-1.0_beta7-freetype.patch
new file mode 100644
index 000000000000..cfc7acddb499
--- /dev/null
+++ b/media-libs/wxsvg/files/wxsvg-1.0_beta7-freetype.patch
@@ -0,0 +1,41 @@
+diff -Naur wxsvg-1.0b7-orig/src/freetype/SVGCanvasTextFreetype.cpp wxsvg-1.0b7/src/freetype/SVGCanvasTextFreetype.cpp
+--- wxsvg-1.0b7-orig/src/freetype/SVGCanvasTextFreetype.cpp	2007-04-22 21:08:31.000000000 -0600
++++ wxsvg-1.0b7/src/freetype/SVGCanvasTextFreetype.cpp	2007-04-22 21:14:32.000000000 -0600
+@@ -163,7 +163,7 @@
+   }
+ }
+ 
+-static gint moveto(FT_Vector* to, gpointer data)
++static gint moveto(const FT_Vector* to, gpointer data)
+ {
+   wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
+   
+@@ -179,7 +179,7 @@
+   return 0;
+ }
+ 
+-static gint lineto (FT_Vector* to, gpointer data)
++static gint lineto (const FT_Vector* to, gpointer data)
+ {
+   wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
+   if (!canvasText->m_endpath)
+@@ -192,7 +192,7 @@
+   return 0;
+ }
+ 
+-static gint conicto(FT_Vector* ftcontrol, FT_Vector* to, gpointer data)
++static gint conicto(const FT_Vector* ftcontrol, const FT_Vector* to, gpointer data)
+ {
+   wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
+   if (!canvasText->m_endpath)
+@@ -207,8 +207,8 @@
+   return 0;
+ }
+ 
+-static gint cubicto(FT_Vector* ftcontrol1, FT_Vector* ftcontrol2,
+- FT_Vector* to, gpointer data)
++static gint cubicto(const FT_Vector* ftcontrol1, const FT_Vector* ftcontrol2,
++ const FT_Vector* to, gpointer data)
+ {
+   wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
+   if (!canvasText->m_endpath)
diff --git a/media-libs/wxsvg/wxsvg-1.0_beta7.ebuild b/media-libs/wxsvg/wxsvg-1.0_beta7.ebuild
index 9dcbe3c0b93d..44f5a43f0f49 100644
--- a/media-libs/wxsvg/wxsvg-1.0_beta7.ebuild
+++ b/media-libs/wxsvg/wxsvg-1.0_beta7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/wxsvg-1.0_beta7.ebuild,v 1.1 2007/01/28 20:02:38 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/wxsvg-1.0_beta7.ebuild,v 1.2 2007/04/23 03:27:28 dirtyepic Exp $
 
 inherit eutils wxwidgets
 
@@ -26,6 +26,13 @@ DEPEND="=x11-libs/wxGTK-2.6*
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-freetype.patch
+}
+
 src_compile() {
 	export WX_GTK_VER="2.6"
 	need-wxwidgets gtk2