mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
ale: update to git head, fix gcc7 build.
This commit is contained in:
@@ -17,10 +17,10 @@ http://www.youtube.com/watch?v=ZPv58AWWGRQ"
|
||||
HOMEPAGE="https://github.com/czeidler/ALEditor"
|
||||
COPYRIGHT="2009-2014 UniAuckland Team"
|
||||
LICENSE="MIT"
|
||||
REVISION="5"
|
||||
srcGitRev="52a5a621e3c28fc04d46402fae263b9693bd68ab"
|
||||
REVISION="6"
|
||||
srcGitRev="90c1db5b38eedbb101dfc4648c13e65d552fc033"
|
||||
SOURCE_URI="https://github.com/czeidler/ALEditor/archive/$srcGitRev.tar.gz"
|
||||
CHECKSUM_SHA256="cda6bc713485c058b326bc79231a99c24abad36e7d0b68a9cbbc2b292092e683"
|
||||
CHECKSUM_SHA256="e20bffa0dd5d840a55ab79f4e04fb3d7955e1604b9eb40a5d7f047eb47c52fd8"
|
||||
SOURCE_FILENAME="ALEditor-$srcGitRev.tar.gz"
|
||||
SOURCE_DIR="ALEditor-$srcGitRev"
|
||||
PATCHES="ale-$portVersion.patchset"
|
||||
|
||||
@@ -1,27 +1,28 @@
|
||||
From 9207fb694ded934de6a9f798fb793ecc96335375 Mon Sep 17 00:00:00 2001
|
||||
From dadd0ac05fd7ca96c4e1f15be8a814e0c16f00ca Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sun, 22 Jan 2017 11:34:12 +0100
|
||||
Subject: fix x86_64 build.
|
||||
Date: Sat, 29 Sep 2018 15:41:42 +0200
|
||||
Subject: gcc7 fix
|
||||
|
||||
|
||||
diff --git a/src/customization/Object.cpp b/src/customization/Object.cpp
|
||||
index e1134a1..3690881 100644
|
||||
--- a/src/customization/Object.cpp
|
||||
+++ b/src/customization/Object.cpp
|
||||
@@ -396,8 +396,13 @@ BObject::_GetEventConnections()
|
||||
return fEventConnections;
|
||||
diff --git a/src/editor/LayoutEditView.cpp b/src/editor/LayoutEditView.cpp
|
||||
index 02b476f..e886be8 100644
|
||||
--- a/src/editor/LayoutEditView.cpp
|
||||
+++ b/src/editor/LayoutEditView.cpp
|
||||
@@ -1157,12 +1157,12 @@ StrokeRect(areaFrame);
|
||||
} else if (dynamic_cast<BLayout*>(item) != NULL)
|
||||
region.Exclude(item->Frame());
|
||||
|
||||
EventConnections* eventConnections = new EventConnections;
|
||||
+#if LONG_MAX == INT_MAX
|
||||
if (atomic_test_and_set(reinterpret_cast<int32*>(&fEventConnections),
|
||||
reinterpret_cast<int32>(eventConnections), 0) != 0)
|
||||
+#else
|
||||
+ if (atomic_test_and_set64(reinterpret_cast<int64*>(&fEventConnections),
|
||||
+ reinterpret_cast<int64>(eventConnections), 0) != 0)
|
||||
+#endif
|
||||
delete eventConnections;
|
||||
return fEventConnections;
|
||||
}
|
||||
- const int8 shade = 240;
|
||||
+ const uint8 shade = 240;
|
||||
rgb_color backgoundColor = {shade, shade, shade};
|
||||
SetHighColor(backgoundColor);
|
||||
FillRegion(®ion);
|
||||
|
||||
- const int8 shadeDark = 220;
|
||||
+ const uint8 shadeDark = 220;
|
||||
rgb_color borderColor = {shadeDark, shadeDark, shadeDark};
|
||||
SetHighColor(borderColor);
|
||||
StrokeRect(region.Frame());
|
||||
--
|
||||
2.10.2
|
||||
2.19.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user