colors: patch is upstreamed.

haiku-apps/colors/colors-2.3.recipe

@@ -13,12 +13,11 @@ HOMEPAGE="https://github.com/jscipione/Colors"
 COPYRIGHT="2001-2008 Werner Freytag
 	2009-2013 John Scipione"
 LICENSE="MIT"
-REVISION="3"
+REVISION="4"
-srcGitRev="9d832d2c995f822e6386223cb36840743c7e886a"
+srcGitRev="146a127f7ab7cdbeadaefc74247b10cf00c7383c"
 SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="05c5d19b6a29c532e32b11ce6ac805736eddca7348fbf3b917a60f31d29f454d"
+CHECKSUM_SHA256="9a84bc025db4f0293d875a399aaa9dd944c90504ae218840065c823e4fbd1bf8"
 SOURCE_DIR="Colors-$srcGitRev"
-PATCHES="colors-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

haiku-apps/colors/patches/colors-2.3.patchset

@@ -1,35 +0,0 @@
-From bc61daf81e28c2ac1a8e9cbac88d839c4b7b568f Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Thu, 26 Jan 2017 22:08:41 +0100
-Subject: x86_64 build fix.
-
-
-diff --git a/ColorContainersView.cpp b/ColorContainersView.cpp
-index 77154f9..005fabe 100644
---- a/ColorContainersView.cpp
-+++ b/ColorContainersView.cpp
-@@ -102,7 +102,7 @@ ColorContainersView::AttachedToWindow()
- 	BMessage* settings = static_cast<ColorsApplication*>(be_app)->Settings();
- 
- 	for (int32 i = 0; i < kColorContainerCount; ++i) {
--		long int int_color;
-+		int32 int_color;
- 		if (settings->FindInt32("color_well", i, &int_color) == B_OK)
- 			fColorContainer[i]->SetColor(int_color);
- 		else
-diff --git a/ColorPickerView.cpp b/ColorPickerView.cpp
-index 9a69b81..733c881 100644
---- a/ColorPickerView.cpp
-+++ b/ColorPickerView.cpp
-@@ -68,7 +68,7 @@ ColorPickerView::ColorPickerView()
- 
- 	BMessage* settings = static_cast<ColorsApplication*>(be_app)->Settings();
- 
--	long int int_color;
-+	int32 int_color;
- 	if (settings->FindInt32("selected_color", &int_color) == B_OK) {
- 		fRed = (float)(int_color >> 16) / 255;
- 		fGreen = (float)((int_color >> 8) & 255) / 255;
--- 
-2.10.2
-