From 8b576de1e5ae5a181921ba3de5d5c50da39f24fc Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 18 Dec 2017 17:25:12 +0300
Subject: [PATCH] Beam: bump revision

---
 haiku-apps/beam/beam-1.2.recipe           | 41 +++++++++----------
 haiku-apps/beam/patches/beam-1.2.patchset | 49 -----------------------
 2 files changed, 20 insertions(+), 70 deletions(-)
 delete mode 100644 haiku-apps/beam/patches/beam-1.2.patchset

diff --git a/haiku-apps/beam/beam-1.2.recipe b/haiku-apps/beam/beam-1.2.recipe
index 9986b972d..9100142c4 100644
--- a/haiku-apps/beam/beam-1.2.recipe
+++ b/haiku-apps/beam/beam-1.2.recipe
@@ -1,19 +1,17 @@
 SUMMARY="An e-mail client"
 DESCRIPTION="Beam (BEware, Another Mailer) is an open source e-mail client \
-for BeOS (R5 and \
-onwards) that aims to be fast, stable and feature-complete."
-HOMEPAGE="http://github.com/olta/beam"
+for BeOS (R5 and onwards) that aims to be fast, stable and feature-complete."
+HOMEPAGE="https://github.com/HaikuArchives/Beam/"
 COPYRIGHT="2000-2014 Oliver Tappe"
 LICENSE="GNU GPL v2"
-REVISION="5"
-commit="cf3f0a3cd3406cb166d9c4c5939b6809a413799c"
+REVISION="6"
+commit="280e3862f83bedc05d683455aed79be112a680f8"
 SOURCE_URI="https://github.com/HaikuArchives/beam/archive/$commit.tar.gz"
-CHECKSUM_SHA256="06c414812be4cae36723433957e624f04926c2ad03bae1535cec1df19fb8f63a"
+CHECKSUM_SHA256="01f7d6594ebeb5be1d4bf0dc3715b1859565f89709701dfe78c296077b275222"
 SOURCE_DIR="Beam-$commit"
 SOURCE_FILENAME=$SOURCE_DIR
-PATCHES="beam-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="x86_gcc2 !x86_64"
 
 PROVIDES="
 	beam = $portVersion
@@ -21,16 +19,17 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	liblayout >= 1.4.1
-	libpcre >= 8.00
-	lib:libssl
+	lib:libiconv
+	lib:liblayout >= 1.4.1
+	lib:libpcre >= 1.2.9
+	lib:libssl >= 1.0.0
 	"
 
 BUILD_REQUIRES="
-	devel:liblayout >= 1.4.1
-	devel:libpcre
 	devel:libiconv
-	devel:libssl
+	devel:liblayout >= 1.4.1
+	devel:libpcre >= 1.2.9
+	devel:libssl >= 1.0.0
 	"
 BUILD_PREREQUIRES="
 	haiku_devel
@@ -47,14 +46,14 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p ${appsDir}/Beam
-	cp -a generated/distro-haiku/* ${appsDir}/Beam
-	cp -a Changes.txt Readme.md ${appsDir}/Beam
-	mkdir -p ${appsDir}/Beam/Icons
-	cp -a resources/iconset* ${appsDir}/Beam/Icons
-	cd ${appsDir}/Beam/tools
+	mkdir -p $appsDir/Beam
+	cp -a generated/distro-haiku/* $appsDir/Beam
+	cp -a Changes.txt Readme.md $appsDir/Beam
+	mkdir -p $appsDir/Beam/Icons
+	cp -a resources/iconset* $appsDir/Beam/Icons
+	cd $appsDir/Beam/tools
 	ln -s ../lib .
 	ln -s ../add-ons .
 
-	addAppDeskbarSymlink ${appsDir}/Beam/Beam
+	addAppDeskbarSymlink $appsDir/Beam/Beam
 }
diff --git a/haiku-apps/beam/patches/beam-1.2.patchset b/haiku-apps/beam/patches/beam-1.2.patchset
deleted file mode 100644
index c9ad23123..000000000
--- a/haiku-apps/beam/patches/beam-1.2.patchset
+++ /dev/null
@@ -1,49 +0,0 @@
-From 8ac6320697a640db0be6e8cda9f69eb20e515e65 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Sun, 8 Oct 2017 10:16:27 +0200
-Subject: Fix crash
-
-Not sure why, but this ends up being called with be_control_look NULL
-now.
-
-diff --git a/src-beam/BmToolbarButton.cpp b/src-beam/BmToolbarButton.cpp
-index 490d5f9..4aa6d23 100644
---- a/src-beam/BmToolbarButton.cpp
-+++ b/src-beam/BmToolbarButton.cpp
-@@ -236,7 +236,7 @@ void BmToolbarButton::Draw( BRect updateRect) {
- 
- 	BRect rect(Bounds());
- #ifdef __HAIKU__
--	if (mHighlighted && IsEnabled()) {
-+	if (be_control_look && mHighlighted && IsEnabled()) {
- 		// draw higlighting border
- 		uint32 flags = 0;
- 		if (Value())
--- 
-2.14.2
-
-
-From 07bc84afb7f18dc3e91215d11fb6fc2bbabe24e2 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Sun, 8 Oct 2017 11:25:09 +0200
-Subject: Fix build with current flex
-
-It is confused if we are C89 but define INT32_MAX anyway. So pretend we
-are C99.
-
-diff --git a/src-filter-addons/src-sieve/src-libSieve/Jamfile b/src-filter-addons/src-sieve/src-libSieve/Jamfile
-index cbe5db4..884d007 100644
---- a/src-filter-addons/src-sieve/src-libSieve/Jamfile
-+++ b/src-filter-addons/src-sieve/src-libSieve/Jamfile
-@@ -11,6 +11,8 @@ if $(OSPLAT) = X86 {
- 	CCFLAGS += -proto lax -w nounwanted -w nounused ;
- }
- 
-+CFLAGS += --std=gnu9x ;
-+
- SubDirSysHdrs $(COMMON_FOLDER)/include ;
- 
- # <pe-src>
--- 
-2.14.2
-