WonderBrush: bump revision

This commit is contained in:
Sergei Reznikov
2019-07-04 18:18:58 +03:00
parent cd367f5511
commit a52609a5e8
2 changed files with 19 additions and 24 deletions

View File

@@ -1,26 +1,22 @@
From 1e66e0ad302aefc29e41d8635bf3773213c365db 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
From 8b996fea889990a6a0e80095e3196fae90114ae6 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Thu, 4 Jul 2019 16:44:48 +0300
Subject: Fix 32bit build
Signed-off-by: Axel Dörfler <axeld@pinc-software.de>
diff --git a/third_party/agg/include/agg_renderer_outline_aa.h b/third_party/agg/include/agg_renderer_outline_aa.h
index 58af906..e891a17 100644
--- a/third_party/agg/include/agg_renderer_outline_aa.h
+++ b/third_party/agg/include/agg_renderer_outline_aa.h
@@ -1371,7 +1371,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; }
diff --git a/common/src/gui/BubbleHelper.cpp b/common/src/gui/BubbleHelper.cpp
index baaef00..6115163 100644
--- a/common/src/gui/BubbleHelper.cpp
+++ b/common/src/gui/BubbleHelper.cpp
@@ -292,7 +292,7 @@ end:
}
//---------------------------------------------------------------------
int subpixel_width() const { return m_profile->subpixel_width(); }
// _helper
-int
+status_t
BubbleHelper::_helper(void *arg)
{
((BubbleHelper*)arg)->_Helper();
--
2.21.0

View File

@@ -20,12 +20,11 @@ not actually destroy any pixel data."
HOMEPAGE="http://yellowbites.com/wonderbrush.html"
COPYRIGHT="2005-2019, Stephan Aßmus und Ingo Weinhold GbR"
LICENSE="WonderBrush"
REVISION="7"
srcGitRev="0313cf0421fa8a576471b83f0ebef7026f5b1fa0"
REVISION="8"
srcGitRev="30ccad1bf0a08a0021dc213528ccf274b93e21e8"
SOURCE_URI="https://github.com/stippi/WonderBrush-v2/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="961316483e129143172bc3f5fa58fa3e08e44d24ce7390939aab30a64dfb6051"
CHECKSUM_SHA256="b58b575be1925b306f2c8909ada118471a9f6ee8f8e8a52afc38eaf113a137bd"
SOURCE_DIR="WonderBrush-v2-$srcGitRev"
PATCHES="wonderbrush-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86_64"