From 9c9ce13015bba4620cce7c08cb6220472e4efdf7 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 3 Jul 2019 19:39:09 +0000
Subject: [PATCH] agg: enable x86_64 arch

---
 x11-libs/agg/agg-2.5.recipe           |  4 +--
 x11-libs/agg/patches/agg-2.5.patchset | 36 ++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe
index 24c77a887..1c8dbb12e 100644
--- a/x11-libs/agg/agg-2.5.recipe
+++ b/x11-libs/agg/agg-2.5.recipe
@@ -4,13 +4,13 @@ graphic library, written in industrially standard C++."
 HOMEPAGE="https://en.wikipedia.org/wiki/Anti-Grain_Geometry"
 COPYRIGHT="2002-2006 Maxim Shemanarev"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://sourceforge.net/projects/cross-stuff/files/OldFiles/agg-2.5.tar.gz"
 CHECKSUM_SHA256="ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f"
 PATCHES="agg-2.5.patchset"
 
 ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
 
 libVersion="2.0.4"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
diff --git a/x11-libs/agg/patches/agg-2.5.patchset b/x11-libs/agg/patches/agg-2.5.patchset
index 23cf3ceda..481f8d654 100644
--- a/x11-libs/agg/patches/agg-2.5.patchset
+++ b/x11-libs/agg/patches/agg-2.5.patchset
@@ -1,4 +1,4 @@
-From 7a5199ab842d8aa425590ffc5419ad3015abbc10 Mon Sep 17 00:00:00 2001
+From c5cda046a3d03dac394734473dfad114be35c502 Mon Sep 17 00:00:00 2001
 From: Kacper Kasper <kacperkasper@gmail.com>
 Date: Thu, 24 Apr 2014 20:00:29 +0000
 Subject: Haiku support
@@ -69,10 +69,10 @@ index ebe5e7e..c6622bc 100644
 -SUBDIRS = X11 sdl win32 AmigaOS BeOS mac
 +SUBDIRS = X11 sdl win32 AmigaOS Haiku mac
 -- 
-1.8.3.4
+2.21.0
 
 
-From 6aadf8ccb0db0ba33c33220ed9c70d078163ee02 Mon Sep 17 00:00:00 2001
+From 8c170e5f049f679281f2bffbe9641ce3589cfaf0 Mon Sep 17 00:00:00 2001
 From: Kacper Kasper <kacperkasper@gmail.com>
 Date: Fri, 25 Apr 2014 12:52:34 +0000
 Subject: fix unsigned integer overflows
@@ -236,4 +236,32 @@ index 3a39caa..1fddb4e 100644
          }
  
 -- 
-1.8.3.4
+2.21.0
+
+
+From 89c616262f6791889bfbe721da3a4218a25affd2 Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Thu, 19 Dec 2013 01:45:04 +0100
+Subject: Fix the agg headers to be proper C++.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Axel Dörfler <axeld@pinc-software.de>
+
+diff --git a/include/agg_renderer_outline_aa.h b/include/agg_renderer_outline_aa.h
+index ce25a2e..fa3f747 100644
+--- a/include/agg_renderer_outline_aa.h
++++ b/include/agg_renderer_outline_aa.h
+@@ -1375,7 +1375,7 @@ namespace agg
+         //---------------------------------------------------------------------
+         void profile(const line_profile_aa& prof) { m_profile = &prof; }
+         const line_profile_aa& profile() const { return *m_profile; }
+-        line_profile_aa& profile() { return *m_profile; }
++        line_profile_aa& profile() { return *(line_profile_aa*)m_profile; }
+ 
+         //---------------------------------------------------------------------
+         int subpixel_width() const { return m_profile->subpixel_width(); }
+-- 
+2.21.0
+